瀏覽代碼

xfrm: don't call xfrm_policy_cache_flush under xfrm_state_lock

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>
Acked-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Artem Savkov 7 年之前
父節點
當前提交
dd269db849
共有 1 個文件被更改,包括 2 次插入2 次删除
  1. 2 2
      net/xfrm/xfrm_state.c

+ 2 - 2
net/xfrm/xfrm_state.c

@@ -732,12 +732,12 @@ restart:
 			}
 			}
 		}
 		}
 	}
 	}
+out:
+	spin_unlock_bh(&net->xfrm.xfrm_state_lock);
 	if (cnt) {
 	if (cnt) {
 		err = 0;
 		err = 0;
 		xfrm_policy_cache_flush();
 		xfrm_policy_cache_flush();
 	}
 	}
-out:
-	spin_unlock_bh(&net->xfrm.xfrm_state_lock);
 	return err;
 	return err;
 }
 }
 EXPORT_SYMBOL(xfrm_state_flush);
 EXPORT_SYMBOL(xfrm_state_flush);