KVM: s390: Fix a deadlock
Claudio Imbrenda
maintainerPATCH 1/1 KVM: s390: Fix a deadlock
In some scenarios, a deadlock can happen, involving _do_shadow_pte().
Convert all usages of pgste_get_lock() to pgste_get_trylock() in _do_shadow_pte() and return -EAGAIN. All callers can already deal with -EAGAIN being returned.
--- arch/s390/kvm/gaccess.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
arch/s390/kvm/gaccess.c +4 -2
@@ -1434,7 +1434,8 @@ static int _do_shadow_pte(struct gmap *sg, gpa_t raddr, union pte *ptep_h, unionif (rc)return rc; - pgste =pgste_get_lock (ptep_h); +if (!pgste_get_trylock (ptep_h, &pgste)) +return -EAGAIN ; newpte =_pte (f->pfn, f->writable, !p,0 ); newpte.s.d |= ptep->s.d; newpte.s.sd |= ptep->s.sd;
@@ -1444,7 +1445,8 @@ static int _do_shadow_pte(struct gmap *sg, gpa_t raddr, union pte *ptep_h, unionpgste_set_unlock (ptep_h, pgste); newpte =_pte (f->pfn,0 , !p,0 ); - pgste =pgste_get_lock (ptep); +if (!pgste_get_trylock (ptep, &pgste)) +return -EAGAIN ; pgste =__dat_ptep_xchg (ptep, pgste, newpte,gpa_to_gfn (raddr), sg->asce,uses_skeys (sg));pgste_set_unlock (ptep, pgste);
Signature · 1 line
2.53.0
Quoted 8 lines · Claudio Imbrenda
In some scenarios, a deadlock can happen, involving
_do_shadow_pte().Convert all usages of
pgste_get_lock()topgste_get_trylock()in_do_shadow_pte()and return-EAGAIN. All callers can already deal with-EAGAINbeing returned.Signed-off-by Claudio Imbrenda <[email protected]>Fixes e38c884df921 ("KVM: s390: Switch to new gmap")
Quoted 8 lines · Claudio Imbrenda
In some scenarios, a deadlock can happen, involving
_do_shadow_pte().Convert all usages of
pgste_get_lock()topgste_get_trylock()in_do_shadow_pte()and return-EAGAIN. All callers can already deal with-EAGAINbeing returned.Signed-off-by Claudio Imbrenda <[email protected]>Fixes e38c884df921 ("KVM: s390: Switch to new gmap")
Am 03.03.26 um 18:52 schrieb Claudio Imbrenda:
Quoted 8 lines
In some scenarios, a deadlock can happen, involving
_do_shadow_pte().Convert all usages of
pgste_get_lock()topgste_get_trylock()in_do_shadow_pte()and return-EAGAIN. All callers can already deal with-EAGAINbeing returned.Signed-off-by Claudio Imbrenda <[email protected]>Fixes e38c884df921 ("KVM: s390: Switch to new gmap")
I no longer see the rcu stalls.
Quoted 28 lines
--- arch/s390/kvm/gaccess.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)arch/s390/kvm/gaccess.c +4
-2@@ -1434,7 +1434,8 @@ static int _do_shadow_pte(struct gmap *sg, gpa_t raddr, union pte *ptep_h, unionif (rc)return rc; - pgste =pgste_get_lock (ptep_h); +if (!pgste_get_trylock (ptep_h, &pgste)) +return -EAGAIN ; newpte =_pte (f->pfn, f->writable, !p,0 ); newpte.s.d |= ptep->s.d; newpte.s.sd |= ptep->s.sd;@@ -1444,7 +1445,8 @@ static int _do_shadow_pte(struct gmap *sg, gpa_t raddr, union pte *ptep_h, unionpgste_set_unlock (ptep_h, pgste); newpte =_pte (f->pfn,0 , !p,0 ); - pgste =pgste_get_lock (ptep); +if (!pgste_get_trylock (ptep, &pgste)) +return -EAGAIN ; pgste =__dat_ptep_xchg (ptep, pgste, newpte,gpa_to_gfn (raddr), sg->asce,uses_skeys (sg));pgste_set_unlock (ptep, pgste);