Commit c2e8dc12 authored by Sairaj Kodilkar's avatar Sairaj Kodilkar Committed by Joerg Roedel
Browse files

amd/iommu: Preserve domain ids inside the kdump kernel 



Currently AMD IOMMU driver does not reserve domain ids programmed in the
DTE while reusing the device table inside kdump kernel. This can cause
reallocation of these domain ids for newer domains that are created by
the kdump kernel, which can lead to potential IO_PAGE_FAULTs

Hence reserve these ids inside pdom_ids.

Fixes: 38e5f33e ("iommu/amd: Reuse device table for kdump")
Signed-off-by: default avatarSairaj Kodilkar <sarunkod@amd.com>
Reported-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Reviewed-by: default avatarVasant Hegde <vasant.hegde@amd.com>
Reviewed-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Signed-off-by: default avatarJoerg Roedel <joerg.roedel@amd.com>
parent 7a089c5d

drivers/iommu/amd/init.c

+22 −1
Original line number Diff line number Diff line
@@ -1136,9 +1136,13 @@ static void set_dte_bit(struct dev_table_entry *dte, u8 bit) 
static bool __reuse_device_table(struct amd_iommu *iommu)

{

	struct amd_iommu_pci_seg *pci_seg = iommu->pci_seg;

	u32 lo, hi, old_devtb_size;

	struct dev_table_entry *old_dev_tbl_entry;

	u32 lo, hi, old_devtb_size, devid;

	phys_addr_t old_devtb_phys;

	u16 dom_id;

	bool dte_v;

	u64 entry;

	int ret;



	/* Each IOMMU use separate device table with the same size */

	lo = readl(iommu->mmio_base + MMIO_DEV_TABLE_OFFSET);
@@ -1173,6 +1177,23 @@ static bool __reuse_device_table(struct amd_iommu *iommu) 
		return false;

	}



	for (devid = 0; devid <= pci_seg->last_bdf; devid++) {

		old_dev_tbl_entry = &pci_seg->old_dev_tbl_cpy[devid];

		dte_v = FIELD_GET(DTE_FLAG_V, old_dev_tbl_entry->data[0]);

		dom_id = FIELD_GET(DEV_DOMID_MASK, old_dev_tbl_entry->data[1]);



		if (!dte_v || !dom_id)

			continue;

		/*

		 * ID reservation can fail with -ENOSPC when there

		 * are multiple devices present in the same domain,

		 * hence check only for -ENOMEM.

		 */

		ret = ida_alloc_range(&pdom_ids, dom_id, dom_id, GFP_KERNEL);

		if (ret == -ENOMEM)

			return false;

	}



	return true;

}