lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

net/mlx4_core: ICM pages are allocated on device NUMA node

Browse Source 
This is done to optimize FW/HW access to host memory.

Signed-off-by: Yevgeny Petrilin <yevgenyp@mellanox.com>
Signed-off-by: Eugenia Emantayev <eugenia@mellanox.com>
Reviewed-by: Hadar Hen Zion <hadarh@mellanox.com>
Signed-off-by: Amir Vadai <amirv@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Eugenia Emantayev
2013-11-07 12:19:53 +02:00
committed by David S. Miller
parent 41d942d56c
commit 6e7136ed77
3 changed files with 32 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/net/ethernet/mellanox/mlx4/icm.c
View File

@@ -93,13 +93,17 @@ void mlx4_free_icm(struct mlx4_dev *dev, struct mlx4_icm *icm, int coherent)
kfree(icm); kfree(icm);
} }
static int mlx4_alloc_icm_pages(struct scatterlist *mem, int order, gfp_t gfp_mask) static int mlx4_alloc_icm_pages(struct scatterlist *mem, int order,
gfp_t gfp_mask, int node)
{ {
struct page *page; struct page *page;
page = alloc_pages_node(node, gfp_mask, order);
if (!page) {
page = alloc_pages(gfp_mask, order); page = alloc_pages(gfp_mask, order);
if (!page) if (!page)
return -ENOMEM; return -ENOMEM;
}
sg_set_page(mem, page, PAGE_SIZE << order, 0); sg_set_page(mem, page, PAGE_SIZE << order, 0);
return 0; return 0;
@@ -130,9 +134,15 @@ struct mlx4_icm *mlx4_alloc_icm(struct mlx4_dev *dev, int npages,
/* We use sg_set_buf for coherent allocs, which assumes low memory */ /* We use sg_set_buf for coherent allocs, which assumes low memory */
BUG_ON(coherent && (gfp_mask & __GFP_HIGHMEM)); BUG_ON(coherent && (gfp_mask & __GFP_HIGHMEM));
icm = kmalloc(sizeof *icm, gfp_mask & ~(__GFP_HIGHMEM | __GFP_NOWARN)); icm = kmalloc_node(sizeof(*icm),
gfp_mask & ~(__GFP_HIGHMEM | __GFP_NOWARN),
dev->numa_node);
if (!icm) {
icm = kmalloc(sizeof(*icm),
gfp_mask & ~(__GFP_HIGHMEM | __GFP_NOWARN));
if (!icm) if (!icm)
return NULL; return NULL;
}
icm->refcount = 0; icm->refcount = 0;
INIT_LIST_HEAD(&icm->chunk_list); INIT_LIST_HEAD(&icm->chunk_list);
@@ -141,10 +151,17 @@ struct mlx4_icm *mlx4_alloc_icm(struct mlx4_dev *dev, int npages,
while (npages > 0) { while (npages > 0) {
if (!chunk) { if (!chunk) {
chunk = kmalloc(sizeof *chunk, chunk = kmalloc_node(sizeof(*chunk),
gfp_mask & ~(__GFP_HIGHMEM | __GFP_NOWARN)); gfp_mask & ~(__GFP_HIGHMEM |
__GFP_NOWARN),
dev->numa_node);
if (!chunk) {
chunk = kmalloc(sizeof(*chunk),
gfp_mask & ~(__GFP_HIGHMEM |
__GFP_NOWARN));
if (!chunk) if (!chunk)
goto fail; goto fail;
}
sg_init_table(chunk->mem, MLX4_ICM_CHUNK_LEN); sg_init_table(chunk->mem, MLX4_ICM_CHUNK_LEN);
chunk->npages = 0; chunk->npages = 0;
@@ -161,7 +178,8 @@ struct mlx4_icm *mlx4_alloc_icm(struct mlx4_dev *dev, int npages,
cur_order, gfp_mask); cur_order, gfp_mask);
else else
ret = mlx4_alloc_icm_pages(&chunk->mem[chunk->npages], ret = mlx4_alloc_icm_pages(&chunk->mem[chunk->npages],
cur_order, gfp_mask); cur_order, gfp_mask,
dev->numa_node);
if (ret) { if (ret) {
if (--cur_order < 0) if (--cur_order < 0)

1
drivers/net/ethernet/mellanox/mlx4/main.c
View File

@@ -2191,6 +2191,7 @@ static int __mlx4_init_one(struct pci_dev *pdev, int pci_dev_data)
mutex_init(&priv->bf_mutex); mutex_init(&priv->bf_mutex);
dev->rev_id = pdev->revision; dev->rev_id = pdev->revision;
dev->numa_node = dev_to_node(&pdev->dev);
/* Detect if this device is a virtual function */ /* Detect if this device is a virtual function */
if (pci_dev_data & MLX4_PCI_DEV_IS_VF) { if (pci_dev_data & MLX4_PCI_DEV_IS_VF) {
/* When acting as pf, we normally skip vfs unless explicitly /* When acting as pf, we normally skip vfs unless explicitly

1
include/linux/mlx4/device.h
View File

@@ -662,6 +662,7 @@ struct mlx4_dev {
u8 rev_id; u8 rev_id;
char board_id[MLX4_BOARD_ID_LEN]; char board_id[MLX4_BOARD_ID_LEN];
int num_vfs; int num_vfs;
int numa_node;
int oper_log_mgm_entry_size; int oper_log_mgm_entry_size;
u64 regid_promisc_array[MLX4_MAX_PORTS + 1]; u64 regid_promisc_array[MLX4_MAX_PORTS + 1];
u64 regid_allmulti_array[MLX4_MAX_PORTS + 1]; u64 regid_allmulti_array[MLX4_MAX_PORTS + 1];