s390x: do not enable PV dump support by default
v2 cover s390x: do not enable PV dump support by default
v1->v2:
---
* add indent to CONFIG_DUMP if in Makefile (thanks Janosch)
* add comment (thanks Janosch)
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.
Nico Boehr (1):
s390x: do not enable PV dump support by default
configure | 11 +++++++++++ s390x/Makefile | 26 +++++++++++++++++--------- 2 files changed, 28 insertions(+), 9 deletions(-)
Signature · 1 line
2.36.1
PATCH v2 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 0 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 | 26 +++++++++++++++++--------- 2 files changed, 28 insertions(+), 9 deletions(-)
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 +17 -9
@@ -173,18 +173,26 @@ $(comm-key): %.bin: %.elf $(OBJCOPY) -O binary $< $@ -# 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) -ifeq ($(GENPROTIMG_HAS_COMM_KEY),yes) - GENPROTIMG_COMM_KEY = --comm-key $(comm-key) -else - GENPROTIMG_COMM_KEY = --x-comm-key $(comm-key) +# Will only be filled when dump has been enabled +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) + ifeq ($(GENPROTIMG_HAS_COMM_KEY),yes) + GENPROTIMG_COMM_KEY = --comm-key $(comm-key) + else + GENPROTIMG_COMM_KEY = --x-comm-key $(comm-key) + endif + + # allow dumping + PCKMO + genprotimg_pcf = 0x200000e0 endif # use x-pcf to be compatible with old genprotimg versions -# allow dumping + PCKMO -genprotimg_pcf = 0x200000e0 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.36.1
Quoted 5 lines · On Wed, 19 Oct 2022 16:53:20 +0200 Nico Boehr <[email protected]> wrote:
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:
Quoted 8 lines
qemu-system-s390x: KVM PV command 2 (
KVM_PV_SET_SEC_PARMS) failed: header rc 106 rrc 0 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.
Fixes 3043685825d9 ("s390x: create persistent comm-key")Signed-off-by Nico Boehr <[email protected]>
Quoted 88 lines
--- configure | 11 +++++++++++ s390x/Makefile | 26 +++++++++++++++++--------- 2 files changed, 28 insertions(+), 9 deletions(-)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_headers390x/Makefile +17
-9@@ -173,18 +173,26 @@ $(comm-key): %.bin: %.elf $(OBJCOPY) -O binary $< $@ -# 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) -ifeq ($(GENPROTIMG_HAS_COMM_KEY),yes) - GENPROTIMG_COMM_KEY = --comm-key $(comm-key) -else - GENPROTIMG_COMM_KEY = --x-comm-key $(comm-key) +# Will only be filled when dump has been enabled +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) + ifeq ($(GENPROTIMG_HAS_COMM_KEY),yes) + GENPROTIMG_COMM_KEY = --comm-key $(comm-key) + else + GENPROTIMG_COMM_KEY = --x-comm-key $(comm-key) + endif + + # allow dumping + PCKMO + genprotimg_pcf = 0x200000e0 endif # use x-pcf to be compatible with old genprotimg versions -# allow dumping + PCKMO -genprotimg_pcf = 0x200000e0 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)
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 0 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.
Quoted 8 lines · On Wed, 19 Oct 2022 16:53:19 +0200 Nico Boehr <[email protected]> wrote:
v1->v2:
---
* add indent toCONFIG_DUMPif inMakefile(thanks Janosch)
* add comment (thanks Janosch)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.
maybe for the long term we could try to fix the stub generated by genprotimg to check the plaintext flags and the available features and refuse to try to start if the required features are missing.
ideally providing a custom message when generating the image, to be shown if the required features are missing. e.g. for kvm unit test, the custom message could be something like
SKIP: $TEST_NAME: Missing hardware features
once that is in place, we could revert this patch
Quoted 8 lines
Nico Boehr (1):
s390x: do not enable PV dump support by defaultconfigure | 11 +++++++++++ s390x/Makefile | 26 +++++++++++++++++--------- 2 files changed, 28 insertions(+), 9 deletions(-)
Quoting Claudio Imbrenda (2022-10-19 17:19:43)
Quoted 16 lines
Quoted 8 lines · On Wed, 19 Oct 2022 16:53:19 +0200 Nico Boehr <[email protected]> wrote:
v1->v2:
---
* add indent toCONFIG_DUMPif inMakefile(thanks Janosch)
* add comment (thanks Janosch)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.
maybe for the long term we could try to fix the stub generated by genprotimg to check the plaintext flags and the available features and refuse to try to start if the required features are missing.
Quoted 6 lines
ideally providing a custom message when generating the image, to be shown if the required features are missing. e.g. for kvm unit test, the custom message could be something like
SKIP: $TEST_NAME: Missing hardware featuresonce that is in place, we could revert this patch
But that would mean that on machines which don't support dumping, PV tests will never run, will they?
So we need some way of specifing at compile time whether you want dump support or not.
Quoted 17 lines · On Wed, 19 Oct 2022 17:24:16 +0200 Nico Boehr <[email protected]> wrote:
Quoting Claudio Imbrenda (2022-10-19 17:19:43)
Quoted 16 lines
Quoted 8 lines · On Wed, 19 Oct 2022 16:53:19 +0200 Nico Boehr <[email protected]> wrote:
v1->v2:
---
* add indent toCONFIG_DUMPif inMakefile(thanks Janosch)
* add comment (thanks Janosch)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.
maybe for the long term we could try to fix the stub generated by genprotimg to check the plaintext flags and the available features and refuse to try to start if the required features are missing.
Quoted 8 lines
Quoted 6 lines
ideally providing a custom message when generating the image, to be shown if the required features are missing. e.g. for kvm unit test, the custom message could be something like
SKIP: $TEST_NAME: Missing hardware featuresonce that is in place, we could revert this patch
But that would mean that on machines which don't support dumping, PV tests will never run, will they?
no, the check would be done at run time, so the test would only be skipped on machines that don't support dumping (or whatever other feature)
but again, this is a long term idea, for now we'll take your patch since it solves the problem :)
Quoted 2 lines
So we need some way of specifing at compile time whether you want dump support or not.
Quoted 8 lines · Claudio Imbrenda
Quoted 5 lines · On Wed, 19 Oct 2022 16:53:19 +0200 Nico Boehr <[email protected]> wrote:
v1->v2:
---
* add indent toCONFIG_DUMPif inMakefile(thanks Janosch)
* add comment (thanks Janosch)
Quoted 7 lines
Quoted 3 lines
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.
maybe for the long term we could try to fix the stub generated by genprotimg to check the plaintext flags and the available features and refuse to try to start if the required features are missing.
That's not possible on multiple levels:
* Unsecure G2 does not have stfle 158
* Dump is a host feature so I'm unsure if it would even be indicated in the guest
Quoted 7 lines
ideally providing a custom message when generating the image, to be shown if the required features are missing. e.g. for kvm unit test, the custom message could be something like
SKIP: $TEST_NAME: Missing hardware featuresonce that is in place, we could revert this patch
Also the host that's using genprotimg might not be PV enabled or even s390x so checking on image generation is no option either.
Quoted 10 lines
Quoted 9 lines
Nico Boehr (1):
s390x: do not enable PV dump support by defaultconfigure | 11 +++++++++++ s390x/Makefile | 26 +++++++++++++++++--------- 2 files changed, 28 insertions(+), 9 deletions(-)
Quoted 13 lines · On Wed, 19 Oct 2022 17:47:36 +0200 Janosch Frank <[email protected]> wrote:
Quoted 12 lines · Claudio Imbrenda
Quoted 8 lines · On Wed, 19 Oct 2022 16:53:19 +0200 Nico Boehr <[email protected]> wrote:
v1->v2:
---
* add indent toCONFIG_DUMPif inMakefile(thanks Janosch)
* add comment (thanks Janosch)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.
Quoted 8 lines
Quoted 3 lines
maybe for the long term we could try to fix the stub generated by genprotimg to check the plaintext flags and the available features and refuse to try to start if the required features are missing.
That's not possible on multiple levels:
* Unsecure G2 does not have stfle 158
* Dump is a host feature so I'm unsure if it would even be indicated in the guest
fair enough. maybe those are problems that can be somehow fixed in the (far) future.
for example when loading the blob with diag 308 subcode 8, the host could reject it with an appropriate error code (since it would fail to boot anyway)
not something we have to worry about now, though
Quoted 11 lines
Quoted 8 lines
ideally providing a custom message when generating the image, to be shown if the required features are missing. e.g. for kvm unit test, the custom message could be something like
SKIP: $TEST_NAME: Missing hardware featuresonce that is in place, we could revert this patch
Also the host that's using genprotimg might not be PV enabled or even s390x so checking on image generation is no option either.
checking at image generation time is exactly what I did not want.
Quoted 12 lines
Quoted 11 lines
Quoted 10 lines
Nico Boehr (1):
s390x: do not enable PV dump support by defaultconfigure | 11 +++++++++++ s390x/Makefile | 26 +++++++++++++++++--------- 2 files changed, 28 insertions(+), 9 deletions(-)