Skip to contentSkip to conversation

KVM: s390: Enable AP instructions for pv-guests

PATCH Superseded Steffen Eiden 4 participants 7 messages Aug 10, 2023 – Aug 17, 2023

v2 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

v2 cover KVM: s390: Enable AP instructions for pv-guests

This series enables general QEMU support for AP pass-through for Secure Execution guests (pv-guests).

To enable AP-PT on pv-guests QEMU has to turn on the corresponding bits in the KVM CPU-model[1] if the CPU firmware supports it. However, it only makes sense to turn on AP-PT if the QEMU user enabled (general) AP for that guest.

The series consists of three patches:
1) update kvm-s390 header for this series
2) small cleanup for kvm_s390_set_attr() refactor code to add ap_available() and ap_enabled()
3) Add UV_CALL CPU model enablement

since v1:

- removed the new features from the default gen16 model
- updated KVM-headers to match KVM series v3 [1]
- applied review comments from Thomas

[1]
https://lore.kernel.org/linux-s390/[email protected]/#t

Steffen

Steffen Eiden (3):
linux-headers: update asm-s390/kvm.h
target/s390x/kvm: Refactor AP functionalities
target/s390x: AP-passthrough for PV guests

 linux-headers/asm-s390/kvm.h        | 16 +++++
 target/s390x/cpu_features.h         |  1 +
 target/s390x/cpu_features_def.h.inc |  4 ++
 target/s390x/cpu_models.c           |  2 +
 target/s390x/gen-features.c         |  2 +
 target/s390x/kvm/kvm.c              | 97 ++++++++++++++++++++++++++---
 6 files changed, 115 insertions(+), 7 deletions(-)
Signature · 1 line
2.40.1
#1 lore raw

PATCH v2 1/3 linux-headers: update asm-s390/kvm.h

---
 linux-headers/asm-s390/kvm.h | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
linux-headers/asm-s390/kvm.h +16 -0
index e2afd95420..023a2763a9 100644
@@ -159,6 +159,22 @@ struct kvm_s390_vm_cpu_subfunc {
 	__u8 reserved[1728];
 };
 
+#define KVM_S390_VM_CPU_PROCESSOR_UV_FEAT_GUEST	6
+#define KVM_S390_VM_CPU_MACHINE_UV_FEAT_GUEST	7
+
+#define KVM_S390_VM_CPU_UV_FEAT_NR_BITS	64
+struct kvm_s390_vm_cpu_uv_feat {
+	union {
+		struct {
+			__u64 : 4;
+			__u64 ap : 1;		/* bit 4 */
+			__u64 ap_intr : 1;	/* bit 5 */
+			__u64 : 58;
+		};
+		__u64 feat;
+	};
+};
+
 /* kvm attributes for crypto */
 #define KVM_S390_VM_CRYPTO_ENABLE_AES_KW	0
 #define KVM_S390_VM_CRYPTO_ENABLE_DEA_KW	1
Signature · 1 line
2.40.1
#2 lore raw

Re: [PATCH v2 1/3] linux-headers: update asm-s390/kvm.h

Sorry, I should have mentioned this for v1 already, but better late than never: We need to replace this patch with a proper header update later (via the scripts/update-linux-headers.sh script) - so in case you respin, please mark it with NOTFORMERGE or PLACEHOLDER or something similar in the subject, and mention the kernel version in the description that will likely contain the update.

Thanks,
Thomas

Quoted 32 lines · Steffen Eiden
---
  linux-headers/asm-s390/kvm.h | 16 ++++++++++++++++
  1 file changed, 16 insertions(+)
linux-headers/asm-s390/kvm.h +16 -0
index e2afd95420..023a2763a9 100644
@@ -159,6 +159,22 @@ struct kvm_s390_vm_cpu_subfunc {
  	__u8 reserved[1728];
  };
 
