net/rds: Extract dest qp num for displaying in rds-info

This patch extracts the source and destination qp number during the
completion of an rds connection establishment and are saved in newly
defined variables. These values are being passed to the user-space rds-info
application when needed, for display in its output.

Orabug: 31880142

Suggested-by: Rama Nichanamatlu <[email protected]>
Signed-off-by: Praveen Kumar Kannoju <[email protected]>
Reviewed-by: Alan Maguire <[email protected]>
Signed-off-by: Somasundaram Krishnasamy <[email protected]>

Author: pkannoju

include/uapi/linux/rds.h

@@ -291,9 +291,10 @@ struct rds_info_rdma_connection {
 	uint32_t	frag;
 	uint16_t        flow_ctl_post_credit;
 	uint16_t        flow_ctl_send_credit;
-	uint32_t        qp_num;
+	int32_t		qp_num;
 	uint32_t        w_alloc_ctr;
 	uint32_t        w_free_ctr;
+	int32_t		dst_qp_num;
 
 };
 
@@ -314,9 +315,10 @@ struct rds6_info_rdma_connection {
 	uint32_t	frag;
 	uint16_t        flow_ctl_post_credit;
 	uint16_t        flow_ctl_send_credit;
-	uint32_t	qp_num;
+	int32_t		qp_num;
 	uint32_t	w_alloc_ctr;
 	uint32_t	w_free_ctr;
+	int32_t		dst_qp_num;
 };
 
 /*

net/rds/ib.c

@@ -541,6 +541,9 @@ static int rds_ib_conn_info_visitor(struct rds_connection *conn,
 	memset(&iinfo->src_gid, 0, sizeof(iinfo->src_gid));
 	memset(&iinfo->dst_gid, 0, sizeof(iinfo->dst_gid));
 
+	iinfo->qp_num = -1;
+	iinfo->dst_qp_num = -1;
+
 	if (ic) {
 		iinfo->tos = conn->c_tos;
 		iinfo->sl = ic->i_sl;
@@ -557,7 +560,8 @@ static int rds_ib_conn_info_visitor(struct rds_connection *conn,
 		iinfo->max_send_wr = ic->i_send_ring.w_nr;
 		iinfo->max_recv_wr = ic->i_recv_ring.w_nr;
 		iinfo->max_send_sge = rds_ibdev->max_sge;
-		iinfo->qp_num = ic->i_cm_id->qp->qp_num;
+		iinfo->qp_num = ic->i_qp_num;
+		iinfo->dst_qp_num = ic->i_dst_qp_num;
 		iinfo->w_alloc_ctr = ic->i_recv_ring.w_alloc_ctr;
 		iinfo->w_free_ctr =
 			(u32)atomic_read(&ic->i_recv_ring.w_free_ctr);
@@ -589,6 +593,9 @@ static int rds6_ib_conn_info_visitor(struct rds_connection *conn,
 	memset(&iinfo6->src_gid, 0, sizeof(iinfo6->src_gid));
 	memset(&iinfo6->dst_gid, 0, sizeof(iinfo6->dst_gid));
 
+	iinfo6->qp_num = -1;
+	iinfo6->dst_qp_num = -1;
+
 	if (ic) {
 		iinfo6->tos = conn->c_tos;
 		iinfo6->sl = ic->i_sl;
@@ -604,7 +611,8 @@ static int rds6_ib_conn_info_visitor(struct rds_connection *conn,
 		iinfo6->max_send_wr = ic->i_send_ring.w_nr;
 		iinfo6->max_recv_wr = ic->i_recv_ring.w_nr;
 		iinfo6->max_send_sge = rds_ibdev->max_sge;
-		iinfo6->qp_num = ic->i_cm_id->qp->qp_num;
+		iinfo6->qp_num = ic->i_qp_num;
+		iinfo6->dst_qp_num = ic->i_dst_qp_num;
 		iinfo6->w_alloc_ctr = ic->i_recv_ring.w_alloc_ctr;
 		iinfo6->w_free_ctr =
 			(u32)atomic_read(&ic->i_recv_ring.w_free_ctr);

net/rds/ib.h

@@ -291,6 +291,10 @@ struct rds_ib_connection {
 	atomic_t                i_worker_has_rx;
 	atomic_t		i_cq_quiesce;
 	uint			i_irq_local_cpu;
+
+	/* qp number info */
+	s32			i_qp_num;
+	s32			i_dst_qp_num;
 };
 
 /* This assumes that atomic_t is at least 32 bits */

net/rds/ib_cm.c

@@ -375,6 +375,10 @@ void rds_ib_cm_connect_complete(struct rds_connection *conn, struct rdma_cm_even
 					    NULL);
 	}
 
+	/* Save the qp number information in the connection details. */
+	ic->i_qp_num = ic->i_cm_id->qp->qp_num;
+	ic->i_dst_qp_num = event->param.conn.qp_num;
+
 	rds_connect_complete(conn);
 }