Commit 143c7bc6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus-iommufd' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd 

Pull iommufd updates from Jason Gunthorpe:
 "Some polishing and small fixes for iommufd:

   - Remove IOMMU_CAP_INTR_REMAP, instead rely on the interrupt
     subsystem

   - Use GFP_KERNEL_ACCOUNT inside the iommu_domains

   - Support VFIO_NOIOMMU mode with iommufd

   - Various typos

   - A list corruption bug if HWPTs are used for attach"

* tag 'for-linus-iommufd' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd:
  iommufd: Do not add the same hwpt to the ioas->hwpt_list twice
  iommufd: Make sure to zero vfio_iommu_type1_info before copying to user
  vfio: Support VFIO_NOIOMMU with iommufd
  iommufd: Add three missing structures in ucmd_buffer
  selftests: iommu: Fix test_cmd_destroy_access() call in user_copy
  iommu: Remove IOMMU_CAP_INTR_REMAP
  irq/s390: Add arch_is_isolated_msi() for s390
  iommu/x86: Replace IOMMU_CAP_INTR_REMAP with IRQ_DOMAIN_FLAG_ISOLATED_MSI
  genirq/msi: Rename IRQ_DOMAIN_MSI_REMAP to IRQ_DOMAIN_ISOLATED_MSI
  genirq/irqdomain: Remove unused irq_domain_check_msi_remap() code
  iommufd: Convert to msi_device_has_isolated_msi()
  vfio/type1: Convert to iommu_group_has_isolated_msi()
  iommu: Add iommu_group_has_isolated_msi()
  genirq/msi: Add msi_device_has_isolated_msi()
parents a13de74e 939204e4

arch/s390/include/asm/msi.h

0 → 100644
+17 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef _ASM_S390_MSI_H

#define _ASM_S390_MSI_H

#include <asm-generic/msi.h>



/*

 * Work around S390 not using irq_domain at all so we can't set

 * IRQ_DOMAIN_FLAG_ISOLATED_MSI. See for an explanation how it works:

 *

 * https://lore.kernel.org/r/31af8174-35e9-ebeb-b9ef-74c90d4bfd93@linux.ibm.com/

 *

 * Note this is less isolated than the ARM/x86 versions as userspace can trigger

 * MSI belonging to kernel devices within the same gisa.

 */

#define arch_is_isolated_msi() true



#endif

drivers/infiniband/hw/usnic/usnic_uiom.c

+2 −2
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ static int usnic_uiom_map_sorted_intervals(struct list_head *intervals, 
				usnic_dbg("va 0x%lx pa %pa size 0x%zx flags 0x%x",

					va_start, &pa_start, size, flags);

				err = iommu_map(pd->domain, va_start, pa_start,

						size, flags, GFP_KERNEL);

						size, flags, GFP_ATOMIC);

				if (err) {

					usnic_err("Failed to map va 0x%lx pa %pa size 0x%zx with err %d\n",

						va_start, &pa_start, size, err);
@@ -294,7 +294,7 @@ static int usnic_uiom_map_sorted_intervals(struct list_head *intervals, 
				usnic_dbg("va 0x%lx pa %pa size 0x%zx flags 0x%x\n",

					va_start, &pa_start, size, flags);

				err = iommu_map(pd->domain, va_start, pa_start,

						size, flags, GFP_KERNEL);

						size, flags, GFP_ATOMIC);

				if (err) {

					usnic_err("Failed to map va 0x%lx pa %pa size 0x%zx with err %d\n",

						va_start, &pa_start, size, err);

drivers/iommu/amd/iommu.c

+2 −3
Original line number Diff line number Diff line
@@ -2278,8 +2278,6 @@ static bool amd_iommu_capable(struct device *dev, enum iommu_cap cap) 
	switch (cap) {

	case IOMMU_CAP_CACHE_COHERENCY:

		return true;

	case IOMMU_CAP_INTR_REMAP:

		return (irq_remapping_enabled == 1);

	case IOMMU_CAP_NOEXEC:

		return false;

	case IOMMU_CAP_PRE_BOOT_PROTECTION:
@@ -3682,7 +3680,8 @@ int amd_iommu_create_irq_domain(struct amd_iommu *iommu) 
	}



	irq_domain_update_bus_token(iommu->ir_domain,  DOMAIN_BUS_AMDVI);

	iommu->ir_domain->flags |= IRQ_DOMAIN_FLAG_MSI_PARENT;

	iommu->ir_domain->flags |= IRQ_DOMAIN_FLAG_MSI_PARENT |

				   IRQ_DOMAIN_FLAG_ISOLATED_MSI;



	if (amd_iommu_np_cache)

		iommu->ir_domain->msi_parent_ops = &virt_amdvi_msi_parent_ops;

drivers/iommu/intel/iommu.c

+0 −2
Original line number Diff line number Diff line
@@ -4478,8 +4478,6 @@ static bool intel_iommu_capable(struct device *dev, enum iommu_cap cap) 
	switch (cap) {

	case IOMMU_CAP_CACHE_COHERENCY:

		return true;

	case IOMMU_CAP_INTR_REMAP:

		return irq_remapping_enabled == 1;

	case IOMMU_CAP_PRE_BOOT_PROTECTION:

		return dmar_platform_optin();

	case IOMMU_CAP_ENFORCE_CACHE_COHERENCY:

drivers/iommu/intel/irq_remapping.c

+2 −1
Original line number Diff line number Diff line
@@ -573,7 +573,8 @@ static int intel_setup_irq_remapping(struct intel_iommu *iommu) 
	}



	irq_domain_update_bus_token(iommu->ir_domain,  DOMAIN_BUS_DMAR);

	iommu->ir_domain->flags |= IRQ_DOMAIN_FLAG_MSI_PARENT;

	iommu->ir_domain->flags |= IRQ_DOMAIN_FLAG_MSI_PARENT |

				   IRQ_DOMAIN_FLAG_ISOLATED_MSI;



	if (cap_caching_mode(iommu->cap))

		iommu->ir_domain->msi_parent_ops = &virt_dmar_msi_parent_ops;