You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
88 lines
2.9 KiB
88 lines
2.9 KiB
4 years ago
|
From fb95b280014de1cc4cb10e5743b83b00817ac7be Mon Sep 17 00:00:00 2001
|
||
|
|
From: Alaa Hleihel <ahleihel@redhat.com>
|
||
|
|
Date: Mon, 1 Jun 2020 15:40:39 -0400
|
||
|
|
Subject: [PATCH 286/312] [netdrv] net/mlx5: Don't maintain a case of
|
||
|
|
del_sw_func being null
|
||
|
|
|
||
|
|
Message-id: <20200601154102.25980-17-ahleihel@redhat.com>
|
||
|
|
Patchwork-id: 315721
|
||
|
|
Patchwork-instance: patchwork
|
||
|
|
O-Subject: [RHEL8.3 BZ 1842258 16/39] net/mlx5: Don't maintain a case of del_sw_func being null
|
||
|
|
Bugzilla: 1842258 1840408
|
||
|
|
RH-Acked-by: Honggang Li <honli@redhat.com>
|
||
|
|
RH-Acked-by: Kamal Heib <kheib@redhat.com>
|
||
|
|
RH-Acked-by: Marcelo Leitner <mleitner@redhat.com>
|
||
|
|
RH-Acked-by: Jarod Wilson <jarod@redhat.com>
|
||
|
|
|
||
|
|
Bugzilla: http://bugzilla.redhat.com/1842258
|
||
|
|
Bugzilla: http://bugzilla.redhat.com/1840408
|
||
|
|
Upstream: v5.7-rc7
|
||
|
|
|
||
|
|
commit 6eb7a268a99bad8346d4baa148a14456d061c1c3
|
||
|
|
Author: Roi Dayan <roid@mellanox.com>
|
||
|
|
Date: Mon May 11 16:37:11 2020 +0300
|
||
|
|
|
||
|
|
net/mlx5: Don't maintain a case of del_sw_func being null
|
||
|
|
|
||
|
|
Add del_sw_func cb for root ns. Now there is no need to
|
||
|
|
maintain a case of del_sw_func being null when freeing the node.
|
||
|
|
|
||
|
|
Fixes: 2cc43b494a6c ("net/mlx5_core: Managing root flow table")
|
||
|
|
Signed-off-by: Roi Dayan <roid@mellanox.com>
|
||
|
|
Reviewed-by: Mark Bloch <markb@mellanox.com>
|
||
|
|
Reviewed-by: Paul Blakey <paulb@mellanox.com>
|
||
|
|
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
|
||
|
|
|
||
|
|
Signed-off-by: Alaa Hleihel <ahleihel@redhat.com>
|
||
|
|
Signed-off-by: Frantisek Hrbata <fhrbata@redhat.com>
|
||
|
|
---
|
||
|
|
drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 17 +++++++++--------
|
||
|
|
1 file changed, 9 insertions(+), 8 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
|
||
|
|
index 6927d9a1c910..6343d5df787d 100644
|
||
|
|
--- a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
|
||
|
|
+++ b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
|
||
|
|
@@ -325,14 +325,10 @@ static void tree_put_node(struct fs_node *node, bool locked)
|
||
|
|
if (parent_node) {
|
||
|
|
down_write_ref_node(parent_node, locked);
|
||
|
|
list_del_init(&node->list);
|
||
|
|
- if (node->del_sw_func)
|
||
|
|
- node->del_sw_func(node);
|
||
|
|
- up_write_ref_node(parent_node, locked);
|
||
|
|
- } else if (node->del_sw_func) {
|
||
|
|
- node->del_sw_func(node);
|
||
|
|
- } else {
|
||
|
|
- kfree(node);
|
||
|
|
}
|
||
|
|
+ node->del_sw_func(node);
|
||
|
|
+ if (parent_node)
|
||
|
|
+ up_write_ref_node(parent_node, locked);
|
||
|
|
node = NULL;
|
||
|
|
}
|
||
|
|
if (!node && parent_node)
|
||
|
|
@@ -2360,6 +2356,11 @@ static int init_root_tree(struct mlx5_flow_steering *steering,
|
||
|
|
return 0;
|
||
|
|
}
|
||
|
|
|
||
|
|
+static void del_sw_root_ns(struct fs_node *node)
|
||
|
|
+{
|
||
|
|
+ kfree(node);
|
||
|
|
+}
|
||
|
|
+
|
||
|
|
static struct mlx5_flow_root_namespace
|
||
|
|
*create_root_ns(struct mlx5_flow_steering *steering,
|
||
|
|
enum fs_flow_table_type table_type)
|
||
|
|
@@ -2386,7 +2387,7 @@ static struct mlx5_flow_root_namespace
|
||
|
|
ns = &root_ns->ns;
|
||
|
|
fs_init_namespace(ns);
|
||
|
|
mutex_init(&root_ns->chain_lock);
|
||
|
|
- tree_init_node(&ns->node, NULL, NULL);
|
||
|
|
+ tree_init_node(&ns->node, NULL, del_sw_root_ns);
|
||
|
|
tree_add_node(&ns->node, NULL);
|
||
|
|
|
||
|
|
return root_ns;
|
||
|
|
--
|
||
|
|
2.13.6
|
||
|
|
|