mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-08-30 07:39:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'net-mlx5-hws-misc-enhancements'

Browse Source 
Tariq Toukan says:

====================
net/mlx5: HWS misc enhancements

This series by Yevgeny brings several misc improvements to the mlx5 HWS
driver.

v2: https://lore.kernel.org/20260810092630.3137666-1-tariqt@nvidia.com
v1: https://lore.kernel.org/20260723095349.1890983-1-tariqt@nvidia.com
====================

Link: https://patch.msgid.link/20260816142045.3289452-1-tariqt@nvidia.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Jakub Kicinski
2026-08-17 18:48:54 -07:00
parent e818e7464d bc502b3f69
commit 47226bbdef
2 changed files with 51 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/net/ethernet/mellanox/mlx5/core/steering/hws/cmd.c
View File

@@ -398,7 +398,6 @@ int mlx5hws_cmd_rtc_create(struct mlx5_core_dev *mdev,
MLX5_SET(rtc, attr, update_method, rtc_attr->fw_gen_wqe);
MLX5_SET(rtc, attr, update_index_mode, rtc_attr->update_index_mode);
MLX5_SET(rtc, attr, access_index_mode, rtc_attr->access_index_mode);
MLX5_SET(rtc, attr, num_hash_definer, rtc_attr->num_hash_definer);
MLX5_SET(rtc, attr, log_depth, rtc_attr->log_depth);
MLX5_SET(rtc, attr, log_hash_size, rtc_attr->log_size);
MLX5_SET(rtc, attr, table_type, rtc_attr->table_type);
@@ -611,9 +610,11 @@ int mlx5hws_cmd_stc_modify(struct mlx5_core_dev *mdev,
ret = mlx5_cmd_exec(mdev, in, sizeof(in), out, sizeof(out));
if (ret)
mlx5_core_err(mdev, "Failed to modify STC FW action_type %d\n",
stc_attr->action_type);
mlx5_core_err(mdev,
"Failed to modify STC action_type %d, err %d, syndrome 0x%x\n",
stc_attr->action_type, ret,
MLX5_GET(general_obj_out_cmd_hdr,
out, syndrome));
return ret;
}
@@ -1181,12 +1182,6 @@ int mlx5hws_cmd_query_caps(struct mlx5_core_dev *mdev,
capability.e_switch_cap.merged_eswitch);
}
ret = mlx5_cmd_exec(mdev, in, sizeof(in), out, out_size);
if (ret) {
mlx5_core_err(mdev, "Failed to query device attributes\n");
goto out;
}
snprintf(caps->fw_ver, sizeof(caps->fw_ver), "%d.%d.%d",
fw_rev_maj(mdev), fw_rev_min(mdev), fw_rev_sub(mdev));

67
drivers/net/ethernet/mellanox/mlx5/core/steering/hws/send.c
View File

