From patchwork Mon Jul 5 18:30:27 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: 44161 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 7AB5D383D028 for ; Mon, 5 Jul 2021 18:36:22 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7AB5D383D028 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1625510182; bh=/KoU7Cah9tNOqACzTmKUq1JYozWoISuKyxqokqXeZSc=; 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=YXoN4h4QMUEoBCv2lM6OeU/YwS+EHN6nFFlIqszFdeQtWjryoUfVSVuyxRCppnu0I 22M7A5LP+VKnDH7pgeP1h3bUKyG3EQoxz3DyoicYQ2lsuDiVYf4jt0F+9Eafc7AX6Q SO69IgaYBXTcwHv16eK+7hmOvPRdSsWeRZF8YByc= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pj1-x102d.google.com (mail-pj1-x102d.google.com [IPv6:2607:f8b0:4864:20::102d]) by sourceware.org (Postfix) with ESMTPS id 080AA383D805 for ; Mon, 5 Jul 2021 18:30:43 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 080AA383D805 Received: by mail-pj1-x102d.google.com with SMTP id 67-20020a17090a0fc9b02901725ed49016so75076pjz.1 for ; Mon, 05 Jul 2021 11:30:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/KoU7Cah9tNOqACzTmKUq1JYozWoISuKyxqokqXeZSc=; b=dVMgvlgaQ71zSqn7NGyIwHA3BmpvCY+YURv0prVpHEyA3wqnf9crL/Q61G71iU2OmI 6JYLsPKWCHtBgT+inp6CMO1TD/eZ+d+x/oc8mvBOql2MPryb5gS/jlvXOPlOtT4fvyyy slHqFNj5WMZaWt/o6Tg/fb/3d7YdCaPVNxth1ypRXu5Tj3gQhOjytPu+TXER355Y0veO k0S48DMpVmgeH1D4k48pHJSPY0iqeACB+Va8Np2poIqxEm98geBP/TlP72cmrndf7s7D YZvnI1nw32pZ5oe246LTDraQcA+G43AgAUlSqtboibSpNfvIgGB8JQ8OovX2CwRlYxeN kWeA== X-Gm-Message-State: AOAM533q7FEVOwQ2YJOo5OZiYKJLFHw1MYMpa4Nxffv7yVr15Ea600ap D3juh3fNRVmQstZTVRssd+V2oMd6xV7SpA== X-Google-Smtp-Source: ABdhPJxThoauPk0CPHe8+EfNfqltFntLtZGoHRclqwxVZ8rZLynnHsj4xq2eWeLTRt01wnORclolyQ== X-Received: by 2002:a17:90a:73ca:: with SMTP id n10mr404704pjk.16.1625509841807; Mon, 05 Jul 2021 11:30:41 -0700 (PDT) Received: from birita.. ([177.194.59.218]) by smtp.gmail.com with ESMTPSA id y13sm14311299pgp.16.2021.07.05.11.30.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Jul 2021 11:30:41 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH 7/7] socket: Add recvmmsg timestamp test Date: Mon, 5 Jul 2021 15:30:27 -0300 Message-Id: <20210705183027.3804093-8-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210705183027.3804093-1-adhemerval.zanella@linaro.org> References: <20210705183027.3804093-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.5 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 test check if SO_TIMESTAMP and SO_TIMESTAMPNS is correctly generated. The recvmsg() is called with different ancilliary data buffers, to check if the conversion for 64-bit time on 32-bit legacy ABIs are handled correctly. For such archicutures, depending of the remmaning ancially data space the timestamp can not be appended and MSG_TRUNC is returned instead. Checked on x86_64-linux and on i686-linux-gnu on both 5.11 and 4.15 kernel. --- sysdeps/unix/sysv/linux/Makefile | 4 +- sysdeps/unix/sysv/linux/tst-recvmmsg-time64.c | 1 + sysdeps/unix/sysv/linux/tst-recvmmsg.c | 185 ++++++++++++++++++ 3 files changed, 188 insertions(+), 2 deletions(-) create mode 100644 sysdeps/unix/sysv/linux/tst-recvmmsg-time64.c create mode 100644 sysdeps/unix/sysv/linux/tst-recvmmsg.c diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile index be6fe08ac2..74a8d865b2 100644 --- a/sysdeps/unix/sysv/linux/Makefile +++ b/sysdeps/unix/sysv/linux/Makefile @@ -237,8 +237,8 @@ sysdep_routines += cmsg_nxthdr CFLAGS-recvmmsg.c = -fexceptions -fasynchronous-unwind-tables CFLAGS-sendmmsg.c = -fexceptions -fasynchronous-unwind-tables -tests += tst-recvmsg -tests-time64 += tst-recvmsg-time64 +tests += tst-recvmsg tst-recvmmsg +tests-time64 += tst-recvmsg-time64 tst-recvmmsg-time64 tests-special += $(objpfx)tst-socket-consts.out $(objpfx)tst-socket-consts.out: ../sysdeps/unix/sysv/linux/tst-socket-consts.py diff --git a/sysdeps/unix/sysv/linux/tst-recvmmsg-time64.c b/sysdeps/unix/sysv/linux/tst-recvmmsg-time64.c new file mode 100644 index 0000000000..7b9b1bea03 --- /dev/null +++ b/sysdeps/unix/sysv/linux/tst-recvmmsg-time64.c @@ -0,0 +1 @@ +#include "tst-recvmmsg.c" diff --git a/sysdeps/unix/sysv/linux/tst-recvmmsg.c b/sysdeps/unix/sysv/linux/tst-recvmmsg.c new file mode 100644 index 0000000000..012b364434 --- /dev/null +++ b/sysdeps/unix/sysv/linux/tst-recvmmsg.c @@ -0,0 +1,185 @@ +/* Check recvmmsg 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 + +/* Some extra space added for ancillary data, it might be used to convert + 32-bit timestamp to 64-bit for _TIME_BITS=64 on older kernels. */ +static const int slack[] = { 0, 4, 8, 16, 32, 64 }; + +static size_t pagesize; + +static int +do_test_send (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; +} + +#define NMSGS 5 + +static void +do_recvmmsg (int s, bool support_64_timestamp, void *cmsg[], size_t slack, + size_t tsize) +{ + /* 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); + + int msg[5]; + struct iovec iov[NMSGS]; + for (int i = 0; i < NMSGS; i++) + { + iov[i].iov_base = &msg[i]; + iov[i].iov_len = sizeof (msg[i]); + } + struct mmsghdr msghdr[NMSGS]; + size_t msgs = CMSG_SPACE (tsize + slack); + for (int i = 0; i < NMSGS; i++) + { + msghdr[i].msg_hdr.msg_name = NULL; + msghdr[i].msg_hdr.msg_namelen = 0; + msghdr[i].msg_hdr.msg_iov = &iov[i]; + msghdr[i].msg_hdr.msg_iovlen = 1; + msghdr[i].msg_hdr.msg_controllen = msgs, + msghdr[i].msg_hdr.msg_control = cmsg[i] != NULL + ? cmsg[i] + pagesize - msgs : NULL; + } + + TEST_COMPARE (recvmmsg (s, msghdr, NMSGS, 0, NULL), NMSGS); + for (int i = 0; i < NMSGS; i++) + { + if (msghdr[i].msg_len == 0) + continue; + + TEST_COMPARE (msg[i], i); + + int timestamp = false; + for (struct cmsghdr *cmsg = CMSG_FIRSTHDR (&msghdr[i].msg_hdr); + cmsg != NULL; + cmsg = CMSG_NXTHDR (&msghdr[i].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)); + 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)); + 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 (msghdr[i].msg_hdr.msg_flags & MSG_TRUNC); + else + TEST_COMPARE (exp_timestamp, timestamp); + } +} + +static int +do_test (void) +{ + int srv = xsocket (AF_INET, SOCK_DGRAM, 0); + struct sockaddr_in srv_addr = + { + .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 (recvmmsg (-1, NULL, 0, 0, NULL), -1); + TEST_COMPARE (errno, EBADF); + + /* Setup the ancillary data buffer with an extra page with PROT_NONE to + check the possible timestamp conversion on some systems. */ + pagesize = sysconf (_SC_PAGESIZE); + if (pagesize == -1) + FAIL_EXIT1 ("sysconf (_SC_PAGESIZE): %m\n"); + void *msgbuf[NMSGS]; + for (int i = 0; i < NMSGS; i++) + { + msgbuf[i] = xmmap (0, 2 * pagesize, PROT_NONE, + MAP_ANONYMOUS | MAP_PRIVATE, -1); + xmprotect (msgbuf[i], pagesize, PROT_READ | PROT_WRITE); + } + + /* If underlying kernel does not support */ + bool support_64_timestamp = support_socket_time64_timestamp (srv); + + /* Enable the timestamp using struct timeval precision. */ + xsetsockopt (srv, SOL_SOCKET, SO_TIMESTAMP, &(int){1}, sizeof (int)); + for (int s = 0; s < array_length (slack); s++) + { + do_test_send (&srv_addr, NMSGS); + do_recvmmsg (srv, support_64_timestamp, msgbuf, slack[s], + sizeof (struct timeval)); + } + + /* Now enable timestamp using a higher precision, it overwrites the previous + precision. */ + xsetsockopt (srv, SOL_SOCKET, SO_TIMESTAMPNS, &(int){1}, sizeof (int)); + for (int s = 0; s < array_length (slack); s++) + { + do_test_send (&srv_addr, NMSGS); + do_recvmmsg (srv, support_64_timestamp, msgbuf, slack[s], + sizeof (struct timespec)); + } + + return 0; +} + +#include