Message ID | 20170808091332.5413-1-Haakon.Bugge@oracle.com |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
On Tue, Aug 08, 2017 at 11:13:32AM +0200, Håkon Bugge wrote: > 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> > --- > net/rds/ib_recv.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/net/rds/ib_recv.c b/net/rds/ib_recv.c > index e10624a..9722bf8 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, > if (rds_ib_ring_empty(&ic->i_recv_ring)) > rds_ib_stats_inc(s_ib_rx_ring_empty); > > - if (rds_ib_ring_low(&ic->i_recv_ring)) > + if (rds_ib_ring_low(&ic->i_recv_ring)) { > rds_ib_recv_refill(conn, 0, GFP_NOWAIT); > + rds_ib_stats_inc(s_ib_rx_refill_from_cq); > + } > } > > int rds_ib_recv_path(struct rds_conn_path *cp) > @@ -1029,6 +1031,7 @@ int rds_ib_recv_path(struct rds_conn_path *cp) > if (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; > -- > 2.9.3 > Reviewed-by: Shamir Rabinovitch <shamir.rabinovitch@oracle.com>
On 8/8/2017 2:13 AM, Håkon Bugge wrote: > 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> > --- Looks fine. Acked-by: Santosh Shilimkar <santosh.shilimkar@oracle.com>
From: Håkon Bugge <Haakon.Bugge@oracle.com> Date: Tue, 8 Aug 2017 11:13:32 +0200 > 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> Applied.
diff --git a/net/rds/ib_recv.c b/net/rds/ib_recv.c index e10624a..9722bf8 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, if (rds_ib_ring_empty(&ic->i_recv_ring)) rds_ib_stats_inc(s_ib_rx_ring_empty); - if (rds_ib_ring_low(&ic->i_recv_ring)) + if (rds_ib_ring_low(&ic->i_recv_ring)) { rds_ib_recv_refill(conn, 0, GFP_NOWAIT); + rds_ib_stats_inc(s_ib_rx_refill_from_cq); + } } int rds_ib_recv_path(struct rds_conn_path *cp) @@ -1029,6 +1031,7 @@ int rds_ib_recv_path(struct rds_conn_path *cp) if (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;