KVM: s390: Fixes for 6.8
Janosch Frank
maintainerPaolo,
please pull the fixes for the following two problems:
- The PQAP instruction did not set the CC in all occasions
- We observed crashes with nested guests because a pointer to struct kvm was accessed before being valid (resulting in NULL pointers).
You'll see that the fixes are still based on 6.7-rc4 since they've lived on our master for quite a while. But I've re-based them on Linus' master and your queue and next branches without an issue.
The following changes since commit 4cdf351d3630a640ab6a05721ef055b9df62277f:
KVM: SVM: Update EFER software model on CR0 trap for SEV-ES (2023-12-08 13:37:05 -0500)
are available in the Git repository at:
https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git tags/kvm-s390-master-6.8-1
for you to fetch changes up to 83303a4c776ce1032d88df59e811183479acea77:
KVM: s390: fix cc for successful PQAP (2024-01-08 18:05:44 +0100)
----------------------------------------------------------------
pqap instruction missing cc fix
vsie shadow creation race fix
----------------------------------------------------------------
Christian Borntraeger (1):
KVM: s390: vsie: fix race during shadow creation
Eric Farman (1):
KVM: s390: fix cc for successful PQAP
arch/s390/kvm/priv.c | 8 ++++++-- arch/s390/kvm/vsie.c | 1 - arch/s390/mm/gmap.c | 1 + 3 files changed, 7 insertions(+), 3 deletions(-)
Signature · 1 line
2.43.0
Janosch Frank
maintainer[GIT PULL 1/2] KVM: s390: vsie: fix race during shadow creation
From: Christian Borntraeger <[email protected]>
Right now it is possible to see gmap->private being zero in kvm_s390_vsie_gmap_notifier resulting in a crash. This is due to the fact that we add gmap->private == kvm after creation:
static int acquire_gmap_shadow(struct kvm_vcpu *vcpu,
struct vsie_page *vsie_page)
{
[...]
gmap = gmap_shadow(vcpu->arch.gmap, asce, edat);
if (IS_ERR(gmap))
return PTR_ERR(gmap);
gmap->private = vcpu->kvm;Let children inherit the private field of the parent.
--- arch/s390/kvm/vsie.c | 1 - arch/s390/mm/gmap.c | 1 + 2 files changed, 1 insertion(+), 1 deletion(-)
arch/s390/kvm/vsie.c +0 -1
@@ -1220,7 +1220,6 @@ static int acquire_gmap_shadow(struct kvm_vcpu *vcpu, gmap =gmap_shadow (vcpu->arch.gmap, asce, edat);if (IS_ERR (gmap))return PTR_ERR (gmap); - gmap->private = vcpu->kvm; vcpu->kvm->stat.gmap_shadow_create++;WRITE_ONCE (vsie_page->gmap, gmap);return 0 ;
arch/s390/mm/gmap.c +1 -0
@@ -1691,6 +1691,7 @@ struct gmap *gmap_shadow(struct gmap *parent, unsigned long asce,return ERR_PTR (-ENOMEM ); new->mm = parent->mm; new->parent =gmap_get (parent); + new->private = parent->private; new->orig_asce = asce; new->edat_level = edat_level; new->initialized = false;
Signature · 1 line
2.43.0
Janosch Frank
maintainer[GIT PULL 2/2] KVM: s390: fix cc for successful PQAP
In reply to Janosch FrankFrom: Eric Farman <[email protected]>
The various errors that are possible when processing a PQAP instruction (the absence of a driver hook, an error FROM that hook), all correctly set the PSW condition code to 3. But if that processing works successfully, CC0 needs to be set to convey that everything was fine.
Fix the check so that the guest can examine the condition code to determine whether GPR1 has meaningful data.
Message-Id: <[email protected]>
--- arch/s390/kvm/priv.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
arch/s390/kvm/priv.c +6 -2
@@ -676,8 +676,12 @@ static int handle_pqap(struct kvm_vcpu *vcpu)if (vcpu->kvm->arch.crypto.pqap_hook) { pqap_hook = *vcpu->kvm->arch.crypto.pqap_hook; ret =pqap_hook (vcpu); -if (!ret && vcpu->run->s.regs.gprs[1 ] &0x00ff0000 ) -kvm_s390_set_psw_cc (vcpu,3 ); +if (!ret) { +if (vcpu->run->s.regs.gprs[1 ] &0x00ff0000 ) +kvm_s390_set_psw_cc (vcpu,3 ); +else +kvm_s390_set_psw_cc (vcpu,0 ); + }up_read (&vcpu->kvm->arch.crypto.pqap_hook_rwsem);return ret; }
Signature · 1 line
2.43.0
Paolo Bonzini
maintainerQuoted 16 lines · Janosch Frank
Paolo,
please pull the fixes for the following two problems:
- The PQAP instruction did not set the CC in all occasions
- We observed crashes with nested guests because a pointer to struct kvm was accessed before being valid (resulting in NULL pointers).You'll see that the fixes are still based on 6.7-rc4 since they've lived on our master for quite a while. But I've re-based them on Linus' master and your queue and next branches without an issue.
The following changes since commit
4cdf351d3630a640ab6a05721ef055b9df62277f:KVM: SVM: Update EFER software model on CR0 trap for SEV-ES (2023-12-08 13:37:05 -0500)
Quoted 7 lines
are available in the Git repository at:
https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git tags/kvm-s390-master-6.8-1
for you to fetch changes up to
83303a4c776ce1032d88df59e811183479acea77:KVM: s390: fix cc for successful PQAP (2024-01-08 18:05:44 +0100)
Pulled, thanks.
Paolo
Quoted 19 lines
----------------------------------------------------------------
pqap instruction missing cc fix
vsie shadow creation race fix
----------------------------------------------------------------Christian Borntraeger (1):
KVM: s390: vsie: fix race during shadow creationEric Farman (1):
KVM: s390: fix cc for successful PQAParch/s390/kvm/priv.c | 8 ++++++-- arch/s390/kvm/vsie.c | 1 - arch/s390/mm/gmap.c | 1 + 3 files changed, 7 insertions(+), 3 deletions(-)--
2.43.0