From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ot1-x32f.google.com (mail-ot1-x32f.google.com [IPv6:2607:f8b0:4864:20::32f]) by sourceware.org (Postfix) with ESMTPS id C4AF83857C5C for ; Tue, 1 Feb 2022 18:55:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org C4AF83857C5C Received: by mail-ot1-x32f.google.com with SMTP id x52-20020a05683040b400b0059ea92202daso17119174ott.7 for ; Tue, 01 Feb 2022 10:55:08 -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:mime-version :content-transfer-encoding; bh=PlB0lKJhf2ITNd+2hMtezy69KyCQ2HYUSThdaCLiAQ0=; b=OkKm/lh8+gt+OnzFQ/2mcQe2aLrrBPgjYqM59+Tm0xQwDDnHpZYTkyHulMNKGVBdnT G8tyP7UWhFm63n8Fjvc3r9C6z7JKDOKb1uF4/ZWSCoQMLPxYNMU/NFqVABIpGlA1ZVEz RAVd/UCjvbQWynfiRiK7rFi/6NfR2DHWnjhe/Y1eT+cyxMOiw6Ln1lfvH8olxAA0GoGT oqdYBfjKweK24CQrLg9+etIa2Li6iz1l5wsadR7x1oXE+sM4FyliVQzJzT+SuYMh6xb3 NpQv+yt777d2HajWZ9RxgIaK+TGwTcs3TgOL/RMN4hlct8EYJWbnn6rgkH7EU/QlSOpX qqdA== X-Gm-Message-State: AOAM53189/p/gibqOiciq2/VswihlLGzaSRBhhzVwQno5qetISm16F2g iv7mSWm3owjnBrWMqZyfJ6lL7eCe2D8AXA== X-Google-Smtp-Source: ABdhPJwVhTE5EzLwFre2MT5u9d2yyxsUzUT1K3FM0hL80WvMKFxDBBvE2W+OwftEg+UkpbrprycbnQ== X-Received: by 2002:a9d:634c:: with SMTP id y12mr14400389otk.247.1643741708043; Tue, 01 Feb 2022 10:55:08 -0800 (PST) Received: from birita.. ([2804:431:c7ca:709a:f3cb:a92a:e1ce:d27d]) by smtp.gmail.com with ESMTPSA id bg10sm6786162oib.33.2022.02.01.10.55.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Feb 2022 10:55:07 -0800 (PST) From: Adhemerval Zanella To: libc-stable@sourceware.org Cc: Florian Weimer Subject: [COMMITTED 2.34 1/4] support: Add support_socket_so_timestamp_time64 Date: Tue, 1 Feb 2022 15:54:59 -0300 Message-Id: <20220201185502.1045497-1-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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_NUMSUBJECT, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE 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-stable@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-stable mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Feb 2022 18:55:10 -0000 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. Reviewed-by: Florian Weimer (cherry picked from 38bc0f4e78934aab455b31af05cefcbf3c22bece) --- 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 2a0731796f..724ae6d712 100644 --- a/support/Makefile +++ b/support/Makefile @@ -78,6 +78,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 c219e0d9d1..309be85b09 100644 --- a/support/support.h +++ b/support/support.h @@ -164,6 +164,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..54bf3f4272 --- /dev/null +++ b/support/support_socket_so_timestamp_time64.c @@ -0,0 +1,48 @@ +/* Return whether socket supports 64-bit timestamps. + Copyright (C) 2022 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 +} -- 2.32.0