From: Eric Auger <eric.auger@redhat.com> To: eric.auger.pro@gmail.com, eric.auger@redhat.com, iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu, joro@8bytes.org, alex.williamson@redhat.com, jacob.jun.pan@linux.intel.com, yi.l.liu@linux.intel.com, jean-philippe.brucker@arm.com, will.deacon@arm.com, robin.murphy@arm.com Cc: kevin.tian@intel.com, ashok.raj@intel.com, marc.zyngier@arm.com, christoffer.dall@arm.com, peter.maydell@linaro.org Subject: [PATCH v4 08/22] vfio: VFIO_IOMMU_CACHE_INVALIDATE Date: Mon, 18 Feb 2019 14:54:49 +0100 [thread overview] Message-ID: <20190218135504.25048-9-eric.auger@redhat.com> (raw) In-Reply-To: <20190218135504.25048-1-eric.auger@redhat.com> From: "Liu, Yi L" <yi.l.liu@linux.intel.com> When the guest "owns" the stage 1 translation structures, the host IOMMU driver has no knowledge of caching structure updates unless the guest invalidation requests are trapped and passed down to the host. This patch adds the VFIO_IOMMU_CACHE_INVALIDATE ioctl with aims at propagating guest stage1 IOMMU cache invalidations to the host. Signed-off-by: Liu, Yi L <yi.l.liu@linux.intel.com> Signed-off-by: Eric Auger <eric.auger@redhat.com> --- v2 -> v3: - introduce vfio_iommu_for_each_dev back in this patch v1 -> v2: - s/TLB/CACHE - remove vfio_iommu_task usage - commit message rewording --- drivers/vfio/vfio_iommu_type1.c | 47 +++++++++++++++++++++++++++++++++ include/uapi/linux/vfio.h | 13 +++++++++ 2 files changed, 60 insertions(+) diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c index 222e9199edbf..12a40b9db6aa 100644 --- a/drivers/vfio/vfio_iommu_type1.c +++ b/drivers/vfio/vfio_iommu_type1.c @@ -113,6 +113,26 @@ struct vfio_regions { #define IS_IOMMU_CAP_DOMAIN_IN_CONTAINER(iommu) \ (!list_empty(&iommu->domain_list)) +/* iommu->lock must be held */ +static int +vfio_iommu_for_each_dev(struct vfio_iommu *iommu, void *data, + int (*fn)(struct device *, void *)) +{ + struct vfio_domain *d; + struct vfio_group *g; + int ret = 0; + + list_for_each_entry(d, &iommu->domain_list, next) { + list_for_each_entry(g, &d->group_list, next) { + ret = iommu_group_for_each_dev(g->iommu_group, + data, fn); + if (ret) + break; + } + } + return ret; +} + static int put_pfn(unsigned long pfn, int prot); /* @@ -1681,6 +1701,15 @@ vfio_attach_pasid_table(struct vfio_iommu *iommu, return ret; } +static int vfio_cache_inv_fn(struct device *dev, void *data) +{ + struct vfio_iommu_type1_cache_invalidate *ustruct = + (struct vfio_iommu_type1_cache_invalidate *)data; + struct iommu_domain *d = iommu_get_domain_for_dev(dev); + + return iommu_cache_invalidate(d, dev, &ustruct->info); +} + static long vfio_iommu_type1_ioctl(void *iommu_data, unsigned int cmd, unsigned long arg) { @@ -1767,6 +1796,24 @@ static long vfio_iommu_type1_ioctl(void *iommu_data, } else if (cmd == VFIO_IOMMU_DETACH_PASID_TABLE) { vfio_detach_pasid_table(iommu); return 0; + } else if (cmd == VFIO_IOMMU_CACHE_INVALIDATE) { + struct vfio_iommu_type1_cache_invalidate ustruct; + int ret; + + minsz = offsetofend(struct vfio_iommu_type1_cache_invalidate, + info); + + if (copy_from_user(&ustruct, (void __user *)arg, minsz)) + return -EFAULT; + + if (ustruct.argsz < minsz || ustruct.flags) + return -EINVAL; + + mutex_lock(&iommu->lock); + ret = vfio_iommu_for_each_dev(iommu, &ustruct, + vfio_cache_inv_fn); + mutex_unlock(&iommu->lock); + return ret; } return -ENOTTY; diff --git a/include/uapi/linux/vfio.h b/include/uapi/linux/vfio.h index 329d378565d9..29f0ef2d805d 100644 --- a/include/uapi/linux/vfio.h +++ b/include/uapi/linux/vfio.h @@ -776,6 +776,19 @@ struct vfio_iommu_type1_attach_pasid_table { #define VFIO_IOMMU_ATTACH_PASID_TABLE _IO(VFIO_TYPE, VFIO_BASE + 22) #define VFIO_IOMMU_DETACH_PASID_TABLE _IO(VFIO_TYPE, VFIO_BASE + 23) +/** + * VFIO_IOMMU_CACHE_INVALIDATE - _IOWR(VFIO_TYPE, VFIO_BASE + 24, + * struct vfio_iommu_type1_cache_invalidate) + * + * Propagate guest IOMMU cache invalidation to the host. + */ +struct vfio_iommu_type1_cache_invalidate { + __u32 argsz; + __u32 flags; + struct iommu_cache_invalidate_info info; +}; +#define VFIO_IOMMU_CACHE_INVALIDATE _IO(VFIO_TYPE, VFIO_BASE + 24) + /* -------- Additional API for SPAPR TCE (Server POWERPC) IOMMU -------- */ /* -- 2.20.1
WARNING: multiple messages have this Message-ID (diff)
From: Eric Auger <eric.auger@redhat.com> To: eric.auger.pro@gmail.com, eric.auger@redhat.com, iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu, joro@8bytes.org, alex.williamson@redhat.com, jacob.jun.pan@linux.intel.com, yi.l.liu@linux.intel.com, jean-philippe.brucker@arm.com, will.deacon@arm.com, robin.murphy@arm.com Cc: marc.zyngier@arm.com, kevin.tian@intel.com, ashok.raj@intel.com Subject: [PATCH v4 08/22] vfio: VFIO_IOMMU_CACHE_INVALIDATE Date: Mon, 18 Feb 2019 14:54:49 +0100 [thread overview] Message-ID: <20190218135504.25048-9-eric.auger@redhat.com> (raw) In-Reply-To: <20190218135504.25048-1-eric.auger@redhat.com> From: "Liu, Yi L" <yi.l.liu@linux.intel.com> When the guest "owns" the stage 1 translation structures, the host IOMMU driver has no knowledge of caching structure updates unless the guest invalidation requests are trapped and passed down to the host. This patch adds the VFIO_IOMMU_CACHE_INVALIDATE ioctl with aims at propagating guest stage1 IOMMU cache invalidations to the host. Signed-off-by: Liu, Yi L <yi.l.liu@linux.intel.com> Signed-off-by: Eric Auger <eric.auger@redhat.com> --- v2 -> v3: - introduce vfio_iommu_for_each_dev back in this patch v1 -> v2: - s/TLB/CACHE - remove vfio_iommu_task usage - commit message rewording --- drivers/vfio/vfio_iommu_type1.c | 47 +++++++++++++++++++++++++++++++++ include/uapi/linux/vfio.h | 13 +++++++++ 2 files changed, 60 insertions(+) diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c index 222e9199edbf..12a40b9db6aa 100644 --- a/drivers/vfio/vfio_iommu_type1.c +++ b/drivers/vfio/vfio_iommu_type1.c @@ -113,6 +113,26 @@ struct vfio_regions { #define IS_IOMMU_CAP_DOMAIN_IN_CONTAINER(iommu) \ (!list_empty(&iommu->domain_list)) +/* iommu->lock must be held */ +static int +vfio_iommu_for_each_dev(struct vfio_iommu *iommu, void *data, + int (*fn)(struct device *, void *)) +{ + struct vfio_domain *d; + struct vfio_group *g; + int ret = 0; + + list_for_each_entry(d, &iommu->domain_list, next) { + list_for_each_entry(g, &d->group_list, next) { + ret = iommu_group_for_each_dev(g->iommu_group, + data, fn); + if (ret) + break; + } + } + return ret; +} + static int put_pfn(unsigned long pfn, int prot); /* @@ -1681,6 +1701,15 @@ vfio_attach_pasid_table(struct vfio_iommu *iommu, return ret; } +static int vfio_cache_inv_fn(struct device *dev, void *data) +{ + struct vfio_iommu_type1_cache_invalidate *ustruct = + (struct vfio_iommu_type1_cache_invalidate *)data; + struct iommu_domain *d = iommu_get_domain_for_dev(dev); + + return iommu_cache_invalidate(d, dev, &ustruct->info); +} + static long vfio_iommu_type1_ioctl(void *iommu_data, unsigned int cmd, unsigned long arg) { @@ -1767,6 +1796,24 @@ static long vfio_iommu_type1_ioctl(void *iommu_data, } else if (cmd == VFIO_IOMMU_DETACH_PASID_TABLE) { vfio_detach_pasid_table(iommu); return 0; + } else if (cmd == VFIO_IOMMU_CACHE_INVALIDATE) { + struct vfio_iommu_type1_cache_invalidate ustruct; + int ret; + + minsz = offsetofend(struct vfio_iommu_type1_cache_invalidate, + info); + + if (copy_from_user(&ustruct, (void __user *)arg, minsz)) + return -EFAULT; + + if (ustruct.argsz < minsz || ustruct.flags) + return -EINVAL; + + mutex_lock(&iommu->lock); + ret = vfio_iommu_for_each_dev(iommu, &ustruct, + vfio_cache_inv_fn); + mutex_unlock(&iommu->lock); + return ret; } return -ENOTTY; diff --git a/include/uapi/linux/vfio.h b/include/uapi/linux/vfio.h index 329d378565d9..29f0ef2d805d 100644 --- a/include/uapi/linux/vfio.h +++ b/include/uapi/linux/vfio.h @@ -776,6 +776,19 @@ struct vfio_iommu_type1_attach_pasid_table { #define VFIO_IOMMU_ATTACH_PASID_TABLE _IO(VFIO_TYPE, VFIO_BASE + 22) #define VFIO_IOMMU_DETACH_PASID_TABLE _IO(VFIO_TYPE, VFIO_BASE + 23) +/** + * VFIO_IOMMU_CACHE_INVALIDATE - _IOWR(VFIO_TYPE, VFIO_BASE + 24, + * struct vfio_iommu_type1_cache_invalidate) + * + * Propagate guest IOMMU cache invalidation to the host. + */ +struct vfio_iommu_type1_cache_invalidate { + __u32 argsz; + __u32 flags; + struct iommu_cache_invalidate_info info; +}; +#define VFIO_IOMMU_CACHE_INVALIDATE _IO(VFIO_TYPE, VFIO_BASE + 24) + /* -------- Additional API for SPAPR TCE (Server POWERPC) IOMMU -------- */ /* -- 2.20.1
next prev parent reply other threads:[~2019-02-18 14:34 UTC|newest] Thread overview: 69+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-02-18 13:54 [PATCH v4 00/22] SMMUv3 Nested Stage Setup Eric Auger 2019-02-18 13:54 ` Eric Auger 2019-02-18 13:54 ` [PATCH v4 01/22] driver core: add per device iommu param Eric Auger 2019-02-18 13:54 ` Eric Auger 2019-02-18 13:54 ` [PATCH v4 02/22] iommu: introduce device fault data Eric Auger 2019-02-18 13:54 ` Eric Auger 2019-03-05 14:56 ` Jean-Philippe Brucker 2019-03-06 9:38 ` Auger Eric 2019-03-06 12:08 ` Jean-Philippe Brucker 2019-03-06 11:03 ` Auger Eric 2019-03-06 14:30 ` Auger Eric 2019-03-06 16:07 ` Jean-Philippe Brucker 2019-03-06 17:32 ` Auger Eric 2019-02-18 13:54 ` [PATCH v4 03/22] iommu: introduce device fault report API Eric Auger 2019-02-18 13:54 ` Eric Auger 2019-03-05 15:03 ` Jean-Philippe Brucker 2019-03-06 23:46 ` Jacob Pan 2019-03-07 11:42 ` Jean-Philippe Brucker 2019-03-07 11:42 ` Jean-Philippe Brucker 2019-03-07 11:42 ` Jean-Philippe Brucker 2019-02-18 13:54 ` [PATCH v4 04/22] iommu: Introduce attach/detach_pasid_table API Eric Auger 2019-02-18 13:54 ` Eric Auger 2019-03-05 15:23 ` Jean-Philippe Brucker 2019-03-05 18:15 ` Auger Eric 2019-03-05 18:15 ` Auger Eric 2019-02-18 13:54 ` [PATCH v4 05/22] iommu: Introduce cache_invalidate API Eric Auger 2019-02-18 13:54 ` Eric Auger 2019-03-05 15:28 ` Jean-Philippe Brucker 2019-03-05 18:14 ` Auger Eric 2019-03-05 18:14 ` Auger Eric 2019-03-06 21:59 ` Jacob Pan 2019-03-06 21:59 ` Jacob Pan 2019-02-18 13:54 ` [PATCH v4 06/22] iommu: Introduce bind/unbind_guest_msi Eric Auger 2019-02-18 13:54 ` Eric Auger 2019-02-18 13:54 ` [PATCH v4 07/22] vfio: VFIO_IOMMU_ATTACH/DETACH_PASID_TABLE Eric Auger 2019-02-18 13:54 ` Eric Auger [this message] 2019-02-18 13:54 ` [PATCH v4 08/22] vfio: VFIO_IOMMU_CACHE_INVALIDATE Eric Auger 2019-02-18 13:54 ` [PATCH v4 09/22] vfio: VFIO_IOMMU_BIND/UNBIND_MSI Eric Auger 2019-02-18 13:54 ` Eric Auger 2019-02-18 13:54 ` [PATCH v4 10/22] iommu/arm-smmu-v3: Link domains and devices Eric Auger 2019-02-18 13:54 ` Eric Auger 2019-02-18 13:54 ` [PATCH v4 11/22] iommu/arm-smmu-v3: Maintain a SID->device structure Eric Auger 2019-02-18 13:54 ` Eric Auger 2019-02-18 13:54 ` [PATCH v4 12/22] iommu/smmuv3: Get prepared for nested stage support Eric Auger 2019-02-18 13:54 ` Eric Auger 2019-02-18 13:54 ` [PATCH v4 13/22] iommu/smmuv3: Implement attach/detach_pasid_table Eric Auger 2019-02-18 13:54 ` Eric Auger 2019-02-18 13:54 ` [PATCH v4 14/22] iommu/smmuv3: Implement cache_invalidate Eric Auger 2019-02-18 13:54 ` Eric Auger 2019-02-18 13:54 ` [PATCH v4 15/22] dma-iommu: Implement NESTED_MSI cookie Eric Auger 2019-02-18 13:54 ` Eric Auger 2019-02-18 13:54 ` [PATCH v4 16/22] iommu/smmuv3: Implement bind/unbind_guest_msi Eric Auger 2019-02-18 13:54 ` Eric Auger 2019-02-18 13:54 ` [PATCH v4 17/22] iommu/smmuv3: Report non recoverable faults Eric Auger 2019-02-18 13:54 ` Eric Auger 2019-02-18 13:54 ` [PATCH v4 18/22] vfio-pci: Add a new VFIO_REGION_TYPE_NESTED region type Eric Auger 2019-02-18 13:54 ` Eric Auger 2019-02-18 13:55 ` [PATCH v4 19/22] vfio-pci: Register an iommu fault handler Eric Auger 2019-02-18 13:55 ` Eric Auger 2019-02-25 14:22 ` Vincent Stehlé 2019-02-25 17:30 ` Auger Eric 2019-02-18 13:55 ` [PATCH v4 20/22] vfio_pci: Allow to mmap the fault queue Eric Auger 2019-02-18 13:55 ` Eric Auger 2019-02-18 13:55 ` [PATCH v4 21/22] vfio-pci: Add VFIO_PCI_DMA_FAULT_IRQ_INDEX Eric Auger 2019-02-18 13:55 ` Eric Auger 2019-02-18 13:55 ` [PATCH v4 22/22] vfio: Document nested stage control Eric Auger 2019-02-18 13:55 ` Eric Auger 2019-03-05 8:07 ` [PATCH v4 00/22] SMMUv3 Nested Stage Setup Auger Eric 2019-03-05 16:42 ` Auger Eric
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=20190218135504.25048-9-eric.auger@redhat.com \ --to=eric.auger@redhat.com \ --cc=alex.williamson@redhat.com \ --cc=ashok.raj@intel.com \ --cc=christoffer.dall@arm.com \ --cc=eric.auger.pro@gmail.com \ --cc=iommu@lists.linux-foundation.org \ --cc=jacob.jun.pan@linux.intel.com \ --cc=jean-philippe.brucker@arm.com \ --cc=joro@8bytes.org \ --cc=kevin.tian@intel.com \ --cc=kvm@vger.kernel.org \ --cc=kvmarm@lists.cs.columbia.edu \ --cc=linux-kernel@vger.kernel.org \ --cc=marc.zyngier@arm.com \ --cc=peter.maydell@linaro.org \ --cc=robin.murphy@arm.com \ --cc=will.deacon@arm.com \ --cc=yi.l.liu@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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.