From: Liu Yi L <yi.l.liu@intel.com>
To: qemu-devel@nongnu.org, mst@redhat.com, pbonzini@redhat.com,
alex.williamson@redhat.com, peterx@redhat.com
Cc: tianyu.lan@intel.com, kevin.tian@intel.com, yi.l.liu@intel.com,
Yi Sun <yi.y.sun@linux.intel.com>,
kvm@vger.kernel.org, jun.j.tian@intel.com, eric.auger@redhat.com,
yi.y.sun@intel.com, jacob.jun.pan@linux.intel.com,
david@gibson.dropbear.id.au
Subject: [RFC v2 09/22] vfio/pci: add iommu_context notifier for pasid alloc/free
Date: Thu, 24 Oct 2019 08:34:30 -0400 [thread overview]
Message-ID: <1571920483-3382-10-git-send-email-yi.l.liu@intel.com> (raw)
In-Reply-To: <1571920483-3382-1-git-send-email-yi.l.liu@intel.com>
This patch adds pasid alloc/free notifiers for vfio-pci. It is
supposed to be fired by vIOMMU. VFIO then sends PASID allocation
or free request to host.
Cc: Kevin Tian <kevin.tian@intel.com>
Cc: Jacob Pan <jacob.jun.pan@linux.intel.com>
Cc: Peter Xu <peterx@redhat.com>
Cc: Eric Auger <eric.auger@redhat.com>
Cc: Yi Sun <yi.y.sun@linux.intel.com>
Cc: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Liu Yi L <yi.l.liu@intel.com>
---
hw/vfio/common.c | 9 ++++++
hw/vfio/pci.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++++
include/hw/iommu/iommu.h | 15 +++++++++
3 files changed, 105 insertions(+)
diff --git a/hw/vfio/common.c b/hw/vfio/common.c
index d418527..e6ad21c 100644
--- a/hw/vfio/common.c
+++ b/hw/vfio/common.c
@@ -1436,6 +1436,7 @@ static void vfio_disconnect_container(VFIOGroup *group)
if (QLIST_EMPTY(&container->group_list)) {
VFIOAddressSpace *space = container->space;
VFIOGuestIOMMU *giommu, *tmp;
+ VFIOIOMMUContext *giommu_ctx, *ctx;
QLIST_REMOVE(container, next);
@@ -1446,6 +1447,14 @@ static void vfio_disconnect_container(VFIOGroup *group)
g_free(giommu);
}
+ QLIST_FOREACH_SAFE(giommu_ctx, &container->iommu_ctx_list,
+ iommu_ctx_next, ctx) {
+ iommu_ctx_notifier_unregister(giommu_ctx->iommu_ctx,
+ &giommu_ctx->n);
+ QLIST_REMOVE(giommu_ctx, iommu_ctx_next);
+ g_free(giommu_ctx);
+ }
+
trace_vfio_disconnect_container(container->fd);
close(container->fd);
g_free(container);
diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
index 12fac39..8721ff6 100644
--- a/hw/vfio/pci.c
+++ b/hw/vfio/pci.c
@@ -2699,11 +2699,80 @@ static void vfio_unregister_req_notifier(VFIOPCIDevice *vdev)
vdev->req_enabled = false;
}
+static void vfio_register_iommu_ctx_notifier(VFIOPCIDevice *vdev,
+ IOMMUContext *iommu_ctx,
+ IOMMUCTXNotifyFn fn,
+ IOMMUCTXEvent event)
+{
+ VFIOContainer *container = vdev->vbasedev.group->container;
+ VFIOIOMMUContext *giommu_ctx;
+
+ giommu_ctx = g_malloc0(sizeof(*giommu_ctx));
+ giommu_ctx->container = container;
+ giommu_ctx->iommu_ctx = iommu_ctx;
+ QLIST_INSERT_HEAD(&container->iommu_ctx_list,
+ giommu_ctx,
+ iommu_ctx_next);
+ iommu_ctx_notifier_register(iommu_ctx,
+ &giommu_ctx->n,
+ fn,
+ event);
+}
+
+static void vfio_iommu_pasid_alloc_notify(IOMMUCTXNotifier *n,
+ IOMMUCTXEventData *event_data)
+{
+ VFIOIOMMUContext *giommu_ctx = container_of(n, VFIOIOMMUContext, n);
+ VFIOContainer *container = giommu_ctx->container;
+ IOMMUCTXPASIDReqDesc *pasid_req =
+ (IOMMUCTXPASIDReqDesc *) event_data->data;
+ struct vfio_iommu_type1_pasid_request req;
+ unsigned long argsz;
+ int pasid;
+
+ argsz = sizeof(req);
+ req.argsz = argsz;
+ req.flag = VFIO_IOMMU_PASID_ALLOC;
+ req.min_pasid = pasid_req->min_pasid;
+ req.max_pasid = pasid_req->max_pasid;
+
+ pasid = ioctl(container->fd, VFIO_IOMMU_PASID_REQUEST, &req);
+ if (pasid < 0) {
+ error_report("%s: %d, alloc failed", __func__, -errno);
+ }
+ pasid_req->alloc_result = pasid;
+}
+
+static void vfio_iommu_pasid_free_notify(IOMMUCTXNotifier *n,
+ IOMMUCTXEventData *event_data)
+{
+ VFIOIOMMUContext *giommu_ctx = container_of(n, VFIOIOMMUContext, n);
+ VFIOContainer *container = giommu_ctx->container;
+ IOMMUCTXPASIDReqDesc *pasid_req =
+ (IOMMUCTXPASIDReqDesc *) event_data->data;
+ struct vfio_iommu_type1_pasid_request req;
+ unsigned long argsz;
+ int ret = 0;
+
+ argsz = sizeof(req);
+ req.argsz = argsz;
+ req.flag = VFIO_IOMMU_PASID_FREE;
+ req.pasid = pasid_req->pasid;
+
+ ret = ioctl(container->fd, VFIO_IOMMU_PASID_REQUEST, &req);
+ if (ret != 0) {
+ error_report("%s: %d, pasid %u free failed",
+ __func__, -errno, (unsigned) pasid_req->pasid);
+ }
+ pasid_req->free_result = ret;
+}
+
static void vfio_realize(PCIDevice *pdev, Error **errp)
{
VFIOPCIDevice *vdev = PCI_VFIO(pdev);
VFIODevice *vbasedev_iter;
VFIOGroup *group;
+ IOMMUContext *iommu_context;
char *tmp, *subsys, group_path[PATH_MAX], *group_name;
Error *err = NULL;
ssize_t len;
@@ -3000,6 +3069,18 @@ static void vfio_realize(PCIDevice *pdev, Error **errp)
vfio_register_req_notifier(vdev);
vfio_setup_resetfn_quirk(vdev);
+ iommu_context = pci_device_iommu_context(pdev);
+ if (iommu_context) {
+ vfio_register_iommu_ctx_notifier(vdev,
+ iommu_context,
+ vfio_iommu_pasid_alloc_notify,
+ IOMMU_CTX_EVENT_PASID_ALLOC);
+ vfio_register_iommu_ctx_notifier(vdev,
+ iommu_context,
+ vfio_iommu_pasid_free_notify,
+ IOMMU_CTX_EVENT_PASID_FREE);
+ }
+
return;
out_teardown:
diff --git a/include/hw/iommu/iommu.h b/include/hw/iommu/iommu.h
index c22c442..4352afd 100644
--- a/include/hw/iommu/iommu.h
+++ b/include/hw/iommu/iommu.h
@@ -31,10 +31,25 @@
typedef struct IOMMUContext IOMMUContext;
enum IOMMUCTXEvent {
+ IOMMU_CTX_EVENT_PASID_ALLOC,
+ IOMMU_CTX_EVENT_PASID_FREE,
IOMMU_CTX_EVENT_NUM,
};
typedef enum IOMMUCTXEvent IOMMUCTXEvent;
+union IOMMUCTXPASIDReqDesc {
+ struct {
+ uint32_t min_pasid;
+ uint32_t max_pasid;
+ int32_t alloc_result; /* pasid allocated for the alloc request */
+ };
+ struct {
+ uint32_t pasid; /* pasid to be free */
+ int free_result;
+ };
+};
+typedef union IOMMUCTXPASIDReqDesc IOMMUCTXPASIDReqDesc;
+
struct IOMMUCTXEventData {
IOMMUCTXEvent event;
uint64_t length;
--
2.7.4
next prev parent reply other threads:[~2019-10-24 14:26 UTC|newest]
Thread overview: 79+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-24 12:34 [RFC v2 00/22] intel_iommu: expose Shared Virtual Addressing to VM Liu Yi L
2019-10-24 12:34 ` [RFC v2 01/22] update-linux-headers: Import iommu.h Liu Yi L
2019-10-24 12:34 ` [RFC v2 02/22] header update VFIO/IOMMU vSVA APIs against 5.4.0-rc3+ Liu Yi L
2019-10-24 12:34 ` [RFC v2 03/22] intel_iommu: modify x-scalable-mode to be string option Liu Yi L
2019-11-01 14:57 ` Peter Xu
2019-11-05 9:14 ` Liu, Yi L
2019-11-05 12:50 ` Peter Xu
2019-11-06 9:50 ` Liu, Yi L
2019-10-24 12:34 ` [RFC v2 04/22] hw/iommu: introduce IOMMUContext Liu Yi L
2019-10-27 17:39 ` David Gibson
2019-11-06 11:18 ` Liu, Yi L
2019-10-24 12:34 ` [RFC v2 05/22] vfio/common: add iommu_ctx_notifier in container Liu Yi L
2019-11-01 14:58 ` Peter Xu
2019-11-06 11:08 ` Liu, Yi L
2019-10-24 12:34 ` [RFC v2 06/22] hw/pci: modify pci_setup_iommu() to set PCIIOMMUOps Liu Yi L
2019-10-27 17:43 ` David Gibson
2019-11-06 8:18 ` Liu, Yi L
2019-11-01 18:09 ` Peter Xu
2019-11-06 8:15 ` Liu, Yi L
2019-10-24 12:34 ` [RFC v2 07/22] hw/pci: introduce pci_device_iommu_context() Liu Yi L
2019-10-29 11:50 ` David Gibson
2019-11-06 8:20 ` Liu, Yi L
2019-11-01 18:09 ` Peter Xu
2019-11-06 8:14 ` Liu, Yi L
2019-10-24 12:34 ` [RFC v2 08/22] intel_iommu: provide get_iommu_context() callback Liu Yi L
2019-11-01 14:55 ` Peter Xu
2019-11-06 11:07 ` Liu, Yi L
2019-10-24 12:34 ` Liu Yi L [this message]
2019-10-29 12:15 ` [RFC v2 09/22] vfio/pci: add iommu_context notifier for pasid alloc/free David Gibson
2019-11-01 17:26 ` Peter Xu
2019-11-06 12:46 ` Liu, Yi L
2019-11-06 12:14 ` Liu, Yi L
2019-11-20 4:27 ` David Gibson
2019-11-26 7:07 ` Liu, Yi L
2019-10-24 12:34 ` [RFC v2 10/22] intel_iommu: add virtual command capability support Liu Yi L
2019-11-01 18:05 ` Peter Xu
2019-11-06 12:40 ` Liu, Yi L
2019-11-06 14:00 ` Peter Xu
2019-11-12 6:27 ` Liu, Yi L
2019-10-24 12:34 ` [RFC v2 11/22] intel_iommu: process pasid cache invalidation Liu Yi L
2019-11-02 16:05 ` Peter Xu
2019-11-06 5:55 ` Liu, Yi L
2019-10-24 12:34 ` [RFC v2 12/22] intel_iommu: add present bit check for pasid table entries Liu Yi L
2019-11-02 16:20 ` Peter Xu
2019-11-06 8:14 ` Liu, Yi L
2019-10-24 12:34 ` [RFC v2 13/22] intel_iommu: add PASID cache management infrastructure Liu Yi L
2019-11-04 17:08 ` Peter Xu
2019-11-04 20:06 ` Peter Xu
2019-11-06 7:56 ` Liu, Yi L
2019-11-07 15:46 ` Peter Xu
2019-10-24 12:34 ` [RFC v2 14/22] vfio/pci: add iommu_context notifier for pasid bind/unbind Liu Yi L
2019-11-04 16:02 ` David Gibson
2019-11-06 12:22 ` Liu, Yi L
2019-11-06 14:25 ` Peter Xu
2019-10-24 12:34 ` [RFC v2 15/22] intel_iommu: bind/unbind guest page table to host Liu Yi L
2019-11-04 20:25 ` Peter Xu
2019-11-06 8:10 ` Liu, Yi L
2019-11-06 14:27 ` Peter Xu
2019-10-24 12:34 ` [RFC v2 16/22] intel_iommu: replay guest pasid bindings " Liu Yi L
2019-10-24 12:34 ` [RFC v2 17/22] intel_iommu: replay pasid binds after context cache invalidation Liu Yi L
2019-10-24 12:34 ` [RFC v2 18/22] intel_iommu: do not passdown pasid bind for PASID #0 Liu Yi L
2019-10-24 12:34 ` [RFC v2 19/22] vfio/pci: add iommu_context notifier for PASID-based iotlb flush Liu Yi L
2019-10-24 12:34 ` [RFC v2 20/22] intel_iommu: process PASID-based iotlb invalidation Liu Yi L
2019-10-24 12:34 ` [RFC v2 21/22] intel_iommu: propagate PASID-based iotlb invalidation to host Liu Yi L
2019-10-24 12:34 ` [RFC v2 22/22] intel_iommu: process PASID-based Device-TLB invalidation Liu Yi L
2019-10-25 6:21 ` [RFC v2 00/22] intel_iommu: expose Shared Virtual Addressing to VM no-reply
2019-10-25 6:30 ` no-reply
2019-10-25 9:49 ` Jason Wang
2019-10-25 10:12 ` Tian, Kevin
2019-10-31 4:33 ` Jason Wang
2019-10-31 5:39 ` Tian, Kevin
2019-10-31 14:07 ` Liu, Yi L
2019-11-01 7:29 ` Jason Wang
2019-11-01 7:46 ` Tian, Kevin
2019-11-01 8:04 ` Jason Wang
2019-11-01 8:09 ` Jason Wang
2019-11-02 7:35 ` Tian, Kevin
2019-11-04 17:22 ` Peter Xu
2019-11-05 9:09 ` 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=1571920483-3382-10-git-send-email-yi.l.liu@intel.com \
--to=yi.l.liu@intel.com \
--cc=alex.williamson@redhat.com \
--cc=david@gibson.dropbear.id.au \
--cc=eric.auger@redhat.com \
--cc=jacob.jun.pan@linux.intel.com \
--cc=jun.j.tian@intel.com \
--cc=kevin.tian@intel.com \
--cc=kvm@vger.kernel.org \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peterx@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=tianyu.lan@intel.com \
--cc=yi.y.sun@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).