2023-10-18 05:07:22

by Zhang, Tina

[permalink] [raw]
Subject: [PATCH v9 0/5] Share sva domains with all devices bound to a mm

This series is to share sva(shared virtual addressing) domains with all
devices bound to one mm.

Problem
-------
In the current iommu core code, sva domain is allocated per IOMMU group,
when device driver is binding a process address space to a device (which is
handled in iommu_sva_bind_device()). If one than more device is bound to
the same process address space, there must be more than one sva domain
instance, with each device having one. In other words, the sva domain
doesn't share between those devices bound to the same process address
space, and that leads to two problems:
1) device driver has to duplicate sva domains with enqcmd, as those sva
domains have the same PASID and are relevant to one virtual address space.
This makes the sva domain handling complex in device drivers.
2) IOMMU driver cannot get sufficient info of the IOMMUs that have
devices behind them bound to the same virtual address space, when handling
mmu_notifier_ops callbacks. As a result, IOMMU IOTLB invalidation is
performed per device instead of per IOMMU, and that may lead to
superfluous IOTLB invalidation issue, especially in a virtualization
environment where all devices may be behind one virtual IOMMU.

Solution
--------
This patch-set tries to fix those two problems by allowing sharing sva
domains with all devices bound to a mm. To achieve this, a new structure
pointer is introduced to mm to replace the old PASID field, which can keep
the info of PASID as well as the corresponding shared sva domains.
Besides, function iommu_sva_bind_device() is updated to ensure a new sva
domain can only be allocated when the old ones cannot work for the IOMMU.
With these changes, a device driver can expect one sva domain could work
for per PASID instance(e.g., enqcmd PASID instance), and therefore may get
rid of handling sva domain duplication. Besides, IOMMU driver (e.g., intel
vt-d driver) can get sufficient info (e.g., the info of the IOMMUs having
their devices bound to one virtual address space) when handling
mmu_notifier_ops callbacks, to remove the redundant IOTLB invalidations.

Arguably there shouldn't be more than one sva_domain with the same PASID,
and in any sane configuration there should be only 1 type of IOMMU driver
that needs only 1 SVA domain. However, in reality, IOMMUs on one platform
may not be identical to each other. Thus, attaching a sva domain that has
been successfully bound to device A behind a IOMMU A, to device B behind
IOMMU B may get failed due to the difference between IOMMU A and IOMMU
B. In this case, a new sva domain with the same PASID needs to be
allocated to work with IOMMU B. That's why we need a list to keep sva
domains of one PASID. For the platform where IOMMUs are compatible to each
other, there should be one sva domain in the list.

v8:
- CC more people
- CC [email protected] mailing list.
When sending version 7, some issue happened in my CC list and that caused
version 7 wasn't sent to [email protected].
- Rebase to v6.6-rc6 and make a few format changes.

v7: https://lore.kernel.org/lkml/[email protected]/
- Add mm_pasid_init() back and do zeroing mm->iommu_mm pointer in
mm_pasid_init() to avoid the use-after-free/double-free problem.
- Update the commit message of patch "iommu: Add mm_get_enqcmd_pasid()
helper function".

v6: https://lore.kernel.org/linux-iommu/[email protected]/
- Rename iommu_sva_alloc_pasid() to iommu_alloc_mm_data().
- Hold the iommu_sva_lock before invoking iommu_alloc_mm_data().
- Remove "iommu: Introduce mm_get_pasid() helper function" patch, because
SMMUv3 decides to use mm_get_enqcmd_pasid() instead and other users are
using iommu_sva_get_pasid() to get the pasid value. Besides, the iommu
core accesses iommu_mm_data in the critical section protected by
iommu_sva_lock. So no need to add another helper to retrieve PASID
atomically.

v5: https://lore.kernel.org/linux-iommu/[email protected]/
- Order patch "iommu/vt-d: Remove mm->pasid in intel_sva_bind_mm()"
first in this series.
- Update commit message of patch "iommu: Introduce mm_get_pasid()
helper function"
- Use smp_store_release() & READ_ONCE() in storing and loading mm's
pasid value.

v4: https://lore.kernel.org/linux-iommu/[email protected]/
- Rebase to v6.6-rc1.

v3: https://lore.kernel.org/linux-iommu/[email protected]/
- Add a comment describing domain->next.
- Expand explanation of why PASID isn't released in
iommu_sva_unbind_device().
- Add a patch to remove mm->pasid in intel_sva_bind_mm()

v2: https://lore.kernel.org/linux-iommu/[email protected]/
- Add mm_get_enqcmd_pasid().
- Update commit message.

v1: https://lore.kernel.org/linux-iommu/[email protected]/

RFC: https://lore.kernel.org/linux-iommu/[email protected]/

Tina Zhang (5):
iommu/vt-d: Remove mm->pasid in intel_sva_bind_mm()
iommu: Add mm_get_enqcmd_pasid() helper function
mm: Add structure to keep sva information
iommu: Support mm PASID 1:n with sva domains
mm: Deprecate pasid field

arch/x86/kernel/traps.c | 2 +-
.../iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c | 14 +--
drivers/iommu/intel/svm.c | 14 +--
drivers/iommu/iommu-sva.c | 94 +++++++++++--------
include/linux/iommu.h | 38 +++++++-
include/linux/mm_types.h | 3 +-
mm/init-mm.c | 3 -
7 files changed, 108 insertions(+), 60 deletions(-)

--
2.39.3


2023-10-18 05:07:23

by Zhang, Tina

[permalink] [raw]
Subject: [PATCH v9 2/5] iommu: Add mm_get_enqcmd_pasid() helper function

mm_get_enqcmd_pasid() should be used by architecture code and closely
related to learn the PASID value that the x86 ENQCMD operation should
use for the mm.

For the moment SMMUv3 uses this without any connection to ENQCMD, it
will be cleaned up similar to how the prior patch made VT-d use the
PASID argument of set_dev_pasid().

The motivation is to replace mm->pasid with an iommu private data
structure that is introduced in a later patch.

Reviewed-by: Lu Baolu <[email protected]>
Reviewed-by: Jason Gunthorpe <[email protected]>
Tested-by: Nicolin Chen <[email protected]>
Signed-off-by: Tina Zhang <[email protected]>
---

Change in v7:
- Update the commit message.

