netfilter: introduce nf_conn_acct structure

Encapsulate counters for both directions into nf_conn_acct. During
that process also consistently name pointers to the extend 'acct',
not 'counters'. This patch is a cleanup.

Signed-off-by: Holger Eitzenberger <holger@eitzenberger.org>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

4 files changed, 30 insertions, 20 deletions

diff --git a/net/netfilter/nf_conntrack_acct.c b/net/netfilter/nf_conntrack_acct.c
index 2d3030ab5b61..a4b5e2a435ac 100644
--- a/net/netfilter/nf_conntrack_acct.c
+++ b/net/netfilter/nf_conntrack_acct.c
@@ -39,21 +39,23 @@ static struct ctl_table acct_sysctl_table[] = {
 unsigned int
 seq_print_acct(struct seq_file *s, const struct nf_conn *ct, int dir)
 {
-        struct nf_conn_counter *acct;
+        struct nf_conn_acct *acct;
+        struct nf_conn_counter *counter;
 
         acct = nf_conn_acct_find(ct);
         if (!acct)
                 return 0;
 
+        counter = acct->counter;
         return seq_printf(s, "packets=%llu bytes=%llu ",
-                          (unsigned long long)atomic64_read(&acct[dir].packets),
-                          (unsigned long long)atomic64_read(&acct[dir].bytes));
+                          (unsigned long long)atomic64_read(&counter[dir].packets),
+                          (unsigned long long)atomic64_read(&counter[dir].bytes));
 };
 EXPORT_SYMBOL_GPL(seq_print_acct);
 
 static struct nf_ct_ext_type acct_extend __read_mostly = {
-        .len    = sizeof(struct nf_conn_counter[IP_CT_DIR_MAX]),
-        .align  = __alignof__(struct nf_conn_counter[IP_CT_DIR_MAX]),
+        .len    = sizeof(struct nf_conn_acct),
+        .align  = __alignof__(struct nf_conn_acct),
         .id     = NF_CT_EXT_ACCT,
 };
 
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
index 5d892febd64c..e22d950c60b3 100644
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -1109,12 +1109,14 @@ void __nf_ct_refresh_acct(struct nf_conn *ct,
 
 acct:
         if (do_acct) {
-                struct nf_conn_counter *acct;
+                struct nf_conn_acct *acct;
 
                 acct = nf_conn_acct_find(ct);
                 if (acct) {
-                        atomic64_inc(&acct[CTINFO2DIR(ctinfo)].packets);
-                        atomic64_add(skb->len, &acct[CTINFO2DIR(ctinfo)].bytes);
+                        struct nf_conn_counter *counter = acct->counter;
+
+                        atomic64_inc(&counter[CTINFO2DIR(ctinfo)].packets);
+                        atomic64_add(skb->len, &counter[CTINFO2DIR(ctinfo)].bytes);
                 }
         }
 }
@@ -1126,13 +1128,15 @@ bool __nf_ct_kill_acct(struct nf_conn *ct,
                        int do_acct)
 {
         if (do_acct) {
-                struct nf_conn_counter *acct;
+                struct nf_conn_acct *acct;
 
                 acct = nf_conn_acct_find(ct);
                 if (acct) {
-                        atomic64_inc(&acct[CTINFO2DIR(ctinfo)].packets);
+                        struct nf_conn_counter *counter = acct->counter;
+
+                        atomic64_inc(&counter[CTINFO2DIR(ctinfo)].packets);
                         atomic64_add(skb->len - skb_network_offset(skb),
-                                     &acct[CTINFO2DIR(ctinfo)].bytes);
+                                     &counter[CTINFO2DIR(ctinfo)].bytes);
                 }
         }
 
diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c
index eea936b70d15..ddc3777d8340 100644
--- a/net/netfilter/nf_conntrack_netlink.c
+++ b/net/netfilter/nf_conntrack_netlink.c
@@ -237,19 +237,21 @@ static int
 ctnetlink_dump_counters(struct sk_buff *skb, const struct nf_conn *ct,
                         enum ip_conntrack_dir dir, int type)
 {
-        struct nf_conn_counter *acct;
+        struct nf_conn_acct *acct;
+        struct nf_conn_counter *counter;
         u64 pkts, bytes;
 
         acct = nf_conn_acct_find(ct);
         if (!acct)
                 return 0;
 
+        counter = acct->counter;
         if (type == IPCTNL_MSG_CT_GET_CTRZERO) {
-                pkts = atomic64_xchg(&acct[dir].packets, 0);
-                bytes = atomic64_xchg(&acct[dir].bytes, 0);
+                pkts = atomic64_xchg(&counter[dir].packets, 0);
+                bytes = atomic64_xchg(&counter[dir].bytes, 0);
         } else {
-                pkts = atomic64_read(&acct[dir].packets);
-                bytes = atomic64_read(&acct[dir].bytes);
+                pkts = atomic64_read(&counter[dir].packets);
+                bytes = atomic64_read(&counter[dir].bytes);
         }
         return dump_counters(skb, pkts, bytes, dir);
 }
@@ -530,7 +532,7 @@ ctnetlink_proto_size(const struct nf_conn *ct)
 }
 
 static inline size_t
-ctnetlink_counters_size(const struct nf_conn *ct)
+ctnetlink_acct_size(const struct nf_conn *ct)
 {
         if (!nf_ct_ext_exist(ct, NF_CT_EXT_ACCT))
                 return 0;
@@ -579,7 +581,7 @@ ctnetlink_nlmsg_size(const struct nf_conn *ct)
                + 3 * nla_total_size(sizeof(u_int8_t)) /* CTA_PROTO_NUM */
                + nla_total_size(sizeof(u_int32_t)) /* CTA_ID */
                + nla_total_size(sizeof(u_int32_t)) /* CTA_STATUS */
-               + ctnetlink_counters_size(ct)
+               + ctnetlink_acct_size(ct)
                + ctnetlink_timestamp_size(ct)
                + nla_total_size(sizeof(u_int32_t)) /* CTA_TIMEOUT */
                + nla_total_size(0) /* CTA_PROTOINFO */
diff --git a/net/netfilter/xt_connbytes.c b/net/netfilter/xt_connbytes.c
index e595e07a759b..1e634615ab9d 100644
--- a/net/netfilter/xt_connbytes.c
+++ b/net/netfilter/xt_connbytes.c
@@ -26,16 +26,18 @@ connbytes_mt(const struct sk_buff *skb, struct xt_action_param *par)
         u_int64_t what = 0;     /* initialize to make gcc happy */
         u_int64_t bytes = 0;
         u_int64_t pkts = 0;
+        const struct nf_conn_acct *acct;
         const struct nf_conn_counter *counters;
 
         ct = nf_ct_get(skb, &ctinfo);
         if (!ct)
                 return false;
 
-        counters = nf_conn_acct_find(ct);
-        if (!counters)
+        acct = nf_conn_acct_find(ct);
+        if (!acct)
                 return false;
 
+        counters = acct->counter;
         switch (sinfo->what) {
         case XT_CONNBYTES_PKTS:
                 switch (sinfo->direction) {