[PATCH v11 00/10] iommu: I/O page faults for SMMUv3
Jean-Philippe Brucker
jean-philippe at linaro.org
Mon Jan 25 22:06:41 AEDT 2021
Add stall support to the SMMUv3, along with a common I/O Page Fault
handler.
This version fixes a typo introduced in v10 [1] and adds review tags
(thanks!) You can find the range diff for v10->v11 below.
[1] https://lore.kernel.org/linux-iommu/20210121123623.2060416-1-jean-philippe@linaro.org/
Jean-Philippe Brucker (10):
iommu: Fix comment for struct iommu_fwspec
iommu/arm-smmu-v3: Use device properties for pasid-num-bits
iommu: Separate IOMMU_DEV_FEAT_IOPF from IOMMU_DEV_FEAT_SVA
iommu/vt-d: Support IOMMU_DEV_FEAT_IOPF
uacce: Enable IOMMU_DEV_FEAT_IOPF
iommu: Add a page fault handler
iommu/arm-smmu-v3: Maintain a SID->device structure
dt-bindings: document stall property for IOMMU masters
ACPI/IORT: Enable stall support for platform devices
iommu/arm-smmu-v3: Add stall support for platform devices
drivers/iommu/Makefile | 1 +
.../devicetree/bindings/iommu/iommu.txt | 18 +
drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h | 56 ++-
drivers/iommu/iommu-sva-lib.h | 53 ++
include/linux/iommu.h | 26 +-
drivers/acpi/arm64/iort.c | 15 +-
.../iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c | 59 ++-
drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 349 +++++++++++--
drivers/iommu/intel/iommu.c | 11 +-
drivers/iommu/io-pgfault.c | 461 ++++++++++++++++++
drivers/iommu/of_iommu.c | 5 -
drivers/misc/uacce/uacce.c | 39 +-
12 files changed, 1019 insertions(+), 74 deletions(-)
create mode 100644 drivers/iommu/io-pgfault.c
--
@@ drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c: static void arm_smmu_release_device(struct device *dev)
master = dev_iommu_priv_get(dev);
- WARN_ON(arm_smmu_master_sva_enabled(master));
-+ iopf_queue_remove_device(master->smmu->evtq.iopf, dev);
+- WARN_ON(arm_smmu_master_sva_enabled(master));
++ if (WARN_ON(arm_smmu_master_sva_enabled(master)))
++ iopf_queue_remove_device(master->smmu->evtq.iopf, dev);
arm_smmu_detach_dev(master);
arm_smmu_disable_pasid(master);
arm_smmu_remove_master(master);
@@ drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c: static struct iommu_ops arm_smmu_op
.pgsize_bitmap = -1UL, /* Restricted during device attach */
};
-@@ drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c: static int arm_smmu_cmdq_init(struct arm_smmu_device *smmu)
- static int arm_smmu_init_queues(struct arm_smmu_device *smmu)
- {
- int ret;
-+ bool sva = smmu->features & ARM_SMMU_FEAT_STALLS;
-
- /* cmdq */
- ret = arm_smmu_init_one_queue(smmu, &smmu->cmdq.q, ARM_SMMU_CMDQ_PROD,
@@ drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c: static int arm_smmu_init_queues(struct arm_smmu_device *smmu)
if (ret)
return ret;
-+ if (sva && smmu->features & ARM_SMMU_FEAT_STALLS) {
++ if ((smmu->features & ARM_SMMU_FEAT_SVA) &&
++ (smmu->features & ARM_SMMU_FEAT_STALLS)) {
+ smmu->evtq.iopf = iopf_queue_alloc(dev_name(smmu->dev));
+ if (!smmu->evtq.iopf)
+ return -ENOMEM;
More information about the Linux-accelerators
mailing list