Add PGR response PASID requirement check in Intel IOMMU.
v3 cover Add PGR response PASID requirement check in Intel IOMMU.
From: Kuppuswamy Sathyanarayanan <[email protected]>
Intel IOMMU responds automatically when receiving page-requests from a PCIe endpoint and the page-request queue is full and it cannot accept any more page-requests. When it auto-responds to page-requests with a success to the endpoint, it automatically responds with the PASID if the page-request had a PASID in the incoming request. IOMMU doesn't actually have any place to check device capabilities (like whether the device expects PASID in PGR response or not) before sending the response message. Due to this restriction, If PASID is enabled then Intel IOMMU driver will enable PRI only, if the endpoint is compliant to Intel IOMMU's.
Changes since v1:
* Changed interface name to pci_prg_resp_pasid_required().
* Update comment header format.
Changes since v2:
* Fixed typos.
* Moved pci_prg_resp_pasid_required() check to PRI enable logic.
Kuppuswamy Sathyanarayanan (2):
PCI/ATS: Add pci_prg_resp_pasid_required() interface. iommu/vt-d: Fix PRI/PASID dependency issue.
drivers/iommu/intel-iommu.c | 4 +++- drivers/pci/ats.c | 30 ++++++++++++++++++++++++++++++ include/linux/pci-ats.h | 5 +++++ include/uapi/linux/pci_regs.h | 1 + 4 files changed, 39 insertions(+), 1 deletion(-)
Signature · 1 line
2.20.1
PATCH v3 1/2 PCI/ATS: Add pci_prg_resp_pasid_required() interface.
From: Kuppuswamy Sathyanarayanan <[email protected]>
Return the PRG Response PASID Required bit in the Page Request Status Register.
As per PCIe spec r4.0, sec 10.5.2.3, if this bit is Set, the device expects a PASID TLP Prefix on PRG Response Messages when the corresponding Page Requests had a PASID TLP Prefix. If Clear, the device does not expect PASID TLP Prefixes on any PRG Response Message, and the device behavior is undefined if the device receives a PRG Response Message with a PASID TLP Prefix. Also the device behavior is undefined if this bit is Set and the device receives a PRG Response Message with no PASID TLP Prefix when the corresponding Page Requests had a PASID TLP Prefix.
This function will be used by drivers like IOMMU, if it is required to check the status of the PRG Response PASID Required bit before enabling the PASID support of the device.
--- drivers/pci/ats.c | 30 ++++++++++++++++++++++++++++++ include/linux/pci-ats.h | 5 +++++ include/uapi/linux/pci_regs.h | 1 + 3 files changed, 36 insertions(+)
drivers/pci/ats.c +30 -0
@@ -368,6 +368,36 @@ int pci_pasid_features(struct pci_dev *pdev) }EXPORT_SYMBOL_GPL (pci_pasid_features); +/** +* pci_prg_resp_pasid_required - Return PRG Response PASID Required bit +* status. +* @pdev: PCI device structure +* +* 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. +*/ +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) +return 0 ; + +pci_read_config_word (pdev, pos +PCI_PRI_STATUS , &status); + +if (status &PCI_PRI_STATUS_PASID ) +return 1 ; + +return 0 ; +} +EXPORT_SYMBOL_GPL (pci_prg_resp_pasid_required); +#define PASID_NUMBER_SHIFT 8#define PASID_NUMBER_MASK (0x1f << PASID_NUMBER_SHIFT)/**
include/linux/pci-ats.h +5 -0
@@ -40,6 +40,7 @@ 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 */
@@ -66,6 +67,10 @@ static inline int pci_max_pasids(struct pci_dev *pdev) return -EINVAL; } +static int pci_prg_resp_pasid_required (struct pci_dev *pdev) +{ +return 0 ; +}#endif /* CONFIG_PCI_PASID */
include/uapi/linux/pci_regs.h +1 -0
@@ -880,6 +880,7 @@#define PCI_PRI_STATUS_RF 0x001/* Response Failure */ #define PCI_PRI_STATUS_UPRGI 0x002/* Unexpected PRG index */ #define PCI_PRI_STATUS_STOPPED 0x100/* PRI Stopped */ +#define PCI_PRI_STATUS_PASID 0x8000/* PRG Response PASID Required */ #define PCI_PRI_MAX_REQ 0x08/* PRI max reqs supported */ #define PCI_PRI_ALLOC_REQ 0x0c/* PRI max reqs allowed */ #define PCI_EXT_CAP_PRI_SIZEOF 16
Signature · 1 line
2.20.1
PATCH v3 2/2 iommu/vt-d: Fix PRI/PASID dependency issue.
In reply to [email protected]From: Kuppuswamy Sathyanarayanan <[email protected]>
In Intel IOMMU, if the Page Request Queue (PRQ) is full, it will automatically respond to the device with a success message as a keep alive. And when sending the success message, IOMMU will include PASID in the Response Message when the Page Request has a PASID in Request Message and it does not check against the PRG Response PASID requirement of the device before sending the response. Also, if the device receives the PRG response with PASID when its not expecting it the device behavior is undefined. So if PASID is enabled in the device, enable PRI only if device expects PASID in PRG Response Message.
--- drivers/iommu/intel-iommu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/iommu/intel-iommu.c +3 -1
@@ -1402,7 +1402,9 @@ static void iommu_enable_dev_iotlb(struct device_domain_info *info)if (info->pasid_supported && !pci_enable_pasid (pdev, info->pasid_supported & ~1 )) info->pasid_enabled =1 ; -if (info->pri_supported && !pci_reset_pri (pdev) && !pci_enable_pri (pdev,32 )) +if (info->pri_supported && + (info->pasid_enabled ?pci_prg_resp_pasid_required (pdev) :1 ) && + !pci_reset_pri (pdev) && !pci_enable_pri (pdev,32 )) info->pri_enabled =1 ;#endif if (!pdev->untrusted && info->ats_supported &&
Signature · 1 line
2.20.1
Quoted 9 lines · On Tue, Feb 19, 2019 at 11:04:50AM -0800…
Kuppuswamy Sathyanarayanan (2):
PCI/ATS: Addpci_prg_resp_pasid_required()interface. iommu/vt-d: Fix PRI/PASID dependency issue.drivers/iommu/intel-iommu.c | 4 +++- drivers/pci/ats.c | 30 ++++++++++++++++++++++++++++++ include/linux/pci-ats.h | 5 +++++ include/uapi/linux/pci_regs.h | 1 + 4 files changed, 39 insertions(+), 1 deletion(-)
Applied, thanks.