Commit 66c54c20 authored by Zijian Zhang's avatar Zijian Zhang Committed by Martin KaFai Lau
Browse files

selftests/bpf: Add txmsg_pass to pull/push/pop in test_sockmap 



Add txmsg_pass to test_txmsg_pull/push/pop. If txmsg_pass is missing,
tx_prog will be NULL, and no program will be attached to the sockmap.
As a result, pull/push/pop are never invoked.

Fixes: 328aa08a ("bpf: Selftests, break down test_sockmap into subtests")
Signed-off-by: default avatarZijian Zhang <zijianzhang@bytedance.com>
Reviewed-by: default avatarJohn Fastabend <john.fastabend@gmail.com>
Link: https://lore.kernel.org/r/20241106222520.527076-2-zijianzhang@bytedance.com


Signed-off-by: default avatarMartin KaFai Lau <martin.lau@kernel.org>
parent ac1bd501

tools/testing/selftests/bpf/test_sockmap.c

+7 −0
Original line number Diff line number Diff line
@@ -1596,11 +1596,13 @@ static void test_txmsg_cork_hangs(int cgrp, struct sockmap_options *opt) 
static void test_txmsg_pull(int cgrp, struct sockmap_options *opt)

{

	/* Test basic start/end */

	txmsg_pass = 1;

	txmsg_start = 1;

	txmsg_end = 2;

	test_send(opt, cgrp);



	/* Test >4k pull */

	txmsg_pass = 1;

	txmsg_start = 4096;

	txmsg_end = 9182;

	test_send_large(opt, cgrp);
@@ -1629,11 +1631,13 @@ static void test_txmsg_pull(int cgrp, struct sockmap_options *opt) 
static void test_txmsg_pop(int cgrp, struct sockmap_options *opt)

{

	/* Test basic pop */

	txmsg_pass = 1;

	txmsg_start_pop = 1;

	txmsg_pop = 2;

	test_send_many(opt, cgrp);



	/* Test pop with >4k */

	txmsg_pass = 1;

	txmsg_start_pop = 4096;

	txmsg_pop = 4096;

	test_send_large(opt, cgrp);
@@ -1662,11 +1666,13 @@ static void test_txmsg_pop(int cgrp, struct sockmap_options *opt) 
static void test_txmsg_push(int cgrp, struct sockmap_options *opt)

{

	/* Test basic push */

	txmsg_pass = 1;

	txmsg_start_push = 1;

	txmsg_end_push = 1;

	test_send(opt, cgrp);



	/* Test push 4kB >4k */

	txmsg_pass = 1;

	txmsg_start_push = 4096;

	txmsg_end_push = 4096;

	test_send_large(opt, cgrp);
@@ -1687,6 +1693,7 @@ static void test_txmsg_push(int cgrp, struct sockmap_options *opt) 


static void test_txmsg_push_pop(int cgrp, struct sockmap_options *opt)

{

	txmsg_pass = 1;

	txmsg_start_push = 1;

	txmsg_end_push = 10;

	txmsg_start_pop = 5;