mlx5 updates 2022-03-09
Subsystems (6)
From: Saeed Mahameed <[email protected]>
Hi Dave, Hi Jakub,
This pull request adds two mlx5 updates.
1) debugfs for to provide stats on FW command failures, especially the
to eliminate kernel log on FW events for FW page management commands.
2) Support Software steering for ConnectX-7 device.
For more information please see tag log below.
Please pull and let me know if there is any problem.
Thanks,
Saeed.
The following changes since commit 24055bb87977e0c687b54ebf7bac8715f3636bc3:
net: tcp: fix shim definition of tcp_inbound_md5_hash (2022-03-09 08:44:40 -0800)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux.git tags/mlx5-updates-2022-03-09
for you to fetch changes up to 6862c787c7e88df490675ed781dc9052dba88a56:
net/mlx5: DR, Add support for ConnectX-7 steering (2022-03-09 13:33:04 -0800)
----------------------------------------------------------------
mlx5-updates-2022-03-09
1) Remove kernel log prints on FW events regarding FW pages management and replace that with debugfs entries to track FW pages management commands failures and general stats, we do that for all FW commands in general since it's the same effort to do so under the already existing debugfs entry for FW commands.
2) Add support for ConnectX-7 Software managed steering, in other words STEv2 which shares a lot in common with STE V1, the difference is in specific offsets in the devices, the logic is almost the same, thus we implement STEv1 and STEv2 in the same file.
----------------------------------------------------------------
Dan Carpenter (1):
net/mlx5e: TC, Fix use after free in mlx5e_clone_flow_attr_for_post_act()
Moshe Shemesh (8):
net/mlx5: Add command failures data to debugfs net/mlx5: Remove redundant notify fail on give pages net/mlx5: Remove redundant error on give pages net/mlx5: Remove redundant error on reclaim pages net/mlx5: Change release_all_pages cap bit location net/mlx5: Move debugfs entries to separate struct net/mlx5: Add pages debugfs
net/mlx5: Add debugfs counters for page commands failures
Shun Hao (1):
net/mlx5: DR, Align mlx5dv_dr API vport action with FW behavior
Yevgeny Kliteynik (6):
net/mlx5: DR, Add support for matching on Internet Header Length (IHL) net/mlx5: DR, Remove unneeded comments
net/mlx5: DR, Fix handling of different actions on the same STE in STEv1 net/mlx5: DR, Rename action modify fields to reflect naming in HW spec net/mlx5: DR, Refactor ste_ctx handling for STE v0/1 net/mlx5: DR, Add support for ConnectX-7 steering
drivers/infiniband/hw/mlx5/cong.c | 3 +- drivers/infiniband/hw/mlx5/main.c | 2 +- drivers/infiniband/hw/mlx5/mr.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/Makefile | 1 + drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 46 +++- drivers/net/ethernet/mellanox/mlx5/core/debugfs.c | 58 ++++- drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/main.c | 8 +- .../net/ethernet/mellanox/mlx5/core/pagealloc.c | 40 +++- .../mellanox/mlx5/core/steering/dr_action.c | 12 +- .../ethernet/mellanox/mlx5/core/steering/dr_dbg.c | 2 +- .../mellanox/mlx5/core/steering/dr_domain.c | 2 +- .../mellanox/mlx5/core/steering/dr_matcher.c | 19 +- .../ethernet/mellanox/mlx5/core/steering/dr_ste.c | 24 +- .../ethernet/mellanox/mlx5/core/steering/dr_ste.h | 7 +- .../mellanox/mlx5/core/steering/dr_ste_v0.c | 10 +- .../mellanox/mlx5/core/steering/dr_ste_v1.c | 253 +++++++++++---------- .../mellanox/mlx5/core/steering/dr_ste_v1.h | 94 ++++++++ .../mellanox/mlx5/core/steering/dr_ste_v2.c | 231 +++++++++++++++++++ .../mellanox/mlx5/core/steering/dr_types.h | 5 +- .../ethernet/mellanox/mlx5/core/steering/fs_dr.c | 2 +- .../ethernet/mellanox/mlx5/core/steering/mlx5dr.h | 2 +- include/linux/mlx5/driver.h | 38 +++- include/linux/mlx5/mlx5_ifc.h | 9 +- 24 files changed, 665 insertions(+), 207 deletions(-) create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/steering/dr_ste_v1.h create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/steering/dr_ste_v2.c
PATCH 1/16 net/mlx5e: TC, Fix use after free in mlx5e_clone_flow_attr_for_post_act()
From: Dan Carpenter <[email protected]>
This returns freed memory leading to a use after free. It's supposed to return NULL.
--- drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c +1 -1
@@ -3410,7 +3410,7 @@ mlx5e_clone_flow_attr_for_post_act(struct mlx5_flow_attr *attr,if (!attr2 || !parse_attr) {kvfree (parse_attr);kfree (attr2); -return attr2; +return NULL ; }memcpy (attr2, attr, attr_sz);
Signature · 1 line
2.35.1
Re: [net-next 01/16] net/mlx5e: TC, Fix use after free in mlx5e_clone_flow_attr_for_post_act()
This series was applied to netdev/net-next.git (master) by Saeed Mahameed <[email protected]>:
Hello:
This series was applied to netdev/net-next.git (master) by Saeed Mahameed <[email protected]>:
Quoted 11 lines · On Wed, 9 Mar 2022 13:37:40 -0800 you wrote:
From: Dan Carpenter <[email protected]>
This returns freed memory leading to a use after free. It's supposed to return NULL.
Fixes 8300f225268b ("net/mlx5e: Create new flow attr for multi table actions")Signed-off-by Dan Carpenter <[email protected]>Reviewed-by Roi Dayan <[email protected]>Signed-off-by Saeed Mahameed <[email protected]>[...]
Here is the summary with links:
- [net-next,01/16] net/mlx5e: TC, Fix use after free in mlx5e_clone_flow_attr_for_post_act()
https://git.kernel.org/netdev/net-next/c/371c2b349d92 - [net-next,02/16] net/mlx5: Add command failures data to debugfs https://git.kernel.org/netdev/net-next/c/34f46ae0d4b3 - [net-next,03/16] net/mlx5: Remove redundant notify fail on give pages https://git.kernel.org/netdev/net-next/c/4dac2f10ada0 - [net-next,04/16] net/mlx5: Remove redundant error on give pages https://git.kernel.org/netdev/net-next/c/113fdaaad75a - [net-next,05/16] net/mlx5: Remove redundant error on reclaim pages https://git.kernel.org/netdev/net-next/c/8d564292a166 - [net-next,06/16] net/mlx5: Change release_all_pages cap bit location https://git.kernel.org/netdev/net-next/c/d2cb8dda214f - [net-next,07/16] net/mlx5: Move debugfs entries to separate struct https://git.kernel.org/netdev/net-next/c/66771a1c729e - [net-next,08/16] net/mlx5: Add pages debugfs https://git.kernel.org/netdev/net-next/c/4e05cbf05c66 - [net-next,09/16] net/mlx5: Add debugfs counters for page commands failures https://git.kernel.org/netdev/net-next/c/32071187e9fb - [net-next,10/16] net/mlx5: DR, Align mlx5dv_dr API vport action with FW behavior https://git.kernel.org/netdev/net-next/c/aa818fbf8f36 - [net-next,11/16] net/mlx5: DR, Add support for matching on Internet Header Length (IHL) https://git.kernel.org/netdev/net-next/c/5c422bfad2fb - [net-next,12/16] net/mlx5: DR, Remove unneeded comments https://git.kernel.org/netdev/net-next/c/11659ef8d28e - [net-next,13/16] net/mlx5: DR, Fix handling of different actions on the same STE in STEv1 https://git.kernel.org/netdev/net-next/c/bdc3ab5795a6 - [net-next,14/16] net/mlx5: DR, Rename action modify fields to reflect naming in HW spec https://git.kernel.org/netdev/net-next/c/75a3926ca6a4 - [net-next,15/16] net/mlx5: DR, Refactor ste_ctx handling for STE v0/1 https://git.kernel.org/netdev/net-next/c/638a07f1090e - [net-next,16/16] net/mlx5: DR, Add support for ConnectX-7 steering https://git.kernel.org/netdev/net-next/c/6862c787c7e8
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
PATCH 2/16 net/mlx5: Add command failures data to debugfs
In reply to Saeed MahameedFrom: Moshe Shemesh <[email protected]>
Add new counters to command interface debugfs to count command failures. The following counters added:total_failed - number of times command failed (any kind of failure). failed_mbox_status - number of times command failed on bad status returned by FW.
In addition, add data about last command failure to command interface debugfs:last_failed_errno - last command failed returned errno. last_failed_mbox_status - last bad status returned by FW.
--- drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 44 +++++++++++++++---- .../net/ethernet/mellanox/mlx5/core/debugfs.c | 7 +++ include/linux/mlx5/driver.h | 9 ++++ 3 files changed, 51 insertions(+), 9 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/cmd.c +35 -9
@@ -1877,16 +1877,38 @@ static int cmd_exec(struct mlx5_core_dev *dev, void *in, int in_size, void *out,return err; } +static void cmd_status_log (struct mlx5_core_dev *dev,u16 opcode,u8 status,int err) +{ +struct mlx5_cmd_stats *stats; + +if (!err) +return ; + + stats = &dev->cmd.stats[opcode]; +spin_lock_irq (&stats->lock); + stats->failed++; +if (err <0 ) + stats->last_failed_errno = -err; +if (err == -EREMOTEIO ) { + stats->failed_mbox_status++; + stats->last_failed_mbox_status = status; + } +spin_unlock_irq (&stats->lock); +} +/* preserve -EREMOTEIO for outbox.status != OK, otherwise return err as is */ -static int cmd_status_err (int err,void *out) +static int cmd_status_err (struct mlx5_core_dev *dev,int err,u16 opcode,void *out) { -if (err)/* -EREMOTEIO is preserved */ -return err == -EREMOTEIO ? -EIO : err; +u8 status =MLX5_GET (mbox_out, out, status); -if (MLX5_GET (mbox_out, out, status) !=MLX5_CMD_STAT_OK ) -return -EREMOTEIO ; +if (err == -EREMOTEIO )/* -EREMOTEIO is preserved */ + err = -EIO ; -return 0 ; +if (!err && status !=MLX5_CMD_STAT_OK ) + err = -EREMOTEIO ; + +cmd_status_log (dev, opcode, status, err); +return err; }/**
@@ -1910,8 +1932,10 @@ static int cmd_status_err(int err, void *out)int mlx5_cmd_do (struct mlx5_core_dev *dev,void *in,int in_size,void *out,int out_size) {int err =cmd_exec (dev, in, in_size, out, out_size,NULL ,NULL , false); +u16 opcode =MLX5_GET (mbox_in, in, opcode); -return cmd_status_err (err, out); + err =cmd_status_err (dev, err, opcode, out); +return err; }EXPORT_SYMBOL (mlx5_cmd_do);
@@ -1954,8 +1978,9 @@ int mlx5_cmd_exec_polling(struct mlx5_core_dev *dev, void *in, int in_size, void *out, int out_size) { int err = cmd_exec(dev, in, in_size, out, out_size, NULL, NULL, true); +u16 opcode =MLX5_GET (mbox_in, in, opcode); - err =cmd_status_err (err, out); + err =cmd_status_err (dev, err, opcode, out);return mlx5_cmd_check (dev, err, in, out); }EXPORT_SYMBOL (mlx5_cmd_exec_polling);
@@ -1991,7 +2016,7 @@ static void mlx5_cmd_exec_cb_handler(int status, void *_work)struct mlx5_async_ctx *ctx; ctx = work->ctx; - status =cmd_status_err (status, work->out); + status =cmd_status_err (ctx->dev, status, work->opcode, work->out); work->user_callback (status, work);if (atomic_dec_and_test (&ctx->num_inflight))wake_up (&ctx->wait);
@@ -2005,6 +2030,7 @@ int mlx5_cmd_exec_cb(struct mlx5_async_ctx *ctx, void *in, int in_size, work->ctx = ctx; work->user_callback = callback; + work->opcode =MLX5_GET (mbox_in, in, opcode); work->out = out;if (WARN_ON (!atomic_inc_not_zero (&ctx->num_inflight)))return -EIO ;
drivers/net/ethernet/mellanox/mlx5/core/debugfs.c +7 -0
@@ -180,6 +180,13 @@ void mlx5_cmdif_debugfs_init(struct mlx5_core_dev *dev)debugfs_create_file ("average" ,0400 , stats->root, stats, &stats_fops);debugfs_create_u64 ("n" ,0400 , stats->root, &stats->n); +debugfs_create_u64 ("failed" ,0400 , stats->root, &stats->failed); +debugfs_create_u64 ("failed_mbox_status" ,0400 , stats->root, + &stats->failed_mbox_status); +debugfs_create_u32 ("last_failed_errno" ,0400 , stats->root, + &stats->last_failed_errno); +debugfs_create_u8 ("last_failed_mbox_status" ,0400 , stats->root, + &stats->last_failed_mbox_status); } } }
include/linux/mlx5/driver.h +9 -0
@@ -264,6 +264,14 @@ enum {struct mlx5_cmd_stats {u64 sum;u64 n; +/* number of times command failed */ +u64 failed; +/* number of times command failed on bad status returned by FW */ +u64 failed_mbox_status; +/* last command failed returned errno */ +u32 last_failed_errno; +/* last bad status returned by FW */ +u8 last_failed_mbox_status;struct dentry *root;/* protect command average calculations */ spinlock_t lock;
@@ -955,6 +963,7 @@ typedef void (*mlx5_async_cbk_t)(int status, struct mlx5_async_work *context);struct mlx5_async_work {struct mlx5_async_ctx *ctx;mlx5_async_cbk_t user_callback; +u16 opcode;/* cmd opcode */ void *out;/* pointer to the cmd output buffer */ };
Signature · 1 line
2.35.1
PATCH 3/16 net/mlx5: Remove redundant notify fail on give pages
In reply to Saeed MahameedFrom: Moshe Shemesh <[email protected]>
If give pages command failed by FW, there is no need to notify the FW on the failure. FW is aware and will handle it.
--- drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c +5 -1
@@ -365,8 +365,12 @@ static int give_pages(struct mlx5_core_dev *dev, u16 func_id, int npages,MLX5_SET (manage_pages_in, in, input_num_entries, npages);MLX5_SET (manage_pages_in, in, embedded_cpu_function, ec_function); - err =mlx5_cmd_exec (dev, in, inlen, out,sizeof (out)); + err =mlx5_cmd_do (dev, in, inlen, out,sizeof (out));if (err) { +if (err == -EREMOTEIO ) + notify_fail =0 ; + + err =mlx5_cmd_check (dev, err, in, out);mlx5_core_warn (dev,"func_id 0x%x, npages %d, err %d\n" , func_id, npages, err); goto out_4k;
Signature · 1 line
2.35.1
PATCH 4/16 net/mlx5: Remove redundant error on give pages
In reply to Saeed MahameedFrom: Moshe Shemesh <[email protected]>
If give pages was triggered by FW event and FW failed the command, the driver should ignore as FW is aware and will handle it.
The downstream patch will add a debugfs counter on this flow for debuggability.
--- .../net/ethernet/mellanox/mlx5/core/pagealloc.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c +10 -4
@@ -327,11 +327,12 @@ static void page_notify_fail(struct mlx5_core_dev *dev, u16 func_id, }static int give_pages (struct mlx5_core_dev *dev,u16 func_id,int npages, -int notify_fail,bool ec_function) +int event,bool ec_function) {u32 function =get_function (func_id, ec_function);u32 out[MLX5_ST_SZ_DW (manage_pages_out)] = {0 };int inlen =MLX5_ST_SZ_BYTES (manage_pages_in); +int notify_fail = event;u64 addr;int err;u32 *in;
@@ -366,10 +367,15 @@ static int give_pages(struct mlx5_core_dev *dev, u16 func_id, int npages,MLX5_SET (manage_pages_in, in, embedded_cpu_function, ec_function); err =mlx5_cmd_do (dev, in, inlen, out,sizeof (out)); +if (err == -EREMOTEIO ) { + notify_fail =0 ; +/* if triggered by FW and failed by FW ignore */ +if (event) { + err =0 ; + goto out_4k; + } + }if (err) { -if (err == -EREMOTEIO ) - notify_fail =0 ; - err =mlx5_cmd_check (dev, err, in, out);mlx5_core_warn (dev,"func_id 0x%x, npages %d, err %d\n" , func_id, npages, err);
Signature · 1 line
2.35.1
PATCH 5/16 net/mlx5: Remove redundant error on reclaim pages
In reply to Saeed MahameedFrom: Moshe Shemesh <[email protected]>
If reclaim pages was triggered by FW event and FW failed the command, the driver should ignore as FW is aware and will handle it.
The downstream patch will add a debugfs counter on this flow for debuggability.
--- drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c +8 -4
@@ -465,7 +465,7 @@ static int reclaim_pages_cmd(struct mlx5_core_dev *dev,u32 i =0 ;if (!mlx5_cmd_is_down (dev)) -return mlx5_cmd_exec (dev, in, in_size, out, out_size); +return mlx5_cmd_do (dev, in, in_size, out, out_size);/* No hard feelings, we want our pages back! */ npages =MLX5_GET (manage_pages_in, in, input_num_entries);
@@ -489,7 +489,7 @@ static int reclaim_pages_cmd(struct mlx5_core_dev *dev, }static int reclaim_pages (struct mlx5_core_dev *dev,u16 func_id,int npages, -int *nclaimed,bool ec_function) +int *nclaimed,bool event,bool ec_function) {u32 function =get_function (func_id, ec_function);int outlen =MLX5_ST_SZ_BYTES (manage_pages_out);
@@ -516,7 +516,11 @@ static int reclaim_pages(struct mlx5_core_dev *dev, u16 func_id, int npages,mlx5_core_dbg (dev,"func 0x%x, npages %d, outlen %d\n" , func_id, npages, outlen); err =reclaim_pages_cmd (dev, in,sizeof (in), out, outlen); +/* if triggered by FW event and failed by FW then ignore */ +if (event && err == -EREMOTEIO ) + err =0 ;if (err) { + err =mlx5_cmd_check (dev, err, in, out);mlx5_core_err (dev,"failed reclaiming pages: err %d\n" , err); goto out_free; }
@@ -556,7 +560,7 @@ static void pages_work_handler(struct work_struct *work)release_all_pages (dev, req->func_id, req->ec_function); else if (req->npages < 0) err =reclaim_pages (dev, req->func_id,-1 * req->npages,NULL , - req->ec_function); + true, req->ec_function); else if (req->npages > 0) err =give_pages (dev, req->func_id, req->npages,1 , req->ec_function);
@@ -655,7 +659,7 @@ static int mlx5_reclaim_root_pages(struct mlx5_core_dev *dev,int err; err =reclaim_pages (dev, func_id,optimal_reclaimed_pages (), - &nclaimed,mlx5_core_is_ecpf (dev)); + &nclaimed, false,mlx5_core_is_ecpf (dev));if (err) {mlx5_core_warn (dev,"failed reclaiming pages (%d) for func id 0x%x\n" , err, func_id);
Signature · 1 line
2.35.1
PATCH 6/16 net/mlx5: Change release_all_pages cap bit location
In reply to Saeed MahameedFrom: Moshe Shemesh <[email protected]>
mlx5 FW has changed release_all_pages cap bit by one bit offset to reflect a fix in the FW flow for release_all_pages. The driver should use the new bit to ensure it calls release_all_pages only if the FW fix is there.
--- include/linux/mlx5/mlx5_ifc.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
include/linux/mlx5/mlx5_ifc.h +2 -1
@@ -1419,8 +1419,9 @@ struct mlx5_ifc_cmd_hca_cap_bits {u8 reserved_at_130[0xa ];u8 log_max_ra_res_dc[0x6 ]; -u8 reserved_at_140[0x6 ]; +u8 reserved_at_140[0x5 ];u8 release_all_pages[0x1 ]; +u8 must_not_use[0x1 ];u8 reserved_at_147[0x2 ];u8 roce_accl[0x1 ];u8 log_max_ra_req_qp[0x6 ];
Signature · 1 line
2.35.1
PATCH 7/16 net/mlx5: Move debugfs entries to separate struct
In reply to Saeed MahameedFrom: Moshe Shemesh <[email protected]>
Move the debugfs entry pointers under priv to their own struct. Add get function for device debugfs root.
--- drivers/infiniband/hw/mlx5/cong.c | 3 +- drivers/infiniband/hw/mlx5/main.c | 2 +- drivers/infiniband/hw/mlx5/mr.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 2 +- .../net/ethernet/mellanox/mlx5/core/debugfs.c | 30 +++++++++++-------- .../net/ethernet/mellanox/mlx5/core/main.c | 8 ++--- .../mellanox/mlx5/core/steering/dr_dbg.c | 2 +- include/linux/mlx5/driver.h | 17 ++++++----- 8 files changed, 37 insertions(+), 29 deletions(-)
drivers/infiniband/hw/mlx5/cong.c +1 -2
@@ -433,8 +433,7 @@ void mlx5_ib_init_cong_debugfs(struct mlx5_ib_dev *dev, u32 port_num) dev->port[port_num].dbg_cc_params = dbg_cc_params; - dbg_cc_params->root =debugfs_create_dir ("cc_params" , - mdev->priv.dbg_root); + dbg_cc_params->root =debugfs_create_dir ("cc_params" ,mlx5_debugfs_get_dev_root (mdev));for (i =0 ; i <MLX5_IB_DBG_CC_MAX ; i++) { dbg_cc_params->params[i].offset = i;
drivers/infiniband/hw/mlx5/main.c +1 -1
@@ -4178,7 +4178,7 @@ static int mlx5_ib_stage_delay_drop_init(struct mlx5_ib_dev *dev)if (!mlx5_debugfs_root)return 0 ; - root =debugfs_create_dir ("delay_drop" , dev->mdev->priv.dbg_root); + root =debugfs_create_dir ("delay_drop" ,mlx5_debugfs_get_dev_root (dev->mdev)); dev->delay_drop.dir_debugfs = root; debugfs_create_atomic_t("num_timeout_events", 0400, root,
drivers/infiniband/hw/mlx5/mr.c +1 -1
@@ -696,7 +696,7 @@ static void mlx5_mr_cache_debugfs_init(struct mlx5_ib_dev *dev)if (!mlx5_debugfs_root || dev->is_rep)return ; - cache->root =debugfs_create_dir ("mr_cache" , dev->mdev->priv.dbg_root); + cache->root =debugfs_create_dir ("mr_cache" ,mlx5_debugfs_get_dev_root (dev->mdev));for (i =0 ; i <MAX_MR_CACHE_ENTRIES ; i++) { ent = &cache->ent[i];
drivers/net/ethernet/mellanox/mlx5/core/cmd.c +1 -1
@@ -1543,7 +1543,7 @@ static void create_debugfs_files(struct mlx5_core_dev *dev) {struct mlx5_cmd_debug *dbg = &dev->cmd.dbg; - dbg->dbg_root =debugfs_create_dir ("cmd" , dev->priv.dbg_root); + dbg->dbg_root =debugfs_create_dir ("cmd" ,mlx5_debugfs_get_dev_root (dev));debugfs_create_file ("in" ,0400 , dbg->dbg_root, dev, &dfops);debugfs_create_file ("out" ,0200 , dbg->dbg_root, dev, &dfops);
drivers/net/ethernet/mellanox/mlx5/core/debugfs.c +18 -12
@@ -99,26 +99,32 @@ void mlx5_unregister_debugfs(void)debugfs_remove (mlx5_debugfs_root); } +struct dentry *mlx5_debugfs_get_dev_root (struct mlx5_core_dev *dev) +{ +return dev->priv.dbg.dbg_root; +} +EXPORT_SYMBOL (mlx5_debugfs_get_dev_root); +void mlx5_qp_debugfs_init (struct mlx5_core_dev *dev) { - dev->priv.qp_debugfs =debugfs_create_dir ("QPs" , dev->priv.dbg_root); + dev->priv.dbg.qp_debugfs =debugfs_create_dir ("QPs" , dev->priv.dbg.dbg_root); }EXPORT_SYMBOL (mlx5_qp_debugfs_init);void mlx5_qp_debugfs_cleanup (struct mlx5_core_dev *dev) { -debugfs_remove_recursive (dev->priv.qp_debugfs); +debugfs_remove_recursive (dev->priv.dbg.qp_debugfs); }EXPORT_SYMBOL (mlx5_qp_debugfs_cleanup);void mlx5_eq_debugfs_init (struct mlx5_core_dev *dev) { - dev->priv.eq_debugfs =debugfs_create_dir ("EQs" , dev->priv.dbg_root); + dev->priv.dbg.eq_debugfs =debugfs_create_dir ("EQs" , dev->priv.dbg.dbg_root); }void mlx5_eq_debugfs_cleanup (struct mlx5_core_dev *dev) { -debugfs_remove_recursive (dev->priv.eq_debugfs); +debugfs_remove_recursive (dev->priv.dbg.eq_debugfs); } static ssize_t average_read(struct file *filp, char __user *buf, size_t count,
@@ -168,8 +174,8 @@ void mlx5_cmdif_debugfs_init(struct mlx5_core_dev *dev)const char *namep;int i; - cmd = &dev->priv.cmdif_debugfs; - *cmd =debugfs_create_dir ("commands" , dev->priv.dbg_root); + cmd = &dev->priv.dbg.cmdif_debugfs; + *cmd =debugfs_create_dir ("commands" , dev->priv.dbg.dbg_root);for (i =0 ; i <MLX5_CMD_OP_MAX ; i++) { stats = &dev->cmd.stats[i];
@@ -193,17 +199,17 @@ void mlx5_cmdif_debugfs_init(struct mlx5_core_dev *dev)void mlx5_cmdif_debugfs_cleanup (struct mlx5_core_dev *dev) { -debugfs_remove_recursive (dev->priv.cmdif_debugfs); +debugfs_remove_recursive (dev->priv.dbg.cmdif_debugfs); }void mlx5_cq_debugfs_init (struct mlx5_core_dev *dev) { - dev->priv.cq_debugfs =debugfs_create_dir ("CQs" , dev->priv.dbg_root); + dev->priv.dbg.cq_debugfs =debugfs_create_dir ("CQs" , dev->priv.dbg.dbg_root); }void mlx5_cq_debugfs_cleanup (struct mlx5_core_dev *dev) { -debugfs_remove_recursive (dev->priv.cq_debugfs); +debugfs_remove_recursive (dev->priv.dbg.cq_debugfs); } static u64 qp_read_field(struct mlx5_core_dev *dev, struct mlx5_core_qp *qp,
@@ -448,7 +454,7 @@ int mlx5_debug_qp_add(struct mlx5_core_dev *dev, struct mlx5_core_qp *qp)if (!mlx5_debugfs_root)return 0 ; - err =add_res_tree (dev,MLX5_DBG_RSC_QP , dev->priv.qp_debugfs, + err =add_res_tree (dev,MLX5_DBG_RSC_QP , dev->priv.dbg.qp_debugfs, &qp->dbg, qp->qpn, qp_fields,ARRAY_SIZE (qp_fields), qp);if (err)
@@ -475,7 +481,7 @@ int mlx5_debug_eq_add(struct mlx5_core_dev *dev, struct mlx5_eq *eq)if (!mlx5_debugfs_root)return 0 ; - err =add_res_tree (dev,MLX5_DBG_RSC_EQ , dev->priv.eq_debugfs, + err =add_res_tree (dev,MLX5_DBG_RSC_EQ , dev->priv.dbg.eq_debugfs, &eq->dbg, eq->eqn, eq_fields,ARRAY_SIZE (eq_fields), eq);if (err)
@@ -500,7 +506,7 @@ int mlx5_debug_cq_add(struct mlx5_core_dev *dev, struct mlx5_core_cq *cq)if (!mlx5_debugfs_root)return 0 ; - err =add_res_tree (dev,MLX5_DBG_RSC_CQ , dev->priv.cq_debugfs, + err =add_res_tree (dev,MLX5_DBG_RSC_CQ , dev->priv.dbg.cq_debugfs, &cq->dbg, cq->cqn, cq_fields,ARRAY_SIZE (cq_fields), cq);if (err)
drivers/net/ethernet/mellanox/mlx5/core/main.c +4 -4
@@ -1487,8 +1487,8 @@ int mlx5_mdev_init(struct mlx5_core_dev *dev, int profile_idx)INIT_LIST_HEAD (&priv->pgdir_list); priv->numa_node =dev_to_node (mlx5_core_dma_dev (dev)); - priv->dbg_root =debugfs_create_dir (dev_name (dev->device), - mlx5_debugfs_root); + priv->dbg.dbg_root =debugfs_create_dir (dev_name (dev->device), + mlx5_debugfs_root);INIT_LIST_HEAD (&priv->traps); err =mlx5_tout_init (dev);
@@ -1524,7 +1524,7 @@ int mlx5_mdev_init(struct mlx5_core_dev *dev, int profile_idx) err_health_init:mlx5_tout_cleanup (dev); err_timeout_init: -debugfs_remove (dev->priv.dbg_root); +debugfs_remove (dev->priv.dbg.dbg_root);mutex_destroy (&priv->pgdir_mutex);mutex_destroy (&priv->alloc_mutex);mutex_destroy (&priv->bfregs.wc_head.lock);
@@ -1542,7 +1542,7 @@ void mlx5_mdev_uninit(struct mlx5_core_dev *dev)mlx5_pagealloc_cleanup (dev);mlx5_health_cleanup (dev);mlx5_tout_cleanup (dev); -debugfs_remove_recursive (dev->priv.dbg_root); +debugfs_remove_recursive (dev->priv.dbg.dbg_root);mutex_destroy (&priv->pgdir_mutex);mutex_destroy (&priv->alloc_mutex);mutex_destroy (&priv->bfregs.wc_head.lock);
drivers/net/ethernet/mellanox/mlx5/core/steering/dr_dbg.c +1 -1
@@ -630,7 +630,7 @@ void mlx5dr_dbg_init_dump(struct mlx5dr_domain *dmn) } dmn->dump_info.steering_debugfs = -debugfs_create_dir ("steering" , dev->priv.dbg_root); +debugfs_create_dir ("steering" ,mlx5_debugfs_get_dev_root (dev)); dmn->dump_info.fdb_debugfs =debugfs_create_dir ("fdb" , dmn->dump_info.steering_debugfs);
include/linux/mlx5/driver.h +10 -7
@@ -551,6 +551,14 @@ struct mlx5_adev {int idx; }; +struct mlx5_debugfs_entries { +struct dentry *dbg_root; +struct dentry *qp_debugfs; +struct dentry *eq_debugfs; +struct dentry *cq_debugfs; +struct dentry *cmdif_debugfs; +}; +struct mlx5_ft_pool ;struct mlx5_priv {/* IRQ table valid only for real pci devices PF or VF */
@@ -570,12 +578,7 @@ struct mlx5_priv {struct mlx5_core_health health;struct list_head traps; -/* start: qp staff */ -struct dentry *qp_debugfs; -struct dentry *eq_debugfs; -struct dentry *cq_debugfs; -struct dentry *cmdif_debugfs; -/* end: qp staff */ +struct mlx5_debugfs_entries dbg;/* start: alloc staff */ /* protect buffer allocation according to numa node */
@@ -585,7 +588,6 @@ struct mlx5_priv {struct mutex pgdir_mutex;struct list_head pgdir_list;/* end: alloc staff */ -struct dentry *dbg_root;struct list_head ctx_list;spinlock_t ctx_lock;
@@ -1038,6 +1040,7 @@ int mlx5_vector2eqn(struct mlx5_core_dev *dev, int vector, int *eqn);int mlx5_core_attach_mcg (struct mlx5_core_dev *dev,union ib_gid *mgid,u32 qpn);int mlx5_core_detach_mcg (struct mlx5_core_dev *dev,union ib_gid *mgid,u32 qpn); +struct dentry *mlx5_debugfs_get_dev_root (struct mlx5_core_dev *dev);void mlx5_qp_debugfs_init (struct mlx5_core_dev *dev);void mlx5_qp_debugfs_cleanup (struct mlx5_core_dev *dev); int mlx5_access_reg(struct mlx5_core_dev *dev, void *data_in, int size_in,
Signature · 1 line
2.35.1
PATCH 8/16 net/mlx5: Add pages debugfs
In reply to Saeed MahameedFrom: Moshe Shemesh <[email protected]>
Add pages debugfs to expose the following counters for debuggability:fw_pages_total - How many pages were given to FW and not returned yet. vfs_pages - For SRIOV, how many pages were given to FW for virtual functions usage.host_pf_pages - For ECPF, how many pages were given to FW for external hosts physical functions usage.
--- .../net/ethernet/mellanox/mlx5/core/debugfs.c | 17 +++++++++++++++++ .../net/ethernet/mellanox/mlx5/core/pagealloc.c | 2 ++ include/linux/mlx5/driver.h | 9 ++++++--- 3 files changed, 25 insertions(+), 3 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/debugfs.c +17 -0
@@ -212,6 +212,23 @@ void mlx5_cq_debugfs_cleanup(struct mlx5_core_dev *dev)debugfs_remove_recursive (dev->priv.dbg.cq_debugfs); } +void mlx5_pages_debugfs_init (struct mlx5_core_dev *dev) +{ +struct dentry *pages; + + dev->priv.dbg.pages_debugfs =debugfs_create_dir ("pages" , dev->priv.dbg.dbg_root); + pages = dev->priv.dbg.pages_debugfs; + +debugfs_create_u32 ("fw_pages_total" ,0400 , pages, &dev->priv.fw_pages); +debugfs_create_u32 ("fw_pages_vfs" ,0400 , pages, &dev->priv.vfs_pages); +debugfs_create_u32 ("fw_pages_host_pf" ,0400 , pages, &dev->priv.host_pf_pages); +} + +void mlx5_pages_debugfs_cleanup (struct mlx5_core_dev *dev) +{ +debugfs_remove_recursive (dev->priv.dbg.pages_debugfs); +} +static u64 qp_read_field (struct mlx5_core_dev *dev,struct mlx5_core_qp *qp,int index,int *is_str) {
drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c +2 -0
@@ -714,12 +714,14 @@ int mlx5_pagealloc_init(struct mlx5_core_dev *dev)return -ENOMEM ;xa_init (&dev->priv.page_root_xa); +mlx5_pages_debugfs_init (dev);return 0 ; }void mlx5_pagealloc_cleanup (struct mlx5_core_dev *dev) { +mlx5_pages_debugfs_cleanup (dev);xa_destroy (&dev->priv.page_root_xa);destroy_workqueue (dev->priv.pg_wq); }
include/linux/mlx5/driver.h +6 -3
@@ -557,6 +557,7 @@ struct mlx5_debugfs_entries {struct dentry *eq_debugfs;struct dentry *cq_debugfs;struct dentry *cmdif_debugfs; +struct dentry *pages_debugfs; };struct mlx5_ft_pool ;
@@ -569,11 +570,11 @@ struct mlx5_priv {struct mlx5_nb pg_nb;struct workqueue_struct *pg_wq;struct xarray page_root_xa; -int fw_pages; +u32 fw_pages;atomic_t reg_pages;struct list_head free_list; -int vfs_pages; -int host_pf_pages; +u32 vfs_pages; +u32 host_pf_pages;struct mlx5_core_health health;struct list_head traps;
@@ -1026,6 +1027,8 @@ int mlx5_pagealloc_init(struct mlx5_core_dev *dev);void mlx5_pagealloc_cleanup (struct mlx5_core_dev *dev);void mlx5_pagealloc_start (struct mlx5_core_dev *dev);void mlx5_pagealloc_stop (struct mlx5_core_dev *dev); +void mlx5_pages_debugfs_init (struct mlx5_core_dev *dev); +void mlx5_pages_debugfs_cleanup (struct mlx5_core_dev *dev);void mlx5_core_req_pages_handler (struct mlx5_core_dev *dev,u16 func_id,s32 npages,bool ec_function);int mlx5_satisfy_startup_pages (struct mlx5_core_dev *dev,int boot);
Signature · 1 line
2.35.1
PATCH 9/16 net/mlx5: Add debugfs counters for page commands failures
In reply to Saeed MahameedFrom: Moshe Shemesh <[email protected]>
Add the following new debugfs counters for debug and verbosity:fw_pages_alloc_failed - number of pages FW requested but driver failed to allocate.give_pages_dropped - number of pages given to FW, but command give pages failed by FW.reclaim_pages_discard - number of pages which were about to reclaim back and FW failed the command.
--- drivers/net/ethernet/mellanox/mlx5/core/debugfs.c | 4 ++++ .../net/ethernet/mellanox/mlx5/core/pagealloc.c | 14 +++++++++++--- include/linux/mlx5/driver.h | 3 +++ 3 files changed, 18 insertions(+), 3 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/debugfs.c +4 -0
@@ -222,6 +222,10 @@ void mlx5_pages_debugfs_init(struct mlx5_core_dev *dev)debugfs_create_u32 ("fw_pages_total" ,0400 , pages, &dev->priv.fw_pages);debugfs_create_u32 ("fw_pages_vfs" ,0400 , pages, &dev->priv.vfs_pages);debugfs_create_u32 ("fw_pages_host_pf" ,0400 , pages, &dev->priv.host_pf_pages); +debugfs_create_u32 ("fw_pages_alloc_failed" ,0400 , pages, &dev->priv.fw_pages_alloc_failed); +debugfs_create_u32 ("fw_pages_give_dropped" ,0400 , pages, &dev->priv.give_pages_dropped); +debugfs_create_u32 ("fw_pages_reclaim_discard" ,0400 , pages, + &dev->priv.reclaim_pages_discard); }void mlx5_pages_debugfs_cleanup (struct mlx5_core_dev *dev)
drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c +11 -3
@@ -352,8 +352,10 @@ static int give_pages(struct mlx5_core_dev *dev, u16 func_id, int npages,if (err) {if (err == -ENOMEM ) err =alloc_system_page (dev, function); -if (err) +if (err) { + dev->priv.fw_pages_alloc_failed += (npages - i); goto out_4k; + } goto retry; }
@@ -372,14 +374,14 @@ static int give_pages(struct mlx5_core_dev *dev, u16 func_id, int npages,/* if triggered by FW and failed by FW ignore */ if (event) { err =0 ; - goto out_4k; + goto out_dropped; } }if (err) { err =mlx5_cmd_check (dev, err, in, out);mlx5_core_warn (dev,"func_id 0x%x, npages %d, err %d\n" , func_id, npages, err); - goto out_4k; + goto out_dropped; } dev->priv.fw_pages += npages;
@@ -394,6 +396,8 @@ static int give_pages(struct mlx5_core_dev *dev, u16 func_id, int npages,kvfree (in);return 0 ; +out_dropped: + dev->priv.give_pages_dropped += npages; out_4k:for (i--; i >=0 ; i--)free_4k (dev,MLX5_GET64 (manage_pages_in, in, pas[i]), function);
@@ -516,6 +520,10 @@ static int reclaim_pages(struct mlx5_core_dev *dev, u16 func_id, int npages,mlx5_core_dbg (dev,"func 0x%x, npages %d, outlen %d\n" , func_id, npages, outlen); err =reclaim_pages_cmd (dev, in,sizeof (in), out, outlen); +if (err) { + npages =MLX5_GET (manage_pages_in, in, input_num_entries); + dev->priv.reclaim_pages_discard += npages; + }/* if triggered by FW event and failed by FW then ignore */ if (event && err == -EREMOTEIO ) err =0 ;
include/linux/mlx5/driver.h +3 -0
@@ -575,6 +575,9 @@ struct mlx5_priv {struct list_head free_list;u32 vfs_pages;u32 host_pf_pages; +u32 fw_pages_alloc_failed; +u32 give_pages_dropped; +u32 reclaim_pages_discard;struct mlx5_core_health health;struct list_head traps;
Signature · 1 line
2.35.1
PATCH 10/16 net/mlx5: DR, Align mlx5dv_dr API vport action with FW behavior
In reply to Saeed MahameedFrom: Shun Hao <[email protected]>
This aligns the behavior with FW when creating an FDB rule with wire vport destination but no source port matching. Until now such rules would fail on internal DR RX rule creation since the source and destination are the wire vport.
The new behavior is the same as done on FW steering, if destination is wire, we will create both TX and RX rules, but the RX packet coming from wire will be dropped due to loopback not supported.
--- .../ethernet/mellanox/mlx5/core/steering/dr_action.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/steering/dr_action.c +3 -9
@@ -669,15 +669,9 @@ int mlx5dr_actions_build_ste_arr(struct mlx5dr_matcher *matcher,case DR_ACTION_TYP_VPORT : attr.hit_gvmi = action->vport->caps->vhca_gvmi; dest_action = action; -if (rx_rule) { -if (action->vport->caps->num ==MLX5_VPORT_UPLINK ) { -mlx5dr_dbg (dmn,"Device doesn't support Loopback on WIRE vport\n" ); -return -EOPNOTSUPP ; - } - attr.final_icm_addr = action->vport->caps->icm_address_rx; - }else { - attr.final_icm_addr = action->vport->caps->icm_address_tx; - } + attr.final_icm_addr = rx_rule ? + action->vport->caps->icm_address_rx : + action->vport->caps->icm_address_tx;break ;case DR_ACTION_TYP_POP_VLAN : if (!rx_rule && !(dmn->ste_ctx->actions_caps &
Signature · 1 line
2.35.1
PATCH 11/16 net/mlx5: DR, Add support for matching on Internet Header Length (IHL)
In reply to Saeed MahameedFrom: Yevgeny Kliteynik <[email protected]>
Add support for matching on new field - Internet Header Length (IHL).
--- .../ethernet/mellanox/mlx5/core/steering/dr_matcher.c | 11 +++++++++-- .../net/ethernet/mellanox/mlx5/core/steering/dr_ste.c | 1 + .../ethernet/mellanox/mlx5/core/steering/dr_ste_v0.c | 1 + .../ethernet/mellanox/mlx5/core/steering/dr_ste_v1.c | 1 + .../ethernet/mellanox/mlx5/core/steering/dr_types.h | 4 +++- include/linux/mlx5/mlx5_ifc.h | 5 ++++- 6 files changed, 19 insertions(+), 4 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/steering/dr_matcher.c +9 -2
@@ -47,6 +47,11 @@ static bool dr_mask_is_ttl_set(struct mlx5dr_match_spec *spec)return spec->ttl_hoplimit; } +static bool dr_mask_is_ipv4_ihl_set (struct mlx5dr_match_spec *spec) +{ +return spec->ipv4_ihl; +} +#define DR_MASK_IS_L2_DST (_spec, _misc, _inner_outer) (_spec.first_vid || \ (_spec).first_cfi || (_spec).first_prio || (_spec).cvlan_tag || \ (_spec).svlan_tag || (_spec).dmac_47_16 || (_spec).dmac_15_0 || \
@@ -507,7 +512,8 @@ static int dr_matcher_set_ste_builders(struct mlx5dr_matcher *matcher,mlx5dr_ste_build_eth_l3_ipv4_5_tuple (ste_ctx, &sb[idx++], &mask, inner, rx); -if (dr_mask_is_ttl_set (&mask.outer)) +if (dr_mask_is_ttl_set (&mask.outer) || +dr_mask_is_ipv4_ihl_set (&mask.outer))mlx5dr_ste_build_eth_l3_ipv4_misc (ste_ctx, &sb[idx++], &mask, inner, rx); }
@@ -614,7 +620,8 @@ static int dr_matcher_set_ste_builders(struct mlx5dr_matcher *matcher,mlx5dr_ste_build_eth_l3_ipv4_5_tuple (ste_ctx, &sb[idx++], &mask, inner, rx); -if (dr_mask_is_ttl_set (&mask.inner)) +if (dr_mask_is_ttl_set (&mask.inner) || +dr_mask_is_ipv4_ihl_set (&mask.inner))mlx5dr_ste_build_eth_l3_ipv4_misc (ste_ctx, &sb[idx++], &mask, inner, rx); }
drivers/net/ethernet/mellanox/mlx5/core/steering/dr_ste.c +1 -0
@@ -793,6 +793,7 @@ static void dr_ste_copy_mask_spec(char *mask, struct mlx5dr_match_spec *spec, bo spec->tcp_sport =IFC_GET_CLR (fte_match_set_lyr_2_4, mask, tcp_sport, clr); spec->tcp_dport =IFC_GET_CLR (fte_match_set_lyr_2_4, mask, tcp_dport, clr); + spec->ipv4_ihl =IFC_GET_CLR (fte_match_set_lyr_2_4, mask, ipv4_ihl, clr); spec->ttl_hoplimit =IFC_GET_CLR (fte_match_set_lyr_2_4, mask, ttl_hoplimit, clr); spec->udp_sport =IFC_GET_CLR (fte_match_set_lyr_2_4, mask, udp_sport, clr);
drivers/net/ethernet/mellanox/mlx5/core/steering/dr_ste_v0.c +1 -0
@@ -1152,6 +1152,7 @@ dr_ste_v0_build_eth_l3_ipv4_misc_tag(struct mlx5dr_match_param *value,struct mlx5dr_match_spec *spec = sb->inner ? &value->inner : &value->outer;DR_STE_SET_TAG (eth_l3_ipv4_misc, tag, time_to_live, spec, ttl_hoplimit); +DR_STE_SET_TAG (eth_l3_ipv4_misc, tag, ihl, spec, ipv4_ihl);return 0 ; }
drivers/net/ethernet/mellanox/mlx5/core/steering/dr_ste_v1.c +1 -0
@@ -1331,6 +1331,7 @@ static int dr_ste_v1_build_eth_l3_ipv4_misc_tag(struct mlx5dr_match_param *valuestruct mlx5dr_match_spec *spec = sb->inner ? &value->inner : &value->outer;DR_STE_SET_TAG (eth_l3_ipv4_misc_v1, tag, time_to_live, spec, ttl_hoplimit); +DR_STE_SET_TAG (eth_l3_ipv4_misc_v1, tag, ihl, spec, ipv4_ihl);return 0 ; }
drivers/net/ethernet/mellanox/mlx5/core/steering/dr_types.h +3 -1
@@ -555,7 +555,9 @@ struct mlx5dr_match_spec {*/ u32 tcp_dport:16; - u32 reserved_auto1:24; + u32 reserved_auto1:16; + u32 ipv4_ihl:4; + u32 reserved_auto2:4; u32 ttl_hoplimit:8;/* UDP source port.;tcp and udp sport/dport are mutually exclusive */
include/linux/mlx5/mlx5_ifc.h +4 -1
@@ -493,7 +493,10 @@ struct mlx5_ifc_fte_match_set_lyr_2_4_bits {u8 tcp_sport[0x10 ];u8 tcp_dport[0x10 ]; -u8 reserved_at_c0[0x18 ]; +u8 reserved_at_c0[0x10 ]; +u8 ipv4_ihl[0x4 ]; +u8 reserved_at_c4[0x4 ]; +u8 ttl_hoplimit[0x8 ];u8 udp_sport[0x10 ];
Signature · 1 line
2.35.1
PATCH 12/16 net/mlx5: DR, Remove unneeded comments
In reply to Saeed MahameedFrom: Yevgeny Kliteynik <[email protected]>
Remove two comments that were erroneously left in the code.
--- drivers/net/ethernet/mellanox/mlx5/core/steering/dr_ste_v1.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/steering/dr_ste_v1.c +2 -2
@@ -1079,8 +1079,8 @@ static void dr_ste_v1_build_eth_l2_src_or_dst_bit_mask(struct mlx5dr_match_paramDR_STE_SET_TAG (eth_l2_src_v1, bit_mask, first_vlan_id, mask, first_vid);DR_STE_SET_TAG (eth_l2_src_v1, bit_mask, first_cfi, mask, first_cfi);DR_STE_SET_TAG (eth_l2_src_v1, bit_mask, first_priority, mask, first_prio); -DR_STE_SET_TAG (eth_l2_src_v1, bit_mask, ip_fragmented, mask, frag);// ? -DR_STE_SET_TAG (eth_l2_src_v1, bit_mask, l3_ethertype, mask, ethertype);// ? +DR_STE_SET_TAG (eth_l2_src_v1, bit_mask, ip_fragmented, mask, frag); +DR_STE_SET_TAG (eth_l2_src_v1, bit_mask, l3_ethertype, mask, ethertype);DR_STE_SET_ONES (eth_l2_src_v1, bit_mask, l3_type, mask, ip_version);if (mask->svlan_tag || mask->cvlan_tag) {
Signature · 1 line
2.35.1
PATCH 13/16 net/mlx5: DR, Fix handling of different actions on the same STE in STEv1
In reply to Saeed MahameedFrom: Yevgeny Kliteynik <[email protected]>
Fix handling of various conditions in set_actions_rx/tx that check whether different actions can be on the same STE.
--- .../net/ethernet/mellanox/mlx5/core/steering/dr_ste_v1.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/steering/dr_ste_v1.c +2 -4
@@ -533,7 +533,6 @@ static void dr_ste_v1_set_actions_tx(struct mlx5dr_domain *dmn,dr_ste_v1_set_pop_vlan (last_ste, action, attr->vlans.count); action_sz -=DR_STE_ACTION_SINGLE_SZ ; action +=DR_STE_ACTION_SINGLE_SZ ; - allow_modify_hdr = false; }if (action_type_set[DR_ACTION_TYP_CTR ])
@@ -677,13 +676,12 @@ static void dr_ste_v1_set_actions_rx(struct mlx5dr_domain *dmn,dr_ste_v1_arr_init_next_match (&last_ste, added_stes, attr->gvmi); action =MLX5_ADDR_OF (ste_mask_and_match_v1, last_ste, action); action_sz =DR_STE_ACTION_TRIPLE_SZ ; - allow_modify_hdr = false; - allow_ctr = false; }dr_ste_v1_set_pop_vlan (last_ste, action, attr->vlans.count); action_sz -=DR_STE_ACTION_SINGLE_SZ ; action +=DR_STE_ACTION_SINGLE_SZ ; + allow_ctr = false; }if (action_type_set[DR_ACTION_TYP_MODIFY_HDR ]) {
@@ -731,9 +729,9 @@ static void dr_ste_v1_set_actions_rx(struct mlx5dr_domain *dmn, action =MLX5_ADDR_OF (ste_mask_and_match_v1, last_ste, action); action_sz =DR_STE_ACTION_TRIPLE_SZ ; allow_modify_hdr = true; - allow_ctr = false; }dr_ste_v1_set_counter_id (last_ste, attr->ctr_id); + allow_ctr = false; }if (action_type_set[DR_ACTION_TYP_L2_TO_TNL_L2 ]) {
Signature · 1 line
2.35.1
PATCH 14/16 net/mlx5: DR, Rename action modify fields to reflect naming in HW spec
In reply to Saeed MahameedFrom: Yevgeny Kliteynik <[email protected]>
As preparation for supporting ConnectX-7, rename action modify fields steering registers from arbitrary names to the names that reflect the corresponding naming and location of the steering registers in HW. These registers mapping has changed in ConnectX-7, so the renaming allows to keep track of their mapping better.
--- .../mellanox/mlx5/core/steering/dr_ste_v1.c | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/steering/dr_ste_v1.c +12 -12
@@ -121,12 +121,12 @@ enum {DR_STE_V1_ACTION_MDFY_FLD_CFG_HDR_0_1 =0x70 ,DR_STE_V1_ACTION_MDFY_FLD_METADATA_2_CQE =0x7b ,DR_STE_V1_ACTION_MDFY_FLD_GNRL_PURPOSE =0x7c , -DR_STE_V1_ACTION_MDFY_FLD_REGISTER_2 =0x8c , -DR_STE_V1_ACTION_MDFY_FLD_REGISTER_3 =0x8d , -DR_STE_V1_ACTION_MDFY_FLD_REGISTER_4 =0x8e , -DR_STE_V1_ACTION_MDFY_FLD_REGISTER_5 =0x8f , -DR_STE_V1_ACTION_MDFY_FLD_REGISTER_6 =0x90 , - DR_STE_V1_ACTION_MDFY_FLD_REGISTER_7 = 0x91, +DR_STE_V1_ACTION_MDFY_FLD_REGISTER_2_0 =0x8c , +DR_STE_V1_ACTION_MDFY_FLD_REGISTER_2_1 =0x8d , +DR_STE_V1_ACTION_MDFY_FLD_REGISTER_1_0 =0x8e , +DR_STE_V1_ACTION_MDFY_FLD_REGISTER_1_1 =0x8f , +DR_STE_V1_ACTION_MDFY_FLD_REGISTER_0_0 =0x90 , + DR_STE_V1_ACTION_MDFY_FLD_REGISTER_0_1 = 0x91, }; static const struct mlx5dr_ste_action_modify_field dr_ste_v1_action_modify_field_arr[] = {
@@ -223,22 +223,22 @@ static const struct mlx5dr_ste_action_modify_field dr_ste_v1_action_modify_field .hw_field = DR_STE_V1_ACTION_MDFY_FLD_METADATA_2_CQE, .start = 0, .end = 31, }, [MLX5_ACTION_IN_FIELD_METADATA_REG_C_0] = { - .hw_field = DR_STE_V1_ACTION_MDFY_FLD_REGISTER_6, .start = 0, .end = 31, + .hw_field = DR_STE_V1_ACTION_MDFY_FLD_REGISTER_0_0, .start = 0, .end = 31, }, [MLX5_ACTION_IN_FIELD_METADATA_REG_C_1] = { - .hw_field = DR_STE_V1_ACTION_MDFY_FLD_REGISTER_7, .start = 0, .end = 31, + .hw_field = DR_STE_V1_ACTION_MDFY_FLD_REGISTER_0_1, .start = 0, .end = 31, }, [MLX5_ACTION_IN_FIELD_METADATA_REG_C_2] = { - .hw_field = DR_STE_V1_ACTION_MDFY_FLD_REGISTER_4, .start = 0, .end = 31, + .hw_field = DR_STE_V1_ACTION_MDFY_FLD_REGISTER_1_0, .start = 0, .end = 31, }, [MLX5_ACTION_IN_FIELD_METADATA_REG_C_3] = { - .hw_field = DR_STE_V1_ACTION_MDFY_FLD_REGISTER_5, .start = 0, .end = 31, + .hw_field = DR_STE_V1_ACTION_MDFY_FLD_REGISTER_1_1, .start = 0, .end = 31, }, [MLX5_ACTION_IN_FIELD_METADATA_REG_C_4] = { - .hw_field = DR_STE_V1_ACTION_MDFY_FLD_REGISTER_2, .start = 0, .end = 31, + .hw_field = DR_STE_V1_ACTION_MDFY_FLD_REGISTER_2_0, .start = 0, .end = 31, }, [MLX5_ACTION_IN_FIELD_METADATA_REG_C_5] = { - .hw_field = DR_STE_V1_ACTION_MDFY_FLD_REGISTER_3, .start = 0, .end = 31, + .hw_field = DR_STE_V1_ACTION_MDFY_FLD_REGISTER_2_1, .start = 0, .end = 31, }, [MLX5_ACTION_IN_FIELD_OUT_TCP_SEQ_NUM] = { .hw_field = DR_STE_V1_ACTION_MDFY_FLD_TCP_MISC_0, .start = 0, .end = 31,
Signature · 1 line
2.35.1
PATCH 15/16 net/mlx5: DR, Refactor ste_ctx handling for STE v0/1
In reply to Saeed MahameedFrom: Yevgeny Kliteynik <[email protected]>
As preparation for supporting ConnectX-7, this patches changes handling of ste_ctx handling for existing STE v0 and V1:
- each context is now a static struct, and it has a corresponding getter
- v0 and v1 were extended to contain the fields that are required for integrating STEv2.
--- .../mellanox/mlx5/core/steering/dr_ste.c | 21 ++++++++----------- .../mellanox/mlx5/core/steering/dr_ste.h | 6 ++++-- .../mellanox/mlx5/core/steering/dr_ste_v0.c | 9 +++++++- .../mellanox/mlx5/core/steering/dr_ste_v1.c | 20 ++++++++++++++++-- .../mellanox/mlx5/core/steering/dr_types.h | 1 + 5 files changed, 40 insertions(+), 17 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/steering/dr_ste.c +9 -12
@@ -523,8 +523,8 @@ void mlx5dr_ste_set_actions_tx(struct mlx5dr_ste_ctx *ste_ctx,struct mlx5dr_ste_actions_attr *attr, u32 *added_stes) { - ste_ctx->set_actions_tx(dmn, action_type_set, hw_ste_arr, -attr ,added_stes ); + ste_ctx->set_actions_tx(dmn, action_type_set, ste_ctx->actions_caps, +hw_ste_arr ,attr ,added_stes ); } void mlx5dr_ste_set_actions_rx(struct mlx5dr_ste_ctx *ste_ctx,
@@ -534,8 +534,8 @@ void mlx5dr_ste_set_actions_rx(struct mlx5dr_ste_ctx *ste_ctx,struct mlx5dr_ste_actions_attr *attr, u32 *added_stes) { - ste_ctx->set_actions_rx(dmn, action_type_set, hw_ste_arr, -attr ,added_stes ); + ste_ctx->set_actions_rx(dmn, action_type_set, ste_ctx->actions_caps, +hw_ste_arr ,attr ,added_stes ); } const struct mlx5dr_ste_action_modify_field *
@@ -1361,15 +1361,12 @@ void mlx5dr_ste_build_tnl_header_0_1(struct mlx5dr_ste_ctx *ste_ctx, ste_ctx->build_tnl_header_0_1_init (sb, mask); } -static struct mlx5dr_ste_ctx *mlx5dr_ste_ctx_arr[] = { - [MLX5_STEERING_FORMAT_CONNECTX_5 ] = &ste_ctx_v0, - [MLX5_STEERING_FORMAT_CONNECTX_6DX ] = &ste_ctx_v1, -}; -struct mlx5dr_ste_ctx *mlx5dr_ste_get_ctx (u8 version) { -if (version >MLX5_STEERING_FORMAT_CONNECTX_6DX ) -return NULL ; +if (version ==MLX5_STEERING_FORMAT_CONNECTX_5 ) +return mlx5dr_ste_get_ctx_v0 (); +else if (version ==MLX5_STEERING_FORMAT_CONNECTX_6DX ) +return mlx5dr_ste_get_ctx_v1 (); -return mlx5dr_ste_ctx_arr[version]; +return NULL ; }
drivers/net/ethernet/mellanox/mlx5/core/steering/dr_ste.h +4 -2
@@ -161,11 +161,13 @@ struct mlx5dr_ste_ctx {u32 actions_caps;void (*set_actions_rx)(struct mlx5dr_domain *dmn,u8 *action_type_set, +u32 actions_caps,u8 *hw_ste_arr,struct mlx5dr_ste_actions_attr *attr,u32 *added_stes);void (*set_actions_tx)(struct mlx5dr_domain *dmn,u8 *action_type_set, +u32 actions_caps,u8 *hw_ste_arr,struct mlx5dr_ste_actions_attr *attr,u32 *added_stes);
@@ -197,7 +199,7 @@ struct mlx5dr_ste_ctx { void (*prepare_for_postsend)(u8 *hw_ste_p, u32 ste_size); }; -extern struct mlx5dr_ste_ctx ste_ctx_v0; -extern struct mlx5dr_ste_ctx ste_ctx_v1; +struct mlx5dr_ste_ctx *mlx5dr_ste_get_ctx_v0 (void ); +struct mlx5dr_ste_ctx *mlx5dr_ste_get_ctx_v1 (void );#endif /* _DR_STE_ */
drivers/net/ethernet/mellanox/mlx5/core/steering/dr_ste_v0.c +8 -1
@@ -408,6 +408,7 @@ static void dr_ste_v0_arr_init_next(u8 **last_ste,static void dr_ste_v0_set_actions_tx (struct mlx5dr_domain *dmn,u8 *action_type_set, +u32 actions_caps,u8 *last_ste,struct mlx5dr_ste_actions_attr *attr,u32 *added_stes)
@@ -477,6 +478,7 @@ dr_ste_v0_set_actions_tx(struct mlx5dr_domain *dmn,static void dr_ste_v0_set_actions_rx (struct mlx5dr_domain *dmn,u8 *action_type_set, +u32 actions_caps,u8 *last_ste,struct mlx5dr_ste_actions_attr *attr,u32 *added_stes)
@@ -1898,7 +1900,7 @@ static void dr_ste_v0_build_tnl_header_0_1_init(struct mlx5dr_ste_build *sb, sb->ste_build_tag_func = &dr_ste_v0_build_tnl_header_0_1_tag; } -struct mlx5dr_ste_ctx ste_ctx_v0 = { +static struct mlx5dr_ste_ctx ste_ctx_v0 = {/* Builders */ .build_eth_l2_src_dst_init = &dr_ste_v0_build_eth_l2_src_dst_init, .build_eth_l3_ipv6_src_init = &dr_ste_v0_build_eth_l3_ipv6_src_init,
@@ -1951,3 +1953,8 @@ struct mlx5dr_ste_ctx ste_ctx_v0 = { .set_action_copy = &dr_ste_v0_set_action_copy, .set_action_decap_l3_list = &dr_ste_v0_set_action_decap_l3_list, }; + +struct mlx5dr_ste_ctx *mlx5dr_ste_get_ctx_v0 (void ) +{ +return &ste_ctx_v0; +}
drivers/net/ethernet/mellanox/mlx5/core/steering/dr_ste_v1.c +18 -2
@@ -513,6 +513,7 @@ static void dr_ste_v1_arr_init_next_match(u8 **last_ste,static void dr_ste_v1_set_actions_tx (struct mlx5dr_domain *dmn,u8 *action_type_set, +u32 actions_caps,u8 *last_ste,struct mlx5dr_ste_actions_attr *attr,u32 *added_stes)
@@ -533,6 +534,10 @@ static void dr_ste_v1_set_actions_tx(struct mlx5dr_domain *dmn,dr_ste_v1_set_pop_vlan (last_ste, action, attr->vlans.count); action_sz -=DR_STE_ACTION_SINGLE_SZ ; action +=DR_STE_ACTION_SINGLE_SZ ; + +/* Check if vlan_pop and modify_hdr on same STE is supported */ +if (!(actions_caps &DR_STE_CTX_ACTION_CAP_POP_MDFY )) + allow_modify_hdr = false; }if (action_type_set[DR_ACTION_TYP_CTR ])
@@ -632,6 +637,7 @@ static void dr_ste_v1_set_actions_tx(struct mlx5dr_domain *dmn,static void dr_ste_v1_set_actions_rx (struct mlx5dr_domain *dmn,u8 *action_type_set, +u32 actions_caps,u8 *last_ste,struct mlx5dr_ste_actions_attr *attr,u32 *added_stes)
@@ -682,6 +688,10 @@ static void dr_ste_v1_set_actions_rx(struct mlx5dr_domain *dmn, action_sz -=DR_STE_ACTION_SINGLE_SZ ; action +=DR_STE_ACTION_SINGLE_SZ ; allow_ctr = false; + +/* Check if vlan_pop and modify_hdr on same STE is supported */ +if (!(actions_caps &DR_STE_CTX_ACTION_CAP_POP_MDFY )) + allow_modify_hdr = false; }if (action_type_set[DR_ACTION_TYP_MODIFY_HDR ]) {
@@ -2045,7 +2055,7 @@ dr_ste_v1_build_tnl_gtpu_flex_parser_1_init(struct mlx5dr_ste_build *sb, sb->ste_build_tag_func = &dr_ste_v1_build_tnl_gtpu_flex_parser_1_tag; } -struct mlx5dr_ste_ctx ste_ctx_v1 = { +static struct mlx5dr_ste_ctx ste_ctx_v1 = {/* Builders */ .build_eth_l2_src_dst_init = &dr_ste_v1_build_eth_l2_src_dst_init, .build_eth_l3_ipv6_src_init = &dr_ste_v1_build_eth_l3_ipv6_src_init,
@@ -2090,7 +2100,8 @@ struct mlx5dr_ste_ctx ste_ctx_v1 = {/* Actions */ .actions_caps = DR_STE_CTX_ACTION_CAP_TX_POP |DR_STE_CTX_ACTION_CAP_RX_PUSH | - DR_STE_CTX_ACTION_CAP_RX_ENCAP, +DR_STE_CTX_ACTION_CAP_RX_ENCAP | + DR_STE_CTX_ACTION_CAP_POP_MDFY, .set_actions_rx = &dr_ste_v1_set_actions_rx, .set_actions_tx = &dr_ste_v1_set_actions_tx, .modify_field_arr_sz = ARRAY_SIZE(dr_ste_v1_action_modify_field_arr),
@@ -2102,3 +2113,8 @@ struct mlx5dr_ste_ctx ste_ctx_v1 = {/* Send */ .prepare_for_postsend = &dr_ste_v1_prepare_for_postsend, }; + +struct mlx5dr_ste_ctx *mlx5dr_ste_get_ctx_v1 (void ) +{ +return &ste_ctx_v1; +}
drivers/net/ethernet/mellanox/mlx5/core/steering/dr_types.h +1 -0
@@ -91,6 +91,7 @@ enum mlx5dr_ste_ctx_action_cap {DR_STE_CTX_ACTION_CAP_TX_POP =1 <<0 ,DR_STE_CTX_ACTION_CAP_RX_PUSH =1 <<1 ,DR_STE_CTX_ACTION_CAP_RX_ENCAP =1 <<2 , + DR_STE_CTX_ACTION_CAP_POP_MDFY = 1 << 3, }; enum {
Signature · 1 line
2.35.1
PATCH 16/16 net/mlx5: DR, Add support for ConnectX-7 steering
In reply to Saeed MahameedFrom: Yevgeny Kliteynik <[email protected]>
Add support for a new SW format version that is implemented by ConnectX-7.
Except for several differences, the STEv2 is identical to STEv1, so for most callbacks the STEv2 context struct will call STEv1 functions.
--- .../net/ethernet/mellanox/mlx5/core/Makefile | 1 + .../mellanox/mlx5/core/steering/dr_domain.c | 2 +- .../mellanox/mlx5/core/steering/dr_matcher.c | 8 +- .../mellanox/mlx5/core/steering/dr_ste.c | 2 + .../mellanox/mlx5/core/steering/dr_ste.h | 1 + .../mellanox/mlx5/core/steering/dr_ste_v1.c | 202 ++++++++------- .../mellanox/mlx5/core/steering/dr_ste_v1.h | 94 +++++++ .../mellanox/mlx5/core/steering/dr_ste_v2.c | 231 ++++++++++++++++++ .../mellanox/mlx5/core/steering/fs_dr.c | 2 +- .../mellanox/mlx5/core/steering/mlx5dr.h | 2 +- include/linux/mlx5/mlx5_ifc.h | 1 + 11 files changed, 436 insertions(+), 110 deletions(-) create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/steering/dr_ste_v1.h create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/steering/dr_ste_v2.c
drivers/net/ethernet/mellanox/mlx5/core/Makefile +1 -0
@@ -103,6 +103,7 @@ mlx5_core-$(CONFIG_MLX5_SW_STEERING) += steering/dr_domain.o steering/dr_table.o steering/dr_icm_pool.o steering/dr_buddy.o \ steering/dr_ste.o steering/dr_send.o \ steering/dr_ste_v0.o steering/dr_ste_v1.o \ + steering/dr_ste_v2.o \ steering/dr_cmd.o steering/dr_fw.o \ steering/dr_action.o steering/fs_dr.o \ steering/dr_dbg.o
drivers/net/ethernet/mellanox/mlx5/core/steering/dr_domain.c +1 -1
@@ -8,7 +8,7 @@#define DR_DOMAIN_SW_STEERING_SUPPORTED (dmn, dmn_type) \ ((dmn)->info.caps.dmn_type##_sw_owner || \ ((dmn)->info.caps.dmn_type##_sw_owner_v2 && \ - (dmn)->info.caps.sw_format_ver <= MLX5_STEERING_FORMAT_CONNECTX_6DX)) + (dmn)->info.caps.sw_format_ver <= MLX5_STEERING_FORMAT_CONNECTX_7))static void dr_domain_init_csum_recalc_fts (struct mlx5dr_domain *dmn) {
drivers/net/ethernet/mellanox/mlx5/core/steering/dr_matcher.c +4 -4
@@ -108,7 +108,7 @@ dr_mask_is_vxlan_gpe_set(struct mlx5dr_match_misc3 *misc3)static bool dr_matcher_supp_vxlan_gpe (struct mlx5dr_cmd_caps *caps) { -return (caps->sw_format_ver ==MLX5_STEERING_FORMAT_CONNECTX_6DX ) || +return (caps->sw_format_ver >=MLX5_STEERING_FORMAT_CONNECTX_6DX ) || (caps->flex_protocols &MLX5_FLEX_PARSER_VXLAN_GPE_ENABLED ); }
@@ -149,7 +149,7 @@ static bool dr_mask_is_tnl_geneve_tlv_opt_exist_set(struct mlx5dr_match_misc *mistatic bool dr_matcher_supp_tnl_geneve (struct mlx5dr_cmd_caps *caps) { -return (caps->sw_format_ver ==MLX5_STEERING_FORMAT_CONNECTX_6DX ) || +return (caps->sw_format_ver >=MLX5_STEERING_FORMAT_CONNECTX_6DX ) || (caps->flex_protocols &MLX5_FLEX_PARSER_GENEVE_ENABLED ); }
@@ -266,13 +266,13 @@ static bool dr_mask_is_tnl_gtpu_any(struct mlx5dr_match_param *mask,static int dr_matcher_supp_icmp_v4 (struct mlx5dr_cmd_caps *caps) { -return (caps->sw_format_ver ==MLX5_STEERING_FORMAT_CONNECTX_6DX ) || +return (caps->sw_format_ver >=MLX5_STEERING_FORMAT_CONNECTX_6DX ) || (caps->flex_protocols &MLX5_FLEX_PARSER_ICMP_V4_ENABLED ); }static int dr_matcher_supp_icmp_v6 (struct mlx5dr_cmd_caps *caps) { -return (caps->sw_format_ver ==MLX5_STEERING_FORMAT_CONNECTX_6DX ) || +return (caps->sw_format_ver >=MLX5_STEERING_FORMAT_CONNECTX_6DX ) || (caps->flex_protocols &MLX5_FLEX_PARSER_ICMP_V6_ENABLED ); }
drivers/net/ethernet/mellanox/mlx5/core/steering/dr_ste.c +2 -0
@@ -1367,6 +1367,8 @@ struct mlx5dr_ste_ctx *mlx5dr_ste_get_ctx(u8 version)return mlx5dr_ste_get_ctx_v0 (); else if (version == MLX5_STEERING_FORMAT_CONNECTX_6DX) return mlx5dr_ste_get_ctx_v1(); + else if (version == MLX5_STEERING_FORMAT_CONNECTX_7) + return mlx5dr_ste_get_ctx_v2();return NULL ; }
drivers/net/ethernet/mellanox/mlx5/core/steering/dr_ste.h +1 -0
@@ -201,5 +201,6 @@ struct mlx5dr_ste_ctx {struct mlx5dr_ste_ctx *mlx5dr_ste_get_ctx_v0 (void );struct mlx5dr_ste_ctx *mlx5dr_ste_get_ctx_v1 (void ); +struct mlx5dr_ste_ctx *mlx5dr_ste_get_ctx_v2 (void );#endif /* _DR_STE_ */
drivers/net/ethernet/mellanox/mlx5/core/steering/dr_ste_v1.c +99 -103
475 lines not on this page · raw message
drivers/net/ethernet/mellanox/mlx5/core/steering/dr_ste_v1.h new file +94 -0
94 lines not on this page · raw message
drivers/net/ethernet/mellanox/mlx5/core/steering/dr_ste_v2.c new file +231 -0
231 lines not on this page · raw message
drivers/net/ethernet/mellanox/mlx5/core/steering/fs_dr.c +1 -1
@@ -758,7 +758,7 @@ static u32 mlx5_cmd_dr_get_capabilities(struct mlx5_flow_root_namespace *ns, enum fs_flow_table_type ft_type) {if (ft_type !=FS_FT_FDB || -MLX5_CAP_GEN (ns->dev, steering_format_version) !=MLX5_STEERING_FORMAT_CONNECTX_6DX ) +MLX5_CAP_GEN (ns->dev, steering_format_version) ==MLX5_STEERING_FORMAT_CONNECTX_5 )return 0 ;return MLX5_FLOW_STEERING_CAP_VLAN_PUSH_ON_RX |MLX5_FLOW_STEERING_CAP_VLAN_POP_ON_TX ;
drivers/net/ethernet/mellanox/mlx5/core/steering/mlx5dr.h +1 -1
@@ -136,7 +136,7 @@ mlx5dr_is_supported(struct mlx5_core_dev *dev) (MLX5_CAP_ESW_FLOWTABLE_FDB (dev, sw_owner) || (MLX5_CAP_ESW_FLOWTABLE_FDB (dev, sw_owner_v2) && (MLX5_CAP_GEN (dev, steering_format_version) <= -MLX5_STEERING_FORMAT_CONNECTX_6DX ))); +MLX5_STEERING_FORMAT_CONNECTX_7 ))); }/* buddy functions & structure */
include/linux/mlx5/mlx5_ifc.h +1 -0
@@ -1346,6 +1346,7 @@ enum mlx5_fc_bulk_alloc_bitmask {enum {MLX5_STEERING_FORMAT_CONNECTX_5 =0 ,MLX5_STEERING_FORMAT_CONNECTX_6DX =1 , +MLX5_STEERING_FORMAT_CONNECTX_7 =2 , };struct mlx5_ifc_cmd_hca_cap_bits {
Signature · 1 line
2.35.1