Skip to contentSkip to conversation

x86_64: fix dma_alloc_pages

PATCH Applied Yinghai Lu 2 participants 2 messages Feb 19, 2008 x86

lore
Share & tools
lore

Yinghai Lu

author
#0 lore raw

PATCH 1/1 x86_64: fix dma_alloc_pages

one system with two nodes and two ht links on every node. the bios already have _pxm for two links.

when no ram installed for node1 will have panic.

reason: the device on second chain will get node = 1 from dev_to_node...via pci_acpi_scan_root.
but node1 doesn't have ram installed.
in dma_alloc_pages it will pass check with first_node(node_online_map)... and will have problem with __alloc_pages in alloc_pages_node.

this patch will check the if the node is online..., if not will get numa_node_id to get one node with ram.

arch/x86/kernel/pci-dma_64.c +1 -4
index a82473d..931b51a 100644
@@ -53,12 +53,9 @@ dma_alloc_pages(struct device *dev, gfp_t gfp, unsigned order)
 	int node;
 
 	node = dev_to_node(dev);
-	if (node == -1)
+	if (node == -1 || !node_online(node))
 		node = numa_node_id();
 
-	if (node < first_node(node_online_map))
-		node = first_node(node_online_map);
-
 	page = alloc_pages_node(node, gfp, order);
 	return page ? page_address(page) : NULL;
 }
Applied
#1 lore raw
Quoted 5 lines · Yinghai Lu

one system with two nodes and two ht links on every node. the bios already have _pxm for two links.

when no ram installed for node1 will have panic.

Quoted 8 lines

reason: the device on second chain will get node = 1 from dev_to_node...via pci_acpi_scan_root. but node1 doesn't have ram installed. in dma_alloc_pages it will pass check with first_node(node_online_map)... and will have problem with __alloc_pages in alloc_pages_node.

this patch will check the if the node is online..., if not will get numa_node_id to get one node with ram.

thanks, applied.

Ingo