diff mbox series

[bpf,v2,2/2] selftests: bpf: add test for skb_load_bytes

Message ID 20220413062131.363740-3-liujian56@huawei.com (mailing list archive)
State Superseded
Delegated to: BPF
Headers show
Series Enlarge offset check value in bpf_skb_load_bytes | expand

Checks

Context Check Description
bpf/vmtest-bpf-VM_Test-1 fail Logs for Kernel LATEST on ubuntu-latest + selftests
netdev/tree_selection success Clearly marked for bpf, async
netdev/fixes_present success Fixes tag present in non-next series
netdev/subject_prefix success Link
netdev/cover_letter success Series has a cover letter
netdev/patch_count success Link
netdev/header_inline success No static functions without inline keyword in header files
netdev/build_32bit success Errors and warnings before: 0 this patch: 0
netdev/cc_maintainers warning 2 maintainers not CCed: linux-kselftest@vger.kernel.org shuah@kernel.org
netdev/build_clang success Errors and warnings before: 0 this patch: 0
netdev/module_param success Was 0 now: 0
netdev/verify_signedoff success Signed-off-by tag matches author and committer
netdev/verify_fixes success No Fixes tag
netdev/build_allmodconfig_warn success Errors and warnings before: 0 this patch: 0
netdev/checkpatch warning CHECK: Alignment should match open parenthesis WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
netdev/kdoc success Errors and warnings before: 0 this patch: 0
netdev/source_inline success Was 0 now: 0
bpf/vmtest-bpf-PR fail PR summary
bpf/vmtest-bpf-VM_Test-2 fail Logs for Kernel LATEST on z15 + selftests

Commit Message

liujian (CE) April 13, 2022, 6:21 a.m. UTC 
Use bpf_prog_test_run_opts to test the skb_load_bytes function.
Tests the behavior when offset is greater than INT_MAX or a normal value.

Signed-off-by: Liu Jian <liujian56@huawei.com>
---
v1->v2: As Liu Song's review comments, use bpf skeleton and global variable.
 .../selftests/bpf/prog_tests/skb_load_bytes.c | 45 +++++++++++++++++++
 .../selftests/bpf/progs/skb_load_bytes.c      | 19 ++++++++
 2 files changed, 64 insertions(+)
 create mode 100644 tools/testing/selftests/bpf/prog_tests/skb_load_bytes.c
 create mode 100644 tools/testing/selftests/bpf/progs/skb_load_bytes.c

Comments

Song Liu April 13, 2022, 9:11 p.m. UTC | #1 
I guess this should go via bpf-next instead? Please mark the patches with
prefix "PATCH bpf-next". 

> On Apr 12, 2022, at 11:21 PM, Liu Jian <liujian56@huawei.com> wrote:
> 
> Use bpf_prog_test_run_opts to test the skb_load_bytes function.
> Tests the behavior when offset is greater than INT_MAX or a normal value.
> 
> Signed-off-by: Liu Jian <liujian56@huawei.com>
> ---
> v1->v2: As Liu Song's review comments, use bpf skeleton and global variable.
> .../selftests/bpf/prog_tests/skb_load_bytes.c | 45 +++++++++++++++++++
> .../selftests/bpf/progs/skb_load_bytes.c      | 19 ++++++++
> 2 files changed, 64 insertions(+)
> create mode 100644 tools/testing/selftests/bpf/prog_tests/skb_load_bytes.c
> create mode 100644 tools/testing/selftests/bpf/progs/skb_load_bytes.c
> 
> diff --git a/tools/testing/selftests/bpf/prog_tests/skb_load_bytes.c b/tools/testing/selftests/bpf/prog_tests/skb_load_bytes.c
> new file mode 100644
> index 000000000000..81cc224a0c69
> --- /dev/null
> +++ b/tools/testing/selftests/bpf/prog_tests/skb_load_bytes.c
> @@ -0,0 +1,45 @@
> +// SPDX-License-Identifier: GPL-2.0
> +#include <test_progs.h>
> +#include <network_helpers.h>
> +#include "skb_load_bytes.skel.h"
> +
> +void test_skb_load_bytes(void)
> +{
> +	struct skb_load_bytes *skel;
> +	int err, prog_fd, test_result;
> +	struct __sk_buff skb = { 0 };
> +
> +	LIBBPF_OPTS(bpf_test_run_opts, tattr,
> +		.data_in = &pkt_v4,
> +		.data_size_in = sizeof(pkt_v4),
> +		.ctx_in = &skb,
> +		.ctx_size_in = sizeof(skb),
> +	);
> +
> +	skel = skb_load_bytes__open_and_load();
> +	if (!ASSERT_OK_PTR(skel, "skel_open_and_load"))
> +		return;
> +
> +	prog_fd = bpf_program__fd(skel->progs.skb_process);
> +	if (prog_fd < 0)
> +		goto out;

I guess we should report error here? like

	if (ASSERT_GE(prog_fd, 0, "prog_fd"))
		goto out;

> +
> +	skel->bss->load_offset = (uint32_t)(-1);
> +	tattr.data_out = NULL;
> +	tattr.data_size_out = 0;
> +	err = bpf_prog_test_run_opts(prog_fd, &tattr);
> +	CHECK_ATTR(err != 0, "offset -1", "err %d errno %d\n", err, errno);

We can use ASSERT_OK() here. 

> +	test_result = skel->bss->test_result;
> +	CHECK_ATTR(test_result != -EFAULT, "offset -1", "test error\n");
And ASSERT_NEQ

> +
> +	skel->bss->load_offset = (uint32_t)10;
> +	tattr.data_out = NULL;
> +	tattr.data_size_out = 0;

I guess = NULL and = 0 are not needed here. 

> +	err = bpf_prog_test_run_opts(prog_fd, &tattr);
> +	CHECK_ATTR(err != 0, "offset 10", "err %d errno %d\n", err, errno);
> +	test_result = skel->bss->test_result;
> +	CHECK_ATTR(test_result != 0, "offset 10", "test error\n");
> +
> +out:
> +	skb_load_bytes__destroy(skel);
> +}
> diff --git a/tools/testing/selftests/bpf/progs/skb_load_bytes.c b/tools/testing/selftests/bpf/progs/skb_load_bytes.c
> new file mode 100644
> index 000000000000..e4252fd973be
> --- /dev/null
> +++ b/tools/testing/selftests/bpf/progs/skb_load_bytes.c
> @@ -0,0 +1,19 @@
> +// SPDX-License-Identifier: GPL-2.0
> +
> +#include <linux/bpf.h>
> +#include <bpf/bpf_helpers.h>
> +
> +char _license[] SEC("license") = "GPL";
> +
> +__u32 load_offset = 0;
> +int test_result = 0;
> +
> +SEC("tc")
> +int skb_process(struct __sk_buff *skb)
> +{
> +	char buf[16];
> +
> +	test_result = bpf_skb_load_bytes(skb, load_offset, buf, 10);
> +
> +	return 0;
> +}
> -- 
> 2.17.1
>
diff mbox series

