Commit 46e43786 authored by Tushar Vyavahare's avatar Tushar Vyavahare Committed by Daniel Borkmann
Browse files

selftests/xsk: Remove unnecessary parameter from pkt_set() function call 



The pkt_set() function no longer needs the umem parameter. This commit
removes the umem parameter from the pkt_set() function.

Signed-off-by: default avatarTushar Vyavahare <tushar.vyavahare@intel.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Acked-by: default avatarMagnus Karlsson <magnus.karlsson@intel.com>
Link: https://lore.kernel.org/bpf/20230927135241.2287547-6-tushar.vyavahare@intel.com
parent 8913e653

tools/testing/selftests/bpf/xskxceiver.c

+11 −16
Original line number Diff line number Diff line
@@ -651,7 +651,7 @@ static u32 pkt_get_buffer_len(struct xsk_umem_info *umem, u32 len) 
	return ceil_u32(len, umem->frame_size) * umem->frame_size;

}



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

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

{

	struct pkt_stream *pkt_stream;

	u32 i;
@@ -672,30 +672,28 @@ static struct pkt_stream *pkt_stream_generate(struct xsk_umem_info *umem, u32 nb 
	return pkt_stream;

}



static struct pkt_stream *pkt_stream_clone(struct xsk_umem_info *umem,

					   struct pkt_stream *pkt_stream)

static struct pkt_stream *pkt_stream_clone(struct pkt_stream *pkt_stream)

{

	return pkt_stream_generate(umem, pkt_stream->nb_pkts, pkt_stream->pkts[0].len);

	return pkt_stream_generate(pkt_stream->nb_pkts, pkt_stream->pkts[0].len);

}



static void pkt_stream_replace(struct test_spec *test, u32 nb_pkts, u32 pkt_len)

{

	struct pkt_stream *pkt_stream;



	pkt_stream = pkt_stream_generate(test->ifobj_tx->umem, nb_pkts, pkt_len);

	pkt_stream = pkt_stream_generate(nb_pkts, pkt_len);

	test->ifobj_tx->xsk->pkt_stream = pkt_stream;

	pkt_stream = pkt_stream_generate(test->ifobj_rx->umem, nb_pkts, pkt_len);

	pkt_stream = pkt_stream_generate(nb_pkts, pkt_len);

	test->ifobj_rx->xsk->pkt_stream = pkt_stream;

}



static void __pkt_stream_replace_half(struct ifobject *ifobj, u32 pkt_len,

				      int offset)

{

	struct xsk_umem_info *umem = ifobj->umem;

	struct pkt_stream *pkt_stream;

	u32 i;



	pkt_stream = pkt_stream_clone(umem, ifobj->xsk->pkt_stream);

	pkt_stream = pkt_stream_clone(ifobj->xsk->pkt_stream);

	for (i = 1; i < ifobj->xsk->pkt_stream->nb_pkts; i += 2)

		pkt_set(pkt_stream, &pkt_stream->pkts[i], offset, pkt_len);
@@ -711,11 +709,10 @@ static void pkt_stream_replace_half(struct test_spec *test, u32 pkt_len, int off 


static void pkt_stream_receive_half(struct test_spec *test)

{

	struct xsk_umem_info *umem = test->ifobj_rx->umem;

	struct pkt_stream *pkt_stream = test->ifobj_tx->xsk->pkt_stream;

	u32 i;



	test->ifobj_rx->xsk->pkt_stream = pkt_stream_generate(umem, pkt_stream->nb_pkts,

	test->ifobj_rx->xsk->pkt_stream = pkt_stream_generate(pkt_stream->nb_pkts,

							      pkt_stream->pkts[0].len);

	pkt_stream = test->ifobj_rx->xsk->pkt_stream;

	for (i = 1; i < pkt_stream->nb_pkts; i += 2)
@@ -1918,8 +1915,7 @@ static int testapp_stats_tx_invalid_descs(struct test_spec *test) 
static int testapp_stats_rx_full(struct test_spec *test)

{

	pkt_stream_replace(test, DEFAULT_UMEM_BUFFERS + DEFAULT_UMEM_BUFFERS / 2, MIN_PKT_SIZE);

	test->ifobj_rx->xsk->pkt_stream = pkt_stream_generate(test->ifobj_rx->umem,

							      DEFAULT_UMEM_BUFFERS, MIN_PKT_SIZE);

	test->ifobj_rx->xsk->pkt_stream = pkt_stream_generate(DEFAULT_UMEM_BUFFERS, MIN_PKT_SIZE);



	test->ifobj_rx->xsk->rxqsize = DEFAULT_UMEM_BUFFERS;

	test->ifobj_rx->release_rx = false;
@@ -1930,8 +1926,7 @@ static int testapp_stats_rx_full(struct test_spec *test) 
static int testapp_stats_fill_empty(struct test_spec *test)

{

	pkt_stream_replace(test, DEFAULT_UMEM_BUFFERS + DEFAULT_UMEM_BUFFERS / 2, MIN_PKT_SIZE);

	test->ifobj_rx->xsk->pkt_stream = pkt_stream_generate(test->ifobj_rx->umem,

							      DEFAULT_UMEM_BUFFERS, MIN_PKT_SIZE);

	test->ifobj_rx->xsk->pkt_stream = pkt_stream_generate(DEFAULT_UMEM_BUFFERS, MIN_PKT_SIZE);



	test->ifobj_rx->use_fill_ring = false;

	test->ifobj_rx->validation_func = validate_fill_empty;
@@ -2467,8 +2462,8 @@ int main(int argc, char **argv) 
	init_iface(ifobj_tx, worker_testapp_validate_tx);



	test_spec_init(&test, ifobj_tx, ifobj_rx, 0, &tests[0]);

	tx_pkt_stream_default = pkt_stream_generate(ifobj_tx->umem, DEFAULT_PKT_CNT, MIN_PKT_SIZE);

	rx_pkt_stream_default = pkt_stream_generate(ifobj_rx->umem, DEFAULT_PKT_CNT, MIN_PKT_SIZE);

	tx_pkt_stream_default = pkt_stream_generate(DEFAULT_PKT_CNT, MIN_PKT_SIZE);

	rx_pkt_stream_default = pkt_stream_generate(DEFAULT_PKT_CNT, MIN_PKT_SIZE);

	if (!tx_pkt_stream_default || !rx_pkt_stream_default)

		exit_with_error(ENOMEM);

	test.tx_pkt_stream_default = tx_pkt_stream_default;