[PATCH nf-next 1/3] ipvs: show the current conn_tab size to users

[Julian Anastasov <ja@xxxxxx>]

As conn_tab is per-net, better to show the current hash table size
to users instead of the ip_vs_conn_tab_size (max).

Signed-off-by: Julian Anastasov <ja@xxxxxx>
---
 net/netfilter/ipvs/ip_vs_ctl.c | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
index b472e564b769..3129b15dadc2 100644
--- a/net/netfilter/ipvs/ip_vs_ctl.c
+++ b/net/netfilter/ipvs/ip_vs_ctl.c
@@ -281,6 +281,13 @@ static void est_reload_work_handler(struct work_struct 
*work)
        mutex_unlock(&ipvs->est_mutex);
 }
 
+static int get_conn_tab_size(struct netns_ipvs *ipvs)
+{
+       struct ip_vs_rht *t = rcu_dereference(ipvs->conn_tab);
+
+       return t? t->size : 0;
+}
+
 int
 ip_vs_use_count_inc(void)
 {
@@ -2742,10 +2749,14 @@ static void ip_vs_info_seq_stop(struct seq_file *seq, 
void *v)
 
 static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
 {
+       struct net *net = seq_file_net(seq);
+       struct netns_ipvs *ipvs = net_ipvs(net);
+
        if (v == SEQ_START_TOKEN) {
                seq_printf(seq,
                        "IP Virtual Server version %d.%d.%d (size=%d)\n",
-                       NVERSION(IP_VS_VERSION_CODE), ip_vs_conn_tab_size);
+                       NVERSION(IP_VS_VERSION_CODE),
+                       get_conn_tab_size(ipvs));
                seq_puts(seq,
                         "Prot LocalAddress:Port Scheduler Flags\n");
                seq_puts(seq,
@@ -3424,9 +3435,13 @@ do_ip_vs_get_ctl(struct sock *sk, int cmd, void __user 
*user, int *len)
        case IP_VS_SO_GET_VERSION:
        {
                char buf[64];
+               int csize;
 
+               rcu_read_lock();
+               csize = get_conn_tab_size(ipvs);
+               rcu_read_unlock();
                sprintf(buf, "IP Virtual Server version %d.%d.%d (size=%d)",
-                       NVERSION(IP_VS_VERSION_CODE), ip_vs_conn_tab_size);
+                       NVERSION(IP_VS_VERSION_CODE), csize);
                if (copy_to_user(user, buf, strlen(buf)+1) != 0) {
                        ret = -EFAULT;
                        goto out;
@@ -3438,8 +3453,11 @@ do_ip_vs_get_ctl(struct sock *sk, int cmd, void __user 
*user, int *len)
        case IP_VS_SO_GET_INFO:
        {
                struct ip_vs_getinfo info;
+
                info.version = IP_VS_VERSION_CODE;
-               info.size = ip_vs_conn_tab_size;
+               rcu_read_lock();
+               info.size = get_conn_tab_size(ipvs);
+               rcu_read_unlock();
                info.num_services =
                        atomic_read(&ipvs->num_services[IP_VS_AF_INET]);
                if (copy_to_user(user, &info, sizeof(info)) != 0)
@@ -4448,7 +4466,7 @@ static int ip_vs_genl_get_cmd(struct sk_buff *skb, struct 
genl_info *info)
                if (nla_put_u32(msg, IPVS_INFO_ATTR_VERSION,
                                IP_VS_VERSION_CODE) ||
                    nla_put_u32(msg, IPVS_INFO_ATTR_CONN_TAB_SIZE,
-                               ip_vs_conn_tab_size))
+                               get_conn_tab_size(ipvs)))
                        goto nla_put_failure;
                break;
        }
-- 
2.53.0