[PATCH] xfrm: don't call xfrm_policy_cache_flush under xfrm_state_lock

From	Artem Savkov <asavkov@redhat.com>
Newsgroups	linux.kernel
Subject	[PATCH] xfrm: don't call xfrm_policy_cache_flush under xfrm_state_lock
Date	2017-09-27 14:30 +0200
Message-ID	<uujDs-2nV-9@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

I might be wrong but it doesn't look like xfrm_state_lock is required
for xfrm_policy_cache_flush and calling it under this lock triggers both
"sleeping function called from invalid context" and "possible circular
locking dependency detected" warnings on flush.

Fixes: ec30d78c14a8 xfrm: add xdst pcpu cache
Signed-off-by: Artem Savkov <asavkov@redhat.com>
---
 net/xfrm/xfrm_state.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
index 0dab1cd79ce4..12213477cd3a 100644
--- a/net/xfrm/xfrm_state.c
+++ b/net/xfrm/xfrm_state.c
@@ -732,12 +732,12 @@ int xfrm_state_flush(struct net *net, u8 proto, bool task_valid)
 			}
 		}
 	}
+out:
+	spin_unlock_bh(&net->xfrm.xfrm_state_lock);
 	if (cnt) {
 		err = 0;
 		xfrm_policy_cache_flush();
 	}
-out:
-	spin_unlock_bh(&net->xfrm.xfrm_state_lock);
 	return err;
 }
 EXPORT_SYMBOL(xfrm_state_flush);
-- 
2.13.5

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] xfrm: don't call xfrm_policy_cache_flush under xfrm_state_lock Artem Savkov <asavkov@redhat.com> - 2017-09-27 14:30 +0200
  Re: [PATCH] xfrm: don't call xfrm_policy_cache_flush under  xfrm_state_lock Florian Westphal <fw@strlen.de> - 2017-09-27 14:40 +0200
    Re: [PATCH] xfrm: don't call xfrm_policy_cache_flush under  xfrm_state_lock Steffen Klassert <steffen.klassert@secunet.com> - 2017-09-28 13:20 +0200

csiph-web