Skip to contentSkip to conversation

PCI/P2PDMA: Allow P2PDMA on all AMD CPUs newer than the Zen family

PATCH Applied Logan Gunthorpe 3 participants 3 messages Jul 29, 2020 – Jul 30, 2020

Subsystems (2)
lore
Share & tools
lore

Logan Gunthorpe

author maintainer
#0 lore raw

PATCH v2 1/1 PCI/P2PDMA: Allow P2PDMA on all AMD CPUs newer than the Zen family

In order to avoid needing to add every new AMD CPU host bridge to the list every cycle, allow P2PDMA if the CPUs vendor is AMD and family is greater than 0x17 (Zen).

This should cut down a bunch of the churn adding to the list of allowed host bridges.

Cc Bjorn Helgaas <[email protected]>
Cc Alex Deucher <[email protected]>
Cc Christian König <[email protected]>
Cc Huang Rui <[email protected]>

---

Here's a reworked patch to enable P2PDMA on Zen2 (and in fact all subsequent Zen platforms).

This should remove all the churn on the list for the AMD side. Still don't have a good solution for Intel.

 drivers/pci/p2pdma.c | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)
drivers/pci/p2pdma.c +20 -6
index e8e444eeb1cd..f1cab2c50595 100644
@@ -273,6 +273,24 @@ static void seq_buf_print_bus_devfn(struct seq_buf *buf, struct pci_dev *pdev)
 	seq_buf_printf(buf, "%s;", pci_name(pdev));
 }
 
+#ifdef CONFIG_X86
+static bool cpu_supports_p2pdma(void)
+{
+	struct cpuinfo_x86 *c = &cpu_data(0);
+
+	/* Any AMD CPU who's family id is newer than Zen will support p2pdma */
+	if (c->x86_vendor == X86_VENDOR_AMD && c->x86 >= 0x17)
+		return true;
+
+	return false;
+}
+#else
+static bool cpu_supports_p2pdma(void)
+{
+	return false;
+}
+#endif
+
 static const struct pci_p2pdma_whitelist_entry {
 	unsigned short vendor;
 	unsigned short device;
@@ -280,11 +298,6 @@ static const struct pci_p2pdma_whitelist_entry {
 		REQ_SAME_HOST_BRIDGE	= 1 << 0,
 	} flags;
 } pci_p2pdma_whitelist[] = {
-	/* AMD ZEN */
-	{PCI_VENDOR_ID_AMD,	0x1450,	0},
-	{PCI_VENDOR_ID_AMD,	0x15d0,	0},
-	{PCI_VENDOR_ID_AMD,	0x1630,	0},
-
 	/* Intel Xeon E5/Core i7 */
 	{PCI_VENDOR_ID_INTEL,	0x3c00, REQ_SAME_HOST_BRIDGE},
 	{PCI_VENDOR_ID_INTEL,	0x3c01, REQ_SAME_HOST_BRIDGE},
@@ -473,7 +486,8 @@ upstream_bridge_distance(struct pci_dev *provider, struct pci_dev *client,
 					      acs_redirects, acs_list);
 
 	if (map_type == PCI_P2PDMA_MAP_THRU_HOST_BRIDGE) {
-		if (!host_bridge_whitelist(provider, client))
+		if (!cpu_supports_p2pdma() &&
+		    !host_bridge_whitelist(provider, client))
 			map_type = PCI_P2PDMA_MAP_NOT_SUPPORTED;
 	}
 

base-commit: 92ed301919932f777713b9172e525674157e983d --
2.20.1

Reviewed-by on v2 1/1
#1 lore raw
Quoted 4 lines · Logan Gunthorpe

In order to avoid needing to add every new AMD CPU host bridge to the list every cycle, allow P2PDMA if the CPUs vendor is AMD and family is greater than 0x17 (Zen).

Might want to say "greater than or equal to" to clarify that all Zen parts (Zen1, Zen2, etc.) support p2p. With that clarified,

Quoted 76 lines

This should cut down a bunch of the churn adding to the list of allowed host bridges.

Cc Bjorn Helgaas <[email protected]>
Cc Alex Deucher <[email protected]>
Cc Christian König <[email protected]>
Cc Huang Rui <[email protected]>

---

Here's a reworked patch to enable P2PDMA on Zen2 (and in fact all subsequent Zen platforms).

This should remove all the churn on the list for the AMD side. Still don't have a good solution for Intel.

 drivers/pci/p2pdma.c | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)
drivers/pci/p2pdma.c +20 -6
index e8e444eeb1cd..f1cab2c50595 100644
@@ -273,6 +273,24 @@ static void seq_buf_print_bus_devfn(struct seq_buf *buf, struct pci_dev *pdev)
        seq_buf_printf(buf, "%s;", pci_name(pdev));
 }
 
