Message ID | 20191024114059.102802-6-frankja@linux.ibm.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | KVM: s390: Add support for protected VMs | expand |
On 24.10.19 13:40, Janosch Frank wrote: > We need it in the next patch, when doing memory management for the > guest in the kernel's fault handler, where otherwise we wouldn't have > access to the handle. > > Signed-off-by: Janosch Frank <frankja@linux.ibm.com> > --- > arch/s390/include/asm/gmap.h | 1 + > arch/s390/kvm/pv.c | 1 + > 2 files changed, 2 insertions(+) > > diff --git a/arch/s390/include/asm/gmap.h b/arch/s390/include/asm/gmap.h > index 37f96b6f0e61..6efc0b501227 100644 > --- a/arch/s390/include/asm/gmap.h > +++ b/arch/s390/include/asm/gmap.h > @@ -61,6 +61,7 @@ struct gmap { > spinlock_t shadow_lock; > struct gmap *parent; > unsigned long orig_asce; > + unsigned long se_handle; > int edat_level; > bool removed; > bool initialized; > diff --git a/arch/s390/kvm/pv.c b/arch/s390/kvm/pv.c > index 94cf16f40f25..80aecd5bea9e 100644 > --- a/arch/s390/kvm/pv.c > +++ b/arch/s390/kvm/pv.c > @@ -169,6 +169,7 @@ int kvm_s390_pv_create_vm(struct kvm *kvm) > kvm_s390_pv_dealloc_vm(kvm); > return -EINVAL; > } > + kvm->arch.gmap->se_handle = uvcb.guest_handle; > return rc; > } > > I'd suggest squashing that into the patch that needs it.
diff --git a/arch/s390/include/asm/gmap.h b/arch/s390/include/asm/gmap.h index 37f96b6f0e61..6efc0b501227 100644 --- a/arch/s390/include/asm/gmap.h +++ b/arch/s390/include/asm/gmap.h @@ -61,6 +61,7 @@ struct gmap { spinlock_t shadow_lock; struct gmap *parent; unsigned long orig_asce; + unsigned long se_handle; int edat_level; bool removed; bool initialized; diff --git a/arch/s390/kvm/pv.c b/arch/s390/kvm/pv.c index 94cf16f40f25..80aecd5bea9e 100644 --- a/arch/s390/kvm/pv.c +++ b/arch/s390/kvm/pv.c @@ -169,6 +169,7 @@ int kvm_s390_pv_create_vm(struct kvm *kvm) kvm_s390_pv_dealloc_vm(kvm); return -EINVAL; } + kvm->arch.gmap->se_handle = uvcb.guest_handle; return rc; }
We need it in the next patch, when doing memory management for the guest in the kernel's fault handler, where otherwise we wouldn't have access to the handle. Signed-off-by: Janosch Frank <frankja@linux.ibm.com> --- arch/s390/include/asm/gmap.h | 1 + arch/s390/kvm/pv.c | 1 + 2 files changed, 2 insertions(+)