From: Lu Baolu <baolu.lu@linux.intel.com> To: Joerg Roedel <joro@8bytes.org>, Jason Gunthorpe <jgg@nvidia.com>, Christoph Hellwig <hch@infradead.org>, Kevin Tian <kevin.tian@intel.com>, Ashok Raj <ashok.raj@intel.com>, Will Deacon <will@kernel.org>, Robin Murphy <robin.murphy@arm.com>, Jean-Philippe Brucker <jean-philippe@linaro.com>, Dave Jiang <dave.jiang@intel.com>, Vinod Koul <vkoul@kernel.org> Cc: Eric Auger <eric.auger@redhat.com>, Liu Yi L <yi.l.liu@intel.com>, Jacob jun Pan <jacob.jun.pan@intel.com>, iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org, Lu Baolu <baolu.lu@linux.intel.com>, Jean-Philippe Brucker <jean-philippe@linaro.org> Subject: [PATCH v6 02/12] iommu: Add pasid_bits field in struct dev_iommu Date: Tue, 10 May 2022 14:17:28 +0800 [thread overview] Message-ID: <20220510061738.2761430-3-baolu.lu@linux.intel.com> (raw) In-Reply-To: <20220510061738.2761430-1-baolu.lu@linux.intel.com> Use this field to save the pasid/ssid bits that a device is able to support with its IOMMU hardware. It is a generic attribute of a device and lifting it into the per-device dev_iommu struct makes it possible to allocate a PASID for device without calls into the IOMMU drivers. Any iommu driver which suports PASID related features should set this field before features are enabled on the devices. For initialization of this field in the VT-d driver, the info->pasid_supported is only set for PCI devices. So the status is that non-PCI SVA hasn't been supported yet. Setting this field only for PCI devices has no functional change. Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com> Reviewed-by: Jean-Philippe Brucker <jean-philippe@linaro.org> --- include/linux/iommu.h | 1 + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 2 ++ drivers/iommu/intel/iommu.c | 5 ++++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/include/linux/iommu.h b/include/linux/iommu.h index 5e1afe169549..b8ffaf2cb1d0 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h @@ -373,6 +373,7 @@ struct dev_iommu { struct iommu_fwspec *fwspec; struct iommu_device *iommu_dev; void *priv; + unsigned int pasid_bits; }; int iommu_device_register(struct iommu_device *iommu, 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 627a3ed5ee8f..afc63fce6107 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c @@ -2681,6 +2681,8 @@ static struct iommu_device *arm_smmu_probe_device(struct device *dev) smmu->features & ARM_SMMU_FEAT_STALL_FORCE) master->stall_enabled = true; + dev->iommu->pasid_bits = master->ssid_bits; + return &smmu->iommu; err_free_master: diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c index 2990f80c5e08..99643f897f26 100644 --- a/drivers/iommu/intel/iommu.c +++ b/drivers/iommu/intel/iommu.c @@ -4624,8 +4624,11 @@ static struct iommu_device *intel_iommu_probe_device(struct device *dev) if (pasid_supported(iommu)) { int features = pci_pasid_features(pdev); - if (features >= 0) + if (features >= 0) { info->pasid_supported = features | 1; + dev->iommu->pasid_bits = + fls(pci_max_pasids(pdev)) - 1; + } } if (info->ats_supported && ecap_prs(iommu->ecap) && -- 2.25.1
WARNING: multiple messages have this Message-ID (diff)
From: Lu Baolu <baolu.lu@linux.intel.com> To: Joerg Roedel <joro@8bytes.org>, Jason Gunthorpe <jgg@nvidia.com>, Christoph Hellwig <hch@infradead.org>, Kevin Tian <kevin.tian@intel.com>, Ashok Raj <ashok.raj@intel.com>, Will Deacon <will@kernel.org>, Robin Murphy <robin.murphy@arm.com>, Jean-Philippe Brucker <jean-philippe@linaro.com>, Dave Jiang <dave.jiang@intel.com>, Vinod Koul <vkoul@kernel.org> Cc: Jean-Philippe Brucker <jean-philippe@linaro.org>, linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org, Jacob jun Pan <jacob.jun.pan@intel.com> Subject: [PATCH v6 02/12] iommu: Add pasid_bits field in struct dev_iommu Date: Tue, 10 May 2022 14:17:28 +0800 [thread overview] Message-ID: <20220510061738.2761430-3-baolu.lu@linux.intel.com> (raw) In-Reply-To: <20220510061738.2761430-1-baolu.lu@linux.intel.com> Use this field to save the pasid/ssid bits that a device is able to support with its IOMMU hardware. It is a generic attribute of a device and lifting it into the per-device dev_iommu struct makes it possible to allocate a PASID for device without calls into the IOMMU drivers. Any iommu driver which suports PASID related features should set this field before features are enabled on the devices. For initialization of this field in the VT-d driver, the info->pasid_supported is only set for PCI devices. So the status is that non-PCI SVA hasn't been supported yet. Setting this field only for PCI devices has no functional change. Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com> Reviewed-by: Jean-Philippe Brucker <jean-philippe@linaro.org> --- include/linux/iommu.h | 1 + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 2 ++ drivers/iommu/intel/iommu.c | 5 ++++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/include/linux/iommu.h b/include/linux/iommu.h index 5e1afe169549..b8ffaf2cb1d0 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h @@ -373,6 +373,7 @@ struct dev_iommu { struct iommu_fwspec *fwspec; struct iommu_device *iommu_dev; void *priv; + unsigned int pasid_bits; }; int iommu_device_register(struct iommu_device *iommu, 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 627a3ed5ee8f..afc63fce6107 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c @@ -2681,6 +2681,8 @@ static struct iommu_device *arm_smmu_probe_device(struct device *dev) smmu->features & ARM_SMMU_FEAT_STALL_FORCE) master->stall_enabled = true; + dev->iommu->pasid_bits = master->ssid_bits; + return &smmu->iommu; err_free_master: diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c index 2990f80c5e08..99643f897f26 100644 --- a/drivers/iommu/intel/iommu.c +++ b/drivers/iommu/intel/iommu.c @@ -4624,8 +4624,11 @@ static struct iommu_device *intel_iommu_probe_device(struct device *dev) if (pasid_supported(iommu)) { int features = pci_pasid_features(pdev); - if (features >= 0) + if (features >= 0) { info->pasid_supported = features | 1; + dev->iommu->pasid_bits = + fls(pci_max_pasids(pdev)) - 1; + } } if (info->ats_supported && ecap_prs(iommu->ecap) && -- 2.25.1 _______________________________________________ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu
next prev parent reply other threads:[~2022-05-10 6:21 UTC|newest] Thread overview: 80+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-05-10 6:17 [PATCH v6 00/12] iommu: SVA and IOPF refactoring Lu Baolu 2022-05-10 6:17 ` Lu Baolu 2022-05-10 6:17 ` [PATCH v6 01/12] dmaengine: idxd: Separate user and kernel pasid enabling Lu Baolu 2022-05-10 6:17 ` Lu Baolu 2022-05-10 6:17 ` Lu Baolu [this message] 2022-05-10 6:17 ` [PATCH v6 02/12] iommu: Add pasid_bits field in struct dev_iommu Lu Baolu 2022-05-10 14:34 ` Jason Gunthorpe via iommu 2022-05-10 14:34 ` Jason Gunthorpe 2022-05-11 2:25 ` Baolu Lu 2022-05-11 2:25 ` Baolu Lu 2022-05-11 8:00 ` Jean-Philippe Brucker 2022-05-11 8:00 ` Jean-Philippe Brucker 2022-05-11 11:59 ` Jason Gunthorpe 2022-05-11 11:59 ` Jason Gunthorpe via iommu 2022-05-10 6:17 ` [PATCH v6 03/12] iommu: Add attach/detach_dev_pasid domain ops Lu Baolu 2022-05-10 6:17 ` Lu Baolu 2022-05-10 14:02 ` Jason Gunthorpe via iommu 2022-05-10 14:02 ` Jason Gunthorpe 2022-05-11 2:32 ` Baolu Lu 2022-05-11 2:32 ` Baolu Lu 2022-05-11 4:09 ` Tian, Kevin 2022-05-11 4:09 ` Tian, Kevin 2022-05-11 7:54 ` Jean-Philippe Brucker 2022-05-11 7:54 ` Jean-Philippe Brucker 2022-05-11 12:02 ` Jason Gunthorpe 2022-05-11 12:02 ` Jason Gunthorpe via iommu 2022-05-12 7:00 ` Jean-Philippe Brucker 2022-05-12 7:00 ` Jean-Philippe Brucker 2022-05-12 11:51 ` Jason Gunthorpe 2022-05-12 11:51 ` Jason Gunthorpe via iommu 2022-05-16 2:03 ` Baolu Lu 2022-05-16 2:03 ` Baolu Lu 2022-05-10 6:17 ` [PATCH v6 04/12] iommu/sva: Basic data structures for SVA Lu Baolu 2022-05-10 6:17 ` Lu Baolu 2022-05-10 6:17 ` [PATCH v6 05/12] iommu/vt-d: Remove SVM_FLAG_SUPERVISOR_MODE support Lu Baolu 2022-05-10 6:17 ` Lu Baolu 2022-05-10 14:35 ` Jason Gunthorpe via iommu 2022-05-10 14:35 ` Jason Gunthorpe 2022-05-10 6:17 ` [PATCH v6 06/12] iommu/vt-d: Add SVA domain support Lu Baolu 2022-05-10 6:17 ` Lu Baolu 2022-05-10 6:17 ` [PATCH v6 07/12] arm-smmu-v3/sva: " Lu Baolu 2022-05-10 6:17 ` Lu Baolu 2022-05-10 6:17 ` [PATCH v6 08/12] iommu/sva: Use attach/detach_pasid_dev in SVA interfaces Lu Baolu 2022-05-10 6:17 ` Lu Baolu 2022-05-10 15:23 ` Jason Gunthorpe via iommu 2022-05-10 15:23 ` Jason Gunthorpe 2022-05-11 7:21 ` Baolu Lu 2022-05-11 7:21 ` Baolu Lu 2022-05-11 14:53 ` Jason Gunthorpe 2022-05-11 14:53 ` Jason Gunthorpe via iommu 2022-05-12 3:02 ` Baolu Lu 2022-05-12 3:02 ` Baolu Lu 2022-05-12 5:01 ` Tian, Kevin 2022-05-12 5:01 ` Tian, Kevin 2022-05-12 5:17 ` Baolu Lu 2022-05-12 5:17 ` Baolu Lu 2022-05-12 5:44 ` Tian, Kevin 2022-05-12 5:44 ` Tian, Kevin 2022-05-12 6:16 ` Baolu Lu 2022-05-12 6:16 ` Baolu Lu 2022-05-12 11:48 ` Jason Gunthorpe 2022-05-12 11:48 ` Jason Gunthorpe via iommu 2022-05-12 11:59 ` Baolu Lu 2022-05-12 11:59 ` Baolu Lu 2022-05-12 12:03 ` Jason Gunthorpe 2022-05-12 12:03 ` Jason Gunthorpe via iommu 2022-05-12 12:47 ` Baolu Lu 2022-05-12 12:47 ` Baolu Lu 2022-05-12 11:51 ` Jason Gunthorpe 2022-05-12 11:51 ` Jason Gunthorpe via iommu 2022-05-12 12:39 ` Baolu Lu 2022-05-12 12:39 ` Baolu Lu 2022-05-10 6:17 ` [PATCH v6 09/12] iommu: Remove SVA related callbacks from iommu ops Lu Baolu 2022-05-10 6:17 ` Lu Baolu 2022-05-10 6:17 ` [PATCH v6 10/12] iommu: Prepare IOMMU domain for IOPF Lu Baolu 2022-05-10 6:17 ` Lu Baolu 2022-05-10 6:17 ` [PATCH v6 11/12] iommu: Per-domain I/O page fault handling Lu Baolu 2022-05-10 6:17 ` Lu Baolu 2022-05-10 6:17 ` [PATCH v6 12/12] iommu: Rename iommu-sva-lib.{c,h} Lu Baolu 2022-05-10 6:17 ` Lu Baolu
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=20220510061738.2761430-3-baolu.lu@linux.intel.com \ --to=baolu.lu@linux.intel.com \ --cc=ashok.raj@intel.com \ --cc=dave.jiang@intel.com \ --cc=eric.auger@redhat.com \ --cc=hch@infradead.org \ --cc=iommu@lists.linux-foundation.org \ --cc=jacob.jun.pan@intel.com \ --cc=jean-philippe@linaro.com \ --cc=jean-philippe@linaro.org \ --cc=jgg@nvidia.com \ --cc=joro@8bytes.org \ --cc=kevin.tian@intel.com \ --cc=linux-kernel@vger.kernel.org \ --cc=robin.murphy@arm.com \ --cc=vkoul@kernel.org \ --cc=will@kernel.org \ --cc=yi.l.liu@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.