iommu/vt-d: SVM implementation cleanup
Subsystems (2)
Lu Baolu
maintainercover iommu/vt-d: SVM implementation cleanup
This is a cleanup series after the merge of commit be51b1d6bbff ("iommu/sva: Refactoring iommu_sva_bind/unbind_device()"). It removes the unused/duplicate data and code.
Lu Baolu (4):
iommu/vt-d: Remove include/linux/intel-svm.h iommu/vt-d: Remove unused fields in svm structures iommu/vt-d: Remove users from intel_svm_dev iommu/vt-d: Remove sva from intel_svm_dev
include/linux/intel-svm.h | 16 ------- drivers/iommu/intel/iommu.h | 11 +++-- drivers/iommu/intel/iommu.c | 1 - drivers/iommu/intel/svm.c | 88 +++++++++++++++---------------------- MAINTAINERS | 1 - 5 files changed, 41 insertions(+), 76 deletions(-) delete mode 100644 include/linux/intel-svm.h
Signature · 1 line
2.34.1
Lu Baolu
maintainerPATCH 1/4 iommu/vt-d: Remove include/linux/intel-svm.h
There's no need to have a public header for Intel SVA implementation. The device driver should interact with Intel SVA implementation via the IOMMU generic APIs.
--- include/linux/intel-svm.h | 16 ---------------- drivers/iommu/intel/iommu.h | 5 +++++ drivers/iommu/intel/iommu.c | 1 - drivers/iommu/intel/svm.c | 1 - MAINTAINERS | 1 - 5 files changed, 5 insertions(+), 19 deletions(-) delete mode 100644 include/linux/intel-svm.h
include/linux/intel-svm.h deleted +0 -16
@@ -1,16 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -/* -* Copyright © 2015 Intel Corporation. -* -* Authors: David Woodhouse <[email protected]> -*/ - -#ifndef __INTEL_SVM_H__ -#define __INTEL_SVM_H__ - -/* Page Request Queue depth */ -#define PRQ_ORDER 4 -#define PRQ_RING_MASK ((0x1000 << PRQ_ORDER) - 0x20) -#define PRQ_DEPTH ((0x1000 << PRQ_ORDER) >> 5) - -#endif /* __INTEL_SVM_H__ */
drivers/iommu/intel/iommu.h +5 -0
@@ -438,6 +438,11 @@ struct q_inval {int free_cnt; }; +/* Page Request Queue depth */ +#define PRQ_ORDER 4 +#define PRQ_RING_MASK ((0x1000 << PRQ_ORDER) - 0x20) +#define PRQ_DEPTH ((0x1000 << PRQ_ORDER) >> 5) +struct dmar_pci_notify_info ;#ifdef CONFIG_IRQ_REMAP
drivers/iommu/intel/iommu.c +0 -1
@@ -16,7 +16,6 @@#include <linux/crash_dump.h> #include <linux/dma-direct.h> #include <linux/dmi.h> -#include <linux/intel-svm.h> #include <linux/memory.h> #include <linux/pci.h> #include <linux/pci-ats.h>
drivers/iommu/intel/svm.c +0 -1
@@ -9,7 +9,6 @@#include <linux/sched.h> #include <linux/sched/mm.h> #include <linux/slab.h> -#include <linux/intel-svm.h> #include <linux/rculist.h> #include <linux/pci.h> #include <linux/pci-ats.h>
MAINTAINERS +0 -1
@@ -10459,7 +10459,6 @@ L: [email protected] S: Supported T: git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git F: drivers/iommu/intel/ -F: include/linux/intel-svm.h INTEL IPU3 CSI-2 CIO2 DRIVER M: Yong Zhi <[email protected]>
Signature · 1 line
2.34.1
Lu Baolu
maintainerPATCH 2/4 iommu/vt-d: Remove unused fields in svm structures
In reply to Lu BaoluThey aren't used anywhere. Remove them to avoid dead code.
--- drivers/iommu/intel/iommu.h | 4 ---- drivers/iommu/intel/svm.c | 2 -- 2 files changed, 6 deletions(-)
drivers/iommu/intel/iommu.h +0 -4
@@ -762,18 +762,14 @@ struct intel_svm_dev {struct device *dev;struct intel_iommu *iommu;struct iommu_sva sva; -u32 pasid;int users;u16 did; - u16 dev_iotlb:1;u16 sid, qdep; };struct intel_svm {struct mmu_notifier notifier;struct mm_struct *mm; - -unsigned int flags;u32 pasid;struct list_head devs; };
drivers/iommu/intel/svm.c +0 -2
@@ -351,11 +351,9 @@ static struct iommu_sva *intel_svm_bind_mm(struct intel_iommu *iommu, sdev->did =FLPT_DEFAULT_DID ; sdev->sid =PCI_DEVID (info->bus, info->devfn); sdev->users =1 ; - sdev->pasid = svm->pasid; sdev->sva.dev = dev;init_rcu_head (&sdev->rcu);if (info->ats_enabled) { - sdev->dev_iotlb =1 ; sdev->qdep = info->ats_qdep;if (sdev->qdep >=QI_DEV_EIOTLB_MAX_INVS ) sdev->qdep =0 ;
Signature · 1 line
2.34.1
Lu Baolu
maintainerPATCH 3/4 iommu/vt-d: Remove users from intel_svm_dev
In reply to Lu BaoluIt was used as a reference counter of an existing bond between device and user application memory address. Commit be51b1d6bbff ("iommu/sva:
Refactoring iommu_sva_bind/unbind_device()") has added this in iommu core. Remove it to avoid duplicate code.
--- drivers/iommu/intel/iommu.h | 1 - drivers/iommu/intel/svm.c | 62 ++++++++++++++++--------------------- 2 files changed, 27 insertions(+), 36 deletions(-)
drivers/iommu/intel/iommu.h +0 -1
@@ -762,7 +762,6 @@ struct intel_svm_dev {struct device *dev;struct intel_iommu *iommu;struct iommu_sva sva; -int users;u16 did;u16 sid, qdep; };
drivers/iommu/intel/svm.c +27 -35
86 lines not on this page · raw message
Signature · 1 line
2.34.1
Lu Baolu
maintainerPATCH 4/4 iommu/vt-d: Remove sva from intel_svm_dev
In reply to Lu BaoluAfter commit be51b1d6bbff ("iommu/sva: Refactoring iommu_sva_bind/unbind_device()"), the iommu driver doesn't need to return an iommu_sva pointer anymore. This removes the sva field from intel_svm_dev and cleanups the code accordingly.
--- drivers/iommu/intel/iommu.h | 1 - drivers/iommu/intel/svm.c | 23 +++++++++-------------- 2 files changed, 9 insertions(+), 15 deletions(-)
drivers/iommu/intel/iommu.h +0 -1
@@ -761,7 +761,6 @@ struct intel_svm_dev {struct rcu_head rcu;struct device *dev;struct intel_iommu *iommu; -struct iommu_sva sva;u16 did;u16 sid, qdep; };
drivers/iommu/intel/svm.c +9 -14
@@ -298,9 +298,8 @@ static int pasid_to_svm_sdev(struct device *dev, unsigned int pasid,return 0 ; } -static struct iommu_sva *intel_svm_bind_mm (struct intel_iommu *iommu, -struct device *dev, -struct mm_struct *mm) +static int intel_svm_bind_mm (struct intel_iommu *iommu,struct device *dev, +struct mm_struct *mm) {struct device_domain_info *info =dev_iommu_priv_get (dev);struct intel_svm_dev *sdev;
@@ -312,7 +311,7 @@ static struct iommu_sva *intel_svm_bind_mm(struct intel_iommu *iommu,if (!svm) { svm =kzalloc (sizeof (*svm),GFP_KERNEL );if (!svm) -return ERR_PTR (-ENOMEM ); +return -ENOMEM ; svm->pasid = mm->pasid; svm->mm = mm;
@@ -322,14 +321,14 @@ static struct iommu_sva *intel_svm_bind_mm(struct intel_iommu *iommu, ret =mmu_notifier_register (&svm->notifier, mm);if (ret) {kfree (svm); -return ERR_PTR (ret); +return ret; } ret =pasid_private_add (svm->pasid, svm);if (ret) {mmu_notifier_unregister (&svm->notifier, mm);kfree (svm); -return ERR_PTR (ret); +return ret; } }
@@ -343,7 +342,6 @@ static struct iommu_sva *intel_svm_bind_mm(struct intel_iommu *iommu, sdev->iommu = iommu; sdev->did =FLPT_DEFAULT_DID ; sdev->sid =PCI_DEVID (info->bus, info->devfn); - sdev->sva.dev = dev;init_rcu_head (&sdev->rcu);if (info->ats_enabled) { sdev->qdep = info->ats_qdep;
@@ -360,7 +358,7 @@ static struct iommu_sva *intel_svm_bind_mm(struct intel_iommu *iommu,list_add_rcu (&sdev->list, &svm->devs); -return &sdev->sva; +return 0 ; free_sdev:kfree (sdev);
@@ -371,7 +369,7 @@ static struct iommu_sva *intel_svm_bind_mm(struct intel_iommu *iommu,kfree (svm); } -return ERR_PTR (ret); +return ret; }/* Caller must hold pasid_mutex */
@@ -843,13 +841,10 @@ static int intel_svm_set_dev_pasid(struct iommu_domain *domain,struct device_domain_info *info =dev_iommu_priv_get (dev);struct intel_iommu *iommu = info->iommu;struct mm_struct *mm = domain->mm; -struct iommu_sva *sva; -int ret =0 ; +int ret;mutex_lock (&pasid_mutex); - sva =intel_svm_bind_mm (iommu, dev, mm); -if (IS_ERR (sva)) - ret =PTR_ERR (sva); + ret =intel_svm_bind_mm (iommu, dev, mm);mutex_unlock (&pasid_mutex);return ret;
Signature · 1 line
2.34.1
Quoted 7 lines
From: Lu Baolu <[email protected]>
Sent: Monday, January 9, 2023 9:50 AMThis is a cleanup series after the merge of commit
be51b1d6bbff("iommu/sva: Refactoring iommu_sva_bind/unbind_device()"). It removes the unused/duplicate data and code.
Quoted 6 lines
Lu Baolu (4):
iommu/vt-d: Removeinclude/linux/intel-svm.hiommu/vt-d: Remove unused fields in svm structures iommu/vt-d: Remove users fromintel_svm_deviommu/vt-d: Remove sva fromintel_svm_dev
For the series:
Baolu Lu
maintainerQuoted 9 lines · Lu Baolu
This is a cleanup series after the merge of commit
be51b1d6bbff("iommu/sva: Refactoring iommu_sva_bind/unbind_device()"). It removes the unused/duplicate data and code.Lu Baolu (4):
iommu/vt-d: Removeinclude/linux/intel-svm.hiommu/vt-d: Remove unused fields in svm structures iommu/vt-d: Remove users fromintel_svm_deviommu/vt-d: Remove sva fromintel_svm_dev
Patches queued for v6.3.
https://lore.kernel.org/linux-iommu/[email protected]/
Best regards,
baolu