Netdev Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Saeed Mahameed <saeed@kernel.org>
To: "David S. Miller" <davem@davemloft.net>,
	Jakub Kicinski <kuba@kernel.org>
Cc: netdev@vger.kernel.org, Maor Gottlieb <maorg@nvidia.com>,
	Dan Carpenter <dan.carpenter@oracle.com>,
	Saeed Mahameed <saeedm@nvidia.com>
Subject: [net 5/7] net/mlx5: Fix potential sleeping in atomic context
Date: Tue,  7 Sep 2021 14:24:18 -0700	[thread overview]
Message-ID: <20210907212420.28529-6-saeed@kernel.org> (raw)
In-Reply-To: <20210907212420.28529-1-saeed@kernel.org>

From: Maor Gottlieb <maorg@nvidia.com>

Fixes the below flow of sleeping in atomic context by releasing
the RCU lock before calling to free_match_list.

build_match_list() <- disables preempt
-> free_match_list()
   -> tree_put_node()
      -> down_write_ref_node() <- take write lock

Fixes: 693c6883bbc4 ("net/mlx5: Add hash table for flow groups in flow table")
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Maor Gottlieb <maorg@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>
---
 drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
index 9fe8e3c204d6..fe501ba88bea 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
@@ -1682,14 +1682,13 @@ static int build_match_list(struct match_list *match_head,
 
 		curr_match = kmalloc(sizeof(*curr_match), GFP_ATOMIC);
 		if (!curr_match) {
+			rcu_read_unlock();
 			free_match_list(match_head, ft_locked);
-			err = -ENOMEM;
-			goto out;
+			return -ENOMEM;
 		}
 		curr_match->g = g;
 		list_add_tail(&curr_match->list, &match_head->list);
 	}
-out:
 	rcu_read_unlock();
 	return err;
 }
-- 
2.31.1


  parent reply	other threads:[~2021-09-07 21:24 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-09-07 21:24 [pull request][net 0/7] mlx5 fixes 2021-09-07 Saeed Mahameed
2021-09-07 21:24 ` [net 1/7] net/mlx5: Bridge, fix uninitialized variable usage Saeed Mahameed
2021-09-08 10:50   ` patchwork-bot+netdevbpf
2021-09-07 21:24 ` [net 2/7] net/mlx5: Fix rdma aux device on devlink reload Saeed Mahameed
2021-09-07 21:24 ` [net 3/7] net/mlx5: Lag, don't update lag if lag isn't supported Saeed Mahameed
2021-09-07 21:24 ` [net 4/7] net/mlx5: FWTrace, cancel work on alloc pd error flow Saeed Mahameed
2021-09-11  7:43   ` Pavel Machek
2021-09-07 21:24 ` Saeed Mahameed [this message]
2021-09-07 21:24 ` [net 6/7] net/mlx5e: Fix mutual exclusion between CQE compression and HW TS Saeed Mahameed
2021-09-07 21:24 ` [net 7/7] net/mlx5e: Fix condition when retrieving PTP-rqn Saeed Mahameed
2021-09-08 16:39   ` Jakub Kicinski
2021-09-08 17:34     ` Saeed Mahameed

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=20210907212420.28529-6-saeed@kernel.org \
    --to=saeed@kernel.org \
    --cc=dan.carpenter@oracle.com \
    --cc=davem@davemloft.net \
    --cc=kuba@kernel.org \
    --cc=maorg@nvidia.com \
    --cc=netdev@vger.kernel.org \
    --cc=saeedm@nvidia.com \
    --subject='Re: [net 5/7] net/mlx5: Fix potential sleeping in atomic context' \
    /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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).