Patch

diff --git a/tools/testing/selftests/bpf/prog_tests/skb_load_bytes.c b/tools/testing/selftests/bpf/prog_tests/skb_load_bytes.c
new file mode 100644
index 000000000000..81cc224a0c69
--- /dev/null
+++ b/tools/testing/selftests/bpf/prog_tests/skb_load_bytes.c
@@ -0,0 +1,45 @@ 
+// SPDX-License-Identifier: GPL-2.0
+#include <test_progs.h>
+#include <network_helpers.h>
+#include "skb_load_bytes.skel.h"
+
+void test_skb_load_bytes(void)
+{
+	struct skb_load_bytes *skel;
+	int err, prog_fd, test_result;
+	struct __sk_buff skb = { 0 };
+
+	LIBBPF_OPTS(bpf_test_run_opts, tattr,
+		.data_in = &pkt_v4,
+		.data_size_in = sizeof(pkt_v4),
+		.ctx_in = &skb,
+		.ctx_size_in = sizeof(skb),
+	);
+
+	skel = skb_load_bytes__open_and_load();
+	if (!ASSERT_OK_PTR(skel, "skel_open_and_load"))
+		return;
+
+	prog_fd = bpf_program__fd(skel->progs.skb_process);
+	if (prog_fd < 0)
+		goto out;
+
+	skel->bss->load_offset = (uint32_t)(-1);
+	tattr.data_out = NULL;
+	tattr.data_size_out = 0;
+	err = bpf_prog_test_run_opts(prog_fd, &tattr);
+	CHECK_ATTR(err != 0, "offset -1", "err %d errno %d\n", err, errno);
+	test_result = skel->bss->test_result;
+	CHECK_ATTR(test_result != -EFAULT, "offset -1", "test error\n");
+
+	skel->bss->load_offset = (uint32_t)10;
+	tattr.data_out = NULL;
+	tattr.data_size_out = 0;
+	err = bpf_prog_test_run_opts(prog_fd, &tattr);
+	CHECK_ATTR(err != 0, "offset 10", "err %d errno %d\n", err, errno);
+	test_result = skel->bss->test_result;
+	CHECK_ATTR(test_result != 0, "offset 10", "test error\n");
+
+out:
+	skb_load_bytes__destroy(skel);
+}
diff --git a/tools/testing/selftests/bpf/progs/skb_load_bytes.c b/tools/testing/selftests/bpf/progs/skb_load_bytes.c
new file mode 100644
index 000000000000..e4252fd973be
--- /dev/null
+++ b/tools/testing/selftests/bpf/progs/skb_load_bytes.c
@@ -0,0 +1,19 @@ 
+// SPDX-License-Identifier: GPL-2.0
+
+#include <linux/bpf.h>
+#include <bpf/bpf_helpers.h>
+
+char _license[] SEC("license") = "GPL";
+
+__u32 load_offset = 0;
+int test_result = 0;
+
+SEC("tc")
+int skb_process(struct __sk_buff *skb)
+{
+	char buf[16];
+
+	test_result = bpf_skb_load_bytes(skb, load_offset, buf, 10);
+
+	return 0;
+}