net/mlx5: Create a new profile for SFs

Create a new profile for SFs in order to disable the command cache.
Each function command cache consumes ~500KB of memory, when using a
large number of SFs this savings is notable on memory constarined
systems.

Use a new profile to provide for future differences between SFs and PFs.

The mr_cache not used for non-PF functions, so it is excluded from the
new profile.

Signed-off-by: Parav Pandit <parav@mellanox.com>
Reviewed-by: Bodong Wang <bodong@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/cmd.c b/drivers/net/ethernet/mellanox/mlx5/core/cmd.c
index b00e33ed05e9177460260436c560bd37f3817fe8..d53de39539a8fd90d455fbe83f87dba0225dde14 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/cmd.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/cmd.c
@@ -1802,7 +1802,7 @@ static struct mlx5_cmd_msg *alloc_msg(struct mlx5_core_dev *dev, int in_size,
        if (in_size <= 16)
                goto cache_miss;
 
-       for (i = 0; i < MLX5_NUM_COMMAND_CACHES; i++) {
+       for (i = 0; i < dev->profile.num_cmd_caches; i++) {
                ch = &cmd->cache[i];
                if (in_size > ch->max_inbox_size)
                        continue;
@@ -2097,7 +2097,7 @@ static void destroy_msg_cache(struct mlx5_core_dev *dev)
        struct mlx5_cmd_msg *n;
        int i;
 
-       for (i = 0; i < MLX5_NUM_COMMAND_CACHES; i++) {
+       for (i = 0; i < dev->profile.num_cmd_caches; i++) {
                ch = &dev->cmd.cache[i];
                list_for_each_entry_safe(msg, n, &ch->head, list) {
                        list_del(&msg->list);
@@ -2127,7 +2127,7 @@ static void create_msg_cache(struct mlx5_core_dev *dev)
        int k;
 
        /* Initialize and fill the caches with initial entries */
-       for (k = 0; k < MLX5_NUM_COMMAND_CACHES; k++) {
+       for (k = 0; k < dev->profile.num_cmd_caches; k++) {
                ch = &cmd->cache[k];
                spin_lock_init(&ch->lock);
                INIT_LIST_HEAD(&ch->head);

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/main.c b/drivers/net/ethernet/mellanox/mlx5/core/main.c
index f95df73d10897d5a10b76b0325082ba3b59fd7ed..a95d1218def91d2b9adc9169916620d109dceff5 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c
@@ -100,15 +100,19 @@ enum {
 static struct mlx5_profile profile[] = {
        [0] = {
                .mask           = 0,
+               .num_cmd_caches = MLX5_NUM_COMMAND_CACHES,
        },
        [1] = {
                .mask           = MLX5_PROF_MASK_QP_SIZE,
                .log_max_qp     = 12,
+               .num_cmd_caches = MLX5_NUM_COMMAND_CACHES,
+
        },
        [2] = {
                .mask           = MLX5_PROF_MASK_QP_SIZE |
                                  MLX5_PROF_MASK_MR_CACHE,
                .log_max_qp     = LOG_MAX_SUPPORTED_QPS,
+               .num_cmd_caches = MLX5_NUM_COMMAND_CACHES,
                .mr_cache[0]    = {
                        .size   = 500,
                        .limit  = 250
@@ -174,6 +178,11 @@ static struct mlx5_profile profile[] = {
                        .limit  = 4
                },
        },
+       [3] = {
+               .mask           = MLX5_PROF_MASK_QP_SIZE,
+               .log_max_qp     = LOG_MAX_SUPPORTED_QPS,
+               .num_cmd_caches = 0,
+       },
 };
 
 static int wait_fw_init(struct mlx5_core_dev *dev, u32 max_wait_mili,

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h b/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h
index be0785f83083a13f55e5e3fa6998821774f07fbf..5eaab99678ee536ce0999f19df878a2562337d47 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h
@@ -142,6 +142,7 @@ enum mlx5_semaphore_space_address {
 };
 
 #define MLX5_DEFAULT_PROF       2
+#define MLX5_SF_PROF           3
 
 static inline int mlx5_flexible_inlen(struct mlx5_core_dev *dev, size_t fixed,
                                      size_t item_size, size_t num_items,

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/sf/dev/driver.c b/drivers/net/ethernet/mellanox/mlx5/core/sf/dev/driver.c
index a7377619ba6f2943b8a184a733e1756e5fcc278b..e2f26d0bc61541f98d637d0c45f9c710c4325230 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/sf/dev/driver.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/sf/dev/driver.c
@@ -28,7 +28,7 @@ static int mlx5_sf_dev_probe(struct auxiliary_device *adev, const struct auxilia
        mdev->priv.adev_idx = adev->id;
        sf_dev->mdev = mdev;
 
-       err = mlx5_mdev_init(mdev, MLX5_DEFAULT_PROF);
+       err = mlx5_mdev_init(mdev, MLX5_SF_PROF);
        if (err) {
                mlx5_core_warn(mdev, "mlx5_mdev_init on err=%d\n", err);
                goto mdev_err;

diff --git a/include/linux/mlx5/driver.h b/include/linux/mlx5/driver.h
index f243bd10a5e11846447b9dbe3a46e9023b0b881c..135a3c8d82371c7c3af9e945ab411c7ae0227bee 100644 (file)
--- a/include/linux/mlx5/driver.h
+++ b/include/linux/mlx5/driver.h
@@ -751,6 +751,7 @@ enum {
 struct mlx5_profile {
        u64     mask;
        u8      log_max_qp;
+       u8      num_cmd_caches;
        struct {
                int     size;
                int     limit;