s390/uvdevice: Expose secret UVCs
v4 cover s390/uvdevice: Expose secret UVCs
IBM Secure Execution guests may want to inject secrets into the Ultravisor(UV). Also they should be able to know which secrets the UV possesses and prevent the further addition of more secrets.
Therefore, add three new Ultravisor-Calls and expose them via the uvdevice: Add Secret, List Secrets, and Lock Secrets. The uvdevice still acts as the messenger only and does not inspect or modify the requests. Only some sanity checks are made to prevent the kernel from corruption.
Also add a new IOCTL to get information about the supported UV-calls of the uvdevice. As userspace wants to know which secrets, types, etc. are supported expose the corresponding UV Query info data to userspace via sysfs.
The series contains:
* A new info IOCTL, giving information about the capabilities of the uvdevice and UV
* 3 patches adding new Ultravisor-Calls and expose them to userspace
* A patch replacing scnprintf with sysfs_emit in arch/s390/kernel/uv.c
* A patch with an Ultravisor Query Info update for the new secret related information
Changes for v4:
* more nits from Janosch
Changes for v3:
* misc nits from Janosch
Changes for v2:
* use __set_bit instead of the atomic set_bit (Heiko)
* add a patch for replacing scnprintf with sysfs_emit in arch/s390/kernel/uv.c (Heiko)
* use scnprintf instead of sysfs_emit for the new sysfs entries in the last patch (Heiko)
* use hex values in struct definitions (Claudio)
Steffen
Steffen Eiden (6):
s390/uvdevice: Add info IOCTL
s390/uvdevice: Add 'Add Secret' UVC
s390/uvdevice: Add 'List Secrets' UVC
s390/uvdevice: Add 'Lock Secret Store' UVC
s390/uv: replace scnprintf with sysfs_emit
s390/uv: Update query for secret-UVCs
arch/s390/boot/uv.c | 4 + arch/s390/include/asm/uv.h | 32 +++- arch/s390/include/uapi/asm/uvdevice.h | 53 +++++- arch/s390/kernel/uv.c | 98 +++++++---- drivers/s390/char/uvdevice.c | 231 +++++++++++++++++++++++++- 5 files changed, 376 insertions(+), 42 deletions(-)
Signature · 1 line
2.40.1
PATCH v4 1/6 s390/uvdevice: Add info IOCTL
Add an IOCTL that allows userspace to find out which IOCTLs the uvdevice supports without trial and error.
Explicitly expose the IOCTL nr for the request types.
--- arch/s390/include/uapi/asm/uvdevice.h | 42 ++++++++++++++- drivers/s390/char/uvdevice.c | 77 ++++++++++++++++++++++++--- 2 files changed, 111 insertions(+), 8 deletions(-)
arch/s390/include/uapi/asm/uvdevice.h +41 -1
@@ -32,6 +32,33 @@ struct uvio_attest {__u16 reserved136;/* 0x0136 */ }; +/** +* uvio_uvdev_info - Information of supported functions +* @supp_uvio_cmds - supported IOCTLs by this device +* @supp_uv_cmds - supported UVCs corresponding to the IOCTL +* +* UVIO request to get information about supported request types by this +* uvdevice and the Ultravisor. Everything is output. Bits are in LSB0 +* ordering. If the bit is set in both, @supp_uvio_cmds and @supp_uv_cmds, the +* uvdevice and the Ultravisor support that call. +* +* Note that bit 0 (UVIO_IOCTL_UVDEV_INFO_NR) is always zero for `supp_uv_cmds` +* as there is no corresponding UV-call. +*/ +struct uvio_uvdev_info { +/* +* If bit `n` is set, this device supports the IOCTL with nr `n`. +*/ +__u64 supp_uvio_cmds; +/* +* If bit `n` is set, the Ultravisor(UV) supports the UV-call +* corresponding to the IOCTL with nr `n` in the calling contextx (host +* or guest). The value is only valid if the corresponding bit in +* @supp_uvio_cmds is set as well. +*/ +__u64 supp_uv_cmds; +}; +/* * The following max values define an upper length for the IOCTL in/out buffers. * However, they do not represent the maximum the Ultravisor allows which is
@@ -46,6 +73,19 @@ struct uvio_attest {#define UVIO_DEVICE_NAME "uv"#define UVIO_TYPE_UVC 'u' -#define UVIO_IOCTL_ATT _IOWR(UVIO_TYPE_UVC, 0x01, struct uvio_ioctl_cb) +enum UVIO_IOCTL_NR { +UVIO_IOCTL_UVDEV_INFO_NR =0x00 , +UVIO_IOCTL_ATT_NR , +/* must be the last entry */ +UVIO_IOCTL_NUM_IOCTLS +}; + +#define UVIO_IOCTL (nr) _IOWR(UVIO_TYPE_UVC, nr, struct uvio_ioctl_cb) +#define UVIO_IOCTL_UVDEV_INFO UVIO_IOCTL(UVIO_IOCTL_UVDEV_INFO_NR) +#define UVIO_IOCTL_ATT UVIO_IOCTL(UVIO_IOCTL_ATT_NR) + +#define UVIO_SUPP_CALL (nr) (1ULL << (nr)) +#define UVIO_SUPP_UDEV_INFO UVIO_SUPP_CALL(UVIO_IOCTL_UDEV_INFO_NR) +#define UVIO_SUPP_ATT UVIO_SUPP_CALL(UVIO_IOCTL_ATT_NR)#endif /* __S390_ASM_UVDEVICE_H */
drivers/s390/char/uvdevice.c +70 -7
109 lines not on this page · raw message
Signature · 1 line
2.40.1
PATCH v4 2/6 s390/uvdevice: Add 'Add Secret' UVC
In reply to Steffen EidenUserspace can call the Add Secret Ultravisor Call using IOCTLs on the uvdevice. The Add Secret UV call sends an encrypted and cryptographically verified request to the Ultravisor. The request inserts a protected guest's secret into the Ultravisor for later use.
The uvdevice is merely transporting the request from userspace to the Ultravisor. It's neither checking nor manipulating the request data.
--- arch/s390/include/asm/uv.h | 14 ++++++ arch/s390/include/uapi/asm/uvdevice.h | 4 ++ drivers/s390/char/uvdevice.c | 63 +++++++++++++++++++++++++++ 3 files changed, 81 insertions(+)
arch/s390/include/asm/uv.h +14 -0
@@ -58,6 +58,7 @@#define UVC_CMD_SET_SHARED_ACCESS 0x1000#define UVC_CMD_REMOVE_SHARED_ACCESS 0x1001#define UVC_CMD_RETR_ATTEST 0x1020 +#define UVC_CMD_ADD_SECRET 0x1031/* Bits in installed uv calls */ enum uv_cmds_inst {
@@ -88,6 +89,7 @@ enum uv_cmds_inst {BIT_UVC_CMD_DUMP_CPU =26 ,BIT_UVC_CMD_DUMP_COMPLETE =27 ,BIT_UVC_CMD_RETR_ATTEST =28 , + BIT_UVC_CMD_ADD_SECRET = 29, }; enum uv_feat_ind {
@@ -292,6 +294,18 @@ struct uv_cb_dump_complete {u64 reserved30[5 ]; } __packed__aligned(8) ; +/* +* A common UV call struct for pv guests that contains a single address +* Examples: +* Add Secret +*/ +struct uv_cb_guest_addr { +struct uv_cb_header header; +u64 reserved08[3 ]; +u64 addr; +u64 reserved28[4 ]; +} __packed__aligned(8) ; +static inline int __uv_call (unsigned long r1,unsigned long r2) {int cc;
arch/s390/include/uapi/asm/uvdevice.h +4 -0
@@ -69,6 +69,7 @@ struct uvio_uvdev_info {#define UVIO_ATT_ARCB_MAX_LEN 0x100000#define UVIO_ATT_MEASUREMENT_MAX_LEN 0x8000#define UVIO_ATT_ADDITIONAL_MAX_LEN 0x8000 +#define UVIO_ADD_SECRET_MAX_LEN 0x100000#define UVIO_DEVICE_NAME "uv"#define UVIO_TYPE_UVC 'u'
@@ -76,6 +77,7 @@ struct uvio_uvdev_info {enum UVIO_IOCTL_NR {UVIO_IOCTL_UVDEV_INFO_NR =0x00 ,UVIO_IOCTL_ATT_NR , +UVIO_IOCTL_ADD_SECRET_NR ,/* must be the last entry */ UVIO_IOCTL_NUM_IOCTLS };
@@ -83,9 +85,11 @@ enum UVIO_IOCTL_NR {#define UVIO_IOCTL (nr) _IOWR(UVIO_TYPE_UVC, nr, struct uvio_ioctl_cb)#define UVIO_IOCTL_UVDEV_INFO UVIO_IOCTL(UVIO_IOCTL_UVDEV_INFO_NR)#define UVIO_IOCTL_ATT UVIO_IOCTL(UVIO_IOCTL_ATT_NR) +#define UVIO_IOCTL_ADD_SECRET UVIO_IOCTL(UVIO_IOCTL_ADD_SECRET_NR)#define UVIO_SUPP_CALL (nr) (1ULL << (nr))#define UVIO_SUPP_UDEV_INFO UVIO_SUPP_CALL(UVIO_IOCTL_UDEV_INFO_NR)#define UVIO_SUPP_ATT UVIO_SUPP_CALL(UVIO_IOCTL_ATT_NR) +#define UVIO_SUPP_ADD_SECRET UVIO_SUPP_CALL(UVIO_IOCTL_ADD_SECRET_NR)#endif /* __S390_ASM_UVDEVICE_H */
drivers/s390/char/uvdevice.c +63 -0
81 lines not on this page · raw message
Signature · 1 line
2.40.1
Re: [PATCH v4 2/6] s390/uvdevice: Add 'Add Secret' UVC
Quoted 9 lines · Steffen Eiden
Userspace can call the Add Secret Ultravisor Call using IOCTLs on the uvdevice. The Add Secret UV call sends an encrypted and cryptographically verified request to the Ultravisor. The request inserts a protected guest's secret into the Ultravisor for later use.
The uvdevice is merely transporting the request from userspace to the Ultravisor. It's neither checking nor manipulating the request data.
Signed-off-by Steffen Eiden <[email protected]>
PATCH v4 3/6 s390/uvdevice: Add 'List Secrets' UVC
In reply to Steffen EidenUserspace can call the List Secrets Ultravisor Call using IOCTLs on the uvdevice. The List Secrets UV call lists the identifier of the secrets in the UV secret store.
The uvdevice is merely transporting the request from userspace to Ultravisor. It's neither checking nor manipulating the request or response data.
--- arch/s390/include/asm/uv.h | 3 ++ arch/s390/include/uapi/asm/uvdevice.h | 4 +++ drivers/s390/char/uvdevice.c | 52 +++++++++++++++++++++++++++ 3 files changed, 59 insertions(+)
arch/s390/include/asm/uv.h +3 -0
@@ -59,6 +59,7 @@#define UVC_CMD_REMOVE_SHARED_ACCESS 0x1001#define UVC_CMD_RETR_ATTEST 0x1020#define UVC_CMD_ADD_SECRET 0x1031 +#define UVC_CMD_LIST_SECRETS 0x1033/* Bits in installed uv calls */ enum uv_cmds_inst {
@@ -90,6 +91,7 @@ enum uv_cmds_inst {BIT_UVC_CMD_DUMP_COMPLETE =27 ,BIT_UVC_CMD_RETR_ATTEST =28 ,BIT_UVC_CMD_ADD_SECRET =29 , + BIT_UVC_CMD_LIST_SECRETS = 30, }; enum uv_feat_ind {
@@ -298,6 +300,7 @@ struct uv_cb_dump_complete {* A common UV call struct for pv guests that contains a single address * Examples: * Add Secret +* List Secrets */ struct uv_cb_guest_addr {struct uv_cb_header header;
arch/s390/include/uapi/asm/uvdevice.h +4 -0
@@ -70,6 +70,7 @@ struct uvio_uvdev_info {#define UVIO_ATT_MEASUREMENT_MAX_LEN 0x8000#define UVIO_ATT_ADDITIONAL_MAX_LEN 0x8000#define UVIO_ADD_SECRET_MAX_LEN 0x100000 +#define UVIO_LIST_SECRETS_LEN 0x1000#define UVIO_DEVICE_NAME "uv"#define UVIO_TYPE_UVC 'u'
@@ -78,6 +79,7 @@ enum UVIO_IOCTL_NR {UVIO_IOCTL_UVDEV_INFO_NR =0x00 ,UVIO_IOCTL_ATT_NR ,UVIO_IOCTL_ADD_SECRET_NR , +UVIO_IOCTL_LIST_SECRETS_NR ,/* must be the last entry */ UVIO_IOCTL_NUM_IOCTLS };
@@ -86,10 +88,12 @@ enum UVIO_IOCTL_NR {#define UVIO_IOCTL_UVDEV_INFO UVIO_IOCTL(UVIO_IOCTL_UVDEV_INFO_NR)#define UVIO_IOCTL_ATT UVIO_IOCTL(UVIO_IOCTL_ATT_NR)#define UVIO_IOCTL_ADD_SECRET UVIO_IOCTL(UVIO_IOCTL_ADD_SECRET_NR) +#define UVIO_IOCTL_LIST_SECRETS UVIO_IOCTL(UVIO_IOCTL_LIST_SECRETS_NR)#define UVIO_SUPP_CALL (nr) (1ULL << (nr))#define UVIO_SUPP_UDEV_INFO UVIO_SUPP_CALL(UVIO_IOCTL_UDEV_INFO_NR)#define UVIO_SUPP_ATT UVIO_SUPP_CALL(UVIO_IOCTL_ATT_NR)#define UVIO_SUPP_ADD_SECRET UVIO_SUPP_CALL(UVIO_IOCTL_ADD_SECRET_NR) +#define UVIO_SUPP_LIST_SECRETS UVIO_SUPP_CALL(UVIO_IOCTL_LIST_SECRETS_NR)#endif /* __S390_ASM_UVDEVICE_H */
drivers/s390/char/uvdevice.c +52 -0
70 lines not on this page · raw message
Signature · 1 line
2.40.1
Re: [PATCH v4 3/6] s390/uvdevice: Add 'List Secrets' UVC
Quoted 9 lines · Steffen Eiden
Userspace can call the List Secrets Ultravisor Call using IOCTLs on the uvdevice. The List Secrets UV call lists the identifier of the secrets in the UV secret store.
The uvdevice is merely transporting the request from userspace to Ultravisor. It's neither checking nor manipulating the request or response data.
Signed-off-by Steffen Eiden <[email protected]>
PATCH v4 4/6 s390/uvdevice: Add 'Lock Secret Store' UVC
In reply to Steffen EidenUserspace can call the Lock Secret Store Ultravisor Call using IOCTLs on the uvdevice. The Lock Secret Store UV call disables all additions of secrets for the future.
The uvdevice is merely transporting the request from userspace to the Ultravisor.
--- arch/s390/include/asm/uv.h | 2 ++ arch/s390/include/uapi/asm/uvdevice.h | 3 +++ drivers/s390/char/uvdevice.c | 39 +++++++++++++++++++++++++++ 3 files changed, 44 insertions(+)
arch/s390/include/asm/uv.h +2 -0
@@ -60,6 +60,7 @@#define UVC_CMD_RETR_ATTEST 0x1020#define UVC_CMD_ADD_SECRET 0x1031#define UVC_CMD_LIST_SECRETS 0x1033 +#define UVC_CMD_LOCK_SECRETS 0x1034/* Bits in installed uv calls */ enum uv_cmds_inst {
@@ -92,6 +93,7 @@ enum uv_cmds_inst {BIT_UVC_CMD_RETR_ATTEST =28 ,BIT_UVC_CMD_ADD_SECRET =29 ,BIT_UVC_CMD_LIST_SECRETS =30 , + BIT_UVC_CMD_LOCK_SECRETS = 31, }; enum uv_feat_ind {
arch/s390/include/uapi/asm/uvdevice.h +3 -0
@@ -80,6 +80,7 @@ enum UVIO_IOCTL_NR {UVIO_IOCTL_ATT_NR ,UVIO_IOCTL_ADD_SECRET_NR ,UVIO_IOCTL_LIST_SECRETS_NR , +UVIO_IOCTL_LOCK_SECRETS_NR ,/* must be the last entry */ UVIO_IOCTL_NUM_IOCTLS };
@@ -89,11 +90,13 @@ enum UVIO_IOCTL_NR {#define UVIO_IOCTL_ATT UVIO_IOCTL(UVIO_IOCTL_ATT_NR)#define UVIO_IOCTL_ADD_SECRET UVIO_IOCTL(UVIO_IOCTL_ADD_SECRET_NR)#define UVIO_IOCTL_LIST_SECRETS UVIO_IOCTL(UVIO_IOCTL_LIST_SECRETS_NR) +#define UVIO_IOCTL_LOCK_SECRETS UVIO_IOCTL(UVIO_IOCTL_LOCK_SECRETS_NR)#define UVIO_SUPP_CALL (nr) (1ULL << (nr))#define UVIO_SUPP_UDEV_INFO UVIO_SUPP_CALL(UVIO_IOCTL_UDEV_INFO_NR)#define UVIO_SUPP_ATT UVIO_SUPP_CALL(UVIO_IOCTL_ATT_NR)#define UVIO_SUPP_ADD_SECRET UVIO_SUPP_CALL(UVIO_IOCTL_ADD_SECRET_NR)#define UVIO_SUPP_LIST_SECRETS UVIO_SUPP_CALL(UVIO_IOCTL_LIST_SECRETS_NR) +#define UVIO_SUPP_LOCK_SECRETS UVIO_SUPP_CALL(UVIO_IOCTL_LOCK_SECRETS_NR)#endif /* __S390_ASM_UVDEVICE_H */
drivers/s390/char/uvdevice.c +39 -0
@@ -39,6 +39,7 @@ static const u32 ioctl_nr_to_uvc_bit[] __initconst = { [UVIO_IOCTL_ATT_NR] = BIT_UVC_CMD_RETR_ATTEST, [UVIO_IOCTL_ADD_SECRET_NR] = BIT_UVC_CMD_ADD_SECRET, [UVIO_IOCTL_LIST_SECRETS_NR] = BIT_UVC_CMD_LIST_SECRETS, + [UVIO_IOCTL_LOCK_SECRETS_NR ] =BIT_UVC_CMD_LOCK_SECRETS , };static_assert (ARRAY_SIZE (ioctl_nr_to_uvc_bit) ==UVIO_IOCTL_NUM_IOCTLS );
@@ -340,6 +341,41 @@ static int uvio_list_secrets(struct uvio_ioctl_cb *uv_ioctl)return ret; } +/** uvio_lock_secrets() - perform a Lock Secret Store UVC +* @uv_ioctl: ioctl control block +* +* uvio_lock_secrets() performs the Lock Secret Store Ultravisor Call. It +* performs the UV-call and copies the return codes to the ioctl control block. +* After this call was dispatched successfully every following Add Secret UVC +* and Lock Secrets UVC will fail with return code 0x102. +* +* The argument address and size must be 0. +* +* If the Lock Secrets UV facility is not present, UV will return invalid +* command rc. This won't be fenced in the driver and does not result in a +* negative return value. +* +* Context: might sleep +* +* Return: 0 on success or a negative error code on error. +*/ +static int uvio_lock_secrets (struct uvio_ioctl_cb *ioctl) +{ +struct uv_cb_nodata uvcb = { + .header.len =sizeof (uvcb), + .header.cmd =UVC_CMD_LOCK_SECRETS , + }; + +if (ioctl->argument_addr || ioctl->argument_len) +return -EINVAL ; + +uv_call (0 , (u64)&uvcb); + ioctl->uv_rc = uvcb.header.rc; + ioctl->uv_rrc = uvcb.header.rrc; + +return 0 ; +} +static int uvio_copy_and_check_ioctl (struct uvio_ioctl_cb *ioctl,void __user *argp,unsigned long cmd) {
@@ -390,6 +426,9 @@ static long uvio_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)case UVIO_IOCTL_LIST_SECRETS_NR : ret =uvio_list_secrets (&uv_ioctl);break ; +case UVIO_IOCTL_LOCK_SECRETS_NR : + ret =uvio_lock_secrets (&uv_ioctl); +break ;default : ret = -ENOIOCTLCMD ;break ;
Signature · 1 line
2.40.1
Re: [PATCH v4 4/6] s390/uvdevice: Add 'Lock Secret Store' UVC
Quoted 8 lines · Steffen Eiden
Userspace can call the Lock Secret Store Ultravisor Call using IOCTLs on the uvdevice. The Lock Secret Store UV call disables all additions of secrets for the future.
The uvdevice is merely transporting the request from userspace to the Ultravisor.
Signed-off-by Steffen Eiden <[email protected]>
PATCH v4 5/6 s390/uv: replace scnprintf with sysfs_emit
In reply to Steffen EidenReplace scnprintf(page, PAGE_SIZE, ...) with the page size aware sysfs_emit(buf, ...) which adds some sanity checks.
--- arch/s390/kernel/uv.c | 58 +++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 32 deletions(-)
arch/s390/kernel/uv.c +26 -32
@@ -460,13 +460,13 @@ EXPORT_SYMBOL_GPL(arch_make_page_accessible);#if defined(CONFIG_PROTECTED_VIRTUALIZATION_GUEST ) ||IS_ENABLED (CONFIG_KVM )static ssize_t uv_query_facilities (struct kobject *kobj, -struct kobj_attribute *attr,char *page) +struct kobj_attribute *attr,char *buf) { -return scnprintf (page,PAGE_SIZE ,"%lx\n%lx\n%lx\n%lx\n" , - uv_info.inst_calls_list[0 ], - uv_info.inst_calls_list[1 ], - uv_info.inst_calls_list[2 ], - uv_info.inst_calls_list[3 ]); +return sysfs_emit (buf,"%lx\n%lx\n%lx\n%lx\n" , + uv_info.inst_calls_list[0 ], + uv_info.inst_calls_list[1 ], + uv_info.inst_calls_list[2 ], + uv_info.inst_calls_list[3 ]); } static struct kobj_attribute uv_query_facilities_attr =
@@ -491,30 +491,27 @@ 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) +struct kobj_attribute *attr,char *buf) { -return scnprintf (page,PAGE_SIZE ,"%lx\n" , - uv_info.guest_cpu_stor_len); +return sysfs_emit (buf,"%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) +struct kobj_attribute *attr,char *buf) { -return scnprintf (page,PAGE_SIZE ,"%lx\n" , - uv_info.conf_dump_storage_state_len); +return sysfs_emit (buf,"%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) +struct kobj_attribute *attr,char *buf) { -return scnprintf (page,PAGE_SIZE ,"%lx\n" , - uv_info.conf_dump_finalize_len); +return sysfs_emit (buf,"%lx\n" , uv_info.conf_dump_finalize_len); } static struct kobj_attribute uv_query_dump_finalize_len_attr =
@@ -530,48 +527,45 @@ static struct kobj_attribute uv_query_feature_indications_attr =__ATTR (feature_indications,0444 , uv_query_feature_indications,NULL );static ssize_t uv_query_max_guest_cpus (struct kobject *kobj, -struct kobj_attribute *attr,char *page) +struct kobj_attribute *attr,char *buf) { -return scnprintf (page,PAGE_SIZE ,"%d\n" , - uv_info.max_guest_cpu_id +1 ); +return sysfs_emit (buf,"%d\n" , uv_info.max_guest_cpu_id +1 ); }static struct kobj_attribute uv_query_max_guest_cpus_attr =__ATTR (max_cpus,0444 , uv_query_max_guest_cpus,NULL );static ssize_t uv_query_max_guest_vms (struct kobject *kobj, -struct kobj_attribute *attr,char *page) +struct kobj_attribute *attr,char *buf) { -return scnprintf (page,PAGE_SIZE ,"%d\n" , - uv_info.max_num_sec_conf); +return sysfs_emit (buf,"%d\n" , uv_info.max_num_sec_conf); }static struct kobj_attribute uv_query_max_guest_vms_attr =__ATTR (max_guests,0444 , uv_query_max_guest_vms,NULL );static ssize_t uv_query_max_guest_addr (struct kobject *kobj, -struct kobj_attribute *attr,char *page) +struct kobj_attribute *attr,char *buf) { -return scnprintf (page,PAGE_SIZE ,"%lx\n" , - uv_info.max_sec_stor_addr); +return sysfs_emit (buf,"%lx\n" , uv_info.max_sec_stor_addr); }static struct kobj_attribute uv_query_max_guest_addr_attr =__ATTR (max_address,0444 , uv_query_max_guest_addr,NULL );static ssize_t uv_query_supp_att_req_hdr_ver (struct kobject *kobj, -struct kobj_attribute *attr,char *page) +struct kobj_attribute *attr,char *buf) { -return scnprintf (page,PAGE_SIZE ,"%lx\n" , uv_info.supp_att_req_hdr_ver); +return sysfs_emit (buf,"%lx\n" , uv_info.supp_att_req_hdr_ver); }static struct kobj_attribute uv_query_supp_att_req_hdr_ver_attr =__ATTR (supp_att_req_hdr_ver,0444 , uv_query_supp_att_req_hdr_ver,NULL );static ssize_t uv_query_supp_att_pflags (struct kobject *kobj, -struct kobj_attribute *attr,char *page) +struct kobj_attribute *attr,char *buf) { -return scnprintf (page,PAGE_SIZE ,"%lx\n" , uv_info.supp_att_pflags); +return sysfs_emit (buf,"%lx\n" , uv_info.supp_att_pflags); } static struct kobj_attribute uv_query_supp_att_pflags_attr =
@@ -598,18 +592,18 @@ static struct attribute_group uv_query_attr_group = { };static ssize_t uv_is_prot_virt_guest (struct kobject *kobj, -struct kobj_attribute *attr,char *page) +struct kobj_attribute *attr,char *buf) {int val =0 ;#ifdef CONFIG_PROTECTED_VIRTUALIZATION_GUEST val = prot_virt_guest;#endif -return scnprintf (page,PAGE_SIZE ,"%d\n" , val); +return sysfs_emit (buf,"%d\n" , val); }static ssize_t uv_is_prot_virt_host (struct kobject *kobj, -struct kobj_attribute *attr,char *page) +struct kobj_attribute *attr,char *buf) {int val =0 ;
@@ -617,7 +611,7 @@ static ssize_t uv_is_prot_virt_host(struct kobject *kobj, val = prot_virt_host;#endif -return scnprintf (page,PAGE_SIZE ,"%d\n" , val); +return sysfs_emit (buf,"%d\n" , val); } static struct kobj_attribute uv_prot_virt_guest =
Signature · 1 line
2.40.1
Re: [PATCH v4 5/6] s390/uv: replace scnprintf with sysfs_emit
Quoted 4 lines · Steffen Eiden
Replace
scnprintf(page, PAGE_SIZE, ...)with the page size awaresysfs_emit(buf, ...)which adds some sanity checks.Signed-off-by Steffen Eiden <[email protected]>
PATCH v4 6/6 s390/uv: Update query for secret-UVCs
In reply to Steffen EidenUpdate the query struct such that secret-UVC related information can be parsed.
Add sysfs files for these new values.
'supp_add_secret_req_ver' notes the supported versions for the Add Secret UVC. Bit 0 indicates that version 0x100 is supported, bit 1 indicates 0x200, and so on.
'supp_add_secret_pcf' notes the supported plaintext flags for the Add Secret UVC.
'supp_secret_types' notes the supported types of secrets. Bit 0 indicates secret type 1, bit 1 indicates type 2, and so on.
'max_secrets' notes the maximum amount of secrets the secret store can store per pv guest.
--- arch/s390/boot/uv.c | 4 ++++ arch/s390/include/asm/uv.h | 13 +++++++++++-- arch/s390/kernel/uv.c | 40 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 55 insertions(+), 2 deletions(-)
arch/s390/boot/uv.c +4 -0
@@ -47,6 +47,10 @@ void uv_query_info(void) uv_info.conf_dump_finalize_len = uvcb.conf_dump_finalize_len; uv_info.supp_att_req_hdr_ver = uvcb.supp_att_req_hdr_ver; uv_info.supp_att_pflags = uvcb.supp_att_pflags; + uv_info.supp_add_secret_req_ver = uvcb.supp_add_secret_req_ver; + uv_info.supp_add_secret_pcf = uvcb.supp_add_secret_pcf; + uv_info.supp_secret_types = uvcb.supp_secret_types; + uv_info.max_secrets = uvcb.max_secrets }#ifdef CONFIG_PROTECTED_VIRTUALIZATION_GUEST
arch/s390/include/asm/uv.h +11 -2
@@ -123,7 +123,7 @@ struct uv_cb_qui {u32 reserved70[3 ];/* 0x0070 */ u32 max_num_sec_conf;/* 0x007c */ u64 max_guest_stor_addr;/* 0x0080 */ -u8 reserved88[158 -136 ];/* 0x0088 */ +u8 reserved88[0x9e -0x88 ];/* 0x0088 */ u16 max_guest_cpu_id;/* 0x009e */ u64 uv_feature_indications;/* 0x00a0 */ u64 reserveda8;/* 0x00a8 */
@@ -135,7 +135,12 @@ struct uv_cb_qui {u64 reservedd8;/* 0x00d8 */ u64 supp_att_req_hdr_ver;/* 0x00e0 */ u64 supp_att_pflags;/* 0x00e8 */ -u8 reservedf0[256 -240 ];/* 0x00f0 */ +u64 reservedf0;/* 0x00f0 */ +u64 supp_add_secret_req_ver;/* 0x00f8 */ +u64 supp_add_secret_pcf;/* 0x0100 */ +u64 supp_secret_types;/* 0x0180 */ +u16 max_secrets;/* 0x0110 */ +u8 reserved112[0x120 -0x112 ];/* 0x0112 */ } __packed__aligned(8) ;/* Initialize Ultravisor */
@@ -384,6 +389,10 @@ struct uv_info {unsigned long conf_dump_finalize_len;unsigned long supp_att_req_hdr_ver;unsigned long supp_att_pflags; +unsigned long supp_add_secret_req_ver; +unsigned long supp_add_secret_pcf; +unsigned long supp_secret_types; +unsigned short max_secrets; };extern struct uv_info uv_info;
arch/s390/kernel/uv.c +40 -0
@@ -571,6 +571,42 @@ static ssize_t uv_query_supp_att_pflags(struct kobject *kobj,static struct kobj_attribute uv_query_supp_att_pflags_attr =__ATTR (supp_att_pflags,0444 , uv_query_supp_att_pflags,NULL ); +static ssize_t uv_query_supp_add_secret_req_ver (struct kobject *kobj, +struct kobj_attribute *attr,char *buf) +{ +return sysfs_emit (buf,"%lx\n" , uv_info.supp_add_secret_req_ver); +} + +static struct kobj_attribute uv_query_supp_add_secret_req_ver_attr = +__ATTR (supp_add_secret_req_ver,0444 , uv_query_supp_add_secret_req_ver,NULL ); + +static ssize_t uv_query_supp_add_secret_pcf (struct kobject *kobj, +struct kobj_attribute *attr,char *buf) +{ +return sysfs_emit (buf,"%lx\n" , uv_info.supp_add_secret_pcf); +} + +static struct kobj_attribute uv_query_supp_add_secret_pcf_attr = +__ATTR (supp_add_secret_pcf,0444 , uv_query_supp_add_secret_pcf,NULL ); + +static ssize_t uv_query_supp_secret_types (struct kobject *kobj, +struct kobj_attribute *attr,char *buf) +{ +return sysfs_emit (buf,"%lx\n" , uv_info.supp_secret_types); +} + +static struct kobj_attribute uv_query_supp_secret_types_attr = +__ATTR (supp_secret_types,0444 , uv_query_supp_secret_types,NULL ); + +static ssize_t uv_query_max_secrets (struct kobject *kobj, +struct kobj_attribute *attr,char *buf) +{ +return sysfs_emit (buf,"%d\n" , uv_info.max_secrets); +} + +static struct kobj_attribute uv_query_max_secrets_attr = +__ATTR (max_secrets,0444 , uv_query_max_secrets,NULL ); +static struct attribute *uv_query_attrs[] = { &uv_query_facilities_attr.attr, &uv_query_feature_indications_attr.attr,
@@ -584,6 +620,10 @@ static struct attribute *uv_query_attrs[] = { &uv_query_dump_cpu_len_attr.attr, &uv_query_supp_att_req_hdr_ver_attr.attr, &uv_query_supp_att_pflags_attr.attr, + &uv_query_supp_add_secret_req_ver_attr.attr, + &uv_query_supp_add_secret_pcf_attr.attr, + &uv_query_supp_secret_types_attr.attr, + &uv_query_max_secrets_attr.attr, NULL, };
Signature · 1 line
2.40.1
kernel test robot
build botRe: [PATCH v4 6/6] s390/uv: Update query for secret-UVCs
kernel test robot noticed the following build errors:
Hi Steffen,
kernel test robot noticed the following build errors:
[auto build test ERROR on kvms390/next]
[also build test ERROR on s390/features mst-vhost/linux-next linus/master v6.4-rc5 next-20230607] [If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Steffen-Eiden/s390-uvdevice-Add-info-IOCTL/20230607-021159 base: https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git next patch link: https://lore.kernel.org/r/20230606180817.3019077-7-seiden%40linux.ibm.com patch subject: [PATCH v4 6/6] s390/uv: Update query for secret-UVCs config: s390-defconfig (https://download.01.org/0day-ci/archive/20230607/[email protected]/config) compiler: s390-linux-gcc (GCC) 12.3.0
reproduce (this is a W=1 build):
mkdir -p ~/bin
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
git remote add kvms390 https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git
git fetch kvms390 next
git checkout kvms390/next
b4 shazam https://lore.kernel.org/r/[email protected]
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.3.0 ~/bin/make.cross W=1 O=build_dir ARCH=s390 olddefconfig COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.3.0 ~/bin/make.cross W=1 O=build_dir ARCH=s390 SHELL=/bin/bash
If you fix the issue, kindly add following tag where applicable
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All errors (new ones prefixed by >>):
arch/s390/boot/uv.c: In function 'uv_query_info':
>> arch/s390/boot/uv.c:53:55: error: expected ';' before '}' token
53 | uv_info.max_secrets = uvcb.max_secrets
| ^
| ;
54 | }
| ~ vim +53 arch/s390/boot/uv.c
18
19 void uv_query_info(void)
20 {
21 struct uv_cb_qui uvcb = {
22 .header.cmd = UVC_CMD_QUI,
23 .header.len = sizeof(uvcb)
24 };
25
26 if (!test_facility(158))
27 return;
28
29 /* rc==0x100 means that there is additional data we do not process */
30 if (uv_call(0, (uint64_t)&uvcb) && uvcb.header.rc != 0x100)
31 return;
32
33 if (IS_ENABLED(CONFIG_KVM)) {
34 memcpy(uv_info.inst_calls_list, uvcb.inst_calls_list, sizeof(uv_info.inst_calls_list));
35 uv_info.uv_base_stor_len = uvcb.uv_base_stor_len;
36 uv_info.guest_base_stor_len = uvcb.conf_base_phys_stor_len;
37 uv_info.guest_virt_base_stor_len = uvcb.conf_base_virt_stor_len;
38 uv_info.guest_virt_var_stor_len = uvcb.conf_virt_var_stor_len;
39 uv_info.guest_cpu_stor_len = uvcb.cpu_stor_len;
40 uv_info.max_sec_stor_addr = ALIGN(uvcb.max_guest_stor_addr, PAGE_SIZE);
41 uv_info.max_num_sec_conf = uvcb.max_num_sec_conf;
42 uv_info.max_guest_cpu_id = uvcb.max_guest_cpu_id;
43 uv_info.uv_feature_indications = uvcb.uv_feature_indications;
44 uv_info.supp_se_hdr_ver = uvcb.supp_se_hdr_versions;
45 uv_info.supp_se_hdr_pcf = uvcb.supp_se_hdr_pcf;
46 uv_info.conf_dump_storage_state_len = uvcb.conf_dump_storage_state_len;
47 uv_info.conf_dump_finalize_len = uvcb.conf_dump_finalize_len;
48 uv_info.supp_att_req_hdr_ver = uvcb.supp_att_req_hdr_ver;
49 uv_info.supp_att_pflags = uvcb.supp_att_pflags;
50 uv_info.supp_add_secret_req_ver = uvcb.supp_add_secret_req_ver;
51 uv_info.supp_add_secret_pcf = uvcb.supp_add_secret_pcf;
52 uv_info.supp_secret_types = uvcb.supp_secret_types;
> 53 uv_info.max_secrets = uvcb.max_secrets
54 }
55 Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki
Re: [PATCH v4 6/6] s390/uv: Update query for secret-UVCs
In reply to Steffen EidenQuoted 29 lines · Steffen Eiden
Update the query struct such that secret-UVC related information can be parsed.
Add sysfs files for these new values.'
supp_add_secret_req_ver' notes the supported versions for the Add Secret UVC. Bit 0 indicates that version0x100is supported, bit 1 indicates0x200, and so on.'
supp_add_secret_pcf' notes the supported plaintext flags for the Add Secret UVC.'
supp_secret_types' notes the supported types of secrets. Bit 0 indicates secret type 1, bit 1 indicates type 2, and so on.'
max_secrets' notes the maximum amount of secrets the secret store can store per pv guest.Signed-off-by Steffen Eiden <[email protected]>--- arch/s390/boot/uv.c | 4 ++++ arch/s390/include/asm/uv.h | 13 +++++++++++-- arch/s390/kernel/uv.c | 40 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 55 insertions(+), 2 deletions(-)arch/s390/boot/uv.c +0
-0
arch/s390/boot/uv.c void uv_query_info(void) · line 53
Quoted 7 lines
arch/s390/boot/uv.c +4
-0@@ -47,6 +47,10 @@ void uv_query_info(void) uv_info.conf_dump_finalize_len = uvcb.conf_dump_finalize_len; uv_info.supp_att_req_hdr_ver = uvcb.supp_att_req_hdr_ver; uv_info.supp_att_pflags = uvcb.supp_att_pflags; + uv_info.supp_add_secret_req_ver = uvcb.supp_add_secret_req_ver; + uv_info.supp_add_secret_pcf = uvcb.supp_add_secret_pcf; + uv_info.supp_secret_types = uvcb.supp_secret_types; + uv_info.max_secrets = uvcb.max_secrets
Apart from this:
But we can add the ";" when picking.