From patchwork Tue Jul 6 14:50:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 44171 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 A5078388A837 for ; Tue, 6 Jul 2021 15:07:22 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A5078388A837 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1625584042; bh=gIFxbpTPbIwrfAubEdeuIi7KwHPoX/91LxpVOc6ATCQ=; 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=LDd7p6EkfwzFFA2ZM5knmSGIPw4U8MxMiyTMU/o6volv9WtN7g5mklKQ8SaYPlLMY tJti0WvbM8TaBH7H3XBwzy5p7nFRr9RYi8/f9V8uqwwvfn2dk5nDyiQeBm7Vn66+QL kW4ocvvac6psphFlooT66s00gwHF5bEVcKoXpfig= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pj1-x102a.google.com (mail-pj1-x102a.google.com [IPv6:2607:f8b0:4864:20::102a]) by sourceware.org (Postfix) with ESMTPS id B7C30388CC1B for ; Tue, 6 Jul 2021 14:50:41 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org B7C30388CC1B Received: by mail-pj1-x102a.google.com with SMTP id p17-20020a17090b0111b02901723ab8d11fso2039413pjz.1 for ; Tue, 06 Jul 2021 07:50:41 -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=gIFxbpTPbIwrfAubEdeuIi7KwHPoX/91LxpVOc6ATCQ=; b=fqKIJj6N4cg1SwPcJLiGSDVJHMXiwulFkCM60pPeTyG4lfyDjI6DU7ei1uMdgTQLxG Z94IfHSa7CG6vBeptmB69MDIoQWgqY2zwxRzP8h79pGLg8yW0IqsqDG7ullRXMs7J1bp Y3Mh53ioDMcIMS+AMjqW9r6B7EwvQ+g/izJ7Gx85VNfJSOnzuioZRsYfgrG3pqzJJCyM Sjz4wGMIn6wr0BtFecuueJorsnnBnHYRLuqwmfbFDDKMD+ZOq4UFKSdvbbpePoOOHt86 reOQajYMuaa0zwgQTl/rNNGmIKB5GzpoSdeWQYK+hFnIDQv5bAvzirVs884IVSyLhWQr 9V8w== X-Gm-Message-State: AOAM531uKefbppx5aq4dZx59dJgb3Ps6VgRwDB3AqP97NestxdYWh6oy H4hzfOB0DxviKPJf97T9qdBiJxI1aU+w1A== X-Google-Smtp-Source: ABdhPJwiM6nm4pDHi7XHLJ+Ynpv/hQ6Ebak/yrId6vNc4FiwVgoQpfhx/mMNNCjPaALsuXUGEzC1jw== X-Received: by 2002:a17:90a:4890:: with SMTP id b16mr888485pjh.211.1625583040691; Tue, 06 Jul 2021 07:50:40 -0700 (PDT) Received: from birita.. ([177.194.59.218]) by smtp.gmail.com with ESMTPSA id t1sm14529875pjo.33.2021.07.06.07.50.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 07:50:40 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH v2 1/2] support: Add support_socket_time64_timestamp Date: Tue, 6 Jul 2021 11:50:34 -0300 Message-Id: <20210706145035.1657874-2-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210706145035.1657874-1-adhemerval.zanella@linaro.org> References: <20210706145035.1657874-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 Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" Changes from previous version: - Use getsockopt instead of setsockopt. - Fixed socketcall fallback. --- 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 | 3 ++ support/support_socket_time64_timestamp.c | 64 +++++++++++++++++++++++ 3 files changed, 68 insertions(+) create mode 100644 support/support_socket_time64_timestamp.c diff --git a/support/Makefile b/support/Makefile index 5c69f0de4b..7659357b28 100644 --- a/support/Makefile +++ b/support/Makefile @@ -76,6 +76,7 @@ libsupport-routines = \ support_set_small_thread_stack_size \ support_shared_allocate \ support_small_stack_thread_attribute \ + support_socket_time64_timestamp \ support_stat_nanoseconds \ support_subprocess \ support_test_compare_blob \ diff --git a/support/support.h b/support/support.h index 9ec8ecb8d7..bf74a2584b 100644 --- a/support/support.h +++ b/support/support.h @@ -154,6 +154,9 @@ 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. */ +extern bool support_socket_time64_timestamp (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_time64_timestamp.c b/support/support_socket_time64_timestamp.c new file mode 100644 index 0000000000..a2b059a13d --- /dev/null +++ b/support/support_socket_time64_timestamp.c @@ -0,0 +1,64 @@ +/* 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 + +static int +__attribute_used__ +getsockopt_syscall (int fd) +{ + 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; +} +#endif + +bool +support_socket_time64_timestamp (int fd) +{ +#ifdef __linux__ +# if __LINUX_KERNEL_VERSION >= 0x050100 \ + || __WORDSIZE == 64 \ + || (defined __SYSCALL_WORDSIZE && __SYSCALL_WORDSIZE == 64) + return true; +# else + return getsockopt_syscall (fd) != -1; +# endif +#else + return false; +#endif +}