Re: [PATCH net-next v2 1/4] selftests/xsk: Introduce helpers for setting UMEM properties

[Maciej Fijalkowski <maciej.fijalkowski@intel.com>]

On Wed, Jun 03, 2026 at 11:33:24AM +0530, Tushar Vyavahare wrote:
> UMEM properties are set via open-coded field assignments in multiple test
> paths, which makes updates noisy and error-prone.
> 
> Introduce two helpers to set UMEM properties through a single interface.
> This keeps setup logic consistent across tests and makes future refactoring
> simpler.
> 
> No functional behavior change is intended.
> 
> Signed-off-by: Magnus Karlsson <magnus.karlsson@intel.com>
> Signed-off-by: Tushar Vyavahare <tushar.vyavahare@intel.com>

Reviewed-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com>

> ---
>  .../selftests/bpf/prog_tests/test_xsk.c       | 36 ++++++++++---------
>  1 file changed, 20 insertions(+), 16 deletions(-)
> 
> diff --git a/tools/testing/selftests/bpf/prog_tests/test_xsk.c b/tools/testing/selftests/bpf/prog_tests/test_xsk.c
> index 7950c504ed28..3369450da974 100644
> --- a/tools/testing/selftests/bpf/prog_tests/test_xsk.c
> +++ b/tools/testing/selftests/bpf/prog_tests/test_xsk.c
> @@ -303,6 +303,18 @@ static void test_spec_reset(struct test_spec *test)
>  	__test_spec_init(test, test->ifobj_tx, test->ifobj_rx);
>  }
>  
> +static void test_spec_set_unaligned(struct test_spec *test)
> +{
> +	test->ifobj_tx->umem->unaligned_mode = true;
> +	test->ifobj_rx->umem->unaligned_mode = true;
> +}
> +
> +static void test_spec_set_frame_size(struct test_spec *test, u32 size)
> +{
> +	test->ifobj_tx->umem->frame_size = size;
> +	test->ifobj_rx->umem->frame_size = size;
> +}
> +
>  static void test_spec_set_xdp_prog(struct test_spec *test, struct bpf_program *xdp_prog_rx,
>  				   struct bpf_program *xdp_prog_tx, struct bpf_map *xskmap_rx,
>  				   struct bpf_map *xskmap_tx)
> @@ -2025,8 +2037,7 @@ int testapp_stats_fill_empty(struct test_spec *test)
>  
>  int testapp_send_receive_unaligned(struct test_spec *test)
>  {
> -	test->ifobj_tx->umem->unaligned_mode = true;
> -	test->ifobj_rx->umem->unaligned_mode = true;
> +	test_spec_set_unaligned(test);
>  	/* Let half of the packets straddle a 4K buffer boundary */
>  	if (pkt_stream_replace_half(test, MIN_PKT_SIZE, -MIN_PKT_SIZE / 2))
>  		return TEST_FAILURE;
> @@ -2037,8 +2048,7 @@ int testapp_send_receive_unaligned(struct test_spec *test)
>  int testapp_send_receive_unaligned_mb(struct test_spec *test)
>  {
>  	test->mtu = MAX_ETH_JUMBO_SIZE;
> -	test->ifobj_tx->umem->unaligned_mode = true;
> -	test->ifobj_rx->umem->unaligned_mode = true;
> +	test_spec_set_unaligned(test);
>  	if (pkt_stream_replace(test, DEFAULT_PKT_CNT, MAX_ETH_JUMBO_SIZE))
>  		return TEST_FAILURE;
>  	return testapp_validate_traffic(test);
> @@ -2337,8 +2347,7 @@ int testapp_send_receive(struct test_spec *test)
>  
>  int testapp_send_receive_2k_frame(struct test_spec *test)
>  {
> -	test->ifobj_tx->umem->frame_size = 2048;
> -	test->ifobj_rx->umem->frame_size = 2048;
> +	test_spec_set_frame_size(test, 2048);
>  	if (pkt_stream_replace(test, DEFAULT_PKT_CNT, MIN_PKT_SIZE))
>  		return TEST_FAILURE;
>  	return testapp_validate_traffic(test);
> @@ -2363,15 +2372,13 @@ int testapp_aligned_inv_desc(struct test_spec *test)
>  
>  int testapp_aligned_inv_desc_2k_frame(struct test_spec *test)
>  {
> -	test->ifobj_tx->umem->frame_size = 2048;
> -	test->ifobj_rx->umem->frame_size = 2048;
> +	test_spec_set_frame_size(test, 2048);
>  	return testapp_invalid_desc(test);
>  }
>  
>  int testapp_unaligned_inv_desc(struct test_spec *test)
>  {
> -	test->ifobj_tx->umem->unaligned_mode = true;
> -	test->ifobj_rx->umem->unaligned_mode = true;
> +	test_spec_set_unaligned(test);
>  	return testapp_invalid_desc(test);
>  }
>  
> @@ -2380,10 +2387,8 @@ int testapp_unaligned_inv_desc_4001_frame(struct test_spec *test)
>  	u64 page_size, umem_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;
> +	test_spec_set_frame_size(test, 4001);
> +	test_spec_set_unaligned(test);
>  	/* This test exists to test descriptors that staddle the end of
>  	 * the UMEM but not a page.
>  	 */
> @@ -2402,8 +2407,7 @@ int testapp_aligned_inv_desc_mb(struct test_spec *test)
>  
>  int testapp_unaligned_inv_desc_mb(struct test_spec *test)
>  {
> -	test->ifobj_tx->umem->unaligned_mode = true;
> -	test->ifobj_rx->umem->unaligned_mode = true;
> +	test_spec_set_unaligned(test);
>  	return testapp_invalid_desc_mb(test);
>  }
>  
> -- 
> 2.43.0
>