2023-09-25 02:39:04

by Zhang, Tina

Subject: [PATCH v5 2/6] iommu: Add mm_get_enqcmd_pasid() helper function

mm_get_enqcmd_pasid() is for getting enqcmd pasid value.

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]>
Signed-off-by: Tina Zhang <[email protected]>
---

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

arch/x86/kernel/traps.c | 2 +-
include/linux/iommu.h | 8 ++++++++
2 files changed, 9 insertions(+), 1 deletion(-)

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/include/linux/iommu.h b/include/linux/iommu.h
index c50a769d569a..a4eab6697fe1 100644
--- a/include/linux/iommu.h
+++ b/include/linux/iommu.h
@@ -1189,6 +1189,10 @@ 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);
@@ -1211,6 +1215,10 @@ 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.34.1

2023-10-05 18:41:15

by Jason Gunthorpe

Subject: Re: [PATCH v5 2/6] iommu: Add mm_get_enqcmd_pasid() helper function

On Mon, Sep 25, 2023 at 10:38:09AM +0800, Tina Zhang wrote:
> mm_get_enqcmd_pasid() is for getting enqcmd pasid value.
>
> 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]>
> Signed-off-by: Tina Zhang <[email protected]>
> ---
>
> Change in v2:
> - Change mm_get_pasid() to mm_get_enqcmd_pasid()
>
> arch/x86/kernel/traps.c | 2 +-
> include/linux/iommu.h | 8 ++++++++
> 2 files changed, 9 insertions(+), 1 deletion(-)

Reviewed-by: Jason Gunthorpe <[email protected]>

Jason