iommu/vt-d: Report the right page fault address
authorLu Baolu <baolu.lu@linux.intel.com>
Sat, 20 Mar 2021 02:54:11 +0000 (10:54 +0800)
committerJoerg Roedel <jroedel@suse.de>
Wed, 7 Apr 2021 09:55:46 +0000 (11:55 +0200)
The Address field of the Page Request Descriptor only keeps bit [63:12]
of the offending address. Convert it to a full address before reporting
it to device drivers.

Fixes: eb8d93ea3c1d3 ("iommu/vt-d: Report page request faults for guest SVA")
Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
Link: https://lore.kernel.org/r/20210320025415.641201-2-baolu.lu@linux.intel.com
Signed-off-by: Joerg Roedel <jroedel@suse.de>
drivers/iommu/intel/svm.c

index f77184a9defb3cc093d9e4895b063f482ffac84a..5165cea904211a8af9768be34750f9a49d55bca4 100644 (file)
@@ -852,7 +852,7 @@ intel_svm_prq_report(struct device *dev, struct page_req_dsc *desc)
        /* 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 = desc->addr;
+       event.fault.prm.addr = (u64)desc->addr << VTD_PAGE_SHIFT;
        event.fault.prm.pasid = desc->pasid;
        event.fault.prm.grpid = desc->prg_index;
        event.fault.prm.perm = prq_to_iommu_prot(desc);