Skip to contentSkip to conversation

KVM: s390: More memory management fixes

PATCH Superseded Claudio Imbrenda 5 participants 25 messages Mar 20 – Mar 24

Subsystems (3)

v2 of 5 Superseded Latest is v5 →

lore
Share & tools
lore

Claudio Imbrenda

author maintainer
#0 lore raw

v2 cover KVM: s390: More memory management fixes

This series fixes some bugs that have been recently introduced with the big gmap rewrite.

Most of the fixes are related to vSIE (nested guests), although some are more general. The last patch fixes an issue introduced last year.

v1->v2
* propagate vsie notification bit when splitting a large page
* replace gmap_crstep_xchg() with gmap_crstep_xchg_atomic(); let the callers properly deal with races
* do not attempt to protect guest page table when the nested guest is running in a real address space
* fix return value of KVM_S390_VCPU_FAULT in case of error

Claudio Imbrenda (8):
KVM: s390: vsie: Fix dat_split_ste()
KVM: s390: Remove non-atomic dat_crstep_xchg()
KVM: s390: vsie: Fix check for pre-existing shadow mapping
KVM: s390: Fix gmap_link()
KVM: s390: vsie: Fix refcount overflow for shadow gmaps
KVM: s390: vsie: Fix unshadowing while shadowing
KVM: s390: vsie: Fix guest page tables protection
KVM: s390: Fix KVM_S390_VCPU_FAULT ioctl

 arch/s390/kvm/dat.c      | 102 +++++----------------------
 arch/s390/kvm/dat.h      |  11 +--
 arch/s390/kvm/gaccess.c  |  43 ++++++-----
 arch/s390/kvm/gmap.c     | 149 +++++++++++++++++++++++++++++----------
 arch/s390/kvm/gmap.h     |  24 ++++---
 arch/s390/kvm/kvm-s390.c |  18 ++++-
 arch/s390/kvm/vsie.c     |   4 +-
 7 files changed, 189 insertions(+), 162 deletions(-)
Signature · 1 line
2.53.0
author maintainer
#1 lore raw

PATCH v2 1/8 KVM: s390: vsie: Fix dat_split_ste()

If the guest misbehaves and puts the page tables for its nested guest inside the memory of the nested guest itself, the shadow mapping will lose synchronization with the actual mapping.

Propagate the vsie_notif bit from shadowed large pages to smaller pages when splitting a large page.

Fixes 2db149a0a6c5 ("KVM: s390: KVM page table management functions: walks")
---
 arch/s390/kvm/dat.c | 1 +
 1 file changed, 1 insertion(+)
