mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Abhijit Gangurde <abhijit.gangurde@amd.com>
To: <nipun.gupta@amd.com>, <nikhil.agarwal@amd.com>
Cc: <gregkh@linuxfoundation.org>, <linux-kernel@vger.kernel.org>,
	<michal.simek@amd.com>, <git@amd.com>,
	Abhijit Gangurde <abhijit.gangurde@amd.com>
Subject: [PATCH 1/1] RDMA/ionic: simplify rq_meta allocation
Date: Tue, 7 Jul 2026 15:25:43 +0530	[thread overview]
Message-ID: <20260707095555.3939295-5-abhijit.gangurde@amd.com> (raw)
In-Reply-To: <20260707095555.3939295-1-abhijit.gangurde@amd.com>

Eliminate the free rq_meta entries. Instead, maintain rq_meta
as a parallel array to rq WQEs, indexed by the WQE index.

Signed-off-by: Abhijit Gangurde <abhijit.gangurde@amd.com>
---
 .../infiniband/hw/ionic/ionic_controlpath.c   | 14 +---
 drivers/infiniband/hw/ionic/ionic_datapath.c  | 64 ++++---------------
 drivers/infiniband/hw/ionic/ionic_fw.h        | 11 +++-
 drivers/infiniband/hw/ionic/ionic_ibdev.h     |  5 --
 4 files changed, 20 insertions(+), 74 deletions(-)

diff --git a/drivers/infiniband/hw/ionic/ionic_controlpath.c b/drivers/infiniband/hw/ionic/ionic_controlpath.c
index a5045c08915e..b82513297b41 100644
--- a/drivers/infiniband/hw/ionic/ionic_controlpath.c
+++ b/drivers/infiniband/hw/ionic/ionic_controlpath.c
@@ -2008,8 +2008,8 @@ static int ionic_rq_init(struct ionic_ibdev *dev, struct ionic_ctx *ctx,
 			 struct ionic_tbl_buf *buf, int max_wr, int max_sge,
 			 int rq_spec, struct ib_udata *udata, int access)
 {
-	int rc = 0, i;
 	u32 wqe_size;
+	int rc = 0;
 
 	rq->cmb_prod = 0;
 	rc = -EINVAL;
@@ -2079,11 +2079,6 @@ static int ionic_rq_init(struct ionic_ibdev *dev, struct ionic_ctx *ctx,
 			rc = -ENOMEM;
 			goto err_rq_meta;
 		}
-
-		for (i = 0; i < rq->q.mask; ++i)
-			rq->meta[i].next = &rq->meta[i + 1];
-		rq->meta[i].next = IONIC_META_LAST;
-		rq->meta_head = &rq->meta[0];
 	}
 
 	ionic_rq_init_cmb(dev, rq, udata);
@@ -2476,7 +2471,6 @@ static void ionic_reset_qp(struct ionic_ibdev *dev, struct ionic_qp *qp)
 {
 	unsigned long irqflags;
 	struct ionic_cq *cq;
-	int i;
 
 	local_irq_save(irqflags);
 
@@ -2510,12 +2504,6 @@ static void ionic_reset_qp(struct ionic_ibdev *dev, struct ionic_qp *qp)
 		qp->rq.flush = false;
 		qp->rq.q.prod = 0;
 		qp->rq.q.cons = 0;
-		if (qp->rq.meta) {
-			for (i = 0; i < qp->rq.q.mask; ++i)
-				qp->rq.meta[i].next = &qp->rq.meta[i + 1];
-			qp->rq.meta[i].next = IONIC_META_LAST;
-		}
-		qp->rq.meta_head = &qp->rq.meta[0];
 		spin_unlock(&qp->rq.lock);
 	}
 
