Calgary: Find nearest matching Calgary while walking up the PCI tree
PATCH 1/1 Calgary: Find nearest matching Calgary while walking up the PCI tree
On a multi-node x3950M2 system, there's a slight oddity in the PCI device tree for all secondary nodes:
30:1e.0 PCI bridge: Intel Corporation 82801 PCI Bridge (rev e1)
\-33:00.0 PCI bridge: IBM CalIOC2 PCI-E Root Port (rev 01)
\-34:00.0 RAID bus controller: LSI Logic / Symbios Logic MegaRAID SAS 1078 (rev 04)
...as compared to the primary node:
00:1e.0 PCI bridge: Intel Corporation 82801 PCI Bridge (rev e1)
\-01:00.0 VGA compatible controller: ATI Technologies Inc ES1000 (rev 02)
03:00.0 PCI bridge: IBM CalIOC2 PCI-E Root Port (rev 01)
\-04:00.0 RAID bus controller: LSI Logic / Symbios Logic MegaRAID SAS 1078 (rev 04)
In both nodes, the LSI RAID controller hangs off a CalIOC2 device, but on the secondary nodes, the BIOS hides the VGA device and substitutes the device tree ending with the disk controller.
It would seem that Calgary devices don't necessarily appear at the top of the PCI tree, which means that the current code to find the Calgary IOMMU that goes with a particular device is buggy. Rather than walk all the way to the top of the PCI device tree and try to match bus number with Calgary descriptor, the code needs to examine each parent of the particular device; if it encounters a Calgary with a matching bus number, simply use that. Otherwise, we BUG() when the bus number of the Calgary doesn't match the bus number of whatever's at the top of the device tree.
---
arch/x86/kernel/pci-calgary_64.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-)
arch/x86/kernel/pci-calgary_64.c +7 -5
@@ -318,13 +318,15 @@ static inline struct iommu_table *find_iommu_table(struct device *dev) pdev =to_pci_dev (dev); +/* search up the device tree for an iommu */ pbus = pdev->bus; - -/* is the device behind a bridge? Look for the root bus */ -while (pbus->parent) +do { + tbl =pci_iommu (pbus); +if (tbl && tbl->it_busno == pbus->number) +break ; + tbl =NULL ; pbus = pbus->parent; - - tbl =pci_iommu (pbus); + }while (pbus);BUG_ON (tbl && (tbl->it_busno != pbus->number));
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH v2 1/1 Calgary: Find nearest matching Calgary while walking up the PCI tree
On a multi-node x3950M2 system, there's a slight oddity in the PCI device tree for all secondary nodes:
30:1e.0 PCI bridge: Intel Corporation 82801 PCI Bridge (rev e1)
\-33:00.0 PCI bridge: IBM CalIOC2 PCI-E Root Port (rev 01)
\-34:00.0 RAID bus controller: LSI Logic / Symbios Logic MegaRAID SAS 1078 (rev 04)
...as compared to the primary node:
00:1e.0 PCI bridge: Intel Corporation 82801 PCI Bridge (rev e1)
\-01:00.0 VGA compatible controller: ATI Technologies Inc ES1000 (rev 02)
03:00.0 PCI bridge: IBM CalIOC2 PCI-E Root Port (rev 01)
\-04:00.0 RAID bus controller: LSI Logic / Symbios Logic MegaRAID SAS 1078 (rev 04)
In both nodes, the LSI RAID controller hangs off a CalIOC2 device, but on the secondary nodes, the BIOS hides the VGA device and substitutes the device tree ending with the disk controller.
It would seem that Calgary devices don't necessarily appear at the top of the PCI tree, which means that the current code to find the Calgary IOMMU that goes with a particular device is buggy. Rather than walk all the way to the top of the PCI device tree and try to match bus number with Calgary descriptor, the code needs to examine each parent of the particular device; if it encounters a Calgary with a matching bus number, simply use that. Otherwise, we BUG() when the bus number of the Calgary doesn't match the bus number of whatever's at the top of the device tree.
Extra note: This patch appears to work correctly for the x3950 that came before the x3950 M2.
---
arch/x86/kernel/pci-calgary_64.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-)
arch/x86/kernel/pci-calgary_64.c +7 -5
@@ -318,13 +318,15 @@ static inline struct iommu_table *find_iommu_table(struct device *dev) pdev =to_pci_dev (dev); +/* search up the device tree for an iommu */ pbus = pdev->bus; - -/* is the device behind a bridge? Look for the root bus */ -while (pbus->parent) +do { + tbl =pci_iommu (pbus); +if (tbl && tbl->it_busno == pbus->number) +break ; + tbl =NULL ; pbus = pbus->parent; - - tbl =pci_iommu (pbus); + }while (pbus);BUG_ON (tbl && (tbl->it_busno != pbus->number));
[tip:core/iommu] x86, Calgary IOMMU quirk: Find nearest matching Calgary while walking up the PCI tree
Commit-ID: 4528752f49c1f4025473d12bc5fa9181085c3f22 Gitweb: http://git.kernel.org/tip/4528752f49c1f4025473d12bc5fa9181085c3f22 Author: Darrick J. Wong <[email protected]> AuthorDate: Wed, 2 Dec 2009 15:05:56 -0800 Committer: Ingo Molnar <[email protected]> CommitDate: Thu, 3 Dec 2009 11:44:05 +0100
x86, Calgary IOMMU quirk: Find nearest matching Calgary while walking up the PCI tree
On a multi-node x3950M2 system, there's a slight oddity in the PCI device tree for all secondary nodes:
30:1e.0 PCI bridge: Intel Corporation 82801 PCI Bridge (rev e1)
\-33:00.0 PCI bridge: IBM CalIOC2 PCI-E Root Port (rev 01)
\-34:00.0 RAID bus controller: LSI Logic / Symbios Logic MegaRAID SAS 1078 (rev 04)
...as compared to the primary node:
00:1e.0 PCI bridge: Intel Corporation 82801 PCI Bridge (rev e1)
\-01:00.0 VGA compatible controller: ATI Technologies Inc ES1000 (rev 02)
03:00.0 PCI bridge: IBM CalIOC2 PCI-E Root Port (rev 01)
\-04:00.0 RAID bus controller: LSI Logic / Symbios Logic MegaRAID SAS 1078 (rev 04)
In both nodes, the LSI RAID controller hangs off a CalIOC2 device, but on the secondary nodes, the BIOS hides the VGA device and substitutes the device tree ending with the disk controller.
It would seem that Calgary devices don't necessarily appear at the top of the PCI tree, which means that the current code to find the Calgary IOMMU that goes with a particular device is buggy.
Rather than walk all the way to the top of the PCI device tree and try to match bus number with Calgary descriptor, the code needs to examine each parent of the particular device; if it encounters a Calgary with a matching bus number, simply use that.
Otherwise, we BUG() when the bus number of the Calgary doesn't match the bus number of whatever's at the top of the device tree.
Extra note: This patch appears to work correctly for the x3950 that came before the x3950 M2.
LKML-Reference: <[email protected]>
--- arch/x86/kernel/pci-calgary_64.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-)
arch/x86/kernel/pci-calgary_64.c +7 -5
@@ -316,13 +316,15 @@ static inline struct iommu_table *find_iommu_table(struct device *dev) pdev =to_pci_dev (dev); +/* search up the device tree for an iommu */ pbus = pdev->bus; - -/* is the device behind a bridge? Look for the root bus */ -while (pbus->parent) +do { + tbl =pci_iommu (pbus); +if (tbl && tbl->it_busno == pbus->number) +break ; + tbl =NULL ; pbus = pbus->parent; - - tbl =pci_iommu (pbus); + }while (pbus);BUG_ON (tbl && (tbl->it_busno != pbus->number));
Quoted 42 lines · Darrick J. Wong
On a multi-node x3950M2 system, there's a slight oddity in the PCI device tree for all secondary nodes:
30:1e.0 PCI bridge: Intel Corporation 82801 PCI Bridge (rev e1) \-33:00.0 PCI bridge: IBM CalIOC2 PCI-E Root Port (rev 01)
\-34:00.0 RAID bus controller: LSI Logic / Symbios Logic MegaRAID SAS 1078 (rev 04)...as compared to the primary node:
00:1e.0 PCI bridge: Intel Corporation 82801 PCI Bridge (rev e1) \-01:00.0 VGA compatible controller: ATI Technologies Inc ES1000 (rev 02) 03:00.0 PCI bridge: IBM CalIOC2 PCI-E Root Port (rev 01)
\-04:00.0 RAID bus controller: LSI Logic / Symbios Logic MegaRAID SAS 1078 (rev 04)In both nodes, the LSI RAID controller hangs off a CalIOC2 device, but on the secondary nodes, the BIOS hides the VGA device and substitutes the device tree ending with the disk controller.
It would seem that Calgary devices don't necessarily appear at the top of the PCI tree, which means that the current code to find the Calgary IOMMU that goes with a particular device is buggy. Rather than walk all the way to the top of the PCI device tree and try to match bus number with Calgary descriptor, the code needs to examine each parent of the particular device; if it encounters a Calgary with a matching bus number, simply use that. Otherwise, we
BUG()when the bus number of the Calgary doesn't match the bus number of whatever's at the top of the device tree.Signed-off-by Darrick J. Wong <[email protected]>---
arch/x86/kernel/pci-calgary_64.c | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)arch/x86/kernel/pci-calgary_64.c +0
-0@@ -318,13 +318,15 @@ static inline struct iommu_table *find_iommu_table(struct device *dev) pdev = to_pci_dev(dev);
arch/x86/kernel/pci-calgary_64.c static inline struct iommu_table *find_iommu_table(struct device *dev) · line 327
Quoted 10 lines
arch/x86/kernel/pci-calgary_64.c +6
-3+ /* search up the device tree for an iommu */ pbus = pdev->bus; - - /* is the device behind a bridge? Look for the root bus */ - while (pbus->parent) + do { + tbl = pci_iommu(pbus); + if (tbl && tbl->it_busno == pbus->number) + break; + tbl = NULL;
I believe the NULL assignment is unnecessary. If not, then the if check and BUG_ON are busted.
Quoted 8 lines
arch/x86/kernel/pci-calgary_64.c +1
-2pbus = pbus->parent; - - tbl = pci_iommu(pbus); + } while (pbus); BUG_ON(tbl && (tbl->it_busno != pbus->number));
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 24 lines · Muli Ben-Yehuda
Quoted 8 lines · Jon Mason
Quoted 8 lines
arch/x86/kernel/pci-calgary_64.c +0
-0@@ -318,13 +318,15 @@ static inline struct iommu_table *find_iommu_table(struct device *dev) pdev = to_pci_dev(dev);Quoted 13 lines
arch/x86/kernel/pci-calgary_64.c static inline struct iommu_table *find_iommu_table(struct device *dev) · line 327
Quoted 10 lines
arch/x86/kernel/pci-calgary_64.c +6
-3+ /* search up the device tree for an iommu */ pbus = pdev->bus; - - /* is the device behind a bridge? Look for the root bus */ - while (pbus->parent) + do { + tbl = pci_iommu(pbus); + if (tbl && tbl->it_busno == pbus->number) + break; + tbl = NULL;I believe the NULL assignment is unnecessary. If not, then the if check and
BUG_ONare busted.
Quoted 3 lines
I think the NULL assignment is needed for the case where the loop ends (pbus is NULL) and we did not find the right tbl. You don't want to leave the tbl pointing to the last tbl we saw while walking the bus.
Correct. I suspect that you'd only hit this situation in a fairly pathological corner case, but configuring the wrong Calgary for IO could (in theory) be used to breach the Calgary protections, whereas failing to set up the necessary permissions will simply crash the system. In any case it seems cleaner to me to throw away the tbl pointer once we've decided that we're done with it.
--D