Enable the list IOCTL to provide lists longer than on page (85 entries). The list IOCTL accepts argument length up to 8 pages in page granularity and will fill the argument up to this length with entries until the list ends. User space unaware of this enhancement will still receive one page of data and an uv_rc 0x0100. Signed-off-by: Steffen Eiden <seiden@linux.ibm.com> --- Janosch picked the rest of this series[1]. This is an alternate approach on how to forward the enhanced list UVC to userspace without adding a new IOCTL by looping through the list UVCs in kernel space instead of in userspace. This allows a much cleaner API and streamlined implementation for both, kernel and userspace. This patch is based on series [1] without PATCH 5. [1] https://lore.kernel.org/lkml/20241024062638.1465970-1-seiden@linux.ibm.com/ arch/s390/include/uapi/asm/uvdevice.h | 1 + drivers/s390/char/uvdevice.c | 74 ++++++++++++++++++++------- 2 files changed, 56 insertions(+), 19 deletions(-) diff --git a/arch/s390/include/uapi/asm/uvdevice.h b/arch/s390/include/uapi/asm/uvdevice.h index XXXXXXX..XXXXXXX 100644 --- a/arch/s390/include/uapi/asm/uvdevice.h +++ b/arch/s390/include/uapi/asm/uvdevice.h @@ -XXX,XX +XXX,XX @@ struct uvio_uvdev_info { #define UVIO_ATT_ADDITIONAL_MAX_LEN 0x8000 #define UVIO_ADD_SECRET_MAX_LEN 0x100000 #define UVIO_LIST_SECRETS_LEN 0x1000 +#define UVIO_LIST_SECRETS_MAX_LEN 0x8000 #define UVIO_RETR_SECRET_MAX_LEN 0x2000 #define UVIO_DEVICE_NAME "uv" diff --git a/drivers/s390/char/uvdevice.c b/drivers/s390/char/uvdevice.c index XXXXXXX..XXXXXXX 100644 --- a/drivers/s390/char/uvdevice.c +++ b/drivers/s390/char/uvdevice.c @@ -XXX,XX +XXX,XX @@ static int uvio_add_secret(struct uvio_ioctl_cb *uv_ioctl) return ret; } +/* + * Do the actual secret list creation. Calls the list-UVC until there is no more + * space in the user buffer, or the list ends. + */ +static int uvio_get_list(void *zpage, struct uvio_ioctl_cb *uv_ioctl) +{ + u8 __user *user_secrets = (u8 __user *)uv_ioctl->argument_addr; + struct uv_secret_list *list = zpage; + size_t len = UVIO_LIST_SECRETS_LEN; + u16 num_secrets_stored = 0; + size_t user_off = 0; + size_t list_off = 0; + + do { + if (user_off + len > uv_ioctl->argument_len) + break; + uv_list_secrets(list, list->next_secret_idx, &uv_ioctl->uv_rc, + &uv_ioctl->uv_rrc); + if (uv_ioctl->uv_rc != UVC_RC_EXECUTED && + uv_ioctl->uv_rc != UVC_RC_MORE_DATA) + break; + if (copy_to_user(user_secrets + user_off, (u8 *)list + list_off, + len)) + return -EFAULT; + + user_off += len; + num_secrets_stored += list->num_secr_stored; + /* The 2nd,3rd,.. secret list pages will not contain the list header again */ + list_off = offsetof(struct uv_secret_list, secrets); + len = UVIO_LIST_SECRETS_LEN - list_off; + } while (uv_ioctl->uv_rc == UVC_RC_MORE_DATA); + + /* Merge headers */ + list->num_secr_stored = num_secrets_stored; + if (copy_to_user(user_secrets, list, list_off)) + return -EFAULT; + return 0; +} + /** uvio_list_secrets() - perform a List Secret UVC * @uv_ioctl: ioctl control block * @@ -XXX,XX +XXX,XX @@ static int uvio_add_secret(struct uvio_ioctl_cb *uv_ioctl) * * The argument specifies the location for the result of the UV-Call. * + * Argument len must be a multiple of a page; 1-8 pages allowed. + * The list secrets IOCTL will call the list UVC multiple times and fill + * the provided user-buffer with list elements until either the list ends or + * the buffer is full. The list header is merged over all list header from the + * individual UVCs. + * * If the List 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. @@ -XXX,XX +XXX,XX @@ static int uvio_add_secret(struct uvio_ioctl_cb *uv_ioctl) */ static int uvio_list_secrets(struct uvio_ioctl_cb *uv_ioctl) { - void __user *user_buf_arg = (void __user *)uv_ioctl->argument_addr; - struct uv_cb_guest_addr uvcb = { - .header.len = sizeof(uvcb), - .header.cmd = UVC_CMD_LIST_SECRETS, - }; - void *secrets = NULL; - int ret = 0; + void *zpage = NULL; + int rc; - if (uv_ioctl->argument_len != UVIO_LIST_SECRETS_LEN) + if (uv_ioctl->argument_len == 0 || + uv_ioctl->argument_len % UVIO_LIST_SECRETS_LEN != 0 || + uv_ioctl->argument_len > UVIO_LIST_SECRETS_MAX_LEN) return -EINVAL; - secrets = kvzalloc(UVIO_LIST_SECRETS_LEN, GFP_KERNEL); - if (!secrets) + zpage = (void *)get_zeroed_page(GFP_KERNEL); + if (!zpage) return -ENOMEM; - uvcb.addr = (u64)secrets; - uv_call_sched(0, (u64)&uvcb); - uv_ioctl->uv_rc = uvcb.header.rc; - uv_ioctl->uv_rrc = uvcb.header.rrc; - - if (copy_to_user(user_buf_arg, secrets, UVIO_LIST_SECRETS_LEN)) - ret = -EFAULT; + rc = uvio_get_list(zpage, uv_ioctl); - kvfree(secrets); - return ret; + free_page((unsigned long)zpage); + return rc; } /** uvio_lock_secrets() - perform a Lock Secret Store UVC -- 2.45.2 Enable the list IOCTL to provide lists longer than on page (85 entries). The list IOCTL accepts argument length up to 8 pages in page granularity and will fill the argument up to this length with entries until the list ends. User space unaware of this enhancement will still receive one page of data and an uv_rc 0x0100. Signed-off-by: Steffen Eiden <seiden@linux.ibm.com> --- Reworked the whole list-creation loop. Hardened+simplified the implementation. Now, only the actual data filled by the CP is copied to userspace. arch/s390/include/uapi/asm/uvdevice.h | 1 + drivers/s390/char/uvdevice.c | 72 ++++++++++++++++++++------- 2 files changed, 54 insertions(+), 19 deletions(-) diff --git a/arch/s390/include/uapi/asm/uvdevice.h b/arch/s390/include/uapi/asm/uvdevice.h index XXXXXXX..XXXXXXX 100644 --- a/arch/s390/include/uapi/asm/uvdevice.h +++ b/arch/s390/include/uapi/asm/uvdevice.h @@ -XXX,XX +XXX,XX @@ struct uvio_uvdev_info { #define UVIO_ATT_ADDITIONAL_MAX_LEN 0x8000 #define UVIO_ADD_SECRET_MAX_LEN 0x100000 #define UVIO_LIST_SECRETS_LEN 0x1000 +#define UVIO_LIST_SECRETS_MAX_LEN 0x8000 #define UVIO_RETR_SECRET_MAX_LEN 0x2000 #define UVIO_DEVICE_NAME "uv" diff --git a/drivers/s390/char/uvdevice.c b/drivers/s390/char/uvdevice.c index XXXXXXX..XXXXXXX 100644 --- a/drivers/s390/char/uvdevice.c +++ b/drivers/s390/char/uvdevice.c @@ -XXX,XX +XXX,XX @@ static int uvio_add_secret(struct uvio_ioctl_cb *uv_ioctl) return ret; } +/* + * Do the actual secret list creation. Calls the list-UVC until there is no more + * space in the user buffer, or the list ends. + */ +static int uvio_get_list(void *zpage, struct uvio_ioctl_cb *uv_ioctl) +{ + const size_t data_off = offsetof(struct uv_secret_list, secrets); + u8 __user *user_buf = (u8 __user *)uv_ioctl->argument_addr; + struct uv_secret_list *list = zpage; + u16 num_secrets_stored = 0; + size_t user_off = data_off; + size_t copy_len; + + do { + uv_list_secrets(list, list->next_secret_idx, &uv_ioctl->uv_rc, + &uv_ioctl->uv_rrc); + if (uv_ioctl->uv_rc != UVC_RC_EXECUTED && + uv_ioctl->uv_rc != UVC_RC_MORE_DATA) + break; + + copy_len = sizeof(list->secrets[0]) * list->num_secr_stored; + WARN_ON(copy_len > sizeof(list->secrets)); + + if (copy_to_user(user_buf + user_off, list->secrets, copy_len)) + return -EFAULT; + + user_off += copy_len; + num_secrets_stored += list->num_secr_stored; + } while (uv_ioctl->uv_rc == UVC_RC_MORE_DATA && + user_off + sizeof(*list) <= uv_ioctl->argument_len); + + list->num_secr_stored = num_secrets_stored; + if (copy_to_user(user_buf, list, data_off)) + return -EFAULT; + return 0; +} + /** uvio_list_secrets() - perform a List Secret UVC * @uv_ioctl: ioctl control block * @@ -XXX,XX +XXX,XX @@ static int uvio_add_secret(struct uvio_ioctl_cb *uv_ioctl) * * The argument specifies the location for the result of the UV-Call. * + * Argument len must be a multiple of a page; 1-8 pages allowed. + * The list secrets IOCTL will call the list UVC multiple times and fill + * the provided user-buffer with list elements until either the list ends or + * the buffer is full. The list header is merged over all list header from the + * individual UVCs. + * * If the List 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. @@ -XXX,XX +XXX,XX @@ static int uvio_add_secret(struct uvio_ioctl_cb *uv_ioctl) */ static int uvio_list_secrets(struct uvio_ioctl_cb *uv_ioctl) { - void __user *user_buf_arg = (void __user *)uv_ioctl->argument_addr; - struct uv_cb_guest_addr uvcb = { - .header.len = sizeof(uvcb), - .header.cmd = UVC_CMD_LIST_SECRETS, - }; - void *secrets = NULL; - int ret = 0; + void *zpage = NULL; + int rc; - if (uv_ioctl->argument_len != UVIO_LIST_SECRETS_LEN) + if (uv_ioctl->argument_len == 0 || + uv_ioctl->argument_len % UVIO_LIST_SECRETS_LEN != 0 || + uv_ioctl->argument_len > UVIO_LIST_SECRETS_MAX_LEN) return -EINVAL; - secrets = kvzalloc(UVIO_LIST_SECRETS_LEN, GFP_KERNEL); - if (!secrets) + zpage = (void *)get_zeroed_page(GFP_KERNEL); + if (!zpage) return -ENOMEM; - uvcb.addr = (u64)secrets; - uv_call_sched(0, (u64)&uvcb); - uv_ioctl->uv_rc = uvcb.header.rc; - uv_ioctl->uv_rrc = uvcb.header.rrc; - - if (copy_to_user(user_buf_arg, secrets, UVIO_LIST_SECRETS_LEN)) - ret = -EFAULT; + rc = uvio_get_list(zpage, uv_ioctl); - kvfree(secrets); - return ret; + free_page((unsigned long)zpage); + return rc; } /** uvio_lock_secrets() - perform a Lock Secret Store UVC -- 2.45.2