Commit 2fa84351 authored Jun 20, 2016 by Masayoshi Mizuma Committed by Jens Axboe Jul 13, 2016

nvme: avoid crashes when node 0 is memoryless node.



When CONFIG_NUMA is enabled and node 0 is memoryless, the system
crashes because nvme_probe() sets the device->numa_node to 0 by
set_dev_node(&pdev->dev, 0), so it tries to allocate memory from node 0.
To avoid the crash, we should change the 0 to first_memory_node.

Signed-off-by: Masayoshi Mizuma <m.mizuma@jp.fujitsu.com>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: Keith Busch <keith.busch@intel.com>
Signed-off-by: Jens Axboe <axboe@fb.com>

parent f80ec966

drivers/nvme/host/pci.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1918,7 +1918,7 @@ static int nvme_probe(struct pci_dev pdev, const struct pci_device_id id)

	node = dev_to_node(&pdev->dev);		node = dev_to_node(&pdev->dev);
	if (node == NUMA_NO_NODE)		if (node == NUMA_NO_NODE)
	set_dev_node(&pdev->dev, 0);		set_dev_node(&pdev->dev, first_memory_node);

	dev = kzalloc_node(sizeof(*dev), GFP_KERNEL, node);		dev = kzalloc_node(sizeof(*dev), GFP_KERNEL, node);
	if (!dev)		if (!dev)

Admin message