sunrpc: Fix connect metrics

[ Upstream commit 3968a8a5310404c2f0b9e4d9f28cab13a12bc4fd ]

For TCP, the logic in xprt_connect_status is currently never invoked
to record a successful connection. Commit 2a4919919a97 ("SUNRPC:
Return EAGAIN instead of ENOTCONN when waking up xprt->pending")
changed the way TCP xprt's are awoken after a connect succeeds.

Instead, change connection-oriented transports to bump connect_count
and compute connect_time the moment that XPRT_CONNECTED is set.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c
index d0282cc88b145de3cba04b720fd6cd8defb97c9f..b852c34bb6373c9ac724568d9c389699c8a5c881 100644 (file)
--- a/net/sunrpc/xprt.c
+++ b/net/sunrpc/xprt.c
@@ -795,17 +795,11 @@ void xprt_connect(struct rpc_task *task)
 
 static void xprt_connect_status(struct rpc_task *task)
 {
-       struct rpc_xprt *xprt = task->tk_rqstp->rq_xprt;
-
-       if (task->tk_status == 0) {
-               xprt->stat.connect_count++;
-               xprt->stat.connect_time += (long)jiffies - xprt->stat.connect_start;
+       switch (task->tk_status) {
+       case 0:
                dprintk("RPC: %5u xprt_connect_status: connection established\n",
                                task->tk_pid);
-               return;
-       }
-
-       switch (task->tk_status) {
+               break;
        case -ECONNREFUSED:
        case -ECONNRESET:
        case -ECONNABORTED:
@@ -822,7 +816,7 @@ static void xprt_connect_status(struct rpc_task *task)
        default:
                dprintk("RPC: %5u xprt_connect_status: error %d connecting to "
                                "server %s\n", task->tk_pid, -task->tk_status,
-                               xprt->servername);
+                               task->tk_rqstp->rq_xprt->servername);
                task->tk_status = -EIO;
        }
 }

diff --git a/net/sunrpc/xprtrdma/transport.c b/net/sunrpc/xprtrdma/transport.c
index 8cf5ccfe180d35a6809d121ff6d0cb7da71a3464..b1b40a1be8c57a99fde327b1ba800e2237802f51 100644 (file)
--- a/net/sunrpc/xprtrdma/transport.c
+++ b/net/sunrpc/xprtrdma/transport.c
@@ -238,8 +238,12 @@ rpcrdma_connect_worker(struct work_struct *work)
        if (++xprt->connect_cookie == 0)        /* maintain a reserved value */
                ++xprt->connect_cookie;
        if (ep->rep_connected > 0) {
-               if (!xprt_test_and_set_connected(xprt))
+               if (!xprt_test_and_set_connected(xprt)) {
+                       xprt->stat.connect_count++;
+                       xprt->stat.connect_time += (long)jiffies -
+                                                  xprt->stat.connect_start;
                        xprt_wake_pending_tasks(xprt, 0);
+               }
        } else {
                if (xprt_test_and_clear_connected(xprt))
                        xprt_wake_pending_tasks(xprt, -ENOTCONN);

diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index 05a58cc1b0cdb51121560a028b1211b101752505..a42871a59f3b99cf7c22a787a7e0935b71836aea 100644 (file)
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -1592,6 +1592,9 @@ static void xs_tcp_state_change(struct sock *sk)
                        clear_bit(XPRT_SOCK_CONNECTING, &transport->sock_state);
                        xprt_clear_connecting(xprt);
 
+                       xprt->stat.connect_count++;
+                       xprt->stat.connect_time += (long)jiffies -
+                                                  xprt->stat.connect_start;
                        xprt_wake_pending_tasks(xprt, -EAGAIN);
                }
                spin_unlock(&xprt->transport_lock);
@@ -2008,8 +2011,6 @@ static int xs_local_finish_connecting(struct rpc_xprt *xprt,
        }
 
        /* Tell the socket layer to start connecting... */
-       xprt->stat.connect_count++;
-       xprt->stat.connect_start = jiffies;
        return kernel_connect(sock, xs_addr(xprt), xprt->addrlen, 0);
 }
 
@@ -2041,6 +2042,9 @@ static int xs_local_setup_socket(struct sock_xprt *transport)
        case 0:
                dprintk("RPC:       xprt %p connected to %s\n",
                                xprt, xprt->address_strings[RPC_DISPLAY_ADDR]);
+               xprt->stat.connect_count++;
+               xprt->stat.connect_time += (long)jiffies -
+                                          xprt->stat.connect_start;
                xprt_set_connected(xprt);
        case -ENOBUFS:
                break;
@@ -2361,8 +2365,6 @@ static int xs_tcp_finish_connecting(struct rpc_xprt *xprt, struct socket *sock)
        xs_set_memalloc(xprt);
 
        /* Tell the socket layer to start connecting... */
-       xprt->stat.connect_count++;
-       xprt->stat.connect_start = jiffies;
        set_bit(XPRT_SOCK_CONNECTING, &transport->sock_state);
        ret = kernel_connect(sock, xs_addr(xprt), xprt->addrlen, O_NONBLOCK);
        switch (ret) {