rds: Reintroduce statistics counting

In commit 7e3f2952eeb1 ("rds: don't let RDS shutdown a connection
while senders are present"), refilling the receive queue was removed
from rds_ib_recv(), along with the increment of
s_ib_rx_refill_from_thread.

Commit 73ce4317bf98 ("RDS: make sure we post recv buffers")
re-introduces filling the receive queue from rds_ib_recv(), but does
not add the statistics counter. rds_ib_recv() was later renamed to
rds_ib_recv_path().

This commit reintroduces the statistics counting of
s_ib_rx_refill_from_thread and s_ib_rx_refill_from_cq.

Signed-off-by: Håkon Bugge <haakon.bugge@oracle.com>
Reviewed-by: Knut Omang <knut.omang@oracle.com>
Reviewed-by: Wei Lin Guay <wei.lin.guay@oracle.com>
Reviewed-by: Shamir Rabinovitch <shamir.rabinovitch@oracle.com>
Acked-by: Santosh Shilimkar <santosh.shilimkar@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry-picked from upstream 05bfd7dbb53a10be4a3e7aebaeec04b558198d49)

Conflicts:
	net/rds/ib_recv.c

Orabug: 26717115

Reviewed-by: Avinash Repaka <avinash.repaka@oracle.com>

diff --git a/net/rds/ib_recv.c b/net/rds/ib_recv.c
index 8b6b065433dd1afbdf0e971dea4b000a725868b5..03cc2119a3009a93aedb55b2409e5d56f3c6ffcd 100644 (file)
--- a/net/rds/ib_recv.c
+++ b/net/rds/ib_recv.c
@@ -1379,6 +1379,7 @@ void rds_ib_recv_cqe_handler(struct rds_ib_connection *ic,
        if (!rds_ib_srq_enabled) {
                rds_ib_ring_free(&ic->i_recv_ring, 1);
                rds_ib_recv_refill(conn, 0, GFP_NOWAIT);
+               rds_ib_stats_inc(s_ib_rx_refill_from_cq);
        } else {
                recv->r_ic = ic;
                recv->r_posted = 0;
@@ -1510,6 +1511,7 @@ int rds_ib_recv_path(struct rds_conn_path *cp)
        if (!rds_ib_srq_enabled && rds_conn_up(conn)) {
                rds_ib_attempt_ack(ic);
                rds_ib_recv_refill(conn, 0, GFP_KERNEL);
+               rds_ib_stats_inc(s_ib_rx_refill_from_thread);
        }
 
        return ret;