@@ -344,6 +344,36 @@ hws_send_engine_update_rule_resize(struct mlx5hws_send_engine *queue,
}
}
static const char *hws_rule_status_to_string(enum mlx5hws_rule_status status)
{
switch (status) {
case MLX5HWS_RULE_STATUS_CREATING: return "CREATING";
case MLX5HWS_RULE_STATUS_UPDATING: return "UPDATING";
case MLX5HWS_RULE_STATUS_DELETING: return "DELETING";
case MLX5HWS_RULE_STATUS_FAILING: return "FAILING";
default: return "NA";
}
}
static const char *hws_rule_resize_state_to_string(u8 state)
{
switch (state) {
case MLX5HWS_RULE_RESIZE_STATE_IDLE: return "IDLE";
case MLX5HWS_RULE_RESIZE_STATE_WRITING: return "WRITING";
case MLX5HWS_RULE_RESIZE_STATE_DELETING: return "DELETING";
default: return "UNKNOWN";
}
}
static const char *hws_gta_syndrome_to_string(u8 syndrome)
{
switch (syndrome) {
case 1: return "SET_FLOW_FAIL";
case 2: return "DISABLE_FLOW_FAIL";
default: return "UNKNOWN";
}
}
static void hws_send_engine_dump_error_cqe(struct mlx5hws_send_engine *queue,
struct mlx5hws_send_ring_priv *priv,
struct mlx5_cqe64 *cqe)
@@ -352,6 +382,7 @@ static void hws_send_engine_dump_error_cqe(struct mlx5hws_send_engine *queue,
struct mlx5hws_context *ctx = priv->rule->matcher->tbl->ctx;
u32 opcode = cqe ? get_cqe_opcode(cqe) : 0;
struct mlx5hws_rule *rule = priv->rule;
u8 syndrome;
/* If something bad happens and lots of rules are failing, we don't
* want to pollute dmesg. Print only the first bad cqe per engine,
@@ -364,26 +395,17 @@ static void hws_send_engine_dump_error_cqe(struct mlx5hws_send_engine *queue,
if (mlx5hws_rule_move_in_progress(rule))
mlx5hws_err(ctx,
"--- rule 0x%08llx: error completion moving rule: phase %s, wqes left %d\n",
"--- rule 0x%08llx: error completion moving rule: phase %s (%d), wqes left %d\n",
HWS_PTR_TO_ID(rule),
rule->resize_info->state ==
MLX5HWS_RULE_RESIZE_STATE_WRITING ? "WRITING" :
rule->resize_info->state ==
MLX5HWS_RULE_RESIZE_STATE_DELETING ? "DELETING" :
"UNKNOWN",
hws_rule_resize_state_to_string
(rule->resize_info->state),
rule->resize_info->state,
rule->pending_wqes);
else
mlx5hws_err(ctx,
"--- rule 0x%08llx: error completion %s (%d), wqes left %d\n",
HWS_PTR_TO_ID(rule),
rule->status ==
MLX5HWS_RULE_STATUS_CREATING ? "CREATING" :
rule->status ==
MLX5HWS_RULE_STATUS_DELETING ? "DELETING" :
rule->status ==
MLX5HWS_RULE_STATUS_FAILING ? "FAILING" :
rule->status ==
MLX5HWS_RULE_STATUS_UPDATING ? "UPDATING" : "NA",
hws_rule_status_to_string(rule->status),
rule->status,
rule->pending_wqes);
@@ -423,6 +445,10 @@ static void hws_send_engine_dump_error_cqe(struct mlx5hws_send_engine *queue,
" rule 0x%08llx: |--- syndrome = 0x%x\n",
HWS_PTR_TO_ID(rule),
err_cqe->syndrome);
mlx5hws_err(ctx,
" rule 0x%08llx: |--- WQE_CNT = 0x%04x\n",
HWS_PTR_TO_ID(rule),
(u32)be16_to_cpu(err_cqe->wqe_counter));
}
mlx5hws_err(ctx,
@@ -433,13 +459,12 @@ static void hws_send_engine_dump_error_cqe(struct mlx5hws_send_engine *queue,
HWS_PTR_TO_ID(rule),
(be32_to_cpu(cqe->byte_cnt) & 0x80000000) ?
"FAILURE" : "SUCCESS");
/* syndrome is in the lower 2 bits of byte_cnt */
syndrome = be32_to_cpu(cqe->byte_cnt) & 3;
mlx5hws_err(ctx,
" rule 0x%08llx: |------- SYNDROME = %s\n",
" rule 0x%08llx: |------- SYNDROME = %s (%u)\n",
HWS_PTR_TO_ID(rule),
((be32_to_cpu(cqe->byte_cnt) & 0x00000003) == 1) ?
"SET_FLOW_FAIL" :
((be32_to_cpu(cqe->byte_cnt) & 0x00000003) == 2) ?
"DISABLE_FLOW_FAIL" : "UNKNOWN");
hws_gta_syndrome_to_string(syndrome), syndrome);
mlx5hws_err(ctx,
" rule 0x%08llx: cqe->sop_drop_qpn = 0x%08x\n",
HWS_PTR_TO_ID(rule), be32_to_cpu(cqe->sop_drop_qpn));
@@ -1091,8 +1116,6 @@ static int hws_bwc_send_queues_init(struct mlx5hws_context *ctx)
if (!mlx5hws_context_bwc_supported(ctx))
return 0;
ctx->queues += bwc_queues;
ctx->bwc_send_queue_locks = kzalloc_objs(*ctx->bwc_send_queue_locks,
bwc_queues);
@@ -1104,6 +1127,8 @@ static int hws_bwc_send_queues_init(struct mlx5hws_context *ctx)
if (!ctx->bwc_lock_class_keys)
goto err_lock_class_keys;
ctx->queues += bwc_queues;
for (i = 0; i < bwc_queues; i++) {
mutex_init(&ctx->bwc_send_queue_locks[i]);
lockdep_register_key(ctx->bwc_lock_class_keys + i);