xsk: Use struct_size() helper (1d9cb1f3) · Commits · 戴 / test

net/xdp/xsk_queue.c

+7 −8

Original line number	Diff line number	Diff line
		@@ -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));