On Wed, May 12, 2021 at 02:34:29PM +0200, Christian Borntraeger wrote: > > > On 12.05.21 12:24, gregkh@xxxxxxxxxxxxxxxxxxx wrote: > > > > This is a note to let you know that I've just added the patch titled > > > > KVM: s390: VSIE: correctly handle MVPG when in VSIE > > > > to the 4.14-stable tree which can be found at: > > http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary > > > > The filename of the patch is: > > kvm-s390-vsie-correctly-handle-mvpg-when-in-vsie.patch > > and it can be found in the queue-4.14 subdirectory. > > > > If you, or anyone else, feels it should not be added to the stable tree, > > please let <stable@xxxxxxxxxxxxxxx> know about it. > > > > > > From bdf7509bbefa20855d5f6bacdc5b62a8489477c9 Mon Sep 17 00:00:00 2001 > > From: Claudio Imbrenda <imbrenda@xxxxxxxxxxxxx> > > Date: Mon, 1 Feb 2021 21:54:13 +0100 > > Subject: KVM: s390: VSIE: correctly handle MVPG when in VSIE > > > > From: Claudio Imbrenda <imbrenda@xxxxxxxxxxxxx> > > > > commit bdf7509bbefa20855d5f6bacdc5b62a8489477c9 upstream. > > > > Correctly handle the MVPG instruction when issued by a VSIE guest. > > > > Fixes: a3508fbe9dc6d ("KVM: s390: vsie: initial support for nested virtualization") > > Cc: stable@xxxxxxxxxxxxxxx # f85f1baaa189: KVM: s390: split kvm_s390_logical_to_effective > > Signed-off-by: Claudio Imbrenda <imbrenda@xxxxxxxxxxxxx> > > Acked-by: Janosch Frank <frankja@xxxxxxxxxxxxx> > > Reviewed-by: David Hildenbrand <david@xxxxxxxxxx> > > Acked-by: Christian Borntraeger <borntraeger@xxxxxxxxxx> > > Link: https://lore.kernel.org/r/20210302174443.514363-4-imbrenda@xxxxxxxxxxxxx > > [borntraeger@xxxxxxxxxx: apply fixup from Claudio] > > Signed-off-by: Christian Borntraeger <borntraeger@xxxxxxxxxx> > > Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> > [..] > > > +static int vsie_handle_mvpg(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page) > > +{ > > + struct kvm_s390_sie_block *scb_s = &vsie_page->scb_s; > > + unsigned long pei_dest, pei_src, src, dest, mask; > > + u64 *pei_block = &vsie_page->scb_o->mcic; > > Claudio. 4.14, 4.19 and 5.4 misses some prereqs: > > CC arch/s390/kvm/vsie.o > arch/s390/kvm/vsie.c: In function ‘vsie_handle_mvpg’: > arch/s390/kvm/vsie.c:843:43: error: ‘struct kvm_s390_sie_block’ has no member named ‘mcic’ > 843 | u64 *pei_block = &vsie_page->scb_o->mcic; > > > I think something like > scb_o->reservedb0[16] > for 4.9 > > instead of scb_o->mcic > would be a quick fix, but someone would need to test this. > > Greg, > so maybe lets just drop the whole series for 5.4 and older until we have a fixup? Ok, I'll go drop these: bdf7509bbefa ("KVM: s390: VSIE: correctly handle MVPG when in VSIE") c3171e94cc1c ("KVM: s390: VSIE: fix MVPG handling for prefixing and MSO") 5ac14bac08ae ("KVM: s390: extend kvm_s390_shadow_fault to return entry pointer") from 4.14, 4.19, and 5.4. If I should drop more, please let me know. thanks, greg k-h
