PCI/ACS: Enforce pci=noats with Transaction Blocking

PCIe Address Translation Services (ATS) provides a mechanism for a device
to provide an on-device caching translation agent (device IOTLB).  We
already have a means to disable support for this feature via the pci=noats
option.  For untrusted and externally facing devices, we not only disable
ATS support for the device, but we use Access Control Services (ACS)
Transaction Blocking to actively prevent devices from sending TLPs with
non-default AT field values.

Extend pci=noats to also make use of PCI_ACS_TB so that not only is ATS
disabled at the device, but blocked at the downstream ports.  This provides
a means to further lock-down ATS for cases such as device assignment, where
it may not be the hardware configuration of the device that makes it
untrusted, but the driver running on the device.

Link: https://lore.kernel.org/r/162404966325.2362347.12176138291577486015.stgit@omen
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Cc: Rajat Jain <rajatja@google.com>

diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index aacf575c15cff1c7e9df338d350a0e3f4d51af84..e0c6ceced2073f04d3eaf0dd625521a388db4494 100644 (file)
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -915,8 +915,8 @@ static void pci_std_enable_acs(struct pci_dev *dev)
        /* Upstream Forwarding */
        ctrl |= (cap & PCI_ACS_UF);
 
-       /* Enable Translation Blocking for external devices */
-       if (dev->external_facing || dev->untrusted)
+       /* Enable Translation Blocking for external devices and noats */
+       if (pci_ats_disabled() || dev->external_facing || dev->untrusted)
                ctrl |= (cap & PCI_ACS_TB);
 
        pci_write_config_word(dev, pos + PCI_ACS_CTRL, ctrl);

diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 92ed566c761cd7eceae60432558aa3c27d9679b4..68e47002b72cee47e489e3c6eda4d91266f51bda 100644 (file)
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -5080,7 +5080,7 @@ static int pci_quirk_enable_intel_spt_pch_acs(struct pci_dev *dev)
        ctrl |= (cap & PCI_ACS_CR);
        ctrl |= (cap & PCI_ACS_UF);
 
-       if (dev->external_facing || dev->untrusted)
+       if (pci_ats_disabled() || dev->external_facing || dev->untrusted)
                ctrl |= (cap & PCI_ACS_TB);
 
        pci_write_config_dword(dev, pos + INTEL_SPT_ACS_CTRL, ctrl);