From: Gautam Dawar <gautam.dawar@xilinx.com>
To: "Michael S. Tsirkin" <mst@redhat.com>,
Jason Wang <jasowang@redhat.com>, <kvm@vger.kernel.org>,
<virtualization@lists.linux-foundation.org>,
<netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Cc: <martinh@xilinx.com>, <hanand@xilinx.com>, <martinpo@xilinx.com>,
<pabloc@xilinx.com>, <dinang@xilinx.com>, <tanuj.kamde@amd.com>,
<habetsm.xilinx@gmail.com>, <ecree.xilinx@gmail.com>,
<eperezma@redhat.com>, Gautam Dawar <gdawar@xilinx.com>,
Wu Zongyong <wuzongyong@linux.alibaba.com>,
Christophe JAILLET <christophe.jaillet@wanadoo.fr>,
Eli Cohen <elic@nvidia.com>,
Zhu Lingshan <lingshan.zhu@intel.com>,
Stefano Garzarella <sgarzare@redhat.com>,
Xie Yongji <xieyongji@bytedance.com>,
Si-Wei Liu <si-wei.liu@oracle.com>,
Parav Pandit <parav@nvidia.com>, Longpeng <longpeng2@huawei.com>,
Dan Carpenter <dan.carpenter@oracle.com>,
Zhang Min <zhang.min9@zte.com.cn>
Subject: [PATCH v2 04/19] vhost-vdpa: switch to use vhost-vdpa specific IOTLB
Date: Wed, 30 Mar 2022 23:33:44 +0530 [thread overview]
Message-ID: <20220330180436.24644-5-gdawar@xilinx.com> (raw)
In-Reply-To: <20220330180436.24644-1-gdawar@xilinx.com>
To ease the implementation of per group ASID support for vDPA
device. This patch switches to use a vhost-vdpa specific IOTLB to
avoid the unnecessary refactoring of the vhost core.
Signed-off-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: Gautam Dawar <gdawar@xilinx.com>
---
drivers/vhost/vdpa.c | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/drivers/vhost/vdpa.c b/drivers/vhost/vdpa.c
index 6d670e32e67b..632c43eb5ecf 100644
--- a/drivers/vhost/vdpa.c
+++ b/drivers/vhost/vdpa.c
@@ -39,6 +39,7 @@ struct vhost_vdpa {
struct vhost_virtqueue *vqs;
struct completion completion;
struct vdpa_device *vdpa;
+ struct vhost_iotlb *iotlb;
struct device dev;
struct cdev cdev;
atomic_t opened;
@@ -589,12 +590,11 @@ static void vhost_vdpa_iotlb_unmap(struct vhost_vdpa *v,
static void vhost_vdpa_iotlb_free(struct vhost_vdpa *v)
{
- struct vhost_dev *dev = &v->vdev;
- struct vhost_iotlb *iotlb = dev->iotlb;
+ struct vhost_iotlb *iotlb = v->iotlb;
vhost_vdpa_iotlb_unmap(v, iotlb, 0ULL, 0ULL - 1);
- kfree(dev->iotlb);
- dev->iotlb = NULL;
+ kfree(v->iotlb);
+ v->iotlb = NULL;
}
static int perm_to_iommu_flags(u32 perm)
@@ -876,7 +876,7 @@ static int vhost_vdpa_process_iotlb_msg(struct vhost_dev *dev,
struct vhost_vdpa *v = container_of(dev, struct vhost_vdpa, vdev);
struct vdpa_device *vdpa = v->vdpa;
const struct vdpa_config_ops *ops = vdpa->config;
- struct vhost_iotlb *iotlb = dev->iotlb;
+ struct vhost_iotlb *iotlb = v->iotlb;
int r = 0;
mutex_lock(&dev->mutex);
@@ -1017,15 +1017,15 @@ static int vhost_vdpa_open(struct inode *inode, struct file *filep)
vhost_dev_init(dev, vqs, nvqs, 0, 0, 0, false,
vhost_vdpa_process_iotlb_msg);
- dev->iotlb = vhost_iotlb_alloc(0, 0);
- if (!dev->iotlb) {
+ v->iotlb = vhost_iotlb_alloc(0, 0);
+ if (!v->iotlb) {
r = -ENOMEM;
goto err_init_iotlb;
}
r = vhost_vdpa_alloc_domain(v);
if (r)
- goto err_init_iotlb;
+ goto err_alloc_domain;
vhost_vdpa_set_iova_range(v);
@@ -1033,6 +1033,8 @@ static int vhost_vdpa_open(struct inode *inode, struct file *filep)
return 0;
+err_alloc_domain:
+ vhost_vdpa_iotlb_free(v);
err_init_iotlb:
vhost_dev_cleanup(&v->vdev);
kfree(vqs);
--
2.30.1
next prev parent reply other threads:[~2022-03-30 18:08 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-30 18:03 [PATCH v2 00/19] Control VQ support in vDPA Gautam Dawar
2022-03-30 18:03 ` [PATCH v2 01/19] vhost: move the backend feature bits to vhost_types.h Gautam Dawar
2022-03-30 18:03 ` [PATCH v2 02/19] virtio-vdpa: don't set callback if virtio doesn't need it Gautam Dawar
2022-03-30 18:03 ` [PATCH v2 03/19] vhost-vdpa: passing iotlb to IOMMU mapping helpers Gautam Dawar
2022-03-30 18:03 ` Gautam Dawar [this message]
2022-03-30 18:03 ` [PATCH v2 05/19] vdpa: introduce virtqueue groups Gautam Dawar
2022-03-30 18:03 ` [PATCH v2 06/19] vdpa: multiple address spaces support Gautam Dawar
2022-03-30 18:03 ` [PATCH v2 07/19] vdpa: introduce config operations for associating ASID to a virtqueue group Gautam Dawar
2022-03-30 18:03 ` [PATCH v2 08/19] vhost_iotlb: split out IOTLB initialization Gautam Dawar
2022-03-30 18:03 ` [PATCH v2 09/19] vhost: support ASID in IOTLB API Gautam Dawar
2022-03-30 18:03 ` [PATCH v2 10/19] vhost-vdpa: introduce asid based IOTLB Gautam Dawar
2022-03-30 18:03 ` [PATCH v2 11/19] vhost-vdpa: introduce uAPI to get the number of virtqueue groups Gautam Dawar
2022-03-30 18:03 ` [PATCH v2 12/19] vhost-vdpa: introduce uAPI to get the number of address spaces Gautam Dawar
2022-03-30 18:03 ` [PATCH v2 13/19] vhost-vdpa: uAPI to get virtqueue group id Gautam Dawar
2022-03-30 18:03 ` [PATCH v2 14/19] vhost-vdpa: introduce uAPI to set group ASID Gautam Dawar
2022-03-30 18:03 ` [PATCH v2 15/19] vhost-vdpa: support ASID based IOTLB API Gautam Dawar
2022-04-01 4:24 ` Jason Wang
2022-04-28 6:28 ` Gautam Dawar
2022-05-07 10:24 ` Jason Wang
2022-03-30 18:03 ` [PATCH v2 16/19] vdpa_sim: advertise VIRTIO_NET_F_MTU Gautam Dawar
2022-03-30 18:03 ` [PATCH v2 17/19] vdpa_sim: factor out buffer completion logic Gautam Dawar
2022-03-30 18:03 ` [PATCH v2 18/19] vdpa_sim: filter destination mac address Gautam Dawar
2022-03-30 18:03 ` [PATCH v2 19/19] vdpasim: control virtqueue support Gautam Dawar
2022-06-21 15:19 ` Stefano Garzarella
2022-06-22 10:21 ` Eugenio Perez Martin
2022-06-22 15:04 ` Eugenio Perez Martin
2022-06-22 15:44 ` Stefano Garzarella
2022-05-09 3:42 ` [PATCH v2 00/19] Control VQ support in vDPA Jason Wang
2022-05-09 7:07 ` Michael S. Tsirkin
2022-05-20 8:04 ` Eugenio Perez Martin
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=20220330180436.24644-5-gdawar@xilinx.com \
--to=gautam.dawar@xilinx.com \
--cc=christophe.jaillet@wanadoo.fr \
--cc=dan.carpenter@oracle.com \
--cc=dinang@xilinx.com \
--cc=ecree.xilinx@gmail.com \
--cc=elic@nvidia.com \
--cc=eperezma@redhat.com \
--cc=gdawar@xilinx.com \
--cc=habetsm.xilinx@gmail.com \
--cc=hanand@xilinx.com \
--cc=jasowang@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=lingshan.zhu@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=longpeng2@huawei.com \
--cc=martinh@xilinx.com \
--cc=martinpo@xilinx.com \
--cc=mst@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=pabloc@xilinx.com \
--cc=parav@nvidia.com \
--cc=sgarzare@redhat.com \
--cc=si-wei.liu@oracle.com \
--cc=tanuj.kamde@amd.com \
--cc=virtualization@lists.linux-foundation.org \
--cc=wuzongyong@linux.alibaba.com \
--cc=xieyongji@bytedance.com \
--cc=zhang.min9@zte.com.cn \
/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;
as well as URLs for NNTP newsgroup(s).