Commit 83f4ae2f authored by Magnus Karlsson's avatar Magnus Karlsson Committed by Daniel Borkmann
Browse files

selftests: xsk: Move num_frames and frame_headroom to xsk_umem_info 



Move the global variables num_frames and frame_headroom to struct
xsk_umem_info. They describe properties of the umem so no reason for
them to be global.

Signed-off-by: default avatarMagnus Karlsson <magnus.karlsson@intel.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Acked-by: default avatarMaciej Fijalkowski <maciej.fijalkowski@intel.com>
Link: https://lore.kernel.org/bpf/20210907071928.9750-5-magnus.karlsson@gmail.com
parent ce74acaf

tools/testing/selftests/bpf/xdpxceiver.c

+10 −10
Original line number Diff line number Diff line
@@ -241,7 +241,7 @@ static int xsk_configure_umem(struct xsk_umem_info *umem, void *buffer, u64 size 
		.fill_size = XSK_RING_PROD__DEFAULT_NUM_DESCS,

		.comp_size = XSK_RING_CONS__DEFAULT_NUM_DESCS,

		.frame_size = XSK_UMEM__DEFAULT_FRAME_SIZE,

		.frame_headroom = frame_headroom,

		.frame_headroom = umem->frame_headroom,

		.flags = XSK_UMEM__DEFAULT_FLAGS

	};

	int ret;
@@ -406,6 +406,7 @@ static void __test_spec_init(struct test_spec *test, struct ifobject *ifobj_tx, 
		for (j = 0; j < MAX_SOCKETS; j++) {

			memset(&ifobj->umem_arr[j], 0, sizeof(ifobj->umem_arr[j]));

			memset(&ifobj->xsk_arr[j], 0, sizeof(ifobj->xsk_arr[j]));

			ifobj->umem_arr[j].num_frames = DEFAULT_PKT_CNT / 4;

		}

	}
@@ -433,7 +434,7 @@ static struct pkt *pkt_stream_get_pkt(struct pkt_stream *pkt_stream, u32 pkt_nb) 
	return &pkt_stream->pkts[pkt_nb];

}



static struct pkt_stream *pkt_stream_generate(u32 nb_pkts, u32 pkt_len)

static struct pkt_stream *pkt_stream_generate(struct xsk_umem_info *umem, u32 nb_pkts, u32 pkt_len)

{

	struct pkt_stream *pkt_stream;

	u32 i;
@@ -448,7 +449,7 @@ static struct pkt_stream *pkt_stream_generate(u32 nb_pkts, u32 pkt_len) 


	pkt_stream->nb_pkts = nb_pkts;

	for (i = 0; i < nb_pkts; i++) {

		pkt_stream->pkts[i].addr = (i % num_frames) * XSK_UMEM__DEFAULT_FRAME_SIZE;

		pkt_stream->pkts[i].addr = (i % umem->num_frames) * XSK_UMEM__DEFAULT_FRAME_SIZE;

		pkt_stream->pkts[i].len = pkt_len;

		pkt_stream->pkts[i].payload = i;

	}
@@ -766,7 +767,7 @@ static void tx_stats_validate(struct ifobject *ifobject) 


static void thread_common_ops(struct ifobject *ifobject, void *bufs)

{

	u64 umem_sz = num_frames * XSK_UMEM__DEFAULT_FRAME_SIZE;

	u64 umem_sz = ifobject->umem->num_frames * XSK_UMEM__DEFAULT_FRAME_SIZE;

	int mmap_flags = MAP_PRIVATE | MAP_ANONYMOUS | MAP_NORESERVE;

	size_t mmap_sz = umem_sz;

	int ctr = 0, ret;
@@ -885,9 +886,10 @@ static void testapp_validate_traffic(struct test_spec *test) 
		exit_with_error(errno);



	if (stat_test_type == STAT_TEST_TX_INVALID)

		pkt_stream = pkt_stream_generate(DEFAULT_PKT_CNT, XSK_UMEM__INVALID_FRAME_SIZE);

		pkt_stream = pkt_stream_generate(test->ifobj_tx->umem, DEFAULT_PKT_CNT,

						 XSK_UMEM__INVALID_FRAME_SIZE);

	else

		pkt_stream = pkt_stream_generate(DEFAULT_PKT_CNT, PKT_SIZE);

		pkt_stream = pkt_stream_generate(test->ifobj_tx->umem, DEFAULT_PKT_CNT, PKT_SIZE);

	ifobj_tx->pkt_stream = pkt_stream;

	ifobj_rx->pkt_stream = pkt_stream;
@@ -988,11 +990,10 @@ static void testapp_stats(struct test_spec *test) 


		/* reset defaults */

		rxqsize = XSK_RING_CONS__DEFAULT_NUM_DESCS;

		frame_headroom = XSK_UMEM__DEFAULT_FRAME_HEADROOM;



		switch (stat_test_type) {

		case STAT_TEST_RX_DROPPED:

			frame_headroom = XSK_UMEM__DEFAULT_FRAME_SIZE -

			test->ifobj_rx->umem->frame_headroom = XSK_UMEM__DEFAULT_FRAME_SIZE -

				XDP_PACKET_HEADROOM - 1;

			break;

		case STAT_TEST_RX_FULL:
@@ -1040,7 +1041,6 @@ static void run_pkt_test(struct test_spec *test, int mode, int type) 
	second_step = 0;

	stat_test_type = -1;

	rxqsize = XSK_RING_CONS__DEFAULT_NUM_DESCS;

	frame_headroom = XSK_UMEM__DEFAULT_FRAME_HEADROOM;



	configured_mode = mode;

tools/testing/selftests/bpf/xdpxceiver.h

+2 −2
Original line number Diff line number Diff line
@@ -71,7 +71,6 @@ enum stat_test_type { 


static int configured_mode;

static bool opt_pkt_dump;

static u32 num_frames = DEFAULT_PKT_CNT / 4;

static bool second_step;

static int test_type;
@@ -81,12 +80,13 @@ static u32 xdp_flags = XDP_FLAGS_UPDATE_IF_NOEXIST; 
static u32 xdp_bind_flags = XDP_USE_NEED_WAKEUP | XDP_COPY;

static int stat_test_type;

static u32 rxqsize;

static u32 frame_headroom;



struct xsk_umem_info {

	struct xsk_ring_prod fq;

	struct xsk_ring_cons cq;

	struct xsk_umem *umem;

	u32 num_frames;

	u32 frame_headroom;

	void *buffer;

};