| Message ID | 20190212043745.18290-1-aik@ozlabs.ru (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | [kernel] KVM: PPC: Release all hardware TCE tables attached to a group | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | success | next/apply_patch Successfully applied |
| snowpatch_ozlabs/build-ppc64le | success | build succeeded & removed 0 sparse warning(s) |
| snowpatch_ozlabs/build-ppc64be | success | build succeeded & removed 0 sparse warning(s) |
| snowpatch_ozlabs/build-ppc64e | success | build succeeded & removed 0 sparse warning(s) |
| snowpatch_ozlabs/build-pmac32 | success | build succeeded & removed 0 sparse warning(s) |
| snowpatch_ozlabs/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 7 lines checked |
On Tue, Feb 12, 2019 at 03:37:45PM +1100, Alexey Kardashevskiy wrote: > The SPAPR TCE KVM device references all hardware IOMMU tables assigned to > some IOMMU group to ensure that in-kernel KVM acceleration of H_PUT_TCE > can work. The tables are references when an IOMMU group gets registered > with the VFIO KVM device by the KVM_DEV_VFIO_GROUP_ADD ioctl; > KVM_DEV_VFIO_GROUP_DEL calls into the dereferencing code > in kvm_spapr_tce_release_iommu_group() which walks through the list of > LIOBNs, finds a matching IOMMU table and calls kref_put() when found. > > However that code stops after the very first successful derefencing > leaving other tables referenced till the SPAPR TCE KVM device is destroyed > which normally happens on guest reboot or termination so if we do hotplug > and unplug in a loop, we are leaking IOMMU tables here. > > This removes a premature return to let kvm_spapr_tce_release_iommu_group() > find and dereference all attached tables. > > Fixes: 121f80ba68f "KVM: PPC: VFIO: Add in-kernel acceleration for VFIO" > Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru> Thanks, applied to my kvm-ppc-next tree. Paul.
diff --git a/arch/powerpc/kvm/book3s_64_vio.c b/arch/powerpc/kvm/book3s_64_vio.c index 532ab797..6630dde 100644 --- a/arch/powerpc/kvm/book3s_64_vio.c +++ b/arch/powerpc/kvm/book3s_64_vio.c @@ -133,7 +133,6 @@ extern void kvm_spapr_tce_release_iommu_group(struct kvm *kvm, continue; kref_put(&stit->kref, kvm_spapr_tce_liobn_put); - return; } } }
The SPAPR TCE KVM device references all hardware IOMMU tables assigned to some IOMMU group to ensure that in-kernel KVM acceleration of H_PUT_TCE can work. The tables are references when an IOMMU group gets registered with the VFIO KVM device by the KVM_DEV_VFIO_GROUP_ADD ioctl; KVM_DEV_VFIO_GROUP_DEL calls into the dereferencing code in kvm_spapr_tce_release_iommu_group() which walks through the list of LIOBNs, finds a matching IOMMU table and calls kref_put() when found. However that code stops after the very first successful derefencing leaving other tables referenced till the SPAPR TCE KVM device is destroyed which normally happens on guest reboot or termination so if we do hotplug and unplug in a loop, we are leaking IOMMU tables here. This removes a premature return to let kvm_spapr_tce_release_iommu_group() find and dereference all attached tables. Fixes: 121f80ba68f "KVM: PPC: VFIO: Add in-kernel acceleration for VFIO" Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru> --- I kinda hoped to blame RCU for misbehaviour but it was me all over again :) --- arch/powerpc/kvm/book3s_64_vio.c | 1 - 1 file changed, 1 deletion(-)