+#define KVM_S390_VM_CPU_PROCESSOR_UV_FEAT_GUEST	6
+#define KVM_S390_VM_CPU_MACHINE_UV_FEAT_GUEST	7
+
+#define KVM_S390_VM_CPU_UV_FEAT_NR_BITS	64
+struct kvm_s390_vm_cpu_uv_feat {
+	union {
+		struct {
+			__u64 : 4;
+			__u64 ap : 1;		/* bit 4 */
+			__u64 ap_intr : 1;	/* bit 5 */
+			__u64 : 58;
+		};
+		__u64 feat;
+	};
+};
+
  /* kvm attributes for crypto */
  #define KVM_S390_VM_CRYPTO_ENABLE_AES_KW	0
  #define KVM_S390_VM_CRYPTO_ENABLE_DEA_KW	1
#3 lore raw

PATCH v2 2/3 target/s390x/kvm: Refactor AP functionalities

In reply to Steffen Eiden

kvm_s390_set_attr() is a misleading name as it only sets attributes for the KVM_S390_VM_CRYPTO group. Therefore, rename it to kvm_s390_set_crypto_attr().

Add new functions ap_available() and ap_enabled() to avoid code duplication later.

---
 target/s390x/kvm/kvm.c | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)
target/s390x/kvm/kvm.c +17 -7
index a9e5880349..a7e2cdf668 100644
@@ -250,7 +250,7 @@ static void kvm_s390_enable_cmma(void)
     trace_kvm_enable_cmma(rc);
 }
 
-static void kvm_s390_set_attr(uint64_t attr)
+static void kvm_s390_set_crypto_attr(uint64_t attr)
 {
     struct kvm_device_attr attribute = {
         .group = KVM_S390_VM_CRYPTO,
@@ -275,7 +275,7 @@ static void kvm_s390_init_aes_kw(void)
     }
 
     if (kvm_vm_check_attr(kvm_state, KVM_S390_VM_CRYPTO, attr)) {
-            kvm_s390_set_attr(attr);
+            kvm_s390_set_crypto_attr(attr);
     }
 }
 
@@ -289,7 +289,7 @@ static void kvm_s390_init_dea_kw(void)
     }
 
     if (kvm_vm_check_attr(kvm_state, KVM_S390_VM_CRYPTO, attr)) {
-            kvm_s390_set_attr(attr);
+            kvm_s390_set_crypto_attr(attr);
     }
 }
 
@@ -2296,6 +2296,17 @@ static int configure_cpu_subfunc(const S390FeatBitmap features)
     return kvm_vm_ioctl(kvm_state, KVM_SET_DEVICE_ATTR, &attr);
 }
 
+static bool ap_available(void)
+{
+    return kvm_vm_check_attr(kvm_state, KVM_S390_VM_CRYPTO,
+                             KVM_S390_VM_CRYPTO_ENABLE_APIE);
+}
+
+static bool ap_enabled(const S390FeatBitmap features)
+{
+    return test_bit(S390_FEAT_AP, features);
+}
+
 static int kvm_to_feat[][2] = {
     { KVM_S390_VM_CPU_FEAT_ESOP, S390_FEAT_ESOP },
     { KVM_S390_VM_CPU_FEAT_SIEF2, S390_FEAT_SIE_F2 },
@@ -2475,8 +2486,7 @@ void kvm_s390_get_host_cpu_model(S390CPUModel *model, Error **errp)
         return;
     }
     /* for now, we can only provide the AP feature with HW support */
-    if (kvm_vm_check_attr(kvm_state, KVM_S390_VM_CRYPTO,
-        KVM_S390_VM_CRYPTO_ENABLE_APIE)) {
+    if (ap_available()) {
         set_bit(S390_FEAT_AP, model->features);
     }
 
@@ -2502,7 +2512,7 @@ static void kvm_s390_configure_apie(bool interpret)
                                 KVM_S390_VM_CRYPTO_DISABLE_APIE;
 
     if (kvm_vm_check_attr(kvm_state, KVM_S390_VM_CRYPTO, attr)) {
-        kvm_s390_set_attr(attr);
+        kvm_s390_set_crypto_attr(attr);
     }
 }
 
@@ -2556,7 +2566,7 @@ void kvm_s390_apply_cpu_model(const S390CPUModel *model, Error **errp)
         kvm_s390_enable_cmma();
     }
 
-    if (test_bit(S390_FEAT_AP, model->features)) {
+    if (ap_enabled(model->features)) {
         kvm_s390_configure_apie(true);
     }
 }
