KVM: s390: A few misc gmap fixes.
Subsystems (5)
Claudio Imbrenda
maintainerPATCH v3 1/5 KVM: s390: Silence potential warnings in _gmap_crstep_xchg_atomic()
In reply to Claudio ImbrendaWhile dat_crstep_xchg_atomic() is marked as __must_check, in this particular case the return value should be ignored.
Silence potential compiler warnings with a pointless check, and add a comment to explain the situation.
--- arch/s390/kvm/gmap.h | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
arch/s390/kvm/gmap.h +10 -1
@@ -279,7 +279,16 @@ static inline bool __must_check _gmap_crstep_xchg_atomic(struct gmap *gmap, uniogmap_handle_vsie_unshadow_event (gmap, gfn); else_gmap_handle_vsie_unshadow_event (gmap ,gfn ); -dat_crstep_xchg_atomic (crstep, oldcrste, newcrste, gfn, gmap->asce); +if (!dat_crstep_xchg_atomic (crstep, oldcrste, newcrste, gfn, gmap->asce)) +return false; +/* +* Return false even if the swap was successful, as it only +* indicates that the best effort clearing of the vsie_notif +* bit was successful. The caller will have to try again +* regardless, since the desired value has not been set. +* This pointless check is needed to silence a potential +* __must_check warning. +*/ return false; }if (!oldcrste.s.fc1.d && newcrste.s.fc1.d && !newcrste.s.fc1.s)
Signature · 1 line
2.54.0
Claudio Imbrenda
maintainerPATCH v3 3/5 KVM: s390: vsie: Fix allocation of struct vsie_rmap
In reply to Claudio ImbrendaThe allocation size for struct vsie_rmap in kvm_s390_mmu_cache_topup() was wrong due to a copy-paste error.
Fix it by using the type name.
--- arch/s390/kvm/dat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/s390/kvm/dat.c +1 -1
@@ -45,7 +45,7 @@ int kvm_s390_mmu_cache_topup(struct kvm_s390_mmu_cache *mc) mc->pts[mc->n_pts] = o; }for ( ; mc->n_rmaps <KVM_S390_MMU_CACHE_N_RMAPS ; mc->n_rmaps++) { - o =kzalloc_obj (*mc->rmaps[0 ],GFP_KERNEL_ACCOUNT ); + o = kzalloc_obj(struct vsie_rmap, GFP_KERNEL_ACCOUNT);if (!o)return -ENOMEM ; mc->rmaps[mc->n_rmaps] = o;
Signature · 1 line
2.54.0
Claudio Imbrenda
maintainerPATCH v3 5/5 KVM: s390: vsie: Use mmu cache to allocate rmap
In reply to Claudio ImbrendaUse kvm_s390_mmu_cache_alloc_rmap() to allocate the rmap in gmap_insert_rmap(), instead of a normal kzalloc_obj() with GFP_ATOMIC.
This guarantees forward progress.
--- arch/s390/kvm/gaccess.c | 16 ++++++++-------- arch/s390/kvm/gmap.c | 7 ++++--- arch/s390/kvm/gmap.h | 3 ++- 3 files changed, 14 insertions(+), 12 deletions(-)
arch/s390/kvm/gaccess.c +8 -8
@@ -1419,8 +1419,8 @@ static int walk_guest_tables(struct gmap *sg, unsigned long saddr, struct pgtwalreturn kvm_s390_get_guest_page (kvm, entries +LEVEL_MEM , table.pte.pfra, wr); } -static int _do_shadow_pte (struct gmap *sg,gpa_t raddr,union pte *ptep_h,union pte *ptep, -struct guest_fault *f,bool p) +static int _do_shadow_pte (struct kvm_s390_mmu_cache *mc,struct gmap *sg,gpa_t raddr, +union pte *ptep_h,union pte *ptep,struct guest_fault *f,bool p) {union pgste pgste;union pte newpte;
@@ -1430,7 +1430,7 @@ static int _do_shadow_pte(struct gmap *sg, gpa_t raddr, union pte *ptep_h, unionlockdep_assert_held (&sg->parent->children_lock);scoped_guard (spinlock, &sg->host_to_rmap_lock) - rc = gmap_insert_rmap(sg, f->gfn, gpa_to_gfn(raddr), TABLE_TYPE_PAGE_TABLE); + rc = gmap_insert_rmap(mc, sg, f->gfn, gpa_to_gfn(raddr), TABLE_TYPE_PAGE_TABLE);if (rc)return rc;
@@ -1462,8 +1462,8 @@ static int _do_shadow_pte(struct gmap *sg, gpa_t raddr, union pte *ptep_h, unionreturn 0 ; } -static int _do_shadow_crste (struct gmap *sg,gpa_t raddr,union crste *host,union crste *table, -struct guest_fault *f,bool p) +static int _do_shadow_crste (struct kvm_s390_mmu_cache *mc,struct gmap *sg,gpa_t raddr, +union crste *host,union crste *table,struct guest_fault *f,bool p) {union crste newcrste, oldcrste;unsigned long mask;
@@ -1476,7 +1476,7 @@ static int _do_shadow_crste(struct gmap *sg, gpa_t raddr, union crste *host, uni mask =is_pmd (*table) ? _SEGMENT_FR_MASK : _REGION3_FR_MASK; r_gfn =gpa_to_gfn (raddr) & mask;scoped_guard (spinlock, &sg->host_to_rmap_lock) - rc = gmap_insert_rmap(sg, f->gfn & mask, r_gfn, host->h.tt); + rc = gmap_insert_rmap(mc, sg, f->gfn & mask, r_gfn, host->h.tt);if (rc)return rc;
@@ -1578,8 +1578,8 @@ static int _gaccess_do_shadow(struct kvm_s390_mmu_cache *mc, struct gmap *sg,if (KVM_BUG_ON (l >TABLE_TYPE_REGION3 , sg->kvm))return -EFAULT ;if (l ==TABLE_TYPE_PAGE_TABLE ) -return _do_shadow_pte (sg, saddr, ptep_h, ptep, entries +LEVEL_MEM , w->p); -return _do_shadow_crste (sg, saddr, host, table, entries +LEVEL_MEM , w->p); +return _do_shadow_pte (mc, sg, saddr, ptep_h, ptep, entries +LEVEL_MEM , w->p); +return _do_shadow_crste (mc, sg, saddr, host, table, entries +LEVEL_MEM , w->p); } static inline int ___gaccess_shadow_fault(struct kvm_vcpu *vcpu, struct gmap *sg, gpa_t saddr,
arch/s390/kvm/gmap.c +4 -3
@@ -1000,7 +1000,8 @@ int gmap_pv_destroy_range(struct gmap *gmap, gfn_t start, gfn_t end, bool interrreturn 0 ; } -int gmap_insert_rmap (struct gmap *sg,gfn_t p_gfn,gfn_t r_gfn,int level) +int gmap_insert_rmap (struct kvm_s390_mmu_cache *mc,struct gmap *sg,gfn_t p_gfn, +gfn_t r_gfn,int level) { struct vsie_rmap *rmap __free(kvfree) = NULL;struct vsie_rmap *temp;
@@ -1010,7 +1011,7 @@ int gmap_insert_rmap(struct gmap *sg, gfn_t p_gfn, gfn_t r_gfn, int level)KVM_BUG_ON (!is_shadow (sg), sg->kvm);lockdep_assert_held (&sg->host_to_rmap_lock); - rmap =kzalloc_obj (*rmap,GFP_ATOMIC ); + rmap =kvm_s390_mmu_cache_alloc_rmap (mc);if (!rmap)return -ENOMEM ;
@@ -1057,7 +1058,7 @@ int gmap_protect_rmap(struct kvm_s390_mmu_cache *mc, struct gmap *sg, gfn_t p_gfif (level <=TABLE_TYPE_REGION1 ) { bitmask =-1UL << (8 +11 * level);scoped_guard (spinlock, &sg->host_to_rmap_lock) - rc = gmap_insert_rmap(sg, p_gfn, r_gfn & bitmask, level); + rc = gmap_insert_rmap(mc, sg, p_gfn, r_gfn & bitmask, level); }if (rc)return rc;
arch/s390/kvm/gmap.h +2 -1
@@ -100,7 +100,8 @@ int gmap_ucas_map(struct gmap *gmap, gfn_t p_gfn, gfn_t c_gfn, unsigned long couvoid gmap_ucas_unmap (struct gmap *gmap,gfn_t c_gfn,unsigned long count);int gmap_enable_skeys (struct gmap *gmap);int gmap_pv_destroy_range (struct gmap *gmap,gfn_t start,gfn_t end,bool interruptible); -int gmap_insert_rmap (struct gmap *sg,gfn_t p_gfn,gfn_t r_gfn,int level); +int gmap_insert_rmap (struct kvm_s390_mmu_cache *mc,struct gmap *sg,gfn_t p_gfn, +gfn_t r_gfn,int level);int gmap_protect_rmap (struct kvm_s390_mmu_cache *mc,struct gmap *sg,gfn_t p_gfn,gfn_t r_gfn,kvm_pfn_t pfn,int level,bool wr);void gmap_set_cmma_all_dirty (struct gmap *gmap);
Signature · 1 line
2.54.0
Claudio Imbrenda
maintainerPATCH v3 4/5 KVM: s390: vsie: Add missing radix_tree_preload() in _gaccess_shadow_fault()
In reply to Claudio ImbrendaAdd missing radix_tree_preload() in _gaccess_shadow_fault() to guarantee forward progress. The core of _gaccess_shadow_fault() has been split into ___gaccess_shadow_fault() in order to simplify locking.
--- arch/s390/kvm/gaccess.c | 57 +++++++++++++++++++++++++---------------- 1 file changed, 35 insertions(+), 22 deletions(-)
arch/s390/kvm/gaccess.c +35 -22
@@ -1582,35 +1582,48 @@ static int _gaccess_do_shadow(struct kvm_s390_mmu_cache *mc, struct gmap *sg,return _do_shadow_crste (sg, saddr, host, table, entries +LEVEL_MEM , w->p); } -static inline int _gaccess_shadow_fault (struct kvm_vcpu *vcpu,struct gmap *sg,gpa_t saddr, -unsigned long seq,struct pgtwalk *walk) +static inline int ___gaccess_shadow_fault (struct kvm_vcpu *vcpu,struct gmap *sg,gpa_t saddr, +unsigned long seq,struct pgtwalk *walk) {struct gmap *parent;int rc; -if (kvm_s390_array_needs_retry_unsafe (vcpu->kvm, seq, walk->raw_entries)) +if (kvm_s390_array_needs_retry_safe (vcpu->kvm, seq, walk->raw_entries))return -EAGAIN ; -again: - rc =kvm_s390_mmu_cache_topup (vcpu->arch.mc); -if (rc) -return rc; - scoped_guard(read_lock, &vcpu->kvm->mmu_lock) { -if (kvm_s390_array_needs_retry_safe (vcpu->kvm, seq, walk->raw_entries)) -return -EAGAIN ; - parent =READ_ONCE (sg->parent); -if (!parent) + parent =READ_ONCE (sg->parent); +if (!parent) +return -EAGAIN ; + scoped_guard(spinlock, &parent->children_lock) { +if (READ_ONCE (sg->parent) != parent)return -EAGAIN ; - scoped_guard(spinlock, &parent->children_lock) { -if (READ_ONCE (sg->parent) != parent) -return -EAGAIN ; - sg->invalidated = false; - rc =_gaccess_do_shadow (vcpu->arch.mc, sg, saddr, walk); - } -if (rc == -ENOMEM ) - goto again; -if (!rc) -kvm_s390_release_faultin_array (vcpu->kvm, walk->raw_entries, false); + sg->invalidated = false; + rc =_gaccess_do_shadow (vcpu->arch.mc, sg, saddr, walk); } +if (!rc) +kvm_s390_release_faultin_array (vcpu->kvm, walk->raw_entries, false); +return rc; +} + +static inline int _gaccess_shadow_fault (struct kvm_vcpu *vcpu,struct gmap *sg,gpa_t saddr, +unsigned long seq,struct pgtwalk *walk) +{ +int rc; + +if (kvm_s390_array_needs_retry_unsafe (vcpu->kvm, seq, walk->raw_entries)) +return -EAGAIN ; + +do { + rc =kvm_s390_mmu_cache_topup (vcpu->arch.mc); +if (rc) +return rc; + rc =radix_tree_preload (GFP_KERNEL ); +if (rc) +return rc; +scoped_guard (read_lock, &vcpu->kvm->mmu_lock) + rc = ___gaccess_shadow_fault(vcpu, sg, saddr, seq, walk); +radix_tree_preload_end (); + }while (rc == -ENOMEM ); +return rc; }
Signature · 1 line
2.54.0
Claudio Imbrenda
maintainerv3 cover KVM: s390: A few misc gmap fixes.
A few more minor gmap fixes.
v2->v3:
* Fix allocation size of struct vsie_rmap in kvm_s390_mmu_cache_topup()
* Account for the possible failure of radix_tree_preload()
* Move kvm_s390_mmu_cache_topup() inside the retry loop in _gaccess_shadow_fault(), to guarantee forward progress
v1->v2:
* Improve suppression of __must_check, by using a pointless if instead of casting to (void)
* Fix allocation size for struct vsie_rmap in kvm_s390_mmu_cache_topup()
* Add missing radix_tree_preload() in _gaccess_shadow_fault()
Claudio Imbrenda (5):
KVM: s390: Silence potential warnings in _gmap_crstep_xchg_atomic()
KVM: s390: Fix unlikely race in try_get_locked_pte()
KVM: s390: vsie: Fix allocation of struct vsie_rmap
KVM: s390: vsie: Add missing radix_tree_preload() in
_gaccess_shadow_fault()
KVM: s390: vsie: Use mmu cache to allocate rmap
arch/s390/kvm/dat.c | 2 +- arch/s390/kvm/gaccess.c | 73 ++++++++++++++++++++++--------------- arch/s390/kvm/gmap.c | 7 ++-- arch/s390/kvm/gmap.h | 14 ++++++- arch/s390/mm/gmap_helpers.c | 6 +-- 5 files changed, 63 insertions(+), 39 deletions(-)
Signature · 1 line
2.54.0
Claudio Imbrenda
maintainerPATCH v3 2/5 KVM: s390: Fix unlikely race in try_get_locked_pte()
Fix an unlikely race in try_get_locked_pte(), which could have happened if puds or pmds get unmapped between the p?dp_get() and p?d_offset() functions.
--- arch/s390/mm/gmap_helpers.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/s390/mm/gmap_helpers.c +3 -3
@@ -51,15 +51,15 @@ pte_t *try_get_locked_pte(struct mm_struct *mm, unsigned long vmaddr, spinlock_t pgd =pgdp_get (pgdp);if (pgd_none (pgd) || !pgd_present (pgd))return NULL ; - p4dp =p4d_offset (pgdp, vmaddr); + p4dp =p4d_offset_lockless (pgdp, pgd, vmaddr); p4d =p4dp_get (p4dp);if (p4d_none (p4d) || !p4d_present (p4d))return NULL ; - pudp =pud_offset (p4dp, vmaddr); + pudp =pud_offset_lockless (p4dp, p4d, vmaddr); pud =pudp_get (pudp);if (pud_none (pud) ||pud_leaf (pud) || !pud_present (pud))return NULL ; - pmdp =pmd_offset (pudp, vmaddr); + pmdp =pmd_offset_lockless (pudp, pud, vmaddr); pmd =pmdp_get_lockless (pmdp);if (pmd_none (pmd) ||pmd_leaf (pmd) || !pmd_present (pmd))return NULL ;
Signature · 1 line
2.54.0
[email protected]
AI reviewRe: [PATCH v3 3/5] KVM: s390: vsie: Fix allocation of struct vsie_rmap
In reply to Claudio ImbrendaThank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
Pre-existing issues:
- [High] Unhandled memory allocation failures in handle_sske() and handle_pfmf() lead to an unkillable infinite kernel loop. --
commit abe0e652d367e02d61446edc9873e41898b993e0
Author: Claudio Imbrenda <[email protected]>
KVM: s390: vsie: Fix allocation of struct vsie_rmap
This commit fixes a copy-paste error in the allocation size for struct vsie_rmap in kvm_s390_mmu_cache_topup().
arch/s390/kvm/dat.c int kvm_s390_mmu_cache_topup(struct kvm_s390_mmu_cache *mc) · line 50
Quoted 12 lines
arch/s390/kvm/dat.c +1
-1@@ -45,7 +45,7 @@ int kvm_s390_mmu_cache_topup(struct kvm_s390_mmu_cache *mc) mc->pts[mc->n_pts] = o; }for ( ; mc->n_rmaps <KVM_S390_MMU_CACHE_N_RMAPS ; mc->n_rmaps++) { - o =kzalloc_obj (*mc->rmaps[0 ],GFP_KERNEL_ACCOUNT ); + o = kzalloc_obj(struct vsie_rmap, GFP_KERNEL_ACCOUNT);if (!o)return -ENOMEM ;
[Severity: High]
This is a pre-existing issue, but I noticed some callers of kvm_s390_mmu_cache_topup() do not check its return value.
For example, looking at handle_sske() in arch/s390/kvm/priv.c:
if (rc == -ENOMEM) {
kvm_s390_mmu_cache_topup(vcpu->arch.mc);
continue;
}If kvm_s390_mmu_cache_topup() returns -ENOMEM due to memcg limits, does this create an infinite loop since it immediately retries with an empty cache and fails again?
The same pattern appears in handle_pfmf() in arch/s390/kvm/priv.c:
if (rc == -ENOMEM) {
kvm_s390_mmu_cache_topup(vcpu->arch.mc);
continue;
}Without a fatal_signal_pending() check in these loops, could this prevent the host OOM killer from terminating the VM process?
Quoted 4 lines
arch/s390/kvm/dat.c +0
-0mc->rmaps[mc->n_rmaps] = o;arch/s390/kvm/dat.c +0
-0}return 0 ; }
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=3