Skip to contentSkip to conversation

providers/rxe: Remove redundant num_sge_fields

PATCH New Bob Pearson 1 participant 3 messages Sep 13, 2022 InfiniBand

lore
Share & tools
lore
#0 lore raw

cover providers/rxe: Remove redundant num_sge_fields

This patch series removes two unused num_sge fields in struct rxe_send_wr and struct rxe_recv_wqe in favor of the num_sge field in struct rxe_dma_info. It has no effect on the current ABI. It has the desireable side effect of freeing 4 bytes in rxe_send_wr, which is otherwise completely full, for other uses.

Bob Pearson (2):
Update kernel headers
providers/rxe: Remove redundant num_sge fields

 kernel-headers/rdma/rdma_user_rxe.h |  4 ++--
 providers/rxe/rxe.c                 | 11 +++++------
 2 files changed, 7 insertions(+), 8 deletions(-)

base-commit: 3cbfb618e0a70d7341d1e737fd00f661ccaac1c4

Signature · 1 line
2.34.1
#1 lore raw

PATCH 1/2 Update kernel headers

To commit ?? ("RDMA/rxe: Remove redundant num_sge fields").

---
 kernel-headers/rdma/rdma_user_rxe.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
kernel-headers/rdma/rdma_user_rxe.h +2 -2
index f09c5c9e..73f679df 100644
@@ -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;
 };
Signature · 1 line
2.34.1
#2 lore raw

PATCH 2/2 providers/rxe: Remove redundant num_sge fields

In reply to Bob Pearson

This patch is a matching patch to a kernel patch "RDMA/rxe: Remove redundant num_sge fields" which performs the same function for the kernel rxe driver.

---
 providers/rxe/rxe.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)
providers/rxe/rxe.c +5 -6
index 9a900e4d..0e8f5605 100644
@@ -679,6 +679,7 @@ static int rxe_post_one_recv(struct rxe_wq *rq, struct ibv_recv_wr *recv_wr)
 	int i;
 	struct rxe_recv_wqe *wqe;
 	struct rxe_queue_buf *q = rq->queue;
+	int num_sge = recv_wr->num_sge;
 	int length = 0;
 	int rc = 0;
 
@@ -687,7 +688,7 @@ static int rxe_post_one_recv(struct rxe_wq *rq, struct ibv_recv_wr *recv_wr)
 		goto out;
 	}
 
-	if (recv_wr->num_sge > rq->max_sge) {
+	if (num_sge > rq->max_sge) {
 		rc = EINVAL;
 		goto out;
 	}
@@ -695,18 +696,17 @@ static int rxe_post_one_recv(struct rxe_wq *rq, struct ibv_recv_wr *recv_wr)
 	wqe = (struct rxe_recv_wqe *)producer_addr(q);
 
 	wqe->wr_id = recv_wr->wr_id;
-	wqe->num_sge = recv_wr->num_sge;
 
 	memcpy(wqe->dma.sge, recv_wr->sg_list,
-	       wqe->num_sge*sizeof(*wqe->dma.sge));
+	       num_sge*sizeof(*wqe->dma.sge));
 
-	for (i = 0; i < wqe->num_sge; i++)
+	for (i = 0; i < num_sge; i++)
 		length += wqe->dma.sge[i].length;
 
 	wqe->dma.length = length;
 	wqe->dma.resid = length;
 	wqe->dma.cur_sge = 0;
-	wqe->dma.num_sge = wqe->num_sge;
+	wqe->dma.num_sge = num_sge;
 	wqe->dma.sge_offset = 0;
 
 	advance_producer(q);
@@ -1406,7 +1406,6 @@ static void convert_send_wr(struct rxe_qp *qp, struct rxe_send_wr *kwr,
 	memset(kwr, 0, sizeof(*kwr));
 
 	kwr->wr_id		= uwr->wr_id;
-	kwr->num_sge		= uwr->num_sge;
 	kwr->opcode		= uwr->opcode;
 	kwr->send_flags		= uwr->send_flags;
 	kwr->ex.imm_data	= uwr->imm_data;
Signature · 1 line
2.34.1