s390x: do not enable PV dump support by default
PATCH 1/1 s390x: do not enable PV dump support by default
Currently, dump support is always enabled by setting the respective plaintext control flag (PCF). Unfortunately, older machines without support for PV dump will not start the guest when this PCF is set. This will result in an error message like this:
qemu-system-s390x: KVM PV command 2 (KVM_PV_SET_SEC_PARMS) failed: header rc 106 rrc 30 IOCTL rc: -22
Hence, by default, disable dump support to preserve compatibility with older machines. Users can enable dumping support by passing --enable-dump to the configure script.
--- configure | 11 +++++++++++ s390x/Makefile | 9 ++++++++- 2 files changed, 19 insertions(+), 1 deletion(-)
configure +11 -0
@@ -28,6 +28,7 @@ errata_force=0 erratatxt="$srcdir/errata.txt" host_key_document= gen_se_header= +enable_dump=no page_size= earlycon= efi=
@@ -67,6 +68,9 @@ usage() { --gen-se-header=GEN_SE_HEADER Provide an executable to generate a PV header requires --host-key-document. (s390x-snippets only) + --[enable|disable]-dump + Allow PV guests to be dumped. Requires at least z16. + (s390x only) --page-size=PAGE_SIZE Specify the page size (translation granule) (4k, 16k or 64k, default is 64k, arm64 only)
@@ -146,6 +150,12 @@ while [[ "$1" = -* ]]; do --gen-se-header) gen_se_header="$arg" ;; + --enable-dump) + enable_dump=yes + ;; + --disable-dump) + enable_dump=no + ;; --page-size) page_size="$arg" ;;
@@ -387,6 +397,7 @@ U32_LONG_FMT=$u32_long WA_DIVIDE=$wa_divide GENPROTIMG=${GENPROTIMG-genprotimg} HOST_KEY_DOCUMENT=$host_key_document +CONFIG_DUMP=$enable_dump CONFIG_EFI=$efi CONFIG_WERROR=$werror GEN_SE_HEADER=$gen_se_header
s390x/Makefile +8 -1
@@ -173,6 +173,11 @@ $(comm-key): %.bin: %.elf $(OBJCOPY) -O binary $< $@ +GENPROTIMG_COMM_KEY = +# allow PCKMO +genprotimg_pcf = 0x000000e0 + +ifeq ($(CONFIG_DUMP),yes) # The genprotimg arguments for the cck changed over time so we need to # figure out which argument to use in order to set the cck GENPROTIMG_HAS_COMM_KEY = $(shell $(GENPROTIMG) --help | grep -q -- --comm-key && echo yes)
@@ -182,9 +187,11 @@ else GENPROTIMG_COMM_KEY = --x-comm-key $(comm-key) endif -# use x-pcf to be compatible with old genprotimg versions # allow dumping + PCKMO genprotimg_pcf = 0x200000e0 +endif + +# use x-pcf to be compatible with old genprotimg versions genprotimg_args = --host-key-document $(HOST_KEY_DOCUMENT) --no-verify $(GENPROTIMG_COMM_KEY) --x-pcf $(genprotimg_pcf) %selftest.pv.bin: %selftest.bin $(HOST_KEY_DOCUMENT) $(patsubst %.pv.bin,%.parmfile,$@) $(comm-key)
Signature · 1 line
2.35.3
Quoted 11 lines · Nico Boehr
Currently, dump support is always enabled by setting the respective plaintext control flag (PCF). Unfortunately, older machines without support for PV dump will not start the guest when this PCF is set. This will result in an error message like this:
qemu-system-s390x: KVM PV command 2 (
KVM_PV_SET_SEC_PARMS) failed: header rc 106 rrc 30 IOCTL rc: -22Hence, by default, disable dump support to preserve compatibility with older machines. Users can enable dumping support by passing --enable-dump to the configure script.
The patch is fine, some nits below.
But I'm wondering when the core maintainers will start complaining about excessive argument usage. :)
Quoted 13 lines
configure +1
-0@@ -387,6 +397,7 @@ U32_LONG_FMT=$u32_long WA_DIVIDE=$wa_divide GENPROTIMG=${GENPROTIMG-genprotimg} HOST_KEY_DOCUMENT=$host_key_document +CONFIG_DUMP=$enable_dump CONFIG_EFI=$efi CONFIG_WERROR=$werror GEN_SE_HEADER=$gen_se_headers390x/Makefile +0
-0
s390x/Makefile $(comm-key): · line 176
Quoted 4 lines
s390x/Makefile +1
-0@@ -173,6 +173,11 @@ $(comm-key): %.bin: %.elf $(OBJCOPY) -O binary $< $@ +GENPROTIMG_COMM_KEY =
This should have a comment:
Will only be filled when dump has been enabled
s390x/Makefile $(comm-key): · line 180
Quoted 4 lines
s390x/Makefile +4
-0+# allow PCKMO +genprotimg_pcf = 0x000000e0 + +ifeq ($(CONFIG_DUMP),yes)
I'd appreciate indents here
Quoted 16 lines
s390x/Makefile +3
-1# The genprotimg arguments for the cck changed over time so we need to # figure out which argument to use in order to set the cck GENPROTIMG_HAS_COMM_KEY = $(shell $(GENPROTIMG) --help | grep -q -- --comm-key && echo yes)@@ -182,9 +187,11 @@ else GENPROTIMG_COMM_KEY = --x-comm-key $(comm-key) endif -# use x-pcf to be compatible with old genprotimg versions # allow dumping + PCKMO genprotimg_pcf = 0x200000e0 +endif + +# use x-pcf to be compatible with old genprotimg versions genprotimg_args = --host-key-document $(HOST_KEY_DOCUMENT) --no-verify $(GENPROTIMG_COMM_KEY) --x-pcf $(genprotimg_pcf) %selftest.pv.bin: %selftest.bin $(HOST_KEY_DOCUMENT) $(patsubst %.pv.bin,%.parmfile,$@) $(comm-key)