Skip to content

Commit c070c19

Browse files
stefano-garzarellamstsirkin
authored andcommitted
vhost-vdpa: fix an iotlb memory leak
Before commit 3d56987 ("vhost-vdpa: introduce asid based IOTLB") we called vhost_vdpa_iotlb_unmap(v, iotlb, 0ULL, 0ULL - 1) during release to free all the resources allocated when processing user IOTLB messages through vhost_vdpa_process_iotlb_update(). That commit changed the handling of IOTLB a bit, and we accidentally removed some code called during the release. We partially fixed this with commit 037d430 ("vhost-vdpa: call vhost_vdpa_cleanup during the release") but a potential memory leak is still there as showed by kmemleak if the application does not send VHOST_IOTLB_INVALIDATE or crashes: unreferenced object 0xffff888007fbaa30 (size 16): comm "blkio-bench", pid 914, jiffies 4294993521 (age 885.500s) hex dump (first 16 bytes): 40 73 41 07 80 88 ff ff 00 00 00 00 00 00 00 00 @sa............. backtrace: [<0000000087736d2a>] kmem_cache_alloc_trace+0x142/0x1c0 [<0000000060740f50>] vhost_vdpa_process_iotlb_msg+0x68c/0x901 [vhost_vdpa] [<0000000083e8e205>] vhost_chr_write_iter+0xc0/0x4a0 [vhost] [<000000008f2f414a>] vhost_vdpa_chr_write_iter+0x18/0x20 [vhost_vdpa] [<00000000de1cd4a0>] vfs_write+0x216/0x4b0 [<00000000a2850200>] ksys_write+0x71/0xf0 [<00000000de8e720b>] __x64_sys_write+0x19/0x20 [<0000000018b12cbb>] do_syscall_64+0x3f/0x90 [<00000000986ec465>] entry_SYSCALL_64_after_hwframe+0x63/0xcd Let's fix this calling vhost_vdpa_iotlb_unmap() on the whole range in vhost_vdpa_remove_as(). We move that call before vhost_dev_cleanup() since we need a valid v->vdev.mm in vhost_vdpa_pa_unmap(). vhost_iotlb_reset() call can be removed, since vhost_vdpa_iotlb_unmap() on the whole range removes all the entries. The kmemleak log reported was observed with a vDPA device that has `use_va` set to true (e.g. VDUSE). This patch has been tested with both types of devices. Fixes: 037d430 ("vhost-vdpa: call vhost_vdpa_cleanup during the release") Fixes: 3d56987 ("vhost-vdpa: introduce asid based IOTLB") Signed-off-by: Stefano Garzarella <[email protected]> Message-Id: <[email protected]> Signed-off-by: Michael S. Tsirkin <[email protected]> Acked-by: Jason Wang <[email protected]>
1 parent 9804731 commit c070c19

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

drivers/vhost/vdpa.c

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,10 @@ static DEFINE_IDA(vhost_vdpa_ida);
6565

6666
static dev_t vhost_vdpa_major;
6767

68+
static void vhost_vdpa_iotlb_unmap(struct vhost_vdpa *v,
69+
struct vhost_iotlb *iotlb,
70+
u64 start, u64 last);
71+
6872
static inline u32 iotlb_to_asid(struct vhost_iotlb *iotlb)
6973
{
7074
struct vhost_vdpa_as *as = container_of(iotlb, struct
@@ -135,7 +139,7 @@ static int vhost_vdpa_remove_as(struct vhost_vdpa *v, u32 asid)
135139
return -EINVAL;
136140

137141
hlist_del(&as->hash_link);
138-
vhost_iotlb_reset(&as->iotlb);
142+
vhost_vdpa_iotlb_unmap(v, &as->iotlb, 0ULL, 0ULL - 1);
139143
kfree(as);
140144

141145
return 0;
@@ -1162,14 +1166,14 @@ static void vhost_vdpa_cleanup(struct vhost_vdpa *v)
11621166
struct vhost_vdpa_as *as;
11631167
u32 asid;
11641168

1165-
vhost_dev_cleanup(&v->vdev);
1166-
kfree(v->vdev.vqs);
1167-
11681169
for (asid = 0; asid < v->vdpa->nas; asid++) {
11691170
as = asid_to_as(v, asid);
11701171
if (as)
11711172
vhost_vdpa_remove_as(v, asid);
11721173
}
1174+
1175+
vhost_dev_cleanup(&v->vdev);
1176+
kfree(v->vdev.vqs);
11731177
}
11741178

11751179
static int vhost_vdpa_open(struct inode *inode, struct file *filep)

0 commit comments

Comments
 (0)