libbpf: fix XDP socket ring buffer memory ordering (d5e63fdd) · Commits · 戴 / test

The ring buffer code of XDP sockets is missing a memory barrier on the consumer side between the load of the data and the write that signals that it is ok for the producer to put new data into the buffer. On architectures that does not guarantee that stores are not reordered with older loads, the producer might put data into the ring before the consumer had the chance to read it. As IA does guarantee this ordering, it would only need a compiler barrier here, but there are no primitives in barrier.h for this specific case (hinder writes to be ordered before older reads) so I had to add a smp_mb() here which will translate into a run-time synch operation on IA. Signed-off-by:

Magnus Karlsson <magnus.karlsson@intel.com> Signed-off-by:

Alexei Starovoitov <ast@kernel.org>

tools/lib/bpf/xsk.h

+11 −2

Original line number	Diff line number	Diff line
		@@ -36,6 +36,10 @@ struct name { \
		DEFINE_XSK_RING(xsk_ring_prod);
		DEFINE_XSK_RING(xsk_ring_cons);

		/* For a detailed explanation on the memory barriers associated with the
		* ring, please take a look at net/xdp/xsk_queue.h.
		*/

		struct xsk_umem;
		struct xsk_socket;

		@@ -116,8 +120,8 @@ static inline size_t xsk_ring_prod__reserve(struct xsk_ring_prod *prod,

		static inline void xsk_ring_prod__submit(struct xsk_ring_prod *prod, size_t nb)
		{
		/* Make sure everything has been written to the ring before signalling
		* this to the kernel.
		/* Make sure everything has been written to the ring before indicating
		* this to the kernel by writing the producer pointer.
		*/
		smp_wmb();

		@@ -144,6 +148,11 @@ static inline size_t xsk_ring_cons__peek(struct xsk_ring_cons *cons,

		static inline void xsk_ring_cons__release(struct xsk_ring_cons *cons, size_t nb)
		{
		/* Make sure data has been read before indicating we are done
		* with the entries by updating the consumer pointer.
		*/
		smp_mb();

		*cons->consumer += nb;
		}

Admin message