Fix PF/VF dependency issue
v4 cover Fix PF/VF dependency issue
From: Kuppuswamy Sathyanarayanan <[email protected]>
Current implementation of ATS, PASID, PRI does not handle VF dependencies correctly. Following patches addresses this issue.
Changes since v1:
* Added more details about the patches in commit log.
* Removed bulk spec check patch.
* Addressed comments from Bjorn Helgaas.
Changes since v2:
* Added locking mechanism to synchronize accessing PF registers in VF.
* Removed spec compliance checks in patches.
* Addressed comments from Bjorn Helgaas.
Changes since v3:
* Fixed critical path (lock context) in pci_restore_*_state functions.
Kuppuswamy Sathyanarayanan (7):
PCI/ATS: Fix pci_prg_resp_pasid_required() dependency issues PCI/ATS: Initialize PRI in pci_ats_init()
PCI/ATS: Initialize PASID in pci_ats_init()
PCI/ATS: Add PRI support for PCIe VF devices
PCI/ATS: Add PASID support for PCIe VF devices PCI/ATS: Disable PF/VF ATS service independently
PCI: Skip Enhanced Allocation (EA) initialization for VF device
drivers/pci/ats.c | 378 ++++++++++++++++++++++++++++++---------- drivers/pci/pci.c | 7 + include/linux/pci-ats.h | 12 +- include/linux/pci.h | 7 +- 4 files changed, 310 insertions(+), 94 deletions(-)
Signature · 1 line
2.21.0
PATCH v4 1/7 PCI/ATS: Fix pci_prg_resp_pasid_required() dependency issues
From: Kuppuswamy Sathyanarayanan <[email protected]>
Since pci_prg_resp_pasid_required() function has dependency on both PASID and PRI, define it only if both CONFIG_PCI_PRI and CONFIG_PCI_PASID config options are enabled.
interface.")
--- drivers/pci/ats.c | 10 ++++++---- include/linux/pci-ats.h | 12 +++++++++--- 2 files changed, 15 insertions(+), 7 deletions(-)
drivers/pci/ats.c +6 -4
@@ -395,6 +395,8 @@ int pci_pasid_features(struct pci_dev *pdev) }EXPORT_SYMBOL_GPL (pci_pasid_features); +#ifdef CONFIG_PCI_PRI +/** * pci_prg_resp_pasid_required - Return PRG Response PASID Required bit * status.
@@ -402,10 +404,8 @@ EXPORT_SYMBOL_GPL(pci_pasid_features);* * Returns 1 if PASID is required in PRG Response Message, 0 otherwise. * -* Even though the PRG response PASID status is read from PRI Status -* Register, since this API will mainly be used by PASID users, this -* function is defined within #ifdef CONFIG_PCI_PASID instead of -* CONFIG_PCI_PRI. +* Since this API has dependency on both PRI and PASID, protect it +* with both CONFIG_PCI_PRI and CONFIG_PCI_PASID. */ int pci_prg_resp_pasid_required (struct pci_dev *pdev) {
@@ -425,6 +425,8 @@ int pci_prg_resp_pasid_required(struct pci_dev *pdev) }EXPORT_SYMBOL_GPL (pci_prg_resp_pasid_required); +#endif +#define PASID_NUMBER_SHIFT 8#define PASID_NUMBER_MASK (0x1f << PASID_NUMBER_SHIFT)/**
include/linux/pci-ats.h +9 -3
@@ -40,7 +40,6 @@ void pci_disable_pasid(struct pci_dev *pdev);void pci_restore_pasid_state (struct pci_dev *pdev);int pci_pasid_features (struct pci_dev *pdev);int pci_max_pasids (struct pci_dev *pdev); -int pci_prg_resp_pasid_required (struct pci_dev *pdev);#else /* CONFIG_PCI_PASID */
@@ -67,11 +66,18 @@ static inline int pci_max_pasids(struct pci_dev *pdev)return -EINVAL ; } +#endif /* CONFIG_PCI_PASID */ + +#if defined(CONFIG_PCI_PRI ) && defined(CONFIG_PCI_PASID ) + +int pci_prg_resp_pasid_required (struct pci_dev *pdev); + +#else /* CONFIG_PCI_PASID && CONFIG_PCI_PRI */ +static inline int pci_prg_resp_pasid_required (struct pci_dev *pdev) {return 0 ; } -#endif /* CONFIG_PCI_PASID */ - +#endif #endif /* LINUX_PCI_ATS_H*/
Signature · 1 line
2.21.0
PATCH v4 2/7 PCI/ATS: Initialize PRI in pci_ats_init()
In reply to [email protected]From: Kuppuswamy Sathyanarayanan <[email protected]>
Currently, PRI Capability checks are repeated across all PRI API's. Instead, cache the capability check result in pci_pri_init() and use it in other PRI API's. Also, since PRI is a shared resource between PF/VF, initialize default values for common PRI features in pci_pri_init().
--- drivers/pci/ats.c | 83 +++++++++++++++++++++++++++++++-------------- include/linux/pci.h | 1 + 2 files changed, 59 insertions(+), 25 deletions(-)
drivers/pci/ats.c +58 -25
@@ -16,6 +16,40 @@#include "pci.h" +#ifdef CONFIG_PCI_PRI +static void pci_pri_init (struct pci_dev *pdev) +{ +u32 max_requests; +int pos; + +/* +* As per PCIe r4.0, sec 9.3.7.11, only PF is permitted to +* implement PRI and all associated VFs can only use it. +* Since PF already initialized the PRI parameters there is +* no need to proceed further. +*/ +if (pdev->is_virtfn) +return ; + + pos =pci_find_ext_capability (pdev,PCI_EXT_CAP_ID_PRI ); +if (!pos) +return ; + +pci_read_config_dword (pdev, pos +PCI_PRI_MAX_REQ , &max_requests); + +/* +* Since PRI is a shared resource between PF and VF, we must not +* configure Outstanding Page Allocation Quota as a per device +* resource in pci_enable_pri(). So use maximum value possible +* as default value. +*/ +pci_write_config_dword (pdev, pos +PCI_PRI_ALLOC_REQ , max_requests); + + pdev->pri_reqs_alloc = max_requests; + pdev->pri_cap = pos; +} +#endif +void pci_ats_init (struct pci_dev *dev) {int pos;
@@ -28,6 +62,10 @@ void pci_ats_init(struct pci_dev *dev)return ; dev->ats_cap = pos; + +#ifdef CONFIG_PCI_PRI +pci_pri_init (dev); +#endif }/**
@@ -175,31 +213,34 @@ EXPORT_SYMBOL_GPL(pci_ats_page_aligned);* @ pdev: PCI device structure * * Returns 0 on success, negative value on error +* +* TODO: Since PRI is a shared resource between PF/VF, don't update +* Outstanding Page Allocation Quota in the same API as a per device +* feature. */ int pci_enable_pri (struct pci_dev *pdev,u32 reqs) {u16 control, status;u32 max_requests; -int pos;if (WARN_ON (pdev->pri_enabled))return -EBUSY ; - pos =pci_find_ext_capability (pdev,PCI_EXT_CAP_ID_PRI ); -if (!pos) +if (!pdev->pri_cap)return -EINVAL ; -pci_read_config_word (pdev, pos +PCI_PRI_STATUS , &status); +pci_read_config_word (pdev, pdev->pri_cap +PCI_PRI_STATUS , &status);if (!(status &PCI_PRI_STATUS_STOPPED ))return -EBUSY ; -pci_read_config_dword (pdev, pos +PCI_PRI_MAX_REQ , &max_requests); +pci_read_config_dword (pdev, pdev->pri_cap +PCI_PRI_MAX_REQ , + &max_requests); reqs =min (max_requests, reqs); pdev->pri_reqs_alloc = reqs; -pci_write_config_dword (pdev, pos +PCI_PRI_ALLOC_REQ , reqs); +pci_write_config_dword (pdev, pdev->pri_cap +PCI_PRI_ALLOC_REQ , reqs); control =PCI_PRI_CTRL_ENABLE ; -pci_write_config_word (pdev, pos +PCI_PRI_CTRL , control); +pci_write_config_word (pdev, pdev->pri_cap +PCI_PRI_CTRL , control); pdev->pri_enabled =1 ;
@@ -216,18 +257,16 @@ EXPORT_SYMBOL_GPL(pci_enable_pri);void pci_disable_pri (struct pci_dev *pdev) {u16 control; -int pos;if (WARN_ON (!pdev->pri_enabled))return ; - pos =pci_find_ext_capability (pdev,PCI_EXT_CAP_ID_PRI ); -if (!pos) +if (!pdev->pri_cap)return ; -pci_read_config_word (pdev, pos +PCI_PRI_CTRL , &control); +pci_read_config_word (pdev, pdev->pri_cap +PCI_PRI_CTRL , &control); control &= ~PCI_PRI_CTRL_ENABLE ; -pci_write_config_word (pdev, pos +PCI_PRI_CTRL , control); +pci_write_config_word (pdev, pdev->pri_cap +PCI_PRI_CTRL , control); pdev->pri_enabled =0 ; }
@@ -241,17 +280,15 @@ void pci_restore_pri_state(struct pci_dev *pdev) {u16 control =PCI_PRI_CTRL_ENABLE ;u32 reqs = pdev->pri_reqs_alloc; -int pos;if (!pdev->pri_enabled)return ; - pos =pci_find_ext_capability (pdev,PCI_EXT_CAP_ID_PRI ); -if (!pos) +if (!pdev->pri_cap)return ; -pci_write_config_dword (pdev, pos +PCI_PRI_ALLOC_REQ , reqs); -pci_write_config_word (pdev, pos +PCI_PRI_CTRL , control); +pci_write_config_dword (pdev, pdev->pri_cap +PCI_PRI_ALLOC_REQ , reqs); +pci_write_config_word (pdev, pdev->pri_cap +PCI_PRI_CTRL , control); }EXPORT_SYMBOL_GPL (pci_restore_pri_state);
@@ -265,17 +302,15 @@ EXPORT_SYMBOL_GPL(pci_restore_pri_state);int pci_reset_pri (struct pci_dev *pdev) {u16 control; -int pos;if (WARN_ON (pdev->pri_enabled))return -EBUSY ; - pos =pci_find_ext_capability (pdev,PCI_EXT_CAP_ID_PRI ); -if (!pos) +if (!pdev->pri_cap)return -EINVAL ; control =PCI_PRI_CTRL_RESET ; -pci_write_config_word (pdev, pos +PCI_PRI_CTRL , control); +pci_write_config_word (pdev, pdev->pri_cap +PCI_PRI_CTRL , control);return 0 ; }
@@ -410,13 +445,11 @@ EXPORT_SYMBOL_GPL(pci_pasid_features);int pci_prg_resp_pasid_required (struct pci_dev *pdev) {u16 status; -int pos; - pos =pci_find_ext_capability (pdev,PCI_EXT_CAP_ID_PRI ); -if (!pos) +if (!pdev->pri_cap)return 0 ; -pci_read_config_word (pdev, pos +PCI_PRI_STATUS , &status); +pci_read_config_word (pdev, pdev->pri_cap +PCI_PRI_STATUS , &status);if (status &PCI_PRI_STATUS_PASID )return 1 ;
include/linux/pci.h +1 -0
@@ -452,6 +452,7 @@ struct pci_dev {atomic_t ats_ref_cnt;/* Number of VFs with ATS enabled */ #endif #ifdef CONFIG_PCI_PRI +u16 pri_cap;/* PRI Capability offset */ u32 pri_reqs_alloc;/* Number of PRI requests allocated */ #endif #ifdef CONFIG_PCI_PASID
Signature · 1 line
2.21.0
Re: [PATCH v4 2/7] PCI/ATS: Initialize PRI in pci_ats_init()
Quoted 38 lines · On Wed, Jul 03, 2019 at 01:46:19PM -0700…
drivers/pci/ats.c +34
-0+#ifdef CONFIG_PCI_PRI +static void pci_pri_init (struct pci_dev *pdev) +{ +u32 max_requests; +int pos; + +/* +* As per PCIe r4.0, sec 9.3.7.11, only PF is permitted to +* implement PRI and all associated VFs can only use it. +* Since PF already initialized the PRI parameters there is +* no need to proceed further. +*/ +if (pdev->is_virtfn) +return ; + + pos =pci_find_ext_capability (pdev,PCI_EXT_CAP_ID_PRI ); +if (!pos) +return ; + +pci_read_config_dword (pdev, pos +PCI_PRI_MAX_REQ , &max_requests); + +/* +* Since PRI is a shared resource between PF and VF, we must not +* configure Outstanding Page Allocation Quota as a per device +* resource in pci_enable_pri(). So use maximum value possible +* as default value. +*/ +pci_write_config_dword (pdev, pos +PCI_PRI_ALLOC_REQ , max_requests); + + pdev->pri_reqs_alloc = max_requests; + pdev->pri_cap = pos; +} +#endif +void pci_ats_init (struct pci_dev *dev) {int pos;
drivers/pci/ats.c void pci_ats_init(struct pci_dev *dev) · line 69
Quoted 8 lines
drivers/pci/ats.c +4
-0@@ -28,6 +62,10 @@ void pci_ats_init(struct pci_dev *dev)return ; dev->ats_cap = pos; + +#ifdef CONFIG_PCI_PRI +pci_pri_init (dev); +#endif }
Rather than surround the call to pci_pri_init() with the #ifdef, you should provide an empty function implementation when CONFIG_PCI_PRI is not defined. Same thing for the next patch adding PASID.
Re: [PATCH v4 2/7] PCI/ATS: Initialize PRI in pci_ats_init()
Hi Keith,
Thanks for the review.
Quoted 41 lines · Keith Busch
Quoted 40 lines · On Wed, Jul 03, 2019 at 01:46:19PM -0700…
drivers/pci/ats.c +34
-0+#ifdef CONFIG_PCI_PRI +static void pci_pri_init (struct pci_dev *pdev) +{ +u32 max_requests; +int pos; + +/* +* As per PCIe r4.0, sec 9.3.7.11, only PF is permitted to +* implement PRI and all associated VFs can only use it. +* Since PF already initialized the PRI parameters there is +* no need to proceed further. +*/ +if (pdev->is_virtfn) +return ; + + pos =pci_find_ext_capability (pdev,PCI_EXT_CAP_ID_PRI ); +if (!pos) +return ; + +pci_read_config_dword (pdev, pos +PCI_PRI_MAX_REQ , &max_requests); + +/* +* Since PRI is a shared resource between PF and VF, we must not +* configure Outstanding Page Allocation Quota as a per device +* resource in pci_enable_pri(). So use maximum value possible +* as default value. +*/ +pci_write_config_dword (pdev, pos +PCI_PRI_ALLOC_REQ , max_requests); + + pdev->pri_reqs_alloc = max_requests; + pdev->pri_cap = pos; +} +#endif +void pci_ats_init (struct pci_dev *dev) {int pos;@@ -28,6 +62,10 @@ void pci_ats_init(struct pci_dev *dev)return ;
Quoted 9 lines
drivers/pci/ats.c void pci_ats_init(struct pci_dev *dev) · line 69
Quoted 6 lines
drivers/pci/ats.c +4
-0dev->ats_cap = pos; + +#ifdef CONFIG_PCI_PRI +pci_pri_init (dev); +#endif }Rather than surround the call to
pci_pri_init()with the #ifdef, you should provide an empty function implementation whenCONFIG_PCI_PRIis not defined. Same thing for the next patch adding PASID.
This function is defined and used in the same file (ats.c). Is there any advantage in defining an empty function ? But if this is the recommended approach, I can make the necessary changes. Please confirm.
Quoted 1 line
Signature · 2 lines
Sathyanarayanan Kuppuswamy Linux kernel developer
Re: [PATCH v4 2/7] PCI/ATS: Initialize PRI in pci_ats_init()
Quoted 8 lines · sathyanarayanan kuppuswamy
Quoted 3 lines · Keith Busch
Rather than surround the call to
pci_pri_init()with the #ifdef, you should provide an empty function implementation whenCONFIG_PCI_PRIis not defined. Same thing for the next patch adding PASID.This function is defined and used in the same file (
ats.c). Is there any advantage in defining an empty function ? But if this is the recommended approach, I can make the necessary changes. Please confirm.
That way is just the existing convention, so it's recommended for kernel style consistency. See the "Conditional Compilation" section in Documentation/process/coding-style.rst (currently section 21).
PATCH v4 3/7 PCI/ATS: Initialize PASID in pci_ats_init()
In reply to [email protected]From: Kuppuswamy Sathyanarayanan <[email protected]>
Currently, PASID Capability checks are repeated across all PASID API's. Instead, cache the capability check result in pci_pasid_init() and use it in other PASID API's. Also, since PASID is a shared resource between PF/VF, initialize PASID features with default values in pci_pasid_init().
--- drivers/pci/ats.c | 76 ++++++++++++++++++++++++++++++++------------- include/linux/pci.h | 1 + 2 files changed, 56 insertions(+), 21 deletions(-)
drivers/pci/ats.c +55 -21
@@ -50,6 +50,41 @@ static void pci_pri_init(struct pci_dev *pdev) }#endif +#ifdef CONFIG_PCI_PASID +static void pci_pasid_init (struct pci_dev *pdev) +{ +u16 supported; +int pos; + +/* +* As per PCIe r4.0, sec 9.3.7.14, only PF is permitted to +* implement PASID Capability and all associated VFs can +* only use it. Since PF already initialized the PASID +* parameters there is no need to proceed further. +*/ +if (pdev->is_virtfn) +return ; + + pos =pci_find_ext_capability (pdev,PCI_EXT_CAP_ID_PASID ); +if (!pos) +return ; + +pci_read_config_word (pdev, pos +PCI_PASID_CAP , &supported); + + supported &=PCI_PASID_CAP_EXEC |PCI_PASID_CAP_PRIV ; + +/* +* Enable all supported features. Since PASID is a shared +* resource between PF/VF, we must not set this feature as +* a per device property in pci_enable_pasid(). +*/ +pci_write_config_word (pdev, pos +PCI_PASID_CTRL , supported); + + pdev->pasid_features = supported; + pdev->pasid_cap = pos; +} +#endif +void pci_ats_init (struct pci_dev *dev) {int pos;
@@ -66,6 +101,9 @@ void pci_ats_init(struct pci_dev *dev)#ifdef CONFIG_PCI_PRI pci_pri_init (dev);#endif +#ifdef CONFIG_PCI_PASID +pci_pasid_init (dev); +#endif }/**
@@ -326,11 +364,13 @@ EXPORT_SYMBOL_GPL(pci_reset_pri);* 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. +* +* TODO: Since PASID is a shared resource between PF/VF, don't update +* PASID features in the same API as a per device feature. */ int pci_enable_pasid (struct pci_dev *pdev,int features) {u16 control, supported; -int pos;if (WARN_ON (pdev->pasid_enabled))return -EBUSY ;
@@ -338,11 +378,11 @@ int pci_enable_pasid(struct pci_dev *pdev, int features)if (!pdev->eetlp_prefix_path)return -EINVAL ; - pos =pci_find_ext_capability (pdev,PCI_EXT_CAP_ID_PASID ); -if (!pos) +if (!pdev->pasid_cap)return -EINVAL ; -pci_read_config_word (pdev, pos +PCI_PASID_CAP , &supported); +pci_read_config_word (pdev, pdev->pasid_cap +PCI_PASID_CAP , + &supported); supported &=PCI_PASID_CAP_EXEC |PCI_PASID_CAP_PRIV ;/* User wants to enable anything unsupported? */
@@ -352,7 +392,7 @@ int pci_enable_pasid(struct pci_dev *pdev, int features) control =PCI_PASID_CTRL_ENABLE | features; pdev->pasid_features = features; -pci_write_config_word (pdev, pos +PCI_PASID_CTRL , control); +pci_write_config_word (pdev, pdev->pasid_cap +PCI_PASID_CTRL , control); pdev->pasid_enabled =1 ;
@@ -367,16 +407,14 @@ EXPORT_SYMBOL_GPL(pci_enable_pasid);void pci_disable_pasid (struct pci_dev *pdev) {u16 control =0 ; -int pos;if (WARN_ON (!pdev->pasid_enabled))return ; - pos =pci_find_ext_capability (pdev,PCI_EXT_CAP_ID_PASID ); -if (!pos) +if (!pdev->pasid_cap)return ; -pci_write_config_word (pdev, pos +PCI_PASID_CTRL , control); +pci_write_config_word (pdev, pdev->pasid_cap +PCI_PASID_CTRL , control); pdev->pasid_enabled =0 ; }
@@ -389,17 +427,15 @@ EXPORT_SYMBOL_GPL(pci_disable_pasid);void pci_restore_pasid_state (struct pci_dev *pdev) {u16 control; -int pos;if (!pdev->pasid_enabled)return ; - pos =pci_find_ext_capability (pdev,PCI_EXT_CAP_ID_PASID ); -if (!pos) +if (!pdev->pasid_cap)return ; control =PCI_PASID_CTRL_ENABLE | pdev->pasid_features; -pci_write_config_word (pdev, pos +PCI_PASID_CTRL , control); +pci_write_config_word (pdev, pdev->pasid_cap +PCI_PASID_CTRL , control); }EXPORT_SYMBOL_GPL (pci_restore_pasid_state);
@@ -416,13 +452,12 @@ EXPORT_SYMBOL_GPL(pci_restore_pasid_state);int pci_pasid_features (struct pci_dev *pdev) {u16 supported; -int pos; - pos =pci_find_ext_capability (pdev,PCI_EXT_CAP_ID_PASID ); -if (!pos) +if (!pdev->pasid_cap)return -EINVAL ; -pci_read_config_word (pdev, pos +PCI_PASID_CAP , &supported); +pci_read_config_word (pdev, pdev->pasid_cap +PCI_PASID_CAP , + &supported); supported &=PCI_PASID_CAP_EXEC |PCI_PASID_CAP_PRIV ;
@@ -472,13 +507,12 @@ EXPORT_SYMBOL_GPL(pci_prg_resp_pasid_required);int pci_max_pasids (struct pci_dev *pdev) {u16 supported; -int pos; - pos =pci_find_ext_capability (pdev,PCI_EXT_CAP_ID_PASID ); -if (!pos) +if (!pdev->pasid_cap)return -EINVAL ; -pci_read_config_word (pdev, pos +PCI_PASID_CAP , &supported); +pci_read_config_word (pdev, pdev->pasid_cap +PCI_PASID_CAP , + &supported); supported = (supported &PASID_NUMBER_MASK ) >>PASID_NUMBER_SHIFT ;
include/linux/pci.h +1 -0
@@ -456,6 +456,7 @@ struct pci_dev {u32 pri_reqs_alloc;/* Number of PRI requests allocated */ #endif #ifdef CONFIG_PCI_PASID +u16 pasid_cap;/* PASID Capability offset */ u16 pasid_features;#endif #ifdef CONFIG_PCI_P2PDMA
Signature · 1 line
2.21.0
PATCH v4 4/7 PCI/ATS: Add PRI support for PCIe VF devices
In reply to [email protected]From: Kuppuswamy Sathyanarayanan <[email protected]>
When IOMMU tries to enable Page Request Interface (PRI) for VF device in iommu_enable_dev_iotlb(), it always fails because PRI support for PCIe VF device is currently broken. Current implementation expects the given PCIe device (PF & VF) to implement PRI capability before enabling the PRI support. But this assumption is incorrect. As per PCIe spec r4.0, sec 9.3.7.11, all VFs associated with PF can only use the PRI of the PF and not implement it. Hence we need to create exception for handling the PRI support for PCIe VF device.
Also, since PRI is a shared resource between PF/VF, following rules should apply.
1. Use proper locking before accessing/modifying PF resources in VF PRI enable/disable call.
2. Use reference count logic to track the usage of PRI resource.
3. Disable PRI only if the PRI reference count (pri_ref_cnt) is zero.
--- drivers/pci/ats.c | 143 ++++++++++++++++++++++++++++++++++---------- include/linux/pci.h | 2 + 2 files changed, 112 insertions(+), 33 deletions(-)
drivers/pci/ats.c +110 -33
@@ -31,6 +31,8 @@ static void pci_pri_init(struct pci_dev *pdev)if (pdev->is_virtfn)return ; +mutex_init (&pdev->pri_lock); + pos =pci_find_ext_capability (pdev,PCI_EXT_CAP_ID_PRI );if (!pos)return ;
@@ -260,29 +262,57 @@ int pci_enable_pri(struct pci_dev *pdev, u32 reqs) {u16 control, status;u32 max_requests; +int ret =0 ; +struct pci_dev *pf =pci_physfn (pdev); -if (WARN_ON (pdev->pri_enabled)) -return -EBUSY ; +mutex_lock (&pf->pri_lock); -if (!pdev->pri_cap) -return -EINVAL ; +if (WARN_ON (pdev->pri_enabled)) { + ret = -EBUSY ; + goto pri_unlock; + } -pci_read_config_word (pdev, pdev->pri_cap +PCI_PRI_STATUS , &status); -if (!(status &PCI_PRI_STATUS_STOPPED )) -return -EBUSY ; +if (!pf->pri_cap) { + ret = -EINVAL ; + goto pri_unlock; + } + +if (pdev->is_virtfn && pf->pri_enabled) + goto update_status; + +/* +* Before updating PRI registers, make sure there is no +* outstanding PRI requests. +*/ +pci_read_config_word (pf, pf->pri_cap +PCI_PRI_STATUS , &status); +if (!(status &PCI_PRI_STATUS_STOPPED )) { + ret = -EBUSY ; + goto pri_unlock; + } -pci_read_config_dword (pdev, pdev->pri_cap +PCI_PRI_MAX_REQ , - &max_requests); +pci_read_config_dword (pf, pf->pri_cap +PCI_PRI_MAX_REQ , &max_requests); reqs =min (max_requests, reqs); - pdev->pri_reqs_alloc = reqs; -pci_write_config_dword (pdev, pdev->pri_cap +PCI_PRI_ALLOC_REQ , reqs); + pf->pri_reqs_alloc = reqs; +pci_write_config_dword (pf, pf->pri_cap +PCI_PRI_ALLOC_REQ , reqs); control =PCI_PRI_CTRL_ENABLE ; -pci_write_config_word (pdev, pdev->pri_cap +PCI_PRI_CTRL , control); +pci_write_config_word (pf, pf->pri_cap +PCI_PRI_CTRL , control); - pdev->pri_enabled =1 ; +/* +* If PRI is not already enabled in PF, increment the PF +* pri_ref_cnt to track the usage of PRI interface. +*/ +if (pdev->is_virtfn && !pf->pri_enabled) { +atomic_inc (&pf->pri_ref_cnt); + pf->pri_enabled =1 ; + } -return 0 ; +update_status: +atomic_inc (&pf->pri_ref_cnt); + pdev->pri_enabled =1 ; +pri_unlock: +mutex_unlock (&pf->pri_lock); +return ret; }EXPORT_SYMBOL_GPL (pci_enable_pri);
@@ -295,18 +325,30 @@ EXPORT_SYMBOL_GPL(pci_enable_pri);void pci_disable_pri (struct pci_dev *pdev) {u16 control; +struct pci_dev *pf =pci_physfn (pdev); -if (WARN_ON (!pdev->pri_enabled)) -return ; +mutex_lock (&pf->pri_lock); -if (!pdev->pri_cap) -return ; +if (WARN_ON (!pdev->pri_enabled) || !pf->pri_cap) + goto pri_unlock; + +atomic_dec (&pf->pri_ref_cnt); -pci_read_config_word (pdev, pdev->pri_cap +PCI_PRI_CTRL , &control); +/* +* If pri_ref_cnt is not zero, then don't modify hardware +* registers. +*/ +if (atomic_read (&pf->pri_ref_cnt)) + goto done; + +pci_read_config_word (pf, pf->pri_cap +PCI_PRI_CTRL , &control); control &= ~PCI_PRI_CTRL_ENABLE ; -pci_write_config_word (pdev, pdev->pri_cap +PCI_PRI_CTRL , control); +pci_write_config_word (pf, pf->pri_cap +PCI_PRI_CTRL , control); +done: pdev->pri_enabled =0 ; +pri_unlock: +mutex_unlock (&pf->pri_lock); }EXPORT_SYMBOL_GPL (pci_disable_pri);
@@ -316,17 +358,31 @@ EXPORT_SYMBOL_GPL(pci_disable_pri);*/ void pci_restore_pri_state (struct pci_dev *pdev) { -u16 control =PCI_PRI_CTRL_ENABLE ; -u32 reqs = pdev->pri_reqs_alloc; +u16 control; +u32 reqs; +struct pci_dev *pf =pci_physfn (pdev);if (!pdev->pri_enabled)return ; -if (!pdev->pri_cap) +if (!pf->pri_cap)return ; -pci_write_config_dword (pdev, pdev->pri_cap +PCI_PRI_ALLOC_REQ , reqs); -pci_write_config_word (pdev, pdev->pri_cap +PCI_PRI_CTRL , control); +mutex_lock (&pf->pri_lock); + +/* If PRI is already enabled by other VF's or PF, return */ +pci_read_config_word (pf, pf->pri_cap +PCI_PRI_CTRL , &control); +if (control &PCI_PRI_CTRL_ENABLE ) + goto pri_unlock; + + reqs = pf->pri_reqs_alloc; + control =PCI_PRI_CTRL_ENABLE ; + +pci_write_config_dword (pf, pf->pri_cap +PCI_PRI_ALLOC_REQ , reqs); +pci_write_config_word (pf, pf->pri_cap +PCI_PRI_CTRL , control); + +pri_unlock: +mutex_unlock (&pf->pri_lock); }EXPORT_SYMBOL_GPL (pci_restore_pri_state);
@@ -339,18 +395,32 @@ EXPORT_SYMBOL_GPL(pci_restore_pri_state);*/ int pci_reset_pri (struct pci_dev *pdev) { +struct pci_dev *pf =pci_physfn (pdev);u16 control; +int ret =0 ; -if (WARN_ON (pdev->pri_enabled)) -return -EBUSY ; +mutex_lock (&pf->pri_lock); -if (!pdev->pri_cap) -return -EINVAL ; +if (WARN_ON (pdev->pri_enabled)) { + ret = -EBUSY ; + goto done; + } + +if (!pf->pri_cap) { + ret = -EINVAL ; + goto done; + } + +/* If PRI is already enabled by other VF's or PF, return 0 */ +if (pf->pri_enabled) + goto done; control =PCI_PRI_CTRL_RESET ; -pci_write_config_word (pdev, pdev->pri_cap +PCI_PRI_CTRL , control); -return 0 ; +pci_write_config_word (pf, pf->pri_cap +PCI_PRI_CTRL , control); +done: +mutex_unlock (&pf->pri_lock); +return ret; }EXPORT_SYMBOL_GPL (pci_reset_pri);#endif /* CONFIG_PCI_PRI */
@@ -480,11 +550,18 @@ EXPORT_SYMBOL_GPL(pci_pasid_features);int pci_prg_resp_pasid_required (struct pci_dev *pdev) {u16 status; +struct pci_dev *pf =pci_physfn (pdev); + +mutex_lock (&pf->pri_lock); -if (!pdev->pri_cap) +if (!pf->pri_cap) { +mutex_unlock (&pf->pri_lock);return 0 ; + } + +pci_read_config_word (pf, pf->pri_cap +PCI_PRI_STATUS , &status); -pci_read_config_word (pdev, pdev->pri_cap +PCI_PRI_STATUS , &status); +mutex_unlock (&pf->pri_lock);if (status &PCI_PRI_STATUS_PASID )return 1 ;
include/linux/pci.h +2 -0
@@ -452,8 +452,10 @@ struct pci_dev {atomic_t ats_ref_cnt;/* Number of VFs with ATS enabled */ #endif #ifdef CONFIG_PCI_PRI +struct mutex pri_lock;/* PRI enable lock */ u16 pri_cap;/* PRI Capability offset */ u32 pri_reqs_alloc;/* Number of PRI requests allocated */ +atomic_t pri_ref_cnt;/* Number of PF/VF PRI users */ #endif #ifdef CONFIG_PCI_PASID u16 pasid_cap;/* PASID Capability offset */
Signature · 1 line
2.21.0
PATCH v4 5/7 PCI/ATS: Add PASID support for PCIe VF devices
In reply to [email protected]From: Kuppuswamy Sathyanarayanan <[email protected]>
When IOMMU tries to enable PASID for VF device in iommu_enable_dev_iotlb(), it always fails because PASID support for PCIe VF device is currently broken in PCIE driver. Current implementation expects the given PCIe device (PF & VF) to implement PASID capability before enabling the PASID support. But this assumption is incorrect. As per PCIe spec r4.0, sec 9.3.7.14, all VFs associated with PF can only use the PASID of the PF and not implement it.
Also, since PASID is a shared resource between PF/VF, following rules should apply.
1. Use proper locking before accessing/modifying PF resources in VF PASID enable/disable call.
2. Use reference count logic to track the usage of PASID resource.
3. Disable PASID only if the PASID reference count (pasid_ref_cnt) is zero.
--- drivers/pci/ats.c | 113 ++++++++++++++++++++++++++++++++++---------- include/linux/pci.h | 2 + 2 files changed, 90 insertions(+), 25 deletions(-)
drivers/pci/ats.c +88 -25
@@ -67,6 +67,8 @@ static void pci_pasid_init(struct pci_dev *pdev)if (pdev->is_virtfn)return ; +mutex_init (&pdev->pasid_lock); + pos =pci_find_ext_capability (pdev,PCI_EXT_CAP_ID_PASID );if (!pos)return ;
@@ -441,32 +443,57 @@ EXPORT_SYMBOL_GPL(pci_reset_pri);int pci_enable_pasid (struct pci_dev *pdev,int features) {u16 control, supported; +int ret =0 ; +struct pci_dev *pf =pci_physfn (pdev); -if (WARN_ON (pdev->pasid_enabled)) -return -EBUSY ; +mutex_lock (&pf->pasid_lock); -if (!pdev->eetlp_prefix_path) -return -EINVAL ; +if (WARN_ON (pdev->pasid_enabled)) { + ret = -EBUSY ; + goto pasid_unlock; + } -if (!pdev->pasid_cap) -return -EINVAL ; +if (!pdev->eetlp_prefix_path) { + ret = -EINVAL ; + goto pasid_unlock; + } -pci_read_config_word (pdev, pdev->pasid_cap +PCI_PASID_CAP , - &supported); +if (!pf->pasid_cap) { + ret = -EINVAL ; + goto pasid_unlock; + } + +if (pdev->is_virtfn && pf->pasid_enabled) + goto update_status; + +pci_read_config_word (pf, pf->pasid_cap +PCI_PASID_CAP , &supported); supported &=PCI_PASID_CAP_EXEC |PCI_PASID_CAP_PRIV ;/* User wants to enable anything unsupported? */ -if ((supported & features) != features) -return -EINVAL ; +if ((supported & features) != features) { + ret = -EINVAL ; + goto pasid_unlock; + } control =PCI_PASID_CTRL_ENABLE | features; - pdev->pasid_features = features; - + pf->pasid_features = features;pci_write_config_word (pdev, pdev->pasid_cap +PCI_PASID_CTRL , control); - pdev->pasid_enabled =1 ; +/* +* If PASID is not already enabled in PF, increment pasid_ref_cnt +* to count PF PASID usage. +*/ +if (pdev->is_virtfn && !pf->pasid_enabled) { +atomic_inc (&pf->pasid_ref_cnt); + pf->pasid_enabled =1 ; + } -return 0 ; +update_status: +atomic_inc (&pf->pasid_ref_cnt); + pdev->pasid_enabled =1 ; +pasid_unlock: +mutex_unlock (&pf->pasid_lock); +return ret; }EXPORT_SYMBOL_GPL (pci_enable_pasid);
@@ -477,16 +504,29 @@ EXPORT_SYMBOL_GPL(pci_enable_pasid);void pci_disable_pasid (struct pci_dev *pdev) {u16 control =0 ; +struct pci_dev *pf =pci_physfn (pdev); + +mutex_lock (&pf->pasid_lock);if (WARN_ON (!pdev->pasid_enabled)) -return ; + goto pasid_unlock; -if (!pdev->pasid_cap) -return ; +if (!pf->pasid_cap) + goto pasid_unlock; -pci_write_config_word (pdev, pdev->pasid_cap +PCI_PASID_CTRL , control); +atomic_dec (&pf->pasid_ref_cnt); +if (atomic_read (&pf->pasid_ref_cnt)) + goto done; + +/* Disable PASID only if pasid_ref_cnt is zero */ +pci_write_config_word (pf, pf->pasid_cap +PCI_PASID_CTRL , control); + +done: pdev->pasid_enabled =0 ; +pasid_unlock: +mutex_unlock (&pf->pasid_lock); + }EXPORT_SYMBOL_GPL (pci_disable_pasid);
@@ -497,15 +537,25 @@ EXPORT_SYMBOL_GPL(pci_disable_pasid);void pci_restore_pasid_state (struct pci_dev *pdev) {u16 control; +struct pci_dev *pf =pci_physfn (pdev);if (!pdev->pasid_enabled)return ; -if (!pdev->pasid_cap) +if (!pf->pasid_cap)return ; +mutex_lock (&pf->pasid_lock); + +pci_read_config_word (pf, pf->pasid_cap +PCI_PASID_CTRL , &control); +if (control &PCI_PASID_CTRL_ENABLE ) + goto pasid_unlock; + control =PCI_PASID_CTRL_ENABLE | pdev->pasid_features; -pci_write_config_word (pdev, pdev->pasid_cap +PCI_PASID_CTRL , control); +pci_write_config_word (pf, pf->pasid_cap +PCI_PASID_CTRL , control); + +pasid_unlock: +mutex_unlock (&pf->pasid_lock); }EXPORT_SYMBOL_GPL (pci_restore_pasid_state);
@@ -522,15 +572,22 @@ EXPORT_SYMBOL_GPL(pci_restore_pasid_state);int pci_pasid_features (struct pci_dev *pdev) {u16 supported; +struct pci_dev *pf =pci_physfn (pdev); + +mutex_lock (&pf->pasid_lock); -if (!pdev->pasid_cap) +if (!pf->pasid_cap) { +mutex_unlock (&pf->pasid_lock);return -EINVAL ; + } -pci_read_config_word (pdev, pdev->pasid_cap +PCI_PASID_CAP , +pci_read_config_word (pf, pf->pasid_cap +PCI_PASID_CAP , &supported); supported &=PCI_PASID_CAP_EXEC |PCI_PASID_CAP_PRIV ; +mutex_unlock (&pf->pasid_lock); +return supported; }EXPORT_SYMBOL_GPL (pci_pasid_features);
@@ -584,15 +641,21 @@ EXPORT_SYMBOL_GPL(pci_prg_resp_pasid_required);int pci_max_pasids (struct pci_dev *pdev) {u16 supported; +struct pci_dev *pf =pci_physfn (pdev); + +mutex_lock (&pf->pasid_lock); -if (!pdev->pasid_cap) +if (!pf->pasid_cap) { +mutex_unlock (&pf->pasid_lock);return -EINVAL ; + } -pci_read_config_word (pdev, pdev->pasid_cap +PCI_PASID_CAP , - &supported); +pci_read_config_word (pf, pf->pasid_cap +PCI_PASID_CAP , &supported); supported = (supported &PASID_NUMBER_MASK ) >>PASID_NUMBER_SHIFT ; +mutex_unlock (&pf->pasid_lock); +return (1 << supported); }EXPORT_SYMBOL_GPL (pci_max_pasids);
include/linux/pci.h +2 -0
@@ -458,8 +458,10 @@ struct pci_dev {atomic_t pri_ref_cnt;/* Number of PF/VF PRI users */ #endif #ifdef CONFIG_PCI_PASID +struct mutex pasid_lock;/* PASID enable lock */ u16 pasid_cap;/* PASID Capability offset */ u16 pasid_features; +atomic_t pasid_ref_cnt;/* Number of VFs with PASID enabled */ #endif #ifdef CONFIG_PCI_P2PDMA struct pci_p2pdma *p2pdma;
Signature · 1 line
2.21.0
PATCH v4 6/7 PCI/ATS: Disable PF/VF ATS service independently
In reply to [email protected]From: Kuppuswamy Sathyanarayanan <[email protected]>
Currently all VF's needs to be disable their ATS service before disabling the ATS service in corresponding PF device. But this logic is incorrect and does not align with the spec. Also it might lead to some power and performance impact in the system. As per PCIe spec r4.0, sec 9.3.7.8, ATS Capabilities in VFs and their associated PFs may be enabled/disabled independently. So remove this dependency logic in enable/disable code.
--- drivers/pci/ats.c | 11 ----------- include/linux/pci.h | 1 - 2 files changed, 12 deletions(-)
drivers/pci/ats.c +0 -11
@@ -140,8 +140,6 @@ int pci_enable_ats(struct pci_dev *dev, int ps) pdev =pci_physfn (dev);if (pdev->ats_stu != ps)return -EINVAL ; - -atomic_inc (&pdev->ats_ref_cnt);/* count enabled VFs */ }else { dev->ats_stu = ps; ctrl |=PCI_ATS_CTRL_STU (dev->ats_stu -PCI_ATS_MIN_STU );
@@ -159,20 +157,11 @@ EXPORT_SYMBOL_GPL(pci_enable_ats);*/ void pci_disable_ats (struct pci_dev *dev) { -struct pci_dev *pdev;u16 ctrl;if (WARN_ON (!dev->ats_enabled))return ; -if (atomic_read (&dev->ats_ref_cnt)) -return ;/* VFs still enabled */ - -if (dev->is_virtfn) { - pdev =pci_physfn (dev); -atomic_dec (&pdev->ats_ref_cnt); - } -pci_read_config_word (dev, dev->ats_cap +PCI_ATS_CTRL , &ctrl); ctrl &= ~PCI_ATS_CTRL_ENABLE ;pci_write_config_word (dev, dev->ats_cap +PCI_ATS_CTRL , ctrl);
include/linux/pci.h +0 -1
@@ -449,7 +449,6 @@ struct pci_dev { };u16 ats_cap;/* ATS Capability offset */ u8 ats_stu;/* ATS Smallest Translation Unit */ -atomic_t ats_ref_cnt;/* Number of VFs with ATS enabled */ #endif #ifdef CONFIG_PCI_PRI struct mutex pri_lock;/* PRI enable lock */
Signature · 1 line
2.21.0
PATCH v4 7/7 PCI: Skip Enhanced Allocation (EA) initialization for VF device
In reply to [email protected]From: Kuppuswamy Sathyanarayanan <[email protected]>
As per PCIe r4.0, sec 9.3.6, VF must not implement Enhanced Allocation Capability. So skip pci_ea_init() for virtual devices.
--- drivers/pci/pci.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/pci/pci.c +7 -0
@@ -2986,6 +2986,13 @@ void pci_ea_init(struct pci_dev *dev)int offset;int i; +/* +* Per PCIe r4.0, sec 9.3.6, VF must not implement Enhanced +* Allocation Capability. +*/ +if (dev->is_virtfn) +return ; +/* find PCI EA capability in list */ ea =pci_find_capability (dev,PCI_CAP_ID_EA );if (!ea)
Signature · 1 line
2.21.0