From: Saeed Mahameed <saeedm@mellanox.com>
To: "David S. Miller" <davem@davemloft.net>
Cc: netdev@vger.kernel.org, Maor Gottlieb <maorg@mellanox.com>,
Saeed Mahameed <saeedm@mellanox.com>
Subject: [net 12/14] net/mlx5: Fix steering memory leak
Date: Wed, 20 Dec 2017 00:24:54 +0200 [thread overview]
Message-ID: <20171219222456.29627-13-saeedm@mellanox.com> (raw)
In-Reply-To: <20171219222456.29627-1-saeedm@mellanox.com>
From: Maor Gottlieb <maorg@mellanox.com>
Flow steering priority and namespace are software only objects that
didn't have the proper destructors and were not freed during steering
cleanup.
Fix it by adding destructor functions for these objects.
Fixes: bd71b08ec2ee ("net/mlx5: Support multiple updates of steering rules in parallel")
Signed-off-by: Maor Gottlieb <maorg@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
---
drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
index c70fd663a633..dfaad9ecb2b8 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
@@ -174,6 +174,8 @@ static void del_hw_fte(struct fs_node *node);
static void del_sw_flow_table(struct fs_node *node);
static void del_sw_flow_group(struct fs_node *node);
static void del_sw_fte(struct fs_node *node);
+static void del_sw_prio(struct fs_node *node);
+static void del_sw_ns(struct fs_node *node);
/* Delete rule (destination) is special case that
* requires to lock the FTE for all the deletion process.
*/
@@ -408,6 +410,16 @@ static inline struct mlx5_core_dev *get_dev(struct fs_node *node)
return NULL;
}
+static void del_sw_ns(struct fs_node *node)
+{
+ kfree(node);
+}
+
+static void del_sw_prio(struct fs_node *node)
+{
+ kfree(node);
+}
+
static void del_hw_flow_table(struct fs_node *node)
{
struct mlx5_flow_table *ft;
@@ -2064,7 +2076,7 @@ static struct fs_prio *fs_create_prio(struct mlx5_flow_namespace *ns,
return ERR_PTR(-ENOMEM);
fs_prio->node.type = FS_TYPE_PRIO;
- tree_init_node(&fs_prio->node, NULL, NULL);
+ tree_init_node(&fs_prio->node, NULL, del_sw_prio);
tree_add_node(&fs_prio->node, &ns->node);
fs_prio->num_levels = num_levels;
fs_prio->prio = prio;
@@ -2090,7 +2102,7 @@ static struct mlx5_flow_namespace *fs_create_namespace(struct fs_prio *prio)
return ERR_PTR(-ENOMEM);
fs_init_namespace(ns);
- tree_init_node(&ns->node, NULL, NULL);
+ tree_init_node(&ns->node, NULL, del_sw_ns);
tree_add_node(&ns->node, &prio->node);
list_add_tail(&ns->node.list, &prio->node.children);
--
2.13.0
next prev parent reply other threads:[~2017-12-19 22:28 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-19 22:24 [pull request][net 00/14] Mellanox, mlx5 fixes 2017-12-19 Saeed Mahameed
2017-12-19 22:24 ` [net 01/14] net/mlx5: FPGA, return -EINVAL if size is zero Saeed Mahameed
2017-12-19 22:24 ` [net 02/14] Revert "mlx5: move affinity hints assignments to generic code" Saeed Mahameed
2017-12-19 22:42 ` Jes Sorensen
2017-12-25 13:53 ` Sagi Grimberg
2017-12-26 15:58 ` Saeed Mahameed
2017-12-26 17:14 ` Sagi Grimberg
2018-01-04 20:19 ` Saeed Mahameed
2017-12-19 22:24 ` [net 03/14] net/mlx5: Fix rate limit packet pacing naming and struct Saeed Mahameed
2017-12-19 22:24 ` [net 04/14] net/mlx5e: Fix ETS BW check Saeed Mahameed
2017-12-20 7:42 ` Or Gerlitz
2017-12-19 22:24 ` [net 05/14] net/mlx5e: Fix features check of IPv6 traffic Saeed Mahameed
2017-12-20 7:45 ` Or Gerlitz
2017-12-19 22:24 ` [net 06/14] net/mlx5e: Fix defaulting RX ring size when not needed Saeed Mahameed
2017-12-19 22:24 ` [net 07/14] net/mlx5: Fix misspelling in the error message and comment Saeed Mahameed
2017-12-19 22:24 ` [net 08/14] net/mlx5: Fix error flow in CREATE_QP command Saeed Mahameed
2017-12-19 22:24 ` [net 09/14] net/mlx5e: Fix possible deadlock of VXLAN lock Saeed Mahameed
2017-12-19 22:24 ` [net 10/14] net/mlx5e: Add refcount to VXLAN structure Saeed Mahameed
2017-12-19 22:24 ` [net 11/14] net/mlx5e: Prevent possible races in VXLAN control flow Saeed Mahameed
2017-12-19 22:24 ` Saeed Mahameed [this message]
2017-12-19 22:24 ` [net 13/14] net/mlx5: Cleanup IRQs in case of unload failure Saeed Mahameed
2017-12-19 22:24 ` [net 14/14] net/mlx5: Stay in polling mode when command EQ destroy fails Saeed Mahameed
2017-12-20 18:42 ` [pull request][net 00/14] Mellanox, mlx5 fixes 2017-12-19 David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171219222456.29627-13-saeedm@mellanox.com \
--to=saeedm@mellanox.com \
--cc=davem@davemloft.net \
--cc=maorg@mellanox.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox