Commit 6c5e6839 authored by Bob Pearson's avatar Bob Pearson Committed by Jason Gunthorpe
Browse files

RDMA/rxe: Remove redundant num_sge fields 

In include/uapi/rdma/rdma_user_rxe.h there are redundant copies of num_sge
in the rxe_send_wr, rxe_recv_wqe, and rxe_dma_info. Only the ones in
rxe_dma_info are actually used by the rxe kernel driver.

The userspace would set these values, but the kernel never read them.

This change has no affect on the current ABI and new or old versions of
rdma-core operate correctly with new or old versions of the kernel rxe
driver.

Link: https://lore.kernel.org/r/20220913222716.18335-1-rpearsonhpe@gmail.com


Signed-off-by: default avatarBob Pearson <rpearsonhpe@gmail.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent 72b2f760

drivers/infiniband/sw/rxe/rxe_verbs.c

+0 −2
Original line number Diff line number Diff line
@@ -262,7 +262,6 @@ static int post_one_recv(struct rxe_rq *rq, const struct ib_recv_wr *ibwr) 


	recv_wqe = queue_producer_addr(rq->queue, QUEUE_TYPE_TO_DRIVER);

	recv_wqe->wr_id = ibwr->wr_id;

	recv_wqe->num_sge = num_sge;



	memcpy(recv_wqe->dma.sge, ibwr->sg_list,

	       num_sge * sizeof(struct ib_sge));
@@ -526,7 +525,6 @@ static void init_send_wr(struct rxe_qp *qp, struct rxe_send_wr *wr, 
			 const struct ib_send_wr *ibwr)

{

	wr->wr_id = ibwr->wr_id;

	wr->num_sge = ibwr->num_sge;

	wr->opcode = ibwr->opcode;

	wr->send_flags = ibwr->send_flags;

include/uapi/rdma/rdma_user_rxe.h

+2 −2
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ struct rxe_av { 


struct rxe_send_wr {

	__aligned_u64		wr_id;

	__u32			num_sge;

	__u32			reserved;

	__u32			opcode;

	__u32			send_flags;

	union {
@@ -166,7 +166,7 @@ struct rxe_send_wqe { 


struct rxe_recv_wqe {

	__aligned_u64		wr_id;

	__u32			num_sge;

	__u32			reserved;

	__u32			padding;

	struct rxe_dma_info	dma;

};