github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-28 00:53:34 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

net/mlx5: fs, split bulk init

Browse Source 
Refactor mlx5_fs_bulk_init() by moving bitmap allocation logic into a
new helper function mlx5_fs_bulk_bitmap_alloc(). This change does not
alter any logic.

Signed-off-by: Mark Bloch <mbloch@nvidia.com>
Signed-off-by: Moshe Shemesh <moshe@nvidia.com>
Reviewed-by: Yevgeny Kliteynik <kliteyn@nvidia.com>
Signed-off-by: Tariq Toukan <tariqt@nvidia.com>
Link: https://patch.msgid.link/1768210825-1598472-3-git-send-email-tariqt@nvidia.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
This commit is contained in:
Mark Bloch 2026-01-12 11:40:24 +02:00 committed by Paolo Abeni
parent 96e89982a6
commit 6a6c4dd7c0
4 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/ethernet/mellanox/mlx5/core/fs_counters.c
View File

@ -449,7 +449,9 @@ static struct mlx5_fs_bulk *mlx5_fc_bulk_create(struct mlx5_core_dev *dev,
if (!fc_bulk)
return NULL;
if (mlx5_fs_bulk_init(dev, &fc_bulk->fs_bulk, bulk_len))
mlx5_fs_bulk_init(&fc_bulk->fs_bulk, bulk_len);
if (mlx5_fs_bulk_bitmap_alloc(dev, &fc_bulk->fs_bulk))
goto fc_bulk_free;
if (mlx5_cmd_fc_bulk_alloc(dev, alloc_bitmask, &base_id))
@ -566,7 +568,7 @@ mlx5_fc_local_create(u32 counter_id, u32 offset, u32 bulk_size)
counter->type = MLX5_FC_TYPE_LOCAL;
counter->id = counter_id;
fc_bulk->fs_bulk.bulk_len = bulk_size;
mlx5_fs_bulk_init(&fc_bulk->fs_bulk, bulk_size);
mlx5_fc_bulk_init(fc_bulk, counter_id - offset);
counter->bulk = fc_bulk;
refcount_set(&counter->fc_local_refcount, 1);

16
drivers/net/ethernet/mellanox/mlx5/core/fs_pool.c
View File

@ -4,23 +4,27 @@
#include <mlx5_core.h>
#include "fs_pool.h"
int mlx5_fs_bulk_init(struct mlx5_core_dev *dev, struct mlx5_fs_bulk *fs_bulk,
int bulk_len)
int mlx5_fs_bulk_bitmap_alloc(struct mlx5_core_dev *dev,
struct mlx5_fs_bulk *fs_bulk)
{
int i;
fs_bulk->bitmask = kvcalloc(BITS_TO_LONGS(bulk_len), sizeof(unsigned long),
GFP_KERNEL);
fs_bulk->bitmask = kvcalloc(BITS_TO_LONGS(fs_bulk->bulk_len),
sizeof(unsigned long), GFP_KERNEL);
if (!fs_bulk->bitmask)
return -ENOMEM;
fs_bulk->bulk_len = bulk_len;
for (i = 0; i < bulk_len; i++)
for (i = 0; i < fs_bulk->bulk_len; i++)
set_bit(i, fs_bulk->bitmask);
return 0;
}
void mlx5_fs_bulk_init(struct mlx5_fs_bulk *fs_bulk, int bulk_len)
{
fs_bulk->bulk_len = bulk_len;
}
void mlx5_fs_bulk_cleanup(struct mlx5_fs_bulk *fs_bulk)
{
kvfree(fs_bulk->bitmask);

5
drivers/net/ethernet/mellanox/mlx5/core/fs_pool.h
View File

@ -39,8 +39,9 @@ struct mlx5_fs_pool {
int threshold;
};
int mlx5_fs_bulk_init(struct mlx5_core_dev *dev, struct mlx5_fs_bulk *fs_bulk,
int bulk_len);
void mlx5_fs_bulk_init(struct mlx5_fs_bulk *fs_bulk, int bulk_len);
int mlx5_fs_bulk_bitmap_alloc(struct mlx5_core_dev *dev,
struct mlx5_fs_bulk *fs_bulk);
void mlx5_fs_bulk_cleanup(struct mlx5_fs_bulk *fs_bulk);
int mlx5_fs_bulk_get_free_amount(struct mlx5_fs_bulk *bulk);

8
drivers/net/ethernet/mellanox/mlx5/core/steering/hws/fs_hws_pools.c
View File

@ -121,7 +121,9 @@ mlx5_fs_hws_pr_bulk_create(struct mlx5_core_dev *dev, void *pool_ctx)
if (!pr_bulk)
return NULL;
if (mlx5_fs_bulk_init(dev, &pr_bulk->fs_bulk, bulk_len))
mlx5_fs_bulk_init(&pr_bulk->fs_bulk, bulk_len);
if (mlx5_fs_bulk_bitmap_alloc(dev, &pr_bulk->fs_bulk))
goto free_pr_bulk;
for (i = 0; i < bulk_len; i++) {
@ -275,7 +277,9 @@ mlx5_fs_hws_mh_bulk_create(struct mlx5_core_dev *dev, void *pool_ctx)
if (!mh_bulk)
return NULL;
if (mlx5_fs_bulk_init(dev, &mh_bulk->fs_bulk, bulk_len))
mlx5_fs_bulk_init(&mh_bulk->fs_bulk, bulk_len);
if (mlx5_fs_bulk_bitmap_alloc(dev, &mh_bulk->fs_bulk))
goto free_mh_bulk;
for (int i = 0; i < bulk_len; i++) {