moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: prefer nf_ct_put instead of nf_conntrack_put

Browse Source 
[ Upstream commit 408bdcfce8dfd6902f75fbcd3b99d8b24b506597 ]

Its the same as nf_conntrack_put(), but without the
need for an indirect call.  The downside is a module dependency on
nf_conntrack, but all of these already depend on conntrack anyway.

Cc: Paul Blakey <paulb@mellanox.com>
Cc: dev@openvswitch.org
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Florian Westphal
2022-01-07 05:03:26 +01:00
committed by Greg Kroah-Hartman
parent 6b663fa23c
commit 72dd9e61fa
3 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
net/netfilter/nf_conntrack_core.c
View File

@@ -989,7 +989,7 @@ static int __nf_ct_resolve_clash(struct sk_buff *skb,
nf_ct_acct_merge(ct, ctinfo, loser_ct); nf_ct_acct_merge(ct, ctinfo, loser_ct);
nf_ct_add_to_dying_list(loser_ct); nf_ct_add_to_dying_list(loser_ct);
nf_conntrack_put(&loser_ct->ct_general); nf_ct_put(loser_ct);
nf_ct_set(skb, ct, ctinfo); nf_ct_set(skb, ct, ctinfo);
NF_CT_STAT_INC(net, clash_resolve); NF_CT_STAT_INC(net, clash_resolve);
@@ -1920,7 +1920,7 @@ repeat:
/* Invalid: inverse of the return code tells /* Invalid: inverse of the return code tells
* the netfilter core what to do */ * the netfilter core what to do */
pr_debug("nf_conntrack_in: Can't track with proto module\n"); pr_debug("nf_conntrack_in: Can't track with proto module\n");
nf_conntrack_put(&ct->ct_general); nf_ct_put(ct);
skb->_nfct = 0; skb->_nfct = 0;
/* Special case: TCP tracker reports an attempt to reopen a /* Special case: TCP tracker reports an attempt to reopen a
* closed/aborted connection. We have to go back and create a * closed/aborted connection. We have to go back and create a

14
net/openvswitch/conntrack.c
View File

@@ -574,7 +574,7 @@ ovs_ct_expect_find(struct net *net, const struct nf_conntrack_zone *zone,
struct nf_conn *ct = nf_ct_tuplehash_to_ctrack(h); struct nf_conn *ct = nf_ct_tuplehash_to_ctrack(h);
nf_ct_delete(ct, 0, 0); nf_ct_delete(ct, 0, 0);
nf_conntrack_put(&ct->ct_general); nf_ct_put(ct);
} }
} }
@@ -723,7 +723,7 @@ static bool skb_nfct_cached(struct net *net,
if (nf_ct_is_confirmed(ct)) if (nf_ct_is_confirmed(ct))
nf_ct_delete(ct, 0, 0); nf_ct_delete(ct, 0, 0);
nf_conntrack_put(&ct->ct_general); nf_ct_put(ct);
nf_ct_set(skb, NULL, 0); nf_ct_set(skb, NULL, 0);
return false; return false;
} }
@@ -967,7 +967,8 @@ static int __ovs_ct_lookup(struct net *net, struct sw_flow_key *key,
/* Associate skb with specified zone. */ /* Associate skb with specified zone. */
if (tmpl) { if (tmpl) {
nf_conntrack_put(skb_nfct(skb)); ct = nf_ct_get(skb, &ctinfo);
nf_ct_put(ct);
nf_conntrack_get(&tmpl->ct_general); nf_conntrack_get(&tmpl->ct_general);
nf_ct_set(skb, tmpl, IP_CT_NEW); nf_ct_set(skb, tmpl, IP_CT_NEW);
} }
@@ -1328,7 +1329,12 @@ int ovs_ct_execute(struct net *net, struct sk_buff *skb,
int ovs_ct_clear(struct sk_buff *skb, struct sw_flow_key *key) int ovs_ct_clear(struct sk_buff *skb, struct sw_flow_key *key)
{ {
nf_conntrack_put(skb_nfct(skb)); enum ip_conntrack_info ctinfo;
struct nf_conn *ct;
ct = nf_ct_get(skb, &ctinfo);
nf_ct_put(ct);
nf_ct_set(skb, NULL, IP_CT_UNTRACKED); nf_ct_set(skb, NULL, IP_CT_UNTRACKED);
ovs_ct_fill_key(skb, key, false); ovs_ct_fill_key(skb, key, false);

6
net/sched/act_ct.c
View File

@@ -592,7 +592,7 @@ static bool tcf_ct_skb_nfct_cached(struct net *net, struct sk_buff *skb,
if (nf_ct_is_confirmed(ct)) if (nf_ct_is_confirmed(ct))
nf_ct_kill(ct); nf_ct_kill(ct);
nf_conntrack_put(&ct->ct_general); nf_ct_put(ct);
nf_ct_set(skb, NULL, IP_CT_UNTRACKED); nf_ct_set(skb, NULL, IP_CT_UNTRACKED);
return false; return false;
@@ -757,7 +757,7 @@ static void tcf_ct_params_free(struct rcu_head *head)
tcf_ct_flow_table_put(params); tcf_ct_flow_table_put(params);
if (params->tmpl) if (params->tmpl)
nf_conntrack_put(&params->tmpl->ct_general); nf_ct_put(params->tmpl);
kfree(params); kfree(params);
} }
@@ -967,7 +967,7 @@ static int tcf_ct_act(struct sk_buff *skb, const struct tc_action *a,
tc_skb_cb(skb)->post_ct = false; tc_skb_cb(skb)->post_ct = false;
ct = nf_ct_get(skb, &ctinfo); ct = nf_ct_get(skb, &ctinfo);
if (ct) { if (ct) {
nf_conntrack_put(&ct->ct_general); nf_ct_put(ct);
nf_ct_set(skb, NULL, IP_CT_UNTRACKED); nf_ct_set(skb, NULL, IP_CT_UNTRACKED);
} }