Skip to content

Commit 21c5f4f

Browse files
guidosarduccianakryiko
authored andcommitted
selftests/bpf: Fix error compiling tc_redirect.c with musl libc
Linux 5.1 implemented 64-bit time types and related syscalls to address the Y2038 problem generally across archs. Userspace handling of Y2038 varies with the libc however. While musl libc uses 64-bit time across all 32-bit and 64-bit platforms, GNU glibc uses 64-bit time on 64-bit platforms but defaults to 32-bit time on 32-bit platforms unless they "opt-in" to 64-bit time or explicitly use 64-bit syscalls and time structures. One specific area is the standard setsockopt() call, SO_TIMESTAMPNS option used for timestamping, and the related output 'struct timespec'. GNU glibc defaults as above, also exposing the SO_TIMESTAMPNS_NEW flag to explicitly use a 64-bit call and 'struct __kernel_timespec'. Since these are not exposed or needed with musl libc, their use in tc_redirect.c leads to compile errors building for mips64el/musl: tc_redirect.c: In function 'rcv_tstamp': tc_redirect.c:425:32: error: 'SO_TIMESTAMPNS_NEW' undeclared (first use in this function); did you mean 'SO_TIMESTAMPNS'? 425 | cmsg->cmsg_type == SO_TIMESTAMPNS_NEW) | ^~~~~~~~~~~~~~~~~~ | SO_TIMESTAMPNS tc_redirect.c:425:32: note: each undeclared identifier is reported only once for each function it appears in tc_redirect.c: In function 'test_inet_dtime': tc_redirect.c:491:49: error: 'SO_TIMESTAMPNS_NEW' undeclared (first use in this function); did you mean 'SO_TIMESTAMPNS'? 491 | err = setsockopt(listen_fd, SOL_SOCKET, SO_TIMESTAMPNS_NEW, | ^~~~~~~~~~~~~~~~~~ | SO_TIMESTAMPNS However, using SO_TIMESTAMPNS_NEW isn't strictly needed, nor is Y2038 being explicitly tested. The timestamp checks in tc_redirect.c are simple: the packet receive timestamp is non-zero and processed/handled in less than 5 seconds. Switch to using the standard setsockopt() call and SO_TIMESTAMPNS option to ensure compatibility across glibc and musl libc. In the worst-case, there is a 5-second window 14 years from now where tc_redirect tests may fail on 32-bit systems. However, we should reasonably expect glibc to adopt a 64-bit mandate rather than the current "opt-in" policy before the Y2038 roll-over. Fixes: ce6f6cf ("selftests/bpf: Wait for the netstamp_needed_key static key to be turned on") Fixes: c803475 ("bpf: selftests: test skb->tstamp in redirect_neigh") Signed-off-by: Tony Ambardar <[email protected]> Signed-off-by: Andrii Nakryiko <[email protected]> Link: https://lore.kernel.org/bpf/031d656c058b4e55ceae56ef49c4e1729b5090f3.1722244708.git.tony.ambardar@gmail.com
1 parent 06eeca1 commit 21c5f4f

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

tools/testing/selftests/bpf/prog_tests/tc_redirect.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,7 @@ static int set_forwarding(bool enable)
471471

472472
static int __rcv_tstamp(int fd, const char *expected, size_t s, __u64 *tstamp)
473473
{
474-
struct __kernel_timespec pkt_ts = {};
474+
struct timespec pkt_ts = {};
475475
char ctl[CMSG_SPACE(sizeof(pkt_ts))];
476476
struct timespec now_ts;
477477
struct msghdr msg = {};
@@ -495,7 +495,7 @@ static int __rcv_tstamp(int fd, const char *expected, size_t s, __u64 *tstamp)
495495

496496
cmsg = CMSG_FIRSTHDR(&msg);
497497
if (cmsg && cmsg->cmsg_level == SOL_SOCKET &&
498-
cmsg->cmsg_type == SO_TIMESTAMPNS_NEW)
498+
cmsg->cmsg_type == SO_TIMESTAMPNS)
499499
memcpy(&pkt_ts, CMSG_DATA(cmsg), sizeof(pkt_ts));
500500

501501
pkt_ns = pkt_ts.tv_sec * NSEC_PER_SEC + pkt_ts.tv_nsec;
@@ -537,9 +537,9 @@ static int wait_netstamp_needed_key(void)
537537
if (!ASSERT_GE(srv_fd, 0, "start_server"))
538538
goto done;
539539

540-
err = setsockopt(srv_fd, SOL_SOCKET, SO_TIMESTAMPNS_NEW,
540+
err = setsockopt(srv_fd, SOL_SOCKET, SO_TIMESTAMPNS,
541541
&opt, sizeof(opt));
542-
if (!ASSERT_OK(err, "setsockopt(SO_TIMESTAMPNS_NEW)"))
542+
if (!ASSERT_OK(err, "setsockopt(SO_TIMESTAMPNS)"))
543543
goto done;
544544

545545
cli_fd = connect_to_fd(srv_fd, TIMEOUT_MILLIS);
@@ -621,9 +621,9 @@ static void test_inet_dtime(int family, int type, const char *addr, __u16 port)
621621
return;
622622

623623
/* Ensure the kernel puts the (rcv) timestamp for all skb */
624-
err = setsockopt(listen_fd, SOL_SOCKET, SO_TIMESTAMPNS_NEW,
624+
err = setsockopt(listen_fd, SOL_SOCKET, SO_TIMESTAMPNS,
625625
&opt, sizeof(opt));
626-
if (!ASSERT_OK(err, "setsockopt(SO_TIMESTAMPNS_NEW)"))
626+
if (!ASSERT_OK(err, "setsockopt(SO_TIMESTAMPNS)"))
627627
goto done;
628628

629629
if (type == SOCK_STREAM) {

0 commit comments

Comments
 (0)