Commit 408bdcfc authored by Florian Westphal's avatar Florian Westphal Committed by Pablo Neira Ayuso
Browse files

net: prefer nf_ct_put instead of nf_conntrack_put 



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: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 6ae7989c

net/netfilter/nf_conntrack_core.c

+2 −2
Original line number Diff line number Diff line
@@ -989,7 +989,7 @@ static int __nf_ct_resolve_clash(struct sk_buff *skb, 


		nf_ct_acct_merge(ct, ctinfo, 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_STAT_INC(net, clash_resolve);
@@ -1921,7 +1921,7 @@ nf_conntrack_in(struct sk_buff *skb, const struct nf_hook_state *state) 
		/* Invalid: inverse of the return code tells

		 * the netfilter core what to do */

		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;

		NF_CT_STAT_INC_ATOMIC(state->net, invalid);

		if (ret == -NF_DROP)

net/openvswitch/conntrack.c

+10 −4
Original line number Diff line number Diff line
@@ -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);



			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))

			nf_ct_delete(ct, 0, 0);



		nf_conntrack_put(&ct->ct_general);

		nf_ct_put(ct);

		nf_ct_set(skb, NULL, 0);

		return false;

	}
@@ -967,7 +967,8 @@ static int __ovs_ct_lookup(struct net *net, struct sw_flow_key *key, 


		/* Associate skb with specified zone. */

		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_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)

{

	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);

	ovs_ct_fill_key(skb, key, false);

net/sched/act_ct.c

+3 −3
Original line number Diff line number Diff line
@@ -598,7 +598,7 @@ static bool tcf_ct_skb_nfct_cached(struct net *net, struct sk_buff *skb, 
		if (nf_ct_is_confirmed(ct))

			nf_ct_kill(ct);



		nf_conntrack_put(&ct->ct_general);

		nf_ct_put(ct);

		nf_ct_set(skb, NULL, IP_CT_UNTRACKED);



		return false;
@@ -763,7 +763,7 @@ static void tcf_ct_params_free(struct rcu_head *head) 
	tcf_ct_flow_table_put(params);



	if (params->tmpl)

		nf_conntrack_put(&params->tmpl->ct_general);

		nf_ct_put(params->tmpl);

	kfree(params);

}
@@ -967,7 +967,7 @@ static int tcf_ct_act(struct sk_buff *skb, const struct tc_action *a, 
		qdisc_skb_cb(skb)->post_ct = false;

		ct = nf_ct_get(skb, &ctinfo);

		if (ct) {

			nf_conntrack_put(&ct->ct_general);

			nf_ct_put(ct);

			nf_ct_set(skb, NULL, IP_CT_UNTRACKED);

		}