Signature · 1 line
2.40.1
Reviewed-by on v2 2/3
#4 lore raw

Re: [PATCH v2 2/3] target/s390x/kvm: Refactor AP functionalities

Quoted 8 lines · Steffen Eiden

kvm_s390_set_attr() is a misleading name as it only sets attributes for the KVM_S390_VM_CRYPTO group. Therefore, rename it to kvm_s390_set_crypto_attr().

Add new functions ap_available() and ap_enabled() to avoid code duplication later.

Quoted 81 lines
---
  target/s390x/kvm/kvm.c | 24 +++++++++++++++++-------
  1 file changed, 17 insertions(+), 7 deletions(-)
target/s390x/kvm/kvm.c +17 -7
index a9e5880349..a7e2cdf668 100644
@@ -250,7 +250,7 @@ static void kvm_s390_enable_cmma(void)
      trace_kvm_enable_cmma(rc);
  }
 
-static void kvm_s390_set_attr(uint64_t attr)
+static void kvm_s390_set_crypto_attr(uint64_t attr)
  {
      struct kvm_device_attr attribute = {
          .group = KVM_S390_VM_CRYPTO,
@@ -275,7 +275,7 @@ static void kvm_s390_init_aes_kw(void)
      }
 
      if (kvm_vm_check_attr(kvm_state, KVM_S390_VM_CRYPTO, attr)) {
-            kvm_s390_set_attr(attr);
+            kvm_s390_set_crypto_attr(attr);
      }
  }
 
@@ -289,7 +289,7 @@ static void kvm_s390_init_dea_kw(void)
      }
 
      if (kvm_vm_check_attr(kvm_state, KVM_S390_VM_CRYPTO, attr)) {
-            kvm_s390_set_attr(attr);
+            kvm_s390_set_crypto_attr(attr);
      }
  }
 
@@ -2296,6 +2296,17 @@ static int configure_cpu_subfunc(const S390FeatBitmap features)
      return kvm_vm_ioctl(kvm_state, KVM_SET_DEVICE_ATTR, &attr);
  }
 
+static bool ap_available(void)
+{
+    return kvm_vm_check_attr(kvm_state, KVM_S390_VM_CRYPTO,
+                             KVM_S390_VM_CRYPTO_ENABLE_APIE);
+}
+
+static bool ap_enabled(const S390FeatBitmap features)
+{
+    return test_bit(S390_FEAT_AP, features);
+}
+
  static int kvm_to_feat[][2] = {
      { KVM_S390_VM_CPU_FEAT_ESOP, S390_FEAT_ESOP },
      { KVM_S390_VM_CPU_FEAT_SIEF2, S390_FEAT_SIE_F2 },
@@ -2475,8 +2486,7 @@ void kvm_s390_get_host_cpu_model(S390CPUModel *model, Error **errp)
          return;
      }
      /* for now, we can only provide the AP feature with HW support */
-    if (kvm_vm_check_attr(kvm_state, KVM_S390_VM_CRYPTO,
-        KVM_S390_VM_CRYPTO_ENABLE_APIE)) {
+    if (ap_available()) {
          set_bit(S390_FEAT_AP, model->features);
      }
 
@@ -2502,7 +2512,7 @@ static void kvm_s390_configure_apie(bool interpret)
                                  KVM_S390_VM_CRYPTO_DISABLE_APIE;
 
      if (kvm_vm_check_attr(kvm_state, KVM_S390_VM_CRYPTO, attr)) {
-        kvm_s390_set_attr(attr);
+        kvm_s390_set_crypto_attr(attr);
      }
  }
 
@@ -2556,7 +2566,7 @@ void kvm_s390_apply_cpu_model(const S390CPUModel *model, Error **errp)
          kvm_s390_enable_cmma();
      }
 
-    if (test_bit(S390_FEAT_AP, model->features)) {
+    if (ap_enabled(model->features)) {
          kvm_s390_configure_apie(true);
      }
  }
#5 lore raw

PATCH v2 3/3 target/s390x: AP-passthrough for PV guests

In reply to Steffen Eiden

