Commit a5f1da66 authored by Martin KaFai Lau's avatar Martin KaFai Lau
Browse files

Merge branch 'xsk: Fix unaligned descriptor validation' 

Kal Conley says:

====================

This patchset includes the test with the bugfix as requested here:
https://lore.kernel.org/all/f1a32d5a-03e7-fce1-f5a5-6095f365f0a9@linux.dev/



Patch #1 (the bugfix) is identical to the previous submission except
that I improved the commit message slightly.

Magnus: I improved the test code a little different than you asked
since I thought this was a little simpler than having a separate
function for now. Hopefully, you can live with this :-).
====================

Signed-off-by: default avatarMartin KaFai Lau <martin.lau@kernel.org>
parents 34bf9347 c0801598

include/net/xsk_buff_pool.h

+2 −7
Original line number Diff line number Diff line
@@ -180,13 +180,8 @@ static inline bool xp_desc_crosses_non_contig_pg(struct xsk_buff_pool *pool, 
	if (likely(!cross_pg))

		return false;



	if (pool->dma_pages_cnt) {

		return !(pool->dma_pages[addr >> PAGE_SHIFT] &

			 XSK_NEXT_PG_CONTIG_MASK);

	}



	/* skb path */

	return addr + len > pool->addrs_cnt;

	return pool->dma_pages_cnt &&

	       !(pool->dma_pages[addr >> PAGE_SHIFT] & XSK_NEXT_PG_CONTIG_MASK);

}



static inline u64 xp_aligned_extract_addr(struct xsk_buff_pool *pool, u64 addr)

net/xdp/xsk_queue.h

+1 −0
Original line number Diff line number Diff line
@@ -162,6 +162,7 @@ static inline bool xp_unaligned_validate_desc(struct xsk_buff_pool *pool, 
		return false;



	if (base_addr >= pool->addrs_cnt || addr >= pool->addrs_cnt ||

	    addr + desc->len > pool->addrs_cnt ||

	    xp_desc_crosses_non_contig_pg(pool, addr, desc->len))

		return false;

tools/testing/selftests/bpf/xskxceiver.c

+24 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ 
 */



#define _GNU_SOURCE

#include <assert.h>

#include <fcntl.h>

#include <errno.h>

#include <getopt.h>
@@ -1876,6 +1877,29 @@ static void run_pkt_test(struct test_spec *test, enum test_mode mode, enum test_ 
		test->ifobj_rx->umem->unaligned_mode = true;

		testapp_invalid_desc(test);

		break;

	case TEST_TYPE_UNALIGNED_INV_DESC_4K1_FRAME: {

		u64 page_size, umem_size;



		if (!hugepages_present(test->ifobj_tx)) {

			ksft_test_result_skip("No 2M huge pages present.\n");

			return;

		}

		test_spec_set_name(test, "UNALIGNED_INV_DESC_4K1_FRAME_SIZE");

		/* Odd frame size so the UMEM doesn't end near a page boundary. */

		test->ifobj_tx->umem->frame_size = 4001;

		test->ifobj_rx->umem->frame_size = 4001;

		test->ifobj_tx->umem->unaligned_mode = true;

		test->ifobj_rx->umem->unaligned_mode = true;

		/* This test exists to test descriptors that staddle the end of

		 * the UMEM but not a page.

		 */

		page_size = sysconf(_SC_PAGESIZE);

		umem_size = test->ifobj_tx->umem->num_frames * test->ifobj_tx->umem->frame_size;

		assert(umem_size % page_size > PKT_SIZE);

		assert(umem_size % page_size < page_size - PKT_SIZE);

		testapp_invalid_desc(test);

		break;

	}

	case TEST_TYPE_UNALIGNED:

		if (!testapp_unaligned(test))

			return;

tools/testing/selftests/bpf/xskxceiver.h

+1 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ enum test_type { 
	TEST_TYPE_ALIGNED_INV_DESC,

	TEST_TYPE_ALIGNED_INV_DESC_2K_FRAME,

	TEST_TYPE_UNALIGNED_INV_DESC,

	TEST_TYPE_UNALIGNED_INV_DESC_4K1_FRAME,

	TEST_TYPE_HEADROOM,

	TEST_TYPE_TEARDOWN,

	TEST_TYPE_BIDI,