Commit 3f02a9dc authored by Lu Baolu's avatar Lu Baolu Committed by Joerg Roedel
Browse files

iommu: Merge iommu_fault_event and iopf_fault 



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: default avatarLu Baolu <baolu.lu@linux.intel.com>
Reviewed-by: default avatarKevin Tian <kevin.tian@intel.com>
Reviewed-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Reviewed-by: default avatarYi Liu <yi.l.liu@intel.com>
Tested-by: default avatarYan Zhao <yan.y.zhao@intel.com>
Tested-by: default avatarLongfang Liu <liulongfang@huawei.com>
Link: https://lore.kernel.org/r/20240212012227.119381-8-baolu.lu@linux.intel.com


Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent 1ff25d79

drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c

+2 −2
Original line number Diff line number Diff line
@@ -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,

				  struct iommu_fault_event *unused,

				  struct iopf_fault *unused,

				  struct iommu_page_response *resp)

{

	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;

	bool ssid_valid = evt[0] & EVTQ_0_SSV;

	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;



	switch (FIELD_GET(EVTQ_0_ID, evt[0])) {

drivers/iommu/intel/iommu.h

+1 −1
Original line number Diff line number Diff line
@@ -1079,7 +1079,7 @@ struct iommu_domain *intel_nested_domain_alloc(struct iommu_domain *parent, 
void intel_svm_check(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_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_domain *intel_svm_domain_alloc(void);

void intel_svm_remove_dev_pasid(struct device *dev, ioasid_t pasid);

drivers/iommu/intel/svm.c

+2 −3
Original line number Diff line number Diff line
@@ -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,

				struct page_req_dsc *desc)

{

	struct iommu_fault_event event;

	struct iopf_fault event = { };



	if (!dev || !dev_is_pci(dev))

		return -ENODEV;



	/* 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.prm.addr = (u64)desc->addr << VTD_PAGE_SHIFT;

	event.fault.prm.pasid = desc->pasid;
@@ -743,7 +742,7 @@ static irqreturn_t prq_event_thread(int irq, void *d) 
}



int intel_svm_page_response(struct device *dev,

			    struct iommu_fault_event *evt,

			    struct iopf_fault *evt,

			    struct iommu_page_response *msg)

{

	struct device_domain_info *info = dev_iommu_priv_get(dev);

drivers/iommu/io-pgfault.c

+0 −5
Original line number Diff line number Diff line
@@ -25,11 +25,6 @@ struct iopf_queue { 
	struct mutex			lock;

};



struct iopf_fault {

	struct iommu_fault		fault;

	struct list_head		list;

};



struct iopf_group {

	struct iopf_fault		last_fault;

	struct list_head		faults;

drivers/iommu/iommu.c

+4 −4
Original line number Diff line number Diff line
@@ -1341,10 +1341,10 @@ EXPORT_SYMBOL_GPL(iommu_group_put); 
 *

 * 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 iommu_fault_event *evt_pending = NULL;

	struct iopf_fault *evt_pending = NULL;

	struct iommu_fault_param *fparam;

	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 &&

	    (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);

		if (!evt_pending) {

			ret = -ENOMEM;
@@ -1386,7 +1386,7 @@ int iommu_page_response(struct device *dev, 
{

	bool needs_pasid;

	int ret = -EINVAL;

	struct iommu_fault_event *evt;

	struct iopf_fault *evt;

	struct iommu_fault_page_request *prm;

	struct dev_iommu *param = dev->iommu;

	const struct iommu_ops *ops = dev_iommu_ops(dev);