xfrm: don't call xfrm_policy_cache_flush under xfrm_state_lock

sm00th · klassert · commit dd269db84908 · 2017-09-28T09:39:05.000+02:00
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: ec30d78 xfrm: add xdst pcpu cache Signed-off-by: Artem Savkov <asavkov@redhat.com> Acked-by: Florian Westphal <fw@strlen.de> Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
diff --git 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);

Original file line number	Diff line number	Diff line change
`@@ -732,12 +732,12 @@ int xfrm_state_flush(struct net *net, u8 proto, bool task_valid)`
`732`	`732`	`}`
`733`	`733`	`}`
`734`	`734`	`}`
	`735`	`+out:`
	`736`	`+ spin_unlock_bh(&net->xfrm.xfrm_state_lock);`
`735`	`737`	`if (cnt) {`
`736`	`738`	`err = 0;`
`737`	`739`	`xfrm_policy_cache_flush();`
`738`	`740`	`}`
`739`		`-out:`
`740`		`- spin_unlock_bh(&net->xfrm.xfrm_state_lock);`
`741`	`741`	`return err;`
`742`	`742`	`}`
`743`	`743`	`EXPORT_SYMBOL(xfrm_state_flush);`