From: Marcus Wichelmann <marcus.wichelmann@hetzner-cloud.de>
To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
bpf@vger.kernel.org, linux-kselftest@vger.kernel.org
Cc: willemdebruijn.kernel@gmail.com, jasowang@redhat.com,
andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com,
kuba@kernel.org, pabeni@redhat.com, andrii@kernel.org,
eddyz87@gmail.com, mykolal@fb.com, ast@kernel.org,
daniel@iogearbox.net, martin.lau@linux.dev, song@kernel.org,
yonghong.song@linux.dev, john.fastabend@gmail.com,
kpsingh@kernel.org, sdf@fomichev.me, haoluo@google.com,
jolsa@kernel.org, shuah@kernel.org, hawk@kernel.org,
marcus.wichelmann@hetzner-cloud.de
Subject: [PATCH bpf-next v3 6/6] selftests/bpf: fix file descriptor assertion in open_tuntap helper
Date: Mon, 24 Feb 2025 15:29:09 +0000 [thread overview]
Message-ID: <20250224152909.3911544-7-marcus.wichelmann@hetzner-cloud.de> (raw)
In-Reply-To: <20250224152909.3911544-1-marcus.wichelmann@hetzner-cloud.de>
The open_tuntap helper function uses open() to get a file descriptor for
/dev/net/tun.
The open(2) manpage writes this about its return value:
On success, open(), openat(), and creat() return the new file
descriptor (a nonnegative integer). On error, -1 is returned and
errno is set to indicate the error.
This means that the fd > 0 assertion in the open_tuntap helper is
incorrect and should rather check for fd >= 0.
When running the BPF selftests locally, this incorrect assertion was not
an issue, but the BPF kernel-patches CI failed because of this:
open_tuntap:FAIL:open(/dev/net/tun) unexpected open(/dev/net/tun):
actual 0 <= expected 0
Signed-off-by: Marcus Wichelmann <marcus.wichelmann@hetzner-cloud.de>
---
tools/testing/selftests/bpf/network_helpers.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/testing/selftests/bpf/network_helpers.c b/tools/testing/selftests/bpf/network_helpers.c
index e1cfa1b37754..9b59bfd5d912 100644
--- a/tools/testing/selftests/bpf/network_helpers.c
+++ b/tools/testing/selftests/bpf/network_helpers.c
@@ -571,7 +571,7 @@ int open_tuntap(const char *dev_name, bool need_mac)
struct ifreq ifr;
int fd = open("/dev/net/tun", O_RDWR);
- if (!ASSERT_GT(fd, 0, "open(/dev/net/tun)"))
+ if (!ASSERT_GE(fd, 0, "open(/dev/net/tun)"))
return -1;
ifr.ifr_flags = IFF_NO_PI | (need_mac ? IFF_TAP : IFF_TUN);
--
2.43.0
next prev parent reply other threads:[~2025-02-24 15:29 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-24 15:29 [PATCH bpf-next v3 0/6] XDP metadata support for tun driver Marcus Wichelmann
2025-02-24 15:29 ` [PATCH bpf-next v3 1/6] net: tun: enable XDP metadata support Marcus Wichelmann
2025-02-26 5:50 ` Jason Wang
2025-02-24 15:29 ` [PATCH bpf-next v3 2/6] net: tun: enable transfer of XDP metadata to skb Marcus Wichelmann
2025-02-25 18:26 ` Willem de Bruijn
2025-02-26 5:59 ` Jason Wang
2025-02-24 15:29 ` [PATCH bpf-next v3 3/6] selftests/bpf: move open_tuntap to network helpers Marcus Wichelmann
2025-02-25 18:24 ` Willem de Bruijn
2025-02-26 6:31 ` Jason Wang
2025-02-24 15:29 ` [PATCH bpf-next v3 4/6] selftests/bpf: refactor xdp_context_functional test and bpf program Marcus Wichelmann
2025-02-24 17:12 ` Stanislav Fomichev
2025-02-26 15:56 ` Marcus Wichelmann
2025-02-25 15:07 ` Marcus Wichelmann
2025-02-25 18:23 ` Willem de Bruijn
2025-02-26 17:39 ` Marcus Wichelmann
2025-02-25 18:32 ` Willem de Bruijn
2025-02-26 17:14 ` Marcus Wichelmann
2025-02-24 15:29 ` [PATCH bpf-next v3 5/6] selftests/bpf: add test for XDP metadata support in tun driver Marcus Wichelmann
2025-02-24 17:14 ` Stanislav Fomichev
2025-02-26 18:50 ` Marcus Wichelmann
2025-02-26 19:00 ` Stanislav Fomichev
2025-02-26 19:29 ` Marcus Wichelmann
2025-02-24 15:29 ` Marcus Wichelmann [this message]
2025-02-25 18:24 ` [PATCH bpf-next v3 6/6] selftests/bpf: fix file descriptor assertion in open_tuntap helper Willem de Bruijn
2025-02-25 14:55 ` [PATCH bpf-next v3 0/6] XDP metadata support for tun driver Willem de Bruijn
2025-02-25 15:03 ` Marcus Wichelmann
2025-02-25 18:14 ` Willem de Bruijn
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=20250224152909.3911544-7-marcus.wichelmann@hetzner-cloud.de \
--to=marcus.wichelmann@hetzner-cloud.de \
--cc=andrew+netdev@lunn.ch \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=eddyz87@gmail.com \
--cc=edumazet@google.com \
--cc=haoluo@google.com \
--cc=hawk@kernel.org \
--cc=jasowang@redhat.com \
--cc=john.fastabend@gmail.com \
--cc=jolsa@kernel.org \
--cc=kpsingh@kernel.org \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=martin.lau@linux.dev \
--cc=mykolal@fb.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=sdf@fomichev.me \
--cc=shuah@kernel.org \
--cc=song@kernel.org \
--cc=willemdebruijn.kernel@gmail.com \
--cc=yonghong.song@linux.dev \
/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
all inboxes | Powered by JetHome®