arch/s390/kvm/dat.c +1 -0
index 670404d4fa44..48b5f2bcf172 100644
@@ -292,6 +292,7 @@ static int dat_split_ste(struct kvm_s390_mmu_cache *mc, union pmd *pmdp, gfn_t g
 				pt->ptes[i].val = init.val | i * PAGE_SIZE;
 			/* No need to take locks as the page table is not installed yet. */
 			pgste_init.prefix_notif = old.s.fc1.prefix_notif;
+			pgste_init.vsie_notif = old.s.fc1.vsie_notif;
 			pgste_init.pcl = uses_skeys && init.h.i;
 			dat_init_pgstes(pt, pgste_init.val);
 		} else {
Signature · 1 line
2.53.0
Reviewed-by on v2 1/8
#2 lore raw

Re: [PATCH v2 1/8] KVM: s390: vsie: Fix dat_split_ste()

Quoted 9 lines · Claudio Imbrenda

If the guest misbehaves and puts the page tables for its nested guest inside the memory of the nested guest itself, the shadow mapping will lose synchronization with the actual mapping.

Propagate the vsie_notif bit from shadowed large pages to smaller pages when splitting a large page.

Fixes 2db149a0a6c5 ("KVM: s390: KVM page table management functions: walks")
Quoted 19 lines
---
 arch/s390/kvm/dat.c | 1 +
 1 file changed, 1 insertion(+)
arch/s390/kvm/dat.c +1 -0
index 670404d4fa44..48b5f2bcf172 100644
@@ -292,6 +292,7 @@ static int dat_split_ste(struct kvm_s390_mmu_cache *mc, union pmd *pmdp, gfn_t g
 				pt->ptes[i].val = init.val | i * PAGE_SIZE;
 			/* No need to take locks as the page table is not installed yet. */
 			pgste_init.prefix_notif = old.s.fc1.prefix_notif;
+			pgste_init.vsie_notif = old.s.fc1.vsie_notif;
 			pgste_init.pcl = uses_skeys && init.h.i;
 			dat_init_pgstes(pt, pgste_init.val);
 		} else {
Signature · 1 line
2.53.0
Reviewed-by on v2 1/8
#3 lore raw

Re: [PATCH v2 1/8] KVM: s390: vsie: Fix dat_split_ste()

In reply to Claudio Imbrenda
Quoted 9 lines · Claudio Imbrenda

If the guest misbehaves and puts the page tables for its nested guest inside the memory of the nested guest itself, the shadow mapping will lose synchronization with the actual mapping.

Propagate the vsie_notif bit from shadowed large pages to smaller pages when splitting a large page.

Fixes 2db149a0a6c5 ("KVM: s390: KVM page table management functions: walks")
Quoted 16 lines
---
 arch/s390/kvm/dat.c | 1 +
 1 file changed, 1 insertion(+)
arch/s390/kvm/dat.c +1 -0
index 670404d4fa44..48b5f2bcf172 100644
@@ -292,6 +292,7 @@ static int dat_split_ste(struct kvm_s390_mmu_cache *mc, union pmd *pmdp, gfn_t g
 				pt->ptes[i].val = init.val | i * PAGE_SIZE;
 			/* No need to take locks as the page table is not installed yet. */
 			pgste_init.prefix_notif = old.s.fc1.prefix_notif;
+			pgste_init.vsie_notif = old.s.fc1.vsie_notif;
 			pgste_init.pcl = uses_skeys && init.h.i;
 			dat_init_pgstes(pt, pgste_init.val);
 		} else {
maintainer Reviewed-by on v2 1/8
#4 lore raw

Re: [PATCH v2 1/8] KVM: s390: vsie: Fix dat_split_ste()

In reply to Claudio Imbrenda
Quoted 4 lines · Claudio Imbrenda

If the guest misbehaves and puts the page tables for its nested guest inside the memory of the nested guest itself, the shadow mapping will lose synchronization with the actual mapping.

Maybe add this (or similar) instead of the sentence below:

This is due to the fact that we don't propagate the vsie bit from large STEs to all PTEs when splitting.

Let's copy that bit over just like the prefix bit.

Quoted 2 lines

Propagate the vsie_notif bit from shadowed large pages to smaller pages when splitting a large page.

author maintainer
#5 lore raw

PATCH v2 2/8 KVM: s390: Remove non-atomic dat_crstep_xchg()

In reply to Claudio Imbrenda

In practice dat_crstep_xchg() is racy and hard to use correctly. Simply remove it and replace its uses with dat_crstep_xchg_atomic().

This solves some actual races that lead to system hangs / crashes.

Fixes 589071eaaa8f ("KVM: s390: KVM page table management functions: clear and replace")
Fixes 94fd9b16cc67 ("KVM: s390: KVM page table management functions: lifecycle management")
---
 arch/s390/kvm/dat.c     | 53 ++++++++------------------
 arch/s390/kvm/dat.h     |  9 +++--
 arch/s390/kvm/gaccess.c | 26 +++++++------
 arch/s390/kvm/gmap.c    | 82 ++++++++++++++++++++++++-----------------
 arch/s390/kvm/gmap.h    | 24 ++++++------
 5 files changed, 97 insertions(+), 97 deletions(-)
arch/s390/kvm/dat.c +15 -38
index 48b5f2bcf172..8ba80b0b4698 100644
@@ -134,32 +134,6 @@ int dat_set_asce_limit(struct kvm_s390_mmu_cache *mc, union asce *asce, int newt
 	return 0;
 }
 
-/**
- * dat_crstep_xchg() - Exchange a gmap CRSTE with another.
- * @crstep: Pointer to the CRST entry
- * @new: Replacement entry.
- * @gfn: The affected guest address.
- * @asce: The ASCE of the address space.
- *
- * Context: This function is assumed to be called with kvm->mmu_lock held.
- */
-void dat_crstep_xchg(union crste *crstep, union crste new, gfn_t gfn, union asce asce)
-{
-	if (crstep->h.i) {
-		WRITE_ONCE(*crstep, new);
-		return;
-	} else if (cpu_has_edat2()) {
-		crdte_crste(crstep, *crstep, new, gfn, asce);
-		return;
-	}
-
-	if (machine_has_tlb_guest())
-		idte_crste(crstep, gfn, IDTE_GUEST_ASCE, asce, IDTE_GLOBAL);
-	else
-		idte_crste(crstep, gfn, 0, NULL_ASCE, IDTE_GLOBAL);
-	WRITE_ONCE(*crstep, new);
-}
-
 /**
  * dat_crstep_xchg_atomic() - Atomically exchange a gmap CRSTE with another.
  * @crstep: Pointer to the CRST entry.
@@ -175,8 +149,8 @@ void dat_crstep_xchg(union crste *crstep, union crste new, gfn_t gfn, union asce
  *
  * Return: %true if the exchange was successful.
  */
-bool dat_crstep_xchg_atomic(union crste *crstep, union crste old, union crste new, gfn_t gfn,
-			    union asce asce)
+bool __must_check dat_crstep_xchg_atomic(union crste *crstep, union crste old, union crste new,
+					 gfn_t gfn, union asce asce)
 {
 	if (old.h.i)
 		return arch_try_cmpxchg((long *)crstep, &old.val, new.val);
@@ -894,7 +868,8 @@ static long _dat_slot_crste(union crste *crstep, gfn_t gfn, gfn_t next, struct d
 
 	/* This table entry needs to be updated. */
 	if (walk->start <= gfn && walk->end >= next) {
-		dat_crstep_xchg_atomic(crstep, crste, new_crste, gfn, walk->asce);
+		if (!dat_crstep_xchg_atomic(crstep, crste, new_crste, gfn, walk->asce))
+			return -EINVAL;
 		/* A lower level table was present, needs to be freed. */
 		if (!crste.h.fc && !crste.h.i) {
 			if (is_pmd(crste))
@@ -1072,17 +1047,19 @@ int dat_link(struct kvm_s390_mmu_cache *mc, union asce asce, int level,
 
 static long dat_set_pn_crste(union crste *crstep, gfn_t gfn, gfn_t next, struct dat_walk *walk)
 {
-	union crste crste = READ_ONCE(*crstep);
+	union crste newcrste, oldcrste;
 	int *n = walk->priv;
 
-	if (!crste.h.fc || crste.h.i || crste.h.p)
-		return 0;
-
-	*n = 2;
-	if (crste.s.fc1.prefix_notif)
-		return 0;
-	crste.s.fc1.prefix_notif = 1;
-	dat_crstep_xchg(crstep, crste, gfn, walk->asce);
+	do {
+		oldcrste = READ_ONCE(*crstep);
+		if (!oldcrste.h.fc || oldcrste.h.i || oldcrste.h.p)
+			return 0;
+		*n = 2;
+		if (oldcrste.s.fc1.prefix_notif)
+			return 0;
+		newcrste = oldcrste;
+		newcrste.s.fc1.prefix_notif = 1;
+	} while (!dat_crstep_xchg_atomic(crstep, oldcrste, newcrste, gfn, walk->asce));
 	return 0;
 }
 
arch/s390/kvm/dat.h +6 -3
index 123e11dcd70d..22dafc775335 100644
@@ -938,11 +938,14 @@ static inline bool dat_pudp_xchg_atomic(union pud *pudp, union pud old, union pu
 	return dat_crstep_xchg_atomic(_CRSTEP(pudp), _CRSTE(old), _CRSTE(new), gfn, asce);
 }
 
-static inline void dat_crstep_clear(union crste *crstep, gfn_t gfn, union asce asce)
+static inline union crste dat_crstep_clear_atomic(union crste *crstep, gfn_t gfn, union asce asce)
 {
-	union crste newcrste = _CRSTE_EMPTY(crstep->h.tt);
+	union crste oldcrste, empty = _CRSTE_EMPTY(crstep->h.tt);
 
-	dat_crstep_xchg(crstep, newcrste, gfn, asce);
+	do {
+		oldcrste = READ_ONCE(*crstep);
+	} while (!dat_crstep_xchg_atomic(crstep, oldcrste, empty, gfn, asce));
+	return oldcrste;
 }
 
 static inline int get_level(union crste *crstep, union pte *ptep)
arch/s390/kvm/gaccess.c +15 -11
index a9da9390867d..4ee862424ca0 100644
@@ -1456,7 +1456,7 @@ static int _do_shadow_pte(struct gmap *sg, gpa_t raddr, union pte *ptep_h, union
 static int _do_shadow_crste(struct gmap *sg, gpa_t raddr, union crste *host, union crste *table,
 			    struct guest_fault *f, bool p)
 {
-	union crste newcrste;
+	union crste newcrste, oldcrste;
 	gfn_t gfn;
 	int rc;
 
@@ -1469,16 +1469,20 @@ static int _do_shadow_crste(struct gmap *sg, gpa_t raddr, union crste *host, uni
 	if (rc)
 		return rc;
 
-	newcrste = _crste_fc1(f->pfn, host->h.tt, f->writable, !p);
-	newcrste.s.fc1.d |= host->s.fc1.d;
-	newcrste.s.fc1.sd |= host->s.fc1.sd;
-	newcrste.h.p &= host->h.p;
-	newcrste.s.fc1.vsie_notif = 1;
-	newcrste.s.fc1.prefix_notif = host->s.fc1.prefix_notif;
-	_gmap_crstep_xchg(sg->parent, host, newcrste, f->gfn, false);
-
-	newcrste = _crste_fc1(f->pfn, host->h.tt, 0, !p);
-	dat_crstep_xchg(table, newcrste, gpa_to_gfn(raddr), sg->asce);
+	do {
+		oldcrste = READ_ONCE(*host);
+		newcrste = _crste_fc1(f->pfn, oldcrste.h.tt, f->writable, !p);
+		newcrste.s.fc1.d |= oldcrste.s.fc1.d;
+		newcrste.s.fc1.sd |= oldcrste.s.fc1.sd;
+		newcrste.h.p &= oldcrste.h.p;
+		newcrste.s.fc1.vsie_notif = 1;
+		newcrste.s.fc1.prefix_notif = oldcrste.s.fc1.prefix_notif;
+	} while (!_gmap_crstep_xchg_atomic(sg->parent, host, oldcrste, newcrste, f->gfn, false));
+
+	newcrste = _crste_fc1(f->pfn, oldcrste.h.tt, 0, !p);
+	gfn = gpa_to_gfn(raddr);
+	while (!dat_crstep_xchg_atomic(table, READ_ONCE(*table), newcrste, gfn, sg->asce))
+		;
 	return 0;
 }
 
arch/s390/kvm/gmap.c +48 -34

137 lines not on this page · raw message

arch/s390/kvm/gmap.h +13 -11
index ccb5cd751e31..967a280b3235 100644
@@ -194,8 +194,9 @@ static inline union pgste gmap_ptep_xchg(struct gmap *gmap, union pte *ptep, uni
 	return _gmap_ptep_xchg(gmap, ptep, newpte, pgste, gfn, true);
 }
 
-static inline void _gmap_crstep_xchg(struct gmap *gmap, union crste *crstep, union crste ne,
-				     gfn_t gfn, bool needs_lock)
+static inline bool __must_check _gmap_crstep_xchg_atomic(struct gmap *gmap, union crste *crstep,
+							 union crste oldcrste, union crste newcrste,
+							 gfn_t gfn, bool needs_lock)
 {
 	unsigned long align = 8 + (is_pmd(*crstep) ? 0 : 11);
 
@@ -204,25 +205,26 @@ static inline void _gmap_crstep_xchg(struct gmap *gmap, union crste *crstep, uni
 		lockdep_assert_held(&gmap->children_lock);
 
 	gfn = ALIGN_DOWN(gfn, align);
-	if (crste_prefix(*crstep) && (ne.h.p || ne.h.i || !crste_prefix(ne))) {
-		ne.s.fc1.prefix_notif = 0;
+	if (crste_prefix(oldcrste) && (newcrste.h.p || newcrste.h.i || !crste_prefix(newcrste))) {
+		newcrste.s.fc1.prefix_notif = 0;
 		gmap_unmap_prefix(gmap, gfn, gfn + align);
 	}
-	if (crste_leaf(*crstep) && crstep->s.fc1.vsie_notif &&
-	    (ne.h.p || ne.h.i || !ne.s.fc1.vsie_notif)) {
-		ne.s.fc1.vsie_notif = 0;
+	if (crste_leaf(oldcrste) && oldcrste.s.fc1.vsie_notif &&
+	    (newcrste.h.p || newcrste.h.i || !newcrste.s.fc1.vsie_notif)) {
+		newcrste.s.fc1.vsie_notif = 0;
 		if (needs_lock)
 			gmap_handle_vsie_unshadow_event(gmap, gfn);
 		else
 			_gmap_handle_vsie_unshadow_event(gmap, gfn);
 	}
-	dat_crstep_xchg(crstep, ne, gfn, gmap->asce);
+	return dat_crstep_xchg_atomic(crstep, oldcrste, newcrste, gfn, gmap->asce);
 }
 
-static inline void gmap_crstep_xchg(struct gmap *gmap, union crste *crstep, union crste ne,
-				    gfn_t gfn)
+static inline bool __must_check gmap_crstep_xchg_atomic(struct gmap *gmap, union crste *crstep,
+							union crste oldcrste, union crste newcrste,
+							gfn_t gfn)
 {
-	return _gmap_crstep_xchg(gmap, crstep, ne, gfn, true);
+	return _gmap_crstep_xchg_atomic(gmap, crstep, oldcrste, newcrste, gfn, true);
 }
 
 /**
Signature · 1 line
2.53.0
Reviewed-by on v2 2/8
#6 lore raw

Re: [PATCH v2 2/8] KVM: s390: Remove non-atomic dat_crstep_xchg()

Quoted 8 lines · Claudio Imbrenda

In practice dat_crstep_xchg() is racy and hard to use correctly. Simply remove it and replace its uses with dat_crstep_xchg_atomic().

This solves some actual races that lead to system hangs / crashes.

Fixes 589071eaaa8f ("KVM: s390: KVM page table management functions: clear and replace")
Fixes 94fd9b16cc67 ("KVM: s390: KVM page table management functions: lifecycle management")
author maintainer
#7 lore raw

PATCH v2 3/8 KVM: s390: vsie: Fix check for pre-existing shadow mapping

In reply to Claudio Imbrenda

When shadowing a nested guest, a check is performed and no shadowing is attempted if the nested guest is already shadowed.

The existing check was incomplete; fix it by also checking whether the leaf DAT table entry in the existing shadow gmap has the same protection as the one specified in the guest DAT entry.

Fixes e38c884df921 ("KVM: s390: Switch to new gmap")
---
 arch/s390/kvm/gaccess.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
arch/s390/kvm/gaccess.c +2 -1
index 4ee862424ca0..dad02f7f90f1 100644
@@ -1507,7 +1507,8 @@ static int _gaccess_do_shadow(struct kvm_s390_mmu_cache *mc, struct gmap *sg,
 		return rc;
 
 	/* A race occourred. The shadow mapping is already valid, nothing to do */
-	if ((ptep && !ptep->h.i) || (!ptep && crste_leaf(*table)))
+	if ((ptep && !ptep->h.i && ptep->h.p == w->p) ||
+	    (!ptep && crste_leaf(*table) && !table->h.i && table->h.p == w->p))
 		return 0;
 
 	gl = get_level(table, ptep);
Signature · 1 line
2.53.0
Reviewed-by on v2 3/8
#8 lore raw

Re: [PATCH v2 3/8] KVM: s390: vsie: Fix check for pre-existing shadow mapping

Quoted 9 lines · Claudio Imbrenda

When shadowing a nested guest, a check is performed and no shadowing is attempted if the nested guest is already shadowed.

The existing check was incomplete; fix it by also checking whether the leaf DAT table entry in the existing shadow gmap has the same protection as the one specified in the guest DAT entry.

Fixes e38c884df921 ("KVM: s390: Switch to new gmap")
Quoted 21 lines
---
 arch/s390/kvm/gaccess.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
arch/s390/kvm/gaccess.c +2 -1
index 4ee862424ca0..dad02f7f90f1 100644
@@ -1507,7 +1507,8 @@ static int _gaccess_do_shadow(struct kvm_s390_mmu_cache *mc, struct gmap *sg,
 		return rc;
 
 	/* A race occourred. The shadow mapping is already valid, nothing to do */
-	if ((ptep && !ptep->h.i) || (!ptep && crste_leaf(*table)))
+	if ((ptep && !ptep->h.i && ptep->h.p == w->p) ||
+	    (!ptep && crste_leaf(*table) && !table->h.i && table->h.p == w->p))
 		return 0;
 
 	gl = get_level(table, ptep);
Signature · 1 line
2.53.0
maintainer Reviewed-by on v2 3/8
#9 lore raw

Re: [PATCH v2 3/8] KVM: s390: vsie: Fix check for pre-existing shadow mapping

In reply to Claudio Imbrenda
Quoted 18 lines · Claudio Imbrenda

When shadowing a nested guest, a check is performed and no shadowing is attempted if the nested guest is already shadowed.

The existing check was incomplete; fix it by also checking whether the leaf DAT table entry in the existing shadow gmap has the same protection as the one specified in the guest DAT entry.

Fixes e38c884df921 ("KVM: s390: Switch to new gmap")
---
  arch/s390/kvm/gaccess.c | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
arch/s390/kvm/gaccess.c +0 -0
index 4ee862424ca0..dad02f7f90f1 100644

arch/s390/kvm/gaccess.c static int _gaccess_do_shadow(struct kvm_s390_mmu_cache *mc, struct gmap *sg, · line 1509

Quoted 3 lines
arch/s390/kvm/gaccess.c +0 -0
@@ -1507,7 +1507,8 @@ static int _gaccess_do_shadow(struct kvm_s390_mmu_cache *mc, struct gmap *sg,
  		return rc;
 
  	/* A race occourred. The shadow mapping is already valid, nothing to do */

s/occourred/occurred/

arch/s390/kvm/gaccess.c static int _gaccess_do_shadow(struct kvm_s390_mmu_cache *mc, struct gmap *sg, · line 1512

Quoted 4 lines
arch/s390/kvm/gaccess.c +2 -1
-	if ((ptep && !ptep->h.i) || (!ptep && crste_leaf(*table)))
+	if ((ptep && !ptep->h.i && ptep->h.p == w->p) ||
+	    (!ptep && crste_leaf(*table) && !table->h.i && table->h.p == w->p))
  		return 0;

In this case "table" is not a table but a parent dat entry.
It would make me happy if you'd fix that up at some point, not necessarily in this patch.

author maintainer
#10 lore raw

PATCH v2 4/8 KVM: s390: Fix gmap_link()

In reply to Claudio Imbrenda

The slow path of the fault handler ultimately called gmap_link(), which assumed the fault was a major fault, and blindly called dat_link().

In case of minor faults, things were not always handled properly; in particular the prefix and vsie marker bits were ignored.

Move dat_link() into gmap.c, renaming it accordingly. Once moved, the new _gmap_link() function will be able to correctly honour the prefix and vsie markers.

Fixes 94fd9b16cc67 ("KVM: s390: KVM page table management functions: lifecycle management")
Fixes a2c17f9270cc ("KVM: s390: New gmap code")
---
 arch/s390/kvm/dat.c  | 48 -------------------------------------
 arch/s390/kvm/dat.h  |  2 --
 arch/s390/kvm/gmap.c | 56 ++++++++++++++++++++++++++++++++++++++++----
 3 files changed, 52 insertions(+), 54 deletions(-)
arch/s390/kvm/dat.c +0 -48
index 8ba80b0b4698..a4f482bd3077 100644
@@ -997,54 +997,6 @@ bool dat_test_age_gfn(union asce asce, gfn_t start, gfn_t end)
 	return _dat_walk_gfn_range(start, end, asce, &test_age_ops, 0, NULL) > 0;
 }
 
-int dat_link(struct kvm_s390_mmu_cache *mc, union asce asce, int level,
-	     bool uses_skeys, struct guest_fault *f)
-{
-	union crste oldval, newval;
-	union pte newpte, oldpte;
-	union pgste pgste;
-	int rc = 0;
-
-	rc = dat_entry_walk(mc, f->gfn, asce, DAT_WALK_ALLOC_CONTINUE, level, &f->crstep, &f->ptep);
-	if (rc == -EINVAL || rc == -ENOMEM)
-		return rc;
-	if (rc)
-		return -EAGAIN;
-
-	if (WARN_ON_ONCE(unlikely(get_level(f->crstep, f->ptep) > level)))
-		return -EINVAL;
-
-	if (f->ptep) {
-		pgste = pgste_get_lock(f->ptep);
-		oldpte = *f->ptep;
-		newpte = _pte(f->pfn, f->writable, f->write_attempt | oldpte.s.d, !f->page);
-		newpte.s.sd = oldpte.s.sd;
-		oldpte.s.sd = 0;
-		if (oldpte.val == _PTE_EMPTY.val || oldpte.h.pfra == f->pfn) {
-			pgste = __dat_ptep_xchg(f->ptep, pgste, newpte, f->gfn, asce, uses_skeys);
-			if (f->callback)
-				f->callback(f);
-		} else {
-			rc = -EAGAIN;
-		}
-		pgste_set_unlock(f->ptep, pgste);
-	} else {
-		oldval = READ_ONCE(*f->crstep);
-		newval = _crste_fc1(f->pfn, oldval.h.tt, f->writable,
-				    f->write_attempt | oldval.s.fc1.d);
-		newval.s.fc1.sd = oldval.s.fc1.sd;
-		if (oldval.val != _CRSTE_EMPTY(oldval.h.tt).val &&
-		    crste_origin_large(oldval) != crste_origin_large(newval))
-			return -EAGAIN;
-		if (!dat_crstep_xchg_atomic(f->crstep, oldval, newval, f->gfn, asce))
-			return -EAGAIN;
-		if (f->callback)
-			f->callback(f);
-	}
-
-	return rc;
-}
-
 static long dat_set_pn_crste(union crste *crstep, gfn_t gfn, gfn_t next, struct dat_walk *walk)
 {
 	union crste newcrste, oldcrste;
arch/s390/kvm/dat.h +0 -2
index 22dafc775335..efedcf96110c 100644
@@ -540,8 +540,6 @@ int dat_set_slot(struct kvm_s390_mmu_cache *mc, union asce asce, gfn_t start, gf
 		 u16 type, u16 param);
 int dat_set_prefix_notif_bit(union asce asce, gfn_t gfn);
 bool dat_test_age_gfn(union asce asce, gfn_t start, gfn_t end);
-int dat_link(struct kvm_s390_mmu_cache *mc, union asce asce, int level,
-	     bool uses_skeys, struct guest_fault *f);
 
 int dat_perform_essa(union asce asce, gfn_t gfn, int orc, union essa_state *state, bool *dirty);
 long dat_reset_cmma(union asce asce, gfn_t start_gfn);
arch/s390/kvm/gmap.c +52 -4

71 lines not on this page · raw message

Signature · 1 line
2.53.0
Reviewed-by on v2 4/8
#11 lore raw

Re: [PATCH v2 4/8] KVM: s390: Fix gmap_link()

Quoted 6 lines · Claudio Imbrenda

The slow path of the fault handler ultimately called gmap_link(), which assumed the fault was a major fault, and blindly called dat_link().

In case of minor faults, things were not always handled properly; in particular the prefix and vsie marker bits were ignored.

Quoted 7 lines

Move dat_link() into gmap.c, renaming it accordingly. Once moved, the new _gmap_link() function will be able to correctly honour the prefix and vsie markers.

Fixes 94fd9b16cc67 ("KVM: s390: KVM page table management functions: lifecycle management")
Fixes a2c17f9270cc ("KVM: s390: New gmap code")
maintainer
#12 lore raw

Re: [PATCH v2 4/8] KVM: s390: Fix gmap_link()

In reply to Claudio Imbrenda
Quoted 10 lines · Claudio Imbrenda

The slow path of the fault handler ultimately called gmap_link(), which assumed the fault was a major fault, and blindly called dat_link().

In case of minor faults, things were not always handled properly; in particular the prefix and vsie marker bits were ignored.

Move dat_link() into gmap.c, renaming it accordingly. Once moved, the new _gmap_link() function will be able to correctly honour the prefix and vsie markers.

Quoted 9 lines
Fixes 94fd9b16cc67 ("KVM: s390: KVM page table management functions: lifecycle management")
Fixes a2c17f9270cc ("KVM: s390: New gmap code")
---
  arch/s390/kvm/dat.c  | 48 -------------------------------------
  arch/s390/kvm/dat.h  |  2 --
  arch/s390/kvm/gmap.c | 56 ++++++++++++++++++++++++++++++++++++++++----
  3 files changed, 52 insertions(+), 54 deletions(-)

Ugh, you moved it AND changed it.
Please don't do that if you want to have patches reviewed. Or at least provide a diff between the changes.

author maintainer
#13 lore raw

PATCH v2 5/8 KVM: s390: vsie: Fix refcount overflow for shadow gmaps

In reply to Claudio Imbrenda

In most cases gmap_put() was not called when it should have.

Add the missing gmap_put() in vsie_run().

Fixes e38c884df921 ("KVM: s390: Switch to new gmap")
---
 arch/s390/kvm/vsie.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
arch/s390/kvm/vsie.c +3 -1
index 0330829b4046..72895dddc39a 100644
@@ -1328,7 +1328,7 @@ static void unregister_shadow_scb(struct kvm_vcpu *vcpu)
 static int vsie_run(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page)
 {
 	struct kvm_s390_sie_block *scb_s = &vsie_page->scb_s;
-	struct gmap *sg;
+	struct gmap *sg = NULL;
 	int rc = 0;
 
 	while (1) {
@@ -1368,6 +1368,8 @@ static int vsie_run(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page)
 			sg = gmap_put(sg);
 		cond_resched();
 	}
+	if (sg)
+		sg = gmap_put(sg);
 
 	if (rc == -EFAULT) {
 		/*
Signature · 1 line
2.53.0
author maintainer
#16 lore raw

PATCH v2 6/8 KVM: s390: vsie: Fix unshadowing while shadowing

In reply to Claudio Imbrenda

If shadowing causes the shadow gmap to get unshadowed, exit early to prevent an attempt to dereference the parent pointer, which at this point is NULL.

Opportunistically add some more checks to prevent NULL parents.

Fixes a2c17f9270cc ("KVM: s390: New gmap code")
Fixes e5f98a6899bd ("KVM: s390: Add some helper functions needed for vSIE")
Fixes e38c884df921 ("KVM: s390: Switch to new gmap")
---
 arch/s390/kvm/gaccess.c |  2 ++
 arch/s390/kvm/gmap.c    | 11 ++++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)
arch/s390/kvm/gaccess.c +2 -0
index dad02f7f90f1..1054f9bd107f 100644
@@ -1522,6 +1522,8 @@ static int _gaccess_do_shadow(struct kvm_s390_mmu_cache *mc, struct gmap *sg,
 				       entries[i - 1].pfn, i, entries[i - 1].writable);
 		if (rc)
 			return rc;
+		if (!sg->parent)
+			return -EAGAIN;
 	}
 
 	rc = dat_entry_walk(NULL, entries[LEVEL_MEM].gfn, sg->parent->asce, DAT_WALK_LEAF,
arch/s390/kvm/gmap.c +10 -1
index e9cac6dce48b..6e490735265e 100644
@@ -1163,6 +1163,7 @@ struct gmap_protect_asce_top_level {
 static inline int __gmap_protect_asce_top_level(struct kvm_s390_mmu_cache *mc, struct gmap *sg,
 						struct gmap_protect_asce_top_level *context)
 {
+	struct gmap *parent;
 	int rc, i;
 
 	guard(write_lock)(&sg->kvm->mmu_lock);
@@ -1170,7 +1171,12 @@ static inline int __gmap_protect_asce_top_level(struct kvm_s390_mmu_cache *mc, s
 	if (kvm_s390_array_needs_retry_safe(sg->kvm, context->seq, context->f))
 		return -EAGAIN;
 
-	scoped_guard(spinlock, &sg->parent->children_lock) {
+	parent = READ_ONCE(sg->parent);
+	if (!parent)
+		return -EAGAIN;
+	scoped_guard(spinlock, &parent->children_lock) {
+		if (READ_ONCE(sg->parent) != parent)
+			return -EAGAIN;
 		for (i = 0; i < CRST_TABLE_PAGES; i++) {
 			if (!context->f[i].valid)
 				continue;
@@ -1253,6 +1259,9 @@ struct gmap *gmap_create_shadow(struct kvm_s390_mmu_cache *mc, struct gmap *pare
 	struct gmap *sg, *new;
 	int rc;
 
+	if (WARN_ON(!parent))
+		return ERR_PTR(-EINVAL);
+
 	scoped_guard(spinlock, &parent->children_lock) {
 		sg = gmap_find_shadow(parent, asce, edat_level);
 		if (sg) {
Signature · 1 line
2.53.0
maintainer
#17 lore raw

Re: [PATCH v2 6/8] KVM: s390: vsie: Fix unshadowing while shadowing

Quoted 1 line · Claudio Imbrenda

If shadowing causes the shadow gmap to get unshadowed, exit early to

How can this happen?

Quoted 4 lines

prevent an attempt to dereference the parent pointer, which at this point is NULL.

Opportunistically add some more checks to prevent NULL parents.

author maintainer
#18 lore raw

Re: [PATCH v2 6/8] KVM: s390: vsie: Fix unshadowing while shadowing

Quoted 4 lines · On Tue, 24 Mar 2026 15:52:02 +0100 Janosch Frank <[email protected]> wrote:
Quoted 1 line · Claudio Imbrenda

If shadowing causes the shadow gmap to get unshadowed, exit early to

How can this happen?

one possibility is if g2 maps g3 memory pages over the top-level table of the g2 -> g3 asce

there are probably other cases I can't think of

Quoted 5 lines
Quoted 5 lines

prevent an attempt to dereference the parent pointer, which at this point is NULL.

Opportunistically add some more checks to prevent NULL parents.

author maintainer
#19 lore raw

PATCH v2 7/8 KVM: s390: vsie: Fix guest page tables protection

In reply to Claudio Imbrenda

When shadowing, the guest page tables are write-protected, in order to trap changes and properly unshadow the shadow mapping for the nested guest. Already shadowed levels are skipped, so that only the needed levels are write protected.

Currently the levels that get write protected are exactly one level too
deep: the last level (nested guest memory) gets protected in the wrong way, and will be protected again correctly a few lines afterwards; most importantly, the highest non-shadowed level does *not* get write protected.

Moreover, if the nested guest is running in a real address space, there are no DAT tables to shadow.

Write protect the correct levels, so that all the levels that need to be protected are protected, and avoid double protecting the last level; skip attempting to shadow the DAT tables when the nested guest is running in a real address space.

Fixes e38c884df921 ("KVM: s390: Switch to new gmap")
---
 arch/s390/kvm/gaccess.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)
arch/s390/kvm/gaccess.c +9 -7
index 1054f9bd107f..17563f889c6b 100644
@@ -1517,13 +1517,15 @@ static int _gaccess_do_shadow(struct kvm_s390_mmu_cache *mc, struct gmap *sg,
 	 * Skip levels that are already protected. For each level, protect
 	 * only the page containing the entry, not the whole table.
 	 */
-	for (i = gl ; i >= w->level; i--) {
-		rc = gmap_protect_rmap(mc, sg, entries[i - 1].gfn, gpa_to_gfn(saddr),
-				       entries[i - 1].pfn, i, entries[i - 1].writable);
-		if (rc)
-			return rc;
-		if (!sg->parent)
-			return -EAGAIN;
+	if (w->level > LEVEL_MEM) {
+		for (i = gl ; i >= w->level; i--) {
+			rc = gmap_protect_rmap(mc, sg, entries[i].gfn, gpa_to_gfn(saddr),
+					       entries[i].pfn, i + 1, entries[i].writable);
+			if (rc)
+				return rc;
+			if (!sg->parent)
+				return -EAGAIN;
+		}
 	}
 
 	rc = dat_entry_walk(NULL, entries[LEVEL_MEM].gfn, sg->parent->asce, DAT_WALK_LEAF,
Signature · 1 line
2.53.0
maintainer Reviewed-by on v2 7/8
#20 lore raw

Re: [PATCH v2 7/8] KVM: s390: vsie: Fix guest page tables protection

Quoted 30 lines · Claudio Imbrenda

When shadowing, the guest page tables are write-protected, in order to trap changes and properly unshadow the shadow mapping for the nested guest. Already shadowed levels are skipped, so that only the needed levels are write protected.

Currently the levels that get write protected are exactly one level too
deep: the last level (nested guest memory) gets protected in the wrong way, and will be protected again correctly a few lines afterwards; most importantly, the highest non-shadowed level does *not* get write protected.

Moreover, if the nested guest is running in a real address space, there are no DAT tables to shadow.

Write protect the correct levels, so that all the levels that need to be protected are protected, and avoid double protecting the last level; skip attempting to shadow the DAT tables when the nested guest is running in a real address space.

Fixes e38c884df921 ("KVM: s390: Switch to new gmap")
---
  arch/s390/kvm/gaccess.c | 16 +++++++++-------
  1 file changed, 9 insertions(+), 7 deletions(-)
arch/s390/kvm/gaccess.c +0 -0
index 1054f9bd107f..17563f889c6b 100644

arch/s390/kvm/gaccess.c static int _gaccess_do_shadow(struct kvm_s390_mmu_cache *mc, struct gmap *sg, · line 1522

Quoted 6 lines
arch/s390/kvm/gaccess.c +0 -3
@@ -1517,13 +1517,15 @@ static int _gaccess_do_shadow(struct kvm_s390_mmu_cache *mc, struct gmap *sg,
  	 * Skip levels that are already protected. For each level, protect
  	 * only the page containing the entry, not the whole table.
  	 */
-	for (i = gl ; i >= w->level; i--) {
-		rc = gmap_protect_rmap(mc, sg, entries[i - 1].gfn, gpa_to_gfn(saddr),
-				       entries[i - 1].pfn, i, entries[i - 1].writable);

Yeah, tt for page tables is -1 and adding -1 ends up being LEVEL_MEM...

arch/s390/kvm/gaccess.c static int _gaccess_do_shadow(struct kvm_s390_mmu_cache *mc, struct gmap *sg, · line 1521

Quoted 6 lines
arch/s390/kvm/gaccess.c +2 -4
-		if (rc)
-			return rc;
-		if (!sg->parent)
-			return -EAGAIN;
+	if (w->level > LEVEL_MEM) {
+		for (i = gl ; i >= w->level; i--) {

You could have fixed the rogue white space after "gl"

Quoted 10 lines
arch/s390/kvm/gaccess.c +7 -0
+			rc = gmap_protect_rmap(mc, sg, entries[i].gfn, gpa_to_gfn(saddr),
+					       entries[i].pfn, i + 1, entries[i].writable);
+			if (rc)
+				return rc;
+			if (!sg->parent)
+				return -EAGAIN;
+		}
  	}
 
  	rc = dat_entry_walk(NULL, entries[LEVEL_MEM].gfn, sg->parent->asce, DAT_WALK_LEAF,
author maintainer
#21 lore raw

PATCH v2 8/8 KVM: s390: Fix KVM_S390_VCPU_FAULT ioctl

In reply to Claudio Imbrenda

A previous commit changed the behaviour of the KVM_S390_VCPU_FAULT ioctl. The current (wrong) implementation will trigger a guest addressing exception if the requested address lies outside of a memslot, unless the VM is UCONTROL.

Restore the previous behaviour by open coding the fault-in logic.

Fixes 3762e905ec2e ("KVM: s390: use __kvm_faultin_pfn()")
---
 arch/s390/kvm/kvm-s390.c | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)
arch/s390/kvm/kvm-s390.c +15 -3
index ebcb0ef8835e..62f04931b54d 100644
@@ -5520,9 +5520,21 @@ long kvm_arch_vcpu_ioctl(struct file *filp,
 	}
 #endif
 	case KVM_S390_VCPU_FAULT: {
-		idx = srcu_read_lock(&vcpu->kvm->srcu);
-		r = vcpu_dat_fault_handler(vcpu, arg, 0);
-		srcu_read_unlock(&vcpu->kvm->srcu, idx);
+		gpa_t gaddr = arg;
+
+		scoped_guard(srcu, &vcpu->kvm->srcu) {
+			r = vcpu_ucontrol_translate(vcpu, &gaddr);
+			if (r)
+				break;
+
+			r = kvm_s390_faultin_gfn_simple(vcpu, NULL, gpa_to_gfn(gaddr), false);
+			if (r == PGM_ADDRESSING)
+				r = -EFAULT;
+			if (r <= 0)
+				break;
+			r = -EIO;
+			KVM_BUG_ON(r, vcpu->kvm);
+		}
 		break;
 	}
 	case KVM_ENABLE_CAP:
Signature · 1 line
2.53.0
Reviewed-by on v2 8/8
#22 lore raw

Re: [PATCH v2 8/8] KVM: s390: Fix KVM_S390_VCPU_FAULT ioctl

Quoted 9 lines · Claudio Imbrenda

A previous commit changed the behaviour of the KVM_S390_VCPU_FAULT ioctl. The current (wrong) implementation will trigger a guest addressing exception if the requested address lies outside of a memslot, unless the VM is UCONTROL.

Restore the previous behaviour by open coding the fault-in logic.

Fixes 3762e905ec2e ("KVM: s390: use __kvm_faultin_pfn()")

But I have a comment on a changed logic. And a nit

Quoted 9 lines
---
 arch/s390/kvm/kvm-s390.c | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)
arch/s390/kvm/kvm-s390.c +0 -0
index ebcb0ef8835e..62f04931b54d 100644

arch/s390/kvm/kvm-s390.c long kvm_arch_vcpu_ioctl(struct file *filp, · line 5524

Quoted 5 lines
arch/s390/kvm/kvm-s390.c +0 -2
@@ -5520,9 +5520,21 @@ long kvm_arch_vcpu_ioctl(struct file *filp,
 	}
 #endif
 	case KVM_S390_VCPU_FAULT: {
-		idx = srcu_read_lock(&vcpu->kvm->srcu);
-		r = vcpu_dat_fault_handler(vcpu, arg, 0);

in here every vcpu_ucontrol_translate error (incl ENONEMs from kvm_s390_mmu_cache_topup) is converted into EREMOTE ...

arch/s390/kvm/kvm-s390.c long kvm_arch_vcpu_ioctl(struct file *filp, · line 5528

Quoted 7 lines
arch/s390/kvm/kvm-s390.c +6 -1
-		srcu_read_unlock(&vcpu->kvm->srcu, idx);
+		gpa_t gaddr = arg;
+
+		scoped_guard(srcu, &vcpu->kvm->srcu) {
+			r = vcpu_ucontrol_translate(vcpu, &gaddr);
+			if (r)
+				break;

... which is not longer the case here. As you explicitly convert ENOMENS in gmap_ucas_translate before the topup call tnot converting might be an overlook (in the topup function?).

arch/s390/kvm/kvm-s390.c long kvm_arch_vcpu_ioctl(struct file *filp, · line 5534

Quoted 6 lines
arch/s390/kvm/kvm-s390.c +6 -0
+
+			r = kvm_s390_faultin_gfn_simple(vcpu, NULL, gpa_to_gfn(gaddr), false);
+			if (r == PGM_ADDRESSING)
+				r = -EFAULT;
+			if (r <= 0)
+				break;

nit: in vcpu_dat_fault_handler the ifs are in the inverse order. They are independent, so this does not make any difference, but this itches me a little. :)

Quoted 9 lines
arch/s390/kvm/kvm-s390.c +3 -0
+			r = -EIO;
+			KVM_BUG_ON(r, vcpu->kvm);
+		}
 		break;
 	}
 	case KVM_ENABLE_CAP:
Signature · 1 line
2.53.0

Steffen

maintainer
#23 lore raw

Re: [PATCH v2 8/8] KVM: s390: Fix KVM_S390_VCPU_FAULT ioctl

Quoted 31 lines · Steffen Eiden
Quoted 9 lines · Claudio Imbrenda

A previous commit changed the behaviour of the KVM_S390_VCPU_FAULT ioctl. The current (wrong) implementation will trigger a guest addressing exception if the requested address lies outside of a memslot, unless the VM is UCONTROL.

Restore the previous behaviour by open coding the fault-in logic.

Fixes 3762e905ec2e ("KVM: s390: use __kvm_faultin_pfn()")

But I have a comment on a changed logic. And a nit

Quoted 9 lines
---
  arch/s390/kvm/kvm-s390.c | 18 +++++++++++++++---
  1 file changed, 15 insertions(+), 3 deletions(-)
arch/s390/kvm/kvm-s390.c +0 -0
index ebcb0ef8835e..62f04931b54d 100644

arch/s390/kvm/kvm-s390.c long kvm_arch_vcpu_ioctl(struct file *filp, · line 5524

Quoted 5 lines
arch/s390/kvm/kvm-s390.c +0 -2
@@ -5520,9 +5520,21 @@ long kvm_arch_vcpu_ioctl(struct file *filp,
  	}
  #endif
  	case KVM_S390_VCPU_FAULT: {
-		idx = srcu_read_lock(&vcpu->kvm->srcu);
-		r = vcpu_dat_fault_handler(vcpu, arg, 0);

in here every vcpu_ucontrol_translate error (incl ENONEMs from kvm_s390_mmu_cache_topup) is converted into EREMOTE ...

Quoted 10 lines

arch/s390/kvm/kvm-s390.c long kvm_arch_vcpu_ioctl(struct file *filp, · line 5528

Quoted 7 lines
arch/s390/kvm/kvm-s390.c +6 -1
-		srcu_read_unlock(&vcpu->kvm->srcu, idx);
+		gpa_t gaddr = arg;
+
+		scoped_guard(srcu, &vcpu->kvm->srcu) {
+			r = vcpu_ucontrol_translate(vcpu, &gaddr);
+			if (r)
+				break;

... which is not longer the case here. As you explicitly convert ENOMENS in gmap_ucas_translate before the topup call tnot converting might be an overlook (in the topup function?).

Yeah, I second that.

Acked-by on v2 8/8
#24 lore raw

Re: [PATCH v2 8/8] KVM: s390: Fix KVM_S390_VCPU_FAULT ioctl

In reply to Claudio Imbrenda

Am 20.03.26 um 17:15 schrieb Claudio Imbrenda:

Quoted 9 lines

A previous commit changed the behaviour of the KVM_S390_VCPU_FAULT ioctl. The current (wrong) implementation will trigger a guest addressing exception if the requested address lies outside of a memslot, unless the VM is UCONTROL.

Restore the previous behaviour by open coding the fault-in logic.

Fixes 3762e905ec2e ("KVM: s390: use __kvm_faultin_pfn()")

Is this something that we could improve in the tools/testing/selftests/kvm/s390/ucontrol_test.c testcase? We do test KVM_S390_VCPU_FAULT in there.

Apart from that