From patchwork Mon Dec 13 14:36:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 48871 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 55E783858419 for ; Mon, 13 Dec 2021 14:37:54 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 55E783858419 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1639406274; bh=Ul3XuhWL+p0m79nG2K9b0xmpGfi8wFYi3d3XtlJrCQU=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=GiEUIIFeGW53+EhFeADVGuQGkKOacP481qyJ1Ryhw9/eCW4FrGjInpH4y4usUIs8G gACxYUwsEUc2uuhNzQwnnVDi5fXd2I3JOPazz+G8WeaJmD23c5WINePDmveLL6H/gl vkf/jIB2tZXdlTIibQjZSYFUlmtbRRNwkB//R6DE= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qv1-xf2e.google.com (mail-qv1-xf2e.google.com [IPv6:2607:f8b0:4864:20::f2e]) by sourceware.org (Postfix) with ESMTPS id D949B3858429 for ; Mon, 13 Dec 2021 14:36:49 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org D949B3858429 Received: by mail-qv1-xf2e.google.com with SMTP id kl8so14536533qvb.3 for ; Mon, 13 Dec 2021 06:36:49 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Ul3XuhWL+p0m79nG2K9b0xmpGfi8wFYi3d3XtlJrCQU=; b=CnVDkCQM3TEdggvH7FihbCI51bt6EjuAi7wFWolee8K6PDVEu3WR0lTBWMSWSL/Lgq crco9hVfiuIxs6xI3eERMhkQPi1RTcVpPkvpiSKfE7vAvcxLKUqURVRrGmW0i49Xkp8f 0H0E0iWrgL8y41RDk3FPJfSnya84x3Kvwk32GImnYV4IE+Poy58eEMQwL9Eixttfsg2O ww0T8e/SeGNW7k1/Fi9t2WB2T837GT7Ul071J6MmsNxvh3PJRVV5qC/pzfPaKG8oGFvO nij3WxcZ8040eGZ+/XP2+tMXnxbdMyzRwpqPqTPExutLGsE4j1dVSYfVTWpgAxSIglNj xR8A== X-Gm-Message-State: AOAM532CtxYXn5h2OPp++Npibj4zcfLjuSE9BWQUwPrsyVKilVeCKkNC eIJCvjdAgmu9u2ox+fyRrfJ1xfGl+GhD8g== X-Google-Smtp-Source: ABdhPJxaasMrR4mzYejrIrow2XvMiUl1GxzA9oGvn8fftnjHRNAU/1w7HJA+HqGf9X9nMDtRhXYTcg== X-Received: by 2002:a05:6214:8e5:: with SMTP id dr5mr42669010qvb.28.1639406209020; Mon, 13 Dec 2021 06:36:49 -0800 (PST) Received: from birita.. ([2804:431:c7ca:a776:980f:2e90:a6d5:36a5]) by smtp.gmail.com with ESMTPSA id x16sm5933672qkp.67.2021.12.13.06.36.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Dec 2021 06:36:48 -0800 (PST) To: libc-alpha@sourceware.org, Florian Weimer Subject: [PATCH v3 1/2] support: Add support_socket_so_timestamp_time64 Date: Mon, 13 Dec 2021 11:36:42 -0300 Message-Id: <20211213143643.1182659-2-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211213143643.1182659-1-adhemerval.zanella@linaro.org> References: <20211213143643.1182659-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-11.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_NUMSUBJECT, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Netto Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" Check if the socket support 64-bit network packages timestamps (SO_TIMESTAMP and SO_TIMESTAMPNS). This will be used on recvmsg and recvmmsg tests to check if the timestamp should be generated. --- support/Makefile | 1 + support/support.h | 4 ++ support/support_socket_so_timestamp_time64.c | 56 ++++++++++++++++++++ 3 files changed, 61 insertions(+) create mode 100644 support/support_socket_so_timestamp_time64.c diff --git a/support/Makefile b/support/Makefile index 984ec02dfe..073eb7bb4b 100644 --- a/support/Makefile +++ b/support/Makefile @@ -80,6 +80,7 @@ libsupport-routines = \ support_set_small_thread_stack_size \ support_shared_allocate \ support_small_stack_thread_attribute \ + support_socket_so_timestamp_time64 \ support_stat_nanoseconds \ support_subprocess \ support_test_compare_blob \ diff --git a/support/support.h b/support/support.h index 10a4a36848..28b1cbb304 100644 --- a/support/support.h +++ b/support/support.h @@ -183,6 +183,10 @@ extern bool support_select_modifies_timeout (void); tv_usec larger than 1000000. */ extern bool support_select_normalizes_timeout (void); +/* Return true if socket FD supports 64-bit timestamps with the SOL_SOCKET + and SO_TIMESTAMP/SO_TIMESTAMPNS. */ +extern bool support_socket_so_timestamp_time64 (int fd); + /* Create a timer that trigger after SEC seconds and NSEC nanoseconds. If REPEAT is true the timer will repeat indefinitely. If CALLBACK is not NULL, the function will be called when the timer expires; otherwise a diff --git a/support/support_socket_so_timestamp_time64.c b/support/support_socket_so_timestamp_time64.c new file mode 100644 index 0000000000..eb8f8ef0cc --- /dev/null +++ b/support/support_socket_so_timestamp_time64.c @@ -0,0 +1,56 @@ +/* Return whether socket supports 64-bit timestamps. + Copyright (C) 2021 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#include +#include +#include +#include +#include +#ifdef __linux__ +# include +#endif + +bool +support_socket_so_timestamp_time64 (int fd) +{ +#ifdef __linux__ +# if __LINUX_KERNEL_VERSION >= 0x050100 \ + || __WORDSIZE == 64 \ + || (defined __SYSCALL_WORDSIZE && __SYSCALL_WORDSIZE == 64) + return true; +# else + int level = SOL_SOCKET; + int optname = COMPAT_SO_TIMESTAMP_NEW; + int optval; + socklen_t len = sizeof (optval); + + int r = syscall (__NR_getsockopt, fd, level, optname, &optval, &len); +# ifdef __NR_socketcall + if (r == -1 && errno == ENOSYS) + { + long int args[] = { fd, level, optname, (long int) &optval, + sizeof (optval) }; + r = syscall (__NR_socketcall, 15 /* SOCKOP_getsockopt */ , args); + } +# endif + return r != -1; +# endif +#else + return false; +#endif +} From patchwork Mon Dec 13 14:36:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 48872 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 93DE93858414 for ; Mon, 13 Dec 2021 14:38:36 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 93DE93858414 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1639406316; bh=qSJ+JkYLPCNmnS16JbiGX1WrxHVSM2u/+MXJhPXxA8g=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=m6dYEKQ8V6N+gJjGudztWoVBlYg4fLmcs8JU+4U9B8df3xQSN0GTn8q0tOlqt0CM4 Vpg5dJzPzhbnjq5YJrTdg0vF8uFGeenUiCf0ZZ259+PHpn/VajqaCwJaXW3bq6scoH JV4VDI9amQDkAEbYGIhnyIomEt6Y5iFDIgAW8Bxc= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qk1-x732.google.com (mail-qk1-x732.google.com [IPv6:2607:f8b0:4864:20::732]) by sourceware.org (Postfix) with ESMTPS id 7CBD43858036 for ; Mon, 13 Dec 2021 14:36:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 7CBD43858036 Received: by mail-qk1-x732.google.com with SMTP id a11so14009485qkh.13 for ; Mon, 13 Dec 2021 06:36:51 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=qSJ+JkYLPCNmnS16JbiGX1WrxHVSM2u/+MXJhPXxA8g=; b=LVlu7fEQcxjsnAsjg5LrWVU06w7V4lj9JyghWboeoTiFhUJfPNPpdzJ9dAUh54kzy4 wHCMNcsSv9SI57O2YQPBzjZUyAZ637Z9etKcXU+klA/R6e0J8B5q6GYepC8ErndynhXR kOPVlI7V4muk34VdTFpfV7fDuwmIXSrsRVkGjrWzdTVyyam81bZnSoTFnJxI58UCoiP5 KUqINuLkvsuEvvxzuLPjhANjpIigf3CQsHgSmI7ZXKQ/OH4bdPj3G2v8vdKwREe3qrLI x32cNsVhhqlv/grX5e3gI6OcIWZ81kzYu0+1FrOaUYtfR3sLkMndYJydpKIkpr5Dh9xA 8Dzg== X-Gm-Message-State: AOAM53201mqdMtrTE+kXB084dwv8Kt0htWtr84YdrI1lVYZSWO/IVRFh KpKdFis13C73dGEHB92RM1IIjwow5AG1wg== X-Google-Smtp-Source: ABdhPJyPknvx8Tctt+97K3THXSwIYvErKGFrqpZcngU07DOIiYs1NARegnMOjVgf1Qt27i4kn7pnSA== X-Received: by 2002:a37:8945:: with SMTP id l66mr33777093qkd.776.1639406210618; Mon, 13 Dec 2021 06:36:50 -0800 (PST) Received: from birita.. ([2804:431:c7ca:a776:980f:2e90:a6d5:36a5]) by smtp.gmail.com with ESMTPSA id x16sm5933672qkp.67.2021.12.13.06.36.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Dec 2021 06:36:50 -0800 (PST) To: libc-alpha@sourceware.org, Florian Weimer Subject: [PATCH v3 2/2] linux: Fix ancillary 64-bit time timestamp conversion (BZ #28349, BZ #28350) Date: Mon, 13 Dec 2021 11:36:43 -0300 Message-Id: <20211213143643.1182659-3-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211213143643.1182659-1-adhemerval.zanella@linaro.org> References: <20211213143643.1182659-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Netto Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" The __convert_scm_timestamps() only updates the control message last pointer for SOL_SOCKET type, so if the message control buffer contains multiple ancillary message types the converted timestamp one might overwrite a valid message. The test check if the extra ancillary space is correctly handled by recvmsg/recvmmsg, where if there is no extra space for the 64-bit time_t converted message the control buffer should be marked with MSG_TRUNC. It also check if recvmsg/recvmmsg handle correctly multiple ancillary data. Checked on x86_64-linux and on i686-linux-gnu on both 5.11 and 4.15 kernel. --- sysdeps/unix/sysv/linux/Makefile | 3 + .../unix/sysv/linux/convert_scm_timestamps.c | 8 +- .../sysv/linux/tst-socket-timestamp-time64.c | 1 + .../unix/sysv/linux/tst-socket-timestamp.c | 338 ++++++++++++++++++ 4 files changed, 345 insertions(+), 5 deletions(-) create mode 100644 sysdeps/unix/sysv/linux/tst-socket-timestamp-time64.c create mode 100644 sysdeps/unix/sysv/linux/tst-socket-timestamp.c diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile index 61acc1987d..60aa9d89d6 100644 --- a/sysdeps/unix/sysv/linux/Makefile +++ b/sysdeps/unix/sysv/linux/Makefile @@ -275,6 +275,9 @@ sysdep_routines += cmsg_nxthdr CFLAGS-recvmmsg.c = -fexceptions -fasynchronous-unwind-tables CFLAGS-sendmmsg.c = -fexceptions -fasynchronous-unwind-tables +tests += tst-socket-timestamp +tests-time64 += tst-socket-timestamp-time64 + tests-special += $(objpfx)tst-socket-consts.out $(objpfx)tst-socket-consts.out: ../sysdeps/unix/sysv/linux/tst-socket-consts.py PYTHONPATH=../scripts \ diff --git a/sysdeps/unix/sysv/linux/convert_scm_timestamps.c b/sysdeps/unix/sysv/linux/convert_scm_timestamps.c index 00c934c413..97be3fa5ed 100644 --- a/sysdeps/unix/sysv/linux/convert_scm_timestamps.c +++ b/sysdeps/unix/sysv/linux/convert_scm_timestamps.c @@ -54,6 +54,8 @@ __convert_scm_timestamps (struct msghdr *msg, socklen_t msgsize) cmsg != NULL; cmsg = CMSG_NXTHDR (msg, cmsg)) { + last = cmsg; + if (cmsg->cmsg_level != SOL_SOCKET) continue; @@ -75,8 +77,6 @@ __convert_scm_timestamps (struct msghdr *msg, socklen_t msgsize) tvts[1] = tmp[1]; break; } - - last = cmsg; } if (last == NULL || type == 0) @@ -89,9 +89,7 @@ __convert_scm_timestamps (struct msghdr *msg, socklen_t msgsize) } msg->msg_controllen += CMSG_SPACE (sizeof tvts); - cmsg = CMSG_NXTHDR(msg, last); - if (cmsg == NULL) - return; + cmsg = CMSG_NXTHDR (msg, last); cmsg->cmsg_level = SOL_SOCKET; cmsg->cmsg_type = type; cmsg->cmsg_len = CMSG_LEN (sizeof tvts); diff --git a/sysdeps/unix/sysv/linux/tst-socket-timestamp-time64.c b/sysdeps/unix/sysv/linux/tst-socket-timestamp-time64.c new file mode 100644 index 0000000000..ae424c2a70 --- /dev/null +++ b/sysdeps/unix/sysv/linux/tst-socket-timestamp-time64.c @@ -0,0 +1 @@ +#include "tst-socket-timestamp.c" diff --git a/sysdeps/unix/sysv/linux/tst-socket-timestamp.c b/sysdeps/unix/sysv/linux/tst-socket-timestamp.c new file mode 100644 index 0000000000..9aaa705054 --- /dev/null +++ b/sysdeps/unix/sysv/linux/tst-socket-timestamp.c @@ -0,0 +1,338 @@ +/* Check recvmsg/recvmmsg 64-bit timestamp support. + Copyright (C) 2021 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/* Some extra space added for ancillary data, it might be used to convert + 32-bit timestamp to 64-bit for _TIME_BITS=64. */ +enum { slack_max_size = 64 }; +static const int slack[] = { 0, 4, 8, 16, 32, slack_max_size }; + +static bool support_64_timestamp; +/* AF_INET socket and address used to send and receive data. */ +static int srv; +static struct sockaddr_in srv_addr; + +static int +do_sendto (const struct sockaddr_in *addr, int nmsgs) +{ + int s = xsocket (AF_INET, SOCK_DGRAM | SOCK_CLOEXEC, 0); + xconnect (s, (const struct sockaddr *) addr, sizeof (*addr)); + + for (int i = 0; i < nmsgs; i++) + xsendto (s, &i, sizeof (i), 0, (const struct sockaddr *) addr, + sizeof (*addr)); + + return 0; +} + +static void +do_recvmsg_slack_ancillary (bool use_multi_call, int s, void *cmsg, + size_t slack, size_t tsize, int exp_msg) +{ + int msg; + struct iovec iov = + { + .iov_base = &msg, + .iov_len = sizeof (msg) + }; + size_t msgs = CMSG_SPACE (tsize) + slack; + struct mmsghdr mmhdr = + { + .msg_hdr = + { + .msg_name = NULL, + .msg_namelen = 0, + .msg_iov = &iov, + .msg_iovlen = 1, + .msg_controllen = msgs, + .msg_control = cmsg != NULL ? cmsg - msgs : NULL, + }, + }; + + int r; + if (use_multi_call) + { + r = recvmmsg (s, &mmhdr, 1, 0, NULL); + if (r >= 0) + r = mmhdr.msg_len; + } + else + r = recvmsg (s, &mmhdr.msg_hdr, 0); + TEST_COMPARE (r, sizeof (int)); + TEST_COMPARE (msg, exp_msg); + + if (cmsg == NULL) + return; + + /* A timestamp is expected if 32-bit timestamp are used (support in every + configuration) or if underlying kernel support 64-bit timestamps. + Otherwise recvmsg will need extra space do add the 64-bit timestamp. */ + bool exp_timestamp; + if (sizeof (time_t) == 4 || support_64_timestamp) + exp_timestamp = true; + else + exp_timestamp = slack >= CMSG_SPACE (tsize); + + bool timestamp = false; + for (struct cmsghdr *cmsg = CMSG_FIRSTHDR (&mmhdr.msg_hdr); + cmsg != NULL; + cmsg = CMSG_NXTHDR (&mmhdr.msg_hdr, cmsg)) + { + if (cmsg->cmsg_level != SOL_SOCKET) + continue; + if (cmsg->cmsg_type == SCM_TIMESTAMP + && cmsg->cmsg_len == CMSG_LEN (sizeof (struct timeval))) + { + struct timeval tv; + memcpy (&tv, CMSG_DATA (cmsg), sizeof (tv)); + if (test_verbose) + printf ("SCM_TIMESTAMP: {%jd, %jd}\n", (intmax_t)tv.tv_sec, + (intmax_t)tv.tv_usec); + timestamp = true; + } + else if (cmsg->cmsg_type == SCM_TIMESTAMPNS + && cmsg->cmsg_len == CMSG_LEN (sizeof (struct timespec))) + { + struct timespec ts; + memcpy (&ts, CMSG_DATA (cmsg), sizeof (ts)); + if (test_verbose) + printf ("SCM_TIMESTAMPNS: {%jd, %jd}\n", (intmax_t)ts.tv_sec, + (intmax_t)ts.tv_nsec); + timestamp = true; + } + } + + /* If there is not timestamp in the ancilliary data, recvmsg should set + the flag inidcating it. */ + if (exp_timestamp && !timestamp) + TEST_VERIFY (mmhdr.msg_hdr.msg_flags & MSG_TRUNC); + else + TEST_COMPARE (timestamp, exp_timestamp); +} + +/* Check if the extra ancillary space is correctly handled by recvmsg and + recvmmsg: if there is no extra space for the 64-bit timestamp the syscall + should set MSG_TRUNC flag, otherwise an extra cmsghdr with the converted + timestamp is appended at the message control buffer. */ +static void +do_test_slack_space (void) +{ + /* Setup the ancillary data buffer with an extra page with PROT_NONE to + check the possible timestamp conversion on some systems. */ + struct support_next_to_fault nf = + support_next_to_fault_allocate (slack_max_size); + void *msgbuf = nf.buffer + slack_max_size; + + /* Enable the timestamp using struct timeval precision. */ + { + int r = setsockopt (srv, SOL_SOCKET, SO_TIMESTAMP, &(int){1}, + sizeof (int)); + TEST_VERIFY_EXIT (r != -1); + } + /* Check recvmsg. */ + do_sendto (&srv_addr, array_length (slack)); + for (int s = 0; s < array_length (slack); s++) + do_recvmsg_slack_ancillary (false, srv, msgbuf, slack[s], + sizeof (struct timeval), s); + /* Check recvmmsg. */ + do_sendto (&srv_addr, array_length (slack)); + for (int s = 0; s < array_length (slack); s++) + do_recvmsg_slack_ancillary (true, srv, msgbuf, slack[s], + sizeof (struct timeval), s); + + /* Now enable timestamp using a higher precision, it overwrites the previous + precision. */ + { + int r = setsockopt (srv, SOL_SOCKET, SO_TIMESTAMPNS, &(int){1}, + sizeof (int)); + TEST_VERIFY_EXIT (r != -1); + } + /* Check recvmsg. */ + do_sendto (&srv_addr, array_length (slack)); + for (int s = 0; s < array_length (slack); s++) + do_recvmsg_slack_ancillary (false, srv, msgbuf, slack[s], + sizeof (struct timespec), s); + /* Check recvmmsg. */ + do_sendto (&srv_addr, array_length (slack)); + for (int s = 0; s < array_length (slack); s++) + do_recvmsg_slack_ancillary (true, srv, msgbuf, slack[s], + sizeof (struct timespec), s); + + support_next_to_fault_free (&nf); +} + +/* Check if the converted 64-bit timestamp is correctly appended when there + are multiple ancillary messages. */ +static void +do_recvmsg_multiple_ancillary (bool use_multi_call, int s, void *cmsg, + size_t cmsgsize, int exp_msg) +{ + int msg; + struct iovec iov = + { + .iov_base = &msg, + .iov_len = sizeof (msg) + }; + size_t msgs = cmsgsize; + struct mmsghdr mmhdr = + { + .msg_hdr = + { + .msg_name = NULL, + .msg_namelen = 0, + .msg_iov = &iov, + .msg_iovlen = 1, + .msg_controllen = msgs, + .msg_control = cmsg, + }, + }; + + int r; + if (use_multi_call) + { + r = recvmmsg (s, &mmhdr, 1, 0, NULL); + if (r >= 0) + r = mmhdr.msg_len; + } + else + r = recvmsg (s, &mmhdr.msg_hdr, 0); + TEST_COMPARE (r, sizeof (int)); + TEST_COMPARE (msg, exp_msg); + + if (cmsg == NULL) + return; + + bool timestamp = false; + bool origdstaddr = false; + for (struct cmsghdr *cmsg = CMSG_FIRSTHDR (&mmhdr.msg_hdr); + cmsg != NULL; + cmsg = CMSG_NXTHDR (&mmhdr.msg_hdr, cmsg)) + { + if (cmsg->cmsg_level == SOL_IP + && cmsg->cmsg_type == IP_ORIGDSTADDR + && cmsg->cmsg_len >= CMSG_LEN (sizeof (struct sockaddr_in))) + { + struct sockaddr_in sa; + memcpy (&sa, CMSG_DATA (cmsg), sizeof (sa)); + if (test_verbose) + { + char str[INET_ADDRSTRLEN]; + inet_ntop (AF_INET, &sa.sin_addr, str, INET_ADDRSTRLEN); + printf ("IP_ORIGDSTADDR: %s:%d\n", str, ntohs (sa.sin_port)); + } + origdstaddr = sa.sin_addr.s_addr == srv_addr.sin_addr.s_addr + && sa.sin_port == srv_addr.sin_port; + } + if (cmsg->cmsg_level == SOL_SOCKET + && cmsg->cmsg_type == SCM_TIMESTAMP + && cmsg->cmsg_len >= CMSG_LEN (sizeof (struct timeval))) + { + struct timeval tv; + memcpy (&tv, CMSG_DATA (cmsg), sizeof (tv)); + if (test_verbose) + printf ("SCM_TIMESTAMP: {%jd, %jd}\n", (intmax_t)tv.tv_sec, + (intmax_t)tv.tv_usec); + timestamp = true; + } + } + + /* If there is no timestamp in the ancillary data, recvmsg should set + the flag to indicate it. */ + if (!timestamp) + TEST_VERIFY (mmhdr.msg_hdr.msg_flags & MSG_TRUNC); + else + TEST_COMPARE (timestamp, true); + TEST_COMPARE (origdstaddr, true); +} + +static void +do_test_multiple_ancillary (void) +{ + { + int r = setsockopt (srv, SOL_SOCKET, SO_TIMESTAMP, &(int){1}, + sizeof (int)); + TEST_VERIFY_EXIT (r != -1); + } + { + int r = setsockopt (srv, IPPROTO_IP, IP_RECVORIGDSTADDR, &(int){1}, + sizeof (int)); + TEST_VERIFY_EXIT (r != -1); + } + + /* Enougth data for default SO_TIMESTAMP, the IP_RECVORIGDSTADDR, and the + extra 64-bit SO_TIMESTAMP. */ + enum { msgbuflen = CMSG_SPACE (2 * sizeof (uint64_t)) + + CMSG_SPACE (sizeof (struct sockaddr_in)) + + CMSG_SPACE (2 * sizeof (uint64_t)) }; + char msgbuf[msgbuflen]; + + enum { nmsgs = 8 }; + /* Check recvmsg. */ + do_sendto (&srv_addr, nmsgs); + for (int s = 0; s < nmsgs; s++) + do_recvmsg_multiple_ancillary (false, srv, msgbuf, msgbuflen, s); + /* Check recvmmsg. */ + do_sendto (&srv_addr, nmsgs); + for (int s = 0; s < nmsgs; s++) + do_recvmsg_multiple_ancillary (true, srv, msgbuf, msgbuflen, s); +} + +static int +do_test (void) +{ + srv = xsocket (AF_INET, SOCK_DGRAM, 0); + srv_addr = (struct sockaddr_in) { + .sin_family = AF_INET, + .sin_addr = {.s_addr = htonl (INADDR_LOOPBACK) }, + }; + xbind (srv, (struct sockaddr *) &srv_addr, sizeof (srv_addr)); + { + socklen_t sa_len = sizeof (srv_addr); + xgetsockname (srv, (struct sockaddr *) &srv_addr, &sa_len); + TEST_VERIFY (sa_len == sizeof (srv_addr)); + } + + TEST_COMPARE (recvmsg (-1, NULL, 0), -1); + TEST_COMPARE (errno, EBADF); + TEST_COMPARE (recvmmsg (-1, NULL, 0, 0, NULL), -1); + TEST_COMPARE (errno, EBADF); + + /* If underlying kernel does not support */ + support_64_timestamp = support_socket_so_timestamp_time64 (srv); + + do_test_slack_space (); + do_test_multiple_ancillary (); + + xclose (srv); + + return 0; +} + +#include