[bpf-next,12/12] xsk: use struct_size() helper

Message ID	1575878189-31860-13-git-send-email-magnus.karlsson@intel.com
State	Changes Requested
Delegated to:	BPF Maintainers
Headers	show Return-Path: <bpf-owner@vger.kernel.org> From: Magnus Karlsson <magnus.karlsson@intel.com> To: magnus.karlsson@intel.com, bjorn.topel@intel.com, ast@kernel.org, daniel@iogearbox.net, netdev@vger.kernel.org, jonathan.lemon@gmail.com Cc: bpf@vger.kernel.org, saeedm@mellanox.com, jeffrey.t.kirsher@intel.com, maciej.fijalkowski@intel.com, maciejromanfijalkowski@gmail.com Subject: [PATCH bpf-next 12/12] xsk: use struct_size() helper Date: Mon, 9 Dec 2019 08:56:29 +0100 Message-Id: <1575878189-31860-13-git-send-email-magnus.karlsson@intel.com> In-Reply-To: <1575878189-31860-1-git-send-email-magnus.karlsson@intel.com> References: <1575878189-31860-1-git-send-email-magnus.karlsson@intel.com> Sender: bpf-owner@vger.kernel.org Precedence: bulk
Series	xsk: clean up ring access functions \| expand [bpf-next,00/12] xsk: clean up ring access functions [bpf-next,01/12] xsk: eliminate the lazy update threshold [bpf-next,02/12] xsk: consolidate to one single cached producer pointer [bpf-next,03/12] xsk: standardize naming of producer ring access functions [bpf-next,04/12] xsk: simplify detection of empty and full rings [bpf-next,05/12] xsk: eliminate the RX batch size [bpf-next,06/12] xsk: simplify xskq_nb_avail and xskq_nb_free [bpf-next,07/12] xsk: simplify the consumer ring access functions [bpf-next,08/12] xsk: change names of validation functions [bpf-next,09/12] xsk: ixgbe: i40e: ice: mlx5: xsk_umem_discard_addr to xsk_umem_release_addr [bpf-next,10/12] xsk: remove unnecessary READ_ONCE of data [bpf-next,11/12] xsk: add function naming comments and reorder functions [bpf-next,12/12] xsk: use struct_size() helper

Message ID

1575878189-31860-13-git-send-email-magnus.karlsson@intel.com

State

Changes Requested

Delegated to:

BPF Maintainers

Headers

From: Magnus Karlsson <magnus.karlsson@intel.com>
To: magnus.karlsson@intel.com, bjorn.topel@intel.com, ast@kernel.org,
	daniel@iogearbox.net, netdev@vger.kernel.org, jonathan.lemon@gmail.com
Cc: bpf@vger.kernel.org, saeedm@mellanox.com,
	jeffrey.t.kirsher@intel.com, maciej.fijalkowski@intel.com,
	maciejromanfijalkowski@gmail.com
Subject: [PATCH bpf-next 12/12] xsk: use struct_size() helper
Date: Mon,  9 Dec 2019 08:56:29 +0100
Message-Id: <1575878189-31860-13-git-send-email-magnus.karlsson@intel.com>
In-Reply-To: <1575878189-31860-1-git-send-email-magnus.karlsson@intel.com>
References: <1575878189-31860-1-git-send-email-magnus.karlsson@intel.com>
Sender: bpf-owner@vger.kernel.org
Precedence: bulk

Series

xsk: clean up ring access functions | expand

Commit Message

Magnus Karlsson Dec. 9, 2019, 7:56 a.m. UTC

Improve readability and maintainability by using the struct_size()
helper when allocating the AF_XDP rings.

Signed-off-by: Magnus Karlsson <magnus.karlsson@intel.com>
---
 net/xdp/xsk_queue.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/net/xdp/xsk_queue.c b/net/xdp/xsk_queue.c
index b665045..c90e9c1 100644
--- a/net/xdp/xsk_queue.c
+++ b/net/xdp/xsk_queue.c
@@ -18,14 +18,14 @@  void xskq_set_umem(struct xsk_queue *q, u64 size, u64 chunk_mask)
 	q->chunk_mask = chunk_mask;
 }
 
-static u32 xskq_umem_get_ring_size(struct xsk_queue *q)
+static size_t xskq_get_ring_size(struct xsk_queue *q, bool umem_queue)
 {
-	return sizeof(struct xdp_umem_ring) + q->nentries * sizeof(u64);
-}
+	struct xdp_umem_ring *umem_ring;
+	struct xdp_rxtx_ring *rxtx_ring;
 
-static u32 xskq_rxtx_get_ring_size(struct xsk_queue *q)
-{
-	return sizeof(struct xdp_ring) + q->nentries * sizeof(struct xdp_desc);
+	if (umem_queue)
+		return struct_size(umem_ring, desc, q->nentries);
+	return struct_size(rxtx_ring, desc, q->nentries);
 }
 
 struct xsk_queue *xskq_create(u32 nentries, bool umem_queue)
@@ -43,8 +43,7 @@  struct xsk_queue *xskq_create(u32 nentries, bool umem_queue)
 
 	gfp_flags = GFP_KERNEL | __GFP_ZERO | __GFP_NOWARN |
 		    __GFP_COMP  | __GFP_NORETRY;
-	size = umem_queue ? xskq_umem_get_ring_size(q) :
-	       xskq_rxtx_get_ring_size(q);
+	size = xskq_get_ring_size(q, umem_queue);
 
 	q->ring = (struct xdp_ring *)__get_free_pages(gfp_flags,
 						      get_order(size));

[bpf-next,12/12] xsk: use struct_size() helper

Commit Message

Patch