Commit 6381b442 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'iommu-fixes-v5.5-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu 

Pull iommu fixes from Joerg Roedel:
 "Two fixes:

   - Fix NULL-ptr dereference bug in Intel IOMMU driver

   - Properly save and restore AMD IOMMU performance counter registers
     when testing if they are writable"

* tag 'iommu-fixes-v5.5-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
  iommu/amd: Fix IOMMU perf counter clobbering during init
  iommu/vt-d: Call __dmar_remove_one_dev_info with valid pointer
parents 3c45d751 8c17bbf6

drivers/iommu/amd_iommu_init.c

+18 −6
Original line number Diff line number Diff line
@@ -1655,27 +1655,39 @@ static int iommu_pc_get_set_reg(struct amd_iommu *iommu, u8 bank, u8 cntr, 
static void init_iommu_perf_ctr(struct amd_iommu *iommu)

{

	struct pci_dev *pdev = iommu->dev;

	u64 val = 0xabcd, val2 = 0;

	u64 val = 0xabcd, val2 = 0, save_reg = 0;



	if (!iommu_feature(iommu, FEATURE_PC))

		return;



	amd_iommu_pc_present = true;



	/* save the value to restore, if writable */

	if (iommu_pc_get_set_reg(iommu, 0, 0, 0, &save_reg, false))

		goto pc_false;



	/* Check if the performance counters can be written to */

	if ((iommu_pc_get_set_reg(iommu, 0, 0, 0, &val, true)) ||

	    (iommu_pc_get_set_reg(iommu, 0, 0, 0, &val2, false)) ||

	    (val != val2)) {

		pci_err(pdev, "Unable to write to IOMMU perf counter.\n");

		amd_iommu_pc_present = false;

		return;

	}

	    (val != val2))

		goto pc_false;



	/* restore */

	if (iommu_pc_get_set_reg(iommu, 0, 0, 0, &save_reg, true))

		goto pc_false;



	pci_info(pdev, "IOMMU performance counters supported\n");



	val = readl(iommu->mmio_base + MMIO_CNTR_CONF_OFFSET);

	iommu->max_banks = (u8) ((val >> 12) & 0x3f);

	iommu->max_counters = (u8) ((val >> 7) & 0xf);



	return;



pc_false:

	pci_err(pdev, "Unable to read/write to IOMMU perf counter.\n");

	amd_iommu_pc_present = false;

	return;

}



static ssize_t amd_iommu_show_cap(struct device *dev,

drivers/iommu/intel-iommu.c

+2 −1
Original line number Diff line number Diff line
@@ -5163,7 +5163,8 @@ static void dmar_remove_one_dev_info(struct device *dev) 


	spin_lock_irqsave(&device_domain_lock, flags);

	info = dev->archdata.iommu;

	if (info)

	if (info && info != DEFER_DEVICE_DOMAIN_INFO

	    && info != DUMMY_DEVICE_DOMAIN_INFO)

		__dmar_remove_one_dev_info(info);

	spin_unlock_irqrestore(&device_domain_lock, flags);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE