From: Sasha Levin Date: Tue, 3 Oct 2023 16:19:16 +0000 (-0400) Subject: Fixes for 4.19 X-Git-Tag: v6.5.6~47 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ff0beb4f7e4510f4583f0dc7137d7c0d0ef95cd8;p=thirdparty%2Fkernel%2Fstable-queue.git Fixes for 4.19 Signed-off-by: Sasha Levin --- diff --git a/queue-4.19/nvme-pci-do-not-set-the-numa-node-of-device-if-it-ha.patch b/queue-4.19/nvme-pci-do-not-set-the-numa-node-of-device-if-it-ha.patch new file mode 100644 index 00000000000..c21ce48caee --- /dev/null +++ b/queue-4.19/nvme-pci-do-not-set-the-numa-node-of-device-if-it-ha.patch @@ -0,0 +1,37 @@ +From 6546bc7adc41ad5d36afc26d5a8a1429bb323b78 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 12 Sep 2023 17:52:49 +0200 +Subject: nvme-pci: do not set the NUMA node of device if it has none + +From: Pratyush Yadav + +[ Upstream commit dad651b2a44eb6b201738f810254279dca29d30d ] + +If a device has no NUMA node information associated with it, the driver +puts the device in node first_memory_node (say node 0). Not having a +NUMA node and being associated with node 0 are completely different +things and it makes little sense to mix the two. + +Signed-off-by: Pratyush Yadav +Signed-off-by: Keith Busch +Signed-off-by: Sasha Levin +--- + drivers/nvme/host/pci.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c +index b06d2b6bd3feb..163497ef48fd7 100644 +--- a/drivers/nvme/host/pci.c ++++ b/drivers/nvme/host/pci.c +@@ -2501,8 +2501,6 @@ static int nvme_probe(struct pci_dev *pdev, const struct pci_device_id *id) + size_t alloc_size; + + node = dev_to_node(&pdev->dev); +- if (node == NUMA_NO_NODE) +- set_dev_node(&pdev->dev, first_memory_node); + + dev = kzalloc_node(sizeof(*dev), GFP_KERNEL, node); + if (!dev) +-- +2.40.1 + diff --git a/queue-4.19/series b/queue-4.19/series index b9628140d43..b1b05ce3b7e 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -42,3 +42,4 @@ ring-buffer-avoid-softlockup-in-ring_buffer_resize.patch ata-libata-eh-do-not-clear-ata_pflag_eh_pending-in-a.patch bpf-clarify-error-expectations-from-bpf_clone_redire.patch fbdev-sh7760fb-depend-on-fb-y.patch +nvme-pci-do-not-set-the-numa-node-of-device-if-it-ha.patch