From: "Longpeng(Mike)" <longpeng2@huawei.com>
To: <mst@redhat.com>, <jasowang@redhat.com>
Cc: <arei.gonglei@huawei.com>, <yechuan@huawei.com>,
<huangzhichao@huawei.com>,
<virtualization@lists.linux-foundation.org>,
<linux-kernel@vger.kernel.org>, <kvm@vger.kernel.org>,
Longpeng <longpeng2@huawei.com>
Subject: [PATCH] vhost-vdpa: cleanup memory maps when closing vdpa fds
Date: Tue, 31 Jan 2023 22:53:10 +0800 [thread overview]
Message-ID: <20230131145310.2069-1-longpeng2@huawei.com> (raw)
From: Longpeng <longpeng2@huawei.com>
We must cleanup all memory maps when closing the vdpa fds, otherwise
some critical resources (e.g. memory, iommu map) will leaked if the
userspace exits unexpectedly (e.g. kill -9).
Signed-off-by: Longpeng <longpeng2@huawei.com>
---
drivers/vhost/vdpa.c | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/drivers/vhost/vdpa.c b/drivers/vhost/vdpa.c
index a527eeeac637..37477cffa5aa 100644
--- a/drivers/vhost/vdpa.c
+++ b/drivers/vhost/vdpa.c
@@ -823,6 +823,18 @@ static void vhost_vdpa_unmap(struct vhost_vdpa *v,
vhost_vdpa_remove_as(v, asid);
}
+static void vhost_vdpa_clean_map(struct vhost_vdpa *v)
+{
+ struct vhost_vdpa_as *as;
+ u32 asid;
+
+ for (asid = 0; asid < v->vdpa->nas; asid++) {
+ as = asid_to_as(v, asid);
+ if (as)
+ vhost_vdpa_unmap(v, &as->iotlb, 0ULL, 0ULL - 1);
+ }
+}
+
static int vhost_vdpa_va_map(struct vhost_vdpa *v,
struct vhost_iotlb *iotlb,
u64 iova, u64 size, u64 uaddr, u32 perm)
@@ -1247,6 +1259,7 @@ static int vhost_vdpa_release(struct inode *inode, struct file *filep)
vhost_vdpa_clean_irq(v);
vhost_vdpa_reset(v);
vhost_dev_stop(&v->vdev);
+ vhost_vdpa_clean_map(v);
vhost_vdpa_free_domain(v);
vhost_vdpa_config_put(v);
vhost_vdpa_cleanup(v);
--
2.23.0
next reply other threads:[~2023-01-31 14:53 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-31 14:53 Longpeng(Mike) [this message]
2023-02-14 1:53 ` Longpeng (Mike, Cloud Infrastructure Service Product Dept.)
2023-02-14 6:16 ` Jason Wang
2023-02-14 6:27 ` Longpeng (Mike, Cloud Infrastructure Service Product Dept.)
2023-02-15 2:00 ` Jason Wang
2023-02-15 2:49 ` Longpeng (Mike, Cloud Infrastructure Service Product Dept.)
2023-02-15 2:56 ` Jason Wang
2023-02-15 5:15 ` Longpeng (Mike, Cloud Infrastructure Service Product Dept.)
2023-02-15 11:45 ` Michael S. Tsirkin
2023-02-17 5:58 ` Jason Wang
2023-03-10 8:37 ` Michael S. Tsirkin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230131145310.2069-1-longpeng2@huawei.com \
--to=longpeng2@huawei.com \
--cc=arei.gonglei@huawei.com \
--cc=huangzhichao@huawei.com \
--cc=jasowang@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mst@redhat.com \
--cc=virtualization@lists.linux-foundation.org \
--cc=yechuan@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®