From patchwork Mon Jan 24 12:28:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 50390 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 38CD83858000 for ; Mon, 24 Jan 2022 12:29:29 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 38CD83858000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1643027369; bh=NChMCIlaafgryf8fTqpRB38eoXsubbFDqIS3U5G7YUY=; 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=YsDyYu54jE/0l7pnrxi97tJZwtT+39NG7UzLgT9sZsp26VPU1/PImGc2Dellz6tlm DxCOLWcUhnDA3bqOyRvhlgv5qAEWa2R5Cw+Ke51TgGnQ+STMDMliU7ZQAHcC0enOx0 XxnWVtY/q5atKDandPXFakhZ3K3E/iy/fe8272OU= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-oi1-x236.google.com (mail-oi1-x236.google.com [IPv6:2607:f8b0:4864:20::236]) by sourceware.org (Postfix) with ESMTPS id B2BD33858C60 for ; Mon, 24 Jan 2022 12:28:26 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org B2BD33858C60 Received: by mail-oi1-x236.google.com with SMTP id x193so25308652oix.0 for ; Mon, 24 Jan 2022 04:28:26 -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=NChMCIlaafgryf8fTqpRB38eoXsubbFDqIS3U5G7YUY=; b=zZ/AdMDk5YA6hMz80Ak2OepoBt5qD4CuLJJkL6rP6w9js2guVU601i4li7kCPhG60M b8WpD9O5RZYyWEMMLa0Y7jdLA925JMHyez3vJpk+sUtCr4M1BfHk3FdwlhdKbp+0eYSn epFSxTC4ctj3i6bCflOYaHJfCXkMyCVTn9MHTTcsrfyQAIOz/Wc3xfkVulYjhTvHHdWJ Wv+5GS73WItt+r0P9tLvINAut4vp4fUzuANzIRxrsZtUuEwiL9jRplC/7Pm45Aaf23PN bQ3F1weLNBfcxikOAbahLwO0w2RBJ/Dso95aZjTmrJrQGmTbIz15SMXYJ4IRgUXCTEqG qzGQ== X-Gm-Message-State: AOAM531cSTj87EItoC2LoL6g0iRv0g3MfPdGJgJVrOH2usJDUsQLnYBx dx0P4Kj3EwI3M7TgrTp2YmkSN7Iqj1oSPw== X-Google-Smtp-Source: ABdhPJz8GBTKULmWFPCep4xGpVsdMHp7oP7DD7WdLPxDlJjk9ongJWmGkbR/5ub4+AOmEtpNKbUC/w== X-Received: by 2002:a05:6808:242:: with SMTP id m2mr1137156oie.145.1643027305964; Mon, 24 Jan 2022 04:28:25 -0800 (PST) Received: from birita.. ([2804:431:c7cb:27f8:c505:63c0:de61:b716]) by smtp.gmail.com with ESMTPSA id k17sm5133289otk.80.2022.01.24.04.28.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jan 2022 04:28:25 -0800 (PST) To: libc-alpha@sourceware.org, Florian Weimer Subject: [PATCH v5 1/2] support: Add support_socket_so_timestamp_time64 Date: Mon, 24 Jan 2022 09:28:20 -0300 Message-Id: <20220124122821.1265965-2-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220124122821.1265965-1-adhemerval.zanella@linaro.org> References: <20220124122821.1265965-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-11.8 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 | 48 ++++++++++++++++++++ 3 files changed, 53 insertions(+) create mode 100644 support/support_socket_so_timestamp_time64.c diff --git a/support/Makefile b/support/Makefile index 6dc6c9d49a..5ddcb8d158 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 ee27149d98..73b9fc48f0 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..f3911a4932 --- /dev/null +++ b/support/support_socket_so_timestamp_time64.c @@ -0,0 +1,48 @@ +/* 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); + return r != -1; +# endif +#else + return false; +#endif +} From patchwork Mon Jan 24 12:28:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 50391 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 905D63858002 for ; Mon, 24 Jan 2022 12:30:11 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 905D63858002 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1643027411; bh=E+x8u+3inj+JSxeFH6ibG0qFEyxtMevmGvzGJRiC1lM=; 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=C/vmA7Zvsdz7ndELIY3Dpst53RCAs2uBCqy1h0fqwDW33CMo2nQS8CrXU9uW/jSxm J9C6tBwf/TvnGU0j51cBcudCAAjkfY3HcuOL3htOEzbz26mDGNSdhjNFerbHgrbljO 1lOcdebIUE8ft8hICOKONK1l9Bq26PAtnj55KscI= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-oi1-x22d.google.com (mail-oi1-x22d.google.com [IPv6:2607:f8b0:4864:20::22d]) by sourceware.org (Postfix) with ESMTPS id DF4F63858005 for ; Mon, 24 Jan 2022 12:28:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org DF4F63858005 Received: by mail-oi1-x22d.google.com with SMTP id p203so8848024oih.10 for ; Mon, 24 Jan 2022 04:28:29 -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:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=E+x8u+3inj+JSxeFH6ibG0qFEyxtMevmGvzGJRiC1lM=; b=eTcHgdj0mbLRQAEHjneXhQN41ra+MDVkCpdIUV+J5/P9Mxw+i7t/UwWuWQWYNsy8MH G5zoLJW/P2nhgF9ekzuWWYcXcf8R+tMU8CqSX2ZCdk63ueVrr5+qbvJTc7pKV5bTSk6C ckrZafuduXBd7GrIOO0n98xwKkjduja/hA5kmRisKQO1X/N8BdodgHZcS1dXH8RG5Yak Q41zjZOhqIVelRnRPnBanvm2ZMe1qZp2CkPXkHaybx+ecYTVb+2dGVb9MsrnTQ3xLWP/ 9d2WIvpqScZxLbmFNt3xuaGPST9t4OTsnjnIAGPWmw+FJa4NfiBHbdUAzdOXwA2jSAkr u0iQ== X-Gm-Message-State: AOAM532wIaQ/xFfisIl2HPDA7SFuax94LclMWq/WssH/4o4o322zO26q evp07Qmz8kdkaLZuTqTiixaV3isMDF6RUg== X-Google-Smtp-Source: ABdhPJxC2OkreHy1Fsb6ofj6+srzt8estcrvHdFVu0kz7NXh322W0nDkTzGb03bho5GMPgJmIksKPw== X-Received: by 2002:aca:241a:: with SMTP id n26mr1157981oic.24.1643027308900; Mon, 24 Jan 2022 04:28:28 -0800 (PST) Received: from birita.. ([2804:431:c7cb:27f8:c505:63c0:de61:b716]) by smtp.gmail.com with ESMTPSA id k17sm5133289otk.80.2022.01.24.04.28.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jan 2022 04:28:28 -0800 (PST) To: libc-alpha@sourceware.org, Florian Weimer Subject: [PATCH v5 2/2] linux: Fix ancillary 64-bit time timestamp conversion (BZ #28349, BZ#28350) Date: Mon, 24 Jan 2022 09:28:21 -0300 Message-Id: <20220124122821.1265965-3-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220124122821.1265965-1-adhemerval.zanella@linaro.org> References: <20220124122821.1265965-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.2 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 checks 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. Co-authored-by: Fabian Vogt --- sysdeps/unix/sysv/linux/Makefile | 3 + .../unix/sysv/linux/convert_scm_timestamps.c | 12 +- .../sysv/linux/tst-socket-timestamp-time64.c | 1 + .../unix/sysv/linux/tst-socket-timestamp.c | 340 ++++++++++++++++++ 4 files changed, 351 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 7ca9350c99..4c80ff809c 100644 --- a/sysdeps/unix/sysv/linux/Makefile +++ b/sysdeps/unix/sysv/linux/Makefile @@ -277,6 +277,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 580eb4be84..b4268a2079 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) @@ -88,10 +88,12 @@ __convert_scm_timestamps (struct msghdr *msg, socklen_t msgsize) return; } + /* Zero memory for the new cmsghdr, so reading cmsg_len field + by CMSG_NXTHDR does not trigger UB. */ + memset (msg->msg_control + msg->msg_controllen, 0, + CMSG_SPACE (sizeof tvts)); 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..548be29812 --- /dev/null +++ b/sysdeps/unix/sysv/linux/tst-socket-timestamp.c @@ -0,0 +1,340 @@ +/* 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 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)); + + xclose (s); + + return 0; +} + +static void +do_recvmsg_slack_ancillary (bool use_multi_call, int s, void *cmsg, + size_t slack, size_t tsize, int exp_payload) +{ + int payload; + struct iovec iov = + { + .iov_base = &payload, + .iov_len = sizeof (payload) + }; + size_t msg_controllen = CMSG_SPACE (tsize) + slack; + char *msg_control = cmsg - msg_controllen; + memset (msg_control, 0x55, msg_controllen); + struct mmsghdr mmhdr = + { + .msg_hdr = + { + .msg_name = NULL, + .msg_namelen = 0, + .msg_iov = &iov, + .msg_iovlen = 1, + .msg_control = msg_control, + .msg_controllen = msg_controllen + }, + }; + + 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 (payload, exp_payload); + + 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; + } + } + + 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++) + { + memset (nf.buffer, 0x55, nf.length); + 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++) + { + memset (nf.buffer, 0x55, nf.length); + 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. */ + 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