LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Krzesimir Nowak <krzesimir@kinvolk.io>
To: bpf@vger.kernel.org
Cc: iago@kinvolk.io, alban@kinvolk.io,
	Krzesimir Nowak <krzesimir@kinvolk.io>,
	Shuah Khan <shuah@kernel.org>,
	Alexei Starovoitov <ast@kernel.org>,
	Daniel Borkmann <daniel@iogearbox.net>,
	Martin KaFai Lau <kafai@fb.com>, Song Liu <songliubraving@fb.com>,
	Yonghong Song <yhs@fb.com>, Andrey Ignatov <rdna@fb.com>,
	Jakub Kicinski <jakub.kicinski@netronome.com>,
	linux-kselftest@vger.kernel.org, netdev@vger.kernel.org,
	linux-kernel@vger.kernel.org
Subject: [PATCH bpf v1 2/3] selftests/bpf: Print a message when tester could not run a program
Date: Wed, 15 May 2019 15:47:27 +0200	[thread overview]
Message-ID: <20190515134731.12611-3-krzesimir@kinvolk.io> (raw)
In-Reply-To: <20190515134731.12611-1-krzesimir@kinvolk.io>

This prints a message when the error is about program type being not
supported by the test runner or because of permissions problem. This
is to see if the program we expected to run was actually executed.

The messages are open-coded because strerror(ENOTSUPP) returns
"Unknown error 524".

Signed-off-by: Krzesimir Nowak <krzesimir@kinvolk.io>
---
 tools/testing/selftests/bpf/test_verifier.c | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/tools/testing/selftests/bpf/test_verifier.c b/tools/testing/selftests/bpf/test_verifier.c
index ccd896b98cac..bf0da03f593b 100644
--- a/tools/testing/selftests/bpf/test_verifier.c
+++ b/tools/testing/selftests/bpf/test_verifier.c
@@ -825,11 +825,20 @@ static int do_prog_test_run(int fd_prog, bool unpriv, uint32_t expected_val,
 				tmp, &size_tmp, &retval, NULL);
 	if (unpriv)
 		set_admin(false);
-	if (err && errno != 524/*ENOTSUPP*/ && errno != EPERM) {
-		printf("Unexpected bpf_prog_test_run error ");
-		return err;
+	if (err) {
+		switch (errno) {
+		case 524/*ENOTSUPP*/:
+			printf("Did not run the program (not supported) ");
+			return 0;
+		case EPERM:
+			printf("Did not run the program (no permission) ");
+			return 0;
+		default:
+			printf("Unexpected bpf_prog_test_run error ");
+			return err;
+		}
 	}
-	if (!err && retval != expected_val &&
+	if (retval != expected_val &&
 	    expected_val != POINTER_VALUE) {
 		printf("FAIL retval %d != %d ", retval, expected_val);
 		return 1;
-- 
2.20.1


  parent reply	other threads:[~2019-05-15 13:48 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-15 13:47 [PATCH bpf v1 0/3] Test the 32bit narrow reads Krzesimir Nowak
2019-05-15 13:47 ` [PATCH bpf v1 1/3] selftests/bpf: Test correctness of narrow 32bit read on 64bit field Krzesimir Nowak
2019-05-23 16:02   ` Daniel Borkmann
2019-05-15 13:47 ` Krzesimir Nowak [this message]
2019-05-15 21:45   ` [PATCH bpf v1 2/3] selftests/bpf: Print a message when tester could not run a program Jakub Kicinski
2019-05-16  9:29     ` Krzesimir Nowak
2019-05-16 15:50       ` Jakub Kicinski
2019-05-16 16:21         ` Krzesimir Nowak
2019-05-16 16:54           ` Jakub Kicinski
2019-05-15 13:47 ` [PATCH bpf v1 3/3] selftests/bpf: Avoid a clobbering of errno Krzesimir Nowak
2019-05-15 21:50   ` Jakub Kicinski
2019-05-16  9:31     ` Krzesimir Nowak

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=20190515134731.12611-3-krzesimir@kinvolk.io \
    --to=krzesimir@kinvolk.io \
    --cc=alban@kinvolk.io \
    --cc=ast@kernel.org \
    --cc=bpf@vger.kernel.org \
    --cc=daniel@iogearbox.net \
    --cc=iago@kinvolk.io \
    --cc=jakub.kicinski@netronome.com \
    --cc=kafai@fb.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-kselftest@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=rdna@fb.com \
    --cc=shuah@kernel.org \
    --cc=songliubraving@fb.com \
    --cc=yhs@fb.com \
    /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).