rds: Fix and augment probe counters

Prior to commit 041dc3e ("Backport multipath RDS from upstream to
UEK4"), there was a function called rds_send_pong that incremented the
statistics counter s_send_pong. After said commit, the function was
re-factored and renamed to rds_send_probe. It was used as a helper
function to send pongs, heartbeat pings, and heartbeat pongs. But it
still, incorrectly now, incremented s_send_pong.

Fixes the above in addition to introducing the full matrix of counters
for {send,recv}_[{hb_,mprds_}]{ping,pong}.

Orabug: 30418039

Fixes: 041dc3e ("Backport multipath RDS from upstream to UEK4")
Signed-off-by: Håkon Bugge <[email protected]>
Tested-by: Michael Nowak <[email protected]>
Reviewed-by: Ka-Cheong Poon <[email protected]>

---

v1->v2:
	* Removed MPRDS handshake probes from the statistics
	* Moved increment of s_send_ping to rds_sendmsg() for
          simplicity, as suggested by Ka-Cheong
	* Added Mike's t-b

v2->v3:
	* Added separate counters for MPRDS handshakes, as per
          discussion with Ka-Cheong
	* Fixed a glitch where MPRDS handshakes would be logged as
          illegal probes, as detected by Ka-Cheong

v3->v4:
	* Re-factored the statistics counting in rds_send_probe() and
          moved them to the respective functions calling
          rds_send_probe()
	* Added Ka-Cheong's r-b

Signed-off-by: Somasundaram Krishnasamy <[email protected]>

Author: Hakon-Bugge

net/rds/rds.h

@@ -914,6 +914,11 @@ struct rds_statistics {
 	uint64_t	s_recv_ack_required;
 	uint64_t	s_recv_rdma_bytes;
 	uint64_t	s_recv_ping;
+	uint64_t	s_recv_pong;
+	uint64_t	s_recv_hb_ping;
+	uint64_t	s_recv_hb_pong;
+	uint64_t	s_recv_mprds_ping;
+	uint64_t	s_recv_mprds_pong;
 	uint64_t	s_send_queue_empty;
 	uint64_t	s_send_queue_full;
 	uint64_t	s_send_lock_contention;
@@ -925,7 +930,12 @@ struct rds_statistics {
 	uint64_t	s_send_queued;
 	uint64_t	s_send_rdma;
 	uint64_t	s_send_rdma_bytes;
+	uint64_t	s_send_ping;
 	uint64_t	s_send_pong;
+	uint64_t	s_send_hb_ping;
+	uint64_t	s_send_hb_pong;
+	uint64_t	s_send_mprds_ping;
+	uint64_t	s_send_mprds_pong;
 	uint64_t	s_page_remainder_hit;
 	uint64_t	s_page_remainder_miss;
 	uint64_t	s_copy_to_user;

net/rds/recv.c

@@ -700,11 +700,17 @@ rds_recv_local(struct rds_conn_path *cp, struct in6_addr *saddr,
 			goto out;
 		}
 		if (is_hb_ping) {
+			rds_stats_inc(s_recv_hb_ping);
 			rds_send_hb(conn, 1);
 		} else if (is_hb_pong) {
+			rds_stats_inc(s_recv_hb_pong);
 			cp->cp_hb_start = 0;
 		} else {
-			rds_stats_inc(s_recv_ping);
+			if (be16_to_cpu(inc->i_hdr.h_sport) == RDS_FLAG_PROBE_PORT)
+				rds_stats_inc(s_recv_mprds_ping);
+			else
+				rds_stats_inc(s_recv_ping);
+
 			rds_send_pong(cp, inc->i_hdr.h_sport);
 			/* if this is a handshake ping,
 			 * start multipath if necessary
@@ -721,13 +727,17 @@ rds_recv_local(struct rds_conn_path *cp, struct in6_addr *saddr,
 	if (conn->c_trans->t_mp_capable &&
 	    be16_to_cpu(inc->i_hdr.h_dport) ==  RDS_FLAG_PROBE_PORT &&
 	    inc->i_hdr.h_sport == 0) {
+		rds_stats_inc(s_recv_mprds_pong);
 		rds_recv_hs_exthdrs(&inc->i_hdr, cp->cp_conn);
 		/* if this is a handshake pong, start multipath if necessary */
 		rds_start_mprds(cp->cp_conn);
 		wake_up(&cp->cp_conn->c_hs_waitq);
 		goto out;
 	}
 
+	if (!inc->i_hdr.h_sport)
+		rds_stats_inc(s_recv_pong);
+
 	if (!rs)
 		rs = rds_find_bound(daddr, inc->i_hdr.h_dport,
 				    conn->c_bound_if);

net/rds/send.c

@@ -1628,6 +1628,9 @@ int rds_sendmsg(struct socket *sock, struct msghdr *msg, size_t payload_len)
 	 */
 	rds_stats_inc(s_send_queued);
 
+	if (!dport)
+		rds_stats_inc(s_send_ping);
+
 	ret = rds_send_xmit(cpath);
 	if (ret == -ENOMEM || ret == -EAGAIN)
 		rds_cond_queue_send_work(cpath, 1);
@@ -1850,7 +1853,6 @@ static int rds_send_probe(struct rds_conn_path *cp, __be16 sport,
 	spin_unlock_irqrestore(&cp->cp_lock, flags);
 
 	rds_stats_inc(s_send_queued);
-	rds_stats_inc(s_send_pong);
 
 	if (!test_bit(RDS_LL_SEND_FULL, &cp->cp_flags))
 		rds_cond_queue_send_work(cp, 0);
@@ -1872,10 +1874,13 @@ rds_send_hb(struct rds_connection *conn, int response)
 	if (conn->c_trans->t_type == RDS_TRANS_TCP)
 		return 0;
 
-	if (response)
+	if (response) {
 		flags |= RDS_FLAG_HB_PONG;
-	else
+		rds_stats_inc(s_send_hb_pong);
+	} else {
 		flags |= RDS_FLAG_HB_PING;
+		rds_stats_inc(s_send_hb_ping);
+	}
 	flags |= RDS_FLAG_ACK_REQUIRED;
 
 	rds_send_probe(&conn->c_path[0], 0, 0, flags);
@@ -1886,6 +1891,11 @@ rds_send_hb(struct rds_connection *conn, int response)
 int
 rds_send_pong(struct rds_conn_path *cp, __be16 dport)
 {
+	if (be16_to_cpu(dport) == RDS_FLAG_PROBE_PORT)
+		rds_stats_inc(s_send_mprds_pong);
+	else
+		rds_stats_inc(s_send_pong);
+
 	return rds_send_probe(cp, 0, dport, 0);
 }
 
@@ -1901,7 +1911,9 @@ rds_send_ping(struct rds_connection *conn, int cp_index)
 		return;
 	}
 	conn->c_ping_triggered = 1;
+
 	spin_unlock_irqrestore(&cp->cp_lock, flags);
+	rds_stats_inc(s_send_mprds_ping);
 	rds_send_probe(cp, cpu_to_be16(RDS_FLAG_PROBE_PORT), 0, 0);
 }
 EXPORT_SYMBOL_GPL(rds_send_ping);

net/rds/stats.c

@@ -55,6 +55,11 @@ static char *rds_stat_names[] = {
 	"recv_ack_required",
 	"recv_rdma_bytes",
 	"recv_ping",
+	"recv_pong",
+	"recv_hb_ping",
+	"recv_hb_pong",
+	"recv_mprds_ping",
+	"recv_mprds_pong",
 	"send_queue_empty",
 	"send_queue_full",
 	"send_lock_contention",
@@ -66,7 +71,12 @@ static char *rds_stat_names[] = {
 	"send_queued",
 	"send_rdma",
 	"send_rdma_bytes",
+	"send_ping",
 	"send_pong",
+	"send_hb_ping",
+	"send_hb_pong",
+	"send_mprds_ping",
+	"send_mprds_pong",
 	"page_remainder_hit",
 	"page_remainder_miss",
 	"copy_to_user",