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

selftests: xsk: Make frame_size configurable 



Make the frame size configurable instead of it being hard coded to a
default. This is a property of the umem and will make it possible to
implement tests for different umem frame sizes in a later patch.

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-7-magnus.karlsson@gmail.com
parent 4bf8ee65

tools/testing/selftests/bpf/xdpxceiver.c

+6 −5
Original line number Diff line number Diff line
@@ -240,7 +240,7 @@ static int xsk_configure_umem(struct xsk_umem_info *umem, void *buffer, u64 size 
	struct xsk_umem_config cfg = {

		.fill_size = XSK_RING_PROD__DEFAULT_NUM_DESCS,

		.comp_size = XSK_RING_CONS__DEFAULT_NUM_DESCS,

		.frame_size = XSK_UMEM__DEFAULT_FRAME_SIZE,

		.frame_size = umem->frame_size,

		.frame_headroom = umem->frame_headroom,

		.flags = XSK_UMEM__DEFAULT_FLAGS

	};
@@ -264,7 +264,7 @@ static void xsk_populate_fill_ring(struct xsk_umem_info *umem) 
	if (ret != XSK_RING_PROD__DEFAULT_NUM_DESCS)

		exit_with_error(-ret);

	for (i = 0; i < XSK_RING_PROD__DEFAULT_NUM_DESCS; i++)

		*xsk_ring_prod__fill_addr(&umem->fq, idx++) = i * XSK_UMEM__DEFAULT_FRAME_SIZE;

		*xsk_ring_prod__fill_addr(&umem->fq, idx++) = i * umem->frame_size;

	xsk_ring_prod__submit(&umem->fq, XSK_RING_PROD__DEFAULT_NUM_DESCS);

}
@@ -407,6 +407,7 @@ static void __test_spec_init(struct test_spec *test, struct ifobject *ifobj_tx, 
			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;

			ifobj->umem_arr[j].frame_size = XSK_UMEM__DEFAULT_FRAME_SIZE;

			ifobj->xsk_arr[j].rxqsize = XSK_RING_CONS__DEFAULT_NUM_DESCS;

		}

	}
@@ -450,7 +451,7 @@ static struct pkt_stream *pkt_stream_generate(struct xsk_umem_info *umem, u32 nb 


	pkt_stream->nb_pkts = nb_pkts;

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

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

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

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

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

	}
@@ -768,7 +769,7 @@ static void tx_stats_validate(struct ifobject *ifobject) 


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

{

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

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

	int mmap_flags = MAP_PRIVATE | MAP_ANONYMOUS | MAP_NORESERVE;

	size_t mmap_sz = umem_sz;

	int ctr = 0, ret;
@@ -991,7 +992,7 @@ static void testapp_stats(struct test_spec *test) 


		switch (stat_test_type) {

		case STAT_TEST_RX_DROPPED:

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

			test->ifobj_rx->umem->frame_headroom = test->ifobj_rx->umem->frame_size -

				XDP_PACKET_HEADROOM - 1;

			break;

		case STAT_TEST_RX_FULL:

tools/testing/selftests/bpf/xdpxceiver.h

+1 −0
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ struct xsk_umem_info { 
	u32 num_frames;

	u32 frame_headroom;

	void *buffer;

	u32 frame_size;

};



struct xsk_socket_info {