Enabling AP-passthrough(AP-pt) for PV-guest by using the new CPU features for PV-AP-pt of KVM.

As usual QEMU first checks which CPU features are available and then sets them if available and selected by user. An additional check is done to verify that PV-AP can only be enabled if "regular" AP-pt is enabled as well. Note that KVM itself does not enforce this restriction.

---
 target/s390x/cpu_features.h         |  1 +
 target/s390x/cpu_features_def.h.inc |  4 ++
 target/s390x/cpu_models.c           |  2 +
 target/s390x/gen-features.c         |  2 +
 target/s390x/kvm/kvm.c              | 73 +++++++++++++++++++++++++++++
 5 files changed, 82 insertions(+)
target/s390x/cpu_features.h +1 -0
index 87463f064d..40928c60e9 100644
@@ -43,6 +43,7 @@ typedef enum {
     S390_FEAT_TYPE_KDSA,
     S390_FEAT_TYPE_SORTL,
     S390_FEAT_TYPE_DFLTCC,
+    S390_FEAT_TYPE_UV_CALL,
 } S390FeatType;
 
 /* Definition of a CPU feature */
target/s390x/cpu_features_def.h.inc +4 -0
index e3cfe63735..9a2c5a9dfc 100644
@@ -379,3 +379,7 @@ DEF_FEAT(DEFLATE_GHDT, "dfltcc-gdht", DFLTCC, 1, "DFLTCC GDHT")
 DEF_FEAT(DEFLATE_CMPR, "dfltcc-cmpr", DFLTCC, 2, "DFLTCC CMPR")
 DEF_FEAT(DEFLATE_XPND, "dfltcc-xpnd", DFLTCC, 4, "DFLTCC XPND")
 DEF_FEAT(DEFLATE_F0, "dfltcc-f0", DFLTCC, 192, "DFLTCC format 0 parameter-block")
+
+/* Features exposed via the UV-CALL instruction */
+DEF_FEAT(UV_CALL_AP, "appv", UV_CALL, 4, "AP instructions installed for secure guests")
+DEF_FEAT(UV_CALL_AP_INTR, "appvi", UV_CALL, 5, "AP instructions interpretation for secure guests")
target/s390x/cpu_models.c +2 -0
index 42b52afdb4..a7900a8a5c 100644
@@ -483,6 +483,8 @@ static void check_consistency(const S390CPUModel *model)
         { S390_FEAT_DIAG_318, S390_FEAT_EXTENDED_LENGTH_SCCB },
         { S390_FEAT_NNPA, S390_FEAT_VECTOR },
         { S390_FEAT_RDP, S390_FEAT_LOCAL_TLB_CLEARING },
+        { S390_FEAT_UV_CALL_AP, S390_FEAT_AP },
+        { S390_FEAT_UV_CALL_AP_INTR, S390_FEAT_UV_CALL_AP },
     };
     int i;
 
target/s390x/gen-features.c +2 -0
index 1e3b7c0dc9..6ae10a2cd8 100644
@@ -576,6 +576,8 @@ static uint16_t full_GEN16_GA1[] = {
     S390_FEAT_RDP,
     S390_FEAT_PAI,
     S390_FEAT_PAIE,
+    S390_FEAT_UV_CALL_AP,
+    S390_FEAT_UV_CALL_AP_INTR,
 };
 
 
target/s390x/kvm/kvm.c +73 -0

96 lines not on this page · raw message

Signature · 1 line
2.40.1
#6 lore raw

Re: [PATCH v2 3/3] target/s390x: AP-passthrough for PV guests

Quoted 22 lines · Steffen Eiden

Enabling AP-passthrough(AP-pt) for PV-guest by using the new CPU features for PV-AP-pt of KVM.

As usual QEMU first checks which CPU features are available and then sets them if available and selected by user. An additional check is done to verify that PV-AP can only be enabled if "regular" AP-pt is enabled as well. Note that KVM itself does not enforce this restriction.

---
  target/s390x/cpu_features.h         |  1 +
  target/s390x/cpu_features_def.h.inc |  4 ++
  target/s390x/cpu_models.c           |  2 +
  target/s390x/gen-features.c         |  2 +
  target/s390x/kvm/kvm.c              | 73 +++++++++++++++++++++++++++++
  5 files changed, 82 insertions(+)
