KVM: PPC: Fixes for Book3S HV HPT locking and paired-single decoding
Subsystems (4)
v4 cover KVM: PPC: Fixes for Book3S HV HPT locking and paired-single decoding
This series addresses bug fixes across KVM PPC Book3S HV locking/synchronization and paired-single instruction decoding.
Patches 1 & 2 fix synchronization and preemption issues introduced in commit 6165d5dd99db ("KVM: PPC: Book3S HV: add virtual mode handlers for HPT hcalls and page faults"):
- Patch 1 adds SRCU read lock protection when walking memslots during virtual-mode HPT hcalls to prevent use-after-free races with concurrent memslot updates.
- Patch 2 adds preempt_disable() around all virtual-mode HPTE bit-lock holders — both the guest vCPU paths (kvmppc_hpte_hv_fault() and kvmppc_pseries_do_hpt_hcall()) and the host-side paths (kvm_unmap_rmapp(), kvm_age_rmapp(), resize_hpt_rehash_hpte()) — to prevent CPU stalls and deadlocks on preemption.
Patch 3 fixes paired-single D-form instruction emulation:
- Patch 3 fixes get_d_signext() to correctly extract the full 12-bit D displacement field and perform proper two's-complement sign extension.
Testing:
========
All test kernel builds were compiled with CONFIG_DEBUG_ATOMIC_SLEEP=y. The following scenarios were verified:
1. Power9 PowerNV (L0) in Radix mode:
- Booted L0 host with kernel containing all 3 patches.
- Booted KVM guests in both Radix and Hash modes.
- Ran kernel build workload inside guests — no errors observed.
- Booted L1 guest with the same kernel — booted and ran cleanly.
2. Power9 PowerNV (L0) in Hash mode:
- Booted L0 host with kernel containing all 3 patches.
- Booted KVM guest in Hash mode.
- Ran kernel build workload inside guest — no errors observed.
- Booted L1 nested guest with the same kernel — booted and ran cleanly.
3. Power10 LPAR (L1):
- Booted Power10 LPAR with the patched kernel.
- Booted KVM guest and ran workloads — no errors observed.
Changes in v4:
==============
- v3: https://lore.kernel.org/all/[email protected]/
- Patch 2:
- Fixed missing preemption guard in kvm_htab_write(): introduced kvmppc_virtmode_do_h_remove(), a thin wrapper that brackets kvmppc_do_h_remove() with preempt_disable()/preempt_enable(), mirroring the existing kvmppc_virtmode_do_h_enter() pattern. Replaced both raw kvmppc_do_h_remove() call sites in kvm_htab_write() with the new wrapper.
- Updated commit message to document the kvm_htab_write() fix.
- Dropped Reviewed-by from Shrikanth Hegde as the patch was materially extended.
Changes in v3:
==============
- v2: https://lore.kernel.org/all/[email protected]/
- Patch 2:
- Fixed preemption window in kvm_unmap_rmapp() and kvm_age_rmapp(): moved preempt_disable() before lock_rmap() so both the rmap lock and the HPTE bit-lock are held under a single non-preemptible section, and added preempt_enable() on all early exits and retry paths before cpu_relax().
- Cleaned up kvm_test_clear_dirty_npages(): removed redundant per-iteration preempt_disable()/preempt_enable() pairs since the caller kvmppc_hv_get_dirty_log_hpt() already holds preempt_disable() across the entire loop.
- Reworded commit message to clearly detail the per-function locking design and rationale.
- Picked up Reviewed-by tag from Shrikanth Hegde.
- Patch 3:
- Picked up Reviewed-by tag from Shrikanth Hegde.
Changes in v2:
==============
- v1: https://lore.kernel.org/all/[email protected]/
- Patch 2: Extended preempt_disable()/preempt_enable() coverage to also wrap the HPTE bit-lock hold windows in four host-side virtual-mode functions:
kvm_unmap_rmapp(), kvm_age_rmapp(), kvm_test_clear_dirty_npages(), and resize_hpt_rehash_hpte(). These were identified as vulnerable by Sashiko AI review and confirmed correct by audit.
- Dropped Reviewed-by from Ritesh as the patch was materially extended.
- Patch 2: Added warning comment above kvmppc_pseries_do_hpt_hcall() documenting the preemption requirement.
Amit Machhiwal (3):
KVM: PPC: Book3S HV: Add SRCU protection for virtual-mode HPT hcalls
KVM: PPC: Book3S HV: Add preempt_disable() around virtual-mode HPTE
bit-lock users
KVM: PPC: Fix get_d_signext() 12-bit displacement for paired-single
D-form
arch/powerpc/kvm/book3s_64_mmu_hv.c | 33 +++++++++- arch/powerpc/kvm/book3s_hv.c | 80 +++++++++++++----------- arch/powerpc/kvm/book3s_paired_singles.c | 7 +-- 3 files changed, 77 insertions(+), 43 deletions(-)
base-commit: 602042bf29f6efde39cfb5fdd9289bf4854bc0c5
Signature · 1 line
2.54.0 (Apple Git-157)
PATCH v4 1/3 KVM: PPC: Book3S HV: Add SRCU protection for virtual-mode HPT hcalls
The virtual-mode HPT hcall handlers (H_ENTER, H_REMOVE, H_BULK_REMOVE, H_CLEAR_REF, H_CLEAR_MOD) call into book3s_hv_rm_mmu.c, which accesses memslots via kvm_memslots_raw(). kvm_memslots_raw() uses rcu_dereference_raw_check() to bypass SRCU lockdep annotation checking. This is safe in real mode because the entire guest entry/exit is wrapped in srcu_read_lock/unlock inside kvmppc_run_core() and kvmhv_run_single_vcpu().
However, since commit 6165d5dd99db ("KVM: PPC: Book3S HV: add virtual mode handlers for HPT hcalls and page faults"), these same handlers are also executed in virtual mode via kvmppc_pseries_do_hcall(), which runs after SRCU has already been released on guest exit.
A concurrent KVM_SET_USER_MEMORY_REGION deletion or move can therefore call synchronize_srcu_expedited() — which does not wait for this thread — and then kfree(slot) and vfree(slot->arch.rmap) while the hcall handler still holds a raw pointer to the memslot. lock_rmap() then writes to freed vmalloc memory, leading to use-after-free and memory corruption. Because kvm_memslots_raw() suppresses lockdep checks, this race is entirely silent.
Fix this by factoring out the 7 HPT hcall handlers (H_REMOVE, H_ENTER, H_READ, H_CLEAR_MOD, H_CLEAR_REF, H_PROTECT, H_BULK_REMOVE) into a helper function, kvmppc_pseries_do_hpt_hcall(), and wrapping its call site in srcu_read_lock(&kvm->srcu) / srcu_read_unlock(&kvm->srcu, idx). Targeting only the HPT hcalls avoids wrapping non-HPT hcalls that sleep (such as H_CONFER, H_REGISTER_VPA, H_PAGE_INIT) or handlers that already acquire SRCU internally (such as H_RTAS).
--- arch/powerpc/kvm/book3s_hv.c | 70 ++++++++++++++++++------------------ 1 file changed, 35 insertions(+), 35 deletions(-)
arch/powerpc/kvm/book3s_hv.c +35 -35
@@ -1159,6 +1159,38 @@ static long kvmppc_h_rpt_invalidate(struct kvm_vcpu *vcpu,return H_SUCCESS ; } +static long kvmppc_pseries_do_hpt_hcall (struct kvm_vcpu *vcpu,unsigned long req) +{ +switch (req) { +case H_REMOVE : +return kvmppc_h_remove (vcpu,kvmppc_get_gpr (vcpu,4 ), +kvmppc_get_gpr (vcpu,5 ), +kvmppc_get_gpr (vcpu,6 )); +case H_ENTER : +return kvmppc_h_enter (vcpu,kvmppc_get_gpr (vcpu,4 ), +kvmppc_get_gpr (vcpu,5 ), +kvmppc_get_gpr (vcpu,6 ), +kvmppc_get_gpr (vcpu,7 )); +case H_READ : +return kvmppc_h_read (vcpu,kvmppc_get_gpr (vcpu,4 ), +kvmppc_get_gpr (vcpu,5 )); +case H_CLEAR_MOD : +return kvmppc_h_clear_mod (vcpu,kvmppc_get_gpr (vcpu,4 ), +kvmppc_get_gpr (vcpu,5 )); +case H_CLEAR_REF : +return kvmppc_h_clear_ref (vcpu,kvmppc_get_gpr (vcpu,4 ), +kvmppc_get_gpr (vcpu,5 )); +case H_PROTECT : +return kvmppc_h_protect (vcpu,kvmppc_get_gpr (vcpu,4 ), +kvmppc_get_gpr (vcpu,5 ), +kvmppc_get_gpr (vcpu,6 )); +case H_BULK_REMOVE : +return kvmppc_h_bulk_remove (vcpu); + } + +return H_FUNCTION ; +} +int kvmppc_pseries_do_hcall (struct kvm_vcpu *vcpu) {struct kvm *kvm = vcpu->kvm;
@@ -1174,47 +1206,15 @@ int kvmppc_pseries_do_hcall(struct kvm_vcpu *vcpu)switch (req) {case H_REMOVE : - ret =kvmppc_h_remove (vcpu,kvmppc_get_gpr (vcpu,4 ), -kvmppc_get_gpr (vcpu,5 ), -kvmppc_get_gpr (vcpu,6 )); -if (ret ==H_TOO_HARD ) -return RESUME_HOST ; -break ;case H_ENTER : - ret =kvmppc_h_enter (vcpu,kvmppc_get_gpr (vcpu,4 ), -kvmppc_get_gpr (vcpu,5 ), -kvmppc_get_gpr (vcpu,6 ), -kvmppc_get_gpr (vcpu,7 )); -if (ret ==H_TOO_HARD ) -return RESUME_HOST ; -break ;case H_READ : - ret =kvmppc_h_read (vcpu,kvmppc_get_gpr (vcpu,4 ), -kvmppc_get_gpr (vcpu,5 )); -if (ret ==H_TOO_HARD ) -return RESUME_HOST ; -break ;case H_CLEAR_MOD : - ret =kvmppc_h_clear_mod (vcpu,kvmppc_get_gpr (vcpu,4 ), -kvmppc_get_gpr (vcpu,5 )); -if (ret ==H_TOO_HARD ) -return RESUME_HOST ; -break ;case H_CLEAR_REF : - ret =kvmppc_h_clear_ref (vcpu,kvmppc_get_gpr (vcpu,4 ), -kvmppc_get_gpr (vcpu,5 )); -if (ret ==H_TOO_HARD ) -return RESUME_HOST ; -break ;case H_PROTECT : - ret =kvmppc_h_protect (vcpu,kvmppc_get_gpr (vcpu,4 ), -kvmppc_get_gpr (vcpu,5 ), -kvmppc_get_gpr (vcpu,6 )); -if (ret ==H_TOO_HARD ) -return RESUME_HOST ; -break ;case H_BULK_REMOVE : - ret =kvmppc_h_bulk_remove (vcpu); + idx =srcu_read_lock (&kvm->srcu); + ret =kvmppc_pseries_do_hpt_hcall (vcpu, req); +srcu_read_unlock (&kvm->srcu, idx);if (ret ==H_TOO_HARD )return RESUME_HOST ;break ;
Signature · 1 line
2.54.0 (Apple Git-157)
PATCH v4 2/3 KVM: PPC: Book3S HV: Add preempt_disable() around virtual-mode HPTE bit-lock users
In reply to Amit Machhiwalkvmppc_hv_find_lock_hpte() requires virtual-mode callers to run with preemption disabled, because it can return with HPTE_V_HVLOCK still held until the caller later unlocks the HPTE. Existing virtual-mode callers in book3s_64_mmu_hv.c already follow that rule, but several paths do not.
kvmppc_handle_exit_hv() calls kvmppc_hpte_hv_fault() for hash-mode data-side and instruction-side faults after guest exit with preemption enabled. kvmppc_pseries_do_hcall() executes virtual-mode HPT hcall handlers via kvmppc_pseries_do_hpt_hcall() with preemption enabled; the handlers for H_ENTER, H_REMOVE, H_READ, H_CLEAR_MOD, H_CLEAR_REF, H_PROTECT, and H_BULK_REMOVE all spin on try_lock_hpte() or lock_rmap(). H_ENTER also reaches kvmppc_do_h_enter(), which uses arch_spin_lock() on kvm->mmu_lock. That raw lock choice is intentional because kvmppc_do_h_enter() is also called from real-mode paths, so the correct fix is to establish the proper preemption context at the virtual-mode caller boundary. kvm_htab_write(), the HPT migration restore path, also called kvmppc_do_h_remove() directly with preemption enabled from two
sites: once in the n_valid loop to evict any occupied slot before inserting a new HPTE, and once in the n_invalid loop to evict any occupied slot that the restore marks as invalid. This was inconsistent:
the insert in the same function already used the guarded kvmppc_virtmode_do_h_enter() helper.
On the host side, kvm_unmap_rmapp(), kvm_age_rmapp(), kvm_test_clear_dirty_npages(), and resize_hpt_rehash_hpte() also acquire HPTE_V_HVLOCK via try_lock_hpte() in process context with preemption enabled, serving MMU notifier callbacks, dirty-log harvesting, and HPT resize respectively.
If any of these threads is preempted while holding HPTE_V_HVLOCK, any other thread on the same CPU spinning on the same bit-lock can never make progress, as the lock owner cannot be rescheduled to release it. This is particularly acute when the spinning thread has preemption
disabled: it will never yield, causing a permanent CPU hang.
Fix this by adding preempt_disable()/preempt_enable() pairs around the two kvmppc_hpte_hv_fault() call sites in kvmppc_handle_exit_hv() and around the kvmppc_pseries_do_hpt_hcall() invocation in kvmppc_pseries_do_hcall().
For kvm_htab_write(), introduce kvmppc_virtmode_do_h_remove(), a thin wrapper that brackets kvmppc_do_h_remove() with preempt_disable()/ preempt_enable(), mirroring the existing kvmppc_virtmode_do_h_enter() pattern. The wrapper retains the full flags and avpn parameters so that future virtual-mode callers can use the H_AVPN and H_ANDCOND conditional guards if needed. Note that kvmppc_do_h_remove() spins on both HPTE_V_HVLOCK and lock_rmap() (via remove_revmap_chain()); preemption must be disabled across both bit-locks.
For kvm_unmap_rmapp() and kvm_age_rmapp(), place preempt_disable() before lock_rmap() so that both the rmap chain lock and the subsequent HPTE_V_HVLOCK bit-lock are held under a single non-preemptible window. There is an ABBA ordering constraint between the two locks: the rmap chain lock must be dropped before spinning on the HPTE bit-lock (documented in the comment above the try_lock_hpte() call in kvm_unmap_rmapp()). To preserve this, preempt_enable() is called after unlock_rmap() on the failed try_lock_hpte() retry path and on any early-exit path, before the cpu_relax() spin, so the HPTE lock owner can be scheduled.
For kvm_test_clear_dirty_npages(), remove the per-iteration preempt_disable()/preempt_enable() pairs: this function has a single call site, kvmppc_hv_get_dirty_log_hpt(), which already holds preempt_disable() across the entire loop, making the inner guards redundant.
For resize_hpt_rehash_hpte(), place preempt_disable() before the unconditional try_lock_hpte() spin loop and preempt_enable() after unlock_hpte() at the single exit point. This function is called from kvm_vm_ioctl_resize_hpt_commit(), which first quiesces all vCPUs by clearing kvm->arch.mmu_ready and calling on_each_cpu() to flush any vCPU currently running in guest mode back to host. With all vCPUs out of the guest, no vCPU thread can hold HPTE_V_HVLOCK; any remaining lock holder (an MMU notifier callback or dirty-log walker) runs on a separate CPU and is not preempted, so the spin always makes forward progress.
---
Changes in v4:
- Introduced kvmppc_virtmode_do_h_remove(), a thin wrapper bracketing kvmppc_do_h_remove() with preempt_disable()/preempt_enable(), mirroring kvmppc_virtmode_do_h_enter(). Replaced both raw kvmppc_do_h_remove() call sites in kvm_htab_write() with the new wrapper.
- Updated commit message to document the kvm_htab_write() fix.
- Dropped Reviewed-by from Shrikanth as the patch was materially extended.
arch/powerpc/kvm/book3s_64_mmu_hv.c | 33 +++++++++++++++++++++++++++-- arch/powerpc/kvm/book3s_hv.c | 10 +++++++++ 2 files changed, 41 insertions(+), 2 deletions(-)
arch/powerpc/kvm/book3s_64_mmu_hv.c +31 -2
@@ -47,6 +47,9 @@static long kvmppc_virtmode_do_h_enter (struct kvm *kvm,unsigned long flags,long pte_index,unsigned long pteh,unsigned long ptel,unsigned long *pte_idx_ret); +static void kvmppc_virtmode_do_h_remove (struct kvm *kvm,unsigned long flags, +unsigned long pte_index,unsigned long avpn, +unsigned long *hpret);struct kvm_resize_hpt {/* These fields read-only after init */
@@ -308,6 +311,22 @@ static long kvmppc_virtmode_do_h_enter(struct kvm *kvm, unsigned long flags, } +/* +* Virtual-mode H_REMOVE. kvmppc_do_h_remove() is also called from real mode, +* where preempt_disable() is not usable, so the guard stays here. The function +* spins on HPTE_V_HVLOCK and then lock_rmap() (via remove_revmap_chain()); +* preemption must be disabled across both bit-locks so that spinning callers +* holding preempt_disable() can make forward progress. +*/ +static void kvmppc_virtmode_do_h_remove (struct kvm *kvm,unsigned long flags, +unsigned long pte_index,unsigned long avpn, +unsigned long *hpret) +{ +preempt_disable (); +kvmppc_do_h_remove (kvm, flags, pte_index, avpn, hpret); +preempt_enable (); +} +static struct kvmppc_slb *kvmppc_mmu_book3s_hv_find_slbe (struct kvm_vcpu *vcpu,gva_t eaddr) {
@@ -810,9 +829,11 @@ static void kvm_unmap_rmapp(struct kvm *kvm, struct kvm_memory_slot *memslot, rmapp = &memslot->arch.rmap[gfn - memslot->base_gfn];for (;;) { +preempt_disable ();lock_rmap (rmapp);if (!(*rmapp &KVMPPC_RMAP_PRESENT )) {unlock_rmap (rmapp); +preempt_enable ();break ; }
@@ -826,6 +847,7 @@ static void kvm_unmap_rmapp(struct kvm *kvm, struct kvm_memory_slot *memslot,if (!try_lock_hpte (hptep,HPTE_V_HVLOCK )) {/* unlock rmap before spinning on the HPTE lock */ unlock_rmap (rmapp); +preempt_enable ();while (be64_to_cpu (hptep[0 ]) &HPTE_V_HVLOCK )cpu_relax ();continue ;
@@ -834,6 +856,7 @@ static void kvm_unmap_rmapp(struct kvm *kvm, struct kvm_memory_slot *memslot,kvmppc_unmap_hpte (kvm, i, memslot, rmapp, gfn);unlock_rmap (rmapp);__unlock_hpte (hptep,be64_to_cpu (hptep[0 ])); +preempt_enable (); } }
@@ -890,6 +913,7 @@ static bool kvm_age_rmapp(struct kvm *kvm, struct kvm_memory_slot *memslot, rmapp = &memslot->arch.rmap[gfn - memslot->base_gfn]; retry: +preempt_disable ();lock_rmap (rmapp);if (*rmapp &KVMPPC_RMAP_REFERENCED ) { *rmapp &= ~KVMPPC_RMAP_REFERENCED ;
@@ -897,6 +921,7 @@ static bool kvm_age_rmapp(struct kvm *kvm, struct kvm_memory_slot *memslot, }if (!(*rmapp &KVMPPC_RMAP_PRESENT )) {unlock_rmap (rmapp); +preempt_enable ();return ret; }
@@ -912,6 +937,7 @@ static bool kvm_age_rmapp(struct kvm *kvm, struct kvm_memory_slot *memslot,if (!try_lock_hpte (hptep,HPTE_V_HVLOCK )) {/* unlock rmap before spinning on the HPTE lock */ unlock_rmap (rmapp); +preempt_enable ();while (be64_to_cpu (hptep[0 ]) &HPTE_V_HVLOCK )cpu_relax (); goto retry;
@@ -931,6 +957,7 @@ static bool kvm_age_rmapp(struct kvm *kvm, struct kvm_memory_slot *memslot, }while ((i = j) != head);unlock_rmap (rmapp); +preempt_enable ();return ret; }
@@ -1219,6 +1246,7 @@ static unsigned long resize_hpt_rehash_hpte(struct kvm_resize_hpt *resize,if (!(vpte &HPTE_V_VALID ) && !(vpte &HPTE_V_ABSENT ))return 0 ;/* nothing to do */ +preempt_disable ();while (!try_lock_hpte (hptep,HPTE_V_HVLOCK ))cpu_relax ();
@@ -1346,6 +1374,7 @@ static unsigned long resize_hpt_rehash_hpte(struct kvm_resize_hpt *resize, out:unlock_hpte (hptep, vpte); +preempt_enable ();return ret; }
@@ -1868,7 +1897,7 @@ static ssize_t kvm_htab_write(struct file *file, const char __user *buf, nb +=HPTE_SIZE ;if (be64_to_cpu (hptp[0 ]) & (HPTE_V_VALID |HPTE_V_ABSENT )) -kvmppc_do_h_remove (kvm,0 , i,0 , tmp); +kvmppc_virtmode_do_h_remove (kvm,0 , i,0 , tmp); err = -EIO ; ret =kvmppc_virtmode_do_h_enter (kvm,H_EXACT , i, v, r, tmp);
@@ -1897,7 +1926,7 @@ static ssize_t kvm_htab_write(struct file *file, const char __user *buf,for (j =0 ; j < hdr.n_invalid; ++j) {if (be64_to_cpu (hptp[0 ]) & (HPTE_V_VALID |HPTE_V_ABSENT )) -kvmppc_do_h_remove (kvm,0 , i,0 , tmp); +kvmppc_virtmode_do_h_remove (kvm,0 , i,0 , tmp); ++i; hptp +=2 ; }
arch/powerpc/kvm/book3s_hv.c +10 -0
@@ -1159,6 +1159,10 @@ static long kvmppc_h_rpt_invalidate(struct kvm_vcpu *vcpu,return H_SUCCESS ; } +/* +* Must be called with preemption disabled. The HPT hcall handlers spin +* on HPTE bit-locks and cannot make any blocking/sleeping calls. +*/ static long kvmppc_pseries_do_hpt_hcall (struct kvm_vcpu *vcpu,unsigned long req) {switch (req) {
@@ -1212,9 +1216,11 @@ int kvmppc_pseries_do_hcall(struct kvm_vcpu *vcpu)case H_CLEAR_REF :case H_PROTECT :case H_BULK_REMOVE : +preempt_disable (); idx =srcu_read_lock (&kvm->srcu); ret =kvmppc_pseries_do_hpt_hcall (vcpu, req);srcu_read_unlock (&kvm->srcu, idx); +preempt_enable ();if (ret ==H_TOO_HARD )return RESUME_HOST ;break ;
@@ -1834,8 +1840,10 @@ static int kvmppc_handle_exit_hv(struct kvm_vcpu *vcpu,else vsid = vcpu->arch.fault_gpa; +preempt_disable (); err =kvmppc_hpte_hv_fault (vcpu, vcpu->arch.fault_dar, vsid, vcpu->arch.fault_dsisr, true); +preempt_enable ();if (err ==0 ) { r =RESUME_GUEST ; }else if (err ==-1 || err ==-2 ) {
@@ -1881,8 +1889,10 @@ static int kvmppc_handle_exit_hv(struct kvm_vcpu *vcpu,else vsid = vcpu->arch.fault_gpa; +preempt_disable (); err =kvmppc_hpte_hv_fault (vcpu, vcpu->arch.fault_dar, vsid, vcpu->arch.fault_dsisr, false); +preempt_enable ();if (err ==0 ) { r =RESUME_GUEST ; }else if (err ==-1 ) {
Signature · 1 line
2.54.0 (Apple Git-157)
[email protected]
AI reviewRe: [PATCH v4 2/3] KVM: PPC: Book3S HV: Add preempt_disable() around virtual-mode HPTE bit-lock users
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider: - [High] kvm: deadlock in kvm_test_age_rmapp() due to missing preempt_disable() --
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
- [High] kvm: deadlock in kvm_test_age_rmapp() due to missing preempt_disable() --
commit 6b1add31442320e6307f450d080fd72f64ee2368
Author: Amit Machhiwal <[email protected]>
KVM: PPC: Book3S HV: Add preempt_disable() around virtual-mode HPTE bit-lock users
This commit enforces that threads acquiring HPTE or RMAP bit-locks run with preemption disabled to prevent CPU hangs. It adds preempt_disable() and preempt_enable() pairs around various bit-lock acquisition paths.
arch/powerpc/kvm/book3s_64_mmu_hv.c static bool kvm_age_rmapp(struct kvm *kvm, struct kvm_memory_slot *memslot, · line 919
Quoted 12 lines
arch/powerpc/kvm/book3s_64_mmu_hv.c +1
-0@@ -890,6 +913,7 @@ static bool kvm_age_rmapp(struct kvm *kvm, struct kvm_memory_slot *memslot, rmapp = &memslot->arch.rmap[gfn - memslot->base_gfn]; retry: +preempt_disable ();lock_rmap (rmapp);if (*rmapp &KVMPPC_RMAP_REFERENCED ) { *rmapp &= ~KVMPPC_RMAP_REFERENCED ;
[Severity: High]
Does kvm_test_age_rmapp() also need to disable preemption before acquiring the rmap lock?
Looking at arch/powerpc/kvm/book3s_64_mmu_hv.c:kvm_test_age_rmapp():
lock_rmap(rmapp); if (*rmapp & KVMPPC_RMAP_REFERENCED) goto out;
This MMU notifier callback still acquires the KVMPPC_RMAP_LOCK_BIT without disabling preemption.
If a thread is preempted while holding this bit-lock, and another thread on the same CPU begins spinning for the same lock with preemption disabled (such as in the newly patched paths), couldn't this result in a permanent CPU hang?
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=2
Re: [PATCH v4 2/3] KVM: PPC: Book3S HV: Add preempt_disable() around virtual-mode HPTE bit-lock users
Quoted 30 lines · On 2026/10/07 06:47 PM, [email protected] wrote:
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
- [High] kvm: deadlock inkvm_test_age_rmapp()due to missingpreempt_disable()--commit
6b1add31442320e6307f450d080fd72f64ee2368
Author: Amit Machhiwal <[email protected]>KVM: PPC: Book3S HV: Add
preempt_disable()around virtual-mode HPTE bit-lock usersThis commit enforces that threads acquiring HPTE or RMAP bit-locks run with preemption disabled to prevent CPU hangs. It adds
preempt_disable()andpreempt_enable()pairs around various bit-lock acquisition paths.arch/powerpc/kvm/book3s_64_mmu_hv.c static bool kvm_age_rmapp(struct kvm *kvm, struct kvm_memory_slot *memslot, · line 919
Quoted 12 lines
arch/powerpc/kvm/book3s_64_mmu_hv.c +1
-0@@ -890,6 +913,7 @@ static bool kvm_age_rmapp(struct kvm *kvm, struct kvm_memory_slot *memslot, rmapp = &memslot->arch.rmap[gfn - memslot->base_gfn]; retry: +preempt_disable ();lock_rmap (rmapp);if (*rmapp &KVMPPC_RMAP_REFERENCED ) { *rmapp &= ~KVMPPC_RMAP_REFERENCED ;[Severity: High]
Doeskvm_test_age_rmapp()also need to disable preemption before acquiring the rmap lock?
Quoted 5 lines
Looking at arch/powerpc/kvm/book3s_64_mmu_hv.c:kvm_test_age_rmapp():
lock_rmap(rmapp); if (*rmapp & KVMPPC_RMAP_REFERENCED) goto out;
This is not an issue on powerpc; here is why.
kvm_test_age_rmapp() has exactly one call site:
kvm_test_age_gfn_hv() [book3s_64_mmu_hv.c:1020]
<- kvm_test_age_gfn() [book3s.c:896]
<- kvm_mmu_notifier_test_young() [virt/kvm/kvm_main.c:864]Inside kvm_handle_hva_range(), the handler is invoked only after KVM_MMU_LOCK(kvm) at kvm_main.c:626, which on powerpc expands to spin_lock(&kvm->mmu_lock). mmu_lock is a spinlock_t (include/linux/kvm_host.h:774), and spin_lock() calls preempt_disable() internally. By the time kvm_test_age_rmapp() acquires lock_rmap(), preemption is already disabled by the outer mmu_lock acquisition.
The lockless path in kvm_handle_hva_range() (line 625, gated on CONFIG_KVM_MMU_LOCKLESS_AGING) would bypass KVM_MMU_LOCK and reach the handler with preemption still enabled. However, CONFIG_KVM_MMU_LOCKLESS_AGING is selected only by x86 and s390; powerpc does not select it, so this branch is dead code on powerpc at compile time.
No additional preempt_disable() is needed in kvm_test_age_rmapp().
~ Amit
Quoted 11 lines
This MMU notifier callback still acquires the
KVMPPC_RMAP_LOCK_BITwithout disabling preemption.If a thread is preempted while holding this bit-lock, and another thread on the same CPU begins spinning for the same lock with preemption disabled (such as in the newly patched paths), couldn't this result in a permanent CPU hang?
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=2
PATCH v4 3/3 KVM: PPC: Fix get_d_signext() 12-bit displacement for paired-single D-form
In reply to Amit Machhiwalget_d_signext() has two compounding bugs since its introduction in 2010:
1. The extraction mask 0x8FF silently drops bits 8-10 of the 12-bit D field (PPC ISA bits 21-23), corrupting any displacement that has any of those bits set.
2. The sign-magnitude idiom "-(d & 0x7ff)" is wrong for two's-complement:
for D=0xFFC (encoding of -4) it returns -252 instead of -4.
Together these errors produce a wrong effective address for psq_l, psq_lu, psq_st, and psq_stu whenever the displacement is negative or is a positive value >= 0x100 with bits 8-10 set — essentially any real-world paired- single stack-relative access.
The D field occupies the bottom 12 bits of the instruction word (confirmed by the adjacent W and I extractions via inst_get_field(inst,16,16) and inst_get_field(inst,17,19)). Replace the open-coded logic with the standard sign_extend32(inst & 0xfff, 11), which correctly performs two's-complement sign extension from 12 bits to 32 bits.
---
Changes in v4:
- No changes since v3.
arch/powerpc/kvm/book3s_paired_singles.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
arch/powerpc/kvm/book3s_paired_singles.c +1 -6
@@ -479,12 +479,7 @@ static bool kvmppc_inst_is_paired_single(struct kvm_vcpu *vcpu, u32 inst)static int get_d_signext (u32 inst) { -int d = inst &0x8ff ; - -if (d &0x800 ) -return -(d &0x7ff ); - -return (d &0x7ff ); +return sign_extend32 (inst &0xfff ,11 ); } static int kvmppc_ps_three_in(struct kvm_vcpu *vcpu, bool rc,
Signature · 1 line
2.54.0 (Apple Git-157)
[email protected]
AI reviewRe: [PATCH v4 3/3] KVM: PPC: Fix get_d_signext() 12-bit displacement for paired-single D-form
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider: - [Critical] kvm: ppc: out-of-bounds host memory access in magic page emulation --
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
- [Critical] kvm: ppc: out-of-bounds host memory access in magic page emulation --
commit 7a374e4096a679cdf2566d00b45341748bfbac50
Author: Amit Machhiwal <[email protected]>
KVM: PPC: Fix get_d_signext() 12-bit displacement for paired-single D-form
This commit fixes two compounding bugs in get_d_signext() related to 12-bit D-form displacements for paired-single instructions. It replaces open-coded logic with sign_extend32 to correctly handle bit extraction and two's-complement sign extension.
Quoted 6 lines
arch/powerpc/kvm/book3s_paired_singles.c +0
-0@@ -479,12 +479,7 @@ static bool kvmppc_inst_is_paired_single(struct kvm_vcpu *vcpu, u32 inst)
arch/powerpc/kvm/book3s_paired_singles.c static bool kvmppc_inst_is_paired_single(struct kvm_vcpu *vcpu, u32 inst) · line 483
Quoted 10 lines
arch/powerpc/kvm/book3s_paired_singles.c +1
-6static int get_d_signext (u32 inst) { -int d = inst &0x8ff ; - -if (d &0x800 ) -return -(d &0x7ff ); - -return (d &0x7ff ); +return sign_extend32 (inst &0xfff ,11 ); }
[Severity: Critical]
By fixing the negative displacement calculation here, does this allow negative displacements (like -4 encoding to 0xffc) to reach the magic page emulation in kvmppc_st() and kvmppc_ld() without bounds checking?
For example, in arch/powerpc/kvm/powerpc.c:kvmppc_st():
/* Magic page override */
if (kvmppc_supports_magic_page(vcpu) && mp_pa &&
((pte.raddr & KVM_PAM & PAGE_MASK) == mp_pa) &&
!(kvmppc_get_msr(vcpu) & MSR_PR)) {
void *magic = vcpu->arch.shared;
magic += pte.eaddr & 0xfff;
memcpy(magic, ptr, size);
return EMULATE_DONE;
}If a guest VM sets up a base register pointing to the magic page and executes an 8-byte memory access instruction (like psq_st or lfd) with an offset that translates to 0xffc, could this memcpy copy 8 bytes starting at offset 0xffc, overflowing the 4096-byte vcpu->arch.shared page?
A similar situation appears to exist in kvmppc_ld():
/* Magic page override */
if (kvmppc_supports_magic_page(vcpu) && mp_pa &&
((pte.raddr & KVM_PAM & PAGE_MASK) == mp_pa) &&
!(kvmppc_get_msr(vcpu) & MSR_PR)) {
void *magic = vcpu->arch.shared;
magic += pte.eaddr & 0xfff;
memcpy(ptr, magic, size);
return EMULATE_DONE;
}Could this allow an 8-byte copy to read out-of-bounds host memory when the offset is 0xffc?
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=3