| Message ID | 20240918091251.21202-1-fw@strlen.de (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [ipsec] xfrm: policy: remove last remnants of pernet inexact list | expand |
On Wed, Sep 18, 2024 at 11:12:49AM +0200, Florian Westphal wrote: > xfrm_net still contained the no-longer-used inexact policy list heads, > remove them. > > Fixes: a54ad727f745 ("xfrm: policy: remove remaining use of inexact list") > Signed-off-by: Florian Westphal <fw@strlen.de> Hi Florian, I am wondering if this is intended for ipsec-next rather than ipsec. As I see build failures, due to other instances of policy_inexact when it is applied to the latter but not the former.
Simon Horman <horms@kernel.org> wrote: > On Wed, Sep 18, 2024 at 11:12:49AM +0200, Florian Westphal wrote: > > xfrm_net still contained the no-longer-used inexact policy list heads, > > remove them. > > > > Fixes: a54ad727f745 ("xfrm: policy: remove remaining use of inexact list") > > Signed-off-by: Florian Westphal <fw@strlen.de> > > Hi Florian, > > I am wondering if this is intended for ipsec-next rather than ipsec. > As I see build failures, due to other instances of policy_inexact > when it is applied to the latter but not the former. a54ad727f745 is in net.git, so ipsec.git needs a refresh. I don't think there is a need to defer this for another 3 months.
On Wed, Sep 18, 2024 at 11:12:49AM +0200, Florian Westphal wrote: > xfrm_net still contained the no-longer-used inexact policy list heads, > remove them. > > Fixes: a54ad727f745 ("xfrm: policy: remove remaining use of inexact list") > Signed-off-by: Florian Westphal <fw@strlen.de> Applied, thanks Florian!
diff --git a/include/net/netns/xfrm.h b/include/net/netns/xfrm.h index d489d9250bff..ae60d6664095 100644 --- a/include/net/netns/xfrm.h +++ b/include/net/netns/xfrm.h @@ -51,7 +51,6 @@ struct netns_xfrm { struct hlist_head *policy_byidx; unsigned int policy_idx_hmask; unsigned int idx_generator; - struct hlist_head policy_inexact[XFRM_POLICY_MAX]; struct xfrm_policy_hash policy_bydst[XFRM_POLICY_MAX]; unsigned int policy_count[XFRM_POLICY_MAX * 2]; struct work_struct policy_hash_work; diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c index 428ee83fe298..d555ea401234 100644 --- a/net/xfrm/xfrm_policy.c +++ b/net/xfrm/xfrm_policy.c @@ -4179,7 +4179,6 @@ static int __net_init xfrm_policy_init(struct net *net) net->xfrm.policy_count[dir] = 0; net->xfrm.policy_count[XFRM_POLICY_MAX + dir] = 0; - INIT_HLIST_HEAD(&net->xfrm.policy_inexact[dir]); htab = &net->xfrm.policy_bydst[dir]; htab->table = xfrm_hash_alloc(sz); @@ -4233,8 +4232,6 @@ static void xfrm_policy_fini(struct net *net) for (dir = 0; dir < XFRM_POLICY_MAX; dir++) { struct xfrm_policy_hash *htab; - WARN_ON(!hlist_empty(&net->xfrm.policy_inexact[dir])); - htab = &net->xfrm.policy_bydst[dir]; sz = (htab->hmask + 1) * sizeof(struct hlist_head); WARN_ON(!hlist_empty(htab->table));
xfrm_net still contained the no-longer-used inexact policy list heads, remove them. Fixes: a54ad727f745 ("xfrm: policy: remove remaining use of inexact list") Signed-off-by: Florian Westphal <fw@strlen.de> --- include/net/netns/xfrm.h | 1 - net/xfrm/xfrm_policy.c | 3 --- 2 files changed, 4 deletions(-)