Skip to contentSkip to conversation

KVM: s390: Enable AP instructions for PV-guests

PATCH Superseded Steffen Eiden 2 participants 7 messages Aug 10, 2023 – Aug 15, 2023

Subsystems (4)

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

v3 cover KVM: s390: Enable AP instructions for PV-guests

This series enables general KVM support for AP-passthrough for Secure Execution guests (PV-guests).

To enable AP inside PV-guests two things have to be done/considered:
1) set corresponding flags in the Create Secure Configuration UVC if
firmware supports AP for PV-guests (patch 3).
2) enable/disable AP in PV-guests if the VMM wants this (patch 2).

since v2:
- applied styling recommendations from Heiko

since v1:
- PATCH 1: r-b from Claudio
- PATCH 2: fixed formatting issues (Claudio)
- PATCH 3: removed unnecessary checks (Claudio)

Steffen

Steffen Eiden (3):
s390: uv: UV feature check utility
KVM: s390: Add UV feature negotiation
KVM: s390: pv: Allow AP-instructions for pv-guests

 arch/s390/include/asm/kvm_host.h |  2 +
 arch/s390/include/asm/uv.h       | 17 ++++++-
 arch/s390/include/uapi/asm/kvm.h | 16 +++++++
 arch/s390/kernel/uv.c            |  2 +-
 arch/s390/kvm/kvm-s390.c         | 76 +++++++++++++++++++++++++++++++-
 arch/s390/kvm/pv.c               |  6 ++-
 arch/s390/mm/fault.c             |  2 +-
 7 files changed, 115 insertions(+), 6 deletions(-)
Signature · 1 line
2.40.1
#1 lore raw

PATCH v3 1/3 s390: uv: UV feature check utility

Introduces a function to check the existence of an UV feature. Refactor feature bit checks to use the new function.

---
 arch/s390/include/asm/uv.h | 5 +++++
 arch/s390/kernel/uv.c      | 2 +-
 arch/s390/kvm/kvm-s390.c   | 2 +-
 arch/s390/mm/fault.c       | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)
