PCI: Move pci_enable_acs() and its dependencies up in pci.c
Subsystems (5)
PATCH v4 1/4 PCI: Move pci_enable_acs() and its dependencies up in pci.c
Move pci_enable_acs() and the functions it depends on, further up in the source code to avoid having to forward declare it when we make it static in near future (next patch).
No functional changes intended.
---
v4: Same as v3
v3: Initial version of the patch, created per Bjorn's suggestion
drivers/pci/pci.c | 254 +++++++++++++++++++++++----------------------- 1 file changed, 127 insertions(+), 127 deletions(-)
drivers/pci/pci.c +127 -127
@@ -777,6 +777,133 @@ int pci_wait_for_pending(struct pci_dev *dev, int pos, u16 mask)return 0 ; } +static int pci_acs_enable; + +/** +* pci_request_acs - ask for ACS to be enabled if supported +*/ +void pci_request_acs (void ) +{ + pci_acs_enable =1 ; +} + +static const char *disable_acs_redir_param; + +/** +* pci_disable_acs_redir - disable ACS redirect capabilities +* @dev: the PCI device +* +* For only devices specified in the disable_acs_redir parameter. +*/ +static void pci_disable_acs_redir (struct pci_dev *dev) +{ +int ret =0 ; +const char *p; +int pos; +u16 ctrl; + +if (!disable_acs_redir_param) +return ; + + p = disable_acs_redir_param; +while (*p) { + ret =pci_dev_str_match (dev, p, &p); +if (ret <0 ) { +pr_info_once ("PCI: Can't parse disable_acs_redir parameter: %s\n" , + disable_acs_redir_param); + +break ; + }else if (ret ==1 ) { +/* Found a match */ +break ; + } + +if (*p !=';' && *p !=',' ) { +/* End of param or invalid format */ +break ; + } + p++; + } + +if (ret !=1 ) +return ; + +if (!pci_dev_specific_disable_acs_redir (dev)) +return ; + + pos =pci_find_ext_capability (dev,PCI_EXT_CAP_ID_ACS ); +if (!pos) { +pci_warn (dev,"cannot disable ACS redirect for this hardware as it does not have ACS capabilities\n" ); +return ; + } + +pci_read_config_word (dev, pos +PCI_ACS_CTRL , &ctrl); + +/* P2P Request & Completion Redirect */ + ctrl &= ~(PCI_ACS_RR |PCI_ACS_CR |PCI_ACS_EC ); + +pci_write_config_word (dev, pos +PCI_ACS_CTRL , ctrl); + +pci_info (dev,"disabled ACS redirect\n" ); +} + +/** +* pci_std_enable_acs - enable ACS on devices using standard ACS capabilities +* @dev: the PCI device +*/ +static void pci_std_enable_acs (struct pci_dev *dev) +{ +int pos; +u16 cap; +u16 ctrl; + + pos =pci_find_ext_capability (dev,PCI_EXT_CAP_ID_ACS ); +if (!pos) +return ; + +pci_read_config_word (dev, pos +PCI_ACS_CAP , &cap); +pci_read_config_word (dev, pos +PCI_ACS_CTRL , &ctrl); + +/* Source Validation */ + ctrl |= (cap &PCI_ACS_SV ); + +/* P2P Request Redirect */ + ctrl |= (cap &PCI_ACS_RR ); + +/* P2P Completion Redirect */ + ctrl |= (cap &PCI_ACS_CR ); + +/* Upstream Forwarding */ + ctrl |= (cap &PCI_ACS_UF ); + +pci_write_config_word (dev, pos +PCI_ACS_CTRL , ctrl); +} + +/** +* pci_enable_acs - enable ACS if hardware support it +* @dev: the PCI device +*/ +void pci_enable_acs (struct pci_dev *dev) +{ +if (!pci_acs_enable) + goto disable_acs_redir; + +if (!pci_dev_specific_enable_acs (dev)) + goto disable_acs_redir; + +pci_std_enable_acs (dev); + +disable_acs_redir: +/* +* Note: pci_disable_acs_redir() must be called even if ACS was not +* enabled by the kernel because it may have been enabled by +* platform firmware. So if we are told to disable it, we should +* always disable it after setting the kernel's default +* preferences. +*/ +pci_disable_acs_redir (dev); +} +/** * pci_restore_bars - restore a device's BAR values (e.g. after wake-up) * @dev: PCI device to have its BARs restored
@@ -3230,133 +3357,6 @@ void pci_configure_ari(struct pci_dev *dev) } } -static int pci_acs_enable; - -/** -* pci_request_acs - ask for ACS to be enabled if supported -*/ -void pci_request_acs (void ) -{ - pci_acs_enable =1 ; -} - -static const char *disable_acs_redir_param; - -/** -* pci_disable_acs_redir - disable ACS redirect capabilities -* @dev: the PCI device -* -* For only devices specified in the disable_acs_redir parameter. -*/ -static void pci_disable_acs_redir (struct pci_dev *dev) -{ -int ret =0 ; -const char *p; -int pos; -u16 ctrl; - -if (!disable_acs_redir_param) -return ; - - p = disable_acs_redir_param; -while (*p) { - ret =pci_dev_str_match (dev, p, &p); -if (ret <0 ) { -pr_info_once ("PCI: Can't parse disable_acs_redir parameter: %s\n" , - disable_acs_redir_param); - -break ; - }else if (ret ==1 ) { -/* Found a match */ -break ; - } - -if (*p !=';' && *p !=',' ) { -/* End of param or invalid format */ -break ; - } - p++; - } - -if (ret !=1 ) -return ; - -if (!pci_dev_specific_disable_acs_redir (dev)) -return ; - - pos =pci_find_ext_capability (dev,PCI_EXT_CAP_ID_ACS ); -if (!pos) { -pci_warn (dev,"cannot disable ACS redirect for this hardware as it does not have ACS capabilities\n" ); -return ; - } - -pci_read_config_word (dev, pos +PCI_ACS_CTRL , &ctrl); - -/* P2P Request & Completion Redirect */ - ctrl &= ~(PCI_ACS_RR |PCI_ACS_CR |PCI_ACS_EC ); - -pci_write_config_word (dev, pos +PCI_ACS_CTRL , ctrl); - -pci_info (dev,"disabled ACS redirect\n" ); -} - -/** -* pci_std_enable_acs - enable ACS on devices using standard ACS capabilities -* @dev: the PCI device -*/ -static void pci_std_enable_acs (struct pci_dev *dev) -{ -int pos; -u16 cap; -u16 ctrl; - - pos =pci_find_ext_capability (dev,PCI_EXT_CAP_ID_ACS ); -if (!pos) -return ; - -pci_read_config_word (dev, pos +PCI_ACS_CAP , &cap); -pci_read_config_word (dev, pos +PCI_ACS_CTRL , &ctrl); - -/* Source Validation */ - ctrl |= (cap &PCI_ACS_SV ); - -/* P2P Request Redirect */ - ctrl |= (cap &PCI_ACS_RR ); - -/* P2P Completion Redirect */ - ctrl |= (cap &PCI_ACS_CR ); - -/* Upstream Forwarding */ - ctrl |= (cap &PCI_ACS_UF ); - -pci_write_config_word (dev, pos +PCI_ACS_CTRL , ctrl); -} - -/** -* pci_enable_acs - enable ACS if hardware support it -* @dev: the PCI device -*/ -void pci_enable_acs (struct pci_dev *dev) -{ -if (!pci_acs_enable) - goto disable_acs_redir; - -if (!pci_dev_specific_enable_acs (dev)) - goto disable_acs_redir; - -pci_std_enable_acs (dev); - -disable_acs_redir: -/* -* Note: pci_disable_acs_redir() must be called even if ACS was not -* enabled by the kernel because it may have been enabled by -* platform firmware. So if we are told to disable it, we should -* always disable it after setting the kernel's default -* preferences. -*/ -pci_disable_acs_redir (dev); -} -static bool pci_acs_flags_enabled (struct pci_dev *pdev,u16 acs_flags) {int pos;
Signature · 1 line
2.27.0.212.ge8ba1cc988-goog
PATCH v4 2/4 PCI: Keep the ACS capability offset in device
Currently ACS capabiity is being looked up at a number of places. Read and store it once at bootup so that it can be used by all later.
---
v4: No change
v3: fix commit log, remove forward declation of static function
v2: Commit log cosmetic changes
drivers/pci/p2pdma.c | 2 +- drivers/pci/pci.c | 20 ++++++++++++++++---- drivers/pci/pci.h | 2 +- drivers/pci/probe.c | 2 +- drivers/pci/quirks.c | 8 ++++---- include/linux/pci.h | 1 + 6 files changed, 24 insertions(+), 11 deletions(-)
drivers/pci/p2pdma.c +1 -1
@@ -253,7 +253,7 @@ static int pci_bridge_has_acs_redir(struct pci_dev *pdev)int pos;u16 ctrl; - pos =pci_find_ext_capability (pdev,PCI_EXT_CAP_ID_ACS ); + pos = pdev->acs_cap;if (!pos)return 0 ;
drivers/pci/pci.c +16 -4
@@ -831,7 +831,7 @@ static void pci_disable_acs_redir(struct pci_dev *dev)if (!pci_dev_specific_disable_acs_redir (dev))return ; - pos =pci_find_ext_capability (dev,PCI_EXT_CAP_ID_ACS ); + pos = dev->acs_cap;if (!pos) {pci_warn (dev,"cannot disable ACS redirect for this hardware as it does not have ACS capabilities\n" );return ;
@@ -857,7 +857,7 @@ static void pci_std_enable_acs(struct pci_dev *dev)u16 cap;u16 ctrl; - pos =pci_find_ext_capability (dev,PCI_EXT_CAP_ID_ACS ); + pos = dev->acs_cap;if (!pos)return ;
@@ -883,7 +883,7 @@ static void pci_std_enable_acs(struct pci_dev *dev)* pci_enable_acs - enable ACS if hardware support it * @dev: the PCI device */ -void pci_enable_acs (struct pci_dev *dev) +static void pci_enable_acs (struct pci_dev *dev) {if (!pci_acs_enable) goto disable_acs_redir;
@@ -3362,7 +3362,7 @@ static bool pci_acs_flags_enabled(struct pci_dev *pdev, u16 acs_flags)int pos;u16 cap, ctrl; - pos =pci_find_ext_capability (pdev,PCI_EXT_CAP_ID_ACS ); + pos = pdev->acs_cap;if (!pos)return false;
@@ -3487,6 +3487,18 @@ bool pci_acs_path_enabled(struct pci_dev *start,return true; } +/** +* pci_acs_init - Initialize ACS if hardware supports it +* @dev: the PCI device +*/ +void pci_acs_init (struct pci_dev *dev) +{ + dev->acs_cap =pci_find_ext_capability (dev,PCI_EXT_CAP_ID_ACS ); + +if (dev->acs_cap) +pci_enable_acs (dev); +} +/** * pci_rebar_find_pos - find position of resize ctrl reg for BAR * @pdev: PCI device
drivers/pci/pci.h +1 -1
@@ -532,7 +532,7 @@ static inline resource_size_t pci_resource_alignment(struct pci_dev *dev,return resource_alignment (res); } -void pci_enable_acs (struct pci_dev *dev); +void pci_acs_init (struct pci_dev *dev);#ifdef CONFIG_PCI_QUIRKS int pci_dev_specific_acs_enabled (struct pci_dev *dev,u16 acs_flags);int pci_dev_specific_enable_acs (struct pci_dev *dev);
drivers/pci/probe.c +1 -1
@@ -2390,7 +2390,7 @@ static void pci_init_capabilities(struct pci_dev *dev)pci_ats_init (dev);/* Address Translation Services */ pci_pri_init (dev);/* Page Request Interface */ pci_pasid_init (dev);/* Process Address Space ID */ -pci_enable_acs (dev);/* Enable ACS P2P upstream forwarding */ +pci_acs_init (dev);/* Access Control Services */ pci_ptm_init (dev);/* Precision Time Measurement */ pci_aer_init (dev);/* Advanced Error Reporting */ pci_dpc_init (dev);/* Downstream Port Containment */
drivers/pci/quirks.c +4 -4
@@ -4653,7 +4653,7 @@ static int pci_quirk_intel_spt_pch_acs(struct pci_dev *dev, u16 acs_flags)if (!pci_quirk_intel_spt_pch_acs_match (dev))return -ENOTTY ; - pos =pci_find_ext_capability (dev,PCI_EXT_CAP_ID_ACS ); + pos = dev->acs_cap;if (!pos)return -ENOTTY ;
@@ -4961,7 +4961,7 @@ static int pci_quirk_enable_intel_spt_pch_acs(struct pci_dev *dev)if (!pci_quirk_intel_spt_pch_acs_match (dev))return -ENOTTY ; - pos =pci_find_ext_capability (dev,PCI_EXT_CAP_ID_ACS ); + pos = dev->acs_cap;if (!pos)return -ENOTTY ;
@@ -4988,7 +4988,7 @@ static int pci_quirk_disable_intel_spt_pch_acs_redir(struct pci_dev *dev)if (!pci_quirk_intel_spt_pch_acs_match (dev))return -ENOTTY ; - pos =pci_find_ext_capability (dev,PCI_EXT_CAP_ID_ACS ); + pos = dev->acs_cap;if (!pos)return -ENOTTY ;
@@ -5355,7 +5355,7 @@ int pci_idt_bus_quirk(struct pci_bus *bus, int devfn, u32 *l, int timeout)bool found;struct pci_dev *bridge = bus->self; - pos =pci_find_ext_capability (bridge,PCI_EXT_CAP_ID_ACS ); + pos = bridge->acs_cap;/* Disable ACS SV before initial config reads */ if (pos) {
include/linux/pci.h +1 -0
@@ -486,6 +486,7 @@ struct pci_dev {#ifdef CONFIG_PCI_P2PDMA struct pci_p2pdma *p2pdma;#endif +u16 acs_cap;/* ACS Capability offset */ phys_addr_t rom;/* Physical address if not from BAR */ size_t romlen;/* Length if not from BAR */ char *driver_override;/* Driver name to force a match */
Signature · 1 line
2.27.0.212.ge8ba1cc988-goog
PATCH v4 3/4 PCI: Treat "external-facing" devices as internal
In reply to Rajat JainThe "ExternalFacingPort" devices (root ports) are internal devices that sit on the internal system fabric. Ref:
https://docs.microsoft.com/en-us/windows-hardware/drivers/pci/dsd-for-pcie-root-ports
Currently they were treated (marked as untrusted) at par with other external devices downstream those external facing rootports.
Use the platform flag to identify the external facing devices and then treat them at par with internal devices (don't mark them untrusted). Any devices downstream continue to be marked as "untrusted". This was discussed here:
https://lore.kernel.org/linux-pci/20200610230906.GA1528594@bjorn-Precision-5520/
---
v4: No change
v3: * fix commit log and minor code comment
* Don't check for "ExternalFacingPort" on PCI_EXP_TYPE_DOWNSTREAM
* Check only for pdev->external_facing in iommu.c
v2: cosmetic changes in commit log
drivers/iommu/intel/iommu.c | 6 +++--- drivers/pci/of.c | 2 +- drivers/pci/pci-acpi.c | 10 +++++----- drivers/pci/probe.c | 2 +- include/linux/pci.h | 8 ++++++++ 5 files changed, 18 insertions(+), 10 deletions(-)
drivers/iommu/intel/iommu.c +3 -3
@@ -4738,12 +4738,12 @@ const struct attribute_group *intel_iommu_groups[] = { NULL, }; -static inline bool has_untrusted_dev (void ) +static inline bool has_external_pci (void ) {struct pci_dev *pdev =NULL ;for_each_pci_dev (pdev) -if (pdev->untrusted) +if (pdev->external_facing)return true;return false;
@@ -4751,7 +4751,7 @@ static inline bool has_untrusted_dev(void)static int __init platform_optin_force_iommu (void ) { -if (!dmar_platform_optin () || no_platform_optin || !has_untrusted_dev ()) +if (!dmar_platform_optin () || no_platform_optin || !has_external_pci ())return 0 ;if (no_iommu || dmar_disabled)
drivers/pci/of.c +1 -1
@@ -42,7 +42,7 @@ void pci_set_bus_of_node(struct pci_bus *bus) }else { node =of_node_get (bus->self->dev.of_node);if (node &&of_property_read_bool (node,"external-facing" )) - bus->self->untrusted = true; + bus->self->external_facing = true; } bus->dev.of_node = node;
drivers/pci/pci-acpi.c +5 -5
@@ -1213,7 +1213,7 @@ static void pci_acpi_optimize_delay(struct pci_dev *pdev,ACPI_FREE (obj); } -static void pci_acpi_set_untrusted (struct pci_dev *dev) +static void pci_acpi_set_external_facing (struct pci_dev *dev) {u8 val;
@@ -1223,12 +1223,12 @@ static void pci_acpi_set_untrusted(struct pci_dev *dev)return ;/* -* These root ports expose PCIe (including DMA) outside of the -* system so make sure we treat them and everything behind as +* These root/down ports expose PCIe (including DMA) outside of the +* system so make sure we treat everything behind them as * untrusted. */ if (val) - dev->untrusted =1 ; + dev->external_facing =1 ; }static void pci_acpi_setup (struct device *dev)
@@ -1240,7 +1240,7 @@ static void pci_acpi_setup(struct device *dev)return ;pci_acpi_optimize_delay (pci_dev, adev->handle); -pci_acpi_set_untrusted (pci_dev); +pci_acpi_set_external_facing (pci_dev);pci_acpi_add_edr_notifier (pci_dev);pci_acpi_add_pm_notifier (adev, pci_dev);
drivers/pci/probe.c +1 -1
@@ -1552,7 +1552,7 @@ static void set_pcie_untrusted(struct pci_dev *dev)* untrusted as well. */ parent =pci_upstream_bridge (dev); -if (parent && parent->untrusted) +if (parent && (parent->untrusted || parent->external_facing)) dev->untrusted = true; }
include/linux/pci.h +8 -0
@@ -432,6 +432,14 @@ struct pci_dev {* mappings to make sure they cannot access arbitrary memory. */ unsigned int untrusted:1; +/* +* Devices are marked as external-facing using info from platform +* (ACPI / devicetree). An external-facing device is still an internal +* trusted device, but it faces external untrusted devices. Thus any +* device enumerated downstream an external-facing device, is marked +* as untrusted. +*/ + unsigned int external_facing:1; unsigned int broken_intx_masking:1; /* INTx masking can't be used */ unsigned int io_window_1k:1; /* Intel bridge 1K I/O windows */ unsigned int irq_managed:1;
Signature · 6 lines
2.27.0.212.ge8ba1cc988-goog _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v4 4/4 PCI/ACS: Enable PCI_ACS_TB for untrusted/external-facing devices
In reply to Rajat JainWhen enabling ACS, enable translation blocking for external facing ports and untrusted devices.
---
v4: Add braces to avoid warning from kernel robot
print warning for only external-facing devices.
v3: print warning if ACS_TB not supported on external-facing/untrusted ports.
Minor code comments fixes.
v2: Commit log change
drivers/pci/pci.c | 8 ++++++++ drivers/pci/quirks.c | 15 +++++++++++++++ 2 files changed, 23 insertions(+)
drivers/pci/pci.c +8 -0
@@ -876,6 +876,14 @@ 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) { +if (cap &PCI_ACS_TB ) + ctrl |=PCI_ACS_TB ; +else if (dev->external_facing) +pci_warn (dev,"ACS: No Translation Blocking on external-facing dev\n" ); + } +pci_write_config_word (dev, pos +PCI_ACS_CTRL , ctrl); }
drivers/pci/quirks.c +15 -0
@@ -4934,6 +4934,13 @@ static void pci_quirk_enable_intel_rp_mpc_acs(struct pci_dev *dev) } } +/* +* Currently this quirk does the equivalent of +* PCI_ACS_SV | PCI_ACS_RR | PCI_ACS_CR | PCI_ACS_UF +* +* TODO: This quirk also needs to do equivalent of PCI_ACS_TB, +* if dev->external_facing || dev->untrusted +*/ static int pci_quirk_enable_intel_pch_acs (struct pci_dev *dev) {if (!pci_quirk_intel_pch_acs_match (dev))
@@ -4973,6 +4980,14 @@ static int pci_quirk_enable_intel_spt_pch_acs(struct pci_dev *dev) ctrl |= (cap &PCI_ACS_CR ); ctrl |= (cap &PCI_ACS_UF ); +/* Enable Translation Blocking for external devices */ +if (dev->external_facing || dev->untrusted) { +if (cap &PCI_ACS_TB ) + ctrl |=PCI_ACS_TB ; +else if (dev->external_facing) +pci_warn (dev,"ACS: No Translation Blocking on external-facing dev\n" ); + } +pci_write_config_dword (dev, pos +INTEL_SPT_ACS_CTRL , ctrl);pci_info (dev,"Intel SPT PCH root port ACS workaround enabled\n" );
Signature · 6 lines
2.27.0.212.ge8ba1cc988-goog _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH v4 4/4] PCI/ACS: Enable PCI_ACS_TB for untrusted/external-facing devices
Quoted 20 lines · Rajat Jain
When enabling ACS, enable translation blocking for external facing ports and untrusted devices.
Signed-off-by Rajat Jain <[email protected]>---
v4: Add braces to avoid warning from kernel robot
print warning for only external-facing devices.
v3: print warning ifACS_TBnot supported on external-facing/untrusted ports.
Minor code comments fixes.
v2: Commit log changedrivers/pci/pci.c | 8 ++++++++ drivers/pci/quirks.c | 15 +++++++++++++++ 2 files changed, 23 insertions(+)drivers/pci/pci.c +0
-0
drivers/pci/pci.c static void pci_std_enable_acs(struct pci_dev *dev) · line 885
Quoted 10 lines
drivers/pci/pci.c +7
-0@@ -876,6 +876,14 @@ 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) { +if (cap &PCI_ACS_TB ) + ctrl |=PCI_ACS_TB ; +else if (dev->external_facing) +pci_warn (dev,"ACS: No Translation Blocking on external-facing dev\n" ); + }
IIUC, this means that external devices can *never* use ATS and can never cache translations. And (I guess, I'm not an expert) it can also never use the Page Request Services?
Is this what we want? Do we have any idea how many external devices this will affect or how much of a performance impact they will see?
Do we need some kind of override or mechanism to authenticate certain devices so they can use ATS and PRI?
If we do decide this is the right thing to do, I think we need to expand the commit log a bit, because this is potentially a significant user-visible change.
Quoted 39 lines
drivers/pci/pci.c +0
-0pci_write_config_word (dev, pos +PCI_ACS_CTRL , ctrl); }drivers/pci/quirks.c +15
-0@@ -4934,6 +4934,13 @@ static void pci_quirk_enable_intel_rp_mpc_acs(struct pci_dev *dev) } } +/* +* Currently this quirk does the equivalent of +* PCI_ACS_SV | PCI_ACS_RR | PCI_ACS_CR | PCI_ACS_UF +* +* TODO: This quirk also needs to do equivalent of PCI_ACS_TB, +* if dev->external_facing || dev->untrusted +*/ static int pci_quirk_enable_intel_pch_acs (struct pci_dev *dev) {if (!pci_quirk_intel_pch_acs_match (dev))@@ -4973,6 +4980,14 @@ static int pci_quirk_enable_intel_spt_pch_acs(struct pci_dev *dev) ctrl |= (cap &PCI_ACS_CR ); ctrl |= (cap &PCI_ACS_UF ); +/* Enable Translation Blocking for external devices */ +if (dev->external_facing || dev->untrusted) { +if (cap &PCI_ACS_TB ) + ctrl |=PCI_ACS_TB ; +else if (dev->external_facing) +pci_warn (dev,"ACS: No Translation Blocking on external-facing dev\n" ); + } +pci_write_config_dword (dev, pos +INTEL_SPT_ACS_CTRL , ctrl);pci_info (dev,"Intel SPT PCH root port ACS workaround enabled\n" );Signature · 1 line
2.27.0.212.ge8ba1cc988-goog
Re: [PATCH v4 4/4] PCI/ACS: Enable PCI_ACS_TB for untrusted/external-facing devices
Hi Bjorn
Quoted 24 lines · Bjorn Helgaas
Quoted 23 lines · Rajat Jain
When enabling ACS, enable translation blocking for external facing ports and untrusted devices.
Signed-off-by Rajat Jain <[email protected]>---
v4: Add braces to avoid warning from kernel robot
print warning for only external-facing devices.
v3: print warning ifACS_TBnot supported on external-facing/untrusted ports.
Minor code comments fixes.
v2: Commit log changedrivers/pci/pci.c | 8 ++++++++ drivers/pci/quirks.c | 15 +++++++++++++++ 2 files changed, 23 insertions(+)drivers/pci/pci.c +0
-0@@ -876,6 +876,14 @@ static void pci_std_enable_acs(struct pci_dev *dev)/* Upstream Forwarding */ ctrl |= (cap &PCI_ACS_UF );
Quoted 11 lines
drivers/pci/pci.c static void pci_std_enable_acs(struct pci_dev *dev) · line 885
Quoted 7 lines
drivers/pci/pci.c +7
-0+/* Enable Translation Blocking for external devices */ +if (dev->external_facing || dev->untrusted) { +if (cap &PCI_ACS_TB ) + ctrl |=PCI_ACS_TB ; +else if (dev->external_facing) +pci_warn (dev,"ACS: No Translation Blocking on external-facing dev\n" ); + }IIUC, this means that external devices can *never* use ATS and can never cache translations. And (I guess, I'm not an expert) it can also never use the Page Request Services?
Yep, sounds like it.
Quoted 6 lines
Is this what we want? Do we have any idea how many external devices this will affect or how much of a performance impact they will see?
Do we need some kind of override or mechanism to authenticate certain devices so they can use ATS and PRI?
Sounds like we would need some form of an allow-list to start with so we can have something in the interim.
I suppose a future platform might have a facilty to ensure ATS is secure and authenticated we could enable for all of devices in the system, in addition to PCI CMA/IDE.
I think having a global override to enable all devices so platform can switch to current behavior, or maybe via a cmdline switch.. as much as we have a billion of those, it still gives an option in case someone needs it.
Quoted 44 lines
If we do decide this is the right thing to do, I think we need to expand the commit log a bit, because this is potentially a significant user-visible change.
Quoted 39 lines
drivers/pci/pci.c +0
-0pci_write_config_word (dev, pos +PCI_ACS_CTRL , ctrl); }drivers/pci/quirks.c +15
-0@@ -4934,6 +4934,13 @@ static void pci_quirk_enable_intel_rp_mpc_acs(struct pci_dev *dev) } } +/* +* Currently this quirk does the equivalent of +* PCI_ACS_SV | PCI_ACS_RR | PCI_ACS_CR | PCI_ACS_UF +* +* TODO: This quirk also needs to do equivalent of PCI_ACS_TB, +* if dev->external_facing || dev->untrusted +*/ static int pci_quirk_enable_intel_pch_acs (struct pci_dev *dev) {if (!pci_quirk_intel_pch_acs_match (dev))@@ -4973,6 +4980,14 @@ static int pci_quirk_enable_intel_spt_pch_acs(struct pci_dev *dev) ctrl |= (cap &PCI_ACS_CR ); ctrl |= (cap &PCI_ACS_UF ); +/* Enable Translation Blocking for external devices */ +if (dev->external_facing || dev->untrusted) { +if (cap &PCI_ACS_TB ) + ctrl |=PCI_ACS_TB ; +else if (dev->external_facing) +pci_warn (dev,"ACS: No Translation Blocking on external-facing dev\n" ); + } +pci_write_config_dword (dev, pos +INTEL_SPT_ACS_CTRL , ctrl);pci_info (dev,"Intel SPT PCH root port ACS workaround enabled\n" );Signature · 1 line
2.27.0.212.ge8ba1cc988-goog
Re: [PATCH v4 4/4] PCI/ACS: Enable PCI_ACS_TB for untrusted/external-facing devices
Hello,
Quoted 38 lines · Ashok
Hi Bjorn
Quoted 24 lines · Bjorn Helgaas
Quoted 23 lines · Rajat Jain
When enabling ACS, enable translation blocking for external facing ports and untrusted devices.
Signed-off-by Rajat Jain <[email protected]>---
v4: Add braces to avoid warning from kernel robot
print warning for only external-facing devices.
v3: print warning ifACS_TBnot supported on external-facing/untrusted ports.
Minor code comments fixes.
v2: Commit log changedrivers/pci/pci.c | 8 ++++++++ drivers/pci/quirks.c | 15 +++++++++++++++ 2 files changed, 23 insertions(+)drivers/pci/pci.c +0
-0@@ -876,6 +876,14 @@ static void pci_std_enable_acs(struct pci_dev *dev)/* Upstream Forwarding */ ctrl |= (cap &PCI_ACS_UF );Quoted 9 lines
drivers/pci/pci.c static void pci_std_enable_acs(struct pci_dev *dev) · line 885
Quoted 7 lines
drivers/pci/pci.c +7
-0+/* Enable Translation Blocking for external devices */ +if (dev->external_facing || dev->untrusted) { +if (cap &PCI_ACS_TB ) + ctrl |=PCI_ACS_TB ; +else if (dev->external_facing) +pci_warn (dev,"ACS: No Translation Blocking on external-facing dev\n" ); + }IIUC, this means that external devices can *never* use ATS
Quoted 2 lines
and can
Quoted 1 line
never cache translations.
Yes, but it already exists today (and this patch doesn't change that):521376741b2c2 "PCI/ATS: Only enable ATS for trusted devices"
IMHO any external device trying to send ATS traffic despite having ATS disabled should count as a bad intent. And this patch is trying to plug that loophole, by blocking the AT traffic from devices that we do not expect to see AT from anyway.
Do you see any case where this is not true?
Quoted 4 lines
And (I guess, I'm not an expert) it can
Quoted 1 line
also never use the Page Request Services?
Yep, sounds like it.
Yes, from spec "Address Translation Services" Rev 1.1:
"...a device that supports ATS need not support PRI, but PRI is dependent on ATS’s capabilities."
(So no ATS = No PRI).
Quoted 10 lines
Quoted 7 lines
Is this what we want? Do we have any idea how many external devices this will affect or how much of a performance impact they will see?
Do we need some kind of override or mechanism to authenticate certain devices so they can use ATS and PRI?
Sounds like we would need some form of an allow-list to start with so we can have something in the interim.
I assume what is being referred to, is an escape hatch to enable ATS on certain given "external-facing" ports (and devices downstream on that port). Do we really think a *per-port* control for ATS may be needed? I can add if there is consensus about this.
Quoted 8 lines
I suppose a future platform might have a facilty to ensure ATS is secure and authenticated we could enable for all of devices in the system, in addition to PCI CMA/IDE.
I think having a global override to enable all devices so platform can switch to current behavior, or maybe via a cmdline switch.. as much as we have a billion of those, it still gives an option in case someone needs it.
Currently:
pci.noats => No ATS on all PCI devices.
(Absense of pci.noats): ATS on all PCI devices, EXCEPT external devices.
I can look to add another parameter that is synonymous to "trust-external-pci-devices" that can keep ATS enabled on external ports as well. I think this is better than an allow-list of only certain ports, because most likely an admin will trust all its external ports, or not. Also, we can add this global override and may be add a more granular control later, if and when really needed.
Thanks,
Rajat
Quoted 47 lines
Quoted 47 lines
If we do decide this is the right thing to do, I think we need to expand the commit log a bit, because this is potentially a significant user-visible change.
Quoted 39 lines
drivers/pci/pci.c +0
-0pci_write_config_word (dev, pos +PCI_ACS_CTRL , ctrl); }drivers/pci/quirks.c +15
-1@@ -4934,6 +4934,13 @@ static void pci_quirk_enable_intel_rp_mpc_acs(struct pci_dev *dev) } } +/* +* Currently this quirk does the equivalent of +* PCI_ACS_SV | PCI_ACS_RR | PCI_ACS_CR | PCI_ACS_UF +* +* TODO: This quirk also needs to do equivalent of PCI_ACS_TB, +* if dev->external_facing || dev->untrusted +*/ static int pci_quirk_enable_intel_pch_acs (struct pci_dev *dev) {if (!pci_quirk_intel_pch_acs_match (dev))@@ -4973,6 +4980,14 @@ static int pci_quirk_enable_intel_spt_pch_acs(struct pci_dev *dev) ctrl |= (cap &PCI_ACS_CR ); ctrl |= (cap &PCI_ACS_UF ); +/* Enable Translation Blocking for external devices */ +if (dev->external_facing || dev->untrusted) { +if (cap &PCI_ACS_TB ) + ctrl |=PCI_ACS_TB ; +else if (dev->external_facing) +pci_warn (dev,"ACS: No Translation Blocking on external-facing dev\n" ); + } +pci_write_config_dword (dev, pos +INTEL_SPT_ACS_CTRL , ctrl);pci_info (dev,"Intel SPT PCH root port ACS workaround enabled\n" ); --2.27.0.212.ge8ba1cc988-goog
Re: [PATCH v4 4/4] PCI/ACS: Enable PCI_ACS_TB for untrusted/external-facing devices
Quoted 35 lines · Rajat Jain
Quoted 34 lines · Ashok
Quoted 33 lines · Bjorn Helgaas
Quoted 20 lines · Rajat Jain
When enabling ACS, enable translation blocking for external facing ports and untrusted devices.
Signed-off-by Rajat Jain <[email protected]>---
v4: Add braces to avoid warning from kernel robot
print warning for only external-facing devices.
v3: print warning ifACS_TBnot supported on external-facing/untrusted ports.
Minor code comments fixes.
v2: Commit log changedrivers/pci/pci.c | 8 ++++++++ drivers/pci/quirks.c | 15 +++++++++++++++ 2 files changed, 23 insertions(+)drivers/pci/pci.c +0
-0drivers/pci/pci.c static void pci_std_enable_acs(struct pci_dev *dev) · line 885
Quoted 10 lines
drivers/pci/pci.c +7
-0@@ -876,6 +876,14 @@ 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) { +if (cap &PCI_ACS_TB ) + ctrl |=PCI_ACS_TB ; +else if (dev->external_facing) +pci_warn (dev,"ACS: No Translation Blocking on external-facing dev\n" ); + }IIUC, this means that external devices can *never* use ATS
Quoted 5 lines
Quoted 2 lines
and can
Quoted 1 line
never cache translations.
Yes, but it already exists today (and this patch doesn't change that):
521376741b2c2"PCI/ATS: Only enable ATS for trusted devices"
If you get in the habit of using the commit reference style from Documentation/process/submitting-patches.rst it saves me the trouble of fixing them. I use this:
gsr is aliased to `git --no-pager show -s --abbrev-commit --abbrev=12 --pretty=format:"%h (\"%s\")%n"'
Quoted 4 lines
IMHO any external device trying to send ATS traffic despite having ATS disabled should count as a bad intent. And this patch is trying to plug that loophole, by blocking the AT traffic from devices that we do not expect to see AT from anyway.
That's exactly the sort of assertion I was looking for. If we can get something like this explanation into the commit log, and if Ashok and Alex are OK with this, we'll be much closer.
It sounds like this is just enforcing a restriction we already have, i.e., enabling PCI_ACS_TB blocks translated requests from devices that aren't supposed to be generating them.
Quoted 36 lines
Do you see any case where this is not true?
Quoted 4 lines
And (I guess, I'm not an expert) it can
Quoted 1 line
also never use the Page Request Services?
Yep, sounds like it.
Yes, from spec "Address Translation Services" Rev 1.1:
"...a device that supports ATS need not support PRI, but PRI is dependent on ATS’s capabilities."
(So no ATS = No PRI).Quoted 9 lines
Quoted 6 lines
Is this what we want? Do we have any idea how many external devices this will affect or how much of a performance impact they will see?
Do we need some kind of override or mechanism to authenticate certain devices so they can use ATS and PRI?
Sounds like we would need some form of an allow-list to start with so we can have something in the interim.
I assume what is being referred to, is an escape hatch to enable ATS on certain given "external-facing" ports (and devices downstream on that port). Do we really think a *per-port* control for ATS may be needed? I can add if there is consensus about this.
Quoted 8 lines
I suppose a future platform might have a facilty to ensure ATS is secure and authenticated we could enable for all of devices in the system, in addition to PCI CMA/IDE.
I think having a global override to enable all devices so platform can switch to current behavior, or maybe via a cmdline switch.. as much as we have a billion of those, it still gives an option in case someone needs it.
Quoted 4 lines
Currently:
pci.noats => No ATS on all PCI devices.
(Absense of pci.noats): ATS on all PCI devices, EXCEPT external devices.
You mean the "pci=noats" kernel command line parameter, right?
Quoted 6 lines
I can look to add another parameter that is synonymous to "trust-external-pci-devices" that can keep ATS enabled on external ports as well. I think this is better than an allow-list of only certain ports, because most likely an admin will trust all its external ports, or not. Also, we can add this global override and may be add a more granular control later, if and when really needed.
I think this would be new functionality that we don't have today, and we don't have anything that actually *needs* it AFAIK, so I wouldn't bother.
Bjorn
Re: [PATCH v4 4/4] PCI/ACS: Enable PCI_ACS_TB for untrusted/external-facing devices
In reply to Rajat JainQuoted 37 lines · Rajat Jain
Quoted 25 lines · Ashok
Quoted 24 lines · Bjorn Helgaas
Quoted 23 lines · Rajat Jain
When enabling ACS, enable translation blocking for external facing ports and untrusted devices.
Signed-off-by Rajat Jain <[email protected]>---
v4: Add braces to avoid warning from kernel robot
print warning for only external-facing devices.
v3: print warning ifACS_TBnot supported on external-facing/untrusted ports.
Minor code comments fixes.
v2: Commit log changedrivers/pci/pci.c | 8 ++++++++ drivers/pci/quirks.c | 15 +++++++++++++++ 2 files changed, 23 insertions(+)drivers/pci/pci.c +0
-0@@ -876,6 +876,14 @@ static void pci_std_enable_acs(struct pci_dev *dev)/* Upstream Forwarding */ ctrl |= (cap &PCI_ACS_UF );Quoted 10 lines
Quoted 10 lines
drivers/pci/pci.c static void pci_std_enable_acs(struct pci_dev *dev) · line 885
Quoted 7 lines
drivers/pci/pci.c +7
-0+/* Enable Translation Blocking for external devices */ +if (dev->external_facing || dev->untrusted) { +if (cap &PCI_ACS_TB ) + ctrl |=PCI_ACS_TB ; +else if (dev->external_facing) +pci_warn (dev,"ACS: No Translation Blocking on external-facing dev\n" ); + }IIUC, this means that external devices can *never* use ATS and can never cache translations.
Quoted 7 lines
Yes, but it already exists today (and this patch doesn't change that):
521376741b2c2"PCI/ATS: Only enable ATS for trusted devices"IMHO any external device trying to send ATS traffic despite having ATS disabled should count as a bad intent. And this patch is trying to plug that loophole, by blocking the AT traffic from devices that we do not expect to see AT from anyway.
Thinking about this some more, I wonder if Linux should:
- Explicitly disable ATS for every device at enumeration-time, e.g., in pci_init_capabilities(),
- Enable PCI_ACS_TB for every device (not just external-facing or untrusted ones),
- Disable PCI_ACS_TB for the relevant devices along the path only when enabling ATS.
One nice thing about doing that is that the "untrusted" test would be only in pci_enable_ats(), and we wouldn't need one in pci_std_enable_acs().
It's possible BIOS gives us devices with ATS enabled, and this might break them, but that seems like something we'd want to find out about.
Bjorn
Re: [PATCH v4 4/4] PCI/ACS: Enable PCI_ACS_TB for untrusted/external-facing devices
Quoted 55 lines · Bjorn Helgaas
Quoted 37 lines · Rajat Jain
Quoted 25 lines · Ashok
Quoted 24 lines · Bjorn Helgaas
Quoted 23 lines · Rajat Jain
When enabling ACS, enable translation blocking for external facing ports and untrusted devices.
Signed-off-by Rajat Jain <[email protected]>---
v4: Add braces to avoid warning from kernel robot
print warning for only external-facing devices.
v3: print warning ifACS_TBnot supported on external-facing/untrusted ports.
Minor code comments fixes.
v2: Commit log changedrivers/pci/pci.c | 8 ++++++++ drivers/pci/quirks.c | 15 +++++++++++++++ 2 files changed, 23 insertions(+)drivers/pci/pci.c +0
-0@@ -876,6 +876,14 @@ static void pci_std_enable_acs(struct pci_dev *dev)/* Upstream Forwarding */ ctrl |= (cap &PCI_ACS_UF );Quoted 10 lines
Quoted 10 lines
drivers/pci/pci.c static void pci_std_enable_acs(struct pci_dev *dev) · line 885
Quoted 7 lines
drivers/pci/pci.c +7
-0+/* Enable Translation Blocking for external devices */ +if (dev->external_facing || dev->untrusted) { +if (cap &PCI_ACS_TB ) + ctrl |=PCI_ACS_TB ; +else if (dev->external_facing) +pci_warn (dev,"ACS: No Translation Blocking on external-facing dev\n" ); + }IIUC, this means that external devices can *never* use ATS and can never cache translations.
Quoted 7 lines
Yes, but it already exists today (and this patch doesn't change that):
521376741b2c2"PCI/ATS: Only enable ATS for trusted devices"IMHO any external device trying to send ATS traffic despite having ATS disabled should count as a bad intent. And this patch is trying to plug that loophole, by blocking the AT traffic from devices that we do not expect to see AT from anyway.
Thinking about this some more, I wonder if Linux should:
- Explicitly disable ATS for every device at enumeration-time, e.g., in
pci_init_capabilities(),- Enable
PCI_ACS_TBfor every device (not just external-facing or untrusted ones),
Quoted 6 lines
- Disable
PCI_ACS_TBfor the relevant devices along the path only when enabling ATS.One nice thing about doing that is that the "untrusted" test would be only in
pci_enable_ats(), and we wouldn't need one inpci_std_enable_acs().
Yes, this could work.
I think I had thought about this but I'm blanking out on why I had given it up. I think it was because of the possibility that some bridges may have "Translation blocking" disabled, even if not all their descendents were trusted enough to enable ATS on them. But now thinking about this again, as long as we retain the policy of not enabling ATS on external devices (and thus enable TB for sure on them), this should not be a problem. WDYT?
Quoted 4 lines
It's possible BIOS gives us devices with ATS enabled, and this might break them, but that seems like something we'd want to find out about.
Why would they break? We'd disable ATS on each device as we enumerate them, so they'd be functional, just with ATS disabled until it is enabled again on internal devices as needed. Which would be WAI behavior?
Thanks,
,
Rajat
Quoted 1 line
Bjorn
Re: [PATCH v4 4/4] PCI/ACS: Enable PCI_ACS_TB for untrusted/external-facing devices
Quoted 64 lines · Rajat Jain
Quoted 54 lines · Bjorn Helgaas
Quoted 37 lines · Rajat Jain
Quoted 25 lines · Ashok
Quoted 24 lines · Bjorn Helgaas
Quoted 23 lines · Rajat Jain
When enabling ACS, enable translation blocking for external facing ports and untrusted devices.
Signed-off-by Rajat Jain <[email protected]>---
v4: Add braces to avoid warning from kernel robot
print warning for only external-facing devices.
v3: print warning ifACS_TBnot supported on external-facing/untrusted ports.
Minor code comments fixes.
v2: Commit log changedrivers/pci/pci.c | 8 ++++++++ drivers/pci/quirks.c | 15 +++++++++++++++ 2 files changed, 23 insertions(+)drivers/pci/pci.c +0
-0@@ -876,6 +876,14 @@ static void pci_std_enable_acs(struct pci_dev *dev)/* Upstream Forwarding */ ctrl |= (cap &PCI_ACS_UF );Quoted 10 lines
Quoted 10 lines
drivers/pci/pci.c static void pci_std_enable_acs(struct pci_dev *dev) · line 885
Quoted 7 lines
drivers/pci/pci.c +7
-0+/* Enable Translation Blocking for external devices */ +if (dev->external_facing || dev->untrusted) { +if (cap &PCI_ACS_TB ) + ctrl |=PCI_ACS_TB ; +else if (dev->external_facing) +pci_warn (dev,"ACS: No Translation Blocking on external-facing dev\n" ); + }IIUC, this means that external devices can *never* use ATS and can never cache translations.
Quoted 7 lines
Yes, but it already exists today (and this patch doesn't change that):
521376741b2c2"PCI/ATS: Only enable ATS for trusted devices"IMHO any external device trying to send ATS traffic despite having ATS disabled should count as a bad intent. And this patch is trying to plug that loophole, by blocking the AT traffic from devices that we do not expect to see AT from anyway.
Thinking about this some more, I wonder if Linux should:
- Explicitly disable ATS for every device at enumeration-time, e.g., in
pci_init_capabilities(),- Enable
PCI_ACS_TBfor every device (not just external-facing or untrusted ones),Quoted 6 lines
- Disable
PCI_ACS_TBfor the relevant devices along the path only when enabling ATS.One nice thing about doing that is that the "untrusted" test would be only in
pci_enable_ats(), and we wouldn't need one inpci_std_enable_acs().Yes, this could work.
Quoted 7 lines
I think I had thought about this but I'm blanking out on why I had given it up. I think it was because of the possibility that some bridges may have "Translation blocking" disabled, even if not all their descendents were trusted enough to enable ATS on them. But now thinking about this again, as long as we retain the policy of not enabling ATS on external devices (and thus enable TB for sure on them), this should not be a problem. WDYT?
I think I would feel better if we always enabled Translation Blocking except when we actually need it for ATS. But I'm not confident about how all the pieces of ATS work, so I could be missing something.
Quoted 8 lines
Quoted 3 lines
It's possible BIOS gives us devices with ATS enabled, and this might break them, but that seems like something we'd want to find out about.
Why would they break? We'd disable ATS on each device as we enumerate them, so they'd be functional, just with ATS disabled until it is enabled again on internal devices as needed. Which would be WAI behavior?
If BIOS handed off with ATS enabled and we somehow relied on it being already enabled, something might break if we start disabling ATS. Just a theoretical possibility, doesn't seem likely to me.
Bjorn
Joerg Roedel
maintainerRe: [PATCH v4 4/4] PCI/ACS: Enable PCI_ACS_TB for untrusted/external-facing devices
Quoted 3 lines · Bjorn Helgaas
If BIOS handed off with ATS enabled and we somehow relied on it being already enabled, something might break if we start disabling ATS. Just a theoretical possibility, doesn't seem likely to me.
I don't think this will be a problem. When the BIOS enables ATS for a device it also needs to enable the IOMMU already, an we are not handling an already enabled IOMMU (outside of kdump kernels) very well.
Regards,
Joerg
Re: [PATCH v4 4/4] PCI/ACS: Enable PCI_ACS_TB for untrusted/external-facing devices
In reply to Bjorn HelgaasQuoted 55 lines · Bjorn Helgaas
Quoted 37 lines · Rajat Jain
Quoted 25 lines · Ashok
Quoted 24 lines · Bjorn Helgaas
Quoted 23 lines · Rajat Jain
When enabling ACS, enable translation blocking for external facing ports and untrusted devices.
Signed-off-by Rajat Jain <[email protected]>---
v4: Add braces to avoid warning from kernel robot
print warning for only external-facing devices.
v3: print warning ifACS_TBnot supported on external-facing/untrusted ports.
Minor code comments fixes.
v2: Commit log changedrivers/pci/pci.c | 8 ++++++++ drivers/pci/quirks.c | 15 +++++++++++++++ 2 files changed, 23 insertions(+)drivers/pci/pci.c +0
-0@@ -876,6 +876,14 @@ static void pci_std_enable_acs(struct pci_dev *dev)/* Upstream Forwarding */ ctrl |= (cap &PCI_ACS_UF );Quoted 10 lines
Quoted 10 lines
drivers/pci/pci.c static void pci_std_enable_acs(struct pci_dev *dev) · line 885
Quoted 7 lines
drivers/pci/pci.c +7
-0+/* Enable Translation Blocking for external devices */ +if (dev->external_facing || dev->untrusted) { +if (cap &PCI_ACS_TB ) + ctrl |=PCI_ACS_TB ; +else if (dev->external_facing) +pci_warn (dev,"ACS: No Translation Blocking on external-facing dev\n" ); + }IIUC, this means that external devices can *never* use ATS and can never cache translations.
Quoted 7 lines
Yes, but it already exists today (and this patch doesn't change that):
521376741b2c2"PCI/ATS: Only enable ATS for trusted devices"IMHO any external device trying to send ATS traffic despite having ATS disabled should count as a bad intent. And this patch is trying to plug that loophole, by blocking the AT traffic from devices that we do not expect to see AT from anyway.
Thinking about this some more, I wonder if Linux should:
- Explicitly disable ATS for every device at enumeration-time, e.g., in
pci_init_capabilities(),- Enable
PCI_ACS_TBfor every device (not just external-facing or untrusted ones),
Quoted 6 lines
- Disable
PCI_ACS_TBfor the relevant devices along the path only when enabling ATS.One nice thing about doing that is that the "untrusted" test would be only in
pci_enable_ats(), and we wouldn't need one inpci_std_enable_acs().
Sent out v5 with this approach here:
https://patchwork.kernel.org/patch/11663515/
Thanks,
Rajat
Quoted 6 lines
It's possible BIOS gives us devices with ATS enabled, and this might break them, but that seems like something we'd want to find out about.
Bjorn
Re: [PATCH v4 4/4] PCI/ACS: Enable PCI_ACS_TB for untrusted/external-facing devices
Hello Bjorn,
Quoted 60 lines · Rajat Jain
Quoted 58 lines · Bjorn Helgaas
Quoted 37 lines · Rajat Jain
Quoted 25 lines · Ashok
Quoted 24 lines · Bjorn Helgaas
Quoted 23 lines · Rajat Jain
When enabling ACS, enable translation blocking for external facing ports and untrusted devices.
Signed-off-by Rajat Jain <[email protected]>---
v4: Add braces to avoid warning from kernel robot
print warning for only external-facing devices.
v3: print warning ifACS_TBnot supported on external-facing/untrusted ports.
Minor code comments fixes.
v2: Commit log changedrivers/pci/pci.c | 8 ++++++++ drivers/pci/quirks.c | 15 +++++++++++++++ 2 files changed, 23 insertions(+)drivers/pci/pci.c +0
-0@@ -876,6 +876,14 @@ static void pci_std_enable_acs(struct pci_dev *dev)/* Upstream Forwarding */ ctrl |= (cap &PCI_ACS_UF );Quoted 10 lines
Quoted 10 lines
drivers/pci/pci.c static void pci_std_enable_acs(struct pci_dev *dev) · line 885
Quoted 7 lines
drivers/pci/pci.c +7
-0+/* Enable Translation Blocking for external devices */ +if (dev->external_facing || dev->untrusted) { +if (cap &PCI_ACS_TB ) + ctrl |=PCI_ACS_TB ; +else if (dev->external_facing) +pci_warn (dev,"ACS: No Translation Blocking on external-facing dev\n" ); + }IIUC, this means that external devices can *never* use ATS and can never cache translations.
Quoted 7 lines
Yes, but it already exists today (and this patch doesn't change that):
521376741b2c2"PCI/ATS: Only enable ATS for trusted devices"IMHO any external device trying to send ATS traffic despite having ATS disabled should count as a bad intent. And this patch is trying to plug that loophole, by blocking the AT traffic from devices that we do not expect to see AT from anyway.
Thinking about this some more, I wonder if Linux should:
- Explicitly disable ATS for every device at enumeration-time, e.g., in
pci_init_capabilities(),- Enable
PCI_ACS_TBfor every device (not just external-facing or untrusted ones),- Disable
PCI_ACS_TBfor the relevant devices along the path only when enabling ATS.
Quoted 6 lines
Quoted 3 lines
One nice thing about doing that is that the "untrusted" test would be only in
pci_enable_ats(), and we wouldn't need one inpci_std_enable_acs().Sent out v5 with this approach here:
https://patchwork.kernel.org/patch/11663515/
Any feedback on the patch above? It has been waiting for feedback....
Thanks & Best Regards,,
Rajat
Quoted 11 lines
Thanks,
Rajat
Quoted 6 lines
It's possible BIOS gives us devices with ATS enabled, and this might break them, but that seems like something we'd want to find out about.
Bjorn
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH v4 4/4] PCI/ACS: Enable PCI_ACS_TB for untrusted/external-facing devices
In reply to Rajat JainQuoted 4 lines · Rajat Jain
When enabling ACS, enable translation blocking for external facing ports and untrusted devices.
Signed-off-by Rajat Jain <[email protected]>
Applied (slightly modified) to pci/acs for v5.10, thanks!
I think the warning is superfluous because every external_facing device is a Root Port or Switch Downstream Port, and if those support ACS at all, they are required to support Translation Blocking. So we should only see the warning if the device is defective, and I don't think we need to go out of our way to look for those.
Quoted 66 lines
---
v4: Add braces to avoid warning from kernel robot
print warning for only external-facing devices.
v3: print warning ifACS_TBnot supported on external-facing/untrusted ports.
Minor code comments fixes.
v2: Commit log changedrivers/pci/pci.c | 8 ++++++++ drivers/pci/quirks.c | 15 +++++++++++++++ 2 files changed, 23 insertions(+)drivers/pci/pci.c +8
-0@@ -876,6 +876,14 @@ 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) { +if (cap &PCI_ACS_TB ) + ctrl |=PCI_ACS_TB ; +else if (dev->external_facing) +pci_warn (dev,"ACS: No Translation Blocking on external-facing dev\n" ); + } +pci_write_config_word (dev, pos +PCI_ACS_CTRL , ctrl); }drivers/pci/quirks.c +15
-0@@ -4934,6 +4934,13 @@ static void pci_quirk_enable_intel_rp_mpc_acs(struct pci_dev *dev) } } +/* +* Currently this quirk does the equivalent of +* PCI_ACS_SV | PCI_ACS_RR | PCI_ACS_CR | PCI_ACS_UF +* +* TODO: This quirk also needs to do equivalent of PCI_ACS_TB, +* if dev->external_facing || dev->untrusted +*/ static int pci_quirk_enable_intel_pch_acs (struct pci_dev *dev) {if (!pci_quirk_intel_pch_acs_match (dev))@@ -4973,6 +4980,14 @@ static int pci_quirk_enable_intel_spt_pch_acs(struct pci_dev *dev) ctrl |= (cap &PCI_ACS_CR ); ctrl |= (cap &PCI_ACS_UF ); +/* Enable Translation Blocking for external devices */ +if (dev->external_facing || dev->untrusted) { +if (cap &PCI_ACS_TB ) + ctrl |=PCI_ACS_TB ; +else if (dev->external_facing) +pci_warn (dev,"ACS: No Translation Blocking on external-facing dev\n" ); + } +pci_write_config_dword (dev, pos +INTEL_SPT_ACS_CTRL , ctrl);pci_info (dev,"Intel SPT PCH root port ACS workaround enabled\n" );Signature · 1 line
2.27.0.212.ge8ba1cc988-goog
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Bjorn Helgaas
AppliedQuoted 7 lines · Rajat Jain
Move
pci_enable_acs()and the functions it depends on, further up in the source code to avoid having to forward declare it when we make it static in near future (next patch).No functional changes intended.
Signed-off-by Rajat Jain <[email protected]>
Applied patches 1-3 to pci/enumeration for v5.9, thanks!
I held off on patch 4 (enabling PCI_ACS_TB) until we have a little more conversation on the impact of it.
Quoted 282 lines
---
v4: Same as v3
v3: Initial version of the patch, created per Bjorn's suggestiondrivers/pci/pci.c | 254 +++++++++++++++++++++++----------------------- 1 file changed, 127 insertions(+), 127 deletions(-)drivers/pci/pci.c +127
-127@@ -777,6 +777,133 @@ int pci_wait_for_pending(struct pci_dev *dev, int pos, u16 mask)return 0 ; } +static int pci_acs_enable; + +/** +* pci_request_acs - ask for ACS to be enabled if supported +*/ +void pci_request_acs (void ) +{ + pci_acs_enable =1 ; +} + +static const char *disable_acs_redir_param; + +/** +* pci_disable_acs_redir - disable ACS redirect capabilities +* @dev: the PCI device +* +* For only devices specified in the disable_acs_redir parameter. +*/ +static void pci_disable_acs_redir (struct pci_dev *dev) +{ +int ret =0 ; +const char *p; +int pos; +u16 ctrl; + +if (!disable_acs_redir_param) +return ; + + p = disable_acs_redir_param; +while (*p) { + ret =pci_dev_str_match (dev, p, &p); +if (ret <0 ) { +pr_info_once ("PCI: Can't parse disable_acs_redir parameter: %s\n" , + disable_acs_redir_param); + +break ; + }else if (ret ==1 ) { +/* Found a match */ +break ; + } + +if (*p !=';' && *p !=',' ) { +/* End of param or invalid format */ +break ; + } + p++; + } + +if (ret !=1 ) +return ; + +if (!pci_dev_specific_disable_acs_redir (dev)) +return ; + + pos =pci_find_ext_capability (dev,PCI_EXT_CAP_ID_ACS ); +if (!pos) { +pci_warn (dev,"cannot disable ACS redirect for this hardware as it does not have ACS capabilities\n" ); +return ; + } + +pci_read_config_word (dev, pos +PCI_ACS_CTRL , &ctrl); + +/* P2P Request & Completion Redirect */ + ctrl &= ~(PCI_ACS_RR |PCI_ACS_CR |PCI_ACS_EC ); + +pci_write_config_word (dev, pos +PCI_ACS_CTRL , ctrl); + +pci_info (dev,"disabled ACS redirect\n" ); +} + +/** +* pci_std_enable_acs - enable ACS on devices using standard ACS capabilities +* @dev: the PCI device +*/ +static void pci_std_enable_acs (struct pci_dev *dev) +{ +int pos; +u16 cap; +u16 ctrl; + + pos =pci_find_ext_capability (dev,PCI_EXT_CAP_ID_ACS ); +if (!pos) +return ; + +pci_read_config_word (dev, pos +PCI_ACS_CAP , &cap); +pci_read_config_word (dev, pos +PCI_ACS_CTRL , &ctrl); + +/* Source Validation */ + ctrl |= (cap &PCI_ACS_SV ); + +/* P2P Request Redirect */ + ctrl |= (cap &PCI_ACS_RR ); + +/* P2P Completion Redirect */ + ctrl |= (cap &PCI_ACS_CR ); + +/* Upstream Forwarding */ + ctrl |= (cap &PCI_ACS_UF ); + +pci_write_config_word (dev, pos +PCI_ACS_CTRL , ctrl); +} + +/** +* pci_enable_acs - enable ACS if hardware support it +* @dev: the PCI device +*/ +void pci_enable_acs (struct pci_dev *dev) +{ +if (!pci_acs_enable) + goto disable_acs_redir; + +if (!pci_dev_specific_enable_acs (dev)) + goto disable_acs_redir; + +pci_std_enable_acs (dev); + +disable_acs_redir: +/* +* Note: pci_disable_acs_redir() must be called even if ACS was not +* enabled by the kernel because it may have been enabled by +* platform firmware. So if we are told to disable it, we should +* always disable it after setting the kernel's default +* preferences. +*/ +pci_disable_acs_redir (dev); +} +/** * pci_restore_bars - restore a device's BAR values (e.g. after wake-up) * @dev: PCI device to have its BARs restored @@ -3230,133 +3357,6 @@ void pci_configure_ari(struct pci_dev *dev) } } -static int pci_acs_enable; - -/** -* pci_request_acs - ask for ACS to be enabled if supported -*/ -void pci_request_acs (void ) -{ - pci_acs_enable =1 ; -} - -static const char *disable_acs_redir_param; - -/** -* pci_disable_acs_redir - disable ACS redirect capabilities -* @dev: the PCI device -* -* For only devices specified in the disable_acs_redir parameter. -*/ -static void pci_disable_acs_redir (struct pci_dev *dev) -{ -int ret =0 ; -const char *p; -int pos; -u16 ctrl; - -if (!disable_acs_redir_param) -return ; - - p = disable_acs_redir_param; -while (*p) { - ret =pci_dev_str_match (dev, p, &p); -if (ret <0 ) { -pr_info_once ("PCI: Can't parse disable_acs_redir parameter: %s\n" , - disable_acs_redir_param); - -break ; - }else if (ret ==1 ) { -/* Found a match */ -break ; - } - -if (*p !=';' && *p !=',' ) { -/* End of param or invalid format */ -break ; - } - p++; - } - -if (ret !=1 ) -return ; - -if (!pci_dev_specific_disable_acs_redir (dev)) -return ; - - pos =pci_find_ext_capability (dev,PCI_EXT_CAP_ID_ACS ); -if (!pos) { -pci_warn (dev,"cannot disable ACS redirect for this hardware as it does not have ACS capabilities\n" ); -return ; - } - -pci_read_config_word (dev, pos +PCI_ACS_CTRL , &ctrl); - -/* P2P Request & Completion Redirect */ - ctrl &= ~(PCI_ACS_RR |PCI_ACS_CR |PCI_ACS_EC ); - -pci_write_config_word (dev, pos +PCI_ACS_CTRL , ctrl); - -pci_info (dev,"disabled ACS redirect\n" ); -} - -/** -* pci_std_enable_acs - enable ACS on devices using standard ACS capabilities -* @dev: the PCI device -*/ -static void pci_std_enable_acs (struct pci_dev *dev) -{ -int pos; -u16 cap; -u16 ctrl; - - pos =pci_find_ext_capability (dev,PCI_EXT_CAP_ID_ACS ); -if (!pos) -return ; - -pci_read_config_word (dev, pos +PCI_ACS_CAP , &cap); -pci_read_config_word (dev, pos +PCI_ACS_CTRL , &ctrl); - -/* Source Validation */ - ctrl |= (cap &PCI_ACS_SV ); - -/* P2P Request Redirect */ - ctrl |= (cap &PCI_ACS_RR ); - -/* P2P Completion Redirect */ - ctrl |= (cap &PCI_ACS_CR ); - -/* Upstream Forwarding */ - ctrl |= (cap &PCI_ACS_UF ); - -pci_write_config_word (dev, pos +PCI_ACS_CTRL , ctrl); -} - -/** -* pci_enable_acs - enable ACS if hardware support it -* @dev: the PCI device -*/ -void pci_enable_acs (struct pci_dev *dev) -{ -if (!pci_acs_enable) - goto disable_acs_redir; - -if (!pci_dev_specific_enable_acs (dev)) - goto disable_acs_redir; - -pci_std_enable_acs (dev); - -disable_acs_redir: -/* -* Note: pci_disable_acs_redir() must be called even if ACS was not -* enabled by the kernel because it may have been enabled by -* platform firmware. So if we are told to disable it, we should -* always disable it after setting the kernel's default -* preferences. -*/ -pci_disable_acs_redir (dev); -} -static bool pci_acs_flags_enabled (struct pci_dev *pdev,u16 acs_flags) {int pos;Signature · 1 line
2.27.0.212.ge8ba1cc988-goog