+#ifdef CONFIG_X86
+static bool cpu_supports_p2pdma(void)
+{
+       struct cpuinfo_x86 *c = &cpu_data(0);
+
+       /* Any AMD CPU who's family id is newer than Zen will support p2pdma */
+       if (c->x86_vendor == X86_VENDOR_AMD && c->x86 >= 0x17)
+               return true;
+
+       return false;
+}
+#else
+static bool cpu_supports_p2pdma(void)
+{
+       return false;
+}
+#endif
+
 static const struct pci_p2pdma_whitelist_entry {
        unsigned short vendor;
        unsigned short device;
@@ -280,11 +298,6 @@ static const struct pci_p2pdma_whitelist_entry {
                REQ_SAME_HOST_BRIDGE    = 1 << 0,
        } flags;
 } pci_p2pdma_whitelist[] = {
-       /* AMD ZEN */
-       {PCI_VENDOR_ID_AMD,     0x1450, 0},
-       {PCI_VENDOR_ID_AMD,     0x15d0, 0},
-       {PCI_VENDOR_ID_AMD,     0x1630, 0},
-
        /* Intel Xeon E5/Core i7 */
        {PCI_VENDOR_ID_INTEL,   0x3c00, REQ_SAME_HOST_BRIDGE},
        {PCI_VENDOR_ID_INTEL,   0x3c01, REQ_SAME_HOST_BRIDGE},
@@ -473,7 +486,8 @@ upstream_bridge_distance(struct pci_dev *provider, struct pci_dev *client,
                                              acs_redirects, acs_list);
 
        if (map_type == PCI_P2PDMA_MAP_THRU_HOST_BRIDGE) {
-               if (!host_bridge_whitelist(provider, client))
+               if (!cpu_supports_p2pdma() &&
+                   !host_bridge_whitelist(provider, client))
                        map_type = PCI_P2PDMA_MAP_NOT_SUPPORTED;
        }
 

base-commit: 92ed301919932f777713b9172e525674157e983d --
2.20.1

Reviewed-by Alex Deucher on v2 1/1 Applied
#2 lore raw
In reply to Logan Gunthorpe
Quoted 4 lines · Logan Gunthorpe

In order to avoid needing to add every new AMD CPU host bridge to the list every cycle, allow P2PDMA if the CPUs vendor is AMD and family is greater than 0x17 (Zen).

Quoted 8 lines

This should cut down a bunch of the churn adding to the list of allowed host bridges.

Cc Bjorn Helgaas <[email protected]>
Cc Alex Deucher <[email protected]>
Cc Christian König <[email protected]>
Cc Huang Rui <[email protected]>

Thanks, applied as below with Alex's reviewed-by to pci/peer-to-peer for v5.9.

I had to enable CONFIG_MEMORY_HOTREMOVE and CONFIG_ZONE_DEVICE in order to compile p2pdma.c. I see some reasons why that is, but it's not exactly intuitive, especially for MEMORY_HOTREMOVE.

commit dea286bb71ba ("PCI/P2PDMA: Allow P2PDMA on AMD Zen and newer CPUs")

Author: Logan Gunthorpe <[email protected]>
Date:   Wed Jul 29 17:18:44 2020 -0600

PCI/P2PDMA: Allow P2PDMA on AMD Zen and newer CPUs

Allow P2PDMA if the CPU vendor is AMD and family is 0x17 (Zen) or greater.

[bhelgaas: commit log, simplify #if/#else/#endif]
Cc Christian König <[email protected]>
Cc Huang Rui <[email protected]>
drivers/pci/p2pdma.c +15 -6
index e8e444eeb1cd..1ec61fced4c3 100644
@@ -273,6 +273,19 @@ static void seq_buf_print_bus_devfn(struct seq_buf *buf, struct pci_dev *pdev)
 	seq_buf_printf(buf, "%s;", pci_name(pdev));
 }
 
+static bool cpu_supports_p2pdma(void)
+{
+#ifdef CONFIG_X86
+	struct cpuinfo_x86 *c = &cpu_data(0);
+
+	/* Any AMD CPU whose family ID is Zen or newer supports p2pdma */
+	if (c->x86_vendor == X86_VENDOR_AMD && c->x86 >= 0x17)
+		return true;
+#endif
+
+	return false;
+}
+
 static const struct pci_p2pdma_whitelist_entry {
 	unsigned short vendor;
 	unsigned short device;
@@ -280,11 +293,6 @@ static const struct pci_p2pdma_whitelist_entry {
 		REQ_SAME_HOST_BRIDGE	= 1 << 0,
 	} flags;
 } pci_p2pdma_whitelist[] = {
-	/* AMD ZEN */
-	{PCI_VENDOR_ID_AMD,	0x1450,	0},
-	{PCI_VENDOR_ID_AMD,	0x15d0,	0},
-	{PCI_VENDOR_ID_AMD,	0x1630,	0},
-
 	/* Intel Xeon E5/Core i7 */
 	{PCI_VENDOR_ID_INTEL,	0x3c00, REQ_SAME_HOST_BRIDGE},
 	{PCI_VENDOR_ID_INTEL,	0x3c01, REQ_SAME_HOST_BRIDGE},
@@ -473,7 +481,8 @@ upstream_bridge_distance(struct pci_dev *provider, struct pci_dev *client,
 					      acs_redirects, acs_list);
 
 	if (map_type == PCI_P2PDMA_MAP_THRU_HOST_BRIDGE) {
-		if (!host_bridge_whitelist(provider, client))
+		if (!cpu_supports_p2pdma() &&
+		    !host_bridge_whitelist(provider, client))
 			map_type = PCI_P2PDMA_MAP_NOT_SUPPORTED;
 	}