Changes in v6:
- Let SMMUv3 call mm_get_enqcmd_pasid().
- Let iommu_sva_get_pasid() call mm_get_enqcmd_pasid().

Change in v2:
- Change mm_get_pasid() to mm_get_enqcmd_pasid()

arch/x86/kernel/traps.c | 2 +-
drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c | 14 +++++++-------
drivers/iommu/iommu-sva.c | 2 +-
include/linux/iommu.h | 12 ++++++++++++
4 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
index c876f1d36a81..832f4413d96a 100644
--- a/arch/x86/kernel/traps.c
+++ b/arch/x86/kernel/traps.c
@@ -591,7 +591,7 @@ static bool try_fixup_enqcmd_gp(void)
if (!mm_valid_pasid(current->mm))
return false;

- pasid = current->mm->pasid;
+ pasid = mm_get_enqcmd_pasid(current->mm);

/*
* Did this thread already have its PASID activated?
diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c
index 353248ab18e7..6d9949ce5b32 100644
--- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c
+++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c
@@ -246,7 +246,7 @@ static void arm_smmu_mm_arch_invalidate_secondary_tlbs(struct mmu_notifier *mn,
smmu_domain);
}

- arm_smmu_atc_inv_domain(smmu_domain, mm->pasid, start, size);
+ arm_smmu_atc_inv_domain(smmu_domain, mm_get_enqcmd_pasid(mm), start, size);
}

static void arm_smmu_mm_release(struct mmu_notifier *mn, struct mm_struct *mm)
@@ -264,10 +264,10 @@ static void arm_smmu_mm_release(struct mmu_notifier *mn, struct mm_struct *mm)
* DMA may still be running. Keep the cd valid to avoid C_BAD_CD events,
* but disable translation.
*/
- arm_smmu_update_ctx_desc_devices(smmu_domain, mm->pasid, &quiet_cd);
+ arm_smmu_update_ctx_desc_devices(smmu_domain, mm_get_enqcmd_pasid(mm), &quiet_cd);

arm_smmu_tlb_inv_asid(smmu_domain->smmu, smmu_mn->cd->asid);
- arm_smmu_atc_inv_domain(smmu_domain, mm->pasid, 0, 0);
+ arm_smmu_atc_inv_domain(smmu_domain, mm_get_enqcmd_pasid(mm), 0, 0);

smmu_mn->cleared = true;
mutex_unlock(&sva_lock);
@@ -325,10 +325,10 @@ arm_smmu_mmu_notifier_get(struct arm_smmu_domain *smmu_domain,

spin_lock_irqsave(&smmu_domain->devices_lock, flags);
list_for_each_entry(master, &smmu_domain->devices, domain_head) {
- ret = arm_smmu_write_ctx_desc(master, mm->pasid, cd);
+ ret = arm_smmu_write_ctx_desc(master, mm_get_enqcmd_pasid(mm), cd);
if (ret) {
list_for_each_entry_from_reverse(master, &smmu_domain->devices, domain_head)
- arm_smmu_write_ctx_desc(master, mm->pasid, NULL);
+ arm_smmu_write_ctx_desc(master, mm_get_enqcmd_pasid(mm), NULL);
break;
}
}
@@ -358,7 +358,7 @@ static void arm_smmu_mmu_notifier_put(struct arm_smmu_mmu_notifier *smmu_mn)

list_del(&smmu_mn->list);

- arm_smmu_update_ctx_desc_devices(smmu_domain, mm->pasid, NULL);
+ arm_smmu_update_ctx_desc_devices(smmu_domain, mm_get_enqcmd_pasid(mm), NULL);

/*
* If we went through clear(), we've already invalidated, and no
@@ -366,7 +366,7 @@ static void arm_smmu_mmu_notifier_put(struct arm_smmu_mmu_notifier *smmu_mn)
*/
if (!smmu_mn->cleared) {
arm_smmu_tlb_inv_asid(smmu_domain->smmu, cd->asid);
- arm_smmu_atc_inv_domain(smmu_domain, mm->pasid, 0, 0);
+ arm_smmu_atc_inv_domain(smmu_domain, mm_get_enqcmd_pasid(mm), 0, 0);
}

/* Frees smmu_mn */
diff --git a/drivers/iommu/iommu-sva.c b/drivers/iommu/iommu-sva.c
index b78671a8a914..4a2f5699747f 100644
--- a/drivers/iommu/iommu-sva.c
+++ b/drivers/iommu/iommu-sva.c
@@ -141,7 +141,7 @@ u32 iommu_sva_get_pasid(struct iommu_sva *handle)
{
struct iommu_domain *domain = handle->domain;

- return domain->mm->pasid;
+ return mm_get_enqcmd_pasid(domain->mm);
}
EXPORT_SYMBOL_GPL(iommu_sva_get_pasid);

diff --git a/include/linux/iommu.h b/include/linux/iommu.h
index b5b254e205c6..8aa5910190d1 100644
--- a/include/linux/iommu.h
+++ b/include/linux/iommu.h
@@ -1198,6 +1198,12 @@ static inline bool mm_valid_pasid(struct mm_struct *mm)
{
return mm->pasid != IOMMU_PASID_INVALID;
}
+
+static inline u32 mm_get_enqcmd_pasid(struct mm_struct *mm)
+{
+ return mm->pasid;
+}
+
void mm_pasid_drop(struct mm_struct *mm);
struct iommu_sva *iommu_sva_bind_device(struct device *dev,
struct mm_struct *mm);
@@ -1220,6 +1226,12 @@ static inline u32 iommu_sva_get_pasid(struct iommu_sva *handle)
}
static inline void mm_pasid_init(struct mm_struct *mm) {}
static inline bool mm_valid_pasid(struct mm_struct *mm) { return false; }
+
+static inline u32 mm_get_enqcmd_pasid(struct mm_struct *mm)
+{
+ return IOMMU_PASID_INVALID;
+}
+
static inline void mm_pasid_drop(struct mm_struct *mm) {}
#endif /* CONFIG_IOMMU_SVA */

--
2.39.3

2023-10-18 05:07:26

by Zhang, Tina

[permalink] [raw]
Subject: [PATCH v9 3/5] mm: Add structure to keep sva information

Introduce iommu_mm_data structure to keep sva information (pasid and the
related sva domains). Add iommu_mm pointer, pointing to an instance of
iommu_mm_data structure, to mm.

