iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iommu: Merge iommu_fault_event and iopf_fault

Browse Source 
The iommu_fault_event and iopf_fault data structures store the same
information about an iopf fault. They are also used in the same way.
Merge these two data structures into a single one to make the code
more concise and easier to maintain.

Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
Reviewed-by: Kevin Tian <kevin.tian@intel.com>
Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
Reviewed-by: Yi Liu <yi.l.liu@intel.com>
Tested-by: Yan Zhao <yan.y.zhao@intel.com>
Tested-by: Longfang Liu <liulongfang@huawei.com>
Link: https://lore.kernel.org/r/20240212012227.119381-8-baolu.lu@linux.intel.com
Signed-off-by: Joerg Roedel <jroedel@suse.de>
This commit is contained in:
Lu Baolu 2024-02-12 09:22:18 +08:00 committed by Joerg Roedel
parent 1ff25d798e
commit 3f02a9dc70
6 changed files with 17 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
View File

@ -922,7 +922,7 @@ static int arm_smmu_cmdq_batch_submit(struct arm_smmu_device *smmu,
} }
static int arm_smmu_page_response(struct device *dev, static int arm_smmu_page_response(struct device *dev,
struct iommu_fault_event *unused, struct iopf_fault *unused,
struct iommu_page_response *resp) struct iommu_page_response *resp)
{ {
struct arm_smmu_cmdq_ent cmd = {0}; struct arm_smmu_cmdq_ent cmd = {0};
@ -1465,7 +1465,7 @@ static int arm_smmu_handle_evt(struct arm_smmu_device *smmu, u64 *evt)
struct arm_smmu_master *master; struct arm_smmu_master *master;
bool ssid_valid = evt[0] & EVTQ_0_SSV; bool ssid_valid = evt[0] & EVTQ_0_SSV;
u32 sid = FIELD_GET(EVTQ_0_SID, evt[0]); u32 sid = FIELD_GET(EVTQ_0_SID, evt[0]);
struct iommu_fault_event fault_evt = { }; struct iopf_fault fault_evt = { };
struct iommu_fault *flt = &fault_evt.fault; struct iommu_fault *flt = &fault_evt.fault;
switch (FIELD_GET(EVTQ_0_ID, evt[0])) { switch (FIELD_GET(EVTQ_0_ID, evt[0])) {

2
drivers/iommu/intel/iommu.h
View File

@ -1079,7 +1079,7 @@ struct iommu_domain *intel_nested_domain_alloc(struct iommu_domain *parent,
void intel_svm_check(struct intel_iommu *iommu); void intel_svm_check(struct intel_iommu *iommu);
int intel_svm_enable_prq(struct intel_iommu *iommu); int intel_svm_enable_prq(struct intel_iommu *iommu);
int intel_svm_finish_prq(struct intel_iommu *iommu); int intel_svm_finish_prq(struct intel_iommu *iommu);
int intel_svm_page_response(struct device *dev, struct iommu_fault_event *evt, int intel_svm_page_response(struct device *dev, struct iopf_fault *evt,
struct iommu_page_response *msg); struct iommu_page_response *msg);
struct iommu_domain *intel_svm_domain_alloc(void); struct iommu_domain *intel_svm_domain_alloc(void);
void intel_svm_remove_dev_pasid(struct device *dev, ioasid_t pasid); void intel_svm_remove_dev_pasid(struct device *dev, ioasid_t pasid);

5
drivers/iommu/intel/svm.c
View File

@ -565,13 +565,12 @@ static int prq_to_iommu_prot(struct page_req_dsc *req)
static int intel_svm_prq_report(struct intel_iommu *iommu, struct device *dev, static int intel_svm_prq_report(struct intel_iommu *iommu, struct device *dev,
struct page_req_dsc *desc) struct page_req_dsc *desc)
{ {
struct iommu_fault_event event; struct iopf_fault event = { };
if (!dev || !dev_is_pci(dev)) if (!dev || !dev_is_pci(dev))
return -ENODEV; return -ENODEV;
/* Fill in event data for device specific processing */ /* Fill in event data for device specific processing */
memset(&event, 0, sizeof(struct iommu_fault_event));
event.fault.type = IOMMU_FAULT_PAGE_REQ; event.fault.type = IOMMU_FAULT_PAGE_REQ;
event.fault.prm.addr = (u64)desc->addr << VTD_PAGE_SHIFT; event.fault.prm.addr = (u64)desc->addr << VTD_PAGE_SHIFT;
event.fault.prm.pasid = desc->pasid; event.fault.prm.pasid = desc->pasid;
@ -743,7 +742,7 @@ prq_advance:
} }
int intel_svm_page_response(struct device *dev, int intel_svm_page_response(struct device *dev,
struct iommu_fault_event *evt, struct iopf_fault *evt,
struct iommu_page_response *msg) struct iommu_page_response *msg)
{ {
struct device_domain_info *info = dev_iommu_priv_get(dev); struct device_domain_info *info = dev_iommu_priv_get(dev);

5
drivers/iommu/io-pgfault.c
View File

@ -25,11 +25,6 @@ struct iopf_queue {
struct mutex lock; struct mutex lock;
}; };
struct iopf_fault {
struct iommu_fault fault;
struct list_head list;
};
struct iopf_group { struct iopf_group {
struct iopf_fault last_fault; struct iopf_fault last_fault;
struct list_head faults; struct list_head faults;

8
drivers/iommu/iommu.c
View File

@ -1341,10 +1341,10 @@ EXPORT_SYMBOL_GPL(iommu_group_put);
* *
* Return 0 on success, or an error. * Return 0 on success, or an error.
*/ */
int iommu_report_device_fault(struct device *dev, struct iommu_fault_event *evt) int iommu_report_device_fault(struct device *dev, struct iopf_fault *evt)
{ {
struct dev_iommu *param = dev->iommu; struct dev_iommu *param = dev->iommu;
struct iommu_fault_event *evt_pending = NULL; struct iopf_fault *evt_pending = NULL;
struct iommu_fault_param *fparam; struct iommu_fault_param *fparam;
int ret = 0; int ret = 0;
@ -1357,7 +1357,7 @@ int iommu_report_device_fault(struct device *dev, struct iommu_fault_event *evt)
if (evt->fault.type == IOMMU_FAULT_PAGE_REQ && if (evt->fault.type == IOMMU_FAULT_PAGE_REQ &&
(evt->fault.prm.flags & IOMMU_FAULT_PAGE_REQUEST_LAST_PAGE)) { (evt->fault.prm.flags & IOMMU_FAULT_PAGE_REQUEST_LAST_PAGE)) {
evt_pending = kmemdup(evt, sizeof(struct iommu_fault_event), evt_pending = kmemdup(evt, sizeof(struct iopf_fault),
GFP_KERNEL); GFP_KERNEL);
if (!evt_pending) { if (!evt_pending) {
ret = -ENOMEM; ret = -ENOMEM;
@ -1386,7 +1386,7 @@ int iommu_page_response(struct device *dev,
{ {
bool needs_pasid; bool needs_pasid;
int ret = -EINVAL; int ret = -EINVAL;
struct iommu_fault_event *evt; struct iopf_fault *evt;
struct iommu_fault_page_request *prm; struct iommu_fault_page_request *prm;
struct dev_iommu *param = dev->iommu; struct dev_iommu *param = dev->iommu;
const struct iommu_ops *ops = dev_iommu_ops(dev); const struct iommu_ops *ops = dev_iommu_ops(dev);

27
include/linux/iommu.h
View File

@ -40,7 +40,6 @@ struct iommu_domain_ops;
struct iommu_dirty_ops; struct iommu_dirty_ops;
struct notifier_block; struct notifier_block;
struct iommu_sva; struct iommu_sva;
struct iommu_fault_event;
struct iommu_dma_cookie; struct iommu_dma_cookie;
struct iopf_queue; struct iopf_queue;
@ -121,6 +120,11 @@ struct iommu_page_response {
u32 code; u32 code;
}; };
struct iopf_fault {
struct iommu_fault fault;
/* node for pending lists */
struct list_head list;
};
/* iommu fault flags */ /* iommu fault flags */
#define IOMMU_FAULT_READ 0x0 #define IOMMU_FAULT_READ 0x0
@ -553,7 +557,7 @@ struct iommu_ops {
int (*dev_disable_feat)(struct device *dev, enum iommu_dev_features f); int (*dev_disable_feat)(struct device *dev, enum iommu_dev_features f);
int (*page_response)(struct device *dev, int (*page_response)(struct device *dev,
struct iommu_fault_event *evt, struct iopf_fault *evt,
struct iommu_page_response *msg); struct iommu_page_response *msg);
int (*def_domain_type)(struct device *dev); int (*def_domain_type)(struct device *dev);
@ -654,20 +658,6 @@ struct iommu_device {
u32 max_pasids; u32 max_pasids;
}; };
/**
* struct iommu_fault_event - Generic fault event
*
* Can represent recoverable faults such as a page requests or
* unrecoverable faults such as DMA or IRQ remapping faults.
*
* @fault: fault descriptor
* @list: pending fault event list, used for tracking responses
*/
struct iommu_fault_event {
struct iommu_fault fault;
struct list_head list;
};
/** /**
* struct iommu_fault_param - per-device IOMMU fault data * struct iommu_fault_param - per-device IOMMU fault data
* @lock: protect pending faults list * @lock: protect pending faults list
@ -802,8 +792,7 @@ extern struct iommu_group *iommu_group_get(struct device *dev);
extern struct iommu_group *iommu_group_ref_get(struct iommu_group *group); extern struct iommu_group *iommu_group_ref_get(struct iommu_group *group);
extern void iommu_group_put(struct iommu_group *group); extern void iommu_group_put(struct iommu_group *group);
extern int iommu_report_device_fault(struct device *dev, extern int iommu_report_device_fault(struct device *dev, struct iopf_fault *evt);
struct iommu_fault_event *evt);
extern int iommu_page_response(struct device *dev, extern int iommu_page_response(struct device *dev,
struct iommu_page_response *msg); struct iommu_page_response *msg);
@ -1213,7 +1202,7 @@ static inline void iommu_group_put(struct iommu_group *group)
} }
static inline static inline
int iommu_report_device_fault(struct device *dev, struct iommu_fault_event *evt) int iommu_report_device_fault(struct device *dev, struct iopf_fault *evt)
{ {
return -ENODEV; return -ENODEV;
} }