PCI: Add translated request only flag for pci_enable_pasid()
Subsystems (5)
Lu Baolu
maintainerPATCH v2 1/1 PCI: Add translated request only flag for pci_enable_pasid()
The PCIe fabric routes Memory Requests based on the TLP address, ignoring the PASID. In order to ensure system integrity, commit 201007ef707a ("PCI:
Enable PASID only when ACS RR & UF enabled on upstream path") requires some ACS features being supported on device's upstream path when enabling PCI/PASID.
One alternative is ATS which lets the device resolve the PASID+addr pair before a memory request is made into a routeable TLB address through the TA. Those resolved addresses are then cached on the device instead of in the IOMMU TLB and the device always sets the translated bit for PASID. One example of those devices are AMD graphic devices that always have ACS or ATS enabled together with PASID.
This adds a flag parameter in the pci_enable_pasid() helper, with which the device driver could opt-in the fact that device always sets the translated bit for PASID.
It also applies this opt-in for AMD graphic devices. Without this change, kernel boots to black screen on a system with below AMD graphic device:
00:01.0 VGA compatible controller: Advanced Micro Devices, Inc.
[AMD/ATI] Wani [Radeon R5/R6/R7 Graphics] (rev ca) (prog-if 00 [VGA controller])
DeviceName: ATI EG BROADWAY
Subsystem: Hewlett-Packard Company Device 8332
At present, it is a common practice to enable/disable PCI PASID in the iommu drivers. Considering that the device driver knows more about the specific device, we will follow up by moving pci_enable_pasid() into the specific device drivers.
--- include/linux/pci-ats.h | 6 ++++-- drivers/iommu/amd/iommu.c | 2 +- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 2 +- drivers/iommu/intel/iommu.c | 3 ++- drivers/pci/ats.c | 8 ++++++-- 5 files changed, 14 insertions(+), 7 deletions(-)
Change log:
v2:
- Convert the bool to a named flag;
- Convert TRANSLED to XLATED.
v1:
- https://lore.kernel.org/linux-iommu/[email protected]/
include/linux/pci-ats.h +4 -2
@@ -4,6 +4,8 @@#include <linux/pci.h> +#define PCI_PASID_XLATED_REQ_ONLY BIT(0) +#ifdef CONFIG_PCI_ATS /* Address Translation Service */ bool pci_ats_supported (struct pci_dev *dev);
@@ -35,12 +37,12 @@ static inline bool pci_pri_supported(struct pci_dev *pdev)#endif /* CONFIG_PCI_PRI */ #ifdef CONFIG_PCI_PASID -int pci_enable_pasid (struct pci_dev *pdev,int features); +int pci_enable_pasid (struct pci_dev *pdev,int features,int flags);void pci_disable_pasid (struct pci_dev *pdev);int pci_pasid_features (struct pci_dev *pdev);int pci_max_pasids (struct pci_dev *pdev);#else /* CONFIG_PCI_PASID */ -static inline int pci_enable_pasid (struct pci_dev *pdev,int features) +static inline int pci_enable_pasid (struct pci_dev *pdev,int features,int flags) {return -EINVAL ; }static inline void pci_disable_pasid (struct pci_dev *pdev) { }static inline int pci_pasid_features (struct pci_dev *pdev)
drivers/iommu/amd/iommu.c +1 -1
@@ -1700,7 +1700,7 @@ static int pdev_pri_ats_enable(struct pci_dev *pdev)int ret;/* Only allow access to user-accessible pages */ - ret =pci_enable_pasid (pdev,0 ); + ret =pci_enable_pasid (pdev,0 ,PCI_PASID_XLATED_REQ_ONLY );if (ret) goto out_err;
drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +1 -1
@@ -2350,7 +2350,7 @@ static int arm_smmu_enable_pasid(struct arm_smmu_master *master)if (num_pasids <=0 )return num_pasids; - ret =pci_enable_pasid (pdev, features); + ret =pci_enable_pasid (pdev, features,0 );if (ret) {dev_err (&pdev->dev,"Failed to enable PASID\n" );return ret;
drivers/iommu/intel/iommu.c +2 -1
@@ -1425,7 +1425,8 @@ static void iommu_enable_pci_caps(struct device_domain_info *info)undefined. So always enable PASID support on devices which have it, even if we can't yet know if we're ever going to use it. */ -if (info->pasid_supported && !pci_enable_pasid (pdev, info->pasid_supported & ~1 )) +if (info->pasid_supported && + !pci_enable_pasid (pdev, info->pasid_supported & ~1 ,0 )) info->pasid_enabled =1 ; if (info->pri_supported &&
drivers/pci/ats.c +6 -2
@@ -353,12 +353,15 @@ void pci_pasid_init(struct pci_dev *pdev)* pci_enable_pasid - Enable the PASID capability * @pdev: PCI device structure * @features: Features to enable +* @flags: device-specific flags +* - PCI_PASID_XLATED_REQ_ONLY: The PCI device only issues PASID +* memory requests of translated type. * * Returns 0 on success, negative value on error. This function checks * whether the features are actually supported by the device and returns * an error if not. */ -int pci_enable_pasid (struct pci_dev *pdev,int features) +int pci_enable_pasid (struct pci_dev *pdev,int features,int flags) {u16 control, supported;int pasid = pdev->pasid_cap;
@@ -382,7 +385,8 @@ int pci_enable_pasid(struct pci_dev *pdev, int features)if (!pasid)return -EINVAL ; -if (!pci_acs_path_enabled (pdev,NULL ,PCI_ACS_RR |PCI_ACS_UF )) +if (!(flags &PCI_PASID_XLATED_REQ_ONLY ) && + !pci_acs_path_enabled (pdev,NULL ,PCI_ACS_RR |PCI_ACS_UF ))return -EINVAL ;pci_read_config_word (pdev, pasid +PCI_PASID_CAP , &supported);
Signature · 1 line
2.34.1
Quoted 9 lines
From: Lu Baolu <[email protected]>
Sent: Friday, January 13, 2023 9:44 AMOne alternative is ATS which lets the device resolve the PASID+addr pair before a memory request is made into a routeable TLB address through the TA. Those resolved addresses are then cached on the device instead of in the IOMMU TLB and the device always sets the translated bit for PASID. One example of those devices are AMD graphic devices that always have ACS or ATS enabled together with PASID.
this should be made clear that ATS alone doesn't imply that translated bit is always set. It's just an optimization so the device may cache translation for selective requests. Only combining with PRI to support SVA has such implication.
Quoted 3 lines
+ * @flags: device-specific flags
+ * -PCI_PASID_XLATED_REQ_ONLY: The PCI device only issues PASID
+ * memory requests of translated type.
this reads like the device even doesn't issue non-PASID requests.
It is clearer to be "The PCI device always use translated type for all PASID memory requests".
Otherwise looks good to me:
Baolu Lu
maintainerQuoted 19 lines · Kevin
Quoted 9 lines
From: Lu Baolu <[email protected]>
Sent: Friday, January 13, 2023 9:44 AMOne alternative is ATS which lets the device resolve the PASID+addr pair before a memory request is made into a routeable TLB address through the TA. Those resolved addresses are then cached on the device instead of in the IOMMU TLB and the device always sets the translated bit for PASID. One example of those devices are AMD graphic devices that always have ACS or ATS enabled together with PASID.
this should be made clear that ATS alone doesn't imply that translated bit is always set. It's just an optimization so the device may cache translation for selective requests. Only combining with PRI to support SVA has such implication.
Quoted 3 lines
+ * @flags: device-specific flags
+ * -PCI_PASID_XLATED_REQ_ONLY: The PCI device only issues PASID
+ * memory requests of translated type.
Quoted 8 lines
this reads like the device even doesn't issue non-PASID requests.
It is clearer to be "The PCI device always use translated type for all PASID memory requests".
Otherwise looks good to me:
Reviewed-by Kevin Tian <[email protected]>
Both make sense to me. It's updated. Thanks a lot!
--
Best regards,
baolu
Baolu,
6.2-rc3 with v2 of this patch applied booted normally without the black screen problem. regzbot by Thorsten Leemhuis recommends adding the following link tag to the previous discussion at https://linux-regtracking.leemhuis.info/regzbot/mainline/ "When fixing, add this to the commit message to make regzbot notice patch postings and commits to resolve the issue:" Link: https://lore.kernel.org/r/[email protected]/
Thanks,
Matt
Quoted 152 lines · Lu Baolu
The PCIe fabric routes Memory Requests based on the TLP address, ignoring the PASID. In order to ensure system integrity, commit
201007ef707a("PCI:
Enable PASID only when ACS RR & UF enabled on upstream path") requires some ACS features being supported on device's upstream path when enabling PCI/PASID.One alternative is ATS which lets the device resolve the PASID+addr pair before a memory request is made into a routeable TLB address through the TA. Those resolved addresses are then cached on the device instead of in the IOMMU TLB and the device always sets the translated bit for PASID. One example of those devices are AMD graphic devices that always have ACS or ATS enabled together with PASID.
This adds a flag parameter in the
pci_enable_pasid()helper, with which the device driver could opt-in the fact that device always sets the translated bit for PASID.It also applies this opt-in for AMD graphic devices. Without this change, kernel boots to black screen on a system with below AMD graphic device:
00:01.0 VGA compatible controller: Advanced Micro Devices, Inc.
[AMD/ATI] Wani [Radeon R5/R6/R7 Graphics] (rev ca) (prog-if 00 [VGA controller])
DeviceName: ATI EG BROADWAY
Subsystem: Hewlett-Packard Company Device 8332At present, it is a common practice to enable/disable PCI PASID in the iommu drivers. Considering that the device driver knows more about the specific device, we will follow up by moving
pci_enable_pasid()into the specific device drivers.Fixes 201007ef707a ("PCI: Enable PASID only when ACS RR & UF enabled on upstream path")Reported-by Matt Fagnani <[email protected]>Suggested-by Jason Gunthorpe <[email protected]>Suggested-by Christian König <[email protected]>Signed-off-by Lu Baolu <[email protected]>--- include/linux/pci-ats.h | 6 ++++-- drivers/iommu/amd/iommu.c | 2 +- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 2 +- drivers/iommu/intel/iommu.c | 3 ++- drivers/pci/ats.c | 8 ++++++-- 5 files changed, 14 insertions(+), 7 deletions(-)Change log:
v2:
- Convert the bool to a named flag;
- Convert TRANSLED to XLATED.v1:
- https://lore.kernel.org/linux-iommu/[email protected]/include/linux/pci-ats.h +4
-2@@ -4,6 +4,8 @@#include <linux/pci.h> +#define PCI_PASID_XLATED_REQ_ONLY BIT(0) +#ifdef CONFIG_PCI_ATS /* Address Translation Service */ bool pci_ats_supported (struct pci_dev *dev);@@ -35,12 +37,12 @@ static inline bool pci_pri_supported(struct pci_dev *pdev)#endif /* CONFIG_PCI_PRI */ #ifdef CONFIG_PCI_PASID -int pci_enable_pasid (struct pci_dev *pdev,int features); +int pci_enable_pasid (struct pci_dev *pdev,int features,int flags);void pci_disable_pasid (struct pci_dev *pdev);int pci_pasid_features (struct pci_dev *pdev);int pci_max_pasids (struct pci_dev *pdev);#else /* CONFIG_PCI_PASID */ -static inline int pci_enable_pasid (struct pci_dev *pdev,int features) +static inline int pci_enable_pasid (struct pci_dev *pdev,int features,int flags) {return -EINVAL ; }static inline void pci_disable_pasid (struct pci_dev *pdev) { }static inline int pci_pasid_features (struct pci_dev *pdev)drivers/iommu/amd/iommu.c +1
-1@@ -1700,7 +1700,7 @@ static int pdev_pri_ats_enable(struct pci_dev *pdev)int ret;/* Only allow access to user-accessible pages */ - ret =pci_enable_pasid (pdev,0 ); + ret =pci_enable_pasid (pdev,0 ,PCI_PASID_XLATED_REQ_ONLY );if (ret) goto out_err;drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +1
-1@@ -2350,7 +2350,7 @@ static int arm_smmu_enable_pasid(struct arm_smmu_master *master)if (num_pasids <=0 )return num_pasids; - ret =pci_enable_pasid (pdev, features); + ret =pci_enable_pasid (pdev, features,0 );if (ret) {dev_err (&pdev->dev,"Failed to enable PASID\n" );return ret;drivers/iommu/intel/iommu.c +2
-1@@ -1425,7 +1425,8 @@ static void iommu_enable_pci_caps(struct device_domain_info *info)undefined. So always enable PASID support on devices which have it, even if we can't yet know if we're ever going to use it. */ -if (info->pasid_supported && !pci_enable_pasid (pdev, info->pasid_supported & ~1 )) +if (info->pasid_supported && + !pci_enable_pasid (pdev, info->pasid_supported & ~1 ,0 )) info->pasid_enabled =1 ; if (info->pri_supported &&drivers/pci/ats.c +6
-2@@ -353,12 +353,15 @@ void pci_pasid_init(struct pci_dev *pdev)* pci_enable_pasid - Enable the PASID capability * @pdev: PCI device structure * @features: Features to enable +* @flags: device-specific flags +* - PCI_PASID_XLATED_REQ_ONLY: The PCI device only issues PASID +* memory requests of translated type. * * Returns 0 on success, negative value on error. This function checks * whether the features are actually supported by the device and returns * an error if not. */ -int pci_enable_pasid (struct pci_dev *pdev,int features) +int pci_enable_pasid (struct pci_dev *pdev,int features,int flags) {u16 control, supported;int pasid = pdev->pasid_cap;@@ -382,7 +385,8 @@ int pci_enable_pasid(struct pci_dev *pdev, int features)if (!pasid)return -EINVAL ; -if (!pci_acs_path_enabled (pdev,NULL ,PCI_ACS_RR |PCI_ACS_UF )) +if (!(flags &PCI_PASID_XLATED_REQ_ONLY ) && + !pci_acs_path_enabled (pdev,NULL ,PCI_ACS_RR |PCI_ACS_UF ))return -EINVAL ;pci_read_config_word (pdev, pasid +PCI_PASID_CAP , &supported);
Baolu Lu
maintainerQuoted 3 lines · Matt Fagnani
Baolu,
6.2-rc3 with v2 of this patch applied booted normally without the black screen problem. regzbot by Thorsten Leemhuis recommends adding the following link tag to the previous discussion at https://linux-regtracking.leemhuis.info/regzbot/mainline/ "When fixing, add this to the commit message to make regzbot notice patch postings and commits to resolve the issue:" Link: https://lore.kernel.org/r/[email protected]/
Sure. I will add below:
By the way, can I add your tested-by?
--
Best regards,
baolu
Quoted 156 lines
Thanks,
Matt
Quoted 150 lines · Lu Baolu
The PCIe fabric routes Memory Requests based on the TLP address, ignoring the PASID. In order to ensure system integrity, commit
201007ef707a("PCI:
Enable PASID only when ACS RR & UF enabled on upstream path") requires some ACS features being supported on device's upstream path when enabling PCI/PASID.One alternative is ATS which lets the device resolve the PASID+addr pair before a memory request is made into a routeable TLB address through the TA. Those resolved addresses are then cached on the device instead of in the IOMMU TLB and the device always sets the translated bit for PASID. One example of those devices are AMD graphic devices that always have ACS or ATS enabled together with PASID.
This adds a flag parameter in the
pci_enable_pasid()helper, with which the device driver could opt-in the fact that device always sets the translated bit for PASID.It also applies this opt-in for AMD graphic devices. Without this change, kernel boots to black screen on a system with below AMD graphic device:
00:01.0 VGA compatible controller: Advanced Micro Devices, Inc. [AMD/ATI] Wani [Radeon R5/R6/R7 Graphics] (rev ca) (prog-if 00 [VGA controller])
DeviceName: ATI EG BROADWAY
Subsystem: Hewlett-Packard Company Device 8332At present, it is a common practice to enable/disable PCI PASID in the iommu drivers. Considering that the device driver knows more about the specific device, we will follow up by moving
pci_enable_pasid()into the specific device drivers.Fixes 201007ef707a ("PCI: Enable PASID only when ACS RR & UF enabled on upstream path")Reported-by Matt Fagnani <[email protected]>Suggested-by Jason Gunthorpe <[email protected]>Suggested-by Christian König <[email protected]>Signed-off-by Lu Baolu <[email protected]>---
include/linux/pci-ats.h | 6 ++++-- drivers/iommu/amd/iommu.c | 2 +-drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c| 2 +- drivers/iommu/intel/iommu.c | 3 ++- drivers/pci/ats.c | 8 ++++++--5 files changed, 14 insertions(+), 7 deletions(-)Change log:
v2:
- Convert the bool to a named flag;
- Convert TRANSLED to XLATED.v1:
- https://lore.kernel.org/linux-iommu/[email protected]/include/linux/pci-ats.h +4
-2@@ -4,6 +4,8 @@ #include <linux/pci.h> +#define PCI_PASID_XLATED_REQ_ONLY BIT(0) + #ifdef CONFIG_PCI_ATS /* Address Translation Service */ bool pci_ats_supported(struct pci_dev *dev);@@ -35,12 +37,12 @@ static inline bool pci_pri_supported(struct pci_dev *pdev) #endif /* CONFIG_PCI_PRI */ #ifdef CONFIG_PCI_PASID -int pci_enable_pasid (struct pci_dev *pdev,int features); +int pci_enable_pasid (struct pci_dev *pdev,int features,int flags); void pci_disable_pasid(struct pci_dev *pdev); int pci_pasid_features(struct pci_dev *pdev); int pci_max_pasids(struct pci_dev *pdev); #else /* CONFIG_PCI_PASID */ -static inline int pci_enable_pasid (struct pci_dev *pdev,int features) +static inline int pci_enable_pasid (struct pci_dev *pdev,int features,int flags) { return -EINVAL; } static inline void pci_disable_pasid(struct pci_dev *pdev) { }static inline int
pci_pasid_features(struct pci_dev *pdev)drivers/iommu/amd/iommu.c +1
-1@@ -1700,7 +1700,7 @@ static int pdev_pri_ats_enable(struct pci_dev *pdev) int ret; /* Only allow access to user-accessible pages */ - ret = pci_enable_pasid(pdev, 0); + ret = pci_enable_pasid(pdev, 0, PCI_PASID_XLATED_REQ_ONLY); if (ret) goto out_err;drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +1
-1@@ -2350,7 +2350,7 @@ static int arm_smmu_enable_pasid(struct arm_smmu_master *master) if (num_pasids <= 0) return num_pasids; - ret = pci_enable_pasid(pdev, features); + ret = pci_enable_pasid(pdev, features, 0); if (ret) { dev_err(&pdev->dev, "Failed to enable PASID\n"); return ret;drivers/iommu/intel/iommu.c +0
-0@@ -1425,7 +1425,8 @@ static void iommu_enable_pci_caps(struct device_domain_info *info)undefined. So always enable PASID support on devices which have it, even if we can't yet know if we're ever going to use it. */
- if (info->pasid_supported&& !pci_enable_pasid(pdev,info->pasid_supported& ~1))
+ if (info->pasid_supported&&
+ !pci_enable_pasid(pdev,info->pasid_supported& ~1, 0))info->pasid_enabled= 1;
if (info->pri_supported&&drivers/pci/ats.c +6
-2@@ -353,12 +353,15 @@ void pci_pasid_init(struct pci_dev *pdev)* pci_enable_pasid - Enable the PASID capability * @pdev: PCI device structure * @features: Features to enable +* @flags: device-specific flags +* - PCI_PASID_XLATED_REQ_ONLY: The PCI device only issues PASID +* memory requests of translated type. * * Returns 0 on success, negative value on error. This function checks * whether the features are actually supported by the device and returns * an error if not. */ -int pci_enable_pasid (struct pci_dev *pdev,int features) +int pci_enable_pasid (struct pci_dev *pdev,int features,int flags) { u16 control, supported; int pasid = pdev->pasid_cap;@@ -382,7 +385,8 @@ int pci_enable_pasid(struct pci_dev *pdev, int features) if (!pasid) return -EINVAL; - if (!pci_acs_path_enabled(pdev, NULL, PCI_ACS_RR | PCI_ACS_UF)) + if (!(flags & PCI_PASID_XLATED_REQ_ONLY) && + !pci_acs_path_enabled(pdev, NULL, PCI_ACS_RR | PCI_ACS_UF)) return -EINVAL; pci_read_config_word(pdev, pasid + PCI_PASID_CAP, &supported);
Baolu,
Yes, you can add the tested-by tag for me.
Thanks,
Matt
Quoted 175 lines · Baolu Lu
Quoted 3 lines · Matt Fagnani
Baolu,
6.2-rc3 with v2 of this patch applied booted normally without the black screen problem. regzbot by Thorsten Leemhuis recommends adding the following link tag to the previous discussion at https://linux-regtracking.leemhuis.info/regzbot/mainline/ "When fixing, add this to the commit message to make regzbot notice patch postings and commits to resolve the issue:" Link: https://lore.kernel.org/r/[email protected]/
Sure. I will add below:
Fixes 201007ef707a ("PCI: Enable PASID only when ACS RR & UF enabled on upstream path")Reported-by Matt Fagnani <[email protected]>By the way, can I add your tested-by?
Signature · 2 lines
Best regards, baoluQuoted 156 lines
Thanks,
Matt
Quoted 150 lines · Lu Baolu
The PCIe fabric routes Memory Requests based on the TLP address, ignoring the PASID. In order to ensure system integrity, commit
201007ef707a("PCI:
Enable PASID only when ACS RR & UF enabled on upstream path") requires some ACS features being supported on device's upstream path when enabling PCI/PASID.One alternative is ATS which lets the device resolve the PASID+addr pair before a memory request is made into a routeable TLB address through the TA. Those resolved addresses are then cached on the device instead of in the IOMMU TLB and the device always sets the translated bit for PASID. One example of those devices are AMD graphic devices that always have ACS or ATS enabled together with PASID.
This adds a flag parameter in the
pci_enable_pasid()helper, with which the device driver could opt-in the fact that device always sets the translated bit for PASID.It also applies this opt-in for AMD graphic devices. Without this change, kernel boots to black screen on a system with below AMD graphic device:
00:01.0 VGA compatible controller: Advanced Micro Devices, Inc. [AMD/ATI] Wani [Radeon R5/R6/R7 Graphics] (rev ca) (prog-if 00 [VGA controller])
DeviceName: ATI EG BROADWAY
Subsystem: Hewlett-Packard Company Device 8332At present, it is a common practice to enable/disable PCI PASID in the iommu drivers. Considering that the device driver knows more about the specific device, we will follow up by moving
pci_enable_pasid()into the specific device drivers.Fixes 201007ef707a ("PCI: Enable PASID only when ACS RR & UF enabled on upstream path")Reported-by Matt Fagnani <[email protected]>Suggested-by Jason Gunthorpe <[email protected]>Suggested-by Christian König <[email protected]>Signed-off-by Lu Baolu <[email protected]>---
include/linux/pci-ats.h | 6 ++++-- drivers/iommu/amd/iommu.c | 2 +-drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c| 2 +- drivers/iommu/intel/iommu.c | 3 ++- drivers/pci/ats.c | 8 ++++++--5 files changed, 14 insertions(+), 7 deletions(-)Change log:
v2:
- Convert the bool to a named flag;
- Convert TRANSLED to XLATED.v1:
- https://lore.kernel.org/linux-iommu/[email protected]/include/linux/pci-ats.h +4
-2@@ -4,6 +4,8 @@ #include <linux/pci.h> +#define PCI_PASID_XLATED_REQ_ONLY BIT(0) + #ifdef CONFIG_PCI_ATS /* Address Translation Service */ bool pci_ats_supported(struct pci_dev *dev);@@ -35,12 +37,12 @@ static inline bool pci_pri_supported(struct pci_dev *pdev) #endif /* CONFIG_PCI_PRI */ #ifdef CONFIG_PCI_PASID -int pci_enable_pasid (struct pci_dev *pdev,int features); +int pci_enable_pasid (struct pci_dev *pdev,int features,int flags); void pci_disable_pasid(struct pci_dev *pdev); int pci_pasid_features(struct pci_dev *pdev); int pci_max_pasids(struct pci_dev *pdev); #else /* CONFIG_PCI_PASID */ -static inline int pci_enable_pasid (struct pci_dev *pdev,int features) +static inline int pci_enable_pasid (struct pci_dev *pdev,int features,int flags) { return -EINVAL; } static inline void pci_disable_pasid(struct pci_dev *pdev) { }static inline int
pci_pasid_features(struct pci_dev *pdev)drivers/iommu/amd/iommu.c +1
-1@@ -1700,7 +1700,7 @@ static int pdev_pri_ats_enable(struct pci_dev *pdev) int ret; /* Only allow access to user-accessible pages */ - ret = pci_enable_pasid(pdev, 0); + ret = pci_enable_pasid(pdev, 0, PCI_PASID_XLATED_REQ_ONLY); if (ret) goto out_err;drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +1
-1@@ -2350,7 +2350,7 @@ static int arm_smmu_enable_pasid(struct arm_smmu_master *master) if (num_pasids <= 0) return num_pasids; - ret = pci_enable_pasid(pdev, features); + ret = pci_enable_pasid(pdev, features, 0); if (ret) { dev_err(&pdev->dev, "Failed to enable PASID\n"); return ret;drivers/iommu/intel/iommu.c +0
-0@@ -1425,7 +1425,8 @@ static void iommu_enable_pci_caps(struct device_domain_info *info)undefined. So always enable PASID support on devices which have it, even if we can't yet know if we're ever going to use it. */
- if (info->pasid_supported&& !pci_enable_pasid(pdev,info->pasid_supported& ~1))
+ if (info->pasid_supported&&
+ !pci_enable_pasid(pdev,info->pasid_supported& ~1, 0))info->pasid_enabled= 1;
if (info->pri_supported&&drivers/pci/ats.c +6
-2@@ -353,12 +353,15 @@ void pci_pasid_init(struct pci_dev *pdev)* pci_enable_pasid - Enable the PASID capability * @pdev: PCI device structure * @features: Features to enable +* @flags: device-specific flags +* - PCI_PASID_XLATED_REQ_ONLY: The PCI device only issues PASID +* memory requests of translated type. * * Returns 0 on success, negative value on error. This function checks * whether the features are actually supported by the device and returns * an error if not. */ -int pci_enable_pasid (struct pci_dev *pdev,int features) +int pci_enable_pasid (struct pci_dev *pdev,int features,int flags) { u16 control, supported; int pasid = pdev->pasid_cap;@@ -382,7 +385,8 @@ int pci_enable_pasid(struct pci_dev *pdev, int features) if (!pasid) return -EINVAL; - if (!pci_acs_path_enabled(pdev, NULL, PCI_ACS_RR | PCI_ACS_UF)) + if (!(flags & PCI_PASID_XLATED_REQ_ONLY) && + !pci_acs_path_enabled(pdev, NULL, PCI_ACS_RR | PCI_ACS_UF)) return -EINVAL; pci_read_config_word(pdev, pasid + PCI_PASID_CAP, &supported);
Baolu Lu
maintainerQuoted 3 lines · Matt Fagnani
Baolu,
Yes, you can add the tested-by tag for me.
Thank you, Matt. I just posted a new version:
https://lore.kernel.org/linux-iommu/[email protected]/
--
Best regards,
baolu
Quoted 182 lines
Thanks,
Matt
Quoted 175 lines · Baolu Lu
Quoted 3 lines · Matt Fagnani
Baolu,
6.2-rc3 with v2 of this patch applied booted normally without the black screen problem. regzbot by Thorsten Leemhuis recommends adding the following link tag to the previous discussion at https://linux-regtracking.leemhuis.info/regzbot/mainline/ "When fixing, add this to the commit message to make regzbot notice patch postings and commits to resolve the issue:" Link: https://lore.kernel.org/r/[email protected]/
Sure. I will add below:
Fixes 201007ef707a ("PCI: Enable PASID only when ACS RR & UF enabled on upstream path")Reported-by Matt Fagnani <[email protected]>By the way, can I add your tested-by?
Signature · 2 lines
Best regards, baoluQuoted 156 lines
Thanks,
Matt
Quoted 150 lines · Lu Baolu
The PCIe fabric routes Memory Requests based on the TLP address, ignoring the PASID. In order to ensure system integrity, commit
201007ef707a("PCI:
Enable PASID only when ACS RR & UF enabled on upstream path") requires some ACS features being supported on device's upstream path when enabling PCI/PASID.One alternative is ATS which lets the device resolve the PASID+addr pair before a memory request is made into a routeable TLB address through the TA. Those resolved addresses are then cached on the device instead of in the IOMMU TLB and the device always sets the translated bit for PASID. One example of those devices are AMD graphic devices that always have ACS or ATS enabled together with PASID.
This adds a flag parameter in the
pci_enable_pasid()helper, with which the device driver could opt-in the fact that device always sets the translated bit for PASID.It also applies this opt-in for AMD graphic devices. Without this change, kernel boots to black screen on a system with below AMD graphic device:
00:01.0 VGA compatible controller: Advanced Micro Devices, Inc. [AMD/ATI] Wani [Radeon R5/R6/R7 Graphics] (rev ca) (prog-if 00 [VGA controller])
DeviceName: ATI EG BROADWAY
Subsystem: Hewlett-Packard Company Device 8332At present, it is a common practice to enable/disable PCI PASID in the iommu drivers. Considering that the device driver knows more about the specific device, we will follow up by moving
pci_enable_pasid()into the specific device drivers.Fixes 201007ef707a ("PCI: Enable PASID only when ACS RR & UF enabled on upstream path")Reported-by Matt Fagnani <[email protected]>Suggested-by Jason Gunthorpe <[email protected]>Suggested-by Christian König <[email protected]>Signed-off-by Lu Baolu <[email protected]>---
include/linux/pci-ats.h | 6 ++++-- drivers/iommu/amd/iommu.c | 2 +-drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c| 2 +- drivers/iommu/intel/iommu.c | 3 ++- drivers/pci/ats.c | 8 ++++++--5 files changed, 14 insertions(+), 7 deletions(-)Change log:
v2:
- Convert the bool to a named flag;
- Convert TRANSLED to XLATED.v1:
- https://lore.kernel.org/linux-iommu/[email protected]/include/linux/pci-ats.h +4
-2@@ -4,6 +4,8 @@ #include <linux/pci.h> +#define PCI_PASID_XLATED_REQ_ONLY BIT(0) + #ifdef CONFIG_PCI_ATS /* Address Translation Service */ bool pci_ats_supported(struct pci_dev *dev);@@ -35,12 +37,12 @@ static inline bool pci_pri_supported(struct pci_dev *pdev) #endif /* CONFIG_PCI_PRI */ #ifdef CONFIG_PCI_PASID -int pci_enable_pasid (struct pci_dev *pdev,int features); +int pci_enable_pasid (struct pci_dev *pdev,int features,int flags); void pci_disable_pasid(struct pci_dev *pdev); int pci_pasid_features(struct pci_dev *pdev); int pci_max_pasids(struct pci_dev *pdev); #else /* CONFIG_PCI_PASID */ -static inline int pci_enable_pasid (struct pci_dev *pdev,int features) +static inline int pci_enable_pasid (struct pci_dev *pdev,int features,int flags) { return -EINVAL; } static inline void pci_disable_pasid(struct pci_dev *pdev) { }static inline int
pci_pasid_features(struct pci_dev *pdev)drivers/iommu/amd/iommu.c +1
-1@@ -1700,7 +1700,7 @@ static int pdev_pri_ats_enable(struct pci_dev *pdev) int ret; /* Only allow access to user-accessible pages */ - ret = pci_enable_pasid(pdev, 0); + ret = pci_enable_pasid(pdev, 0, PCI_PASID_XLATED_REQ_ONLY); if (ret) goto out_err;drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +1
-1@@ -2350,7 +2350,7 @@ static int arm_smmu_enable_pasid(struct arm_smmu_master *master) if (num_pasids <= 0) return num_pasids; - ret = pci_enable_pasid(pdev, features); + ret = pci_enable_pasid(pdev, features, 0); if (ret) { dev_err(&pdev->dev, "Failed to enable PASID\n"); return ret;drivers/iommu/intel/iommu.c +0
-0@@ -1425,7 +1425,8 @@ static void iommu_enable_pci_caps(struct device_domain_info *info)undefined. So always enable PASID support on devices which have it, even if we can't yet know if we're ever going to use it. */
- if (info->pasid_supported&& !pci_enable_pasid(pdev,info->pasid_supported& ~1))
+ if (info->pasid_supported&&
+ !pci_enable_pasid(pdev,info->pasid_supported& ~1, 0))info->pasid_enabled= 1;
if (info->pri_supported&&drivers/pci/ats.c +6
-2@@ -353,12 +353,15 @@ void pci_pasid_init(struct pci_dev *pdev)* pci_enable_pasid - Enable the PASID capability * @pdev: PCI device structure * @features: Features to enable +* @flags: device-specific flags +* - PCI_PASID_XLATED_REQ_ONLY: The PCI device only issues PASID +* memory requests of translated type. * * Returns 0 on success, negative value on error. This function checks * whether the features are actually supported by the device and returns * an error if not. */ -int pci_enable_pasid (struct pci_dev *pdev,int features) +int pci_enable_pasid (struct pci_dev *pdev,int features,int flags) { u16 control, supported; int pasid = pdev->pasid_cap;@@ -382,7 +385,8 @@ int pci_enable_pasid(struct pci_dev *pdev, int features) if (!pasid) return -EINVAL; - if (!pci_acs_path_enabled(pdev, NULL, PCI_ACS_RR | PCI_ACS_UF)) + if (!(flags & PCI_PASID_XLATED_REQ_ONLY) && + !pci_acs_path_enabled(pdev, NULL, PCI_ACS_RR | PCI_ACS_UF)) return -EINVAL; pci_read_config_word(pdev, pasid + PCI_PASID_CAP, &supported);