Reviewed-by: Vasant Hegde <[email protected]>
Reviewed-by: Lu Baolu <[email protected]>
Reviewed-by: Jason Gunthorpe <[email protected]>
Tested-by: Nicolin Chen <[email protected]>
Signed-off-by: Tina Zhang <[email protected]>
---
include/linux/iommu.h | 5 +++++
include/linux/mm_types.h | 2 ++
2 files changed, 7 insertions(+)

diff --git a/include/linux/iommu.h b/include/linux/iommu.h
index 8aa5910190d1..b581d8d02afe 100644
--- a/include/linux/iommu.h
+++ b/include/linux/iommu.h
@@ -679,6 +679,11 @@ struct iommu_sva {
struct iommu_domain *domain;
};

+struct iommu_mm_data {
+ u32 pasid;
+ struct list_head sva_domains;
+};
+
int iommu_fwspec_init(struct device *dev, struct fwnode_handle *iommu_fwnode,
const struct iommu_ops *ops);
void iommu_fwspec_free(struct device *dev);
diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
index 36c5b43999e6..9f4efed85f74 100644
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h
@@ -670,6 +670,7 @@ struct mm_cid {
#endif

struct kioctx_table;
+struct iommu_mm_data;
struct mm_struct {
struct {
/*
@@ -883,6 +884,7 @@ struct mm_struct {

#ifdef CONFIG_IOMMU_SVA
u32 pasid;
+ struct iommu_mm_data *iommu_mm;
#endif
#ifdef CONFIG_KSM
/*
--
2.39.3

2023-10-18 05:07:30

by Zhang, Tina

[permalink] [raw]
Subject: [PATCH v9 1/5] iommu/vt-d: Remove mm->pasid in intel_sva_bind_mm()

The pasid is passed in as a parameter through .set_dev_pasid() callback.
Thus, intel_sva_bind_mm() can directly use it instead of retrieving the
pasid value from mm->pasid.

Suggested-by: Lu Baolu <[email protected]>
Reviewed-by: Lu Baolu <[email protected]>
Reviewed-by: Jason Gunthorpe <[email protected]>
Signed-off-by: Tina Zhang <[email protected]>
---
drivers/iommu/intel/svm.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/iommu/intel/svm.c b/drivers/iommu/intel/svm.c
index 50a481c895b8..3c531af58658 100644
--- a/drivers/iommu/intel/svm.c
+++ b/drivers/iommu/intel/svm.c
@@ -290,21 +290,22 @@ static int pasid_to_svm_sdev(struct device *dev, unsigned int pasid,
}

static int intel_svm_bind_mm(struct intel_iommu *iommu, struct device *dev,
- struct mm_struct *mm)
+ struct iommu_domain *domain, ioasid_t pasid)
{
struct device_domain_info *info = dev_iommu_priv_get(dev);
+ struct mm_struct *mm = domain->mm;
struct intel_svm_dev *sdev;
struct intel_svm *svm;
unsigned long sflags;
int ret = 0;

- svm = pasid_private_find(mm->pasid);
+ svm = pasid_private_find(pasid);
if (!svm) {
svm = kzalloc(sizeof(*svm), GFP_KERNEL);
if (!svm)
return -ENOMEM;

- svm->pasid = mm->pasid;
+ svm->pasid = pasid;
svm->mm = mm;
INIT_LIST_HEAD_RCU(&svm->devs);

@@ -342,7 +343,7 @@ static int intel_svm_bind_mm(struct intel_iommu *iommu, struct device *dev,

/* Setup the pasid table: */
sflags = cpu_feature_enabled(X86_FEATURE_LA57) ? PASID_FLAG_FL5LP : 0;
- ret = intel_pasid_setup_first_level(iommu, dev, mm->pgd, mm->pasid,
+ ret = intel_pasid_setup_first_level(iommu, dev, mm->pgd, pasid,
FLPT_DEFAULT_DID, sflags);
if (ret)
goto free_sdev;
@@ -356,7 +357,7 @@ static int intel_svm_bind_mm(struct intel_iommu *iommu, struct device *dev,
free_svm:
if (list_empty(&svm->devs)) {
mmu_notifier_unregister(&svm->notifier, mm);
- pasid_private_remove(mm->pasid);
+ pasid_private_remove(pasid);
kfree(svm);
}

@@ -796,9 +797,8 @@ 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;

- return intel_svm_bind_mm(iommu, dev, mm);
+ return intel_svm_bind_mm(iommu, dev, domain, pasid);
}

static void intel_svm_domain_free(struct iommu_domain *domain)
--
2.39.3

2023-10-18 05:07:37

by Zhang, Tina

[permalink] [raw]
Subject: [PATCH v9 4/5] iommu: Support mm PASID 1:n with sva domains

Each mm bound to devices gets a PASID and corresponding sva domains
allocated in iommu_sva_bind_device(), which are referenced by iommu_mm
field of the mm. The PASID is released in __mmdrop(), while a sva domain
is released when no one is using it (the reference count is decremented
in iommu_sva_unbind_device()). However, although sva domains and their
PASID are separate objects such that their own life cycles could be
handled independently, an enqcmd use case may require releasing the
PASID in releasing the mm (i.e., once a PASID is allocated for a mm, it
will be permanently used by the mm and won't be released until the end
of mm) and only allows to drop the PASID after the sva domains are
released. To this end, mmgrab() is called in iommu_sva_domain_alloc() to
increment the mm reference count and mmdrop() is invoked in
iommu_domain_free() to decrement the mm reference count.

Since the required info of PASID and sva domains is kept in struct
iommu_mm_data of a mm, use mm->iommu_mm field instead of the old pasid
field in mm struct. The sva domain list is protected by iommu_sva_lock.

Besides, this patch removes mm_pasid_init(), as with the introduced
iommu_mm structure, initializing mm pasid in mm_init() is unnecessary.

Reviewed-by: Lu Baolu <[email protected]>
Reviewed-by: Vasant Hegde <[email protected]>
Reviewed-by: Jason Gunthorpe <[email protected]>
Tested-by: Nicolin Chen <[email protected]>
Signed-off-by: Tina Zhang <[email protected]>
---

Change in v7:
- Add mm_pasid_init() back and do zeroing mm->iommu_mm pointer in
mm_pasid_init() to avoid the use-after-free/double-free problem.

Changes in v6:
- Rename iommu_sva_alloc_pasid() to iommu_alloc_mm_data().
- Hold the iommu_sva_lock before invoking iommu_alloc_mm_data().

Change in v5:
- Use smp_store_release() & READ_ONCE() in storing and loading mm's
pasid value.

Change in v4:
- Rebase to v6.6-rc1.

drivers/iommu/iommu-sva.c | 92 +++++++++++++++++++++++----------------
include/linux/iommu.h | 23 ++++++++--
2 files changed, 74 insertions(+), 41 deletions(-)

diff --git a/drivers/iommu/iommu-sva.c b/drivers/iommu/iommu-sva.c
index 4a2f5699747f..5175e8d85247 100644
--- a/drivers/iommu/iommu-sva.c
+++ b/drivers/iommu/iommu-sva.c
@@ -12,32 +12,42 @@
static DEFINE_MUTEX(iommu_sva_lock);

/* Allocate a PASID for the mm within range (inclusive) */
-static int iommu_sva_alloc_pasid(struct mm_struct *mm, struct device *dev)
+static struct iommu_mm_data *iommu_alloc_mm_data(struct mm_struct *mm, struct device *dev)
{
+ struct iommu_mm_data *iommu_mm;
ioasid_t pasid;
- int ret = 0;
+
+ lockdep_assert_held(&iommu_sva_lock);

if (!arch_pgtable_dma_compat(mm))
- return -EBUSY;
+ return ERR_PTR(-EBUSY);

- mutex_lock(&iommu_sva_lock);
+ iommu_mm = mm->iommu_mm;
/* Is a PASID already associated with this mm? */
- if (mm_valid_pasid(mm)) {
- if (mm->pasid >= dev->iommu->max_pasids)
- ret = -EOVERFLOW;
- goto out;
+ if (iommu_mm) {
+ if (iommu_mm->pasid >= dev->iommu->max_pasids)
+ return ERR_PTR(-EOVERFLOW);
+ return iommu_mm;
}

+ iommu_mm = kzalloc(sizeof(struct iommu_mm_data), GFP_KERNEL);
+ if (!iommu_mm)
+ return ERR_PTR(-ENOMEM);
+
pasid = iommu_alloc_global_pasid(dev);
if (pasid == IOMMU_PASID_INVALID) {
- ret = -ENOSPC;
- goto out;
+ kfree(iommu_mm);
+ return ERR_PTR(-ENOSPC);
}
- mm->pasid = pasid;
- ret = 0;
-out:
- mutex_unlock(&iommu_sva_lock);
- return ret;
+ iommu_mm->pasid = pasid;
+ INIT_LIST_HEAD(&iommu_mm->sva_domains);
+ /*
+ * Make sure the write to mm->iommu_mm is not reordered in front of
+ * initialization to iommu_mm fields. If it does, readers may see a
+ * valid iommu_mm with uninitialized values.
+ */
+ smp_store_release(&mm->iommu_mm, iommu_mm);
+ return iommu_mm;
}

/**
@@ -58,31 +68,33 @@ static int iommu_sva_alloc_pasid(struct mm_struct *mm, struct device *dev)
*/
struct iommu_sva *iommu_sva_bind_device(struct device *dev, struct mm_struct *mm)
{
+ struct iommu_mm_data *iommu_mm;
struct iommu_domain *domain;
struct iommu_sva *handle;
int ret;

+ mutex_lock(&iommu_sva_lock);
+
/* Allocate mm->pasid if necessary. */
- ret = iommu_sva_alloc_pasid(mm, dev);
- if (ret)
- return ERR_PTR(ret);
+ iommu_mm = iommu_alloc_mm_data(mm, dev);
+ if (IS_ERR(iommu_mm)) {
+ ret = PTR_ERR(iommu_mm);
+ goto out_unlock;
+ }

handle = kzalloc(sizeof(*handle), GFP_KERNEL);
- if (!handle)
- return ERR_PTR(-ENOMEM);
-
- mutex_lock(&iommu_sva_lock);
- /* Search for an existing domain. */
- domain = iommu_get_domain_for_dev_pasid(dev, mm->pasid,
- IOMMU_DOMAIN_SVA);
- if (IS_ERR(domain)) {
- ret = PTR_ERR(domain);
+ if (!handle) {
+ ret = -ENOMEM;
goto out_unlock;
}

- if (domain) {
- domain->users++;
- goto out;
+ /* Search for an existing domain. */
+ list_for_each_entry(domain, &mm->iommu_mm->sva_domains, next) {
+ ret = iommu_attach_device_pasid(domain, dev, iommu_mm->pasid);
+ if (!ret) {
+ domain->users++;
+ goto out;
+ }
}

/* Allocate a new domain and set it on device pasid. */
@@ -92,23 +104,23 @@ struct iommu_sva *iommu_sva_bind_device(struct device *dev, struct mm_struct *mm
goto out_unlock;
}

- ret = iommu_attach_device_pasid(domain, dev, mm->pasid);
+ ret = iommu_attach_device_pasid(domain, dev, iommu_mm->pasid);
if (ret)
goto out_free_domain;
domain->users = 1;
+ list_add(&domain->next, &mm->iommu_mm->sva_domains);
+
out:
mutex_unlock(&iommu_sva_lock);
handle->dev = dev;
handle->domain = domain;
-
return handle;

out_free_domain:
iommu_domain_free(domain);
+ kfree(handle);
out_unlock:
mutex_unlock(&iommu_sva_lock);
- kfree(handle);
-
return ERR_PTR(ret);
}
EXPORT_SYMBOL_GPL(iommu_sva_bind_device);
@@ -124,12 +136,13 @@ EXPORT_SYMBOL_GPL(iommu_sva_bind_device);
void iommu_sva_unbind_device(struct iommu_sva *handle)
{
struct iommu_domain *domain = handle->domain;
- ioasid_t pasid = domain->mm->pasid;
+ struct iommu_mm_data *iommu_mm = domain->mm->iommu_mm;
struct device *dev = handle->dev;

mutex_lock(&iommu_sva_lock);
+ iommu_detach_device_pasid(domain, dev, iommu_mm->pasid);
if (--domain->users == 0) {
- iommu_detach_device_pasid(domain, dev, pasid);
+ list_del(&domain->next);
iommu_domain_free(domain);
}
mutex_unlock(&iommu_sva_lock);
@@ -205,8 +218,11 @@ iommu_sva_handle_iopf(struct iommu_fault *fault, void *data)

void mm_pasid_drop(struct mm_struct *mm)
{
- if (likely(!mm_valid_pasid(mm)))
+ struct iommu_mm_data *iommu_mm = mm->iommu_mm;
+
+ if (!iommu_mm)
return;

- iommu_free_global_pasid(mm->pasid);
+ iommu_free_global_pasid(iommu_mm->pasid);
+ kfree(iommu_mm);
}
diff --git a/include/linux/iommu.h b/include/linux/iommu.h
index b581d8d02afe..51ab4859bbc4 100644
--- a/include/linux/iommu.h
+++ b/include/linux/iommu.h
@@ -113,6 +113,11 @@ struct iommu_domain {
struct { /* IOMMU_DOMAIN_SVA */
struct mm_struct *mm;
int users;
+ /*
+ * Next iommu_domain in mm->iommu_mm->sva-domains list
+ * protected by iommu_sva_lock.
+ */
+ struct list_head next;
};
};
};
@@ -1197,16 +1202,28 @@ static inline bool tegra_dev_iommu_get_stream_id(struct device *dev, u32 *stream
#ifdef CONFIG_IOMMU_SVA
static inline void mm_pasid_init(struct mm_struct *mm)
{
- mm->pasid = IOMMU_PASID_INVALID;
+ /*
+ * During dup_mm(), a new mm will be memcpy'd from an old one and that makes
+ * the new mm and the old one point to a same iommu_mm instance. When either
+ * one of the two mms gets released, the iommu_mm instance is freed, leaving
+ * the other mm running into a use-after-free/double-free problem. To avoid
+ * the problem, zeroing the iommu_mm pointer of a new mm is needed here.
+ */
+ mm->iommu_mm = NULL;
}
+
static inline bool mm_valid_pasid(struct mm_struct *mm)
{
- return mm->pasid != IOMMU_PASID_INVALID;
+ return READ_ONCE(mm->iommu_mm);
}

static inline u32 mm_get_enqcmd_pasid(struct mm_struct *mm)
{
- return mm->pasid;
+ struct iommu_mm_data *iommu_mm = READ_ONCE(mm->iommu_mm);
+
+ if (!iommu_mm)
+ return IOMMU_PASID_INVALID;
+ return iommu_mm->pasid;
}

void mm_pasid_drop(struct mm_struct *mm);
--
2.39.3

2023-10-18 05:07:42

by Zhang, Tina

[permalink] [raw]
Subject: [PATCH v9 5/5] mm: Deprecate pasid field

Drop the pasid field, as all the information needed for sva domain
management has been moved to the newly added iommu_mm field.

Reviewed-by: Lu Baolu <[email protected]>
Reviewed-by: Vasant Hegde <[email protected]>
Reviewed-by: Jason Gunthorpe <[email protected]>
Signed-off-by: Tina Zhang <[email protected]>
---
include/linux/mm_types.h | 1 -
mm/init-mm.c | 3 ---
2 files changed, 4 deletions(-)

diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
index 9f4efed85f74..37f049c4b059 100644
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h
@@ -883,7 +883,6 @@ struct mm_struct {
struct work_struct async_put_work;

#ifdef CONFIG_IOMMU_SVA
- u32 pasid;
struct iommu_mm_data *iommu_mm;
#endif
#ifdef CONFIG_KSM
diff --git a/mm/init-mm.c b/mm/init-mm.c
index cfd367822cdd..24c809379274 100644
--- a/mm/init-mm.c
+++ b/mm/init-mm.c
@@ -44,9 +44,6 @@ struct mm_struct init_mm = {
#endif
.user_ns = &init_user_ns,
.cpu_bitmap = CPU_BITS_NONE,
-#ifdef CONFIG_IOMMU_SVA
- .pasid = IOMMU_PASID_INVALID,
-#endif
INIT_MM_CONTEXT(init_mm)
};

--
2.39.3

2023-10-25 12:30:24

by Jason Gunthorpe

[permalink] [raw]
Subject: Re: [PATCH v9 0/5] Share sva domains with all devices bound to a mm

On Wed, Oct 18, 2023 at 01:06:35PM +0800, Tina Zhang wrote:

> Tina Zhang (5):
> iommu/vt-d: Remove mm->pasid in intel_sva_bind_mm()
> iommu: Add mm_get_enqcmd_pasid() helper function
> mm: Add structure to keep sva information
> iommu: Support mm PASID 1:n with sva domains
> mm: Deprecate pasid field

I don't know where Joerg has gone, he hasn't been able to answer three
emails about this series in the last week. I'll take it through the
iommufd tree so we can have an orderly next cycle for the three driver
series already posted. If it reaches Joerg's tree before Sunday I'll
drop it.

We should have a discussion about process at LPC.

Regards,
Jason

2023-10-26 07:24:57

by Joerg Roedel

[permalink] [raw]
Subject: Re: [PATCH v9 0/5] Share sva domains with all devices bound to a mm

Hi Tina,

On Wed, Oct 18, 2023 at 01:06:35PM +0800, Tina Zhang wrote:
> Tina Zhang (5):
> iommu/vt-d: Remove mm->pasid in intel_sva_bind_mm()
> iommu: Add mm_get_enqcmd_pasid() helper function
> mm: Add structure to keep sva information
> iommu: Support mm PASID 1:n with sva domains
> mm: Deprecate pasid field

Thanks for doing this, it all looks reasonable to me. But there is one
thing missing which needs to be done before we can move forward with
this.

There was a discussion about the Kconfig symbol naming used in
mm_struct. Please see the discussion here:

https://lore.kernel.org/all/CAHk-=wgUiAtiszwseM1p2fCJ+sC4XWQ+YN4TanFhUgvUqjr9Xw@mail.gmail.com/

Please update this patch-set to solve this and I will take the series.

Regards,

Joerg

2023-10-26 12:21:41

by Jason Gunthorpe

[permalink] [raw]
Subject: Re: [PATCH v9 0/5] Share sva domains with all devices bound to a mm

On Thu, Oct 26, 2023 at 09:24:40AM +0200, Joerg Roedel wrote:
> Hi Tina,
>
> On Wed, Oct 18, 2023 at 01:06:35PM +0800, Tina Zhang wrote:
> > Tina Zhang (5):
> > iommu/vt-d: Remove mm->pasid in intel_sva_bind_mm()
> > iommu: Add mm_get_enqcmd_pasid() helper function
> > mm: Add structure to keep sva information
> > iommu: Support mm PASID 1:n with sva domains
> > mm: Deprecate pasid field
>
> Thanks for doing this, it all looks reasonable to me. But there is one
> thing missing which needs to be done before we can move forward with
> this.
>
> There was a discussion about the Kconfig symbol naming used in
> mm_struct. Please see the discussion here:
>
> https://lore.kernel.org/all/CAHk-=wgUiAtiszwseM1p2fCJ+sC4XWQ+YN4TanFhUgvUqjr9Xw@mail.gmail.com/
>
> Please update this patch-set to solve this and I will take the series.

Lets call it CONFIG_IOMMU_MM_DATA then. It is still pretty nonsensical
but it speaks to what it does after this series

Thanks,
Jason

2023-10-26 13:52:01

by Jason Gunthorpe

[permalink] [raw]
Subject: Re: [PATCH v9 0/5] Share sva domains with all devices bound to a mm

On Thu, Oct 26, 2023 at 09:20:16AM -0300, Jason Gunthorpe wrote:
> On Thu, Oct 26, 2023 at 09:24:40AM +0200, Joerg Roedel wrote:
> > Hi Tina,
> >
> > On Wed, Oct 18, 2023 at 01:06:35PM +0800, Tina Zhang wrote:
> > > Tina Zhang (5):
> > > iommu/vt-d: Remove mm->pasid in intel_sva_bind_mm()
> > > iommu: Add mm_get_enqcmd_pasid() helper function
> > > mm: Add structure to keep sva information
> > > iommu: Support mm PASID 1:n with sva domains
> > > mm: Deprecate pasid field
> >
> > Thanks for doing this, it all looks reasonable to me. But there is one
> > thing missing which needs to be done before we can move forward with
> > this.
> >
> > There was a discussion about the Kconfig symbol naming used in
> > mm_struct. Please see the discussion here:
> >
> > https://lore.kernel.org/all/CAHk-=wgUiAtiszwseM1p2fCJ+sC4XWQ+YN4TanFhUgvUqjr9Xw@mail.gmail.com/
> >
> > Please update this patch-set to solve this and I will take the series.
>
> Lets call it CONFIG_IOMMU_MM_DATA then. It is still pretty nonsensical
> but it speaks to what it does after this series

This is what I came up with:

From ca97b6cb94eadc4066d762aa4c54e7ba9789f3f4 Mon Sep 17 00:00:00 2001
From: Jason Gunthorpe <[email protected]>
Date: Thu, 26 Oct 2023 10:43:12 -0300
Subject: [PATCH] iommu: Change kconfig around IOMMU_SVA

Linus suggested that the kconfig here is confusing:

https://lore.kernel.org/all/CAHk-=wgUiAtiszwseM1p2fCJ+sC4XWQ+YN4TanFhUgvUqjr9Xw@mail.gmail.com/

Let's break it into three kconfigs controlling distinct things:

- CONFIG_IOMMU_MM_DATA controls if the mm_struct has the additional
fields for the IOMMU. Currently only PASID, but later patches store
a struct iommu_mm_data *

- CONFIG_ARCH_HAS_CPU_PASID controls if the arch needs the scheduling bit
for keeping track of the ENQCMD instruction. x86 will select this if
IOMMU_SVA is enabled

- IOMMU_SVA controls if the IOMMU core compiles in the SVA support code
for iommu driver use and the IOMMU exported API

This way ARM will not enable CONFIG_ARCH_HAS_CPU_PASID

Signed-off-by: Jason Gunthorpe <[email protected]>
---
arch/Kconfig | 5 +++++
arch/x86/Kconfig | 1 +
arch/x86/kernel/traps.c | 2 +-
drivers/iommu/Kconfig | 1 +
include/linux/iommu.h | 2 +-
include/linux/mm_types.h | 2 +-
include/linux/sched.h | 2 +-
kernel/fork.c | 2 +-
mm/Kconfig | 3 +++
mm/init-mm.c | 2 +-
10 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/arch/Kconfig b/arch/Kconfig
index 12d51495caec18..35b9fd559bb697 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -301,6 +301,11 @@ config ARCH_HAS_DMA_CLEAR_UNCACHED
config ARCH_HAS_CPU_FINALIZE_INIT
bool

+# The architecture has a per-task state that includes the mm's PASID
+config ARCH_HAS_CPU_PASID
+ bool
+ select IOMMU_MM_DATA
+
# Select if arch init_task must go in the __init_task_data section
config ARCH_TASK_STRUCT_ON_STACK
bool
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 66bfabae881491..afd9c2dc228bdf 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -72,6 +72,7 @@ config X86
select ARCH_HAS_CACHE_LINE_SIZE
select ARCH_HAS_CPU_CACHE_INVALIDATE_MEMREGION
select ARCH_HAS_CPU_FINALIZE_INIT
+ select ARCH_HAS_CPU_PASID if IOMMU_SVA
select ARCH_HAS_CURRENT_STACK_POINTER
select ARCH_HAS_DEBUG_VIRTUAL
select ARCH_HAS_DEBUG_VM_PGTABLE if !X86_PAE
diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
index c876f1d36a81a7..2b62dbb3396add 100644
--- a/arch/x86/kernel/traps.c
+++ b/arch/x86/kernel/traps.c
@@ -565,7 +565,7 @@ static bool fixup_iopl_exception(struct pt_regs *regs)
*/
static bool try_fixup_enqcmd_gp(void)
{
-#ifdef CONFIG_IOMMU_SVA
+#ifdef CONFIG_ARCH_HAS_CPU_PASID
u32 pasid;

/*
diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig
index 5cc869db1b79fc..0f9c3f6ae8d32d 100644
--- a/drivers/iommu/Kconfig
+++ b/drivers/iommu/Kconfig
@@ -160,6 +160,7 @@ config IOMMU_DMA

# Shared Virtual Addressing
config IOMMU_SVA
+ select IOMMU_MM_DATA
bool

config FSL_PAMU
diff --git a/include/linux/iommu.h b/include/linux/iommu.h
index 8fb1b41b4d1580..0d2e01404c3e50 100644
--- a/include/linux/iommu.h
+++ b/include/linux/iommu.h
@@ -1324,7 +1324,7 @@ static inline bool tegra_dev_iommu_get_stream_id(struct device *dev, u32 *stream
return false;
}

-#ifdef CONFIG_IOMMU_SVA
+#ifdef CONFIG_IOMMU_MM_DATA
static inline void mm_pasid_init(struct mm_struct *mm)
{
mm->pasid = IOMMU_PASID_INVALID;
diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
index 36c5b43999e608..330f3cd8d5ad97 100644
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h
@@ -881,7 +881,7 @@ struct mm_struct {
#endif
struct work_struct async_put_work;

-#ifdef CONFIG_IOMMU_SVA
+#ifdef CONFIG_IOMMU_MM_DATA
u32 pasid;
#endif
#ifdef CONFIG_KSM
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 77f01ac385f7a5..3ac8e8556c3d93 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -949,7 +949,7 @@ struct task_struct {
/* Recursion prevention for eventfd_signal() */
unsigned in_eventfd:1;
#endif
-#ifdef CONFIG_IOMMU_SVA
+#ifdef CONFIG_ARCH_HAS_CPU_PASID
unsigned pasid_activated:1;
#endif
#ifdef CONFIG_CPU_SUP_INTEL
diff --git a/kernel/fork.c b/kernel/fork.c
index 3b6d20dfb9a85e..d28f0d4582dcc1 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -1179,7 +1179,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig, int node)
tsk->use_memdelay = 0;
#endif

-#ifdef CONFIG_IOMMU_SVA
+#ifdef CONFIG_ARCH_HAS_CPU_PASID
tsk->pasid_activated = 0;
#endif

diff --git a/mm/Kconfig b/mm/Kconfig
index 264a2df5ecf5b9..fee4a15e444b74 100644
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -1258,6 +1258,9 @@ config LOCK_MM_AND_FIND_VMA
bool
depends on !STACK_GROWSUP

+config IOMMU_MM_DATA
+ bool
+
source "mm/damon/Kconfig"

endmenu
diff --git a/mm/init-mm.c b/mm/init-mm.c
index cfd367822cdd2e..c52dc2740a3de2 100644
--- a/mm/init-mm.c
+++ b/mm/init-mm.c
@@ -44,7 +44,7 @@ struct mm_struct init_mm = {
#endif
.user_ns = &init_user_ns,
.cpu_bitmap = CPU_BITS_NONE,
-#ifdef CONFIG_IOMMU_SVA
+#ifdef CONFIG_IOMMU_MM_DATA
.pasid = IOMMU_PASID_INVALID,
#endif
INIT_MM_CONTEXT(init_mm)
--
2.42.0

2023-10-27 00:10:43

by Zhang, Tina

[permalink] [raw]
Subject: RE: [PATCH v9 0/5] Share sva domains with all devices bound to a mm

Hi Jason and Joerg,

Thanks for this commit. Version 10 of this patch-set has been submitted and this patch is added.

Regards,
-Tina

> -----Original Message-----
> From: Jason Gunthorpe <[email protected]>
> Sent: Thursday, October 26, 2023 9:51 PM
> To: Joerg Roedel <[email protected]>
> Cc: Zhang, Tina <[email protected]>; [email protected]; linux-
> [email protected]; David Woodhouse <[email protected]>; Lu Baolu
> <[email protected]>; Will Deacon <[email protected]>; Robin Murphy
> <[email protected]>; Tian, Kevin <[email protected]>; Nicolin Chen
> <[email protected]>; Michael Shavit <[email protected]>; Vasant Hegde
> <[email protected]>
> Subject: Re: [PATCH v9 0/5] Share sva domains with all devices bound to a mm
>
> On Thu, Oct 26, 2023 at 09:20:16AM -0300, Jason Gunthorpe wrote:
> > On Thu, Oct 26, 2023 at 09:24:40AM +0200, Joerg Roedel wrote:
> > > Hi Tina,
> > >
> > > On Wed, Oct 18, 2023 at 01:06:35PM +0800, Tina Zhang wrote:
> > > > Tina Zhang (5):
> > > > iommu/vt-d: Remove mm->pasid in intel_sva_bind_mm()
> > > > iommu: Add mm_get_enqcmd_pasid() helper function
> > > > mm: Add structure to keep sva information
> > > > iommu: Support mm PASID 1:n with sva domains
> > > > mm: Deprecate pasid field
> > >
> > > Thanks for doing this, it all looks reasonable to me. But there is
> > > one thing missing which needs to be done before we can move forward
> > > with this.
> > >
> > > There was a discussion about the Kconfig symbol naming used in
> > > mm_struct. Please see the discussion here:
> > >
> > >
> > > https://lore.kernel.org/all/CAHk-=wgUiAtiszwseM1p2fCJ+sC4XWQ+YN4TanF
> > > [email protected]/
> > >
> > > Please update this patch-set to solve this and I will take the series.
> >
> > Lets call it CONFIG_IOMMU_MM_DATA then. It is still pretty nonsensical
> > but it speaks to what it does after this series
>
> This is what I came up with:
>
> From ca97b6cb94eadc4066d762aa4c54e7ba9789f3f4 Mon Sep 17 00:00:00
> 2001
> From: Jason Gunthorpe <[email protected]>
> Date: Thu, 26 Oct 2023 10:43:12 -0300
> Subject: [PATCH] iommu: Change kconfig around IOMMU_SVA
>
> Linus suggested that the kconfig here is confusing:
>
> https://lore.kernel.org/all/CAHk-
> [email protected]/
>
> Let's break it into three kconfigs controlling distinct things:
>
> - CONFIG_IOMMU_MM_DATA controls if the mm_struct has the additional
> fields for the IOMMU. Currently only PASID, but later patches store
> a struct iommu_mm_data *
>
> - CONFIG_ARCH_HAS_CPU_PASID controls if the arch needs the scheduling bit
> for keeping track of the ENQCMD instruction. x86 will select this if
> IOMMU_SVA is enabled
>
> - IOMMU_SVA controls if the IOMMU core compiles in the SVA support code
> for iommu driver use and the IOMMU exported API
>
> This way ARM will not enable CONFIG_ARCH_HAS_CPU_PASID
>
> Signed-off-by: Jason Gunthorpe <[email protected]>
> ---
> arch/Kconfig | 5 +++++
> arch/x86/Kconfig | 1 +
> arch/x86/kernel/traps.c | 2 +-
> drivers/iommu/Kconfig | 1 +
> include/linux/iommu.h | 2 +-
> include/linux/mm_types.h | 2 +-
> include/linux/sched.h | 2 +-
> kernel/fork.c | 2 +-
> mm/Kconfig | 3 +++
> mm/init-mm.c | 2 +-
> 10 files changed, 16 insertions(+), 6 deletions(-)
>
> diff --git a/arch/Kconfig b/arch/Kconfig index
> 12d51495caec18..35b9fd559bb697 100644
> --- a/arch/Kconfig
> +++ b/arch/Kconfig
> @@ -301,6 +301,11 @@ config ARCH_HAS_DMA_CLEAR_UNCACHED config
> ARCH_HAS_CPU_FINALIZE_INIT
> bool
>
> +# The architecture has a per-task state that includes the mm's PASID
> +config ARCH_HAS_CPU_PASID
> + bool
> + select IOMMU_MM_DATA
> +
> # Select if arch init_task must go in the __init_task_data section config
> ARCH_TASK_STRUCT_ON_STACK
> bool
> diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index
> 66bfabae881491..afd9c2dc228bdf 100644
> --- a/arch/x86/Kconfig
> +++ b/arch/x86/Kconfig
> @@ -72,6 +72,7 @@ config X86
> select ARCH_HAS_CACHE_LINE_SIZE
> select ARCH_HAS_CPU_CACHE_INVALIDATE_MEMREGION
> select ARCH_HAS_CPU_FINALIZE_INIT
> + select ARCH_HAS_CPU_PASID if IOMMU_SVA
> select ARCH_HAS_CURRENT_STACK_POINTER
> select ARCH_HAS_DEBUG_VIRTUAL
> select ARCH_HAS_DEBUG_VM_PGTABLE if !X86_PAE
> diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c index
> c876f1d36a81a7..2b62dbb3396add 100644
> --- a/arch/x86/kernel/traps.c
> +++ b/arch/x86/kernel/traps.c
> @@ -565,7 +565,7 @@ static bool fixup_iopl_exception(struct pt_regs *regs)
> */
> static bool try_fixup_enqcmd_gp(void)
> {
> -#ifdef CONFIG_IOMMU_SVA
> +#ifdef CONFIG_ARCH_HAS_CPU_PASID
> u32 pasid;
>
> /*
> diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig index
> 5cc869db1b79fc..0f9c3f6ae8d32d 100644
> --- a/drivers/iommu/Kconfig
> +++ b/drivers/iommu/Kconfig
> @@ -160,6 +160,7 @@ config IOMMU_DMA
>
> # Shared Virtual Addressing
> config IOMMU_SVA
> + select IOMMU_MM_DATA
> bool
>
> config FSL_PAMU
> diff --git a/include/linux/iommu.h b/include/linux/iommu.h index
> 8fb1b41b4d1580..0d2e01404c3e50 100644
> --- a/include/linux/iommu.h
> +++ b/include/linux/iommu.h
> @@ -1324,7 +1324,7 @@ static inline bool
> tegra_dev_iommu_get_stream_id(struct device *dev, u32 *stream
> return false;
> }
>
> -#ifdef CONFIG_IOMMU_SVA
> +#ifdef CONFIG_IOMMU_MM_DATA
> static inline void mm_pasid_init(struct mm_struct *mm) {
> mm->pasid = IOMMU_PASID_INVALID;
> diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h index
> 36c5b43999e608..330f3cd8d5ad97 100644
> --- a/include/linux/mm_types.h
> +++ b/include/linux/mm_types.h
> @@ -881,7 +881,7 @@ struct mm_struct {
> #endif
> struct work_struct async_put_work;
>
> -#ifdef CONFIG_IOMMU_SVA
> +#ifdef CONFIG_IOMMU_MM_DATA
> u32 pasid;
> #endif
> #ifdef CONFIG_KSM
> diff --git a/include/linux/sched.h b/include/linux/sched.h index
> 77f01ac385f7a5..3ac8e8556c3d93 100644
> --- a/include/linux/sched.h
> +++ b/include/linux/sched.h
> @@ -949,7 +949,7 @@ struct task_struct {
> /* Recursion prevention for eventfd_signal() */
> unsigned in_eventfd:1;
> #endif
> -#ifdef CONFIG_IOMMU_SVA
> +#ifdef CONFIG_ARCH_HAS_CPU_PASID
> unsigned pasid_activated:1;
> #endif
> #ifdef CONFIG_CPU_SUP_INTEL
> diff --git a/kernel/fork.c b/kernel/fork.c index
> 3b6d20dfb9a85e..d28f0d4582dcc1 100644
> --- a/kernel/fork.c
> +++ b/kernel/fork.c
> @@ -1179,7 +1179,7 @@ static struct task_struct *dup_task_struct(struct
> task_struct *orig, int node)
> tsk->use_memdelay = 0;
> #endif
>
> -#ifdef CONFIG_IOMMU_SVA
> +#ifdef CONFIG_ARCH_HAS_CPU_PASID
> tsk->pasid_activated = 0;
> #endif
>
> diff --git a/mm/Kconfig b/mm/Kconfig
> index 264a2df5ecf5b9..fee4a15e444b74 100644
> --- a/mm/Kconfig
> +++ b/mm/Kconfig
> @@ -1258,6 +1258,9 @@ config LOCK_MM_AND_FIND_VMA
> bool
> depends on !STACK_GROWSUP
>
> +config IOMMU_MM_DATA
> + bool
> +
> source "mm/damon/Kconfig"
>
> endmenu
> diff --git a/mm/init-mm.c b/mm/init-mm.c index
> cfd367822cdd2e..c52dc2740a3de2 100644
> --- a/mm/init-mm.c
> +++ b/mm/init-mm.c
> @@ -44,7 +44,7 @@ struct mm_struct init_mm = { #endif
> .user_ns = &init_user_ns,
> .cpu_bitmap = CPU_BITS_NONE,
> -#ifdef CONFIG_IOMMU_SVA
> +#ifdef CONFIG_IOMMU_MM_DATA
> .pasid = IOMMU_PASID_INVALID,
> #endif
> INIT_MM_CONTEXT(init_mm)
> --
> 2.42.0