Fixes for 5.4

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-5.4/nvme-pci-do-not-set-the-numa-node-of-device-if-it-ha.patch b/queue-5.4/nvme-pci-do-not-set-the-numa-node-of-device-if-it-ha.patch
new file mode 100644 (file)
index 0000000..9bce4e5
--- /dev/null
+++ b/queue-5.4/nvme-pci-do-not-set-the-numa-node-of-device-if-it-ha.patch
@@ -0,0 +1,37 @@
+From 09aa870932b868e96dabce9e16e641286ebc78bc Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+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 <ptyadav@amazon.de>
+
+[ 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 <ptyadav@amazon.de>
+Signed-off-by: Keith Busch <kbusch@kernel.org>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ 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 a58711c488509..486e44d20b430 100644
+--- a/drivers/nvme/host/pci.c
++++ b/drivers/nvme/host/pci.c
+@@ -2841,8 +2841,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-5.4/series b/queue-5.4/series
index 52b8b0eb7fcf115a6a9191e3b2a416e0d0a6d17a..ed5c1caa4efc29ab0c4863ad045920888b7c188a 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -64,3 +64,4 @@ bpf-clarify-error-expectations-from-bpf_clone_redire.patch
 powerpc-watchpoints-annotate-atomic-context-in-more-.patch
 ncsi-propagate-carrier-gain-loss-events-to-the-ncsi-.patch
 fbdev-sh7760fb-depend-on-fb-y.patch
+nvme-pci-do-not-set-the-numa-node-of-device-if-it-ha.patch