VSIE epdx shadowing fix

-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEwGNS88vfc9+v45Yq41TmuOI4ufgFAmN/d5sACgkQ41TmuOI4
 ufhAqQ//X4Qq6jsJL/P2wdKIjQHXaJlrLkcJ2vgYcu0DspFIcpKK+HGYBFWE0sCO
 Lm9BqsPnGN8awlBWp8USEEnLVhhGR542/zbAslj9eIBE4Z2/dOv3ptxOjGE+VtXl
 cd146UspWdOREvnmn8BM55124nj5ebVwGB2zVrkmI5Df6z8ZHsYAKvziw4dCmuwU
 7lDSffQ30XWXERSXCC4xQhcaj9rGSNx2PpveCQcn4Hw2G9JEzxoJTvaUuMzcWRw+
 nQ0uVowZLRxiLJvGCsRW4FhXFKbWX/SYUVtWTWmVMTzKrmGi4nYV2nZ16j6KELch
 frCAY8kg/vJzYW5KwXNtDO9wDffmcAzQKvbQqNDCOcmOb9EB7upjj4OUDa+XfIV7
 LZzUwe/90cW8/dqtUWG14jHy0CC20xPUB1eEBuNf1XQ/BjkJjFxVYqhKjgzi3VLy
 kpwTwWLG/WNH5qPpr2PL3abNy3ypJJ4Z7N+1nYy3x1L8cPngPaesZqtfhrnNPMNU
 aC76oAr9lVKbpk5waxwcqujoJDJloko9zxWRxeJAk+Wj425dh8F2dwp53I11/rTf
 qQUghFbCIVKxMXvCPaR6Yji6I89Wh0nY7JZuPQjjE2qSXntyZ8KH9iQ43Z1+EQv2
 U0CBSjlnl2B6Dotbzhgp+B4WuAVsH+QV8n3pL8IcwgPjTRg5NQM=
 =/yQz
 -----END PGP SIGNATURE-----

Merge tag 'kvm-s390-master-6.1-2' of https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD

VSIE epdx shadowing fix
This commit is contained in:
Paolo Bonzini 2022-11-29 04:15:33 -05:00
commit 7e3bba93f4

View file

@ -546,8 +546,10 @@ static int shadow_scb(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page)
if (test_kvm_cpu_feat(vcpu->kvm, KVM_S390_VM_CPU_FEAT_CEI))
scb_s->eca |= scb_o->eca & ECA_CEI;
/* Epoch Extension */
if (test_kvm_facility(vcpu->kvm, 139))
if (test_kvm_facility(vcpu->kvm, 139)) {
scb_s->ecd |= scb_o->ecd & ECD_MEF;
scb_s->epdx = scb_o->epdx;
}
/* etoken */
if (test_kvm_facility(vcpu->kvm, 156))