netfilter: conntrack: export nf_ct_acct_update()
Subsystems (2)
Pablo Neira Ayuso
maintainerPATCH 1/3 netfilter: conntrack: export nf_ct_acct_update()
This function allows you to update the conntrack counters.
--- include/net/netfilter/nf_conntrack_acct.h | 2 ++ net/netfilter/nf_conntrack_core.c | 15 +++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-)
include/net/netfilter/nf_conntrack_acct.h +2 -0
@@ -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 );
net/netfilter/nf_conntrack_core.c +7 -8
@@ -863,9 +863,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;
@@ -873,10 +871,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)
@@ -890,7 +889,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); } }
@@ -1931,7 +1930,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);
@@ -1939,7 +1938,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 ); }
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 2/3 netfilter: nf_tables: add enum nft_flowtable_flags to uapi
Expose the NFT_FLOWTABLE_HW_OFFLOAD flag through uapi.
--- include/net/netfilter/nf_flow_table.h | 2 +- include/uapi/linux/netfilter/nf_tables.h | 10 ++++++++++ net/netfilter/nf_tables_api.c | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-)
include/net/netfilter/nf_flow_table.h +1 -1
@@ -62,7 +62,7 @@ struct nf_flowtable_type { };enum nf_flowtable_flags { -NF_FLOWTABLE_HW_OFFLOAD =0x1 , +NF_FLOWTABLE_HW_OFFLOAD =0x1 ,/* NFT_FLOWTABLE_HW_OFFLOAD */ };struct nf_flowtable {
include/uapi/linux/netfilter/nf_tables.h +10 -0
@@ -1554,6 +1554,16 @@ enum nft_object_attributes {#define NFTA_OBJ_MAX (__NFTA_OBJ_MAX - 1)/** +* enum nft_flowtable_flags - nf_tables flowtable flags +* +* @NFT_FLOWTABLE_HW_OFFLOAD: flowtable hardware offload is enabled +*/ +enum nft_flowtable_flags { +NFT_FLOWTABLE_HW_OFFLOAD =0x1 , +NFT_FLOWTABLE_MASK =NFT_FLOWTABLE_HW_OFFLOAD +}; + +/** * enum nft_flowtable_attributes - nf_tables flow table netlink attributes * * @NFTA_FLOWTABLE_TABLE: name of the table containing the expression (NLA_STRING)
net/netfilter/nf_tables_api.c +1 -1
@@ -6375,7 +6375,7 @@ static int nf_tables_newflowtable(struct net *net, struct sock *nlsk,if (nla[NFTA_FLOWTABLE_FLAGS ]) { flowtable->data.flags =ntohl (nla_get_be32 (nla[NFTA_FLOWTABLE_FLAGS ])); -if (flowtable->data.flags & ~NF_FLOWTABLE_HW_OFFLOAD ) +if (flowtable->data.flags & ~NFT_FLOWTABLE_MASK ) goto err3; }
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 3/3 netfilter: flowtable: add counter support
In reply to Pablo Neira AyusoAdd a new flag to turn on flowtable counters which are stored in the conntrack entry.
--- include/net/netfilter/nf_flow_table.h | 1 + include/uapi/linux/netfilter/nf_tables.h | 5 ++++- net/netfilter/nf_flow_table_ip.c | 7 +++++++ 3 files changed, 12 insertions(+), 1 deletion(-)
include/net/netfilter/nf_flow_table.h +1 -0
@@ -63,6 +63,7 @@ struct nf_flowtable_type {enum nf_flowtable_flags {NF_FLOWTABLE_HW_OFFLOAD =0x1 ,/* NFT_FLOWTABLE_HW_OFFLOAD */ +NF_FLOWTABLE_COUNTER =0x2 ,/* NFT_FLOWTABLE_COUNTER */ };struct nf_flowtable {
include/uapi/linux/netfilter/nf_tables.h +4 -1
@@ -1557,10 +1557,13 @@ enum nft_object_attributes {* enum nft_flowtable_flags - nf_tables flowtable flags * * @NFT_FLOWTABLE_HW_OFFLOAD: flowtable hardware offload is enabled +* @NFT_FLOWTABLE_COUNTER: enable flow counters */ enum nft_flowtable_flags {NFT_FLOWTABLE_HW_OFFLOAD =0x1 , -NFT_FLOWTABLE_MASK =NFT_FLOWTABLE_HW_OFFLOAD +NFT_FLOWTABLE_COUNTER =0x2 , +NFT_FLOWTABLE_MASK = (NFT_FLOWTABLE_HW_OFFLOAD | +NFT_FLOWTABLE_COUNTER ) };/**
net/netfilter/nf_flow_table_ip.c +7 -0
@@ -12,6 +12,7 @@#include <net/ip6_route.h> #include <net/neighbour.h> #include <net/netfilter/nf_flow_table.h> +#include <net/netfilter/nf_conntrack_acct.h> /* For layer 4 checksum field offset. */ #include <linux/tcp.h> #include <linux/udp.h>
@@ -286,6 +287,9 @@ nf_flow_offload_ip_hook(void *priv, struct sk_buff *skb,ip_decrease_ttl (iph); skb->tstamp =0 ; +if (flow_table->flags &NF_FLOWTABLE_COUNTER ) +nf_ct_acct_update (flow->ct, tuplehash->tuple.dir, skb->len); +if (unlikely (dst_xfrm (&rt->dst))) {memset (skb->cb,0 ,sizeof (struct inet_skb_parm ));IPCB (skb)->iif = skb->dev->ifindex;
@@ -516,6 +520,9 @@ nf_flow_offload_ipv6_hook(void *priv, struct sk_buff *skb, ip6h->hop_limit--; skb->tstamp =0 ; +if (flow_table->flags &NF_FLOWTABLE_COUNTER ) +nf_ct_acct_update (flow->ct, tuplehash->tuple.dir, skb->len); +if (unlikely (dst_xfrm (&rt->dst))) {memset (skb->cb,0 ,sizeof (struct inet6_skb_parm ));IP6CB (skb)->iif = skb->dev->ifindex;
Signature · 1 line
2.11.0
Quoted 37 lines · Pablo Neira Ayuso
This function allows you to update the conntrack counters.
Signed-off-by Pablo Neira Ayuso <[email protected]>--- include/net/netfilter/nf_conntrack_acct.h | 2 ++ net/netfilter/nf_conntrack_core.c | 15 +++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-)include/net/netfilter/nf_conntrack_acct.h +2
-0@@ -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 );net/netfilter/nf_conntrack_core.c +1
-3@@ -863,9 +863,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;
net/netfilter/nf_conntrack_core.c static inline void nf_ct_acct_update(struct nf_conn *ct, · line 878
Quoted 10 lines
net/netfilter/nf_conntrack_core.c +3
-2@@ -873,10 +871,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);
This function only add one packet once. Maybe is not so suit for all the scenario
such as the HW flowtable offload get the counter from HW periodicly.
Quoted 30 lines
net/netfilter/nf_conntrack_core.c +3
-3static void nf_ct_acct_merge (struct nf_conn *ct,enum ip_conntrack_info ctinfo,const struct nf_conn *loser_ct)@@ -890,7 +889,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); } }@@ -1931,7 +1930,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);@@ -1939,7 +1938,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 ); }
Pablo Neira Ayuso
maintainerQuoted 52 lines · wenxu
Quoted 37 lines · Pablo Neira Ayuso
This function allows you to update the conntrack counters.
Signed-off-by Pablo Neira Ayuso <[email protected]>--- include/net/netfilter/nf_conntrack_acct.h | 2 ++ net/netfilter/nf_conntrack_core.c | 15 +++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-)include/net/netfilter/nf_conntrack_acct.h +2
-0@@ -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 );net/netfilter/nf_conntrack_core.c +1
-3@@ -863,9 +863,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;net/netfilter/nf_conntrack_core.c static inline void nf_ct_acct_update(struct nf_conn *ct, · line 878
Quoted 10 lines
net/netfilter/nf_conntrack_core.c +3
-2@@ -873,10 +871,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);This function only add one packet once. Maybe is not so suit for all the scenario
Quoted 1 line
such as the HW flowtable offload get the counter from HW periodicly.
This patchset is not addressing the flowtable HW offload.
That will need something like nf_ct_acct_add() to accumulate packets and bytes. Probably nf_ct_acct_update() should be a static inline that calls nf_ct_acct_add().