iommu/vt-d: Convert dmar_ats_supported() to return bool
Subsystems (2)
Lu Baolu
maintainerPATCH 1/2 iommu/vt-d: Convert dmar_ats_supported() to return bool
dmar_ats_supported() returns an integer that is used as a boolean. Since it all it needs is to return true or false, change the return type from int to bool to make it a bit more readable and obvious.
Cleanup this helper accordingly with no functional change intended.
--- drivers/iommu/intel/iommu.c | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-)
drivers/iommu/intel/iommu.c +18 -15
@@ -3043,15 +3043,15 @@ static struct dmar_satc_unit *dmar_find_matched_satc_unit(struct pci_dev *dev)return satcu; } -static int dmar_ats_supported (struct pci_dev *dev,struct intel_iommu *iommu) +static bool dmar_ats_supported (struct pci_dev *dev,struct intel_iommu *iommu) { -int i, ret =1 ; -struct pci_bus *bus;struct pci_dev *bridge =NULL ; -struct device *tmp; -struct acpi_dmar_atsr *atsr;struct dmar_atsr_unit *atsru;struct dmar_satc_unit *satcu; +struct acpi_dmar_atsr *atsr; +struct pci_bus *bus; +struct device *tmp; +int i; dev =pci_physfn (dev); satcu =dmar_find_matched_satc_unit (dev);
@@ -3069,11 +3069,11 @@ static int dmar_ats_supported(struct pci_dev *dev, struct intel_iommu *iommu) bridge = bus->self;/* If it's an integrated device, allow ATS */ if (!bridge) -return 1 ; +return true;/* Connected via non-PCIe: no ATS */ if (!pci_is_pcie (bridge) ||pci_pcie_type (bridge) ==PCI_EXP_TYPE_PCI_BRIDGE ) -return 0 ; +return false;/* If we found the root port, look it up in the ATSR */ if (pci_pcie_type (bridge) ==PCI_EXP_TYPE_ROOT_PORT )break ;
@@ -3085,18 +3085,21 @@ static int dmar_ats_supported(struct pci_dev *dev, struct intel_iommu *iommu)if (atsr->segment !=pci_domain_nr (dev->bus))continue ; -for_each_dev_scope (atsru->devices, atsru->devices_cnt, i, tmp) -if (tmp == &bridge->dev) - goto out; +for_each_dev_scope (atsru->devices, atsru->devices_cnt, i, tmp) { +if (tmp == &bridge->dev) { +rcu_read_unlock (); +return true; + } + } -if (atsru->include_all) - goto out; +if (atsru->include_all) { +rcu_read_unlock (); +return true; + } } - ret =0 ; -out:rcu_read_unlock (); -return ret; +return false; }int dmar_iommu_notify_scope_dev (struct dmar_pci_notify_info *info)
Signature · 1 line
2.34.1
Lu Baolu
maintainerPATCH 2/2 iommu/vt-d: Remove hardware automatic ATS dependency
If a device is listed in the SATC table with ATC_REQUIRED flag set, it indicates that the device has a functional requirement to enable its ATC (via the ATS capability) for device operation. However, when IOMMU is running in the legacy mode, ATS could be automatically supported by the hardware so that the OS has no need to support the ATS functionality.
This is a backward compatibility feature which enables older OSs. Since Linux VT-d implementation has already supported ATS features for a long time, there is no need to rely on this compatibility hardware. Remove it to make the driver future-proof.
--- drivers/iommu/intel/iommu.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)
drivers/iommu/intel/iommu.c +1 -8
@@ -3056,14 +3056,7 @@ static bool dmar_ats_supported(struct pci_dev *dev, struct intel_iommu *iommu) dev =pci_physfn (dev); satcu =dmar_find_matched_satc_unit (dev);if (satcu) -/* -* This device supports ATS as it is in SATC table. -* When IOMMU is in legacy mode, enabling ATS is done -* automatically by HW for the device that requires -* ATS, hence OS should not enable this device ATS -* to avoid duplicated TLB invalidation. -*/ -return !(satcu->atc_required && !sm_supported (iommu)); +return true;for (bus = dev->bus; bus; bus = bus->parent) { bridge = bus->self;
Signature · 1 line
2.34.1
Re: [PATCH 2/2] iommu/vt-d: Remove hardware automatic ATS dependency
Hi Baolu,
Quoted 5 lines · Lu Baolu
If a device is listed in the SATC table with
ATC_REQUIREDflag set, it indicates that the device has a functional requirement to enable its ATC (via the ATS capability) for device operation. However, when IOMMU is running in the legacy mode, ATS could be automatically supported by the hardware so that the OS has no need to support the ATS functionality.
It seems like if VT-d hw is operating in legacy mode, ATS is enabled automatically? This is really suprising. Maybe I got it wrongly. Could you elaborate a bit?
Quoted 30 lines
This is a backward compatibility feature which enables older OSs. Since Linux VT-d implementation has already supported ATS features for a long time, there is no need to rely on this compatibility hardware. Remove it to make the driver future-proof.
Signed-off-by Lu Baolu <[email protected]>--- drivers/iommu/intel/iommu.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)drivers/iommu/intel/iommu.c +1
-8@@ -3056,14 +3056,7 @@ static bool dmar_ats_supported(struct pci_dev *dev, struct intel_iommu *iommu) dev =pci_physfn (dev); satcu =dmar_find_matched_satc_unit (dev);if (satcu) -/* -* This device supports ATS as it is in SATC table. -* When IOMMU is in legacy mode, enabling ATS is done -* automatically by HW for the device that requires -* ATS, hence OS should not enable this device ATS -* to avoid duplicated TLB invalidation. -*/ -return !(satcu->atc_required && !sm_supported (iommu)); +return true;for (bus = dev->bus; bus; bus = bus->parent) { bridge = bus->self;
Signature · 2 lines
Regards, Yi Liu
Baolu Lu
maintainerRe: [PATCH 2/2] iommu/vt-d: Remove hardware automatic ATS dependency
Quoted 9 lines · Yi Liu
Quoted 5 lines · Lu Baolu
If a device is listed in the SATC table with
ATC_REQUIREDflag set, it indicates that the device has a functional requirement to enable its ATC (via the ATS capability) for device operation. However, when IOMMU is running in the legacy mode, ATS could be automatically supported by the hardware so that the OS has no need to support the ATS functionality.It seems like if VT-d hw is operating in legacy mode, ATS is enabled automatically?
Yes.
Quoted 2 lines
This is really suprising. Maybe I got it wrongly. Could you elaborate a bit?
It's for backward compatible purpose, but I have no hardware details.
Best regards,
baolu
RE: [PATCH 2/2] iommu/vt-d: Remove hardware automatic ATS dependency
In reply to Lu BaoluQuoted 8 lines
From: Lu Baolu <[email protected]>
Sent: Monday, June 24, 2024 1:25 PMIf a device is listed in the SATC table with
ATC_REQUIREDflag set, it indicates that the device has a functional requirement to enable its ATC (via the ATS capability) for device operation. However, when IOMMU is running in the legacy mode, ATS could be automatically supported by the hardware so that the OS has no need to support the ATS functionality.
hmm I don't think "has no need to support" matches...
Quoted 17 lines
This is a backward compatibility feature which enables older OSs. Since Linux VT-d implementation has already supported ATS features for a long time, there is no need to rely on this compatibility hardware. Remove it to make the driver future-proof.
Signed-off-by Lu Baolu <[email protected]>--- drivers/iommu/intel/iommu.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)drivers/iommu/intel/iommu.c +0
-0@@ -3056,14 +3056,7 @@ static bool dmar_ats_supported(struct pci_dev *dev, struct intel_iommu *iommu)
drivers/iommu/intel/iommu.c static bool dmar_ats_supported(struct pci_dev · line 3066
Quoted 10 lines
drivers/iommu/intel/iommu.c +0
-7dev =pci_physfn (dev); satcu =dmar_find_matched_satc_unit (dev);if (satcu) -/* -* This device supports ATS as it is in SATC table. -* When IOMMU is in legacy mode, enabling ATS is done -* automatically by HW for the device that requires -* ATS, hence OS should not enable this device ATS -* to avoid duplicated TLB invalidation. -*/
...what above comment tries to convey.
If this comment is valid, it's not about whether the OS itself supports ATS. instead it's a requirement for the OS to not manage ATS when it's already managed by HW.
Unless there is a way to disable hw management with this change...
Quoted 7 lines
drivers/iommu/intel/iommu.c +1
-1-return !(satcu->atc_required && !sm_supported (iommu)); +return true;for (bus = dev->bus; bus; bus = bus->parent) {bridge =
bus->self;
--
2.34.1
Baolu Lu
maintainerRe: [PATCH 2/2] iommu/vt-d: Remove hardware automatic ATS dependency
Quoted 38 lines · Kevin
Quoted 8 lines
From: Lu Baolu<[email protected]>
Sent: Monday, June 24, 2024 1:25 PMIf a device is listed in the SATC table with
ATC_REQUIREDflag set, it indicates that the device has a functional requirement to enable its ATC (via the ATS capability) for device operation. However, when IOMMU is running in the legacy mode, ATS could be automatically supported by the hardware so that the OS has no need to support the ATS functionality.hmm I don't think "has no need to support" matches...
Quoted 16 lines
This is a backward compatibility feature which enables older OSs. Since Linux VT-d implementation has already supported ATS features for a long time, there is no need to rely on this compatibility hardware. Remove it to make the driver future-proof.
Signed-off-by Lu Baolu<[email protected]>--- drivers/iommu/intel/iommu.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)drivers/iommu/intel/iommu.c +0
-0@@ -3056,14 +3056,7 @@ static bool dmar_ats_supported(struct pci_dev *dev, struct intel_iommu *iommu)drivers/iommu/intel/iommu.c static bool dmar_ats_supported(struct pci_dev · line 3066
Quoted 10 lines
drivers/iommu/intel/iommu.c +0
-7dev =pci_physfn (dev); satcu =dmar_find_matched_satc_unit (dev);if (satcu) -/* -* This device supports ATS as it is in SATC table. -* When IOMMU is in legacy mode, enabling ATS is done -* automatically by HW for the device that requires -* ATS, hence OS should not enable this device ATS -* to avoid duplicated TLB invalidation. -*/ ...what above comment tries to convey.
Quoted 5 lines
If this comment is valid, it's not about whether the OS itself supports ATS. instead it's a requirement for the OS to not manage ATS when it's already managed by HW.
Unless there is a way to disable hw management with this change...
This comment is not correct. The hardware automatic ATS is for older OS compatible purposes, where the ATS is not aware of by the OS yet, but ATS is functionally required for some SOC-integrated accelerators.
The HAS specification for those platforms states that OSs supporting ATS (so-called enlightened OSs) don't require automatic ATS anymore.
From the iommu driver's point of view, automatic ATS is not part of the VT-d spec and also not enumerable, hence it should be transparent.
Best regards,
baolu
RE: [PATCH 2/2] iommu/vt-d: Remove hardware automatic ATS dependency
Quoted 52 lines
From: Baolu Lu <[email protected]>
Sent: Tuesday, June 25, 2024 4:40 PMQuoted 38 lines · Kevin
Quoted 8 lines
From: Lu Baolu<[email protected]>
Sent: Monday, June 24, 2024 1:25 PMIf a device is listed in the SATC table with
ATC_REQUIREDflag set, it indicates that the device has a functional requirement to enable its ATC (via the ATS capability) for device operation. However, when IOMMU is running in the legacy mode, ATS could be automatically supported by the hardware so that the OS has no need to support the ATS functionality.hmm I don't think "has no need to support" matches...
Quoted 16 lines
This is a backward compatibility feature which enables older OSs. Since Linux VT-d implementation has already supported ATS features for a long time, there is no need to rely on this compatibility hardware. Remove it to make the driver future-proof.
Signed-off-by Lu Baolu<[email protected]>--- drivers/iommu/intel/iommu.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)drivers/iommu/intel/iommu.c +0
-0@@ -3056,14 +3056,7 @@ static bool dmar_ats_supported(struct pci_dev *dev, struct intel_iommu *iommu)drivers/iommu/intel/iommu.c static bool dmar_ats_supported(struct pci_dev · line 3066
Quoted 10 lines
drivers/iommu/intel/iommu.c +0
-7dev =pci_physfn (dev); satcu =dmar_find_matched_satc_unit (dev);if (satcu) -/* -* This device supports ATS as it is in SATC table. -* When IOMMU is in legacy mode, enabling ATS is done -* automatically by HW for the device that requires -* ATS, hence OS should not enable this device ATS -* to avoid duplicated TLB invalidation. -*/ ...what above comment tries to convey.
Quoted 5 lines
If this comment is valid, it's not about whether the OS itself supports ATS. instead it's a requirement for the OS to not manage ATS when it's already managed by HW.
Unless there is a way to disable hw management with this change...
This comment is not correct. The hardware automatic ATS is for older OS compatible purposes, where the ATS is not aware of by the OS yet, but ATS is functionally required for some SOC-integrated accelerators.
Quoted 6 lines
The HAS specification for those platforms states that OSs supporting ATS (so-called enlightened OSs) don't require automatic ATS anymore.
From the iommu driver's point of view, automatic ATS is not part of the
VT-d spec and also not enumerable, hence it should be transparent.
I'm curious how automatic ATS can be disabled otherwise the old comment still makes sense as you will have both HW and SW managing ATS and then duplicated invalidations.
Is there a BIOS option to disable automatic ATS? Then the user will need to know which kernel version supports ATS to decide.
Or is it automatically enabled/disabled based on whether the IOMMU is in legacy or scalable mode? If yes then we may still want to disable SW-managed ATS when the IOMMU is in legacy mode to avoid duplicated invalidations.
btw ATS support was introduced long long time ago:
commit 93a23a7271dfb811b3adb72779054c3a24433112
Author: Yu Zhao <[email protected]> Date: Mon May 18 13:51:37 2009 +0800
VT-d: support the device IOTLB
Enable the device IOTLB (i.e. ATS) for both the bare metal and KVM environments.
while this hw-managed ATS was supported much later:
commit 97f2f2c5317f55ae3440733a090a96a251da222b
Author: Yian Chen <[email protected]> Date: Tue Mar 1 10:01:59 2022 +0800
iommu/vt-d: Enable ATS for the devices in SATC table
Starting from Intel VT-d v3.2, Intel platform BIOS can provide additional SATC table structure. SATC table includes a list of SoC integrated devices that support ATC (Address translation cache).
Enabling ATC (via ATS capability) can be a functional requirement for SATC device operation or optional to enhance device performance/functionality. This is determined by the bit of ATC_REQUIRED in SATC table. When IOMMU is working in scalable mode, software chooses to always enable ATS for every device in SATC table because Intel SoC devices in SATC table are trusted to use ATS.
On the other hand, if IOMMU is in legacy mode, ATS of SATC capable devices can work transparently to software and be automatically enabled by IOMMU hardware. As the result, there is no need for software to enable ATS on these devices.
This also removes dmar_find_matched_atsr_unit() helper as it becomes dead code now.
That history doesn't appear to support your argument that it's only for old OS which is not aware of ATS...
Baolu Lu
maintainerRe: [PATCH 2/2] iommu/vt-d: Remove hardware automatic ATS dependency
Quoted 112 lines · Kevin
Quoted 52 lines
From: Baolu Lu <[email protected]>
Sent: Tuesday, June 25, 2024 4:40 PMQuoted 38 lines · Kevin
Quoted 8 lines
From: Lu Baolu<[email protected]>
Sent: Monday, June 24, 2024 1:25 PMIf a device is listed in the SATC table with
ATC_REQUIREDflag set, it indicates that the device has a functional requirement to enable its ATC (via the ATS capability) for device operation. However, when IOMMU is running in the legacy mode, ATS could be automatically supported by the hardware so that the OS has no need to support the ATS functionality.hmm I don't think "has no need to support" matches...
Quoted 16 lines
This is a backward compatibility feature which enables older OSs. Since Linux VT-d implementation has already supported ATS features for a long time, there is no need to rely on this compatibility hardware. Remove it to make the driver future-proof.
Signed-off-by Lu Baolu<[email protected]>--- drivers/iommu/intel/iommu.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)drivers/iommu/intel/iommu.c +0
-0@@ -3056,14 +3056,7 @@ static bool dmar_ats_supported(struct pci_dev *dev, struct intel_iommu *iommu)drivers/iommu/intel/iommu.c static bool dmar_ats_supported(struct pci_dev · line 3066
Quoted 10 lines
drivers/iommu/intel/iommu.c +0
-7dev =pci_physfn (dev); satcu =dmar_find_matched_satc_unit (dev);if (satcu) -/* -* This device supports ATS as it is in SATC table. -* When IOMMU is in legacy mode, enabling ATS is done -* automatically by HW for the device that requires -* ATS, hence OS should not enable this device ATS -* to avoid duplicated TLB invalidation. -*/ ...what above comment tries to convey.
Quoted 5 lines
If this comment is valid, it's not about whether the OS itself supports ATS. instead it's a requirement for the OS to not manage ATS when it's already managed by HW.
Unless there is a way to disable hw management with this change...
This comment is not correct. The hardware automatic ATS is for older OS compatible purposes, where the ATS is not aware of by the OS yet, but ATS is functionally required for some SOC-integrated accelerators.
Quoted 6 lines
The HAS specification for those platforms states that OSs supporting ATS (so-called enlightened OSs) don't require automatic ATS anymore.
From the iommu driver's point of view, automatic ATS is not part of the
VT-d spec and also not enumerable, hence it should be transparent.I'm curious how automatic ATS can be disabled otherwise the old comment still makes sense as you will have both HW and SW managing ATS and then duplicated invalidations.
Is there a BIOS option to disable automatic ATS? Then the user will need to know which kernel version supports ATS to decide.
Or is it automatically enabled/disabled based on whether the IOMMU is in legacy or scalable mode? If yes then we may still want to disable SW-managed ATS when the IOMMU is in legacy mode to avoid duplicated invalidations.
btw ATS support was introduced long long time ago:
commit
93a23a7271dfb811b3adb72779054c3a24433112Author: Yu Zhao <[email protected]> Date: Mon May 18 13:51:37 2009 +0800VT-d: support the device IOTLB
Enable the device IOTLB (i.e. ATS) for both the bare metal and KVM environments.
Signed-off-by Yu Zhao <[email protected]>Signed-off-by David Woodhouse <[email protected]>while this hw-managed ATS was supported much later:
commit
97f2f2c5317f55ae3440733a090a96a251da222bAuthor: Yian Chen <[email protected]> Date: Tue Mar 1 10:01:59 2022 +0800iommu/vt-d: Enable ATS for the devices in SATC table
Starting from Intel VT-d v3.2, Intel platform BIOS can provide additional SATC table structure. SATC table includes a list of SoC integrated devices that support ATC (Address translation cache).
Enabling ATC (via ATS capability) can be a functional requirement for SATC device operation or optional to enhance device performance/functionality. This is determined by the bit of
ATC_REQUIREDin SATC table. When IOMMU is working in scalable mode, software chooses to always enable ATS for every device in SATC table because Intel SoC devices in SATC table are trusted to use ATS.On the other hand, if IOMMU is in legacy mode, ATS of SATC capable devices can work transparently to software and be automatically enabled by IOMMU hardware. As the result, there is no need for software to enable ATS on these devices.
This also removes
dmar_find_matched_atsr_unit()helper as it becomes dead code now.
Quoted 8 lines
Signed-off-by Yian Chen <[email protected]>Signed-off-by Lu Baolu <[email protected]>Signed-off-by Joerg Roedel <[email protected]>That history doesn't appear to support your argument that it's only for old OS which is not aware of ATS...
Software has no means to disable automatic ATS. Therefore it's not expected to turn on the ATS in the device while the iommu is in legacy mode. I will drop this change.
Best regards,
baolu
Quoted 2 lines · Lu Baolu
dmar_ats_supported()returns an integer that is used as a boolean. Since it all it needs is to return true or false, change the return type from
nit: a redundant "it" is used here.
Quoted 57 lines
int to bool to make it a bit more readable and obvious.
Cleanup this helper accordingly with no functional change intended.
Signed-off-by Lu Baolu <[email protected]>--- drivers/iommu/intel/iommu.c | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-)drivers/iommu/intel/iommu.c +9
-10@@ -3043,15 +3043,15 @@ static struct dmar_satc_unit *dmar_find_matched_satc_unit(struct pci_dev *dev)return satcu; } -static int dmar_ats_supported (struct pci_dev *dev,struct intel_iommu *iommu) +static bool dmar_ats_supported (struct pci_dev *dev,struct intel_iommu *iommu) { -int i, ret =1 ; -struct pci_bus *bus;struct pci_dev *bridge =NULL ; -struct device *tmp; -struct acpi_dmar_atsr *atsr;struct dmar_atsr_unit *atsru;struct dmar_satc_unit *satcu; +struct acpi_dmar_atsr *atsr; +struct pci_bus *bus; +struct device *tmp; +int i; dev =pci_physfn (dev); satcu =dmar_find_matched_satc_unit (dev);@@ -3069,11 +3069,11 @@ static int dmar_ats_supported(struct pci_dev *dev, struct intel_iommu *iommu) bridge = bus->self;/* If it's an integrated device, allow ATS */ if (!bridge) -return 1 ; +return true;/* Connected via non-PCIe: no ATS */ if (!pci_is_pcie (bridge) ||pci_pcie_type (bridge) ==PCI_EXP_TYPE_PCI_BRIDGE ) -return 0 ; +return false;/* If we found the root port, look it up in the ATSR */ if (pci_pcie_type (bridge) ==PCI_EXP_TYPE_ROOT_PORT )break ;@@ -3085,18 +3085,21 @@ static int dmar_ats_supported(struct pci_dev *dev, struct intel_iommu *iommu)if (atsr->segment !=pci_domain_nr (dev->bus))continue ; -for_each_dev_scope (atsru->devices, atsru->devices_cnt, i, tmp) -if (tmp == &bridge->dev) - goto out; +for_each_dev_scope (atsru->devices, atsru->devices_cnt, i, tmp) { +if (tmp == &bridge->dev) {
drivers/iommu/intel/iommu.c static int dmar_ats_supported(struct pci_dev *dev, struct intel_iommu *iommu) · line 3097
Quoted 10 lines
drivers/iommu/intel/iommu.c +7
-2+rcu_read_unlock (); +return true; + } + } -if (atsru->include_all) - goto out; +if (atsru->include_all) { +rcu_read_unlock (); +return true;
It appears to me that two gotos is better than opening code. :) Anyhow.
Quoted 11 lines
drivers/iommu/intel/iommu.c +2
-3+ } } - ret =0 ; -out:rcu_read_unlock (); -return ret; +return false; }int dmar_iommu_notify_scope_dev (struct dmar_pci_notify_info *info)
Signature · 2 lines
Regards, Yi Liu
Quoted 10 lines
From: Lu Baolu <[email protected]>
Sent: Monday, June 24, 2024 1:25 PM
dmar_ats_supported()returns an integer that is used as a boolean. Since it all it needs is to return true or false, change the return type from int to bool to make it a bit more readable and obvious.Cleanup this helper accordingly with no functional change intended.
Signed-off-by Lu Baolu <[email protected]>