target/s390x/cpu_features.h +0 -0
index 87463f064d..40928c60e9 100644

target/s390x/cpu_features.h typedef enum { · line 46

Quoted 4 lines
target/s390x/cpu_features.h +1 -0
@@ -43,6 +43,7 @@ typedef enum {
      S390_FEAT_TYPE_KDSA,
      S390_FEAT_TYPE_SORTL,
      S390_FEAT_TYPE_DFLTCC,
+    S390_FEAT_TYPE_UV_CALL,

You've named them UV features in the KVM patches.
None of this is "call" related.

Also you made a point of having the word "guest" in the KVM features

Quoted 8 lines
target/s390x/cpu_features.h +0 -0
  } S390FeatType;
 
  /* Definition of a CPU feature */
target/s390x/cpu_features_def.h.inc +0 -0
index e3cfe63735..9a2c5a9dfc 100644

target/s390x/cpu_features_def.h.inc DEF_FEAT(DEFLATE_GHDT, "dfltcc-gdht", DFLTCC, 1, "DFLTCC GDHT") · line 385

Quoted 7 lines
target/s390x/cpu_features_def.h.inc +4 -0
@@ -379,3 +379,7 @@ DEF_FEAT(DEFLATE_GHDT, "dfltcc-gdht", DFLTCC, 1, "DFLTCC GDHT")
  DEF_FEAT(DEFLATE_CMPR, "dfltcc-cmpr", DFLTCC, 2, "DFLTCC CMPR")
  DEF_FEAT(DEFLATE_XPND, "dfltcc-xpnd", DFLTCC, 4, "DFLTCC XPND")
  DEF_FEAT(DEFLATE_F0, "dfltcc-f0", DFLTCC, 192, "DFLTCC format 0 parameter-block")
+
+/* Features exposed via the UV-CALL instruction */
+DEF_FEAT(UV_CALL_AP, "appv", UV_CALL, 4, "AP instructions installed for secure guests")
+DEF_FEAT(UV_CALL_AP_INTR, "appvi", UV_CALL, 5, "AP instructions interpretation for secure guests")

*INTERRUPTION* support

The AP instructions are nearly fully interpreted in secure guests for security reasons. The only time we see an AP instruction is for defining the notification byte for the interrupt support since we need to pin the page on which the byte resides.

Have a look what the feature for STFLE 65 says and either keep the INTR or use the suffix that's defined there

Quoted 50 lines
target/s390x/cpu_models.c +2 -0
index 42b52afdb4..a7900a8a5c 100644
@@ -483,6 +483,8 @@ static void check_consistency(const S390CPUModel *model)
          { S390_FEAT_DIAG_318, S390_FEAT_EXTENDED_LENGTH_SCCB },
          { S390_FEAT_NNPA, S390_FEAT_VECTOR },
          { S390_FEAT_RDP, S390_FEAT_LOCAL_TLB_CLEARING },
+        { S390_FEAT_UV_CALL_AP, S390_FEAT_AP },
+        { S390_FEAT_UV_CALL_AP_INTR, S390_FEAT_UV_CALL_AP },
      };
      int i;
 
target/s390x/gen-features.c +2 -0
index 1e3b7c0dc9..6ae10a2cd8 100644
@@ -576,6 +576,8 @@ static uint16_t full_GEN16_GA1[] = {
      S390_FEAT_RDP,
      S390_FEAT_PAI,
      S390_FEAT_PAIE,
+    S390_FEAT_UV_CALL_AP,
+    S390_FEAT_UV_CALL_AP_INTR,
  };
 
 
target/s390x/kvm/kvm.c +16 -0
index a7e2cdf668..500b9d894d 100644
@@ -2307,6 +2307,42 @@ static bool ap_enabled(const S390FeatBitmap features)
      return test_bit(S390_FEAT_AP, features);
  }
 
