Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-17 02:15:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

xsk: Use struct_size() helper

Browse Source 
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>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/1576759171-28550-13-git-send-email-magnus.karlsson@intel.com
This commit is contained in:
Magnus Karlsson 2019-12-19 13:39:31 +01:00 committed by Alexei Starovoitov
parent 15d8c9162c
commit 1d9cb1f381
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
net/xdp/xsk_queue.c
View File

@ -18,14 +18,14 @@ void xskq_set_umem(struct xsk_queue *q, u64 size, u64 chunk_mask)
q->chunk_mask = 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) if (umem_queue)
{ return struct_size(umem_ring, desc, q->nentries);
return sizeof(struct xdp_ring) + q->nentries * sizeof(struct xdp_desc); return struct_size(rxtx_ring, desc, q->nentries);
} }
struct xsk_queue *xskq_create(u32 nentries, bool umem_queue) 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_flags = GFP_KERNEL | __GFP_ZERO | __GFP_NOWARN |
__GFP_COMP | __GFP_NORETRY; __GFP_COMP | __GFP_NORETRY;
size = umem_queue ? xskq_umem_get_ring_size(q) : size = xskq_get_ring_size(q, umem_queue);
xskq_rxtx_get_ring_size(q);
q->ring = (struct xdp_ring *)__get_free_pages(gfp_flags, q->ring = (struct xdp_ring *)__get_free_pages(gfp_flags,
get_order(size)); get_order(size));