Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next

Pablo Neira Ayuso says:

====================
Netfilter updates for net-next

A small batch with accumulated updates in nf-next, mostly IPVS updates,
they are:

1) Add 64-bits stats counters to IPVS, from Julian Anastasov.

2) Move NETFILTER_XT_MATCH_ADDRTYPE out of NETFILTER_ADVANCED as docker
seem to require this, from Anton Blanchard.

3) Use boolean instead of numeric value in set_match_v*(), from
coccinelle via Fengguang Wu.

4) Allows rescheduling of new connections in IPVS when port reuse is
detected, from Marcelo Ricardo Leitner.

5) Add missing bits to support arptables extensions from nft_compat,
from Arturo Borrero.

Patrick is preparing a large batch to enhance the set infrastructure,
named expressions among other things, that should follow up soon after
this batch.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 44 insertions, 17 deletions

diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
index 615b20b58545..20fd23398537 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;
@@ -924,6 +941,7 @@ struct netns_ipvs {
         int                     sysctl_nat_icmp_send;
         int                     sysctl_pmtu_disc;
         int                     sysctl_backup_only;
+        int                     sysctl_conn_reuse_mode;
 
         /* ip_vs_lblc */
         int                     sysctl_lblc_expiration;
@@ -1042,6 +1060,11 @@ static inline int sysctl_backup_only(struct netns_ipvs *ipvs)
                ipvs->sysctl_backup_only;
 }
 
+static inline int sysctl_conn_reuse_mode(struct netns_ipvs *ipvs)
+{
+        return ipvs->sysctl_conn_reuse_mode;
+}
+
 #else
 
 static inline int sysctl_sync_threshold(struct netns_ipvs *ipvs)
@@ -1109,6 +1132,11 @@ static inline int sysctl_backup_only(struct netns_ipvs *ipvs)
         return 0;
 }
 
+static inline int sysctl_conn_reuse_mode(struct netns_ipvs *ipvs)
+{
+        return 1;
+}
+
 #endif
 
 /* IPVS core functions
@@ -1388,8 +1416,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,