From: Christoph Hellwig <hch@lst.de>
To: Jani Nikula <jani.nikula@linux.intel.com>,
Joonas Lahtinen <joonas.lahtinen@linux.intel.com>,
Rodrigo Vivi <rodrigo.vivi@intel.com>,
Zhenyu Wang <zhenyuw@linux.intel.com>,
Zhi Wang <zhi.a.wang@intel.com>
Cc: Jason Gunthorpe <jgg@nvidia.com>,
intel-gfx@lists.freedesktop.org,
intel-gvt-dev@lists.freedesktop.org,
dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org
Subject: [PATCH 24/29] drm/i915/gvt: remove the extra vfio_device refcounting for dmabufs
Date: Tue, 2 Nov 2021 08:05:56 +0100 [thread overview]
Message-ID: <20211102070601.155501-25-hch@lst.de> (raw)
In-Reply-To: <20211102070601.155501-1-hch@lst.de>
All the dmabufs are torn down when th VGPU is released, so there is
no need for extra refcounting here.
Based on an patch from Jason Gunthorpe.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
drivers/gpu/drm/i915/gvt/dmabuf.c | 12 ------------
drivers/gpu/drm/i915/gvt/gvt.h | 1 -
2 files changed, 13 deletions(-)
diff --git a/drivers/gpu/drm/i915/gvt/dmabuf.c b/drivers/gpu/drm/i915/gvt/dmabuf.c
index eacfe7beaaf67..88c4f8b02ffb6 100644
--- a/drivers/gpu/drm/i915/gvt/dmabuf.c
+++ b/drivers/gpu/drm/i915/gvt/dmabuf.c
@@ -134,7 +134,6 @@ static void dmabuf_gem_object_free(struct kref *kref)
struct intel_vgpu_dmabuf_obj, list);
if (dmabuf_obj == obj) {
list_del(pos);
- vfio_device_put(vgpu->vfio_device);
idr_remove(&vgpu->object_idr,
dmabuf_obj->dmabuf_id);
kfree(dmabuf_obj->info);
@@ -474,16 +473,6 @@ int intel_vgpu_query_plane(struct intel_vgpu *vgpu, void *args)
kref_init(&dmabuf_obj->kref);
- mutex_lock(&vgpu->dmabuf_lock);
- vgpu->vfio_device = vfio_device_get_from_dev(mdev_dev(vgpu->mdev));
- if (!vgpu->vfio_device) {
- gvt_vgpu_err("failed to get vfio device\n");
- mutex_unlock(&vgpu->dmabuf_lock);
- ret = -ENODEV;
- goto out_free_info;
- }
- mutex_unlock(&vgpu->dmabuf_lock);
-
update_fb_info(gfx_plane_info, &fb_info);
INIT_LIST_HEAD(&dmabuf_obj->list);
@@ -589,7 +578,6 @@ void intel_vgpu_dmabuf_cleanup(struct intel_vgpu *vgpu)
dmabuf_obj->vgpu = NULL;
idr_remove(&vgpu->object_idr, dmabuf_obj->dmabuf_id);
- vfio_device_put(vgpu->vfio_device);
list_del(pos);
/* dmabuf_obj might be freed in dmabuf_obj_put */
diff --git a/drivers/gpu/drm/i915/gvt/gvt.h b/drivers/gpu/drm/i915/gvt/gvt.h
index 7c87d7638e6b2..fa83365227514 100644
--- a/drivers/gpu/drm/i915/gvt/gvt.h
+++ b/drivers/gpu/drm/i915/gvt/gvt.h
@@ -230,7 +230,6 @@ struct intel_vgpu {
struct kvm *kvm;
struct work_struct release_work;
atomic_t released;
- struct vfio_device *vfio_device;
struct vfio_group *vfio_group;
struct kvm_page_track_notifier_node track_node;
--
2.30.2
next prev parent reply other threads:[~2021-11-02 7:09 UTC|newest]
Thread overview: 68+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-02 7:05 refactor the i915 GVT support and move to the modern mdev API v2 Christoph Hellwig
2021-11-02 7:05 ` [PATCH 01/29] drm/i915/gvt: undef TRACE_INCLUDE_FILE in i915_trace.h Christoph Hellwig
2021-11-02 7:05 ` [PATCH 02/29] drm/i915/gvt: integrate into the main Makefile Christoph Hellwig
2021-11-02 13:56 ` Jason Gunthorpe
2021-11-02 14:55 ` Jani Nikula
2021-11-04 12:30 ` Joonas Lahtinen
2021-11-04 12:32 ` Jason Gunthorpe
2021-11-09 7:56 ` Christoph Hellwig
2021-11-09 7:55 ` Christoph Hellwig
2021-11-02 7:05 ` [PATCH 03/29] drm/i915/gvt: remove module refcounting in intel_gvt_{,un}register_hypervisor Christoph Hellwig
2021-11-02 15:36 ` Jason Gunthorpe
2021-11-02 7:05 ` [PATCH 04/29] drm/i915/gvt: remove enum hypervisor_type Christoph Hellwig
2021-11-02 15:37 ` Jason Gunthorpe
2021-11-02 7:05 ` [PATCH 05/29] drm/i915/gvt: rename intel_vgpu_ops to intel_vgpu_mdev_ops Christoph Hellwig
2021-11-02 15:37 ` Jason Gunthorpe
2021-11-02 7:05 ` [PATCH 06/29] drm/i915/gvt: move the gvt code into kvmgt.ko Christoph Hellwig
2021-11-02 7:05 ` [PATCH 07/29] drm/i915/gvt: remove intel_gvt_ops Christoph Hellwig
2021-11-02 16:03 ` Jason Gunthorpe
2021-11-02 7:05 ` [PATCH 08/29] drm/i915/gvt: remove the map_gfn_to_mfn and set_trap_area ops Christoph Hellwig
2021-11-02 16:04 ` Jason Gunthorpe
2021-11-02 7:05 ` [PATCH 09/29] drm/i915/gvt: remove the unused from_virt_to_mfn op Christoph Hellwig
2021-11-02 16:04 ` Jason Gunthorpe
2021-11-02 7:05 ` [PATCH 10/29] drm/i915/gvt: merge struct kvmgt_vdev into struct intel_vgpu Christoph Hellwig
2021-11-02 16:05 ` Jason Gunthorpe
2021-11-02 7:05 ` [PATCH 11/29] drm/i915/gvt: merge struct kvmgt_guest_info into strut intel_vgpu Christoph Hellwig
2021-11-02 16:06 ` Jason Gunthorpe
2021-11-02 7:05 ` [PATCH 12/29] drm/i915/gvt: remove vgpu->handle Christoph Hellwig
2021-11-02 16:07 ` Jason Gunthorpe
2021-11-02 7:05 ` [PATCH 13/29] drm/i915/gvt: devirtualize ->{read,write}_gpa Christoph Hellwig
2021-11-02 16:08 ` Jason Gunthorpe
2021-11-02 7:05 ` [PATCH 14/29] drm/i915/gvt: devirtualize ->{get,put}_vfio_device Christoph Hellwig
2021-11-02 16:12 ` Jason Gunthorpe
2021-11-02 7:05 ` [PATCH 15/29] drm/i915/gvt: devirtualize ->set_edid and ->set_opregion Christoph Hellwig
2021-11-02 16:12 ` Jason Gunthorpe
2021-11-02 7:05 ` [PATCH 16/29] drm/i915/gvt: devirtualize ->detach_vgpu Christoph Hellwig
2021-11-02 16:13 ` Jason Gunthorpe
2021-11-02 7:05 ` [PATCH 17/29] drm/i915/gvt: devirtualize ->inject_msi Christoph Hellwig
2021-11-02 16:13 ` Jason Gunthorpe
2021-11-02 7:05 ` [PATCH 18/29] drm/i915/gvt: devirtualize ->is_valid_gfn Christoph Hellwig
2021-11-02 16:14 ` Jason Gunthorpe
2021-11-02 7:05 ` [PATCH 19/29] drm/i915/gvt: devirtualize ->gfn_to_mfn Christoph Hellwig
2021-11-02 16:14 ` Jason Gunthorpe
2021-11-02 7:05 ` [PATCH 20/29] drm/i915/gvt: devirtualize ->{enable,disable}_page_track Christoph Hellwig
2021-11-02 16:15 ` Jason Gunthorpe
2021-11-02 7:05 ` [PATCH 21/29] drm/i915/gvt: devirtualize ->dma_{,un}map_guest_page Christoph Hellwig
2021-11-02 16:17 ` Jason Gunthorpe
2021-11-02 7:05 ` [PATCH 22/29] drm/i915/gvt: devirtualize dma_pin_guest_page Christoph Hellwig
2021-11-02 16:17 ` Jason Gunthorpe
2021-11-02 7:05 ` [PATCH 23/29] drm/i915/gvt: remove struct intel_gvt_mpt Christoph Hellwig
2021-11-02 16:18 ` Jason Gunthorpe
2021-11-02 7:05 ` Christoph Hellwig [this message]
2021-11-02 16:19 ` [PATCH 24/29] drm/i915/gvt: remove the extra vfio_device refcounting for dmabufs Jason Gunthorpe
2021-11-02 7:05 ` [PATCH 25/29] drm/i915/gvt: streamline intel_vgpu_create Christoph Hellwig
2021-11-02 16:19 ` Jason Gunthorpe
2021-11-02 7:05 ` [PATCH 26/29] drm/i915/gvt: pass a struct intel_vgpu to the vfio read/write helpers Christoph Hellwig
2021-11-02 16:20 ` Jason Gunthorpe
2021-11-02 7:05 ` [PATCH 27/29] drm/i915/gvt: remove kvmgt_guest_{init,exit} Christoph Hellwig
2021-11-02 16:36 ` Jason Gunthorpe
2021-11-02 7:06 ` [PATCH 28/29] drm/i915/gvt: convert to use vfio_register_group_dev() Christoph Hellwig
2021-11-02 16:41 ` Jason Gunthorpe
2021-11-03 6:40 ` Christoph Hellwig
2021-11-02 7:06 ` [PATCH 29/29] drm/i915/gvt: merge gvt.c into kvmgvt.c Christoph Hellwig
2021-11-02 16:42 ` Jason Gunthorpe
2021-11-04 12:59 ` refactor the i915 GVT support and move to the modern mdev API v2 Joonas Lahtinen
2021-11-04 14:51 ` Wang, Zhi A
2021-11-09 8:01 ` Christoph Hellwig
2021-11-09 7:59 ` Christoph Hellwig
2021-11-10 13:49 ` Joonas Lahtinen
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=20211102070601.155501-25-hch@lst.de \
--to=hch@lst.de \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=intel-gvt-dev@lists.freedesktop.org \
--cc=jani.nikula@linux.intel.com \
--cc=jgg@nvidia.com \
--cc=joonas.lahtinen@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=rodrigo.vivi@intel.com \
--cc=zhenyuw@linux.intel.com \
--cc=zhi.a.wang@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).