]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
net/mlx5: Ensure fw pages are always allocated on same NUMA
authorMoshe Shemesh <moshe@nvidia.com>
Tue, 10 Jun 2025 15:15:06 +0000 (18:15 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 27 Jun 2025 10:04:09 +0000 (11:04 +0100)
[ Upstream commit f37258133c1e95e61db532e14067e28b4881bf24 ]

When firmware asks the driver to allocate more pages, using event of
give_pages, the driver should always allocate it from same NUMA, the
original device NUMA. Current code uses dev_to_node() which can result
in different NUMA as it is changed by other driver flows, such as
mlx5_dma_zalloc_coherent_node(). Instead, use saved numa node for
allocating firmware pages.

Fixes: 311c7c71c9bb ("net/mlx5e: Allocate DMA coherent memory on reader NUMA node")
Signed-off-by: Moshe Shemesh <moshe@nvidia.com>
Reviewed-by: Tariq Toukan <tariqt@nvidia.com>
Signed-off-by: Mark Bloch <mbloch@nvidia.com>
Link: https://patch.msgid.link/20250610151514.1094735-2-mbloch@nvidia.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c

index 1ea71f06fdb1c8ed60e886cbf0f8d4abb7e48b4e..b7ccdef697fd081063f6ec77cfcb8ab732b17032 100644 (file)
@@ -272,7 +272,7 @@ static void free_4k(struct mlx5_core_dev *dev, u64 addr, u32 function)
 static int alloc_system_page(struct mlx5_core_dev *dev, u32 function)
 {
        struct device *device = mlx5_core_dma_dev(dev);
-       int nid = dev_to_node(device);
+       int nid = dev->priv.numa_node;
        struct page *page;
        u64 zero_addr = 1;
        u64 addr;