From: Peter Xu <peterx@redhat.com>
To: Liu Yi L <yi.l.liu@intel.com>
Cc: qemu-devel@nongnu.org, alex.williamson@redhat.com,
eric.auger@redhat.com, pbonzini@redhat.com, mst@redhat.com,
david@gibson.dropbear.id.au, kevin.tian@intel.com,
jun.j.tian@intel.com, yi.y.sun@intel.com, kvm@vger.kernel.org,
hao.wu@intel.com, jean-philippe@linaro.org,
Jacob Pan <jacob.jun.pan@linux.intel.com>,
Yi Sun <yi.y.sun@linux.intel.com>
Subject: Re: [PATCH v1 13/22] vfio: add bind stage-1 page table support
Date: Tue, 24 Mar 2020 13:41:21 -0400 [thread overview]
Message-ID: <20200324174121.GX127076@xz-x1> (raw)
In-Reply-To: <1584880579-12178-14-git-send-email-yi.l.liu@intel.com>
On Sun, Mar 22, 2020 at 05:36:10AM -0700, Liu Yi L wrote:
> This patch adds bind_stage1_pgtbl() definition in HostIOMMUContextClass,
> also adds corresponding implementation in VFIO. This is to expose a way
> for vIOMMU to setup dual stage DMA translation for passthru devices on
> hardware.
>
> 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>
> Cc: Alex Williamson <alex.williamson@redhat.com>
> Signed-off-by: Liu Yi L <yi.l.liu@intel.com>
> ---
> hw/iommu/host_iommu_context.c | 49 ++++++++++++++++++++++++++++++-
> hw/vfio/common.c | 55 ++++++++++++++++++++++++++++++++++-
> include/hw/iommu/host_iommu_context.h | 26 ++++++++++++++++-
> 3 files changed, 127 insertions(+), 3 deletions(-)
>
> diff --git a/hw/iommu/host_iommu_context.c b/hw/iommu/host_iommu_context.c
> index af61899..8a53376 100644
> --- a/hw/iommu/host_iommu_context.c
> +++ b/hw/iommu/host_iommu_context.c
> @@ -69,21 +69,67 @@ int host_iommu_ctx_pasid_free(HostIOMMUContext *host_icx, uint32_t pasid)
> return hicxc->pasid_free(host_icx, pasid);
> }
>
> +int host_iommu_ctx_bind_stage1_pgtbl(HostIOMMUContext *host_icx,
> + DualIOMMUStage1BindData *data)
> +{
> + HostIOMMUContextClass *hicxc;
> +
> + if (!host_icx) {
> + return -EINVAL;
> + }
> +
> + hicxc = HOST_IOMMU_CONTEXT_GET_CLASS(host_icx);
> + if (!hicxc) {
> + return -EINVAL;
> + }
> +
> + if (!(host_icx->flags & HOST_IOMMU_NESTING) ||
> + !hicxc->bind_stage1_pgtbl) {
> + return -EINVAL;
> + }
> +
> + return hicxc->bind_stage1_pgtbl(host_icx, data);
> +}
> +
> +int host_iommu_ctx_unbind_stage1_pgtbl(HostIOMMUContext *host_icx,
> + DualIOMMUStage1BindData *data)
> +{
> + HostIOMMUContextClass *hicxc;
> +
> + if (!host_icx) {
> + return -EINVAL;
> + }
> +
> + hicxc = HOST_IOMMU_CONTEXT_GET_CLASS(host_icx);
> + if (!hicxc) {
> + return -EINVAL;
> + }
> +
> + if (!(host_icx->flags & HOST_IOMMU_NESTING) ||
> + !hicxc->unbind_stage1_pgtbl) {
> + return -EINVAL;
> + }
> +
> + return hicxc->unbind_stage1_pgtbl(host_icx, data);
> +}
> +
> void host_iommu_ctx_init(void *_host_icx, size_t instance_size,
> const char *mrtypename,
> - uint64_t flags)
> + uint64_t flags, uint32_t formats)
> {
> HostIOMMUContext *host_icx;
>
> object_initialize(_host_icx, instance_size, mrtypename);
> host_icx = HOST_IOMMU_CONTEXT(_host_icx);
> host_icx->flags = flags;
> + host_icx->stage1_formats = formats;
> host_icx->initialized = true;
> }
>
> void host_iommu_ctx_destroy(HostIOMMUContext *host_icx)
> {
> host_icx->flags = 0x0;
> + host_icx->stage1_formats = 0x0;
This could be dropped too with the function..
> host_icx->initialized = false;
> }
>
> @@ -92,6 +138,7 @@ static void host_icx_init_fn(Object *obj)
> HostIOMMUContext *host_icx = HOST_IOMMU_CONTEXT(obj);
>
> host_icx->flags = 0x0;
> + host_icx->stage1_formats = 0x0;
Same here...
> host_icx->initialized = false;
> }
>
> diff --git a/hw/vfio/common.c b/hw/vfio/common.c
> index e0f2828..770a785 100644
> --- a/hw/vfio/common.c
> +++ b/hw/vfio/common.c
> @@ -1223,6 +1223,52 @@ static int vfio_host_icx_pasid_free(HostIOMMUContext *host_icx,
> return 0;
> }
>
> +static int vfio_host_icx_bind_stage1_pgtbl(HostIOMMUContext *host_icx,
Same name issue on icx? Feel free to choose anything that aligns with
your previous decision...
> + DualIOMMUStage1BindData *bind_data)
> +{
> + VFIOContainer *container = container_of(host_icx, VFIOContainer, host_icx);
> + struct vfio_iommu_type1_bind *bind;
> + unsigned long argsz;
> + int ret = 0;
> +
> + argsz = sizeof(*bind) + sizeof(bind_data->bind_data);
> + bind = g_malloc0(argsz);
> + bind->argsz = argsz;
> + bind->flags = VFIO_IOMMU_BIND_GUEST_PGTBL;
> + memcpy(&bind->data, &bind_data->bind_data, sizeof(bind_data->bind_data));
> +
> + if (ioctl(container->fd, VFIO_IOMMU_BIND, bind)) {
> + ret = -errno;
> + error_report("%s: pasid (%u) bind failed: %d",
> + __func__, bind_data->pasid, ret);
> + }
> + g_free(bind);
> + return ret;
> +}
> +
> +static int vfio_host_icx_unbind_stage1_pgtbl(HostIOMMUContext *host_icx,
> + DualIOMMUStage1BindData *bind_data)
> +{
> + VFIOContainer *container = container_of(host_icx, VFIOContainer, host_icx);
> + struct vfio_iommu_type1_bind *bind;
> + unsigned long argsz;
> + int ret = 0;
> +
> + argsz = sizeof(*bind) + sizeof(bind_data->bind_data);
> + bind = g_malloc0(argsz);
> + bind->argsz = argsz;
> + bind->flags = VFIO_IOMMU_UNBIND_GUEST_PGTBL;
> + memcpy(&bind->data, &bind_data->bind_data, sizeof(bind_data->bind_data));
> +
> + if (ioctl(container->fd, VFIO_IOMMU_BIND, bind)) {
> + ret = -errno;
> + error_report("%s: pasid (%u) unbind failed: %d",
> + __func__, bind_data->pasid, ret);
> + }
> + g_free(bind);
> + return ret;
> +}
> +
> /**
> * Get iommu info from host. Caller of this funcion should free
> * the memory pointed by the returned pointer stored in @info
> @@ -1337,6 +1383,7 @@ static int vfio_init_container(VFIOContainer *container, int group_fd,
> struct vfio_iommu_type1_info_cap_nesting nesting = {
> .nesting_capabilities = 0x0,
> .stage1_formats = 0, };
> + uint32_t stage1_formats;
>
> ret = vfio_get_nesting_iommu_cap(container, &nesting);
> if (ret) {
> @@ -1347,10 +1394,14 @@ static int vfio_init_container(VFIOContainer *container, int group_fd,
>
> flags |= (nesting.nesting_capabilities & VFIO_IOMMU_PASID_REQS) ?
> HOST_IOMMU_PASID_REQUEST : 0;
> + flags |= HOST_IOMMU_NESTING;
> + stage1_formats = nesting.stage1_formats;
> +
> host_iommu_ctx_init(&container->host_icx,
> sizeof(container->host_icx),
> TYPE_VFIO_HOST_IOMMU_CONTEXT,
> - flags);
> + flags,
> + stage1_formats);
We can consider passing in nesting.stage1_formats and drop
stage1_formats.
> }
>
> container->iommu_type = iommu_type;
> @@ -1943,6 +1994,8 @@ static void vfio_host_iommu_context_class_init(ObjectClass *klass,
>
> hicxc->pasid_alloc = vfio_host_icx_pasid_alloc;
> hicxc->pasid_free = vfio_host_icx_pasid_free;
> + hicxc->bind_stage1_pgtbl = vfio_host_icx_bind_stage1_pgtbl;
> + hicxc->unbind_stage1_pgtbl = vfio_host_icx_unbind_stage1_pgtbl;
> }
>
> static const TypeInfo vfio_host_iommu_context_info = {
> diff --git a/include/hw/iommu/host_iommu_context.h b/include/hw/iommu/host_iommu_context.h
> index 5f11a4c..97c9473 100644
> --- a/include/hw/iommu/host_iommu_context.h
> +++ b/include/hw/iommu/host_iommu_context.h
> @@ -41,6 +41,7 @@
> TYPE_HOST_IOMMU_CONTEXT)
>
> typedef struct HostIOMMUContext HostIOMMUContext;
> +typedef struct DualIOMMUStage1BindData DualIOMMUStage1BindData;
>
> typedef struct HostIOMMUContextClass {
> /* private */
> @@ -54,6 +55,16 @@ typedef struct HostIOMMUContextClass {
> /* Reclaim pasid from HostIOMMUContext (a.k.a. host software) */
> int (*pasid_free)(HostIOMMUContext *host_icx,
> uint32_t pasid);
> + /*
> + * Bind stage-1 page table to a hostIOMMU w/ dual stage
> + * DMA translation capability.
> + * @bind_data specifies the bind configurations.
> + */
> + int (*bind_stage1_pgtbl)(HostIOMMUContext *dsi_obj,
> + DualIOMMUStage1BindData *bind_data);
> + /* Undo a previous bind. @bind_data specifies the unbind info. */
> + int (*unbind_stage1_pgtbl)(HostIOMMUContext *dsi_obj,
> + DualIOMMUStage1BindData *bind_data);
> } HostIOMMUContextClass;
>
> /*
> @@ -62,17 +73,30 @@ typedef struct HostIOMMUContextClass {
> struct HostIOMMUContext {
> Object parent_obj;
> #define HOST_IOMMU_PASID_REQUEST (1ULL << 0)
> +#define HOST_IOMMU_NESTING (1ULL << 1)
> uint64_t flags;
> + uint32_t stage1_formats;
> bool initialized;
> };
>
> +struct DualIOMMUStage1BindData {
> + uint32_t pasid;
> + union {
> + struct iommu_gpasid_bind_data gpasid_bind;
> + } bind_data;
> +};
> +
> int host_iommu_ctx_pasid_alloc(HostIOMMUContext *host_icx, uint32_t min,
> uint32_t max, uint32_t *pasid);
> int host_iommu_ctx_pasid_free(HostIOMMUContext *host_icx, uint32_t pasid);
> +int host_iommu_ctx_bind_stage1_pgtbl(HostIOMMUContext *host_icx,
> + DualIOMMUStage1BindData *data);
> +int host_iommu_ctx_unbind_stage1_pgtbl(HostIOMMUContext *host_icx,
> + DualIOMMUStage1BindData *data);
>
> void host_iommu_ctx_init(void *_host_icx, size_t instance_size,
> const char *mrtypename,
> - uint64_t flags);
> + uint64_t flags, uint32_t formats);
> void host_iommu_ctx_destroy(HostIOMMUContext *host_icx);
>
> #endif
> --
> 2.7.4
>
--
Peter Xu
next prev parent reply other threads:[~2020-03-24 17:41 UTC|newest]
Thread overview: 80+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-22 12:35 [PATCH v1 00/22] intel_iommu: expose Shared Virtual Addressing to VMs Liu Yi L
2020-03-22 12:35 ` [PATCH v1 01/22] scripts/update-linux-headers: Import iommu.h Liu Yi L
2020-03-22 12:35 ` [PATCH v1 02/22] header file update VFIO/IOMMU vSVA APIs Liu Yi L
2020-03-29 16:32 ` Auger Eric
2020-03-30 7:06 ` Liu, Yi L
2020-03-22 12:36 ` [PATCH v1 03/22] vfio: check VFIO_TYPE1_NESTING_IOMMU support Liu Yi L
2020-03-22 12:36 ` [PATCH v1 04/22] hw/iommu: introduce HostIOMMUContext Liu Yi L
2020-03-23 20:58 ` Peter Xu
2020-03-24 10:00 ` Liu, Yi L
2020-03-22 12:36 ` [PATCH v1 05/22] hw/pci: modify pci_setup_iommu() to set PCIIOMMUOps Liu Yi L
2020-03-22 12:36 ` [PATCH v1 06/22] hw/pci: introduce pci_device_set/unset_iommu_context() Liu Yi L
2020-03-23 21:15 ` Peter Xu
2020-03-24 10:02 ` Liu, Yi L
2020-03-22 12:36 ` [PATCH v1 07/22] intel_iommu: add set/unset_iommu_context callback Liu Yi L
2020-03-23 21:29 ` Peter Xu
2020-03-24 11:15 ` Liu, Yi L
2020-03-24 15:24 ` Peter Xu
2020-03-25 9:37 ` Liu, Yi L
2020-03-22 12:36 ` [PATCH v1 08/22] vfio: init HostIOMMUContext per-container Liu Yi L
[not found] ` <20200323213943.GR127076@xz-x1>
2020-03-24 13:03 ` Liu, Yi L
2020-03-24 14:45 ` Peter Xu
2020-03-25 9:30 ` Liu, Yi L
2020-03-22 12:36 ` [PATCH v1 09/22] vfio/common: check PASID alloc/free availability Liu Yi L
2020-03-23 22:06 ` Peter Xu
2020-03-24 11:18 ` Liu, Yi L
2020-03-22 12:36 ` [PATCH v1 10/22] intel_iommu: add virtual command capability support Liu Yi L
2020-03-22 12:36 ` [PATCH v1 11/22] intel_iommu: process PASID cache invalidation Liu Yi L
2020-03-22 12:36 ` [PATCH v1 12/22] intel_iommu: add PASID cache management infrastructure Liu Yi L
2020-03-24 17:32 ` Peter Xu
2020-03-25 12:20 ` Liu, Yi L
2020-03-25 14:52 ` Peter Xu
2020-03-26 6:15 ` Liu, Yi L
2020-03-26 13:57 ` Liu, Yi L
2020-03-26 15:53 ` Peter Xu
2020-03-27 1:33 ` Liu, Yi L
2020-03-22 12:36 ` [PATCH v1 13/22] vfio: add bind stage-1 page table support Liu Yi L
2020-03-24 17:41 ` Peter Xu [this message]
2020-03-25 9:49 ` Liu, Yi L
2020-03-22 12:36 ` [PATCH v1 14/22] intel_iommu: bind/unbind guest page table to host Liu Yi L
2020-03-24 17:46 ` Peter Xu
2020-03-25 12:42 ` Liu, Yi L
2020-03-25 14:56 ` Peter Xu
2020-03-26 3:04 ` Liu, Yi L
2020-03-25 12:47 ` Liu, Yi L
2020-03-22 12:36 ` [PATCH v1 15/22] intel_iommu: replay guest pasid bindings " Liu Yi L
2020-03-24 18:00 ` Peter Xu
2020-03-25 13:14 ` Liu, Yi L
2020-03-25 15:06 ` Peter Xu
2020-03-26 3:17 ` Liu, Yi L
2020-03-22 12:36 ` [PATCH v1 16/22] intel_iommu: replay pasid binds after context cache invalidation Liu Yi L
2020-03-24 18:07 ` Peter Xu
2020-03-25 13:18 ` Liu, Yi L
2020-03-22 12:36 ` [PATCH v1 17/22] intel_iommu: do not pass down pasid bind for PASID #0 Liu Yi L
2020-03-24 18:13 ` Peter Xu
2020-03-25 10:42 ` Liu, Yi L
2020-03-25 15:12 ` Peter Xu
2020-03-26 2:42 ` Liu, Yi L
2020-03-22 12:36 ` [PATCH v1 18/22] vfio: add support for flush iommu stage-1 cache Liu Yi L
2020-03-24 18:19 ` Peter Xu
2020-03-25 10:40 ` Liu, Yi L
2020-03-22 12:36 ` [PATCH v1 19/22] intel_iommu: process PASID-based iotlb invalidation Liu Yi L
2020-03-24 18:26 ` Peter Xu
2020-03-25 13:36 ` Liu, Yi L
2020-03-25 15:15 ` Peter Xu
2020-03-29 11:17 ` Liu, Yi L
2020-03-22 12:36 ` [PATCH v1 20/22] intel_iommu: propagate PASID-based iotlb invalidation to host Liu Yi L
2020-03-24 18:34 ` Peter Xu
2020-03-25 13:21 ` Liu, Yi L
2020-03-26 5:41 ` Liu, Yi L
2020-03-26 13:02 ` Peter Xu
2020-03-26 13:22 ` Peter Xu
2020-03-26 13:33 ` Liu, Yi L
2020-03-26 13:23 ` Liu, Yi L
2020-03-22 12:36 ` [PATCH v1 21/22] intel_iommu: process PASID-based Device-TLB invalidation Liu Yi L
2020-03-24 18:36 ` Peter Xu
2020-03-25 9:19 ` Liu, Yi L
2020-03-22 12:36 ` [PATCH v1 22/22] intel_iommu: modify x-scalable-mode to be string option Liu Yi L
2020-03-24 18:39 ` Peter Xu
2020-03-25 13:22 ` Liu, Yi L
2020-03-22 13:25 ` [PATCH v1 00/22] intel_iommu: expose Shared Virtual Addressing to VMs no-reply
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=20200324174121.GX127076@xz-x1 \
--to=peterx@redhat.com \
--cc=alex.williamson@redhat.com \
--cc=david@gibson.dropbear.id.au \
--cc=eric.auger@redhat.com \
--cc=hao.wu@intel.com \
--cc=jacob.jun.pan@linux.intel.com \
--cc=jean-philippe@linaro.org \
--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=qemu-devel@nongnu.org \
--cc=yi.l.liu@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).