KVM: s390: pv dump and selftest changes
Subsystems (5)
Christian Borntraeger
maintainerPaolo,
sorry for the late 2nd pull request for 5.19.
It has 3 numbering things that I had to take care of:api.rst:
4.136 KVM_S390_PV_CPU_COMMAND
8.37 KVM_CAP_S390_PROTECTED_DUMPkvm.h
define KVM_CAP_S390_PROTECTED_DUMP 217
and then I messed up so patched have been sitting here much longer than the commit date tells.
Please pull
The following changes since commit 85165781c5d900d97052be1d2723f6929d56768d:
KVM: Do not pin pages tracked by gfn=>pfn caches (2022-05-25 05:23:44 -0400)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git tags/kvm-s390-next-5.19-2
for you to fetch changes up to b1edf7f159a6d532757b004a70f31a6425d5043f:
KVM: s390: selftests: Use TAP interface in the reset test (2022-06-01 16:57:15 +0200)
----------------------------------------------------------------
KVM: s390: pvdump and selftest improvements
- add an interface to provide a hypervisor dump for secure guests
- improve selftests to show tests
----------------------------------------------------------------
Janosch Frank (11):
s390/uv: Add SE hdr query information
s390/uv: Add dump fields to query
KVM: s390: pv: Add query interface
KVM: s390: pv: Add dump support definitions
KVM: s390: pv: Add query dump information
KVM: s390: Add configuration dump functionality
KVM: s390: Add CPU dump functionality
KVM: s390: Add KVM_CAP_S390_PROTECTED_DUMP
Documentation: virt: Protected virtual machine dumps Documentation/virt/kvm/api.rst: Add protvirt dump/info api descriptions Documentation/virt/kvm/api.rst: Explain rc/rrc delivery
Thomas Huth (4):
KVM: s390: selftests: Use TAP interface in the memop test
KVM: s390: selftests: Use TAP interface in the sync_regs test
KVM: s390: selftests: Use TAP interface in the tprot test
KVM: s390: selftests: Use TAP interface in the reset test
Documentation/virt/kvm/api.rst | 162 ++++++++++++- Documentation/virt/kvm/s390/index.rst | 1 + Documentation/virt/kvm/s390/s390-pv-dump.rst | 64 +++++ arch/s390/boot/uv.c | 4 + arch/s390/include/asm/kvm_host.h | 1 + arch/s390/include/asm/uv.h | 45 +++- arch/s390/kernel/uv.c | 53 ++++ arch/s390/kvm/kvm-s390.c | 269 +++++++++++++++++++++ arch/s390/kvm/kvm-s390.h | 5 + arch/s390/kvm/pv.c | 198 +++++++++++++++ include/uapi/linux/kvm.h | 55 +++++ tools/testing/selftests/kvm/s390x/memop.c | 97 ++++++-- tools/testing/selftests/kvm/s390x/resets.c | 38 ++- tools/testing/selftests/kvm/s390x/sync_regs_test.c | 87 +++++-- tools/testing/selftests/kvm/s390x/tprot.c | 29 ++- 15 files changed, 1052 insertions(+), 56 deletions(-) create mode 100644 Documentation/virt/kvm/s390/s390-pv-dump.rst
Christian Borntraeger
maintainer[GIT PULL 01/15] s390/uv: Add SE hdr query information
From: Janosch Frank <[email protected]>
We have information about the supported se header version and pcf bits so let's expose it via the sysfs files.
Message-Id: <[email protected]>
--- arch/s390/boot/uv.c | 2 ++ arch/s390/include/asm/uv.h | 7 ++++++- arch/s390/kernel/uv.c | 20 ++++++++++++++++++++ 3 files changed, 28 insertions(+), 1 deletion(-)
arch/s390/boot/uv.c +2 -0
@@ -41,6 +41,8 @@ void uv_query_info(void) uv_info.max_num_sec_conf = uvcb.max_num_sec_conf; uv_info.max_guest_cpu_id = uvcb.max_guest_cpu_id; uv_info.uv_feature_indications = uvcb.uv_feature_indications; + uv_info.supp_se_hdr_ver = uvcb.supp_se_hdr_versions; + uv_info.supp_se_hdr_pcf = uvcb.supp_se_hdr_pcf; }#ifdef CONFIG_PROTECTED_VIRTUALIZATION_GUEST
arch/s390/include/asm/uv.h +6 -1
@@ -110,7 +110,10 @@ struct uv_cb_qui {u8 reserved88[158 -136 ];/* 0x0088 */ u16 max_guest_cpu_id;/* 0x009e */ u64 uv_feature_indications;/* 0x00a0 */ -u8 reserveda8[200 -168 ];/* 0x00a8 */ +u64 reserveda8;/* 0x00a8 */ +u64 supp_se_hdr_versions;/* 0x00b0 */ +u64 supp_se_hdr_pcf;/* 0x00b8 */ +u64 reservedc0;/* 0x00c0 */ } __packed__aligned(8) ;/* Initialize Ultravisor */
@@ -307,6 +310,8 @@ struct uv_info {unsigned int max_num_sec_conf;unsigned short max_guest_cpu_id;unsigned long uv_feature_indications; +unsigned long supp_se_hdr_ver; +unsigned long supp_se_hdr_pcf; };extern struct uv_info uv_info;
arch/s390/kernel/uv.c +20 -0
@@ -392,6 +392,24 @@ static ssize_t uv_query_facilities(struct kobject *kobj,static struct kobj_attribute uv_query_facilities_attr =__ATTR (facilities,0444 , uv_query_facilities,NULL ); +static ssize_t uv_query_supp_se_hdr_ver (struct kobject *kobj, +struct kobj_attribute *attr,char *buf) +{ +return sysfs_emit (buf,"%lx\n" , uv_info.supp_se_hdr_ver); +} + +static struct kobj_attribute uv_query_supp_se_hdr_ver_attr = +__ATTR (supp_se_hdr_ver,0444 , uv_query_supp_se_hdr_ver,NULL ); + +static ssize_t uv_query_supp_se_hdr_pcf (struct kobject *kobj, +struct kobj_attribute *attr,char *buf) +{ +return sysfs_emit (buf,"%lx\n" , uv_info.supp_se_hdr_pcf); +} + +static struct kobj_attribute uv_query_supp_se_hdr_pcf_attr = +__ATTR (supp_se_hdr_pcf,0444 , uv_query_supp_se_hdr_pcf,NULL ); +static ssize_t uv_query_feature_indications (struct kobject *kobj,struct kobj_attribute *attr,char *buf) {
@@ -437,6 +455,8 @@ static struct attribute *uv_query_attrs[] = { &uv_query_max_guest_cpus_attr.attr, &uv_query_max_guest_vms_attr.attr, &uv_query_max_guest_addr_attr.attr, + &uv_query_supp_se_hdr_ver_attr.attr, + &uv_query_supp_se_hdr_pcf_attr.attr, NULL, };
Signature · 1 line
2.35.1
Christian Borntraeger
maintainer[GIT PULL 03/15] KVM: s390: pv: Add query interface
In reply to Christian BorntraegerFrom: Janosch Frank <[email protected]>
Some of the query information is already available via sysfs but having a IOCTL makes the information easier to retrieve.
Message-Id: <[email protected]>
--- arch/s390/kvm/kvm-s390.c | 76 ++++++++++++++++++++++++++++++++++++++++ include/uapi/linux/kvm.h | 25 +++++++++++++ 2 files changed, 101 insertions(+)
arch/s390/kvm/kvm-s390.c +76 -0
@@ -2224,6 +2224,42 @@ static int kvm_s390_cpus_to_pv(struct kvm *kvm, u16 *rc, u16 *rrc)return r; } +/* +* Here we provide user space with a direct interface to query UV +* related data like UV maxima and available features as well as +* feature specific data. +* +* To facilitate future extension of the data structures we'll try to +* write data up to the maximum requested length. +*/ +static ssize_t kvm_s390_handle_pv_info (struct kvm_s390_pv_info *info) +{ +ssize_t len_min; + +switch (info->header.id) { +case KVM_PV_INFO_VM : { + len_min =sizeof (info->header) +sizeof (info->vm); + +if (info->header.len_max < len_min) +return -EINVAL ; + +memcpy (info->vm.inst_calls_list, + uv_info.inst_calls_list, +sizeof (uv_info.inst_calls_list)); + +/* It's max cpuid not max cpus, so it's off by one */ + info->vm.max_cpus = uv_info.max_guest_cpu_id +1 ; + info->vm.max_guests = uv_info.max_num_sec_conf; + info->vm.max_guest_addr = uv_info.max_sec_stor_addr; + info->vm.feature_indication = uv_info.uv_feature_indications; + +return len_min; + } +default : +return -EINVAL ; + } +} +static int kvm_s390_handle_pv (struct kvm *kvm,struct kvm_pv_cmd *cmd) {int r =0 ;
@@ -2360,6 +2396,46 @@ static int kvm_s390_handle_pv(struct kvm *kvm, struct kvm_pv_cmd *cmd) cmd->rc, cmd->rrc);break ; } +case KVM_PV_INFO : { +struct kvm_s390_pv_info info = {}; +ssize_t data_len; + +/* +* No need to check the VM protection here. +* +* Maybe user space wants to query some of the data +* when the VM is still unprotected. If we see the +* need to fence a new data command we can still +* return an error in the info handler. +*/ + + r = -EFAULT ; +if (copy_from_user (&info, argp,sizeof (info.header))) +break ; + + r = -EINVAL ; +if (info.header.len_max <sizeof (info.header)) +break ; + + data_len =kvm_s390_handle_pv_info (&info); +if (data_len <0 ) { + r = data_len; +break ; + } +/* +* If a data command struct is extended (multiple +* times) this can be used to determine how much of it +* is valid. +*/ + info.header.len_written = data_len; + + r = -EFAULT ; +if (copy_to_user (argp, &info, data_len)) +break ; + + r =0 ; +break ; + }default : r = -ENOTTY ; }
include/uapi/linux/kvm.h +25 -0
@@ -1660,6 +1660,30 @@ struct kvm_s390_pv_unp {__u64 tweak; }; +enum pv_cmd_info_id { +KVM_PV_INFO_VM , +}; + +struct kvm_s390_pv_info_vm { +__u64 inst_calls_list[4 ]; +__u64 max_cpus; +__u64 max_guests; +__u64 max_guest_addr; +__u64 feature_indication; +}; + +struct kvm_s390_pv_info_header { +__u32 id; +__u32 len_max; +__u32 len_written; +__u32 reserved; +}; + +struct kvm_s390_pv_info { +struct kvm_s390_pv_info_header header; +struct kvm_s390_pv_info_vm vm; +}; +enum pv_cmd_id {KVM_PV_ENABLE ,KVM_PV_DISABLE ,
@@ -1668,6 +1692,7 @@ enum pv_cmd_id {KVM_PV_VERIFY ,KVM_PV_PREP_RESET ,KVM_PV_UNSHARE_ALL , + KVM_PV_INFO, }; struct kvm_pv_cmd {
Signature · 1 line
2.35.1
Christian Borntraeger
maintainer[GIT PULL 02/15] s390/uv: Add dump fields to query
In reply to Christian BorntraegerFrom: Janosch Frank <[email protected]>
The new dump feature requires us to know how much memory is needed for the "dump storage state" and "dump finalize" ultravisor call. These values are reported via the UV query call.
Message-Id: <[email protected]>
--- arch/s390/boot/uv.c | 2 ++ arch/s390/include/asm/uv.h | 5 +++++ arch/s390/kernel/uv.c | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+)
arch/s390/boot/uv.c +2 -0
@@ -43,6 +43,8 @@ void uv_query_info(void) uv_info.uv_feature_indications = uvcb.uv_feature_indications; uv_info.supp_se_hdr_ver = uvcb.supp_se_hdr_versions; uv_info.supp_se_hdr_pcf = uvcb.supp_se_hdr_pcf; + uv_info.conf_dump_storage_state_len = uvcb.conf_dump_storage_state_len; + uv_info.conf_dump_finalize_len = uvcb.conf_dump_finalize_len; }#ifdef CONFIG_PROTECTED_VIRTUALIZATION_GUEST
arch/s390/include/asm/uv.h +5 -0
@@ -114,6 +114,9 @@ struct uv_cb_qui {u64 supp_se_hdr_versions;/* 0x00b0 */ u64 supp_se_hdr_pcf;/* 0x00b8 */ u64 reservedc0;/* 0x00c0 */ +u64 conf_dump_storage_state_len;/* 0x00c8 */ +u64 conf_dump_finalize_len;/* 0x00d0 */ +u8 reservedd8[256 -216 ];/* 0x00d8 */ } __packed__aligned(8) ;/* Initialize Ultravisor */
@@ -312,6 +315,8 @@ struct uv_info {unsigned long uv_feature_indications;unsigned long supp_se_hdr_ver;unsigned long supp_se_hdr_pcf; +unsigned long conf_dump_storage_state_len; +unsigned long conf_dump_finalize_len; };extern struct uv_info uv_info;
arch/s390/kernel/uv.c +33 -0
@@ -410,6 +410,36 @@ static ssize_t uv_query_supp_se_hdr_pcf(struct kobject *kobj,static struct kobj_attribute uv_query_supp_se_hdr_pcf_attr =__ATTR (supp_se_hdr_pcf,0444 , uv_query_supp_se_hdr_pcf,NULL ); +static ssize_t uv_query_dump_cpu_len (struct kobject *kobj, +struct kobj_attribute *attr,char *page) +{ +return scnprintf (page,PAGE_SIZE ,"%lx\n" , + uv_info.guest_cpu_stor_len); +} + +static struct kobj_attribute uv_query_dump_cpu_len_attr = +__ATTR (uv_query_dump_cpu_len,0444 , uv_query_dump_cpu_len,NULL ); + +static ssize_t uv_query_dump_storage_state_len (struct kobject *kobj, +struct kobj_attribute *attr,char *page) +{ +return scnprintf (page,PAGE_SIZE ,"%lx\n" , + uv_info.conf_dump_storage_state_len); +} + +static struct kobj_attribute uv_query_dump_storage_state_len_attr = +__ATTR (dump_storage_state_len,0444 , uv_query_dump_storage_state_len,NULL ); + +static ssize_t uv_query_dump_finalize_len (struct kobject *kobj, +struct kobj_attribute *attr,char *page) +{ +return scnprintf (page,PAGE_SIZE ,"%lx\n" , + uv_info.conf_dump_finalize_len); +} + +static struct kobj_attribute uv_query_dump_finalize_len_attr = +__ATTR (dump_finalize_len,0444 , uv_query_dump_finalize_len,NULL ); +static ssize_t uv_query_feature_indications (struct kobject *kobj,struct kobj_attribute *attr,char *buf) {
@@ -457,6 +487,9 @@ static struct attribute *uv_query_attrs[] = { &uv_query_max_guest_addr_attr.attr, &uv_query_supp_se_hdr_ver_attr.attr, &uv_query_supp_se_hdr_pcf_attr.attr, + &uv_query_dump_storage_state_len_attr.attr, + &uv_query_dump_finalize_len_attr.attr, + &uv_query_dump_cpu_len_attr.attr, NULL, };
Signature · 1 line
2.35.1
Christian Borntraeger
maintainer[GIT PULL 04/15] KVM: s390: pv: Add dump support definitions
In reply to Christian BorntraegerFrom: Janosch Frank <[email protected]>
Let's add the constants and structure definitions needed for the dump support.
Message-Id: <[email protected]>
--- arch/s390/include/asm/uv.h | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+)
arch/s390/include/asm/uv.h +33 -0
@@ -50,6 +50,10 @@#define UVC_CMD_SET_UNSHARE_ALL 0x0340#define UVC_CMD_PIN_PAGE_SHARED 0x0341#define UVC_CMD_UNPIN_PAGE_SHARED 0x0342 +#define UVC_CMD_DUMP_INIT 0x0400 +#define UVC_CMD_DUMP_CONF_STOR_STATE 0x0401 +#define UVC_CMD_DUMP_CPU 0x0402 +#define UVC_CMD_DUMP_COMPLETE 0x0403#define UVC_CMD_SET_SHARED_ACCESS 0x1000#define UVC_CMD_REMOVE_SHARED_ACCESS 0x1001#define UVC_CMD_RETR_ATTEST 0x1020
@@ -77,6 +81,10 @@ enum uv_cmds_inst {BIT_UVC_CMD_UNSHARE_ALL =20 ,BIT_UVC_CMD_PIN_PAGE_SHARED =21 ,BIT_UVC_CMD_UNPIN_PAGE_SHARED =22 , +BIT_UVC_CMD_DUMP_INIT =24 , +BIT_UVC_CMD_DUMP_CONFIG_STOR_STATE =25 , +BIT_UVC_CMD_DUMP_CPU =26 , +BIT_UVC_CMD_DUMP_COMPLETE =27 , BIT_UVC_CMD_RETR_ATTEST = 28, };
@@ -246,6 +254,31 @@ struct uv_cb_attest {u64 reserved168[4 ];/* 0x0168 */ } __packed__aligned(8) ; +struct uv_cb_dump_cpu { +struct uv_cb_header header; +u64 reserved08[2 ]; +u64 cpu_handle; +u64 dump_area_origin; +u64 reserved28[5 ]; +} __packed__aligned(8) ; + +struct uv_cb_dump_stor_state { +struct uv_cb_header header; +u64 reserved08[2 ]; +u64 config_handle; +u64 dump_area_origin; +u64 gaddr; +u64 reserved28[4 ]; +} __packed__aligned(8) ; + +struct uv_cb_dump_complete { +struct uv_cb_header header; +u64 reserved08[2 ]; +u64 config_handle; +u64 dump_area_origin; +u64 reserved30[5 ]; +} __packed__aligned(8) ; +static inline int __uv_call (unsigned long r1,unsigned long r2) {int cc;
Signature · 1 line
2.35.1
Christian Borntraeger
maintainer[GIT PULL 05/15] KVM: s390: pv: Add query dump information
In reply to Christian BorntraegerFrom: Janosch Frank <[email protected]>
The dump API requires userspace to provide buffers into which we will store data. The dump information added in this patch tells userspace how big those buffers need to be.
Message-Id: <[email protected]>
--- arch/s390/kvm/kvm-s390.c | 11 +++++++++++ include/uapi/linux/kvm.h | 12 +++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-)
arch/s390/kvm/kvm-s390.c +11 -0
@@ -2255,6 +2255,17 @@ static ssize_t kvm_s390_handle_pv_info(struct kvm_s390_pv_info *info)return len_min; } +case KVM_PV_INFO_DUMP : { + len_min =sizeof (info->header) +sizeof (info->dump); + +if (info->header.len_max < len_min) +return -EINVAL ; + + info->dump.dump_cpu_buffer_len = uv_info.guest_cpu_stor_len; + info->dump.dump_config_mem_buffer_per_1m = uv_info.conf_dump_storage_state_len; + info->dump.dump_config_finalize_len = uv_info.conf_dump_finalize_len; +return len_min; + }default :return -EINVAL ; }
include/uapi/linux/kvm.h +11 -1
@@ -1662,6 +1662,13 @@ struct kvm_s390_pv_unp {enum pv_cmd_info_id {KVM_PV_INFO_VM , +KVM_PV_INFO_DUMP , +}; + +struct kvm_s390_pv_info_dump { +__u64 dump_cpu_buffer_len; +__u64 dump_config_mem_buffer_per_1m; +__u64 dump_config_finalize_len; };struct kvm_s390_pv_info_vm {
@@ -1681,7 +1688,10 @@ struct kvm_s390_pv_info_header {struct kvm_s390_pv_info {struct kvm_s390_pv_info_header header; -struct kvm_s390_pv_info_vm vm; +union { +struct kvm_s390_pv_info_dump dump; +struct kvm_s390_pv_info_vm vm; + }; };enum pv_cmd_id {
Signature · 1 line
2.35.1
Christian Borntraeger
maintainer[GIT PULL 06/15] KVM: s390: Add configuration dump functionality
In reply to Christian BorntraegerFrom: Janosch Frank <[email protected]>
Sometimes dumping inside of a VM fails, is unavailable or doesn't yield the required data. For these occasions we dump the VM from the outside, writing memory and cpu data to a file.
Up to now PV guests only supported dumping from the inside of the guest through dumpers like KDUMP. A PV guest can be dumped from the hypervisor but the data will be stale and / or encrypted.
To get the actual state of the PV VM we need the help of the Ultravisor who safeguards the VM state. New UV calls have been added to initialize the dump, dump storage state data, dump cpu data and complete the dump process. We expose these calls in this patch via a new UV ioctl command.
The sensitive parts of the dump data are encrypted, the dump key is derived from the Customer Communication Key (CCK). This ensures that only the owner of the VM who has the CCK can decrypt the dump data.
The memory is dumped / read via a normal export call and a re-import after the dump initialization is not needed (no re-encryption with a dump key).
Message-Id: <[email protected]>
--- arch/s390/include/asm/kvm_host.h | 1 + arch/s390/kvm/kvm-s390.c | 93 ++++++++++++++++ arch/s390/kvm/kvm-s390.h | 4 + arch/s390/kvm/pv.c | 182 +++++++++++++++++++++++++++++++ include/uapi/linux/kvm.h | 15 +++ 5 files changed, 295 insertions(+)
arch/s390/include/asm/kvm_host.h +1 -0
@@ -923,6 +923,7 @@ struct kvm_s390_pv {u64 guest_len;unsigned long stor_base;void *stor_var; +bool dumping; };struct kvm_arch {
arch/s390/kvm/kvm-s390.c +93 -0
111 lines not on this page · raw message
arch/s390/kvm/kvm-s390.h +4 -0
@@ -250,6 +250,10 @@ int kvm_s390_pv_set_sec_parms(struct kvm *kvm, void *hdr, u64 length, u16 *rc,int kvm_s390_pv_unpack (struct kvm *kvm,unsigned long addr,unsigned long size,unsigned long tweak,u16 *rc,u16 *rrc);int kvm_s390_pv_set_cpu_state (struct kvm_vcpu *vcpu,u8 state); +int kvm_s390_pv_dump_stor_state (struct kvm *kvm,void __user *buff_user, +u64 *gaddr,u64 buff_user_len,u16 *rc,u16 *rrc); +int kvm_s390_pv_dump_complete (struct kvm *kvm,void __user *buff_user, +u16 *rc,u16 *rrc);static inline u64 kvm_s390_pv_get_handle (struct kvm *kvm) {
arch/s390/kvm/pv.c +182 -0
191 lines not on this page · raw message
include/uapi/linux/kvm.h +15 -0
@@ -1660,6 +1660,20 @@ struct kvm_s390_pv_unp {__u64 tweak; }; +enum pv_cmd_dmp_id { +KVM_PV_DUMP_INIT , +KVM_PV_DUMP_CONFIG_STOR_STATE , +KVM_PV_DUMP_COMPLETE , +}; + +struct kvm_s390_pv_dmp { +__u64 subcmd; +__u64 buff_addr; +__u64 buff_len; +__u64 gaddr;/* For dump storage state */ +__u64 reserved[4 ]; +}; +enum pv_cmd_info_id {KVM_PV_INFO_VM ,KVM_PV_INFO_DUMP ,
@@ -1703,6 +1717,7 @@ enum pv_cmd_id {KVM_PV_PREP_RESET ,KVM_PV_UNSHARE_ALL ,KVM_PV_INFO , + KVM_PV_DUMP, }; struct kvm_pv_cmd {
Signature · 1 line
2.35.1
Christian Borntraeger
maintainer[GIT PULL 09/15] Documentation: virt: Protected virtual machine dumps
In reply to Christian BorntraegerFrom: Janosch Frank <[email protected]>
Let's add a documentation file which describes the dump process. Since we only copy the UV dump data from the UV to userspace we'll not go into detail here and let the party which processes the data describe its structure.
Message-Id: <[email protected]>
--- Documentation/virt/kvm/s390/index.rst | 1 + Documentation/virt/kvm/s390/s390-pv-dump.rst | 64 ++++++++++++++++++++ 2 files changed, 65 insertions(+) create mode 100644 Documentation/virt/kvm/s390/s390-pv-dump.rst
Documentation/virt/kvm/s390/index.rst +1 -0
@@ -10,3 +10,4 @@ KVM for s390 systems s390-diag s390-pv s390-pv-boot + s390-pv-dump
Documentation/virt/kvm/s390/s390-pv-dump.rst new file +64 -0
64 lines not on this page · raw message
Signature · 1 line
2.35.1
Christian Borntraeger
maintainer[GIT PULL 08/15] KVM: s390: Add KVM_CAP_S390_PROTECTED_DUMP
In reply to Christian BorntraegerFrom: Janosch Frank <[email protected]>
The capability indicates dump support for protected VMs.
Message-Id: <[email protected]>
--- arch/s390/kvm/kvm-s390.c | 20 ++++++++++++++++++++ include/uapi/linux/kvm.h | 1 + 2 files changed, 21 insertions(+)
arch/s390/kvm/kvm-s390.c +20 -0
@@ -606,6 +606,26 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)case KVM_CAP_S390_PROTECTED : r =is_prot_virt_host ();break ; +case KVM_CAP_S390_PROTECTED_DUMP : { +u64 pv_cmds_dump[] = { +BIT_UVC_CMD_DUMP_INIT , +BIT_UVC_CMD_DUMP_CONFIG_STOR_STATE , +BIT_UVC_CMD_DUMP_CPU , +BIT_UVC_CMD_DUMP_COMPLETE , + }; +int i; + + r =is_prot_virt_host (); + +for (i =0 ; i <ARRAY_SIZE (pv_cmds_dump); i++) { +if (!test_bit_inv (pv_cmds_dump[i], + (unsigned long *)&uv_info.inst_calls_list)) { + r =0 ; +break ; + } + } +break ; + }default : r =0 ; }
include/uapi/linux/kvm.h +1 -0
@@ -1157,6 +1157,7 @@ struct kvm_ppc_resize_hpt {#define KVM_CAP_VM_TSC_CONTROL 214#define KVM_CAP_SYSTEM_EVENT_DATA 215#define KVM_CAP_ARM_SYSTEM_SUSPEND 216 +#define KVM_CAP_S390_PROTECTED_DUMP 217#ifdef KVM_CAP_IRQ_ROUTING
Signature · 1 line
2.35.1
Christian Borntraeger
maintainer[GIT PULL 11/15] Documentation/virt/kvm/api.rst: Explain rc/rrc delivery
In reply to Christian BorntraegerFrom: Janosch Frank <[email protected]>
Let's explain in which situations the rc/rrc will set in struct kvm_pv_cmd so it's clear that the struct members should be set to
0. rc/rrc are independent of the IOCTL return code.
Message-Id: <[email protected]>
--- Documentation/virt/kvm/api.rst | 8 ++++++++ 1 file changed, 8 insertions(+)
Documentation/virt/kvm/api.rst +8 -0
@@ -5127,6 +5127,14 @@ into ESA mode. This reset is a superset of the initial reset. __u32 reserved[3]; }; +**Ultravisor return codes** +The Ultravisor return (reason) codes are provided by the kernel if a +Ultravisor call has been executed to achieve the results expected by +the command. Therefore they are independent of the IOCTL return +code. If KVM changes `rc`, its value will always be greater than 0 +hence setting it to 0 before issuing a PV command is advised to be +able to detect a change of `rc`. + **cmd values:** KVM_PV_ENABLE
Signature · 1 line
2.35.1
Christian Borntraeger
maintainer[GIT PULL 13/15] KVM: s390: selftests: Use TAP interface in the sync_regs test
In reply to Christian BorntraegerFrom: Thomas Huth <[email protected]>
The sync_regs test currently does not have any output (unless one of the TEST_ASSERT statement fails), so it's hard to say for a user whether a certain new sub-test has been included in the binary or not. Let's make this a little bit more user-friendly and include some TAP output via the kselftests.h interface.
To be able to distinguish the different sub-tests more easily, we also break up the huge main() function here in more fine grained parts.
--- .../selftests/kvm/s390x/sync_regs_test.c | 87 ++++++++++++++----- 1 file changed, 66 insertions(+), 21 deletions(-)
tools/testing/selftests/kvm/s390x/sync_regs_test.c +66 -21
@@ -21,6 +21,7 @@#include "test_util.h" #include "kvm_util.h" #include "diag318_test_handler.h" +#include "kselftest.h" #define VCPU_ID 5
@@ -74,27 +75,9 @@ static void compare_sregs(struct kvm_sregs *left, struct kvm_sync_regs *right)#define TEST_SYNC_FIELDS (KVM_SYNC_GPRS|KVM_SYNC_ACRS|KVM_SYNC_CRS|KVM_SYNC_DIAG318)#define INVALID_SYNC_FIELD 0x80000000 -int main (int argc,char *argv[]) +void test_read_invalid (struct kvm_vm *vm,struct kvm_run *run) { -struct kvm_vm *vm; -struct kvm_run *run; -struct kvm_regs regs; -struct kvm_sregs sregs; -int rv, cap; - -/* Tell stdout not to buffer its content */ -setbuf (stdout,NULL ); - - cap =kvm_check_cap (KVM_CAP_SYNC_REGS ); -if (!cap) { -print_skip ("CAP_SYNC_REGS not supported" ); -exit (KSFT_SKIP ); - } - -/* Create VM */ - vm =vm_create_default (VCPU_ID ,0 , guest_code); - - run =vcpu_state (vm,VCPU_ID ); +int rv;/* Request reading invalid register set from VCPU. */ run->kvm_valid_regs =INVALID_SYNC_FIELD ;
@@ -110,6 +93,11 @@ int main(int argc, char *argv[])"Invalid kvm_valid_regs did not cause expected KVM_RUN error: %d\n" , rv);vcpu_state (vm,VCPU_ID )->kvm_valid_regs =0 ; +} + +void test_set_invalid (struct kvm_vm *vm,struct kvm_run *run) +{ +int rv;/* Request setting invalid register set into VCPU. */ run->kvm_dirty_regs =INVALID_SYNC_FIELD ;
@@ -125,6 +113,13 @@ int main(int argc, char *argv[])"Invalid kvm_dirty_regs did not cause expected KVM_RUN error: %d\n" , rv);vcpu_state (vm,VCPU_ID )->kvm_dirty_regs =0 ; +} + +void test_req_and_verify_all_valid_regs (struct kvm_vm *vm,struct kvm_run *run) +{ +struct kvm_sregs sregs; +struct kvm_regs regs; +int rv;/* Request and verify all valid register sets. */ run->kvm_valid_regs =TEST_SYNC_FIELDS ;
@@ -146,6 +141,13 @@ int main(int argc, char *argv[])vcpu_sregs_get (vm,VCPU_ID , &sregs);compare_sregs (&sregs, &run->s.regs); +} + +void test_set_and_verify_various_reg_values (struct kvm_vm *vm,struct kvm_run *run) +{ +struct kvm_sregs sregs; +struct kvm_regs regs; +int rv;/* Set and verify various register values */ run->s.regs.gprs[11 ] =0xBAD1DEA ;
@@ -180,6 +182,11 @@ int main(int argc, char *argv[])vcpu_sregs_get (vm,VCPU_ID , &sregs);compare_sregs (&sregs, &run->s.regs); +} + +void test_clear_kvm_dirty_regs_bits (struct kvm_vm *vm,struct kvm_run *run) +{ +int rv;/* Clear kvm_dirty_regs bits, verify new s.regs values are * overwritten with existing guest values.
@@ -200,8 +207,46 @@ int main(int argc, char *argv[])TEST_ASSERT (run->s.regs.diag318 !=0x4B1D ,"diag318 sync regs value incorrect 0x%llx." , run->s.regs.diag318); +} + +struct testdef { +const char *name; +void (*test)(struct kvm_vm *vm,struct kvm_run *run); +} testlist[] = { + {"read invalid" , test_read_invalid }, + {"set invalid" , test_set_invalid }, + {"request+verify all valid regs" , test_req_and_verify_all_valid_regs }, + {"set+verify various regs" , test_set_and_verify_various_reg_values }, + {"clear kvm_dirty_regs bits" , test_clear_kvm_dirty_regs_bits }, +}; + +int main (int argc,char *argv[]) +{ +static struct kvm_run *run; +static struct kvm_vm *vm; +int idx; + +/* Tell stdout not to buffer its content */ +setbuf (stdout,NULL ); + +ksft_print_header (); + +if (!kvm_check_cap (KVM_CAP_SYNC_REGS )) +ksft_exit_skip ("CAP_SYNC_REGS not supported" ); + +ksft_set_plan (ARRAY_SIZE (testlist)); + +/* Create VM */ + vm =vm_create_default (VCPU_ID ,0 , guest_code); + + run =vcpu_state (vm,VCPU_ID ); + +for (idx =0 ; idx <ARRAY_SIZE (testlist); idx++) { + testlist[idx].test (vm, run); +ksft_test_result_pass ("%s\n" , testlist[idx].name); + }kvm_vm_free (vm); -return 0 ; +ksft_finished ();/* Print results and exit() accordingly */ }
Signature · 1 line
2.35.1
Christian Borntraeger
maintainer[GIT PULL 14/15] KVM: s390: selftests: Use TAP interface in the tprot test
In reply to Christian BorntraegerFrom: Thomas Huth <[email protected]>
The tprot test currently does not have any output (unless one of the TEST_ASSERT statement fails), so it's hard to say for a user whether a certain new sub-test has been included in the binary or not. Let's make this a little bit more user-friendly and include some TAP output via the kselftests.h interface.
--- tools/testing/selftests/kvm/s390x/tprot.c | 29 +++++++++++++++++++---- 1 file changed, 24 insertions(+), 5 deletions(-)
tools/testing/selftests/kvm/s390x/tprot.c +24 -5
@@ -8,6 +8,7 @@#include <sys/mman.h> #include "test_util.h" #include "kvm_util.h" +#include "kselftest.h" #define PAGE_SHIFT 12#define PAGE_SIZE (1 << PAGE_SHIFT)
@@ -63,12 +64,12 @@ static enum permission test_protection(void *addr, uint8_t key) }enum stage { -STAGE_END ,STAGE_INIT_SIMPLE ,TEST_SIMPLE ,STAGE_INIT_FETCH_PROT_OVERRIDE ,TEST_FETCH_PROT_OVERRIDE ,TEST_STORAGE_PROT_OVERRIDE , +STAGE_END /* must be the last entry (it's the amount of tests) */ };struct test {
@@ -182,7 +183,7 @@ static void guest_code(void)GUEST_SYNC (perform_next_stage (&i, mapped_0)); } -#define HOST_SYNC (vmp, stage) \ +#define HOST_SYNC_NO_TAP (vmp, stage) \ ({ \ struct kvm_vm *__vm = (vmp); \ struct ucall uc; \
@@ -198,12 +199,21 @@ static void guest_code(void)ASSERT_EQ (uc.args[1 ], __stage); \ }) +#define HOST_SYNC (vmp, stage) \ +({ \ + HOST_SYNC_NO_TAP(vmp, stage); \ + ksft_test_result_pass("" #stage "\n"); \ +}) +int main (int argc,char *argv[]) {struct kvm_vm *vm;struct kvm_run *run;vm_vaddr_t guest_0_page; +ksft_print_header (); +ksft_set_plan (STAGE_END ); + vm =vm_create_default (VCPU_ID ,0 , guest_code); run =vcpu_state (vm,VCPU_ID );
@@ -212,9 +222,14 @@ int main(int argc, char *argv[])HOST_SYNC (vm,TEST_SIMPLE ); guest_0_page =vm_vaddr_alloc (vm,PAGE_SIZE ,0 ); -if (guest_0_page !=0 ) -print_skip ("Did not allocate page at 0 for fetch protection override tests" ); -HOST_SYNC (vm,STAGE_INIT_FETCH_PROT_OVERRIDE ); +if (guest_0_page !=0 ) { +/* Use NO_TAP so we don't get a PASS print */ +HOST_SYNC_NO_TAP (vm,STAGE_INIT_FETCH_PROT_OVERRIDE ); +ksft_test_result_skip ("STAGE_INIT_FETCH_PROT_OVERRIDE - " +"Did not allocate page at 0\n" ); + }else { +HOST_SYNC (vm,STAGE_INIT_FETCH_PROT_OVERRIDE ); + }if (guest_0_page ==0 )mprotect (addr_gva2hva (vm, (vm_vaddr_t )0 ),PAGE_SIZE ,PROT_READ ); run->s.regs.crs[0 ] |=CR0_FETCH_PROTECTION_OVERRIDE ;
@@ -224,4 +239,8 @@ int main(int argc, char *argv[]) run->s.regs.crs[0 ] |=CR0_STORAGE_PROTECTION_OVERRIDE ; run->kvm_dirty_regs =KVM_SYNC_CRS ;HOST_SYNC (vm,TEST_STORAGE_PROT_OVERRIDE ); + +kvm_vm_free (vm); + +ksft_finished ();/* Print results and exit() accordingly */ }
Signature · 1 line
2.35.1
Christian Borntraeger
maintainer[GIT PULL 07/15] KVM: s390: Add CPU dump functionality
In reply to Christian BorntraegerFrom: Janosch Frank <[email protected]>
The previous patch introduced the per-VM dump functions now let's focus on dumping the VCPU state via the newly introduced KVM_S390_PV_CPU_COMMAND ioctl which mirrors the VM UV ioctl and can be extended with new commands later.
Message-Id: <[email protected]>
--- arch/s390/kvm/kvm-s390.c | 69 ++++++++++++++++++++++++++++++++++++++++ arch/s390/kvm/kvm-s390.h | 1 + arch/s390/kvm/pv.c | 16 ++++++++++ include/uapi/linux/kvm.h | 4 +++ 4 files changed, 90 insertions(+)
arch/s390/kvm/kvm-s390.c +69 -0
@@ -5096,6 +5096,48 @@ long kvm_arch_vcpu_async_ioctl(struct file *filp,return -ENOIOCTLCMD ; } +static int kvm_s390_handle_pv_vcpu_dump (struct kvm_vcpu *vcpu, +struct kvm_pv_cmd *cmd) +{ +struct kvm_s390_pv_dmp dmp; +void *data; +int ret; + +/* Dump initialization is a prerequisite */ +if (!vcpu->kvm->arch.pv.dumping) +return -EINVAL ; + +if (copy_from_user (&dmp, (__u8 __user *)cmd->data,sizeof (dmp))) +return -EFAULT ; + +/* We only handle this subcmd right now */ +if (dmp.subcmd !=KVM_PV_DUMP_CPU ) +return -EINVAL ; + +/* CPU dump length is the same as create cpu storage donation. */ +if (dmp.buff_len != uv_info.guest_cpu_stor_len) +return -EINVAL ; + + data =kvzalloc (uv_info.guest_cpu_stor_len,GFP_KERNEL ); +if (!data) +return -ENOMEM ; + + ret =kvm_s390_pv_dump_cpu (vcpu, data, &cmd->rc, &cmd->rrc); + +VCPU_EVENT (vcpu,3 ,"PROTVIRT DUMP CPU %d rc %x rrc %x" , + vcpu->vcpu_id, cmd->rc, cmd->rrc); + +if (ret) + ret = -EINVAL ; + +/* On success copy over the dump data */ +if (!ret &©_to_user ((__u8 __user *)dmp.buff_addr, data, uv_info.guest_cpu_stor_len)) + ret = -EFAULT ; + +kvfree (data); +return ret; +} +long kvm_arch_vcpu_ioctl (struct file *filp,unsigned int ioctl,unsigned long arg) {
@@ -5260,6 +5302,33 @@ long kvm_arch_vcpu_ioctl(struct file *filp, irq_state.len);break ; } +case KVM_S390_PV_CPU_COMMAND : { +struct kvm_pv_cmd cmd; + + r = -EINVAL ; +if (!is_prot_virt_host ()) +break ; + + r = -EFAULT ; +if (copy_from_user (&cmd, argp,sizeof (cmd))) +break ; + + r = -EINVAL ; +if (cmd.flags) +break ; + +/* We only handle this cmd right now */ +if (cmd.cmd !=KVM_PV_DUMP ) +break ; + + r =kvm_s390_handle_pv_vcpu_dump (vcpu, &cmd); + +/* Always copy over UV rc / rrc data */ +if (copy_to_user ((__u8 __user *)argp, &cmd.rc, +sizeof (cmd.rc) +sizeof (cmd.rrc))) + r = -EFAULT ; +break ; + }default : r = -ENOTTY ; }
arch/s390/kvm/kvm-s390.h +1 -0
@@ -250,6 +250,7 @@ int kvm_s390_pv_set_sec_parms(struct kvm *kvm, void *hdr, u64 length, u16 *rc,int kvm_s390_pv_unpack (struct kvm *kvm,unsigned long addr,unsigned long size,unsigned long tweak,u16 *rc,u16 *rrc);int kvm_s390_pv_set_cpu_state (struct kvm_vcpu *vcpu,u8 state); +int kvm_s390_pv_dump_cpu (struct kvm_vcpu *vcpu,void *buff,u16 *rc,u16 *rrc);int kvm_s390_pv_dump_stor_state (struct kvm *kvm,void __user *buff_user,u64 *gaddr,u64 buff_user_len,u16 *rc,u16 *rrc); int kvm_s390_pv_dump_complete(struct kvm *kvm, void __user *buff_user,
arch/s390/kvm/pv.c +16 -0
@@ -300,6 +300,22 @@ int kvm_s390_pv_set_cpu_state(struct kvm_vcpu *vcpu, u8 state)return 0 ; } +int kvm_s390_pv_dump_cpu (struct kvm_vcpu *vcpu,void *buff,u16 *rc,u16 *rrc) +{ +struct uv_cb_dump_cpu uvcb = { + .header.cmd =UVC_CMD_DUMP_CPU , + .header.len =sizeof (uvcb), + .cpu_handle = vcpu->arch.pv.handle, + .dump_area_origin = (u64 )buff, + }; +int cc; + + cc =uv_call_sched (0 , (u64)&uvcb); + *rc = uvcb.header.rc; + *rrc = uvcb.header.rrc; +return cc; +} +/* Size of the cache for the storage state dump data. 1MB for now */ #define DUMP_BUFF_LEN HPAGE_SIZE
include/uapi/linux/kvm.h +4 -0
@@ -1664,6 +1664,7 @@ enum pv_cmd_dmp_id {KVM_PV_DUMP_INIT ,KVM_PV_DUMP_CONFIG_STOR_STATE ,KVM_PV_DUMP_COMPLETE , + KVM_PV_DUMP_CPU, }; struct kvm_s390_pv_dmp {
@@ -2168,4 +2169,7 @@ struct kvm_stats_desc {/* Available with KVM_CAP_XSAVE2 */ #define KVM_GET_XSAVE2 _IOR(KVMIO, 0xcf, struct kvm_xsave) +/* Available with KVM_CAP_S390_PROTECTED_DUMP */ +#define KVM_S390_PV_CPU_COMMAND _IOWR(KVMIO, 0xd0, struct kvm_pv_cmd) +#endif /* __LINUX_KVM_H */
Signature · 1 line
2.35.1
Christian Borntraeger
maintainer[GIT PULL 10/15] Documentation/virt/kvm/api.rst: Add protvirt dump/info api descriptions
In reply to Christian BorntraegerFrom: Janosch Frank <[email protected]>
Time to add the dump API changes to the api documentation file. Also some minor cleanup.
Message-Id: <[email protected]>
--- Documentation/virt/kvm/api.rst | 154 ++++++++++++++++++++++++++++++++- 1 file changed, 152 insertions(+), 2 deletions(-)
Documentation/virt/kvm/api.rst +152 -2
@@ -5127,7 +5127,7 @@ into ESA mode. This reset is a superset of the initial reset. __u32 reserved[3]; }; -cmd values: +**cmd values:** KVM_PV_ENABLE Allocate memory and register the VM with the Ultravisor, thereby
@@ -5143,7 +5143,6 @@ KVM_PV_ENABLE ===== ============================= KVM_PV_DISABLE - Deregister the VM from the Ultravisor and reclaim the memory that had been donated to the Ultravisor, making it usable by the kernel again. All registered VCPUs are converted back to non-protected
@@ -5160,6 +5159,117 @@ KVM_PV_VM_VERIFY Verify the integrity of the unpacked image. Only if this succeeds, KVM is allowed to start protected VCPUs. +KVM_PV_INFO + :Capability: KVM_CAP_S390_PROTECTED_DUMP + + Presents an API that provides Ultravisor related data to userspace + via subcommands. len_max is the size of the user space buffer, + len_written is KVM's indication of how much bytes of that buffer + were actually written to. len_written can be used to determine the + valid fields if more response fields are added in the future. + + :: + + enum pv_cmd_info_id { + KVM_PV_INFO_VM, + KVM_PV_INFO_DUMP, + }; + + struct kvm_s390_pv_info_header { + __u32 id; + __u32 len_max; + __u32 len_written; + __u32 reserved; + }; + + struct kvm_s390_pv_info { + struct kvm_s390_pv_info_header header; + struct kvm_s390_pv_info_dump dump; + struct kvm_s390_pv_info_vm vm; + }; + +**subcommands:** + + KVM_PV_INFO_VM + This subcommand provides basic Ultravisor information for PV + hosts. These values are likely also exported as files in the sysfs + firmware UV query interface but they are more easily available to + programs in this API. + + The installed calls and feature_indication members provide the + installed UV calls and the UV's other feature indications. + + The max_* members provide information about the maximum number of PV + vcpus, PV guests and PV guest memory size. + + :: + + struct kvm_s390_pv_info_vm { + __u64 inst_calls_list[4]; + __u64 max_cpus; + __u64 max_guests; + __u64 max_guest_addr; + __u64 feature_indication; + }; + + + KVM_PV_INFO_DUMP + This subcommand provides information related to dumping PV guests. + + :: + + struct kvm_s390_pv_info_dump { + __u64 dump_cpu_buffer_len; + __u64 dump_config_mem_buffer_per_1m; + __u64 dump_config_finalize_len; + }; + +KVM_PV_DUMP + :Capability: KVM_CAP_S390_PROTECTED_DUMP + + Presents an API that provides calls which facilitate dumping a + protected VM. + + :: + + struct kvm_s390_pv_dmp { + __u64 subcmd; + __u64 buff_addr; + __u64 buff_len; + __u64 gaddr; /* For dump storage state */ + }; + + **subcommands:** + + KVM_PV_DUMP_INIT + Initializes the dump process of a protected VM. If this call does + not succeed all other subcommands will fail with -EINVAL. This + subcommand will return -EINVAL if a dump process has not yet been + completed. + + Not all PV vms can be dumped, the owner needs to set `dump + allowed` PCF bit 34 in the SE header to allow dumping. + + KVM_PV_DUMP_CONFIG_STOR_STATE + Stores `buff_len` bytes of tweak component values starting with + the 1MB block specified by the absolute guest address + (`gaddr`). `buff_len` needs to be `conf_dump_storage_state_len` + aligned and at least >= the `conf_dump_storage_state_len` value + provided by the dump uv_info data. buff_user might be written to + even if an error rc is returned. For instance if we encounter a + fault after writing the first page of data. + + KVM_PV_DUMP_COMPLETE + If the subcommand succeeds it completes the dump process and lets + KVM_PV_DUMP_INIT be called again. + + On success `conf_dump_finalize_len` bytes of completion data will be + stored to the `buff_addr`. The completion data contains a key + derivation seed, IV, tweak nonce and encryption keys as well as an + authentication tag all of which are needed to decrypt the dump at a + later time. + + 4.126 KVM_X86_SET_MSR_FILTER ----------------------------
@@ -5802,6 +5912,32 @@ of CPUID leaf 0xD on the host. This ioctl injects an event channel interrupt directly to the guest vCPU. +4.136 KVM_S390_PV_CPU_COMMAND +----------------------------- + +:Capability: KVM_CAP_S390_PROTECTED_DUMP +:Architectures: s390 +:Type: vcpu ioctl +:Parameters: none +:Returns: 0 on success, < 0 on error + +This ioctl closely mirrors `KVM_S390_PV_COMMAND` but handles requests +for vcpus. It re-uses the kvm_s390_pv_dmp struct and hence also shares +the command ids. + +**command:** + +KVM_PV_DUMP + Presents an API that provides calls which facilitate dumping a vcpu + of a protected VM. + +**subcommand:** + +KVM_PV_DUMP_CPU + Provides encrypted dump data like register values. + The length of the returned data is provided by uv_info.guest_cpu_stor_len. + + 5. The kvm_run structure ========================
@@ -7954,6 +8090,20 @@ should adjust CPUID leaf 0xA to reflect that the PMU is disabled. When enabled, KVM will exit to userspace with KVM_EXIT_SYSTEM_EVENT of type KVM_SYSTEM_EVENT_SUSPEND to process the guest suspend request. +8.37 KVM_CAP_S390_PROTECTED_DUMP +-------------------------------- + +:Capability: KVM_CAP_S390_PROTECTED_DUMP +:Architectures: s390 +:Type: vm + +This capability indicates that KVM and the Ultravisor support dumping +PV guests. The `KVM_PV_DUMP` command is available for the +`KVM_S390_PV_COMMAND` ioctl and the `KVM_PV_INFO` command provides +dump related UV data. Also the vcpu ioctl `KVM_S390_PV_CPU_COMMAND` is +available and supports the `KVM_PV_DUMP_CPU` subcommand. + + 9. Known KVM API problems =========================
Signature · 1 line
2.35.1
Christian Borntraeger
maintainer[GIT PULL 12/15] KVM: s390: selftests: Use TAP interface in the memop test
In reply to Christian BorntraegerFrom: Thomas Huth <[email protected]>
The memop test currently does not have any output (unless one of the TEST_ASSERT statement fails), so it's hard to say for a user whether a certain new sub-test has been included in the binary or not. Let's make this a little bit more user-friendly and include some TAP output via the kselftests.h interface.
--- tools/testing/selftests/kvm/s390x/memop.c | 97 ++++++++++++++++++----- 1 file changed, 78 insertions(+), 19 deletions(-)
tools/testing/selftests/kvm/s390x/memop.c +78 -19
@@ -14,6 +14,7 @@#include "test_util.h" #include "kvm_util.h" +#include "kselftest.h" enum mop_target {LOGICAL ,
@@ -691,34 +692,92 @@ static void test_errors(void)kvm_vm_free (t.kvm_vm); } +struct testdef { +const char *name; +void (*test)(void ); +int extension; +} testlist[] = { + { + .name ="simple copy" , + .test = test_copy, + }, + { + .name ="generic error checks" , + .test = test_errors, + }, + { + .name ="copy with storage keys" , + .test = test_copy_key, + .extension =1 , + }, + { + .name ="copy with key storage protection override" , + .test = test_copy_key_storage_prot_override, + .extension =1 , + }, + { + .name ="copy with key fetch protection" , + .test = test_copy_key_fetch_prot, + .extension =1 , + }, + { + .name ="copy with key fetch protection override" , + .test = test_copy_key_fetch_prot_override, + .extension =1 , + }, + { + .name ="error checks with key" , + .test = test_errors_key, + .extension =1 , + }, + { + .name ="termination" , + .test = test_termination, + .extension =1 , + }, + { + .name ="error checks with key storage protection override" , + .test = test_errors_key_storage_prot_override, + .extension =1 , + }, + { + .name ="error checks without key fetch prot override" , + .test = test_errors_key_fetch_prot_override_not_enabled, + .extension =1 , + }, + { + .name ="error checks with key fetch prot override" , + .test = test_errors_key_fetch_prot_override_enabled, + .extension =1 , + }, +}; +int main (int argc,char *argv[]) { -int memop_cap, extension_cap; +int memop_cap, extension_cap, idx;setbuf (stdout,NULL );/* Tell stdout not to buffer its content */ +ksft_print_header (); + memop_cap =kvm_check_cap (KVM_CAP_S390_MEM_OP ); extension_cap =kvm_check_cap (KVM_CAP_S390_MEM_OP_EXTENSION );if (!memop_cap) { -print_skip ("CAP_S390_MEM_OP not supported" ); -exit (KSFT_SKIP ); +ksft_exit_skip ("CAP_S390_MEM_OP not supported.\n" ); } -test_copy (); -if (extension_cap >0 ) { -test_copy_key (); -test_copy_key_storage_prot_override (); -test_copy_key_fetch_prot (); -test_copy_key_fetch_prot_override (); -test_errors_key (); -test_termination (); -test_errors_key_storage_prot_override (); -test_errors_key_fetch_prot_override_not_enabled (); -test_errors_key_fetch_prot_override_enabled (); - }else { -print_skip ("storage key memop extension not supported" ); - } -test_errors (); +ksft_set_plan (ARRAY_SIZE (testlist)); -return 0 ; +for (idx =0 ; idx <ARRAY_SIZE (testlist); idx++) { +if (testlist[idx].extension >= extension_cap) { + testlist[idx].test (); +ksft_test_result_pass ("%s\n" , testlist[idx].name); + }else { +ksft_test_result_skip ("%s - extension level %d not supported\n" , + testlist[idx].name, + testlist[idx].extension); + } + } + +ksft_finished ();/* Print results and exit() accordingly */ }
Signature · 1 line
2.35.1
Christian Borntraeger
maintainer[GIT PULL 15/15] KVM: s390: selftests: Use TAP interface in the reset test
In reply to Christian BorntraegerFrom: Thomas Huth <[email protected]>
Let's standardize the s390x KVM selftest output to the TAP output generated via the kselftests.h interface.
--- tools/testing/selftests/kvm/s390x/resets.c | 38 +++++++++++++++++----- 1 file changed, 30 insertions(+), 8 deletions(-)
tools/testing/selftests/kvm/s390x/resets.c +30 -8
@@ -12,6 +12,7 @@#include "test_util.h" #include "kvm_util.h" +#include "kselftest.h" #define VCPU_ID 3#define LOCAL_IRQS 32
@@ -202,7 +203,7 @@ static void inject_irq(int cpu_id)static void test_normal (void ) { -pr_info ("Testing normal reset\n" ); +ksft_print_msg ("Testing normal reset\n" );/* Create VM */ vm =vm_create_default (VCPU_ID ,0 , guest_code_initial); run =vcpu_state (vm,VCPU_ID );
@@ -225,7 +226,7 @@ static void test_normal(void)static void test_initial (void ) { -pr_info ("Testing initial reset\n" ); +ksft_print_msg ("Testing initial reset\n" ); vm =vm_create_default (VCPU_ID ,0 , guest_code_initial); run =vcpu_state (vm,VCPU_ID ); sync_regs = &run->s.regs;
@@ -247,7 +248,7 @@ static void test_initial(void)static void test_clear (void ) { -pr_info ("Testing clear reset\n" ); +ksft_print_msg ("Testing clear reset\n" ); vm =vm_create_default (VCPU_ID ,0 , guest_code_initial); run =vcpu_state (vm,VCPU_ID ); sync_regs = &run->s.regs;
@@ -266,14 +267,35 @@ static void test_clear(void)kvm_vm_free (vm); } +struct testdef { +const char *name; +void (*test)(void ); +bool needs_cap; +} testlist[] = { + {"initial" , test_initial, false }, + {"normal" , test_normal, true }, + {"clear" , test_clear, true }, +}; +int main (int argc,char *argv[]) { +bool has_s390_vcpu_resets =kvm_check_cap (KVM_CAP_S390_VCPU_RESETS ); +int idx; +setbuf (stdout,NULL );/* Tell stdout not to buffer its content */ -test_initial (); -if (kvm_check_cap (KVM_CAP_S390_VCPU_RESETS )) { -test_normal (); -test_clear (); +ksft_print_header (); +ksft_set_plan (ARRAY_SIZE (testlist)); + +for (idx =0 ; idx <ARRAY_SIZE (testlist); idx++) { +if (!testlist[idx].needs_cap || has_s390_vcpu_resets) { + testlist[idx].test (); +ksft_test_result_pass ("%s\n" , testlist[idx].name); + }else { +ksft_test_result_skip ("%s - no VCPU_RESETS capability\n" , + testlist[idx].name); + } } -return 0 ; + +ksft_finished ();/* Print results and exit() accordingly */ }
Signature · 1 line
2.35.1
Paolo Bonzini
maintainerQuoted 1 line · Christian Borntraeger
git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git tags/kvm-s390-next-5.19-2
Pulled now, thanks.
Paolo