All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH v3 1/1] RDMA/rxe: Avoid -Wflex-array-member-not-at-end warnings
@ 2025-12-23  4:41 Zhu Yanjun
  2025-12-23  5:03 ` Gustavo A. R. Silva
  2025-12-23  9:34 ` Gustavo A. R. Silva
  0 siblings, 2 replies; 20+ messages in thread
From: Zhu Yanjun @ 2025-12-23  4:41 UTC (permalink / raw)
  To: zyjzyj2000, jgg, leon, linux-rdma, linux-kernel
  Cc: Gustavo A. R. Silva, Zhu Yanjun

From: "Gustavo A. R. Silva" <gustavoars@kernel.org>

-Wflex-array-member-not-at-end was introduced in GCC-14, and we are
getting ready to enable it, globally.

Use the new TRAILING_OVERLAP() helper to fix the following warning:

21 drivers/infiniband/sw/rxe/rxe_verbs.h:271:33: warning: structure containing a flexible array member is not at the end of another structure [-Wflex-array-member-not-at-end]

This helper creates a union between a flexible-array member (FAM) and a
set of MEMBERS that would otherwise follow it.

This overlays the trailing MEMBER struct ib_sge sge[RXE_MAX_SGE]; onto
the FAM struct rxe_recv_wqe::dma.sge, while keeping the FAM and the
start of MEMBER aligned.

The static_assert() ensures this alignment remains, and it's
intentionally placed inmediately after the related structure --no
blank line in between.

Lastly, move the conflicting declaration struct rxe_resp_info resp;
to the end of the corresponding structure.

Reviewed-by: Zhu Yanjun <yanjun.zhu@linux.dev>
Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
---
V2->V3: Replace struct ib_sge with struct rxe_sge
---
 drivers/infiniband/sw/rxe/rxe_verbs.h | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/drivers/infiniband/sw/rxe/rxe_verbs.h b/drivers/infiniband/sw/rxe/rxe_verbs.h
index fd48075810dd..3ffd7be8e7b1 100644
--- a/drivers/infiniband/sw/rxe/rxe_verbs.h
+++ b/drivers/infiniband/sw/rxe/rxe_verbs.h
@@ -219,12 +219,6 @@ struct rxe_resp_info {
 	u32			rkey;
 	u32			length;
 
-	/* SRQ only */
-	struct {
-		struct rxe_recv_wqe	wqe;
-		struct ib_sge		sge[RXE_MAX_SGE];
-	} srq_wqe;
-
 	/* Responder resources. It's a circular list where the oldest
 	 * resource is dropped first.
 	 */
@@ -232,7 +226,15 @@ struct rxe_resp_info {
 	unsigned int		res_head;
 	unsigned int		res_tail;
 	struct resp_res		*res;
+
+	/* SRQ only */
+	/* Must be last as it ends in a flexible-array member. */
+	TRAILING_OVERLAP(struct rxe_recv_wqe, wqe, dma.sge,
+		struct rxe_sge		sge[RXE_MAX_SGE];
+	) srq_wqe;
 };
+static_assert(offsetof(struct rxe_resp_info, srq_wqe.wqe.dma.sge) ==
+	      offsetof(struct rxe_resp_info, srq_wqe.sge));
 
 struct rxe_qp {
 	struct ib_qp		ibqp;
@@ -269,7 +271,6 @@ struct rxe_qp {
 
 	struct rxe_req_info	req;
 	struct rxe_comp_info	comp;
-	struct rxe_resp_info	resp;
 
 	atomic_t		ssn;
 	atomic_t		skb_out;
@@ -289,6 +290,9 @@ struct rxe_qp {
 	spinlock_t		state_lock; /* guard requester and completer */
 
 	struct execute_work	cleanup_work;
+
+	/* Must be last as it ends in a flexible-array member. */
+	struct rxe_resp_info	resp;
 };
 
 enum {
-- 
2.39.5


^ permalink raw reply related	[flat|nested] 20+ messages in thread

end of thread, other threads:[~2025-12-24  8:33 UTC | newest]

Thread overview: 20+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-12-23  4:41 [PATCH v3 1/1] RDMA/rxe: Avoid -Wflex-array-member-not-at-end warnings Zhu Yanjun
2025-12-23  5:03 ` Gustavo A. R. Silva
2025-12-23  5:10   ` Zhu Yanjun
2025-12-23  5:18     ` Gustavo A. R. Silva
2025-12-23  5:26       ` Zhu Yanjun
2025-12-23  5:34         ` Gustavo A. R. Silva
2025-12-23  5:44           ` Zhu Yanjun
2025-12-23  5:54             ` Gustavo A. R. Silva
2025-12-23  6:46               ` Zhu Yanjun
2025-12-23  9:28                 ` Gustavo A. R. Silva
2025-12-23 16:02                   ` Zhu Yanjun
2025-12-23 14:20     ` Leon Romanovsky
2025-12-23 16:13       ` Zhu Yanjun
2025-12-23  9:34 ` Gustavo A. R. Silva
2025-12-23 16:38   ` Greg Sword
2025-12-23 16:59     ` Gustavo A. R. Silva
2025-12-23 17:19       ` Greg Sword
2025-12-23 17:26         ` Gustavo A. R. Silva
2025-12-24  6:51           ` Leon Romanovsky
2025-12-24  8:32             ` Gustavo A. R. Silva

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.