GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-03-18 05:04:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

iommu/sva: Replace pasid_valid() helper with mm_valid_pasid()

Browse source 
Kernel has few users of pasid_valid() and all but one checks if the
process has PASID allocated. The helper takes ioasid_t as the input.

Replace the helper with mm_valid_pasid() that takes mm_struct as the
argument. The only call that checks PASID that is not tied to mm_struct
is open-codded now.

This is preparatory patch. It helps avoid ifdeffery: no need to
dereference mm->pasid in generic code to check if the process has PASID.

Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lore.kernel.org/all/20230312112612.31869-11-kirill.shutemov%40linux.intel.com
This commit is contained in:
Kirill A. Shutemov 2023-03-12 14:26:05 +03:00 • committed by Dave Hansen
parent f7d304343b
commit 400b9b9344
4 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
arch/x86/kernel/traps.c
View file

@ -671,15 +671,15 @@ static bool try_fixup_enqcmd_gp(void)
if (!cpu_feature_enabled(X86_FEATURE_ENQCMD)) if (!cpu_feature_enabled(X86_FEATURE_ENQCMD))
return false; return false;
pasid = current->mm->pasid;
/* /*
* If the mm has not been allocated a * If the mm has not been allocated a
* PASID, the #GP can not be fixed up. * PASID, the #GP can not be fixed up.
*/ */
if (!pasid_valid(pasid)) if (!mm_valid_pasid(current->mm))
return false; return false;
pasid = current->mm->pasid;
/* /*
* Did this thread already have its PASID activated? * Did this thread already have its PASID activated?
* If so, the #GP must be from something else. * If so, the #GP must be from something else.

4
drivers/iommu/iommu-sva.c
View file

@ -34,14 +34,14 @@ int iommu_sva_alloc_pasid(struct mm_struct *mm, ioasid_t min, ioasid_t max)
mutex_lock(&iommu_sva_lock); mutex_lock(&iommu_sva_lock);
/* Is a PASID already associated with this mm? */ /* Is a PASID already associated with this mm? */
if (pasid_valid(mm->pasid)) { if (mm_valid_pasid(mm)) {
if (mm->pasid < min || mm->pasid >= max) if (mm->pasid < min || mm->pasid >= max)
ret = -EOVERFLOW; ret = -EOVERFLOW;
goto out; goto out;
} }
pasid = ioasid_alloc(&iommu_sva_pasid, min, max, mm); pasid = ioasid_alloc(&iommu_sva_pasid, min, max, mm);
if (!pasid_valid(pasid)) if (pasid == INVALID_IOASID)
ret = -ENOMEM; ret = -ENOMEM;
else else
mm_pasid_set(mm, pasid); mm_pasid_set(mm, pasid);

9
include/linux/ioasid.h
View file

@ -40,10 +40,6 @@ void *ioasid_find(struct ioasid_set *set, ioasid_t ioasid,
int ioasid_register_allocator(struct ioasid_allocator_ops *allocator); int ioasid_register_allocator(struct ioasid_allocator_ops *allocator);
void ioasid_unregister_allocator(struct ioasid_allocator_ops *allocator); void ioasid_unregister_allocator(struct ioasid_allocator_ops *allocator);
int ioasid_set_data(ioasid_t ioasid, void *data); int ioasid_set_data(ioasid_t ioasid, void *data);
static inline bool pasid_valid(ioasid_t ioasid)
{
return ioasid != INVALID_IOASID;
}
#else /* !CONFIG_IOASID */ #else /* !CONFIG_IOASID */
static inline ioasid_t ioasid_alloc(struct ioasid_set *set, ioasid_t min, static inline ioasid_t ioasid_alloc(struct ioasid_set *set, ioasid_t min,
@ -74,10 +70,5 @@ static inline int ioasid_set_data(ioasid_t ioasid, void *data)
return -ENOTSUPP; return -ENOTSUPP;
} }
static inline bool pasid_valid(ioasid_t ioasid)
{
return false;
}
#endif /* CONFIG_IOASID */ #endif /* CONFIG_IOASID */
#endif /* __LINUX_IOASID_H */ #endif /* __LINUX_IOASID_H */

8
include/linux/sched/mm.h
View file

@ -457,6 +457,11 @@ static inline void mm_pasid_init(struct mm_struct *mm)
mm->pasid = INVALID_IOASID; mm->pasid = INVALID_IOASID;
} }
static inline bool mm_valid_pasid(struct mm_struct *mm)
{
return mm->pasid != INVALID_IOASID;
}
/* Associate a PASID with an mm_struct: */ /* Associate a PASID with an mm_struct: */
static inline void mm_pasid_set(struct mm_struct *mm, u32 pasid) static inline void mm_pasid_set(struct mm_struct *mm, u32 pasid)
{ {
@ -465,13 +470,14 @@ static inline void mm_pasid_set(struct mm_struct *mm, u32 pasid)
static inline void mm_pasid_drop(struct mm_struct *mm) static inline void mm_pasid_drop(struct mm_struct *mm)
{ {
if (pasid_valid(mm->pasid)) { if (mm_valid_pasid(mm)) {
ioasid_free(mm->pasid); ioasid_free(mm->pasid);
mm->pasid = INVALID_IOASID; mm->pasid = INVALID_IOASID;
} }
} }
#else #else
static inline void mm_pasid_init(struct mm_struct *mm) {} static inline void mm_pasid_init(struct mm_struct *mm) {}
static inline bool mm_valid_pasid(struct mm_struct *mm) { return false; }
static inline void mm_pasid_set(struct mm_struct *mm, u32 pasid) {} static inline void mm_pasid_set(struct mm_struct *mm, u32 pasid) {}
static inline void mm_pasid_drop(struct mm_struct *mm) {} static inline void mm_pasid_drop(struct mm_struct *mm) {}
#endif #endif