linux-api.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Lorenz Bauer <lmb@cloudflare.com>
To: ast@kernel.org, daniel@iogearbox.net
Cc: netdev@vger.kernel.org, linux-api@vger.kernel.org,
	Lorenz Bauer <lmb@cloudflare.com>
Subject: [PATCH 3/3] selftests: add a test for bpf_prog_test_run output size
Date: Fri, 16 Nov 2018 12:53:29 +0000	[thread overview]
Message-ID: <20181116125329.3974-4-lmb@cloudflare.com> (raw)
In-Reply-To: <20181116125329.3974-1-lmb@cloudflare.com>

Make sure that bpf_prog_test_run returns the correct length
in the size_out argument and that the kernel respects the
output size hint.

Signed-off-by: Lorenz Bauer <lmb@cloudflare.com>
---
 tools/testing/selftests/bpf/test_progs.c | 34 ++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/tools/testing/selftests/bpf/test_progs.c b/tools/testing/selftests/bpf/test_progs.c
index 560d7527b86b..6ab98e10e86f 100644
--- a/tools/testing/selftests/bpf/test_progs.c
+++ b/tools/testing/selftests/bpf/test_progs.c
@@ -124,6 +124,39 @@ static void test_pkt_access(void)
 	bpf_object__close(obj);
 }
 