arch/s390/include/asm/uv.h +5 -0
index d2cd42bb2c26..f76b2747b648 100644
@@ -397,6 +397,11 @@ struct uv_info {
 
 extern struct uv_info uv_info;
 
+static inline bool uv_has_feature(u8 feature_bit)
+{
+	return test_bit_inv(feature_bit, &uv_info.uv_feature_indications);
+}
+
 #ifdef CONFIG_PROTECTED_VIRTUALIZATION_GUEST
 extern int prot_virt_guest;
 
arch/s390/kernel/uv.c +1 -1
index b771f1b4cdd1..fc07bc39e698 100644
@@ -258,7 +258,7 @@ static bool should_export_before_import(struct uv_cb_header *uvcb, struct mm_str
 	 * shared page from a different protected VM will automatically also
 	 * transfer its ownership.
 	 */
-	if (test_bit_inv(BIT_UV_FEAT_MISC, &uv_info.uv_feature_indications))
+	if (uv_has_feature(BIT_UV_FEAT_MISC))
 		return false;
 	if (uvcb->cmd == UVC_CMD_UNPIN_PAGE_SHARED)
 		return false;
arch/s390/kvm/kvm-s390.c +1 -1
index e6511608280c..813cc3d59c90 100644
@@ -2406,7 +2406,7 @@ static int kvm_s390_cpus_to_pv(struct kvm *kvm, u16 *rc, u16 *rrc)
 	struct kvm_vcpu *vcpu;
 
 	/* Disable the GISA if the ultravisor does not support AIV. */
-	if (!test_bit_inv(BIT_UV_FEAT_AIV, &uv_info.uv_feature_indications))
+	if (!uv_has_feature(BIT_UV_FEAT_AIV))
 		kvm_s390_gisa_disable(kvm);
 
 	kvm_for_each_vcpu(i, vcpu, kvm) {
arch/s390/mm/fault.c +1 -1
index b5e1bea9194c..8a86dd725870 100644
@@ -599,7 +599,7 @@ void do_secure_storage_access(struct pt_regs *regs)
 	 * reliable without the misc UV feature so we need to check
 	 * for that as well.
 	 */
-	if (test_bit_inv(BIT_UV_FEAT_MISC, &uv_info.uv_feature_indications) &&
+	if (uv_has_feature(BIT_UV_FEAT_MISC) &&
 	    !test_bit_inv(61, &regs->int_parm_long)) {
 		/*
 		 * When this happens, userspace did something that it
Signature · 1 line
2.40.1
maintainer Reviewed-by on v3 1/3
#2 lore raw

Re: [PATCH v3 1/3] s390: uv: UV feature check utility

Quoted 5 lines · Steffen Eiden

Introduces a function to check the existence of an UV feature. Refactor feature bit checks to use the new function.

Please add a bounds check, then:

Quoted 12 lines
---
  arch/s390/include/asm/uv.h | 5 +++++
  arch/s390/kernel/uv.c      | 2 +-
  arch/s390/kvm/kvm-s390.c   | 2 +-
  arch/s390/mm/fault.c       | 2 +-
  4 files changed, 8 insertions(+), 3 deletions(-)
arch/s390/include/asm/uv.h +0 -0
index d2cd42bb2c26..f76b2747b648 100644

arch/s390/include/asm/uv.h struct uv_info { · line 401

Quoted 5 lines
arch/s390/include/asm/uv.h +2 -0
@@ -397,6 +397,11 @@ struct uv_info {
 
  extern struct uv_info uv_info;
 
+static inline bool uv_has_feature(u8 feature_bit)
+{

if (feature_bit >= sizeof(uv_info.uv_feature_indications) * 8)

	return false;
Quoted 45 lines
arch/s390/include/asm/uv.h +3 -0
+	return test_bit_inv(feature_bit, &uv_info.uv_feature_indications);
+}
+
  #ifdef CONFIG_PROTECTED_VIRTUALIZATION_GUEST
  extern int prot_virt_guest;
 
arch/s390/kernel/uv.c +1 -1
index b771f1b4cdd1..fc07bc39e698 100644
@@ -258,7 +258,7 @@ static bool should_export_before_import(struct uv_cb_header *uvcb, struct mm_str
  	 * shared page from a different protected VM will automatically also
  	 * transfer its ownership.
  	 */
-	if (test_bit_inv(BIT_UV_FEAT_MISC, &uv_info.uv_feature_indications))
+	if (uv_has_feature(BIT_UV_FEAT_MISC))
  		return false;
  	if (uvcb->cmd == UVC_CMD_UNPIN_PAGE_SHARED)
  		return false;
arch/s390/kvm/kvm-s390.c +1 -1
index e6511608280c..813cc3d59c90 100644
@@ -2406,7 +2406,7 @@ static int kvm_s390_cpus_to_pv(struct kvm *kvm, u16 *rc, u16 *rrc)
  	struct kvm_vcpu *vcpu;
 
  	/* Disable the GISA if the ultravisor does not support AIV. */
-	if (!test_bit_inv(BIT_UV_FEAT_AIV, &uv_info.uv_feature_indications))
+	if (!uv_has_feature(BIT_UV_FEAT_AIV))
  		kvm_s390_gisa_disable(kvm);
 
  	kvm_for_each_vcpu(i, vcpu, kvm) {
arch/s390/mm/fault.c +1 -1
index b5e1bea9194c..8a86dd725870 100644
@@ -599,7 +599,7 @@ void do_secure_storage_access(struct pt_regs *regs)
  	 * reliable without the misc UV feature so we need to check
  	 * for that as well.
  	 */
-	if (test_bit_inv(BIT_UV_FEAT_MISC, &uv_info.uv_feature_indications) &&
+	if (uv_has_feature(BIT_UV_FEAT_MISC) &&
  	    !test_bit_inv(61, &regs->int_parm_long)) {
  		/*
  		 * When this happens, userspace did something that it
#3 lore raw

PATCH v3 2/3 KVM: s390: Add UV feature negotiation

In reply to Steffen Eiden

Add a uv_feature list for pv-guests to the KVM cpu-model. The feature bits 'AP-interpretation for secure guests' and 'AP-interrupt for secure guests' are available.

---
 arch/s390/include/asm/kvm_host.h |  2 +
 arch/s390/include/uapi/asm/kvm.h | 16 +++++++
 arch/s390/kvm/kvm-s390.c         | 74 ++++++++++++++++++++++++++++++++
 3 files changed, 92 insertions(+)
arch/s390/include/asm/kvm_host.h +2 -0
index 91bfecb91321..427f9528a7b6 100644
@@ -817,6 +817,8 @@ struct kvm_s390_cpu_model {
 	__u64 *fac_list;
 	u64 cpuid;
 	unsigned short ibc;
+	/* subset of available UV-features for pv-guests enabled by user space */
+	struct kvm_s390_vm_cpu_uv_feat uv_feat_guest;
 };
 
 typedef int (*crypto_hook)(struct kvm_vcpu *vcpu);
arch/s390/include/uapi/asm/kvm.h +16 -0
index a73cf01a1606..abe926d43cbe 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
arch/s390/kvm/kvm-s390.c +74 -0

116 lines not on this page · raw message

Signature · 1 line
2.40.1
maintainer Reviewed-by on v3 2/3
#4 lore raw

Re: [PATCH v3 2/3] KVM: s390: Add UV feature negotiation

Quoted 5 lines · Steffen Eiden

Add a uv_feature list for pv-guests to the KVM cpu-model. The feature bits 'AP-interpretation for secure guests' and 'AP-interrupt for secure guests' are available.

[...]

Quoted 2 lines

+#define KVM_S390_VM_CPU_UV_FEAT_GUEST_DEFAULT 0

I don't think that's needed, just set it to 0 (and even that's not really needed since it's kzalloced but I'm fine with making this explicit).

Quoted 12 lines
  int kvm_arch_init_vm(struct kvm *kvm, unsigned long type)
  {
  	gfp_t alloc_flags = GFP_KERNEL_ACCOUNT;
arch/s390/kvm/kvm-s390.c +2 -0
@@ -3296,6 +3368,8 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type)
  	kvm->arch.model.cpuid = kvm_s390_get_initial_cpuid();
  	kvm->arch.model.ibc = sclp.ibc & 0x0fff;
 
+	kvm->arch.model.uv_feat_guest.feat = KVM_S390_VM_CPU_UV_FEAT_GUEST_DEFAULT;
+
  	kvm_s390_crypto_init(kvm);
 
  	if (IS_ENABLED(CONFIG_VFIO_PCI_ZDEV_KVM)) {
#5 lore raw

PATCH v3 3/3 KVM: s390: pv: Allow AP-instructions for pv-guests

In reply to Steffen Eiden

Introduces new feature bits and enablement flags for AP and AP IRQ support.

---
 arch/s390/include/asm/uv.h | 12 +++++++++++-
 arch/s390/kvm/pv.c         |  6 ++++--
 2 files changed, 15 insertions(+), 3 deletions(-)
arch/s390/include/asm/uv.h +11 -1
index f76b2747b648..680654ff6d17 100644
@@ -99,6 +99,8 @@ enum uv_cmds_inst {
 enum uv_feat_ind {
 	BIT_UV_FEAT_MISC = 0,
 	BIT_UV_FEAT_AIV = 1,
+	BIT_UV_FEAT_AP = 4,
+	BIT_UV_FEAT_AP_INTR = 5,
 };
 
 struct uv_cb_header {
@@ -159,7 +161,15 @@ struct uv_cb_cgc {
 	u64 guest_handle;
 	u64 conf_base_stor_origin;
 	u64 conf_virt_stor_origin;
-	u64 reserved30;
+	u8  reserved30[6];
+	union {
+		struct {
+			u16 : 14;
+			u16 ap_instr_intr : 1;
+			u16 ap_allow_instr : 1;
+		};
+		u16 raw;
+	} flags;
 	u64 guest_stor_origin;
 	u64 guest_stor_len;
 	u64 guest_sca;
arch/s390/kvm/pv.c +4 -2
index 8d3f39a8a11e..bbd3a93db341 100644
@@ -575,12 +575,14 @@ int kvm_s390_pv_init_vm(struct kvm *kvm, u16 *rc, u16 *rrc)
 	uvcb.conf_base_stor_origin =
 		virt_to_phys((void *)kvm->arch.pv.stor_base);
 	uvcb.conf_virt_stor_origin = (u64)kvm->arch.pv.stor_var;
+	uvcb.flags.ap_allow_instr = kvm->arch.model.uv_feat_guest.ap;
+	uvcb.flags.ap_instr_intr = kvm->arch.model.uv_feat_guest.ap_intr;
 
 	cc = uv_call_sched(0, (u64)&uvcb);
 	*rc = uvcb.header.rc;
 	*rrc = uvcb.header.rrc;
-	KVM_UV_EVENT(kvm, 3, "PROTVIRT CREATE VM: handle %llx len %llx rc %x rrc %x",
-		     uvcb.guest_handle, uvcb.guest_stor_len, *rc, *rrc);
+	KVM_UV_EVENT(kvm, 3, "PROTVIRT CREATE VM: handle %llx len %llx rc %x rrc %x flags %04x",
+		     uvcb.guest_handle, uvcb.guest_stor_len, *rc, *rrc, uvcb.flags.raw);
 
 	/* Outputs */
 	kvm->arch.pv.handle = uvcb.guest_handle;
Signature · 1 line
2.40.1
maintainer Reviewed-by on v3 3/3
#6 lore raw

Re: [PATCH v3 3/3] KVM: s390: pv: Allow AP-instructions for pv-guests

Quoted 4 lines · Steffen Eiden

Introduces new feature bits and enablement flags for AP and AP IRQ support.

Quoted 56 lines
---
  arch/s390/include/asm/uv.h | 12 +++++++++++-
  arch/s390/kvm/pv.c         |  6 ++++--
  2 files changed, 15 insertions(+), 3 deletions(-)
arch/s390/include/asm/uv.h +11 -1
index f76b2747b648..680654ff6d17 100644
@@ -99,6 +99,8 @@ enum uv_cmds_inst {
  enum uv_feat_ind {
  	BIT_UV_FEAT_MISC = 0,
  	BIT_UV_FEAT_AIV = 1,
+	BIT_UV_FEAT_AP = 4,
+	BIT_UV_FEAT_AP_INTR = 5,
  };
 
  struct uv_cb_header {
@@ -159,7 +161,15 @@ struct uv_cb_cgc {
  	u64 guest_handle;
  	u64 conf_base_stor_origin;
  	u64 conf_virt_stor_origin;
-	u64 reserved30;
+	u8  reserved30[6];
+	union {
+		struct {
+			u16 : 14;
+			u16 ap_instr_intr : 1;
+			u16 ap_allow_instr : 1;
+		};
+		u16 raw;
+	} flags;
  	u64 guest_stor_origin;
  	u64 guest_stor_len;
  	u64 guest_sca;
arch/s390/kvm/pv.c +4 -2
index 8d3f39a8a11e..bbd3a93db341 100644
@@ -575,12 +575,14 @@ int kvm_s390_pv_init_vm(struct kvm *kvm, u16 *rc, u16 *rrc)
  	uvcb.conf_base_stor_origin =
  		virt_to_phys((void *)kvm->arch.pv.stor_base);
  	uvcb.conf_virt_stor_origin = (u64)kvm->arch.pv.stor_var;
+	uvcb.flags.ap_allow_instr = kvm->arch.model.uv_feat_guest.ap;
+	uvcb.flags.ap_instr_intr = kvm->arch.model.uv_feat_guest.ap_intr;
 
  	cc = uv_call_sched(0, (u64)&uvcb);
  	*rc = uvcb.header.rc;
  	*rrc = uvcb.header.rrc;
-	KVM_UV_EVENT(kvm, 3, "PROTVIRT CREATE VM: handle %llx len %llx rc %x rrc %x",
-		     uvcb.guest_handle, uvcb.guest_stor_len, *rc, *rrc);
+	KVM_UV_EVENT(kvm, 3, "PROTVIRT CREATE VM: handle %llx len %llx rc %x rrc %x flags %04x",
+		     uvcb.guest_handle, uvcb.guest_stor_len, *rc, *rrc, uvcb.flags.raw);
 
  	/* Outputs */
  	kvm->arch.pv.handle = uvcb.guest_handle;