diff options
author | Håkon Bugge <Haakon.Bugge@oracle.com> | 2017-08-08 05:13:32 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-08-09 00:03:47 -0400 |
commit | 05bfd7dbb53a10be4a3e7aebaeec04b558198d49 (patch) | |
tree | eaad99a15c66e867b3b5f14ab9ef60700e58a31e | |
parent | 8ba60924710cde564a3905588b6219741d6356d0 (diff) |
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>
-rw-r--r-- | net/rds/ib_recv.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/rds/ib_recv.c b/net/rds/ib_recv.c index e10624aa6959..9722bf839d9d 100644 --- a/net/rds/ib_recv.c +++ b/net/rds/ib_recv.c | |||
@@ -1015,8 +1015,10 @@ void rds_ib_recv_cqe_handler(struct rds_ib_connection *ic, | |||
1015 | if (rds_ib_ring_empty(&ic->i_recv_ring)) | 1015 | if (rds_ib_ring_empty(&ic->i_recv_ring)) |
1016 | rds_ib_stats_inc(s_ib_rx_ring_empty); | 1016 | rds_ib_stats_inc(s_ib_rx_ring_empty); |
1017 | 1017 | ||
1018 | if (rds_ib_ring_low(&ic->i_recv_ring)) | 1018 | if (rds_ib_ring_low(&ic->i_recv_ring)) { |
1019 | rds_ib_recv_refill(conn, 0, GFP_NOWAIT); | 1019 | rds_ib_recv_refill(conn, 0, GFP_NOWAIT); |
1020 | rds_ib_stats_inc(s_ib_rx_refill_from_cq); | ||
1021 | } | ||
1020 | } | 1022 | } |
1021 | 1023 | ||
1022 | int rds_ib_recv_path(struct rds_conn_path *cp) | 1024 | int rds_ib_recv_path(struct rds_conn_path *cp) |
@@ -1029,6 +1031,7 @@ int rds_ib_recv_path(struct rds_conn_path *cp) | |||
1029 | if (rds_conn_up(conn)) { | 1031 | if (rds_conn_up(conn)) { |
1030 | rds_ib_attempt_ack(ic); | 1032 | rds_ib_attempt_ack(ic); |
1031 | rds_ib_recv_refill(conn, 0, GFP_KERNEL); | 1033 | rds_ib_recv_refill(conn, 0, GFP_KERNEL); |
1034 | rds_ib_stats_inc(s_ib_rx_refill_from_thread); | ||
1032 | } | 1035 | } |
1033 | 1036 | ||
1034 | return ret; | 1037 | return ret; |