Skip to contentSkip to conversation

KVM: s390: add kvm reference to struct sie_page2

PATCH David Hildenbrand 1 participant 1 message Nov 29, 2018 1 message not in the archive s390

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

David Hildenbrand

author Reviewed-by
#1 lore raw
Quoted 36 lines · Michael Mueller

Adding the kvm reference to struct sie_page2 will allow to determine the kvm a given gisa belongs to:

container_of(gisa, struct sie_page2, gisa)->kvm

This functionality will be required to process a gisa in gib alert interruption context.

---
 arch/s390/include/asm/kvm_host.h | 3 ++-
 arch/s390/kvm/kvm-s390.c         | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)
arch/s390/include/asm/kvm_host.h +2 -1
index 02227457945e..3e3225ea303b 100644
@@ -802,7 +802,8 @@ struct sie_page2 {
 	__u64 fac_list[S390_ARCH_FAC_LIST_SIZE_U64];	/* 0x0000 */
 	struct kvm_s390_crypto_cb crycb;		/* 0x0800 */
 	struct kvm_s390_gisa gisa;			/* 0x0900 */
-	u8 reserved920[0x1000 - 0x920];			/* 0x0920 */
+	struct kvm *kvm;				/* 0x0920 */
+	u8 reserved928[0x1000 - 0x928];			/* 0x0928 */
 };
 
 struct kvm_s390_vsie {
arch/s390/kvm/kvm-s390.c +0 -0
index 46dcf9ea59d3..e00eae7ec0b8 100644

arch/s390/kvm/kvm-s390.c int kvm_arch_init_vm(struct kvm *kvm, unsigned long type) · line 2225

Quoted 7 lines
arch/s390/kvm/kvm-s390.c +1 -0
@@ -2219,6 +2219,7 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type)
 	if (!kvm->arch.sie_page2)
 		goto out_err;
 
+	kvm->arch.sie_page2->kvm = kvm;
 	kvm->arch.model.fac_list = kvm->arch.sie_page2->fac_list;
 
 	for (i = 0; i < kvm_s390_fac_size(); i++) {
Signature · 3 lines
Thanks,

David / dhildenb