From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Cc: davem@davemloft.net, netdev@vger.kernel.org
Subject: [PATCH 10/28] netfilter: conntrack: export nf_ct_acct_update()
Date: Mon, 30 Mar 2020 21:21:18 +0200 [thread overview]
Message-ID: <20200330192136.230459-11-pablo@netfilter.org> (raw)
In-Reply-To: <20200330192136.230459-1-pablo@netfilter.org>
This function allows you to update the conntrack counters.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
include/net/netfilter/nf_conntrack_acct.h | 2 ++
net/netfilter/nf_conntrack_core.c | 15 +++++++--------
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/include/net/netfilter/nf_conntrack_acct.h b/include/net/netfilter/nf_conntrack_acct.h
index f7a060c6eb28..df198c51244a 100644
--- a/include/net/netfilter/nf_conntrack_acct.h
+++ b/include/net/netfilter/nf_conntrack_acct.h
@@ -65,6 +65,8 @@ static inline void nf_ct_set_acct(struct net *net, bool enable)
#endif
}
+void nf_ct_acct_update(struct nf_conn *ct, u32 dir, unsigned int bytes);
+
void nf_conntrack_acct_pernet_init(struct net *net);
int nf_conntrack_acct_init(void);
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
index f82d4a802acc..7ded6d287f87 100644
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -865,9 +865,7 @@ nf_conntrack_hash_check_insert(struct nf_conn *ct)
}
EXPORT_SYMBOL_GPL(nf_conntrack_hash_check_insert);
-static inline void nf_ct_acct_update(struct nf_conn *ct,
- enum ip_conntrack_info ctinfo,
- unsigned int len)
+void nf_ct_acct_update(struct nf_conn *ct, u32 dir, unsigned int bytes)
{
struct nf_conn_acct *acct;
@@ -875,10 +873,11 @@ static inline void nf_ct_acct_update(struct nf_conn *ct,
if (acct) {
struct nf_conn_counter *counter = acct->counter;
- atomic64_inc(&counter[CTINFO2DIR(ctinfo)].packets);
- atomic64_add(len, &counter[CTINFO2DIR(ctinfo)].bytes);
+ atomic64_inc(&counter[dir].packets);
+ atomic64_add(bytes, &counter[dir].bytes);
}
}
+EXPORT_SYMBOL_GPL(nf_ct_acct_update);
static void nf_ct_acct_merge(struct nf_conn *ct, enum ip_conntrack_info ctinfo,
const struct nf_conn *loser_ct)
@@ -892,7 +891,7 @@ static void nf_ct_acct_merge(struct nf_conn *ct, enum ip_conntrack_info ctinfo,
/* u32 should be fine since we must have seen one packet. */
bytes = atomic64_read(&counter[CTINFO2DIR(ctinfo)].bytes);
- nf_ct_acct_update(ct, ctinfo, bytes);
+ nf_ct_acct_update(ct, CTINFO2DIR(ctinfo), bytes);
}
}
@@ -1933,7 +1932,7 @@ void __nf_ct_refresh_acct(struct nf_conn *ct,
WRITE_ONCE(ct->timeout, extra_jiffies);
acct:
if (do_acct)
- nf_ct_acct_update(ct, ctinfo, skb->len);
+ nf_ct_acct_update(ct, CTINFO2DIR(ctinfo), skb->len);
}
EXPORT_SYMBOL_GPL(__nf_ct_refresh_acct);
@@ -1941,7 +1940,7 @@ bool nf_ct_kill_acct(struct nf_conn *ct,
enum ip_conntrack_info ctinfo,
const struct sk_buff *skb)
{
- nf_ct_acct_update(ct, ctinfo, skb->len);
+ nf_ct_acct_update(ct, CTINFO2DIR(ctinfo), skb->len);
return nf_ct_delete(ct, 0, 0);
}
--
2.11.0
next prev parent reply other threads:[~2020-03-30 19:22 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-30 19:21 [PATCH 00/28] Netfilter/IPVS updates for net-next Pablo Neira Ayuso
2020-03-30 19:21 ` [PATCH 01/28] netfilter: nf_tables: move nft_expr_clone() to nf_tables_api.c Pablo Neira Ayuso
2020-03-30 19:21 ` [PATCH 02/28] netfilter: nf_tables: pass context to nft_set_destroy() Pablo Neira Ayuso
2020-03-30 19:21 ` [PATCH 03/28] netfilter: nf_tables: allow to specify stateful expression in set definition Pablo Neira Ayuso
2020-03-30 19:21 ` [PATCH 04/28] netfilter: nf_tables: fix double-free on set expression from the error path Pablo Neira Ayuso
2020-03-30 19:21 ` [PATCH 05/28] netfilter: nf_tables: add nft_set_elem_expr_destroy() and use it Pablo Neira Ayuso
2020-03-30 19:21 ` [PATCH 06/28] netfilter: flowtable: fix NULL pointer dereference in tunnel offload support Pablo Neira Ayuso
2020-03-30 19:21 ` [PATCH 07/28] netfilter: ctnetlink: Add missing annotation for ctnetlink_parse_nat_setup() Pablo Neira Ayuso
2020-03-30 19:21 ` [PATCH 08/28] netfilter: conntrack: Add missing annotations for nf_conntrack_all_lock() and nf_conntrack_all_unlock() Pablo Neira Ayuso
2020-03-30 19:21 ` [PATCH 09/28] ipvs: optimize tunnel dumps for icmp errors Pablo Neira Ayuso
2020-03-30 19:21 ` Pablo Neira Ayuso [this message]
2020-03-30 19:21 ` [PATCH 11/28] netfilter: nf_tables: add enum nft_flowtable_flags to uapi Pablo Neira Ayuso
2020-03-30 19:21 ` [PATCH 12/28] netfilter: flowtable: add counter support Pablo Neira Ayuso
2020-03-30 19:21 ` [PATCH 13/28] netfilter: flowtable: Fix incorrect tc_setup_type type Pablo Neira Ayuso
2020-03-30 19:21 ` [PATCH 14/28] netfilter: nf_tables: silence a RCU-list warning in nft_table_lookup() Pablo Neira Ayuso
2020-03-30 19:21 ` [PATCH 15/28] netfilter: flowtable: Use rw sem as flow block lock Pablo Neira Ayuso
2020-03-30 19:21 ` [PATCH 16/28] netfilter: flowtable: Use work entry per offload command Pablo Neira Ayuso
2020-03-30 19:21 ` [PATCH 17/28] netfilter: nf_queue: make nf_queue_entry_release_refs static Pablo Neira Ayuso
2020-03-30 19:21 ` [PATCH 18/28] netfilter: nf_queue: place bridge physports into queue_entry struct Pablo Neira Ayuso
2020-03-30 19:21 ` [PATCH 19/28] netfilter: nf_queue: do not release refcouts until nf_reinject is done Pablo Neira Ayuso
2020-03-30 19:21 ` [PATCH 20/28] netfilter: nf_queue: prefer nf_queue_entry_free Pablo Neira Ayuso
2020-03-30 19:21 ` [PATCH 21/28] netfilter: ctnetlink: be more strict when NF_CONNTRACK_MARK is not set Pablo Neira Ayuso
2020-03-30 19:21 ` [PATCH 22/28] netfilter: nft_set_bitmap: initialize set element extension in lookups Pablo Neira Ayuso
2020-03-30 19:21 ` [PATCH 23/28] netfilter: nft_dynset: validate set expression definition Pablo Neira Ayuso
2020-03-30 19:21 ` [PATCH 24/28] netfilter: nf_tables: skip set types that do not support for expressions Pablo Neira Ayuso
2020-03-30 19:21 ` [PATCH 25/28] netfilter: conntrack: add nf_ct_acct_add() Pablo Neira Ayuso
2020-03-30 19:21 ` [PATCH 26/28] netfilter: flowtable: add counter support in HW offload Pablo Neira Ayuso
2020-03-30 19:21 ` [PATCH 27/28] netfilter: nft_exthdr: fix endianness of tcp option cast Pablo Neira Ayuso
2020-03-30 19:21 ` [PATCH 28/28] ipvs: fix uninitialized variable warning Pablo Neira Ayuso
2020-03-31 3:11 ` [PATCH 00/28] Netfilter/IPVS updates for net-next David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200330192136.230459-11-pablo@netfilter.org \
--to=pablo@netfilter.org \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).