diff --git a/drivers/infiniband/hw/ionic/ionic_datapath.c b/drivers/infiniband/hw/ionic/ionic_datapath.c
index b8fa6b6e5f33..f49ec764f888 100644
--- a/drivers/infiniband/hw/ionic/ionic_datapath.c
+++ b/drivers/infiniband/hw/ionic/ionic_datapath.c
@@ -31,7 +31,6 @@ static bool ionic_next_cqe(struct ionic_ibdev *dev, struct ionic_cq *cq,
 static int ionic_flush_recv(struct ionic_qp *qp, struct ib_wc *wc)
 {
 	struct ionic_rq_meta *meta;
-	struct ionic_v1_wqe *wqe;
 
 	if (!qp->rq.flush)
 		return 0;
@@ -39,25 +38,7 @@ static int ionic_flush_recv(struct ionic_qp *qp, struct ib_wc *wc)
 	if (ionic_queue_empty(&qp->rq.q))
 		return 0;
 
-	wqe = ionic_queue_at_cons(&qp->rq.q);
-
-	/* wqe_id must be a valid queue index */
-	if (unlikely(wqe->base.wqe_id >> qp->rq.q.depth_log2)) {
-		ibdev_warn(qp->ibqp.device,
-			   "flush qp %u recv index %llu invalid\n",
-			   qp->qpid, (unsigned long long)wqe->base.wqe_id);
-		return -EIO;
-	}
-
-	/* wqe_id must indicate a request that is outstanding */
-	meta = &qp->rq.meta[wqe->base.wqe_id];
-	if (unlikely(meta->next != IONIC_META_POSTED)) {
-		ibdev_warn(qp->ibqp.device,
-			   "flush qp %u recv index %llu not posted\n",
-			   qp->qpid, (unsigned long long)wqe->base.wqe_id);
-		return -EIO;
-	}
-
+	meta = &qp->rq.meta[qp->rq.q.cons];
 	ionic_queue_consume(&qp->rq.q);
 
 	memset(wc, 0, sizeof(*wc));
@@ -66,9 +47,6 @@ static int ionic_flush_recv(struct ionic_qp *qp, struct ib_wc *wc)
 	wc->wr_id = meta->wrid;
 	wc->qp = &qp->ibqp;
 
-	meta->next = qp->rq.meta_head;
-	qp->rq.meta_head = meta;
-
 	return 1;
 }
 
@@ -133,8 +111,8 @@ static int ionic_poll_recv(struct ionic_ibdev *dev, struct ionic_cq *cq,
 {
 	struct ionic_qp *qp = NULL;
 	struct ionic_rq_meta *meta;
+	u16 vlan_tag, wqe_idx;
 	u32 src_qpn, st_len;
-	u16 vlan_tag;
 	u8 op;
 
 	if (cqe_qp->rq.flush)
@@ -160,30 +138,17 @@ static int ionic_poll_recv(struct ionic_ibdev *dev, struct ionic_cq *cq,
 		return -EIO;
 	}
 
-	/* wqe_id must be a valid queue index */
-	if (unlikely(cqe->recv.wqe_id >> qp->rq.q.depth_log2)) {
-		ibdev_warn(&dev->ibdev,
-			   "qp %u recv index %llu invalid\n",
-			   qp->qpid, (unsigned long long)cqe->recv.wqe_id);
-		return -EIO;
-	}
-
-	/* wqe_id must indicate a request that is outstanding */
-	meta = &qp->rq.meta[cqe->recv.wqe_id];
-	if (unlikely(meta->next != IONIC_META_POSTED)) {
-		ibdev_warn(&dev->ibdev,
-			   "qp %u recv index %llu not posted\n",
-			   qp->qpid, (unsigned long long)cqe->recv.wqe_id);
+	wqe_idx = le64_to_cpu(cqe->recv.wqe_id) & IONIC_V1_CQE_WQE_IDX_MASK;
+	if (unlikely(wqe_idx != qp->rq.q.cons)) {
+		ibdev_warn(&dev->ibdev, "wqe not next to complete %#x cons %#x prod %#x",
+			   wqe_idx, qp->rq.q.cons, qp->rq.q.prod);
 		return -EIO;
 	}
 
-	meta->next = qp->rq.meta_head;
-	qp->rq.meta_head = meta;
-
+	meta = &qp->rq.meta[wqe_idx];
 	memset(wc, 0, sizeof(*wc));
 
 	wc->wr_id = meta->wrid;
-
 	wc->qp = &cqe_qp->ibqp;
 
 	if (ionic_v1_cqe_error(cqe)) {
@@ -430,7 +395,7 @@ static int ionic_comp_npg(struct ionic_qp *qp, struct ionic_v1_cqe *cqe)
 		return 0;
 	}
 
-	cqe_idx = cqe->send.npg_wqe_id & qp->sq.mask;
+	cqe_idx = le64_to_cpu(cqe->send.npg_wqe_id) & qp->sq.mask;
 	meta = &qp->sq_meta[cqe_idx];
 	meta->local_comp = true;
 
@@ -811,7 +776,7 @@ static void ionic_prep_base(struct ionic_qp *qp,
 	meta->signal = false;
 	meta->local_comp = false;
 
-	wqe->base.wqe_id = qp->sq.prod;
+	wqe->base.wqe_id = cpu_to_le64(qp->sq.prod);
 
 	if (wr->send_flags & IB_SEND_FENCE)
 		wqe->base.flags |= cpu_to_be16(IONIC_V1_FLAG_FENCE);
@@ -1188,11 +1153,7 @@ static int ionic_prep_recv(struct ionic_qp *qp,
 	if (wqe->base.flags & cpu_to_be16(IONIC_V1_FLAG_FENCE))
 		return -EAGAIN;
 
-	meta = qp->rq.meta_head;
-	if (unlikely(meta == IONIC_META_LAST) ||
-	    unlikely(meta == IONIC_META_POSTED))
-		return -EIO;
-
+	meta = &qp->rq.meta[qp->rq.q.prod];
 	ionic_prep_rq_wqe(qp, wqe);
 
 	mval = ionic_v1_recv_wqe_max_sge(qp->rq.q.stride_log2, qp->rq.spec,
@@ -1205,7 +1166,7 @@ static int ionic_prep_recv(struct ionic_qp *qp,
 
 	meta->wrid = wr->wr_id;
 
-	wqe->base.wqe_id = meta - qp->rq.meta;
+	wqe->base.wqe_id = cpu_to_le64(meta - qp->rq.meta);
 	wqe->base.num_sge_key = wr->num_sge;
 
 	/* total length for recv goes in base imm_data_key */
@@ -1213,9 +1174,6 @@ static int ionic_prep_recv(struct ionic_qp *qp,
 
 	ionic_queue_produce(&qp->rq.q);
 
-	qp->rq.meta_head = meta->next;
-	meta->next = IONIC_META_POSTED;
-
 	return 0;
 }
 
diff --git a/drivers/infiniband/hw/ionic/ionic_fw.h b/drivers/infiniband/hw/ionic/ionic_fw.h
index adfbb89d856c..8c0b456e2443 100644
--- a/drivers/infiniband/hw/ionic/ionic_fw.h
+++ b/drivers/infiniband/hw/ionic/ionic_fw.h
@@ -332,7 +332,7 @@ struct ionic_v1_cqe {
 			__le16		old_rq_cq_cindex;
 		} admin;
 		struct {
-			__u64		wqe_id;
+			__le64		wqe_id;
 			__be32		src_qpn_op;
 			__u8		src_mac[6];
 			__be16		vlan_tag;
@@ -342,13 +342,18 @@ struct ionic_v1_cqe {
 			__u8		rsvd[4];
 			__be32		msg_msn;
 			__u8		rsvd2[8];
-			__u64		npg_wqe_id;
+			__le64		npg_wqe_id;
 		} send;
 	};
 	__be32				status_length;
 	__be32				qid_type_flags;
 };
 
+/* bits for cqe wqe_idx */
+enum ionic_v1_cqe_wqe_id_bits {
+	IONIC_V1_CQE_WQE_IDX_MASK	= 0xffff,
+};
+
 /* bits for cqe recv */
 enum ionic_v1_cqe_src_qpn_bits {
 	IONIC_V1_CQE_RECV_QPN_MASK	= 0xffffff,
@@ -423,7 +428,7 @@ static inline u32 ionic_v1_cqe_qtf_qid(u32 qtf)
 
 /* v1 base wqe header */
 struct ionic_v1_base_hdr {
-	__u64				wqe_id;
+	__le64				wqe_id;
 	__u8				op;
 	__u8				num_sge_key;
 	__be16				flags;
diff --git a/drivers/infiniband/hw/ionic/ionic_ibdev.h b/drivers/infiniband/hw/ionic/ionic_ibdev.h
index 872ce4872084..09fea709e45b 100644
--- a/drivers/infiniband/hw/ionic/ionic_ibdev.h
+++ b/drivers/infiniband/hw/ionic/ionic_ibdev.h
@@ -37,9 +37,6 @@
 #define IONIC_SQCMB_ORDER 5
 #define IONIC_RQCMB_ORDER 0
 
-#define IONIC_META_LAST		((void *)1ul)
-#define IONIC_META_POSTED	((void *)2ul)
-
 #define IONIC_CQ_GRACE 100
 
 #define IONIC_ROCE_UDP_SPORT	28272
@@ -236,7 +233,6 @@ struct ionic_sq_meta {
 };
 
 struct ionic_rq_meta {
-	struct ionic_rq_meta	*next;
 	u64			wrid;
 };
 
@@ -252,7 +248,6 @@ struct ionic_rq {
 	struct rdma_user_mmap_entry	*mmap_cmb;
 
 	struct ionic_rq_meta		*meta;
-	struct ionic_rq_meta		*meta_head;
 	struct ib_umem			*umem;
 
 	int				spec;
-- 
2.43.0


  parent reply	other threads:[~2026-07-07  9:56 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-07-07  9:55 [PATCH v3 0/1] cdx: register shutdown callback for cdx controller Abhijit Gangurde
2024-12-03  8:44 ` [PATCH v2 1/2] " Abhijit Gangurde
2024-12-03  8:44   ` [PATCH v2 2/2] cdx: disable cdx bus from bus shutdown callback Abhijit Gangurde
2024-12-10  7:05   ` [PATCH v2 1/2] cdx: register shutdown callback for cdx controller Agarwal, Nikhil
2026-07-07  9:55   ` Abhijit Gangurde
2026-07-07  9:55 ` [PATCH 1/1] RDMA/ionic: Preserve and set Ethernet source MAC after ib_ud_header_init() Abhijit Gangurde
2026-07-07  9:55 ` [PATCH 1/1] RDMA/ionic: Reserve bytes in CQE format for future use Abhijit Gangurde
2026-07-07  9:55 ` [PATCH 1/1] RDMA/ionic: map PHC state into user space Abhijit Gangurde
2026-07-07  9:55 ` Abhijit Gangurde [this message]
2026-07-07  9:55 ` [PATCH v3 1/1] cdx: register shutdown callback for cdx controller Abhijit Gangurde
2026-07-07  9:55 ` [PATCH 1/4] net: ionic: update LIF identity for RDMA SRQ capability Abhijit Gangurde
2026-07-07  9:55 ` [PATCH 2/4] RDMA/ionic: segregate rq related fields from ionic_qp into a new ionic_rq struct Abhijit Gangurde
2026-07-07  9:55 ` [PATCH 3/4] RDMA/ionic: add Shared receive queue (SRQ) support Abhijit Gangurde
2026-07-07  9:55 ` [PATCH 4/4] RDMA/ionic: implement SRQ event handling support Abhijit Gangurde
2026-07-07  9:55 ` [PATCH v3 0/1] cdx: register shutdown callback for cdx controller Abhijit Gangurde
2026-07-07  9:55 ` [PATCH v3 1/1] " Abhijit Gangurde
2026-07-07  9:55 ` [PATCH v99 1/1] One more fix Abhijit Gangurde
2026-07-07 10:06   ` Greg KH
2026-07-07 10:13     ` Abhijit Gangurde
2026-07-07  9:55 ` [PATCH v99 1/1] merge me Abhijit Gangurde
2026-07-07  9:55 ` [PATCH v3 0/1] cdx: register shutdown callback for cdx controller Abhijit Gangurde
2026-07-07  9:55 ` [PATCH v3 1/1] " Abhijit Gangurde
2026-07-07 10:06 ` [PATCH v3 0/1] " Michal Simek

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20260707095555.3939295-5-abhijit.gangurde@amd.com \
    --to=abhijit.gangurde@amd.com \
    --cc=git@amd.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=michal.simek@amd.com \
    --cc=nikhil.agarwal@amd.com \
    --cc=nipun.gupta@amd.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®