ipvs: use 64-bit rates in stats

IPVS stats are limited to 2^(32-10) conns/s and packets/s,
2^(32-5) bytes/s. It is time to use 64 bits:

* Change all conn/packet kernel counters to 64-bit and update
them in u64_stats_update_{begin,end} section

* In kernel use struct ip_vs_kstats instead of the user-space
struct ip_vs_stats_user and use new func ip_vs_export_stats_user
to export it to sockopt users to preserve compatibility with
32-bit values

* Rename cpu counters "ustats" to "cnt"

* To netlink users provide additionally 64-bit stats:
IPVS_SVC_ATTR_STATS64 and IPVS_DEST_ATTR_STATS64. Old stats
remain for old binaries.

* We can use ip_vs_copy_stats in ip_vs_stats_percpu_show

Thanks to Chris Caputo for providing initial patch for ip_vs_est.c

Signed-off-by: Chris Caputo <ccaputo@alt.net>
Signed-off-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>

1 files changed, 33 insertions, 17 deletions

diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
index 615b20b58545..a627fe690c19 100644
--- a/include/net/ip_vs.h
+++ b/include/net/ip_vs.h
@@ -365,15 +365,15 @@ struct ip_vs_seq {
 
 /* counters per cpu */
 struct ip_vs_counters {
-        __u32           conns;          /* connections scheduled */
-        __u32           inpkts;         /* incoming packets */
-        __u32           outpkts;        /* outgoing packets */
+        __u64           conns;          /* connections scheduled */
+        __u64           inpkts;         /* incoming packets */
+        __u64           outpkts;        /* outgoing packets */
         __u64           inbytes;        /* incoming bytes */
         __u64           outbytes;       /* outgoing bytes */
 };
 /* Stats per cpu */
 struct ip_vs_cpu_stats {
-        struct ip_vs_counters   ustats;
+        struct ip_vs_counters   cnt;
         struct u64_stats_sync   syncp;
 };
 
@@ -383,23 +383,40 @@ struct ip_vs_estimator {
 
         u64                     last_inbytes;
         u64                     last_outbytes;
-        u32                     last_conns;
-        u32                     last_inpkts;
-        u32                     last_outpkts;
-
-        u32                     cps;
-        u32                     inpps;
-        u32                     outpps;
-        u32                     inbps;
-        u32                     outbps;
+        u64                     last_conns;
+        u64                     last_inpkts;
+        u64                     last_outpkts;
+
+        u64                     cps;
+        u64                     inpps;
+        u64                     outpps;
+        u64                     inbps;
+        u64                     outbps;
+};
+
+/*
+ * IPVS statistics object, 64-bit kernel version of struct ip_vs_stats_user
+ */
+struct ip_vs_kstats {
+        u64                     conns;          /* connections scheduled */
+        u64                     inpkts;         /* incoming packets */
+        u64                     outpkts;        /* outgoing packets */
+        u64                     inbytes;        /* incoming bytes */
+        u64                     outbytes;       /* outgoing bytes */
+
+        u64                     cps;            /* current connection rate */
+        u64                     inpps;          /* current in packet rate */
+        u64                     outpps;         /* current out packet rate */
+        u64                     inbps;          /* current in byte rate */
+        u64                     outbps;         /* current out byte rate */
 };
 
 struct ip_vs_stats {
-        struct ip_vs_stats_user ustats;         /* statistics */
+        struct ip_vs_kstats     kstats;         /* kernel statistics */
         struct ip_vs_estimator  est;            /* estimator */
         struct ip_vs_cpu_stats __percpu *cpustats;      /* per cpu counters */
         spinlock_t              lock;           /* spin lock */
-        struct ip_vs_stats_user ustats0;        /* reset values */
+        struct ip_vs_kstats     kstats0;        /* reset values */
 };
 
 struct dst_entry;
@@ -1388,8 +1405,7 @@ void ip_vs_sync_conn(struct net *net, struct ip_vs_conn *cp, int pkts);
 void ip_vs_start_estimator(struct net *net, struct ip_vs_stats *stats);
 void ip_vs_stop_estimator(struct net *net, struct ip_vs_stats *stats);
 void ip_vs_zero_estimator(struct ip_vs_stats *stats);
-void ip_vs_read_estimator(struct ip_vs_stats_user *dst,
-                          struct ip_vs_stats *stats);
+void ip_vs_read_estimator(struct ip_vs_kstats *dst, struct ip_vs_stats *stats);
 
 /* Various IPVS packet transmitters (from ip_vs_xmit.c) */
 int ip_vs_null_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,