+static bool uv_feat_supported(void)
+{
+    return kvm_vm_check_attr(kvm_state, KVM_S390_VM_CPU_MODEL,
+                             KVM_S390_VM_CPU_PROCESSOR_UV_FEAT_GUEST);
+}
+
+static int query_uv_feat_guest(S390FeatBitmap features)
+{
+    struct kvm_s390_vm_cpu_uv_feat prop = {};
+    struct kvm_device_attr attr = {
+        .group = KVM_S390_VM_CPU_MODEL,
+        .attr = KVM_S390_VM_CPU_MACHINE_UV_FEAT_GUEST,
+        .addr = (uint64_t) &prop,
+    };
+    int rc;
+

target/s390x/kvm/kvm.c static bool ap_enabled(const S390FeatBitmap features) · line 2335

Quoted 10 lines
target/s390x/kvm/kvm.c +10 -0
+    if (!uv_feat_supported()) {
+        return 0;
+    }
+
+    rc = kvm_vm_ioctl(kvm_state, KVM_GET_DEVICE_ATTR, &attr);
+    if (rc) {
+        return  rc;
+    }
+
+    if (ap_available()) {

Can this be made into an early return?

Quoted 31 lines
target/s390x/kvm/kvm.c +19 -0
+        if (prop.ap) {
+            set_bit(S390_FEAT_UV_CALL_AP, features);
+        }
+        if (prop.ap_intr) {
+            set_bit(S390_FEAT_UV_CALL_AP_INTR, features);
+        }
+    }
+    return 0;
+}
+
  static int kvm_to_feat[][2] = {
      { KVM_S390_VM_CPU_FEAT_ESOP, S390_FEAT_ESOP },
      { KVM_S390_VM_CPU_FEAT_SIEF2, S390_FEAT_SIE_F2 },
@@ -2501,11 +2537,41 @@ void kvm_s390_get_host_cpu_model(S390CPUModel *model, Error **errp)
          set_bit(S390_FEAT_DIAG_318, model->features);
      }
 
+    /* Test for Ultravisor features that influence secure guest behavior */
+    query_uv_feat_guest(model->features);
+
      /* strip of features that are not part of the maximum model */
      bitmap_and(model->features, model->features, model->def->full_feat,
                 S390_FEAT_MAX);
  }
 
+static int configure_uv_feat_guest(const S390FeatBitmap features,
+                                   bool interpret)
+{
+
+    struct kvm_s390_vm_cpu_uv_feat uv_feat = {};
+    struct kvm_device_attr attribute = {

target/s390x/kvm/kvm.c void kvm_s390_get_host_cpu_model(S390CPUModel *model, Error **errp) · line 2563

Quoted 10 lines
target/s390x/kvm/kvm.c +10 -0
+        .group = KVM_S390_VM_CPU_MODEL,
+        .attr = KVM_S390_VM_CPU_PROCESSOR_UV_FEAT_GUEST,
+        .addr = (__u64) &uv_feat,
+    };
+
+    if (!uv_feat_supported()) {
+        return 0;
+    }
+
+    if (ap_enabled(features)) {

Same early return check please

Quoted 28 lines
target/s390x/kvm/kvm.c +18 -0
+        if (test_bit(S390_FEAT_UV_CALL_AP, features)) {
+            uv_feat.ap = 1;
+        }
+        if (test_bit(S390_FEAT_UV_CALL_AP_INTR, features) && interpret) {
+            uv_feat.ap_intr = 1;
+        }
+    }
+
+    return kvm_vm_ioctl(kvm_state, KVM_SET_DEVICE_ATTR, &attribute);
+}
+
  static void kvm_s390_configure_apie(bool interpret)
  {
      uint64_t attr = interpret ? KVM_S390_VM_CRYPTO_ENABLE_APIE :
@@ -2569,6 +2635,13 @@ void kvm_s390_apply_cpu_model(const S390CPUModel *model, Error **errp)
      if (ap_enabled(model->features)) {
          kvm_s390_configure_apie(true);
      }
+
+    /* configure UV-features for the guest indicated via query / test_bit */
+    rc = configure_uv_feat_guest(model->features, true);
+    if (rc) {
+        error_setg(errp, "KVM: Error configuring CPU UV features %d", rc);
+        return;
+    }
  }
 
  void kvm_s390_restart_interrupt(S390CPU *cpu)