Add page alignment check in Intel IOMMU.
v2 cover Add page alignment check in Intel IOMMU.
From: Kuppuswamy Sathyanarayanan <[email protected]>
As per Intel vt-d specification, Rev 3.0 (section 7.5.1.1, title "Page Request Descriptor"), Intel IOMMU page request descriptor only uses bits[63:12] of the Page Address. Hence its required to enforce that the device will only send page request with page-aligned address. So, this patch set adds support to verify whether the device uses page aligned address before enabling the ATS service in Intel IOMMU driver.
Changes since v1:
* Fixed issue with PCI_ATS_CAP_PAGE_ALIGNED macro.
* Fixed comments.
Kuppuswamy Sathyanarayanan (2):
PCI/ATS: Add pci_ats_page_aligned() interface
iommu/vt-d: Enable ATS only if the device uses page aligned address.
drivers/iommu/intel-iommu.c | 1 + drivers/pci/ats.c | 27 +++++++++++++++++++++++++++ include/linux/pci.h | 2 ++ include/uapi/linux/pci_regs.h | 1 + 4 files changed, 31 insertions(+)
Signature · 1 line
2.20.1
PATCH v2 1/2 PCI/ATS: Add pci_ats_page_aligned() interface
From: Kuppuswamy Sathyanarayanan <[email protected]>
Return the Page Aligned Request bit in the ATS Capability Register.
As per PCIe spec r4.0, sec 10.5.1.2, If Page Aligned Request bit is set, then it indicates the Untranslated Addresses generated by the device are alwayis always aligned to a 4096 byte boundary.
This interface will be used by drivers like IOMMU, if it is required to check whether the Untranslated Address generated by the device will be aligned before enabling the ATS service.
--- drivers/pci/ats.c | 27 +++++++++++++++++++++++++++ include/linux/pci.h | 2 ++ include/uapi/linux/pci_regs.h | 1 + 3 files changed, 30 insertions(+)
drivers/pci/ats.c +27 -0
@@ -142,6 +142,33 @@ int pci_ats_queue_depth(struct pci_dev *dev) }EXPORT_SYMBOL_GPL (pci_ats_queue_depth); +/** +* pci_ats_page_aligned - Return Page Aligned Request bit status. +* @pdev: the PCI device +* +* Returns 1, if Untranslated Addresses generated by the device are +* always aligned or 0 otherwise. +* +* Per PCIe spec r4.0, sec 10.5.1.2, If Page Aligned Request bit is +* set, it indicates the Untranslated Addresses generated by the +* device are always aligned to a 4096 byte boundary. +*/ +int pci_ats_page_aligned (struct pci_dev *pdev) +{ +u16 cap; + +if (!pdev->ats_cap) +return 0 ; + +pci_read_config_word (pdev, pdev->ats_cap +PCI_ATS_CAP , &cap); + +if (cap &PCI_ATS_CAP_PAGE_ALIGNED ) +return 1 ; + +return 0 ; +} +EXPORT_SYMBOL_GPL (pci_ats_page_aligned); +#ifdef CONFIG_PCI_PRI /** * pci_enable_pri - Enable PRI capability
include/linux/pci.h +2 -0
@@ -1524,11 +1524,13 @@ void pci_ats_init(struct pci_dev *dev);int pci_enable_ats (struct pci_dev *dev,int ps);void pci_disable_ats (struct pci_dev *dev);int pci_ats_queue_depth (struct pci_dev *dev); +int pci_ats_page_aligned (struct pci_dev *dev);#else static inline void pci_ats_init (struct pci_dev *d) { }static inline int pci_enable_ats (struct pci_dev *d,int ps) {return -ENODEV ; }static inline void pci_disable_ats (struct pci_dev *d) { }static inline int pci_ats_queue_depth (struct pci_dev *d) {return -ENODEV ; } +static inline int pci_ats_page_aligned (struct pci_dev *dev) {return 0 ; }#endif #ifdef CONFIG_PCIE_PTM
include/uapi/linux/pci_regs.h +1 -0
@@ -866,6 +866,7 @@#define PCI_ATS_CAP 0x04/* ATS Capability Register */ #define PCI_ATS_CAP_QDEP (x) ((x) & 0x1f)/* Invalidate Queue Depth */ #define PCI_ATS_MAX_QDEP 32/* Max Invalidate Queue Depth */ +#define PCI_ATS_CAP_PAGE_ALIGNED 0x0020/* Page Aligned Request */ #define PCI_ATS_CTRL 0x06/* ATS Control Register */ #define PCI_ATS_CTRL_ENABLE 0x8000/* ATS Enable */ #define PCI_ATS_CTRL_STU (x) ((x) & 0x1f)/* Smallest Translation Unit */
Signature · 1 line
2.20.1
PATCH v2 2/2 iommu/vt-d: Enable ATS only if the device uses page aligned address.
In reply to [email protected]From: Kuppuswamy Sathyanarayanan <[email protected]>
As per Intel vt-d specification, Rev 3.0 (section 7.5.1.1, title "Page Request Descriptor"), Intel IOMMU page request descriptor only uses bits[63:12] of the page address. Hence Intel IOMMU driver would only permit devices that advertise they would only send page aligned requests to participate in ATS service.
--- drivers/iommu/intel-iommu.c | 1 + 1 file changed, 1 insertion(+)
drivers/iommu/intel-iommu.c +1 -0
@@ -1406,6 +1406,7 @@ static void iommu_enable_dev_iotlb(struct device_domain_info *info) info->pri_enabled =1 ;#endif if (!pdev->untrusted && info->ats_supported && +pci_ats_page_aligned (pdev) && !pci_enable_ats (pdev,VTD_PAGE_SHIFT )) { info->ats_enabled =1 ;domain_update_iotlb (info->domain);
Signature · 1 line
2.20.1
Re: [PATCH v2 1/2] PCI/ATS: Add pci_ats_page_aligned() interface
In reply to [email protected]Quoted 7 lines · On Mon, Feb 11, 2019 at 01:44:34PM -0800…
From: Kuppuswamy Sathyanarayanan <[email protected]>
Return the Page Aligned Request bit in the ATS Capability Register.
As per PCIe spec r4.0, sec 10.5.1.2, If Page Aligned Request bit is set, then it indicates the Untranslated Addresses generated by the device are alwayis always aligned to a 4096 byte boundary.
s/, If/, if the/
s/then it/it/
s/alwayis//
Quoted 3 lines
This interface will be used by drivers like IOMMU, if it is required to check whether the Untranslated Address generated by the device will be aligned before enabling the ATS service.
Maybe something like this?
An IOMMU that can only translate page-aligned addresses can only be used with devices that always produce aligned Untranslated Addresses. This interface will be used by drivers for such IOMMUs to determine whether devices can use the ATS service.
Quoted 5 lines
Cc Ashok Raj <[email protected]>Cc Jacob Pan <[email protected]>Cc Keith Busch <[email protected]>Suggested-by Ashok Raj <[email protected]>Signed-off-by Kuppuswamy Sathyanarayanan <[email protected]>
With typos addressed (more below),
Quoted 14 lines
--- drivers/pci/ats.c | 27 +++++++++++++++++++++++++++ include/linux/pci.h | 2 ++ include/uapi/linux/pci_regs.h | 1 + 3 files changed, 30 insertions(+)drivers/pci/ats.c +0
-0@@ -142,6 +142,33 @@ int pci_ats_queue_depth(struct pci_dev *dev) }EXPORT_SYMBOL_GPL (pci_ats_queue_depth);
drivers/pci/ats.c int pci_ats_queue_depth(struct pci_dev *dev) · line 154
Quoted 10 lines
drivers/pci/ats.c +10
-0+/** +* pci_ats_page_aligned - Return Page Aligned Request bit status. +* @pdev: the PCI device +* +* Returns 1, if Untranslated Addresses generated by the device are +* always aligned or 0 otherwise. +* +* Per PCIe spec r4.0, sec 10.5.1.2, If Page Aligned Request bit is +* set, it indicates the Untranslated Addresses generated by the +* device are always aligned to a 4096 byte boundary.
s/, If/, if the/
Quoted 53 lines
drivers/pci/ats.c +17
-0+*/ +int pci_ats_page_aligned (struct pci_dev *pdev) +{ +u16 cap; + +if (!pdev->ats_cap) +return 0 ; + +pci_read_config_word (pdev, pdev->ats_cap +PCI_ATS_CAP , &cap); + +if (cap &PCI_ATS_CAP_PAGE_ALIGNED ) +return 1 ; + +return 0 ; +} +EXPORT_SYMBOL_GPL (pci_ats_page_aligned); +#ifdef CONFIG_PCI_PRI /** * pci_enable_pri - Enable PRI capability include/linux/pci.h +2
-0@@ -1524,11 +1524,13 @@ void pci_ats_init(struct pci_dev *dev);int pci_enable_ats (struct pci_dev *dev,int ps);void pci_disable_ats (struct pci_dev *dev);int pci_ats_queue_depth (struct pci_dev *dev); +int pci_ats_page_aligned (struct pci_dev *dev);#else static inline void pci_ats_init (struct pci_dev *d) { }static inline int pci_enable_ats (struct pci_dev *d,int ps) {return -ENODEV ; }static inline void pci_disable_ats (struct pci_dev *d) { }static inline int pci_ats_queue_depth (struct pci_dev *d) {return -ENODEV ; } +static inline int pci_ats_page_aligned (struct pci_dev *dev) {return 0 ; }#endif #ifdef CONFIG_PCIE_PTM include/uapi/linux/pci_regs.h +1
-0@@ -866,6 +866,7 @@#define PCI_ATS_CAP 0x04/* ATS Capability Register */ #define PCI_ATS_CAP_QDEP (x) ((x) & 0x1f)/* Invalidate Queue Depth */ #define PCI_ATS_MAX_QDEP 32/* Max Invalidate Queue Depth */ +#define PCI_ATS_CAP_PAGE_ALIGNED 0x0020/* Page Aligned Request */ #define PCI_ATS_CTRL 0x06/* ATS Control Register */ #define PCI_ATS_CTRL_ENABLE 0x8000/* ATS Enable */ #define PCI_ATS_CTRL_STU (x) ((x) & 0x1f)/* Smallest Translation Unit */ Signature · 1 line
2.20.1