+static void test_output_size_hint(void)
+{
+	const char *file = "./test_pkt_access.o";
+	struct bpf_object *obj;
+	__u32 retval, size, duration;
+	int err, prog_fd;
+	char buf[10];
+
+	err = bpf_prog_load(file, BPF_PROG_TYPE_SCHED_CLS, &obj, &prog_fd);
+	if (err) {
+		error_cnt++;
+		return;
+	}
+
+	memset(buf, 0, sizeof(buf));
+
+	size = 5;
+	err = bpf_prog_test_run(prog_fd, 1, &pkt_v4, sizeof(pkt_v4),
+				buf, &size, &retval, &duration);
+	CHECK(err || retval, "run",
+	      "err %d errno %d retval %d\n",
+	      err, errno, retval);
+
+	CHECK(size != sizeof(pkt_v4), "out_size",
+	      "incorrect output size, want %lu have %u\n",
+	      sizeof(pkt_v4), size);
+
+	CHECK(buf[5] != 0, "overflow",
+	      "prog_test_run ignored size hint\n");
+
+	bpf_object__close(obj);
+}
+
 static void test_xdp(void)
 {
 	struct vip key4 = {.protocol = 6, .family = AF_INET};
@@ -1847,6 +1880,7 @@ int main(void)
 	jit_enabled = is_jit_enabled();
 
 	test_pkt_access();
+	test_output_size_hint();
 	test_xdp();
 	test_xdp_adjust_tail();
 	test_l4lb_all();
-- 
2.17.1

  parent reply	other threads:[~2018-11-16 12:53 UTC|newest]

Thread overview: 44+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-11-16 12:53 [PATCH 0/3] Fix unsafe BPF_PROG_TEST_RUN interface Lorenz Bauer
2018-11-16 12:53 ` [PATCH 1/3] bpf: respect size hint to BPF_PROG_TEST_RUN if present Lorenz Bauer
2018-11-18  5:47   ` Y Song
2018-11-16 12:53 ` [PATCH 2/3] libbpf: require size hint in bpf_prog_test_run Lorenz Bauer
2018-11-18  5:53   ` Y Song
2018-11-16 12:53 ` Lorenz Bauer [this message]
2018-11-18  5:59   ` [PATCH 3/3] selftests: add a test for bpf_prog_test_run output size Y Song
2018-11-20 11:35     ` Lorenz Bauer
2018-11-20 16:58       ` Y Song
2018-11-18  6:13 ` [PATCH 0/3] Fix unsafe BPF_PROG_TEST_RUN interface Y Song
2018-11-19 14:30   ` Lorenz Bauer
2018-11-20  0:34     ` Daniel Borkmann
2018-11-20 15:43 ` [PATCH v2 0/4] " Lorenz Bauer
2018-11-20 15:43   ` [PATCH v2 1/4] bpf: respect size hint to BPF_PROG_TEST_RUN if present Lorenz Bauer
2018-11-20 15:43   ` [PATCH v2 2/4] tools: sync uapi/linux/bpf.h Lorenz Bauer
2018-11-20 15:43   ` [PATCH v2 3/4] libbpf: require size hint in bpf_prog_test_run Lorenz Bauer
2018-11-20 19:18     ` Alexei Starovoitov
2018-11-20 19:43       ` Lorenz Bauer
2018-11-20 22:51         ` Alexei Starovoitov
2018-11-20 15:43   ` [PATCH v2 4/4] selftests: add a test for bpf_prog_test_run output size Lorenz Bauer
2018-11-20 17:18   ` [PATCH v2 0/4] Fix unsafe BPF_PROG_TEST_RUN interface Y Song
2018-11-22 14:09 ` [PATCH v3 " Lorenz Bauer
2018-11-22 14:09   ` [PATCH v3 1/4] bpf: respect size hint to BPF_PROG_TEST_RUN if present Lorenz Bauer
2018-11-22 14:09   ` [PATCH v3 2/4] tools: sync uapi/linux/bpf.h Lorenz Bauer
2018-11-22 14:09   ` [PATCH v3 3/4] libbpf: add bpf_prog_test_run_xattr Lorenz Bauer
2018-11-23 22:25     ` Daniel Borkmann
2018-11-24 22:20       ` Alexei Starovoitov
2018-11-26 12:45         ` Lorenz Bauer
2018-11-26 13:39           ` Daniel Borkmann
2018-11-28  5:05           ` Alexei Starovoitov
2018-11-28 16:52             ` Lorenz Bauer
2018-11-22 14:09   ` [PATCH v3 4/4] selftests: add a test for bpf_prog_test_run_xattr Lorenz Bauer
2018-11-28 16:53 ` [PATCH v4 0/4] Fix unsafe BPF_PROG_TEST_RUN interface Lorenz Bauer
2018-11-28 16:53   ` [PATCH v4 1/4] bpf: respect size hint to BPF_PROG_TEST_RUN if present Lorenz Bauer
2018-11-28 16:53   ` [PATCH v4 2/4] tools: sync uapi/linux/bpf.h Lorenz Bauer
2018-11-28 16:53   ` [PATCH v4 3/4] libbpf: add bpf_prog_test_run_xattr Lorenz Bauer
2018-11-30 21:21     ` Alexei Starovoitov
2018-11-28 16:53   ` [PATCH v4 4/4] selftests: add a test for bpf_prog_test_run_xattr Lorenz Bauer
2018-12-03 11:31 ` [PATCH v5 0/4] Fix unsafe BPF_PROG_TEST_RUN interface Lorenz Bauer
2018-12-03 11:31   ` [PATCH v5 1/4] bpf: respect size hint to BPF_PROG_TEST_RUN if present Lorenz Bauer
2018-12-03 11:31   ` [PATCH v5 2/4] tools: sync uapi/linux/bpf.h Lorenz Bauer
2018-12-03 11:31   ` [PATCH v5 3/4] libbpf: add bpf_prog_test_run_xattr Lorenz Bauer
2018-12-03 11:31   ` [PATCH v5 4/4] selftests: add a test for bpf_prog_test_run_xattr Lorenz Bauer
2018-12-04 16:22   ` [PATCH v5 0/4] Fix unsafe BPF_PROG_TEST_RUN interface Alexei Starovoitov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20181116125329.3974-4-lmb@cloudflare.com \
    --to=lmb@cloudflare.com \
    --cc=ast@kernel.org \
    --cc=daniel@iogearbox.net \
    --cc=linux-api@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).