s390/uv: Update query for secret-UVCs

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 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.

Signed-off-by: Steffen Eiden <seiden@linux.ibm.com>
Reviewed-by: Janosch Frank <frankja@linux.ibm.com>
Link: https://lore.kernel.org/r/20230615100533.3996107-8-seiden@linux.ibm.com
Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
Message-Id: <20230615100533.3996107-8-seiden@linux.ibm.com>

diff --git a/arch/s390/boot/uv.c b/arch/s390/boot/uv.c
index 0a077c0a20563035867cf1fb45f2cf211cbce9ce..1e66d2cbb0965a145730d08bf70e79d48ba1e1a9 100644 (file)
--- a/arch/s390/boot/uv.c
+++ b/arch/s390/boot/uv.c
@@ -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

diff --git a/arch/s390/include/asm/uv.h b/arch/s390/include/asm/uv.h
index 3203ffbdde6b87f4e1ff8ca8fe1c0af2af798f3c..d6bb2f4f78d1f495e45098707136091689d6a326 100644 (file)
--- a/arch/s390/include/asm/uv.h
+++ b/arch/s390/include/asm/uv.h
@@ -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;

diff --git a/arch/s390/kernel/uv.c b/arch/s390/kernel/uv.c
index 6a23a13d0dfc649449f7d4c48fd11f22182af1ad..273a0281a18975651293437268a6a0be0acd78e1 100644 (file)
--- a/arch/s390/kernel/uv.c
+++ b/arch/s390/kernel/uv.c
@@ -579,6 +579,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,
@@ -592,6 +628,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,
 };