net: prefer nf_ct_put instead of nf_conntrack_put

BugLink: https://bugs.launchpad.net/bugs/1969110
[ 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>
(cherry picked from commit 72dd9e61fa319bc44020c2d365275fc8f6799bff)
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>

diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
index 7f79974607643f57a505839d4470b82a00ad1c78..917e708a456119265b0d5ff3bd07feea21e2c145 100644 (file)
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -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);
@@ -1920,7 +1920,7 @@ repeat:
                /* 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;
                /* Special case: TCP tracker reports an attempt to reopen a
                 * closed/aborted connection. We have to go back and create a

diff --git a/net/openvswitch/conntrack.c b/net/openvswitch/conntrack.c
index 8f47f4e78d3201dc4e285b2465359b139422813e..f2b64cab9af70bdfc5d75700e03cf31ebad751a9 100644 (file)
--- a/net/openvswitch/conntrack.c
+++ b/net/openvswitch/conntrack.c
@@ -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);
 

diff --git a/net/sched/act_ct.c b/net/sched/act_ct.c
index 4ffea1290ce1c928cbcae86480753a5fded865f1..240b3c5d2eb195ad4b6675991c672e810eb3958a 100644 (file)
--- a/net/sched/act_ct.c
+++ b/net/sched/act_ct.c
@@ -592,7 +592,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;
@@ -757,7 +757,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,
                tc_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);
                }