Skip to content

Commit 8f6a9f0

Browse files
aikpaulusmack
authored andcommitted
KVM: PPC: Book3S: Protect kvmppc_gpa_to_ua() with SRCU
kvmppc_gpa_to_ua() accesses KVM memory slot array via srcu_dereference_check() and this produces warnings from RCU like below. This extends the existing srcu_read_lock/unlock to cover that kvmppc_gpa_to_ua() as well. We did not hit this before as this lock is not needed for the realmode handlers and hash guests would use the realmode path all the time; however the radix guests are always redirected to the virtual mode handlers and hence the warning. [ 68.253798] ./include/linux/kvm_host.h:575 suspicious rcu_dereference_check() usage! [ 68.253799] other info that might help us debug this: [ 68.253802] rcu_scheduler_active = 2, debug_locks = 1 [ 68.253804] 1 lock held by qemu-system-ppc/6413: [ 68.253806] #0: (&vcpu->mutex){+.+.}, at: [<c00800000e3c22f4>] vcpu_load+0x3c/0xc0 [kvm] [ 68.253826] stack backtrace: [ 68.253830] CPU: 92 PID: 6413 Comm: qemu-system-ppc Tainted: G W 4.14.0-rc3-00553-g432dcba58e9c-dirty #72 [ 68.253833] Call Trace: [ 68.253839] [c000000fd3d9f790] [c000000000b7fcc8] dump_stack+0xe8/0x160 (unreliable) [ 68.253845] [c000000fd3d9f7d0] [c0000000001924c0] lockdep_rcu_suspicious+0x110/0x180 [ 68.253851] [c000000fd3d9f850] [c0000000000e825c] kvmppc_gpa_to_ua+0x26c/0x2b0 [ 68.253858] [c000000fd3d9f8b0] [c00800000e3e1984] kvmppc_h_put_tce+0x12c/0x2a0 [kvm] Fixes: 121f80b ("KVM: PPC: VFIO: Add in-kernel acceleration for VFIO") Cc: [email protected] # v4.12+ Signed-off-by: Alexey Kardashevskiy <[email protected]> Signed-off-by: Paul Mackerras <[email protected]>
1 parent 2cde371 commit 8f6a9f0

File tree

1 file changed

+14
-9
lines changed

1 file changed

+14
-9
lines changed

arch/powerpc/kvm/book3s_64_vio.c

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -478,36 +478,41 @@ long kvmppc_h_put_tce(struct kvm_vcpu *vcpu, unsigned long liobn,
478478
return ret;
479479

480480
dir = iommu_tce_direction(tce);
481+
482+
idx = srcu_read_lock(&vcpu->kvm->srcu);
483+
481484
if ((dir != DMA_NONE) && kvmppc_gpa_to_ua(vcpu->kvm,
482-
tce & ~(TCE_PCI_READ | TCE_PCI_WRITE), &ua, NULL))
483-
return H_PARAMETER;
485+
tce & ~(TCE_PCI_READ | TCE_PCI_WRITE), &ua, NULL)) {
486+
ret = H_PARAMETER;
487+
goto unlock_exit;
488+
}
484489

485490
entry = ioba >> stt->page_shift;
486491

487492
list_for_each_entry_lockless(stit, &stt->iommu_tables, next) {
488-
if (dir == DMA_NONE) {
493+
if (dir == DMA_NONE)
489494
ret = kvmppc_tce_iommu_unmap(vcpu->kvm,
490495
stit->tbl, entry);
491-
} else {
492-
idx = srcu_read_lock(&vcpu->kvm->srcu);
496+
else
493497
ret = kvmppc_tce_iommu_map(vcpu->kvm, stit->tbl,
494498
entry, ua, dir);
495-
srcu_read_unlock(&vcpu->kvm->srcu, idx);
496-
}
497499

498500
if (ret == H_SUCCESS)
499501
continue;
500502

501503
if (ret == H_TOO_HARD)
502-
return ret;
504+
goto unlock_exit;
503505

504506
WARN_ON_ONCE(1);
505507
kvmppc_clear_tce(stit->tbl, entry);
506508
}
507509

508510
kvmppc_tce_put(stt, entry, tce);
509511

510-
return H_SUCCESS;
512+
unlock_exit:
513+
srcu_read_unlock(&vcpu->kvm->srcu, idx);
514+
515+
return ret;
511516
}
512517
EXPORT_SYMBOL_GPL(kvmppc_h_put_tce);
513518

0 commit comments

Comments
 (0)