Commit 3149efcd authored by Long Li's avatar Long Li Committed by Wei Liu
Browse files

PCI: hv: Fix NUMA node assignment when kernel boots with custom NUMA topology 



When kernel boots with a NUMA topology with some NUMA nodes offline, the PCI
driver should only set an online NUMA node on the device. This can happen
during KDUMP where some NUMA nodes are not made online by the KDUMP kernel.

This patch also fixes the case where kernel is booting with "numa=off".

Fixes: 999dd956 ("PCI: hv: Add support for protocol 1.3 and support PCI_BUS_RELATIONS2")
Signed-off-by: default avatarLong Li <longli@microsoft.com>
Reviewed-by: default avatarMichael Kelley <mikelley@microsoft.com>
Tested-by: default avatarPurna Pavan Chandra Aekkaladevi <paekkaladevi@microsoft.com>
Acked-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Link: https://lore.kernel.org/r/1643247814-15184-1-git-send-email-longli@linuxonhyperv.com


Signed-off-by: default avatarWei Liu <wei.liu@kernel.org>
parent 9ff5549b

drivers/pci/controller/pci-hyperv.c

+11 −2
Original line number Diff line number Diff line
@@ -2155,8 +2155,17 @@ static void hv_pci_assign_numa_node(struct hv_pcibus_device *hbus) 
		if (!hv_dev)

			continue;



		if (hv_dev->desc.flags & HV_PCI_DEVICE_FLAG_NUMA_AFFINITY)

			set_dev_node(&dev->dev, hv_dev->desc.virtual_numa_node);

		if (hv_dev->desc.flags & HV_PCI_DEVICE_FLAG_NUMA_AFFINITY &&

		    hv_dev->desc.virtual_numa_node < num_possible_nodes())

			/*

			 * The kernel may boot with some NUMA nodes offline

			 * (e.g. in a KDUMP kernel) or with NUMA disabled via

			 * "numa=off". In those cases, adjust the host provided

			 * NUMA node to a valid NUMA node used by the kernel.

			 */

			set_dev_node(&dev->dev,

				     numa_map_to_online_node(

					     hv_dev->desc.virtual_numa_node));



		put_pcichild(hv_dev);

	}