qiurui
/
linux-kernelorg-stable
mirror of https://kernel.googlesource.com/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

net/mlx5: HWS, change error flow on matcher disconnect 

Currently, when firmware failure occurs during matcher disconnect flow,
the error flow of the function reconnects the matcher back and returns
an error, which continues running the calling function and eventually
frees the matcher that is being disconnected.
This leads to a case where we have a freed matcher on the matchers list,
which in turn leads to use-after-free and eventual crash.

This patch fixes that by not trying to reconnect the matcher back when
some FW command fails during disconnect.

Note that we're dealing here with FW error. We can't overcome this
problem. This might lead to bad steering state (e.g. wrong connection
between matchers), and will also lead to resource leakage, as it is
the case with any other error handling during resource destruction.

However, the goal here is to allow the driver to continue and not crash
the machine with use-after-free error.

Signed-off-by: Yevgeny Kliteynik <kliteyn@nvidia.com>
Signed-off-by: Itamar Gozlan <igozlan@nvidia.com>
Reviewed-by: Mark Bloch <mbloch@nvidia.com>
Signed-off-by: Tariq Toukan <tariqt@nvidia.com>
Link: https://patch.msgid.link/20250102181415.1477316-7-tariqt@nvidia.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Yevgeny Kliteynik 2025-01-02 20:14:05 +02:00 committed by Jakub Kicinski
parent cc611ab6c7
commit 1ce840c7a6
1 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/net/ethernet/mellanox/mlx5/core/steering/hws/matcher.c
View File

@ -165,14 +165,14 @@ static int hws_matcher_disconnect(struct mlx5hws_matcher *matcher)
next->match_ste.rtc_0_id, next->match_ste.rtc_0_id,
next->match_ste.rtc_1_id); next->match_ste.rtc_1_id);
if (ret) { if (ret) {
mlx5hws_err(tbl->ctx, "Failed to disconnect matcher\n"); mlx5hws_err(tbl->ctx, "Fatal error, failed to disconnect matcher\n");
goto matcher_reconnect; return ret;
} }
} else { } else {
ret = mlx5hws_table_connect_to_miss_table(tbl, tbl->default_miss.miss_tbl); ret = mlx5hws_table_connect_to_miss_table(tbl, tbl->default_miss.miss_tbl);
if (ret) { if (ret) {
mlx5hws_err(tbl->ctx, "Failed to disconnect last matcher\n"); mlx5hws_err(tbl->ctx, "Fatal error, failed to disconnect last matcher\n");
goto matcher_reconnect; return ret;
} }
} }
@ -180,27 +180,19 @@ static int hws_matcher_disconnect(struct mlx5hws_matcher *matcher)
if (prev_ft_id == tbl->ft_id) { if (prev_ft_id == tbl->ft_id) {
ret = mlx5hws_table_update_connected_miss_tables(tbl); ret = mlx5hws_table_update_connected_miss_tables(tbl);
if (ret) { if (ret) {
mlx5hws_err(tbl->ctx, "Fatal error, failed to update connected miss table\n"); mlx5hws_err(tbl->ctx,
goto matcher_reconnect; "Fatal error, failed to update connected miss table\n");
return ret;
} }
} }
ret = mlx5hws_table_ft_set_default_next_ft(tbl, prev_ft_id); ret = mlx5hws_table_ft_set_default_next_ft(tbl, prev_ft_id);
if (ret) { if (ret) {
mlx5hws_err(tbl->ctx, "Fatal error, failed to restore matcher ft default miss\n"); mlx5hws_err(tbl->ctx, "Fatal error, failed to restore matcher ft default miss\n");
goto matcher_reconnect; return ret;
} }
return 0; return 0;
matcher_reconnect:
if (list_empty(&tbl->matchers_list) || !prev)
list_add(&matcher->list_node, &tbl->matchers_list);
else
/* insert after prev matcher */
list_add(&matcher->list_node, &prev->list_node);
return ret;
} }
static void hws_matcher_set_rtc_attr_sz(struct mlx5hws_matcher *matcher, static void hws_matcher_set_rtc_attr_sz(struct mlx5hws_matcher *matcher,