Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

iommu/s390: Make attach succeed when the device was surprise removed

When a PCI device is removed with surprise hotplug, there may still be
attempts to attach the device to the default domain as part of tear down
via (__iommu_release_dma_ownership()), or because the removal happens
during probe (__iommu_probe_device()). In both cases zpci_register_ioat()
fails with a cc value indicating that the device handle is invalid. This
is because the device is no longer part of the instance as far as the
hypervisor is concerned.

Currently this leads to an error return and s390_iommu_attach_device()
fails. This triggers the WARN_ON() in __iommu_group_set_domain_nofail()
because attaching to the default domain must never fail.

With the device fenced by the hypervisor no DMAs to or from memory are
possible and the IOMMU translations have no effect. Proceed as if the
registration was successful and let the hotplug event handling clean up
the device.

This is similar to how devices in the error state are handled since
commit 59bbf596791b ("iommu/s390: Make attach succeed even if the device
is in error state") except that for removal the domain will not be
registered later. This approach was also previously discussed at the
link.

Handle both cases, error state and removal, in a helper which checks if
the error needs to be propagated or ignored. Avoid magic number
condition codes by using the pre-existing, but never used, defines for
PCI load/store condition codes and rename them to reflect that they
apply to all PCI instructions.

Cc: stable@vger.kernel.org # v6.2
Link: https://lore.kernel.org/linux-iommu/20240808194155.GD1985367@ziepe.ca/
Suggested-by: Jason Gunthorpe <jgg@ziepe.ca>
Signed-off-by: Niklas Schnelle <schnelle@linux.ibm.com>
Reviewed-by: Matthew Rosato <mjrosato@linux.ibm.com>
Reviewed-by: Benjamin Block <bblock@linux.ibm.com>
Link: https://lore.kernel.org/r/20250904-iommu_succeed_attach_removed-v1-1-e7f333d2f80f@linux.ibm.com
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>

authored by

Niklas Schnelle and committed by
Joerg Roedel
9ffaf522 dce043c0

+24 -12
+5 -5
arch/s390/include/asm/pci_insn.h
··· 16 16 #define ZPCI_PCI_ST_FUNC_NOT_AVAIL 40 17 17 #define ZPCI_PCI_ST_ALREADY_IN_RQ_STATE 44 18 18 19 - /* Load/Store return codes */ 20 - #define ZPCI_PCI_LS_OK 0 21 - #define ZPCI_PCI_LS_ERR 1 22 - #define ZPCI_PCI_LS_BUSY 2 23 - #define ZPCI_PCI_LS_INVAL_HANDLE 3 19 + /* PCI instruction condition codes */ 20 + #define ZPCI_CC_OK 0 21 + #define ZPCI_CC_ERR 1 22 + #define ZPCI_CC_BUSY 2 23 + #define ZPCI_CC_INVAL_HANDLE 3 24 24 25 25 /* Load/Store address space identifiers */ 26 26 #define ZPCI_PCIAS_MEMIO_0 0
+19 -7
drivers/iommu/s390-iommu.c
··· 612 612 } 613 613 } 614 614 615 + static bool reg_ioat_propagate_error(int cc, u8 status) 616 + { 617 + /* 618 + * If the device is in the error state the reset routine 619 + * will register the IOAT of the newly set domain on re-enable 620 + */ 621 + if (cc == ZPCI_CC_ERR && status == ZPCI_PCI_ST_FUNC_NOT_AVAIL) 622 + return false; 623 + /* 624 + * If the device was removed treat registration as success 625 + * and let the subsequent error event trigger tear down. 626 + */ 627 + if (cc == ZPCI_CC_INVAL_HANDLE) 628 + return false; 629 + return cc != ZPCI_CC_OK; 630 + } 631 + 615 632 static int s390_iommu_domain_reg_ioat(struct zpci_dev *zdev, 616 633 struct iommu_domain *domain, u8 *status) 617 634 { ··· 713 696 714 697 /* If we fail now DMA remains blocked via blocking domain */ 715 698 cc = s390_iommu_domain_reg_ioat(zdev, domain, &status); 716 - if (cc && status != ZPCI_PCI_ST_FUNC_NOT_AVAIL) 699 + if (reg_ioat_propagate_error(cc, status)) 717 700 return -EIO; 718 701 zdev->dma_table = s390_domain->dma_table; 719 702 zdev_s390_domain_update(zdev, domain); ··· 1141 1124 1142 1125 /* If we fail now DMA remains blocked via blocking domain */ 1143 1126 cc = s390_iommu_domain_reg_ioat(zdev, domain, &status); 1144 - 1145 - /* 1146 - * If the device is undergoing error recovery the reset code 1147 - * will re-establish the new domain. 1148 - */ 1149 - if (cc && status != ZPCI_PCI_ST_FUNC_NOT_AVAIL) 1127 + if (reg_ioat_propagate_error(cc, status)) 1150 1128 return -EIO; 1151 1129 1152 1130 zdev_s390_domain_update(zdev, domain);