ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 20:51:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

iommu/sva: Move PASID helpers to sva code

Browse Source 
Preparing to remove IOASID infrastructure, PASID management will be
under SVA code. Decouple mm code from IOASID.

Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
Signed-off-by: Jacob Pan <jacob.jun.pan@linux.intel.com>
Reviewed-by: Kevin Tian <kevin.tian@intel.com>
Link: https://lore.kernel.org/r/20230322200803.869130-3-jacob.jun.pan@linux.intel.com
Signed-off-by: Joerg Roedel <jroedel@suse.de>
This commit is contained in:
Jacob Pan
2023-03-22 13:07:58 -07:00
committed by Joerg Roedel
parent 760f41d182
commit cd3891158a
5 changed files with 24 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/iommu/iommu-sva.c
View File

@@ -44,7 +44,7 @@ int iommu_sva_alloc_pasid(struct mm_struct *mm, ioasid_t min, ioasid_t max)
if (!pasid_valid(pasid)) if (!pasid_valid(pasid))
ret = -ENOMEM; ret = -ENOMEM;
else else
mm_pasid_set(mm, pasid); mm->pasid = pasid;
out: out:
mutex_unlock(&iommu_sva_lock); mutex_unlock(&iommu_sva_lock);
return ret; return ret;
@@ -238,3 +238,11 @@ out_put_mm:
return status; return status;
} }
void mm_pasid_drop(struct mm_struct *mm)
{
if (pasid_valid(mm->pasid)) {
ioasid_free(mm->pasid);
mm->pasid = INVALID_IOASID;
}
}

11
include/linux/ioasid.h
View File

@@ -4,8 +4,8 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/iommu.h>
#define INVALID_IOASID ((ioasid_t)-1)
typedef unsigned int ioasid_t; typedef unsigned int ioasid_t;
typedef ioasid_t (*ioasid_alloc_fn_t)(ioasid_t min, ioasid_t max, void *data); typedef ioasid_t (*ioasid_alloc_fn_t)(ioasid_t min, ioasid_t max, void *data);
typedef void (*ioasid_free_fn_t)(ioasid_t ioasid, void *data); typedef void (*ioasid_free_fn_t)(ioasid_t ioasid, void *data);
@@ -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 */

14
include/linux/iommu.h
View File

@@ -13,7 +13,6 @@
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/err.h> #include <linux/err.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/ioasid.h>
#include <uapi/linux/iommu.h> #include <uapi/linux/iommu.h>
#define IOMMU_READ (1 << 0) #define IOMMU_READ (1 << 0)
@@ -192,6 +191,8 @@ enum iommu_dev_features {
}; };
#define IOMMU_PASID_INVALID (-1U) #define IOMMU_PASID_INVALID (-1U)
typedef unsigned int ioasid_t;
#define INVALID_IOASID ((ioasid_t)-1)
#ifdef CONFIG_IOMMU_API #ifdef CONFIG_IOMMU_API
@@ -1172,7 +1173,16 @@ static inline bool tegra_dev_iommu_get_stream_id(struct device *dev, u32 *stream
return false; return false;
} }
static inline bool pasid_valid(ioasid_t ioasid)
{
return ioasid != INVALID_IOASID;
}
#ifdef CONFIG_IOMMU_SVA #ifdef CONFIG_IOMMU_SVA
static inline void mm_pasid_init(struct mm_struct *mm)
{
mm->pasid = INVALID_IOASID;
}
void mm_pasid_drop(struct mm_struct *mm);
struct iommu_sva *iommu_sva_bind_device(struct device *dev, struct iommu_sva *iommu_sva_bind_device(struct device *dev,
struct mm_struct *mm); struct mm_struct *mm);
void iommu_sva_unbind_device(struct iommu_sva *handle); void iommu_sva_unbind_device(struct iommu_sva *handle);
@@ -1192,6 +1202,8 @@ static inline u32 iommu_sva_get_pasid(struct iommu_sva *handle)
{ {
return IOMMU_PASID_INVALID; return IOMMU_PASID_INVALID;
} }
static inline void mm_pasid_init(struct mm_struct *mm) {}
static inline void mm_pasid_drop(struct mm_struct *mm) {}
#endif /* CONFIG_IOMMU_SVA */ #endif /* CONFIG_IOMMU_SVA */
#endif /* __LINUX_IOMMU_H */ #endif /* __LINUX_IOMMU_H */

26
include/linux/sched/mm.h
View File

@@ -8,7 +8,6 @@
#include <linux/mm_types.h> #include <linux/mm_types.h>
#include <linux/gfp.h> #include <linux/gfp.h>
#include <linux/sync_core.h> #include <linux/sync_core.h>
#include <linux/ioasid.h>
/* /*
* Routines for handling mm_structs * Routines for handling mm_structs
@@ -451,29 +450,4 @@ static inline void membarrier_update_current_mm(struct mm_struct *next_mm)
} }
#endif #endif
#ifdef CONFIG_IOMMU_SVA
static inline void mm_pasid_init(struct mm_struct *mm)
{
mm->pasid = INVALID_IOASID;
}
/* Associate a PASID with an mm_struct: */
static inline void mm_pasid_set(struct mm_struct *mm, u32 pasid)
{
mm->pasid = pasid;
}
static inline void mm_pasid_drop(struct mm_struct *mm)
{
if (pasid_valid(mm->pasid)) {
ioasid_free(mm->pasid);
mm->pasid = INVALID_IOASID;
}
}
#else
static inline void mm_pasid_init(struct mm_struct *mm) {}
static inline void mm_pasid_set(struct mm_struct *mm, u32 pasid) {}
static inline void mm_pasid_drop(struct mm_struct *mm) {}
#endif
#endif /* _LINUX_SCHED_MM_H */ #endif /* _LINUX_SCHED_MM_H */

1
kernel/fork.c
View File

@@ -97,6 +97,7 @@
#include <linux/io_uring.h> #include <linux/io_uring.h>
#include <linux/bpf.h> #include <linux/bpf.h>
#include <linux/stackprotector.h> #include <linux/stackprotector.h>
#include <linux/iommu.h>
#include <asm/pgalloc.h> #include <asm/pgalloc.h>
#include <linux/uaccess.h> #include <linux/uaccess.h>