From: Liu Yi L <yi.l.liu@intel.com> To: alex.williamson@redhat.com, eric.auger@redhat.com, baolu.lu@linux.intel.com, joro@8bytes.org Cc: kevin.tian@intel.com, jacob.jun.pan@linux.intel.com, ashok.raj@intel.com, yi.l.liu@intel.com, jun.j.tian@intel.com, yi.y.sun@intel.com, jean-philippe@linaro.org, peterx@redhat.com, jasowang@redhat.com, hao.wu@intel.com, stefanha@gmail.com, iommu@lists.linux-foundation.org, kvm@vger.kernel.org, Will Deacon <will@kernel.org>, Robin Murphy <robin.murphy@arm.com> Subject: [PATCH v7 02/16] iommu/smmu: Report empty domain nesting info Date: Thu, 10 Sep 2020 03:45:19 -0700 [thread overview] Message-ID: <1599734733-6431-3-git-send-email-yi.l.liu@intel.com> (raw) In-Reply-To: <1599734733-6431-1-git-send-email-yi.l.liu@intel.com> This patch is added as instead of returning a boolean for DOMAIN_ATTR_NESTING, iommu_domain_get_attr() should return an iommu_nesting_info handle. For now, return an empty nesting info struct for now as true nesting is not yet supported by the SMMUs. Cc: Will Deacon <will@kernel.org> Cc: Robin Murphy <robin.murphy@arm.com> Cc: Eric Auger <eric.auger@redhat.com> Cc: Jean-Philippe Brucker <jean-philippe@linaro.org> Suggested-by: Jean-Philippe Brucker <jean-philippe@linaro.org> Signed-off-by: Liu Yi L <yi.l.liu@intel.com> Signed-off-by: Jacob Pan <jacob.jun.pan@linux.intel.com> Reviewed-by: Eric Auger <eric.auger@redhat.com> --- v5 -> v6: *) add review-by from Eric Auger. v4 -> v5: *) address comments from Eric Auger. --- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 29 +++++++++++++++++++++++++++-- drivers/iommu/arm/arm-smmu/arm-smmu.c | 29 +++++++++++++++++++++++++++-- 2 files changed, 54 insertions(+), 4 deletions(-) diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c index 7196207..016e2e5 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c @@ -3019,6 +3019,32 @@ static struct iommu_group *arm_smmu_device_group(struct device *dev) return group; } +static int arm_smmu_domain_nesting_info(struct arm_smmu_domain *smmu_domain, + void *data) +{ + struct iommu_nesting_info *info = (struct iommu_nesting_info *)data; + unsigned int size; + + if (!info || smmu_domain->stage != ARM_SMMU_DOMAIN_NESTED) + return -ENODEV; + + size = sizeof(struct iommu_nesting_info); + + /* + * if provided buffer size is smaller than expected, should + * return 0 and also the expected buffer size to caller. + */ + if (info->argsz < size) { + info->argsz = size; + return 0; + } + + /* report an empty iommu_nesting_info for now */ + memset(info, 0x0, size); + info->argsz = size; + return 0; +} + static int arm_smmu_domain_get_attr(struct iommu_domain *domain, enum iommu_attr attr, void *data) { @@ -3028,8 +3054,7 @@ static int arm_smmu_domain_get_attr(struct iommu_domain *domain, case IOMMU_DOMAIN_UNMANAGED: switch (attr) { case DOMAIN_ATTR_NESTING: - *(int *)data = (smmu_domain->stage == ARM_SMMU_DOMAIN_NESTED); - return 0; + return arm_smmu_domain_nesting_info(smmu_domain, data); default: return -ENODEV; } diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu.c b/drivers/iommu/arm/arm-smmu/arm-smmu.c index 09c42af9..368486f 100644 --- a/drivers/iommu/arm/arm-smmu/arm-smmu.c +++ b/drivers/iommu/arm/arm-smmu/arm-smmu.c @@ -1510,6 +1510,32 @@ static struct iommu_group *arm_smmu_device_group(struct device *dev) return group; } +static int arm_smmu_domain_nesting_info(struct arm_smmu_domain *smmu_domain, + void *data) +{ + struct iommu_nesting_info *info = (struct iommu_nesting_info *)data; + unsigned int size; + + if (!info || smmu_domain->stage != ARM_SMMU_DOMAIN_NESTED) + return -ENODEV; + + size = sizeof(struct iommu_nesting_info); + + /* + * if provided buffer size is smaller than expected, should + * return 0 and also the expected buffer size to caller. + */ + if (info->argsz < size) { + info->argsz = size; + return 0; + } + + /* report an empty iommu_nesting_info for now */ + memset(info, 0x0, size); + info->argsz = size; + return 0; +} + static int arm_smmu_domain_get_attr(struct iommu_domain *domain, enum iommu_attr attr, void *data) { @@ -1519,8 +1545,7 @@ static int arm_smmu_domain_get_attr(struct iommu_domain *domain, case IOMMU_DOMAIN_UNMANAGED: switch (attr) { case DOMAIN_ATTR_NESTING: - *(int *)data = (smmu_domain->stage == ARM_SMMU_DOMAIN_NESTED); - return 0; + return arm_smmu_domain_nesting_info(smmu_domain, data); default: return -ENODEV; } -- 2.7.4
WARNING: multiple messages have this Message-ID (diff)
From: Liu Yi L <yi.l.liu@intel.com> To: alex.williamson@redhat.com, eric.auger@redhat.com, baolu.lu@linux.intel.com, joro@8bytes.org Cc: jean-philippe@linaro.org, kevin.tian@intel.com, ashok.raj@intel.com, kvm@vger.kernel.org, stefanha@gmail.com, jun.j.tian@intel.com, iommu@lists.linux-foundation.org, yi.y.sun@intel.com, Robin Murphy <robin.murphy@arm.com>, Will Deacon <will@kernel.org>, jasowang@redhat.com, hao.wu@intel.com Subject: [PATCH v7 02/16] iommu/smmu: Report empty domain nesting info Date: Thu, 10 Sep 2020 03:45:19 -0700 [thread overview] Message-ID: <1599734733-6431-3-git-send-email-yi.l.liu@intel.com> (raw) In-Reply-To: <1599734733-6431-1-git-send-email-yi.l.liu@intel.com> This patch is added as instead of returning a boolean for DOMAIN_ATTR_NESTING, iommu_domain_get_attr() should return an iommu_nesting_info handle. For now, return an empty nesting info struct for now as true nesting is not yet supported by the SMMUs. Cc: Will Deacon <will@kernel.org> Cc: Robin Murphy <robin.murphy@arm.com> Cc: Eric Auger <eric.auger@redhat.com> Cc: Jean-Philippe Brucker <jean-philippe@linaro.org> Suggested-by: Jean-Philippe Brucker <jean-philippe@linaro.org> Signed-off-by: Liu Yi L <yi.l.liu@intel.com> Signed-off-by: Jacob Pan <jacob.jun.pan@linux.intel.com> Reviewed-by: Eric Auger <eric.auger@redhat.com> --- v5 -> v6: *) add review-by from Eric Auger. v4 -> v5: *) address comments from Eric Auger. --- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 29 +++++++++++++++++++++++++++-- drivers/iommu/arm/arm-smmu/arm-smmu.c | 29 +++++++++++++++++++++++++++-- 2 files changed, 54 insertions(+), 4 deletions(-) diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c index 7196207..016e2e5 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c @@ -3019,6 +3019,32 @@ static struct iommu_group *arm_smmu_device_group(struct device *dev) return group; } +static int arm_smmu_domain_nesting_info(struct arm_smmu_domain *smmu_domain, + void *data) +{ + struct iommu_nesting_info *info = (struct iommu_nesting_info *)data; + unsigned int size; + + if (!info || smmu_domain->stage != ARM_SMMU_DOMAIN_NESTED) + return -ENODEV; + + size = sizeof(struct iommu_nesting_info); + + /* + * if provided buffer size is smaller than expected, should + * return 0 and also the expected buffer size to caller. + */ + if (info->argsz < size) { + info->argsz = size; + return 0; + } + + /* report an empty iommu_nesting_info for now */ + memset(info, 0x0, size); + info->argsz = size; + return 0; +} + static int arm_smmu_domain_get_attr(struct iommu_domain *domain, enum iommu_attr attr, void *data) { @@ -3028,8 +3054,7 @@ static int arm_smmu_domain_get_attr(struct iommu_domain *domain, case IOMMU_DOMAIN_UNMANAGED: switch (attr) { case DOMAIN_ATTR_NESTING: - *(int *)data = (smmu_domain->stage == ARM_SMMU_DOMAIN_NESTED); - return 0; + return arm_smmu_domain_nesting_info(smmu_domain, data); default: return -ENODEV; } diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu.c b/drivers/iommu/arm/arm-smmu/arm-smmu.c index 09c42af9..368486f 100644 --- a/drivers/iommu/arm/arm-smmu/arm-smmu.c +++ b/drivers/iommu/arm/arm-smmu/arm-smmu.c @@ -1510,6 +1510,32 @@ static struct iommu_group *arm_smmu_device_group(struct device *dev) return group; } +static int arm_smmu_domain_nesting_info(struct arm_smmu_domain *smmu_domain, + void *data) +{ + struct iommu_nesting_info *info = (struct iommu_nesting_info *)data; + unsigned int size; + + if (!info || smmu_domain->stage != ARM_SMMU_DOMAIN_NESTED) + return -ENODEV; + + size = sizeof(struct iommu_nesting_info); + + /* + * if provided buffer size is smaller than expected, should + * return 0 and also the expected buffer size to caller. + */ + if (info->argsz < size) { + info->argsz = size; + return 0; + } + + /* report an empty iommu_nesting_info for now */ + memset(info, 0x0, size); + info->argsz = size; + return 0; +} + static int arm_smmu_domain_get_attr(struct iommu_domain *domain, enum iommu_attr attr, void *data) { @@ -1519,8 +1545,7 @@ static int arm_smmu_domain_get_attr(struct iommu_domain *domain, case IOMMU_DOMAIN_UNMANAGED: switch (attr) { case DOMAIN_ATTR_NESTING: - *(int *)data = (smmu_domain->stage == ARM_SMMU_DOMAIN_NESTED); - return 0; + return arm_smmu_domain_nesting_info(smmu_domain, data); default: return -ENODEV; } -- 2.7.4 _______________________________________________ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu
next prev parent reply other threads:[~2020-09-10 10:44 UTC|newest] Thread overview: 165+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-09-10 10:45 [PATCH v7 00/16] vfio: expose virtual Shared Virtual Addressing to VMs Liu Yi L 2020-09-10 10:45 ` Liu Yi L 2020-09-10 10:45 ` [PATCH v7 01/16] iommu: Report domain nesting info Liu Yi L 2020-09-10 10:45 ` Liu Yi L 2020-09-11 19:38 ` Alex Williamson 2020-09-11 19:38 ` Alex Williamson 2020-09-10 10:45 ` Liu Yi L [this message] 2020-09-10 10:45 ` [PATCH v7 02/16] iommu/smmu: Report empty " Liu Yi L 2021-01-12 6:50 ` Vivek Gautam 2021-01-12 6:50 ` Vivek Gautam 2021-01-12 9:21 ` Liu, Yi L 2021-01-12 9:21 ` Liu, Yi L 2021-01-12 11:05 ` Vivek Gautam 2021-01-12 11:05 ` Vivek Gautam 2021-01-13 5:56 ` Liu, Yi L 2021-01-13 5:56 ` Liu, Yi L 2021-01-19 10:03 ` Auger Eric 2021-01-19 10:03 ` Auger Eric 2021-01-23 8:59 ` Liu, Yi L 2021-01-23 8:59 ` Liu, Yi L 2021-02-12 7:14 ` Vivek Gautam 2021-02-12 7:14 ` Vivek Gautam 2021-02-12 9:57 ` Auger Eric 2021-02-12 9:57 ` Auger Eric 2021-02-12 10:18 ` Vivek Kumar Gautam 2021-02-12 10:18 ` Vivek Kumar Gautam 2021-02-12 11:01 ` Vivek Kumar Gautam 2021-02-12 11:01 ` Vivek Kumar Gautam 2021-03-03 9:44 ` Liu, Yi L 2021-03-03 9:44 ` Liu, Yi L 2020-09-10 10:45 ` [PATCH v7 03/16] vfio/type1: Report iommu nesting info to userspace Liu Yi L 2020-09-10 10:45 ` Liu Yi L 2020-09-11 20:16 ` Alex Williamson 2020-09-11 20:16 ` Alex Williamson 2020-09-12 8:24 ` Liu, Yi L 2020-09-12 8:24 ` Liu, Yi L 2020-09-10 10:45 ` [PATCH v7 04/16] vfio: Add PASID allocation/free support Liu Yi L 2020-09-10 10:45 ` Liu Yi L 2020-09-11 20:54 ` Alex Williamson 2020-09-11 20:54 ` Alex Williamson 2020-09-15 4:03 ` Liu, Yi L 2020-09-15 4:03 ` Liu, Yi L 2020-09-10 10:45 ` [PATCH v7 05/16] iommu/vt-d: Support setting ioasid set to domain Liu Yi L 2020-09-10 10:45 ` Liu Yi L 2020-09-10 10:45 ` [PATCH v7 06/16] iommu/vt-d: Remove get_task_mm() in bind_gpasid() Liu Yi L 2020-09-10 10:45 ` Liu Yi L 2020-09-10 10:45 ` [PATCH v7 07/16] vfio/type1: Add VFIO_IOMMU_PASID_REQUEST (alloc/free) Liu Yi L 2020-09-10 10:45 ` Liu Yi L 2020-09-11 21:38 ` Alex Williamson 2020-09-11 21:38 ` Alex Williamson 2020-09-12 6:17 ` Liu, Yi L 2020-09-10 10:45 ` [PATCH v7 08/16] iommu: Pass domain to sva_unbind_gpasid() Liu Yi L 2020-09-10 10:45 ` Liu Yi L 2020-09-10 10:45 ` [PATCH v7 09/16] iommu/vt-d: Check ownership for PASIDs from user-space Liu Yi L 2020-09-10 10:45 ` Liu Yi L 2020-09-10 10:45 ` [PATCH v7 10/16] vfio/type1: Support binding guest page tables to PASID Liu Yi L 2020-09-10 10:45 ` Liu Yi L 2020-09-11 22:03 ` Alex Williamson 2020-09-11 22:03 ` Alex Williamson 2020-09-12 6:02 ` Liu, Yi L 2020-09-12 6:02 ` Liu, Yi L 2020-09-10 10:45 ` [PATCH v7 11/16] vfio/type1: Allow invalidating first-level/stage IOMMU cache Liu Yi L 2020-09-10 10:45 ` Liu Yi L 2020-09-10 10:45 ` [PATCH v7 12/16] vfio/type1: Add vSVA support for IOMMU-backed mdevs Liu Yi L 2020-09-10 10:45 ` Liu Yi L 2020-09-10 10:45 ` [PATCH v7 13/16] vfio/pci: Expose PCIe PASID capability to guest Liu Yi L 2020-09-10 10:45 ` Liu Yi L 2020-09-11 22:13 ` Alex Williamson 2020-09-11 22:13 ` Alex Williamson 2020-09-12 7:17 ` Liu, Yi L 2020-09-12 7:17 ` Liu, Yi L 2020-09-10 10:45 ` [PATCH v7 14/16] vfio: Document dual stage control Liu Yi L 2020-09-10 10:45 ` Liu Yi L 2020-09-10 10:45 ` [PATCH v7 15/16] iommu/vt-d: Only support nesting when nesting caps are consistent across iommu units Liu Yi L 2020-09-10 10:45 ` Liu Yi L 2020-09-10 10:45 ` [PATCH v7 16/16] iommu/vt-d: Support reporting nesting capability info Liu Yi L 2020-09-10 10:45 ` Liu Yi L 2020-09-14 4:20 ` [PATCH v7 00/16] vfio: expose virtual Shared Virtual Addressing to VMs Jason Wang 2020-09-14 4:20 ` Jason Wang 2020-09-14 8:01 ` Tian, Kevin 2020-09-14 8:01 ` Tian, Kevin 2020-09-14 8:57 ` Jason Wang 2020-09-14 8:57 ` Jason Wang 2020-09-14 10:38 ` Tian, Kevin 2020-09-14 10:38 ` Tian, Kevin 2020-09-14 11:38 ` Jason Gunthorpe 2020-09-14 11:38 ` Jason Gunthorpe 2020-09-14 13:31 ` Jean-Philippe Brucker 2020-09-14 13:31 ` Jean-Philippe Brucker 2020-09-14 13:47 ` Jason Gunthorpe 2020-09-14 13:47 ` Jason Gunthorpe 2020-09-14 16:22 ` Raj, Ashok 2020-09-14 16:22 ` Raj, Ashok 2020-09-14 16:33 ` Jason Gunthorpe 2020-09-14 16:33 ` Jason Gunthorpe 2020-09-14 16:58 ` Alex Williamson 2020-09-14 16:58 ` Alex Williamson 2020-09-14 17:41 ` Jason Gunthorpe 2020-09-14 17:41 ` Jason Gunthorpe 2020-09-14 18:23 ` Alex Williamson 2020-09-14 18:23 ` Alex Williamson 2020-09-14 19:00 ` Jason Gunthorpe 2020-09-14 19:00 ` Jason Gunthorpe 2020-09-14 22:33 ` Alex Williamson 2020-09-14 22:33 ` Alex Williamson 2020-09-15 14:29 ` Jason Gunthorpe 2020-09-15 14:29 ` Jason Gunthorpe 2020-09-16 1:19 ` Tian, Kevin 2020-09-16 1:19 ` Tian, Kevin 2020-09-16 8:32 ` Jean-Philippe Brucker 2020-09-16 8:32 ` Jean-Philippe Brucker 2020-09-16 14:51 ` Jason Gunthorpe 2020-09-16 14:51 ` Jason Gunthorpe 2020-09-16 16:20 ` Jean-Philippe Brucker 2020-09-16 16:20 ` Jean-Philippe Brucker 2020-09-16 16:32 ` Jason Gunthorpe 2020-09-16 16:32 ` Jason Gunthorpe 2020-09-16 16:50 ` Auger Eric 2020-09-16 16:50 ` Auger Eric 2020-09-16 14:44 ` Jason Gunthorpe 2020-09-16 14:44 ` Jason Gunthorpe 2020-09-17 6:01 ` Tian, Kevin 2020-09-17 6:01 ` Tian, Kevin 2020-09-14 22:44 ` Raj, Ashok 2020-09-15 11:33 ` Jason Gunthorpe 2020-09-15 11:33 ` Jason Gunthorpe 2020-09-15 18:11 ` Raj, Ashok 2020-09-15 18:11 ` Raj, Ashok 2020-09-15 18:45 ` Jason Gunthorpe 2020-09-15 18:45 ` Jason Gunthorpe 2020-09-15 19:26 ` Raj, Ashok 2020-09-15 19:26 ` Raj, Ashok 2020-09-15 23:45 ` Jason Gunthorpe 2020-09-15 23:45 ` Jason Gunthorpe 2020-09-16 2:33 ` Jason Wang 2020-09-16 2:33 ` Jason Wang 2020-09-15 22:08 ` Jacob Pan 2020-09-15 22:08 ` Jacob Pan 2020-09-15 23:51 ` Jason Gunthorpe 2020-09-15 23:51 ` Jason Gunthorpe 2020-09-16 0:22 ` Jacob Pan (Jun) 2020-09-16 1:46 ` Lu Baolu 2020-09-16 1:46 ` Lu Baolu 2020-09-16 15:07 ` Jason Gunthorpe 2020-09-16 15:07 ` Jason Gunthorpe 2020-09-16 16:33 ` Raj, Ashok 2020-09-16 16:33 ` Raj, Ashok 2020-09-16 17:01 ` Jason Gunthorpe 2020-09-16 17:01 ` Jason Gunthorpe 2020-09-16 18:21 ` Jacob Pan (Jun) 2020-09-16 18:21 ` Jacob Pan (Jun) 2020-09-16 18:38 ` Jason Gunthorpe 2020-09-16 18:38 ` Jason Gunthorpe 2020-09-16 23:09 ` Jacob Pan (Jun) 2020-09-16 23:09 ` Jacob Pan (Jun) 2020-09-17 3:53 ` Jason Wang 2020-09-17 3:53 ` Jason Wang 2020-09-17 17:31 ` Jason Gunthorpe 2020-09-17 17:31 ` Jason Gunthorpe 2020-09-17 18:17 ` Jacob Pan (Jun) 2020-09-17 18:17 ` Jacob Pan (Jun) 2020-09-18 3:58 ` Jason Wang 2020-09-18 3:58 ` Jason Wang 2020-09-16 2:29 ` Jason Wang 2020-09-16 2:29 ` Jason Wang
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=1599734733-6431-3-git-send-email-yi.l.liu@intel.com \ --to=yi.l.liu@intel.com \ --cc=alex.williamson@redhat.com \ --cc=ashok.raj@intel.com \ --cc=baolu.lu@linux.intel.com \ --cc=eric.auger@redhat.com \ --cc=hao.wu@intel.com \ --cc=iommu@lists.linux-foundation.org \ --cc=jacob.jun.pan@linux.intel.com \ --cc=jasowang@redhat.com \ --cc=jean-philippe@linaro.org \ --cc=joro@8bytes.org \ --cc=jun.j.tian@intel.com \ --cc=kevin.tian@intel.com \ --cc=kvm@vger.kernel.org \ --cc=peterx@redhat.com \ --cc=robin.murphy@arm.com \ --cc=stefanha@gmail.com \ --cc=will@kernel.org \ --cc=yi.y.sun@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.