From: Yi Liu <yi.l.liu@intel.com>
To: alex.williamson@redhat.com, jgg@nvidia.com, kevin.tian@intel.com
Cc: joro@8bytes.org, robin.murphy@arm.com, cohuck@redhat.com,
eric.auger@redhat.com, nicolinc@nvidia.com, kvm@vger.kernel.org,
mjrosato@linux.ibm.com, chao.p.peng@linux.intel.com,
yi.l.liu@intel.com, yi.y.sun@linux.intel.com, peterx@redhat.com,
jasowang@redhat.com, shameerali.kolothum.thodi@huawei.com,
lulu@redhat.com, suravee.suthikulpanit@amd.com,
intel-gvt-dev@lists.freedesktop.org,
intel-gfx@lists.freedesktop.org, linux-s390@vger.kernel.org,
xudong.hao@intel.com, yan.y.zhao@intel.com,
terrence.xu@intel.com
Subject: [PATCH v1 2/5] vfio-iommufd: No need to record iommufd_ctx in vfio_device
Date: Wed, 8 Mar 2023 05:13:37 -0800 [thread overview]
Message-ID: <20230308131340.459224-3-yi.l.liu@intel.com> (raw)
In-Reply-To: <20230308131340.459224-1-yi.l.liu@intel.com>
iommufd_ctx is stored in vfio_device for emulated devices per bind_iommufd.
However, as iommufd_access is created in bind, no more need to stored it
since iommufd_access implicitly stores it.
Signed-off-by: Yi Liu <yi.l.liu@intel.com>
---
drivers/vfio/iommufd.c | 10 +---------
include/linux/vfio.h | 1 -
2 files changed, 1 insertion(+), 10 deletions(-)
diff --git a/drivers/vfio/iommufd.c b/drivers/vfio/iommufd.c
index 1f87294c1931..b55f94271cc7 100644
--- a/drivers/vfio/iommufd.c
+++ b/drivers/vfio/iommufd.c
@@ -142,14 +142,10 @@ int vfio_iommufd_emulated_bind(struct vfio_device *vdev,
lockdep_assert_held(&vdev->dev_set->lock);
- iommufd_ctx_get(ictx);
user = iommufd_access_create(ictx, &vfio_user_ops, vdev);
- if (IS_ERR(user)) {
- iommufd_ctx_put(ictx);
+ if (IS_ERR(user))
return PTR_ERR(user);
- }
vdev->iommufd_access = user;
- vdev->iommufd_ictx = ictx;
return 0;
}
EXPORT_SYMBOL_GPL(vfio_iommufd_emulated_bind);
@@ -162,8 +158,6 @@ void vfio_iommufd_emulated_unbind(struct vfio_device *vdev)
iommufd_access_destroy(vdev->iommufd_access);
vdev->iommufd_access = NULL;
}
- iommufd_ctx_put(vdev->iommufd_ictx);
- vdev->iommufd_ictx = NULL;
}
EXPORT_SYMBOL_GPL(vfio_iommufd_emulated_unbind);
@@ -171,8 +165,6 @@ int vfio_iommufd_emulated_attach_ioas(struct vfio_device *vdev, u32 *pt_id)
{
lockdep_assert_held(&vdev->dev_set->lock);
- if (!vdev->iommufd_ictx)
- return -EINVAL;
if (!vdev->iommufd_access)
return -ENOENT;
return iommufd_access_set_ioas(vdev->iommufd_access, *pt_id);
diff --git a/include/linux/vfio.h b/include/linux/vfio.h
index 93134b023968..3188d8a374bd 100644
--- a/include/linux/vfio.h
+++ b/include/linux/vfio.h
@@ -60,7 +60,6 @@ struct vfio_device {
void (*put_kvm)(struct kvm *kvm);
#if IS_ENABLED(CONFIG_IOMMUFD)
struct iommufd_device *iommufd_device;
- struct iommufd_ctx *iommufd_ictx;
bool iommufd_attached;
#endif
};
--
2.34.1
next prev parent reply other threads:[~2023-03-08 13:20 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-08 13:13 [PATCH v1 0/5] vfio: Make emulated devices prepared for vfio device cdev Yi Liu
2023-03-08 13:13 ` [PATCH v1 1/5] iommufd: Create access in vfio_iommufd_emulated_bind() Yi Liu
2023-03-10 2:08 ` Tian, Kevin
2023-03-14 18:50 ` Nicolin Chen
2023-03-15 6:16 ` Tian, Kevin
2023-03-15 6:21 ` Nicolin Chen
2023-03-15 6:52 ` Tian, Kevin
2023-03-15 8:52 ` Liu, Yi L
2023-03-16 0:17 ` Tian, Kevin
2023-03-16 0:28 ` Nicolin Chen
2023-03-10 17:36 ` Jason Gunthorpe
2023-03-14 8:20 ` Nicolin Chen
2023-03-15 1:01 ` Nicolin Chen
2023-03-15 6:15 ` Tian, Kevin
2023-03-15 6:32 ` Nicolin Chen
2023-03-15 6:50 ` Tian, Kevin
2023-03-15 9:03 ` Nicolin Chen
2023-03-15 12:18 ` Liu, Yi L
2023-03-16 0:32 ` Nicolin Chen
2023-03-16 2:53 ` Tian, Kevin
2023-03-16 3:25 ` Nicolin Chen
2023-03-16 5:33 ` Nicolin Chen
2023-03-16 5:38 ` Tian, Kevin
2023-03-16 5:43 ` Nicolin Chen
2023-03-16 5:49 ` Tian, Kevin
2023-03-16 5:56 ` Nicolin Chen
2023-03-16 6:01 ` Liu, Yi L
2023-03-20 14:49 ` Jason Gunthorpe
2023-03-20 15:11 ` Yi Liu
2023-03-20 15:33 ` Jason Gunthorpe
2023-03-08 13:13 ` Yi Liu [this message]
2023-03-10 17:37 ` [PATCH v1 2/5] vfio-iommufd: No need to record iommufd_ctx in vfio_device Jason Gunthorpe
2023-03-08 13:13 ` [PATCH v1 3/5] vfio-iommufd: Make vfio_iommufd_emulated_bind() return iommufd_access ID Yi Liu
2023-03-10 2:08 ` Tian, Kevin
2023-03-10 17:37 ` Jason Gunthorpe
2023-03-08 13:13 ` [PATCH v1 4/5] Samples/mdev: Uses the vfio emulated iommufd ops set in the mdev sample drivers Yi Liu
2023-03-10 2:10 ` Tian, Kevin
2023-03-10 17:39 ` Jason Gunthorpe
2023-03-08 13:13 ` [PATCH v1 5/5] vfio: Check the presence for iommufd callbacks in __vfio_register_dev() Yi Liu
2023-03-10 2:15 ` Tian, Kevin
2023-03-10 14:04 ` Jason Gunthorpe
2023-03-10 14:12 ` Liu, Yi L
2023-03-10 15:25 ` Jason Gunthorpe
2023-03-13 1:49 ` Tian, Kevin
2023-03-10 17:39 ` Jason Gunthorpe
2023-03-15 12:15 ` Liu, Yi L
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=20230308131340.459224-3-yi.l.liu@intel.com \
--to=yi.l.liu@intel.com \
--cc=alex.williamson@redhat.com \
--cc=chao.p.peng@linux.intel.com \
--cc=cohuck@redhat.com \
--cc=eric.auger@redhat.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=intel-gvt-dev@lists.freedesktop.org \
--cc=jasowang@redhat.com \
--cc=jgg@nvidia.com \
--cc=joro@8bytes.org \
--cc=kevin.tian@intel.com \
--cc=kvm@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=lulu@redhat.com \
--cc=mjrosato@linux.ibm.com \
--cc=nicolinc@nvidia.com \
--cc=peterx@redhat.com \
--cc=robin.murphy@arm.com \
--cc=shameerali.kolothum.thodi@huawei.com \
--cc=suravee.suthikulpanit@amd.com \
--cc=terrence.xu@intel.com \
--cc=xudong.hao@intel.com \
--cc=yan.y.zhao@intel.com \
--cc=yi.y.sun@linux.intel.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;
as well as URLs for NNTP newsgroup(s).