From nobody Tue Nov 18 07:47:48 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1608321359; cv=none; d=zohomail.com; s=zohoarc; b=ePHOQTIpAwzia4wBPO0JWNoVj2u5549KK+Muw1LA9+UNv++tcj+BhpWZw+UBUf9K1/fjxiBYAZQ8aBoQXPRZS2fliN233RBQK5df9p9v+v0Sth/rfmskm0ROSz5tAbJtWBGMvKaI24r19GG8yv6Vh8OI0EGelJkTVyWVIq8wg30= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1608321359; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=F/N/q4dsael2Jg577ucwa0NpI8hd+NA9mcYgK85nlzI=; b=lm8S0Mtty7Q66O6Yp9VKEFWIWt4JdzSmcquDJtfqHS0IfWuVCGmPYq8mkURTTicqgXSMREhvYwDHERaCV2Oi5eiO7VrTEGwuor+/EmiUcR2NsIWPUiB/J0ub5Z8kwNaF2eyQDU+uTG0vUXEksNBWvOn1Wwqc32T7iDGzmgJYuwE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1608321358928665.4013320723916; Fri, 18 Dec 2020 11:55:58 -0800 (PST) Received: from localhost ([::1]:45838 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kqLr3-0000KU-EY for importer@patchew.org; Fri, 18 Dec 2020 14:55:57 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43068) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <33wjdXwMKCmoaKeOWWOTM.KWUYMUc-LMdMTVWVOVc.WZO@flex--scw.bounces.google.com>) id 1kqLpL-0007R7-W7 for qemu-devel@nongnu.org; Fri, 18 Dec 2020 14:54:12 -0500 Received: from mail-qt1-x84a.google.com ([2607:f8b0:4864:20::84a]:49909) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <33wjdXwMKCmoaKeOWWOTM.KWUYMUc-LMdMTVWVOVc.WZO@flex--scw.bounces.google.com>) id 1kqLpJ-0007H4-9C for qemu-devel@nongnu.org; Fri, 18 Dec 2020 14:54:11 -0500 Received: by mail-qt1-x84a.google.com with SMTP id a11so2440943qto.16 for ; Fri, 18 Dec 2020 11:54:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=F/N/q4dsael2Jg577ucwa0NpI8hd+NA9mcYgK85nlzI=; b=HBIBjg5v81G1CmDdBrvY3kHmeBaG/yRx5DFXZ7/Zs24eAR3PUkKoTlbYFJ64jgnmV2 XRspApriR8hpLjlttY1KfQULjyDw6rWZIUOeXwbatCazmrgnW2CkD4VGx9187woS2BgH fbDyQu5N29eH93/qK8jBmjNhQ0+GK9ofl9So7+B0ja3PprJMB5hqs8doQ6nweVKy2u84 +XKB+sPT5v53kOrQYDFHewShlWTxiqO+rHFElq23ZUjh/JPulNkOGM57t+xy8pnGw/sK 80n9cyXjDbEbtkoVDlsyAhz71tzoz/RYsOzFVMRmtE7QFix5XJHldYSovu1lKyyvJy0D 6MZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=F/N/q4dsael2Jg577ucwa0NpI8hd+NA9mcYgK85nlzI=; b=SHquDhPDqSgp3FRSDip2fElF3D8/Qnby6SnibLMzdWT4k2drVMDcRlH694sDnqJbYC 3khty3+VVw4DRhFK0akOVJ4YhfMAB7bKPGS/HlbWWyYbM64i0KoLFqXNmP86/ysYmKtz bG1M5URTmHXiIYuTHEgq2qaIuGvH+1o2ZEK/f/fmQ+k75OTWXj/kNKSvUhK+QcIVN6sg qSgY1oSgzVXy5uIU/CF7OeulE9OAzs2QxgLNfjJnBYIpWwMiwwaIcYJ9t9DSenS196vv 8lWs6OptMwJiFNphIkR2Ahsjr8CK8ZpubtZMP042O+DG1HsRYDSMK1le2X3ji55GvOw+ LHGQ== X-Gm-Message-State: AOAM531iq69gV3pQ6/OfdarGBzFQRC25uxHEoyT24eXmp9a5I0K/+nFX NhZAVW02MeD9eyqj1c49cM7ZBV+rnbW+8vF1citjDc94kRXVTnMpAP0wKEHnHDKRq+lmcUybKb0 Oz3vcTGxa+8oEFWJCPk1A+D9PWZV+TlbgrmnNaY277Ne46ykqbyWA X-Google-Smtp-Source: ABdhPJy5gonETZjt4DYpBemDDghN11g3C40S1a5GHWIypQun6A5APinPebhJhK43nde9rK+IfHXni9Q= X-Received: from scw-glinux.svl.corp.google.com ([2620:15c:2ce:200:f693:9fff:fef4:29b5]) (user=scw job=sendgmr) by 2002:a0c:c18e:: with SMTP id n14mr6425084qvh.48.1608321247659; Fri, 18 Dec 2020 11:54:07 -0800 (PST) Date: Fri, 18 Dec 2020 11:54:01 -0800 In-Reply-To: <20201218195402.3581189-1-scw@google.com> Message-Id: <20201218195402.3581189-2-scw@google.com> Mime-Version: 1.0 References: <20201218195402.3581189-1-scw@google.com> X-Mailer: git-send-email 2.29.2.684.gfbc64c5ab5-goog Subject: [PATCH v3 1/2] linux-user: Update SO_TIMESTAMP to SO_TIMESTAMP_OLD/NEW To: qemu-devel@nongnu.org, laurent@vivier.eu Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::84a; envelope-from=33wjdXwMKCmoaKeOWWOTM.KWUYMUc-LMdMTVWVOVc.WZO@flex--scw.bounces.google.com; helo=mail-qt1-x84a.google.com X-Spam_score_int: -95 X-Spam_score: -9.6 X-Spam_bar: --------- X-Spam_report: (-9.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_MED=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, USER_IN_DEF_DKIM_WL=-7.5 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Shu-Chun Weng Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Reply-to: Shu-Chun Weng From: Shu-Chun Weng via X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Both guest options map to host SO_TIMESTAMP while keeping a global bit to remember if the guest expects the old or the new format. Don't support programs mixing two formats. Added a multiarch test to verify. Signed-off-by: Shu-Chun Weng --- v1 -> v2: Only keep track of old or new format globally, remove support for differe= nt sockets mixing different formats. Fix style problems. v2 -> v3: Rebase to master on Dec 18, 2020 linux-user/alpha/sockbits.h | 8 +- linux-user/generic/sockbits.h | 9 +- linux-user/hppa/sockbits.h | 8 +- linux-user/mips/sockbits.h | 8 +- linux-user/sparc/sockbits.h | 8 +- linux-user/strace.c | 7 +- linux-user/syscall.c | 91 ++++++-- tests/tcg/multiarch/socket_timestamp.c | 296 +++++++++++++++++++++++++ 8 files changed, 408 insertions(+), 27 deletions(-) create mode 100644 tests/tcg/multiarch/socket_timestamp.c diff --git a/linux-user/alpha/sockbits.h b/linux-user/alpha/sockbits.h index d54dc98c09..40f0644df0 100644 --- a/linux-user/alpha/sockbits.h +++ b/linux-user/alpha/sockbits.h @@ -48,8 +48,6 @@ #define TARGET_SO_DETACH_FILTER 27 =20 #define TARGET_SO_PEERNAME 28 -#define TARGET_SO_TIMESTAMP 29 -#define TARGET_SCM_TIMESTAMP TARGET_SO_TIMESTAMP =20 #define TARGET_SO_PEERSEC 30 #define TARGET_SO_PASSSEC 34 @@ -75,6 +73,12 @@ /* Instruct lower device to use last 4-bytes of skb data as FCS */ #define TARGET_SO_NOFCS 43 =20 +#define TARGET_SO_TIMESTAMP_OLD 29 +#define TARGET_SCM_TIMESTAMP_OLD TARGET_SO_TIMESTAMP_OLD + +#define TARGET_SO_TIMESTAMP_NEW 63 +#define TARGET_SCM_TIMESTAMP_NEW TARGET_SO_TIMESTAMP_NEW + /* TARGET_O_NONBLOCK clashes with the bits used for socket types. Therefo= re we * have to define SOCK_NONBLOCK to a different value here. */ diff --git a/linux-user/generic/sockbits.h b/linux-user/generic/sockbits.h index e44733c601..532cf2d3dc 100644 --- a/linux-user/generic/sockbits.h +++ b/linux-user/generic/sockbits.h @@ -49,10 +49,15 @@ #define TARGET_SO_DETACH_FILTER 27 =20 #define TARGET_SO_PEERNAME 28 -#define TARGET_SO_TIMESTAMP 29 -#define TARGET_SCM_TIMESTAMP TARGET_SO_TIMESTAMP =20 #define TARGET_SO_ACCEPTCONN 30 =20 #define TARGET_SO_PEERSEC 31 + +#define TARGET_SO_TIMESTAMP_OLD 29 +#define TARGET_SCM_TIMESTAMP_OLD TARGET_SO_TIMESTAMP_OLD + +#define TARGET_SO_TIMESTAMP_NEW 63 +#define TARGET_SCM_TIMESTAMP_NEW TARGET_SO_TIMESTAMP_NEW + #endif diff --git a/linux-user/hppa/sockbits.h b/linux-user/hppa/sockbits.h index 23f69a3293..284a47e74e 100644 --- a/linux-user/hppa/sockbits.h +++ b/linux-user/hppa/sockbits.h @@ -29,8 +29,6 @@ #define TARGET_SO_BSDCOMPAT 0x400e #define TARGET_SO_PASSCRED 0x4010 #define TARGET_SO_PEERCRED 0x4011 -#define TARGET_SO_TIMESTAMP 0x4012 -#define TARGET_SCM_TIMESTAMP TARGET_SO_TIMESTAMP #define TARGET_SO_TIMESTAMPNS 0x4013 #define TARGET_SCM_TIMESTAMPNS TARGET_SO_TIMESTAMPNS =20 @@ -67,6 +65,12 @@ =20 #define TARGET_SO_CNX_ADVICE 0x402E =20 +#define TARGET_SO_TIMESTAMP_OLD 0x4012 +#define TARGET_SCM_TIMESTAMP_OLD TARGET_SO_TIMESTAMP_OLD + +#define TARGET_SO_TIMESTAMP_NEW 0x4038 +#define TARGET_SCM_TIMESTAMP_NEW TARGET_SO_TIMESTAMP_NEW + /* TARGET_O_NONBLOCK clashes with the bits used for socket types. Therefo= re we * have to define SOCK_NONBLOCK to a different value here. */ diff --git a/linux-user/mips/sockbits.h b/linux-user/mips/sockbits.h index 0f022cd598..b4c39d9588 100644 --- a/linux-user/mips/sockbits.h +++ b/linux-user/mips/sockbits.h @@ -61,14 +61,18 @@ #define TARGET_SO_DETACH_FILTER 27 =20 #define TARGET_SO_PEERNAME 28 -#define TARGET_SO_TIMESTAMP 29 -#define SCM_TIMESTAMP SO_TIMESTAMP =20 #define TARGET_SO_PEERSEC 30 #define TARGET_SO_SNDBUFFORCE 31 #define TARGET_SO_RCVBUFFORCE 33 #define TARGET_SO_PASSSEC 34 =20 +#define TARGET_SO_TIMESTAMP_OLD 29 +#define TARGET_SCM_TIMESTAMP_OLD TARGET_SO_TIMESTAMP_OLD + +#define TARGET_SO_TIMESTAMP_NEW 63 +#define TARGET_SCM_TIMESTAMP_NEW TARGET_SO_TIMESTAMP_NEW + /** sock_type - Socket types * * Please notice that for binary compat reasons MIPS has to diff --git a/linux-user/sparc/sockbits.h b/linux-user/sparc/sockbits.h index 0a822e3e1f..07440efd14 100644 --- a/linux-user/sparc/sockbits.h +++ b/linux-user/sparc/sockbits.h @@ -48,8 +48,6 @@ #define TARGET_SO_GET_FILTER TARGET_SO_ATTACH_FILTER =20 #define TARGET_SO_PEERNAME 0x001c -#define TARGET_SO_TIMESTAMP 0x001d -#define TARGET_SCM_TIMESTAMP TARGET_SO_TIMESTAMP =20 #define TARGET_SO_PEERSEC 0x001e #define TARGET_SO_PASSSEC 0x001f @@ -104,6 +102,12 @@ =20 #define TARGET_SO_ZEROCOPY 0x003e =20 +#define TARGET_SO_TIMESTAMP_OLD 0x001d +#define TARGET_SCM_TIMESTAMP_OLD TARGET_SO_TIMESTAMP_OLD + +#define TARGET_SO_TIMESTAMP_NEW 0x0046 +#define TARGET_SCM_TIMESTAMP_NEW TARGET_SO_TIMESTAMP_NEW + /* Security levels - as per NRL IPv6 - don't actually do anything */ #define TARGET_SO_SECURITY_AUTHENTICATION 0x5001 #define TARGET_SO_SECURITY_ENCRYPTION_TRANSPORT 0x5002 diff --git a/linux-user/strace.c b/linux-user/strace.c index e00275fcb5..1a4dd13fe8 100644 --- a/linux-user/strace.c +++ b/linux-user/strace.c @@ -2679,8 +2679,11 @@ print_optint: case TARGET_SO_PASSCRED: qemu_log("SO_PASSCRED,"); goto print_optint; - case TARGET_SO_TIMESTAMP: - qemu_log("SO_TIMESTAMP,"); + case TARGET_SO_TIMESTAMP_OLD: + qemu_log("SO_TIMESTAMP_OLD,"); + goto print_optint; + case TARGET_SO_TIMESTAMP_NEW: + qemu_log("SO_TIMESTAMP_NEW,"); goto print_optint; case TARGET_SO_RCVLOWAT: qemu_log("SO_RCVLOWAT,"); diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 7bf99beb18..ddeca7bfd2 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -1934,6 +1934,18 @@ static inline abi_long target_to_host_cmsg(struct ms= ghdr *msgh, return 0; } =20 +/* + * Linux kernel actually keeps track of whether the old version (potential= ly + * 32-bit time_t) or the new version is used for each socket. Instead of + * replicate it will all the complexity, we only keep track of one global = state, + * which is enough for guest programs that don't intentionally mix the two + * versions. + */ +static enum TargetTimestampVersion { + TARGET_TIMESTAMP_OLD, + TARGET_TIMESTAMP_NEW, +} target_expected_timestamp_version =3D TARGET_TIMESTAMP_OLD; + static inline abi_long host_to_target_cmsg(struct target_msghdr *target_ms= gh, struct msghdr *msgh) { @@ -1984,8 +1996,17 @@ static inline abi_long host_to_target_cmsg(struct ta= rget_msghdr *target_msgh, switch (cmsg->cmsg_level) { case SOL_SOCKET: switch (cmsg->cmsg_type) { - case SO_TIMESTAMP: - tgt_len =3D sizeof(struct target_timeval); + case SCM_TIMESTAMP: + switch (target_expected_timestamp_version) { + case TARGET_TIMESTAMP_OLD: + tgt_len =3D sizeof(struct target_timeval); + target_cmsg->cmsg_type =3D tswap32(TARGET_SCM_TIMESTAM= P_OLD); + break; + case TARGET_TIMESTAMP_NEW: + tgt_len =3D sizeof(struct target__kernel_sock_timeval); + target_cmsg->cmsg_type =3D tswap32(TARGET_SCM_TIMESTAM= P_NEW); + break; + } break; default: break; @@ -2019,20 +2040,39 @@ static inline abi_long host_to_target_cmsg(struct t= arget_msghdr *target_msgh, } break; } - case SO_TIMESTAMP: + case SCM_TIMESTAMP: { struct timeval *tv =3D (struct timeval *)data; - struct target_timeval *target_tv =3D - (struct target_timeval *)target_data; - - if (len !=3D sizeof(struct timeval) || - tgt_len !=3D sizeof(struct target_timeval)) { + if (len !=3D sizeof(struct timeval)) { goto unimplemented; } =20 - /* copy struct timeval to target */ - __put_user(tv->tv_sec, &target_tv->tv_sec); - __put_user(tv->tv_usec, &target_tv->tv_usec); + switch (target_expected_timestamp_version) { + case TARGET_TIMESTAMP_OLD: + { + struct target_timeval *target_tv =3D + (struct target_timeval *)target_data; + if (tgt_len !=3D sizeof(struct target_timeval)) { + goto unimplemented; + } + + __put_user(tv->tv_sec, &target_tv->tv_sec); + __put_user(tv->tv_usec, &target_tv->tv_usec); + break; + } + case TARGET_TIMESTAMP_NEW: + { + struct target__kernel_sock_timeval *target_tv =3D + (struct target__kernel_sock_timeval *)target_data; + if (tgt_len !=3D sizeof(struct target__kernel_sock_tim= eval)) { + goto unimplemented; + } + + __put_user(tv->tv_sec, &target_tv->tv_sec); + __put_user(tv->tv_usec, &target_tv->tv_usec); + break; + } + } break; } case SCM_CREDENTIALS: @@ -2174,6 +2214,8 @@ static abi_long do_setsockopt(int sockfd, int level, = int optname, int val; struct ip_mreqn *ip_mreq; struct ip_mreq_source *ip_mreq_source; + enum TargetTimestampVersion target_timestamp_version =3D + target_expected_timestamp_version; =20 switch(level) { case SOL_TCP: @@ -2566,9 +2608,14 @@ set_timeout: case TARGET_SO_PASSSEC: optname =3D SO_PASSSEC; break; - case TARGET_SO_TIMESTAMP: - optname =3D SO_TIMESTAMP; - break; + case TARGET_SO_TIMESTAMP_OLD: + target_timestamp_version =3D TARGET_TIMESTAMP_OLD; + optname =3D SO_TIMESTAMP; + break; + case TARGET_SO_TIMESTAMP_NEW: + target_timestamp_version =3D TARGET_TIMESTAMP_NEW; + optname =3D SO_TIMESTAMP; + break; case TARGET_SO_RCVLOWAT: optname =3D SO_RCVLOWAT; break; @@ -2581,6 +2628,9 @@ set_timeout: if (get_user_u32(val, optval_addr)) return -TARGET_EFAULT; ret =3D get_errno(setsockopt(sockfd, SOL_SOCKET, optname, &val, sizeof(va= l))); + if (!is_error(ret) && optname =3D=3D SO_TIMESTAMP) { + target_expected_timestamp_version =3D target_timestamp_version; + } break; #ifdef SOL_NETLINK case SOL_NETLINK: @@ -2631,6 +2681,7 @@ static abi_long do_getsockopt(int sockfd, int level, = int optname, abi_long ret; int len, val; socklen_t lv; + int timestamp_format_matches =3D 0; =20 switch(level) { case TARGET_SOL_SOCKET: @@ -2811,7 +2862,14 @@ get_timeout: case TARGET_SO_PASSCRED: optname =3D SO_PASSCRED; goto int_case; - case TARGET_SO_TIMESTAMP: + case TARGET_SO_TIMESTAMP_OLD: + timestamp_format_matches =3D + (target_expected_timestamp_version =3D=3D TARGET_TIMESTAMP= _OLD); + optname =3D SO_TIMESTAMP; + goto int_case; + case TARGET_SO_TIMESTAMP_NEW: + timestamp_format_matches =3D + (target_expected_timestamp_version =3D=3D TARGET_TIMESTAMP= _NEW); optname =3D SO_TIMESTAMP; goto int_case; case TARGET_SO_RCVLOWAT: @@ -2838,6 +2896,9 @@ get_timeout: if (optname =3D=3D SO_TYPE) { val =3D host_to_target_sock_type(val); } + if (optname =3D=3D SO_TIMESTAMP) { + val =3D val && timestamp_format_matches; + } if (len > lv) len =3D lv; if (len =3D=3D 4) { diff --git a/tests/tcg/multiarch/socket_timestamp.c b/tests/tcg/multiarch/s= ocket_timestamp.c new file mode 100644 index 0000000000..71ab1845de --- /dev/null +++ b/tests/tcg/multiarch/socket_timestamp.c @@ -0,0 +1,296 @@ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#ifdef __kernel_old_timeval +#define kernel_old_timeval __kernel_old_timeval +#else +struct kernel_old_timeval { + __kernel_long_t tv_sec; + __kernel_long_t tv_usec; +}; +#endif + +struct kernel_sock_timeval { + int64_t tv_sec; + int64_t tv_usec; +}; + +int create_udp_socket(struct sockaddr_in *sockaddr) +{ + socklen_t sockaddr_len; + int sock =3D socket(AF_INET, SOCK_DGRAM, 0); + if (sock < 0) { + int err =3D errno; + fprintf(stderr, "Failed to create server socket: %s\n", strerror(e= rr)); + exit(err); + } + + memset(sockaddr, 0, sizeof(*sockaddr)); + sockaddr->sin_family =3D AF_INET; + sockaddr->sin_port =3D htons(0); /* let kernel select a port for us */ + sockaddr->sin_addr.s_addr =3D htonl(INADDR_LOOPBACK); + + if (bind(sock, (struct sockaddr *)sockaddr, sizeof(*sockaddr)) < 0) { + int err =3D errno; + fprintf(stderr, "Failed to bind server socket: %s\n", strerror(err= )); + exit(err); + } + + sockaddr_len =3D sizeof(*sockaddr); + if (getsockname(sock, (struct sockaddr *)sockaddr, &sockaddr_len) < 0)= { + int err =3D errno; + fprintf(stderr, "Failed to get socket name: %s\n", strerror(err)); + exit(err); + } + return sock; +} + +/* + * Checks that the timestamp in the message is not after the reception tim= estamp + * as well as the reception time is within 10 seconds of the message time. + */ +void check_timestamp_difference(const struct timeval *msg_tv, + const struct timeval *pkt_tv) +{ + if (pkt_tv->tv_sec < msg_tv->tv_sec || + (pkt_tv->tv_sec =3D=3D msg_tv->tv_sec && pkt_tv->tv_usec < msg_tv-= >tv_usec)) + { + fprintf(stderr, + "Packet received before sent: %lld.%06lld < %lld.%06lld\n", + (long long)pkt_tv->tv_sec, (long long)pkt_tv->tv_usec, + (long long)msg_tv->tv_sec, (long long)msg_tv->tv_usec); + exit(-1); + } + + if (pkt_tv->tv_sec > msg_tv->tv_sec + 10 || + (pkt_tv->tv_sec =3D=3D msg_tv->tv_sec + 10 && + pkt_tv->tv_usec > msg_tv->tv_usec)) { + fprintf(stderr, + "Packet received more than 10 seconds after sent: " + "%lld.%06lld > %lld.%06lld + 10\n", + (long long)pkt_tv->tv_sec, (long long)pkt_tv->tv_usec, + (long long)msg_tv->tv_sec, (long long)msg_tv->tv_usec); + exit(-1); + } +} + +void send_current_time(int sock, struct sockaddr_in server_sockaddr) +{ + struct timeval tv =3D {0, 0}; + gettimeofday(&tv, NULL); + sendto(sock, &tv, sizeof(tv), 0, (struct sockaddr *)&server_sockaddr, + sizeof(server_sockaddr)); +} + +typedef void (*get_timeval_t)(const struct cmsghdr *cmsg, struct timeval *= tv); + + +void receive_packet(int sock, get_timeval_t get_timeval) +{ + struct msghdr msg =3D {0}; + + char iobuf[1024]; + struct iovec iov; + + union { + /* + * 128 bytes are enough for all existing + * timeval/timespec/scm_timestamping structures. + */ + char cmsg_buf[CMSG_SPACE(128)]; + struct cmsghdr align; + } u; + struct cmsghdr *cmsg; + struct timeval msg_tv, pkt_tv; + + int res; + + iov.iov_base =3D iobuf; + iov.iov_len =3D sizeof(iobuf); + + msg.msg_iov =3D &iov; + msg.msg_iovlen =3D 1; + msg.msg_control =3D (caddr_t)u.cmsg_buf; + msg.msg_controllen =3D sizeof(u.cmsg_buf); + + res =3D recvmsg(sock, &msg, 0); + if (res < 0) { + int err =3D errno; + fprintf(stderr, "Failed to receive packet: %s\n", strerror(err)); + exit(err); + } + + assert(res =3D=3D sizeof(struct timeval)); + assert(iov.iov_base =3D=3D iobuf); + memcpy(&msg_tv, iov.iov_base, sizeof(msg_tv)); + printf("Message timestamp: %lld.%06lld\n", + (long long)msg_tv.tv_sec, (long long)msg_tv.tv_usec); + + cmsg =3D CMSG_FIRSTHDR(&msg); + assert(cmsg); + (*get_timeval)(cmsg, &pkt_tv); + printf("Packet timestamp: %lld.%06lld\n", + (long long)pkt_tv.tv_sec, (long long)pkt_tv.tv_usec); + + check_timestamp_difference(&msg_tv, &pkt_tv); +} + +void get_timeval_from_so_timestamp(const struct cmsghdr *cmsg, + struct timeval *tv) +{ + assert(cmsg->cmsg_level =3D=3D SOL_SOCKET); + assert(cmsg->cmsg_type =3D=3D SCM_TIMESTAMP); + assert(cmsg->cmsg_len =3D=3D CMSG_LEN(sizeof(struct timeval))); + memcpy(tv, CMSG_DATA(cmsg), sizeof(*tv)); +} + +#ifdef SO_TIMESTAMP_OLD +void get_timeval_from_so_timestamp_old(const struct cmsghdr *cmsg, + struct timeval *tv) +{ + struct kernel_old_timeval old_tv; + assert(cmsg->cmsg_level =3D=3D SOL_SOCKET); + assert(cmsg->cmsg_type =3D=3D SO_TIMESTAMP_OLD); + assert(cmsg->cmsg_len =3D=3D CMSG_LEN(sizeof(old_tv))); + + memcpy(&old_tv, CMSG_DATA(cmsg), sizeof(old_tv)); + tv->tv_sec =3D old_tv.tv_sec; + tv->tv_usec =3D old_tv.tv_usec; +} + +#ifdef SO_TIMESTAMP_NEW +void get_timeval_from_so_timestamp_new(const struct cmsghdr *cmsg, + struct timeval *tv) +{ + struct kernel_sock_timeval sock_tv; + assert(cmsg->cmsg_level =3D=3D SOL_SOCKET); + assert(cmsg->cmsg_type =3D=3D SO_TIMESTAMP_NEW); + assert(cmsg->cmsg_len =3D=3D CMSG_LEN(sizeof(sock_tv))); + + memcpy(&sock_tv, CMSG_DATA(cmsg), sizeof(sock_tv)); + tv->tv_sec =3D sock_tv.tv_sec; + tv->tv_usec =3D sock_tv.tv_usec; +} +#endif /* defined(SO_TIMESTAMP_NEW) */ +#endif /* defined(SO_TIMESTAMP_OLD) */ + +void set_socket_option(int sock, int sockopt, int on) +{ + socklen_t len; + int val =3D on; + if (setsockopt(sock, SOL_SOCKET, sockopt, &val, sizeof(val)) < 0) { + int err =3D errno; + fprintf(stderr, "Failed to setsockopt %d (%s): %s\n", + sockopt, on ? "on" : "off", strerror(err)); + exit(err); + } + + len =3D sizeof(val); + val =3D -1; + if (getsockopt(sock, SOL_SOCKET, sockopt, &val, &len) < 0) { + int err =3D errno; + fprintf(stderr, "Failed to getsockopt (%d): %s\n", sock, strerror(= err)); + exit(err); + } + assert(len =3D=3D sizeof(val)); + assert(val =3D=3D on); +} + +int main(int argc, char **argv) +{ + int parent_sock, child_sock; + struct sockaddr_in parent_sockaddr, child_sockaddr; + int pid; + struct timeval tv =3D {0, 0}; + gettimeofday(&tv, NULL); + + parent_sock =3D create_udp_socket(&parent_sockaddr); + child_sock =3D create_udp_socket(&child_sockaddr); + + printf("Parent sock bound to port %d\nChild sock bound to port %d\n", + parent_sockaddr.sin_port, child_sockaddr.sin_port); + + pid =3D fork(); + if (pid < 0) { + fprintf(stderr, "SKIPPED. Failed to fork: %s\n", strerror(errno)); + } else if (pid =3D=3D 0) { + close(child_sock); + + /* Test 1: SO_TIMESTAMP */ + send_current_time(parent_sock, child_sockaddr); + + if (tv.tv_sec > 0x7fffff00) { + /* Too close to y2038 problem, old system may not work. */ + close(parent_sock); + return 0; + } + +#ifdef SO_TIMESTAMP_OLD + if (SO_TIMESTAMP_OLD !=3D SO_TIMESTAMP) { + /* Test 2a: SO_TIMESTAMP_OLD */ + set_socket_option(parent_sock, SO_TIMESTAMP_OLD, 1); + receive_packet(parent_sock, &get_timeval_from_so_timestamp_old= ); + set_socket_option(parent_sock, SO_TIMESTAMP_OLD, 0); + } +#ifdef SO_TIMESTAMP_NEW + else { + /* Test 2b: SO_TIMESTAMP_NEW */ + set_socket_option(parent_sock, SO_TIMESTAMP_NEW, 1); + receive_packet(parent_sock, &get_timeval_from_so_timestamp_new= ); + set_socket_option(parent_sock, SO_TIMESTAMP_NEW, 0); + } +#endif /* defined(SO_TIMESTAMP_NEW) */ +#endif /* defined(SO_TIMESTAMP_OLD) */ + + close(parent_sock); + } else { + int child_status; + close(parent_sock); + + /* Test 1: SO_TIMESTAMP */ + set_socket_option(child_sock, SO_TIMESTAMP, 1); + receive_packet(child_sock, &get_timeval_from_so_timestamp); + set_socket_option(child_sock, SO_TIMESTAMP, 0); + + if (tv.tv_sec > 0x7fffff00) { + /* Too close to y2038 problem, old system may not work. */ + close(child_sock); + return 0; + } + +#ifdef SO_TIMESTAMP_OLD + if (SO_TIMESTAMP_OLD !=3D SO_TIMESTAMP) { + /* Test 2a: SO_TIMESTAMP_OLD */ + send_current_time(child_sock, parent_sockaddr); + } +#ifdef SO_TIMESTAMP_NEW + else { + /* Test 2b: SO_TIMESTAMP_NEW */ + send_current_time(child_sock, parent_sockaddr); + } +#endif /* defined(SO_TIMESTAMP_NEW) */ +#endif /* defined(SO_TIMESTAMP_OLD) */ + + close(child_sock); + + if (waitpid(pid, &child_status, 0) < 0) { + int err =3D errno; + fprintf(stderr, "Final wait() failed: %s\n", strerror(err)); + return err; + } + return child_status; + } + return 0; +} --=20 2.29.2.684.gfbc64c5ab5-goog From nobody Tue Nov 18 07:47:48 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1608321364; cv=none; d=zohomail.com; s=zohoarc; b=a+RJt0rS4Brymo8GleaV+L9GqhZQykjIXZm10yyk/WiKOPY9Rhc45NiE2vcTIhD1dcNM5F6WcK6SOsRXv6WZRSoTnDcGB8xCnWz9FNU08JU1qJTtbnl/JbEoi+9Iz1k0vn2G+LD9gaCiouPro4irRwOwC5oHs5Z7W2lDFdbf3RU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1608321364; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=AvhLDaiP3y7Ice2XstK1LlBGN0YJ2Hde0KYC5wY7zyM=; b=VfO0pwD8Oz6jZjGXL2Hq6jSVgL+4btvy8kBj+YE8H6cituWPI7EfyxK4rvIdDbpj8cRSYY+k7bD+5iH28AlsB4Tq9gjgWJ3eRxbYiZkoAfDAL/El0PL2AP85vhdIexfbbjQ+WYXC9GcnuNtcp2/VnvuO4/8gpJTf/QsR8VzXK6g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1608321364491737.7502332652394; Fri, 18 Dec 2020 11:56:04 -0800 (PST) Received: from localhost ([::1]:46216 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kqLr8-0000UA-6a for importer@patchew.org; Fri, 18 Dec 2020 14:56:02 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43092) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <34QjdXwMKCmwcMgQYYQVO.MYWaOWe-NOfOVXYXQXe.YbQ@flex--scw.bounces.google.com>) id 1kqLpO-0007UI-LY for qemu-devel@nongnu.org; Fri, 18 Dec 2020 14:54:14 -0500 Received: from mail-yb1-xb49.google.com ([2607:f8b0:4864:20::b49]:33106) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <34QjdXwMKCmwcMgQYYQVO.MYWaOWe-NOfOVXYXQXe.YbQ@flex--scw.bounces.google.com>) id 1kqLpL-0007Hh-Ey for qemu-devel@nongnu.org; Fri, 18 Dec 2020 14:54:14 -0500 Received: by mail-yb1-xb49.google.com with SMTP id a206so4588386ybg.0 for ; Fri, 18 Dec 2020 11:54:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=AvhLDaiP3y7Ice2XstK1LlBGN0YJ2Hde0KYC5wY7zyM=; b=tYxfyMniP0l8CRtRS0c521K6W5uT8NBac9H/W9yOJvOs3my4eVPPravgRRdSEKgbq7 rvJiwOJpaCMCYJPnW4ZUfMwUWI0A9GKExTk7Vj8CL6L8s6LXqfNrMxgg9fS2Aog3/AqW gMVijeC9veHD/EdrHjR5KNSy9FAiYQZ4NB43WwOHfrPdbJbQI/RsnsFONMVuQ3R772lA 07EJ0qu0mDh5qMoVz/C34rQnIevZxknYlJzzZv1i00Ni1Vo7Dy4TlsL9LzfJ3XLHU8Pz XJU7r3z4eIvkgQAyEayYSbXy+s9XiCUiiu8NNTM80mCmW1BCESUCM4uYNOSoP5PuSTWV XZLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=AvhLDaiP3y7Ice2XstK1LlBGN0YJ2Hde0KYC5wY7zyM=; b=kb1wH+myRI1oh46dJvFeKXA/QHc+E4j7YwFS30ou4ssn4JNOc9Kzjoc6HtGzseBN0x WhZYq9ouZwqWCpzvrf/ME1Kq07wgZwXQr8Yd/1V6H+XvC+CiLceWs22JgOb0XlBh6uzu E8AEl7z2wiqQRUVDQrd+3QKL09rwsdmZZvnd4hvIjSaeC6og1BA4lu8YwIVKIRKSqHkf SXw9PMYx5kDV52GgPStjatFSJqP3V6xvg/LjPXiJvh48ZBTYql5OLUroSIadLfCIM2VW tqW0bggDn1Hz94ikIwpCVDEkLTkxPlzYdQpH7GN3pbm8GBZgNyEnXuaTi2GkuceIS4Iw SnbQ== X-Gm-Message-State: AOAM532w5j8ppl0kBnvoYUx0owgTf3N4Vqkc+ZTh89poW4unWRk/08fV 6X9ywDhajABRyoM0etFcTu+dMk6j7h9zDHFBc6ShswAq9iqhKSr9uUarw4I5L4/qdZ8bk391/Rr Y7DkIH3id+5QcK7XErbOPtLitn0Zl9KxQdBcJwJniZ90CwZazW0cQ X-Google-Smtp-Source: ABdhPJygwauUsRLFLBBUgTl9Yw77c2E13PHuBRKH/9WitBY7OUzEdEz5TmCsDzjqOR3MFBJuW8p6IQU= X-Received: from scw-glinux.svl.corp.google.com ([2620:15c:2ce:200:f693:9fff:fef4:29b5]) (user=scw job=sendgmr) by 2002:a25:d98f:: with SMTP id q137mr8640306ybg.128.1608321249575; Fri, 18 Dec 2020 11:54:09 -0800 (PST) Date: Fri, 18 Dec 2020 11:54:02 -0800 In-Reply-To: <20201218195402.3581189-1-scw@google.com> Message-Id: <20201218195402.3581189-3-scw@google.com> Mime-Version: 1.0 References: <20201218195402.3581189-1-scw@google.com> X-Mailer: git-send-email 2.29.2.684.gfbc64c5ab5-goog Subject: [PATCH v3 2/2] linux-user: setsockopt() SO_TIMESTAMPNS and SO_TIMESTAMPING To: qemu-devel@nongnu.org, laurent@vivier.eu Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::b49; envelope-from=34QjdXwMKCmwcMgQYYQVO.MYWaOWe-NOfOVXYXQXe.YbQ@flex--scw.bounces.google.com; helo=mail-yb1-xb49.google.com X-Spam_score_int: -95 X-Spam_score: -9.6 X-Spam_bar: --------- X-Spam_report: (-9.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_MED=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, USER_IN_DEF_DKIM_WL=-7.5 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Shu-Chun Weng Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Reply-to: Shu-Chun Weng From: Shu-Chun Weng via X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This change supports SO_TIMESTAMPNS_OLD/NEW and SO_TIMESTAMPING_OLD/NEW for setsocketopt() with SOL_SOCKET. Based on the SO_TIMESTAMP_OLD/NEW framework. The three pairs share the same flag `SOCK_TSTAMP_NEW` in linux kernel for deciding if the old or the new format is used. Signed-off-by: Shu-Chun Weng --- v1 -> v2: Only keep track of old/new format in a global state. Fix style problems. v2 -> v3: Rebase to master on Dec 18, 2020 linux-user/alpha/sockbits.h | 13 +- linux-user/generic/sockbits.h | 8 + linux-user/hppa/sockbits.h | 12 +- linux-user/mips/sockbits.h | 8 + linux-user/sparc/sockbits.h | 13 +- linux-user/strace.c | 12 + linux-user/syscall.c | 149 ++++++++- tests/tcg/multiarch/socket_timestamp.c | 442 +++++++++++++++++++------ 8 files changed, 540 insertions(+), 117 deletions(-) diff --git a/linux-user/alpha/sockbits.h b/linux-user/alpha/sockbits.h index 40f0644df0..c2c88f432b 100644 --- a/linux-user/alpha/sockbits.h +++ b/linux-user/alpha/sockbits.h @@ -51,8 +51,6 @@ =20 #define TARGET_SO_PEERSEC 30 #define TARGET_SO_PASSSEC 34 -#define TARGET_SO_TIMESTAMPNS 35 -#define TARGET_SCM_TIMESTAMPNS TARGET_SO_TIMESTAMPNS =20 /* Security levels - as per NRL IPv6 - don't actually do anything */ #define TARGET_SO_SECURITY_AUTHENTICATION 19 @@ -61,9 +59,6 @@ =20 #define TARGET_SO_MARK 36 =20 -#define TARGET_SO_TIMESTAMPING 37 -#define TARGET_SCM_TIMESTAMPING TARGET_SO_TIMESTAMPING - #define TARGET_SO_RXQ_OVFL 40 =20 #define TARGET_SO_WIFI_STATUS 41 @@ -75,9 +70,17 @@ =20 #define TARGET_SO_TIMESTAMP_OLD 29 #define TARGET_SCM_TIMESTAMP_OLD TARGET_SO_TIMESTAMP_OLD +#define TARGET_SO_TIMESTAMPNS_OLD 35 +#define TARGET_SCM_TIMESTAMPNS_OLD TARGET_SO_TIMESTAMPNS_OLD +#define TARGET_SO_TIMESTAMPING_OLD 37 +#define TARGET_SCM_TIMESTAMPING_OLD TARGET_SO_TIMESTAMPING_OLD =20 #define TARGET_SO_TIMESTAMP_NEW 63 #define TARGET_SCM_TIMESTAMP_NEW TARGET_SO_TIMESTAMP_NEW +#define TARGET_SO_TIMESTAMPNS_NEW 64 +#define TARGET_SCM_TIMESTAMPNS_NEW TARGET_SO_TIMESTAMPNS_NEW +#define TARGET_SO_TIMESTAMPING_NEW 65 +#define TARGET_SCM_TIMESTAMPING_NEW TARGET_SO_TIMESTAMPING_NEW =20 /* TARGET_O_NONBLOCK clashes with the bits used for socket types. Therefo= re we * have to define SOCK_NONBLOCK to a different value here. diff --git a/linux-user/generic/sockbits.h b/linux-user/generic/sockbits.h index 532cf2d3dc..a0496d8751 100644 --- a/linux-user/generic/sockbits.h +++ b/linux-user/generic/sockbits.h @@ -56,8 +56,16 @@ =20 #define TARGET_SO_TIMESTAMP_OLD 29 #define TARGET_SCM_TIMESTAMP_OLD TARGET_SO_TIMESTAMP_OLD +#define TARGET_SO_TIMESTAMPNS_OLD 35 +#define TARGET_SCM_TIMESTAMPNS_OLD TARGET_SO_TIMESTAMPNS_OLD +#define TARGET_SO_TIMESTAMPING_OLD 37 +#define TARGET_SCM_TIMESTAMPING_OLD TARGET_SO_TIMESTAMPING_OLD =20 #define TARGET_SO_TIMESTAMP_NEW 63 #define TARGET_SCM_TIMESTAMP_NEW TARGET_SO_TIMESTAMP_NEW +#define TARGET_SO_TIMESTAMPNS_NEW 64 +#define TARGET_SCM_TIMESTAMPNS_NEW TARGET_SO_TIMESTAMPNS_NEW +#define TARGET_SO_TIMESTAMPING_NEW 65 +#define TARGET_SCM_TIMESTAMPING_NEW TARGET_SO_TIMESTAMPING_NEW =20 #endif diff --git a/linux-user/hppa/sockbits.h b/linux-user/hppa/sockbits.h index 284a47e74e..d7e9aa340d 100644 --- a/linux-user/hppa/sockbits.h +++ b/linux-user/hppa/sockbits.h @@ -29,8 +29,6 @@ #define TARGET_SO_BSDCOMPAT 0x400e #define TARGET_SO_PASSCRED 0x4010 #define TARGET_SO_PEERCRED 0x4011 -#define TARGET_SO_TIMESTAMPNS 0x4013 -#define TARGET_SCM_TIMESTAMPNS TARGET_SO_TIMESTAMPNS =20 #define TARGET_SO_SECURITY_AUTHENTICATION 0x4016 #define TARGET_SO_SECURITY_ENCRYPTION_TRANSPORT 0x4017 @@ -44,8 +42,6 @@ #define TARGET_SO_PEERSEC 0x401d #define TARGET_SO_PASSSEC 0x401e #define TARGET_SO_MARK 0x401f -#define TARGET_SO_TIMESTAMPING 0x4020 -#define TARGET_SCM_TIMESTAMPING TARGET_SO_TIMESTAMPING #define TARGET_SO_RXQ_OVFL 0x4021 #define TARGET_SO_WIFI_STATUS 0x4022 #define TARGET_SCM_WIFI_STATUS TARGET_SO_WIFI_STATUS @@ -67,9 +63,17 @@ =20 #define TARGET_SO_TIMESTAMP_OLD 0x4012 #define TARGET_SCM_TIMESTAMP_OLD TARGET_SO_TIMESTAMP_OLD +#define TARGET_SO_TIMESTAMPNS_OLD 0x4013 +#define TARGET_SCM_TIMESTAMPNS_OLD TARGET_SO_TIMESTAMPNS_OLD +#define TARGET_SO_TIMESTAMPING_OLD 0x4020 +#define TARGET_SCM_TIMESTAMPING_OLD TARGET_SO_TIMESTAMPING_OLD =20 #define TARGET_SO_TIMESTAMP_NEW 0x4038 #define TARGET_SCM_TIMESTAMP_NEW TARGET_SO_TIMESTAMP_NEW +#define TARGET_SO_TIMESTAMPNS_NEW 0x4039 +#define TARGET_SCM_TIMESTAMPNS_NEW TARGET_SO_TIMESTAMPNS_NEW +#define TARGET_SO_TIMESTAMPING_NEW 0x403A +#define TARGET_SCM_TIMESTAMPING_NEW TARGET_SO_TIMESTAMPING_NEW =20 /* TARGET_O_NONBLOCK clashes with the bits used for socket types. Therefo= re we * have to define SOCK_NONBLOCK to a different value here. diff --git a/linux-user/mips/sockbits.h b/linux-user/mips/sockbits.h index b4c39d9588..49524e23ac 100644 --- a/linux-user/mips/sockbits.h +++ b/linux-user/mips/sockbits.h @@ -69,9 +69,17 @@ =20 #define TARGET_SO_TIMESTAMP_OLD 29 #define TARGET_SCM_TIMESTAMP_OLD TARGET_SO_TIMESTAMP_OLD +#define TARGET_SO_TIMESTAMPNS_OLD 35 +#define TARGET_SCM_TIMESTAMPNS_OLD TARGET_SO_TIMESTAMPNS_OLD +#define TARGET_SO_TIMESTAMPING_OLD 37 +#define TARGET_SCM_TIMESTAMPING_OLD TARGET_SO_TIMESTAMPING_OLD =20 #define TARGET_SO_TIMESTAMP_NEW 63 #define TARGET_SCM_TIMESTAMP_NEW TARGET_SO_TIMESTAMP_NEW +#define TARGET_SO_TIMESTAMPNS_NEW 64 +#define TARGET_SCM_TIMESTAMPNS_NEW TARGET_SO_TIMESTAMPNS_NEW +#define TARGET_SO_TIMESTAMPING_NEW 65 +#define TARGET_SCM_TIMESTAMPING_NEW TARGET_SO_TIMESTAMPING_NEW =20 /** sock_type - Socket types * diff --git a/linux-user/sparc/sockbits.h b/linux-user/sparc/sockbits.h index 07440efd14..c5fade3ad1 100644 --- a/linux-user/sparc/sockbits.h +++ b/linux-user/sparc/sockbits.h @@ -51,14 +51,9 @@ =20 #define TARGET_SO_PEERSEC 0x001e #define TARGET_SO_PASSSEC 0x001f -#define TARGET_SO_TIMESTAMPNS 0x0021 -#define TARGET_SCM_TIMESTAMPNS TARGET_SO_TIMESTAMPNS =20 #define TARGET_SO_MARK 0x0022 =20 -#define TARGET_SO_TIMESTAMPING 0x0023 -#define TARGET_SCM_TIMESTAMPING TARGET_SO_TIMESTAMPING - #define TARGET_SO_RXQ_OVFL 0x0024 =20 #define TARGET_SO_WIFI_STATUS 0x0025 @@ -104,9 +99,17 @@ =20 #define TARGET_SO_TIMESTAMP_OLD 0x001d #define TARGET_SCM_TIMESTAMP_OLD TARGET_SO_TIMESTAMP_OLD +#define TARGET_SO_TIMESTAMPNS_OLD 0x0021 +#define TARGET_SCM_TIMESTAMPNS_OLD TARGET_SO_TIMESTAMPNS_OLD +#define TARGET_SO_TIMESTAMPING_OLD 0x0023 +#define TARGET_SCM_TIMESTAMPING_OLD TARGET_SO_TIMESTAMPING_OLD =20 #define TARGET_SO_TIMESTAMP_NEW 0x0046 #define TARGET_SCM_TIMESTAMP_NEW TARGET_SO_TIMESTAMP_NEW +#define TARGET_SO_TIMESTAMPNS_NEW 0x0042 +#define TARGET_SCM_TIMESTAMPNS_NEW TARGET_SO_TIMESTAMPNS_NEW +#define TARGET_SO_TIMESTAMPING_NEW 0x0043 +#define TARGET_SCM_TIMESTAMPING_NEW TARGET_SO_TIMESTAMPING_NEW =20 /* Security levels - as per NRL IPv6 - don't actually do anything */ #define TARGET_SO_SECURITY_AUTHENTICATION 0x5001 diff --git a/linux-user/strace.c b/linux-user/strace.c index 1a4dd13fe8..563e87bfaa 100644 --- a/linux-user/strace.c +++ b/linux-user/strace.c @@ -2682,9 +2682,21 @@ print_optint: case TARGET_SO_TIMESTAMP_OLD: qemu_log("SO_TIMESTAMP_OLD,"); goto print_optint; + case TARGET_SO_TIMESTAMPNS_OLD: + qemu_log("SO_TIMESTAMPNS_OLD,"); + goto print_optint; + case TARGET_SO_TIMESTAMPING_OLD: + qemu_log("SO_TIMESTAMPING_OLD,"); + goto print_optint; case TARGET_SO_TIMESTAMP_NEW: qemu_log("SO_TIMESTAMP_NEW,"); goto print_optint; + case TARGET_SO_TIMESTAMPNS_NEW: + qemu_log("SO_TIMESTAMPNS_NEW,"); + goto print_optint; + case TARGET_SO_TIMESTAMPING_NEW: + qemu_log("SO_TIMESTAMPING_NEW,"); + goto print_optint; case TARGET_SO_RCVLOWAT: qemu_log("SO_RCVLOWAT,"); goto print_optint; diff --git a/linux-user/syscall.c b/linux-user/syscall.c index ddeca7bfd2..4f834b16ab 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -2008,6 +2008,34 @@ static inline abi_long host_to_target_cmsg(struct ta= rget_msghdr *target_msgh, break; } break; + case SCM_TIMESTAMPNS: + switch (target_expected_timestamp_version) { + case TARGET_TIMESTAMP_OLD: + tgt_len =3D sizeof(struct target_timespec); + target_cmsg->cmsg_type =3D + tswap32(TARGET_SCM_TIMESTAMPNS_OLD); + break; + case TARGET_TIMESTAMP_NEW: + tgt_len =3D sizeof(struct target__kernel_timespec); + target_cmsg->cmsg_type =3D + tswap32(TARGET_SCM_TIMESTAMPNS_NEW); + break; + } + break; + case SCM_TIMESTAMPING: + switch (target_expected_timestamp_version) { + case TARGET_TIMESTAMP_OLD: + tgt_len =3D sizeof(struct target_timespec[3]); + target_cmsg->cmsg_type =3D + tswap32(TARGET_SCM_TIMESTAMPING_OLD); + break; + case TARGET_TIMESTAMP_NEW: + tgt_len =3D sizeof(struct target__kernel_timespec[3]); + target_cmsg->cmsg_type =3D + tswap32(TARGET_SCM_TIMESTAMPING_NEW); + break; + } + break; default: break; } @@ -2075,6 +2103,81 @@ static inline abi_long host_to_target_cmsg(struct ta= rget_msghdr *target_msgh, } break; } + case SCM_TIMESTAMPNS: + { + struct timespec *ts =3D (struct timespec *)data; + if (len !=3D sizeof(struct timespec)) { + goto unimplemented; + } + + switch (target_expected_timestamp_version) { + case TARGET_TIMESTAMP_OLD: + { + struct target_timespec *target_ts =3D + (struct target_timespec *)target_data; + if (tgt_len !=3D sizeof(struct target_timespec)) { + goto unimplemented; + } + + __put_user(ts->tv_sec, &target_ts->tv_sec); + __put_user(ts->tv_nsec, &target_ts->tv_nsec); + break; + } + case TARGET_TIMESTAMP_NEW: + { + struct target__kernel_timespec *target_ts =3D + (struct target__kernel_timespec *)target_data; + if (tgt_len !=3D sizeof(struct target__kernel_timespec= )) { + goto unimplemented; + } + + __put_user(ts->tv_sec, &target_ts->tv_sec); + __put_user(ts->tv_nsec, &target_ts->tv_nsec); + break; + } + } + break; + } + case SCM_TIMESTAMPING: + { + int i; + struct timespec *ts =3D (struct timespec *)data; + if (len !=3D sizeof(struct timespec[3])) { + goto unimplemented; + } + + switch (target_expected_timestamp_version) { + case TARGET_TIMESTAMP_OLD: + { + struct target_timespec *target_ts =3D + (struct target_timespec *)target_data; + if (tgt_len !=3D sizeof(struct target_timespec[3])) { + goto unimplemented; + } + + for (i =3D 0; i < 3; ++i) { + __put_user(ts[i].tv_sec, &target_ts[i].tv_sec); + __put_user(ts[i].tv_nsec, &target_ts[i].tv_nsec); + } + break; + } + case TARGET_TIMESTAMP_NEW: + { + struct target__kernel_timespec *target_ts =3D + (struct target__kernel_timespec *)target_data; + if (tgt_len !=3D sizeof(struct target__kernel_timespec= [3])) { + goto unimplemented; + } + + for (i =3D 0; i < 3; ++i) { + __put_user(ts[i].tv_sec, &target_ts[i].tv_sec); + __put_user(ts[i].tv_nsec, &target_ts[i].tv_nsec); + } + break; + } + } + break; + } case SCM_CREDENTIALS: { struct ucred *cred =3D (struct ucred *)data; @@ -2616,6 +2719,22 @@ set_timeout: target_timestamp_version =3D TARGET_TIMESTAMP_NEW; optname =3D SO_TIMESTAMP; break; + case TARGET_SO_TIMESTAMPNS_OLD: + target_timestamp_version =3D TARGET_TIMESTAMP_OLD; + optname =3D SO_TIMESTAMPNS; + break; + case TARGET_SO_TIMESTAMPNS_NEW: + target_timestamp_version =3D TARGET_TIMESTAMP_NEW; + optname =3D SO_TIMESTAMPNS; + break; + case TARGET_SO_TIMESTAMPING_OLD: + target_timestamp_version =3D TARGET_TIMESTAMP_OLD; + optname =3D SO_TIMESTAMPING; + break; + case TARGET_SO_TIMESTAMPING_NEW: + target_timestamp_version =3D TARGET_TIMESTAMP_NEW; + optname =3D SO_TIMESTAMPING; + break; case TARGET_SO_RCVLOWAT: optname =3D SO_RCVLOWAT; break; @@ -2628,7 +2747,9 @@ set_timeout: if (get_user_u32(val, optval_addr)) return -TARGET_EFAULT; ret =3D get_errno(setsockopt(sockfd, SOL_SOCKET, optname, &val, sizeof(va= l))); - if (!is_error(ret) && optname =3D=3D SO_TIMESTAMP) { + if (!is_error(ret) && + (optname =3D=3D SO_TIMESTAMP || optname =3D=3D SO_TIMESTAMPNS = || + optname =3D=3D SO_TIMESTAMPING)) { target_expected_timestamp_version =3D target_timestamp_version; } break; @@ -2872,6 +2993,26 @@ get_timeout: (target_expected_timestamp_version =3D=3D TARGET_TIMESTAMP= _NEW); optname =3D SO_TIMESTAMP; goto int_case; + case TARGET_SO_TIMESTAMPNS_OLD: + timestamp_format_matches =3D + (target_expected_timestamp_version =3D=3D TARGET_TIMESTAMP= _OLD); + optname =3D SO_TIMESTAMPNS; + goto int_case; + case TARGET_SO_TIMESTAMPNS_NEW: + timestamp_format_matches =3D + (target_expected_timestamp_version =3D=3D TARGET_TIMESTAMP= _NEW); + optname =3D SO_TIMESTAMPNS; + goto int_case; + case TARGET_SO_TIMESTAMPING_OLD: + timestamp_format_matches =3D + (target_expected_timestamp_version =3D=3D TARGET_TIMESTAMP= _OLD); + optname =3D SO_TIMESTAMPING; + goto int_case; + case TARGET_SO_TIMESTAMPING_NEW: + timestamp_format_matches =3D + (target_expected_timestamp_version =3D=3D TARGET_TIMESTAMP= _NEW); + optname =3D SO_TIMESTAMPING; + goto int_case; case TARGET_SO_RCVLOWAT: optname =3D SO_RCVLOWAT; goto int_case; @@ -2895,9 +3036,9 @@ get_timeout: return ret; if (optname =3D=3D SO_TYPE) { val =3D host_to_target_sock_type(val); - } - if (optname =3D=3D SO_TIMESTAMP) { - val =3D val && timestamp_format_matches; + } else if ((optname =3D=3D SO_TIMESTAMP || optname =3D=3D SO_TIMES= TAMPNS || + optname =3D=3D SO_TIMESTAMPING) && !timestamp_format_m= atches) { + val =3D 0; } if (len > lv) len =3D lv; diff --git a/tests/tcg/multiarch/socket_timestamp.c b/tests/tcg/multiarch/s= ocket_timestamp.c index 71ab1845de..3ae833ad44 100644 --- a/tests/tcg/multiarch/socket_timestamp.c +++ b/tests/tcg/multiarch/socket_timestamp.c @@ -1,5 +1,6 @@ #include #include +#include #include #include #include @@ -11,6 +12,7 @@ #include #include #include +#include #include =20 #ifdef __kernel_old_timeval @@ -27,6 +29,33 @@ struct kernel_sock_timeval { int64_t tv_usec; }; =20 +struct kernel_old_timespec { + __kernel_long_t tv_sec; + long tv_nsec; +}; + +struct kernel_timespec { + int64_t tv_sec; + long long tv_nsec; +}; + +struct scm_timestamping { + struct timespec ts[3]; +}; + +struct scm_old_timestamping { + struct kernel_old_timespec ts[3]; +}; + +struct scm_timestamping64 { + struct kernel_timespec ts[3]; +}; + +const int so_timestamping_flags =3D + SOF_TIMESTAMPING_RX_HARDWARE | + SOF_TIMESTAMPING_RX_SOFTWARE | + SOF_TIMESTAMPING_SOFTWARE; + int create_udp_socket(struct sockaddr_in *sockaddr) { socklen_t sockaddr_len; @@ -61,43 +90,47 @@ int create_udp_socket(struct sockaddr_in *sockaddr) * Checks that the timestamp in the message is not after the reception tim= estamp * as well as the reception time is within 10 seconds of the message time. */ -void check_timestamp_difference(const struct timeval *msg_tv, - const struct timeval *pkt_tv) +void check_timestamp_difference(const struct timespec *msg_ts, + const struct timespec *pkt_ts) { - if (pkt_tv->tv_sec < msg_tv->tv_sec || - (pkt_tv->tv_sec =3D=3D msg_tv->tv_sec && pkt_tv->tv_usec < msg_tv-= >tv_usec)) + if (pkt_ts->tv_sec < msg_ts->tv_sec || + (pkt_ts->tv_sec =3D=3D msg_ts->tv_sec && pkt_ts->tv_nsec < msg_ts-= >tv_nsec)) { fprintf(stderr, - "Packet received before sent: %lld.%06lld < %lld.%06lld\n", - (long long)pkt_tv->tv_sec, (long long)pkt_tv->tv_usec, - (long long)msg_tv->tv_sec, (long long)msg_tv->tv_usec); + "Packet received before sent: %lld.%06lld < %lld.%09lld\n", + (long long)pkt_ts->tv_sec, (long long)pkt_ts->tv_nsec, + (long long)msg_ts->tv_sec, (long long)msg_ts->tv_nsec); exit(-1); } =20 - if (pkt_tv->tv_sec > msg_tv->tv_sec + 10 || - (pkt_tv->tv_sec =3D=3D msg_tv->tv_sec + 10 && - pkt_tv->tv_usec > msg_tv->tv_usec)) { + if (pkt_ts->tv_sec > msg_ts->tv_sec + 10 || + (pkt_ts->tv_sec =3D=3D msg_ts->tv_sec + 10 && + pkt_ts->tv_nsec > msg_ts->tv_nsec)) { fprintf(stderr, "Packet received more than 10 seconds after sent: " - "%lld.%06lld > %lld.%06lld + 10\n", - (long long)pkt_tv->tv_sec, (long long)pkt_tv->tv_usec, - (long long)msg_tv->tv_sec, (long long)msg_tv->tv_usec); + "%lld.%06lld > %lld.%09lld + 10\n", + (long long)pkt_ts->tv_sec, (long long)pkt_ts->tv_nsec, + (long long)msg_ts->tv_sec, (long long)msg_ts->tv_nsec); exit(-1); } } =20 void send_current_time(int sock, struct sockaddr_in server_sockaddr) { - struct timeval tv =3D {0, 0}; - gettimeofday(&tv, NULL); - sendto(sock, &tv, sizeof(tv), 0, (struct sockaddr *)&server_sockaddr, + struct timespec ts =3D {0, 0}; + clock_gettime(CLOCK_REALTIME, &ts); +#ifdef MSG_CONFIRM + const int flags =3D MSG_CONFIRM; +#else + const int flags =3D 0; +#endif + sendto(sock, &ts, sizeof(ts), flags, (struct sockaddr *)&server_sockad= dr, sizeof(server_sockaddr)); } =20 -typedef void (*get_timeval_t)(const struct cmsghdr *cmsg, struct timeval *= tv); +typedef void (*get_timespec_t)(const struct cmsghdr *cmsg, struct timespec= *tv); =20 - -void receive_packet(int sock, get_timeval_t get_timeval) +void receive_packet(int sock, get_timespec_t get_timespec) { struct msghdr msg =3D {0}; =20 @@ -113,7 +146,7 @@ void receive_packet(int sock, get_timeval_t get_timeval) struct cmsghdr align; } u; struct cmsghdr *cmsg; - struct timeval msg_tv, pkt_tv; + struct timespec msg_ts, pkt_ts; =20 int res; =20 @@ -134,31 +167,35 @@ void receive_packet(int sock, get_timeval_t get_timev= al) =20 assert(res =3D=3D sizeof(struct timeval)); assert(iov.iov_base =3D=3D iobuf); - memcpy(&msg_tv, iov.iov_base, sizeof(msg_tv)); - printf("Message timestamp: %lld.%06lld\n", - (long long)msg_tv.tv_sec, (long long)msg_tv.tv_usec); + memcpy(&msg_ts, iov.iov_base, sizeof(msg_ts)); + printf("Message timestamp: %lld.%09lld\n", + (long long)msg_ts.tv_sec, (long long)msg_ts.tv_nsec); =20 cmsg =3D CMSG_FIRSTHDR(&msg); assert(cmsg); - (*get_timeval)(cmsg, &pkt_tv); - printf("Packet timestamp: %lld.%06lld\n", - (long long)pkt_tv.tv_sec, (long long)pkt_tv.tv_usec); + (*get_timespec)(cmsg, &pkt_ts); + printf("Packet timestamp: %lld.%09lld\n", + (long long)pkt_ts.tv_sec, (long long)pkt_ts.tv_nsec); =20 - check_timestamp_difference(&msg_tv, &pkt_tv); + check_timestamp_difference(&msg_ts, &pkt_ts); } =20 -void get_timeval_from_so_timestamp(const struct cmsghdr *cmsg, - struct timeval *tv) +void get_timespec_from_so_timestamp(const struct cmsghdr *cmsg, + struct timespec *ts) { + struct timeval tv; assert(cmsg->cmsg_level =3D=3D SOL_SOCKET); assert(cmsg->cmsg_type =3D=3D SCM_TIMESTAMP); - assert(cmsg->cmsg_len =3D=3D CMSG_LEN(sizeof(struct timeval))); - memcpy(tv, CMSG_DATA(cmsg), sizeof(*tv)); + assert(cmsg->cmsg_len =3D=3D CMSG_LEN(sizeof(tv))); + + memcpy(&tv, CMSG_DATA(cmsg), sizeof(tv)); + ts->tv_sec =3D tv.tv_sec; + ts->tv_nsec =3D tv.tv_usec * 1000LL; } =20 #ifdef SO_TIMESTAMP_OLD -void get_timeval_from_so_timestamp_old(const struct cmsghdr *cmsg, - struct timeval *tv) +void get_timespec_from_so_timestamp_old(const struct cmsghdr *cmsg, + struct timespec *ts) { struct kernel_old_timeval old_tv; assert(cmsg->cmsg_level =3D=3D SOL_SOCKET); @@ -166,13 +203,13 @@ void get_timeval_from_so_timestamp_old(const struct c= msghdr *cmsg, assert(cmsg->cmsg_len =3D=3D CMSG_LEN(sizeof(old_tv))); =20 memcpy(&old_tv, CMSG_DATA(cmsg), sizeof(old_tv)); - tv->tv_sec =3D old_tv.tv_sec; - tv->tv_usec =3D old_tv.tv_usec; + ts->tv_sec =3D old_tv.tv_sec; + ts->tv_nsec =3D old_tv.tv_usec * 1000LL; } =20 #ifdef SO_TIMESTAMP_NEW -void get_timeval_from_so_timestamp_new(const struct cmsghdr *cmsg, - struct timeval *tv) +void get_timespec_from_so_timestamp_new(const struct cmsghdr *cmsg, + struct timespec *ts) { struct kernel_sock_timeval sock_tv; assert(cmsg->cmsg_level =3D=3D SOL_SOCKET); @@ -180,42 +217,298 @@ void get_timeval_from_so_timestamp_new(const struct = cmsghdr *cmsg, assert(cmsg->cmsg_len =3D=3D CMSG_LEN(sizeof(sock_tv))); =20 memcpy(&sock_tv, CMSG_DATA(cmsg), sizeof(sock_tv)); - tv->tv_sec =3D sock_tv.tv_sec; - tv->tv_usec =3D sock_tv.tv_usec; + ts->tv_sec =3D sock_tv.tv_sec; + ts->tv_nsec =3D sock_tv.tv_usec * 1000LL; } #endif /* defined(SO_TIMESTAMP_NEW) */ #endif /* defined(SO_TIMESTAMP_OLD) */ =20 -void set_socket_option(int sock, int sockopt, int on) +void get_timespec_from_so_timestampns(const struct cmsghdr *cmsg, + struct timespec *ts) +{ + assert(cmsg->cmsg_level =3D=3D SOL_SOCKET); + assert(cmsg->cmsg_type =3D=3D SCM_TIMESTAMPNS); + assert(cmsg->cmsg_len =3D=3D CMSG_LEN(sizeof(*ts))); + + memcpy(ts, CMSG_DATA(cmsg), sizeof(*ts)); +} + +#ifdef SO_TIMESTAMPNS_OLD +void get_timespec_from_so_timestampns_old(const struct cmsghdr *cmsg, + struct timespec *ts) +{ + struct kernel_old_timespec old_ts; + assert(cmsg->cmsg_level =3D=3D SOL_SOCKET); + assert(cmsg->cmsg_type =3D=3D SO_TIMESTAMPNS_OLD); + assert(cmsg->cmsg_len =3D=3D CMSG_LEN(sizeof(old_ts))); + + memcpy(&old_ts, CMSG_DATA(cmsg), sizeof(old_ts)); + ts->tv_sec =3D old_ts.tv_sec; + ts->tv_nsec =3D old_ts.tv_nsec; +} + +#ifdef SO_TIMESTAMPNS_NEW +void get_timespec_from_so_timestampns_new(const struct cmsghdr *cmsg, + struct timespec *ts) +{ + struct kernel_timespec sock_ts; + assert(cmsg->cmsg_level =3D=3D SOL_SOCKET); + assert(cmsg->cmsg_type =3D=3D SO_TIMESTAMPNS_NEW); + assert(cmsg->cmsg_len =3D=3D CMSG_LEN(sizeof(sock_ts))); + + memcpy(&sock_ts, CMSG_DATA(cmsg), sizeof(sock_ts)); + ts->tv_sec =3D sock_ts.tv_sec; + ts->tv_nsec =3D sock_ts.tv_nsec; +} +#endif /* defined(SO_TIMESTAMPNS_NEW) */ +#endif /* defined(SO_TIMESTAMPNS_OLD) */ + +void get_timespec_from_so_timestamping(const struct cmsghdr *cmsg, + struct timespec *ts) +{ + int i; + struct scm_timestamping tss; + assert(cmsg->cmsg_level =3D=3D SOL_SOCKET); + assert(cmsg->cmsg_type =3D=3D SCM_TIMESTAMPING); + assert(cmsg->cmsg_len =3D=3D CMSG_LEN(sizeof(tss))); + + memcpy(&tss, CMSG_DATA(cmsg), sizeof(tss)); + + for (i =3D 0; i < 3; ++i) { + if (tss.ts[i].tv_sec || tss.ts[i].tv_nsec) { + *ts =3D tss.ts[i]; + return; + } + } + assert(!"All three entries in scm_timestamping are empty"); +} + +#ifdef SO_TIMESTAMPING_OLD +void get_timespec_from_so_timestamping_old(const struct cmsghdr *cmsg, + struct timespec *ts) +{ + int i; + struct scm_old_timestamping tss; + assert(cmsg->cmsg_level =3D=3D SOL_SOCKET); + assert(cmsg->cmsg_type =3D=3D SO_TIMESTAMPING_OLD); + assert(cmsg->cmsg_len =3D=3D CMSG_LEN(sizeof(tss))); + + memcpy(&tss, CMSG_DATA(cmsg), sizeof(tss)); + + for (i =3D 0; i < 3; ++i) { + if (tss.ts[i].tv_sec || tss.ts[i].tv_nsec) { + ts->tv_sec =3D tss.ts[i].tv_sec; + ts->tv_nsec =3D tss.ts[i].tv_nsec; + return; + } + } + assert(!"All three entries in scm_old_timestamping are empty"); +} + +#ifdef SO_TIMESTAMPING_NEW +void get_timespec_from_so_timestamping_new(const struct cmsghdr *cmsg, + struct timespec *ts) +{ + int i; + struct scm_timestamping64 tss; + assert(cmsg->cmsg_level =3D=3D SOL_SOCKET); + assert(cmsg->cmsg_type =3D=3D SO_TIMESTAMPING_NEW); + assert(cmsg->cmsg_len =3D=3D CMSG_LEN(sizeof(tss))); + + memcpy(&tss, CMSG_DATA(cmsg), sizeof(tss)); + for (i =3D 0; i < 3; ++i) { + if (tss.ts[i].tv_sec || tss.ts[i].tv_nsec) { + ts->tv_sec =3D tss.ts[i].tv_sec; + ts->tv_nsec =3D tss.ts[i].tv_nsec; + return; + } + } + assert(!"All three entries in scm_timestamp64 are empty"); +} +#endif /* defined(SO_TIMESTAMPING_NEW) */ +#endif /* defined(SO_TIMESTAMPING_OLD) */ + +void set_socket_option(int sock, int sockopt, int set_to) { socklen_t len; - int val =3D on; + int val =3D set_to; if (setsockopt(sock, SOL_SOCKET, sockopt, &val, sizeof(val)) < 0) { int err =3D errno; - fprintf(stderr, "Failed to setsockopt %d (%s): %s\n", - sockopt, on ? "on" : "off", strerror(err)); + fprintf(stderr, "Failed at setsockopt(%d, SOL_SOCKET, %d, %d): %s\= n", + sock, sockopt, set_to, strerror(err)); exit(err); } =20 +#ifdef SO_TIMESTAMPING_NEW + if (sockopt =3D=3D SO_TIMESTAMPING_NEW) { + /* + * `getsockopt(sock, SOL_SOCKET, SO_TIMESTAMPING_NEW)` not impleme= nted + * as of linux kernel v5.8-rc4. + */ + return; + } +#endif + len =3D sizeof(val); val =3D -1; if (getsockopt(sock, SOL_SOCKET, sockopt, &val, &len) < 0) { int err =3D errno; - fprintf(stderr, "Failed to getsockopt (%d): %s\n", sock, strerror(= err)); + fprintf(stderr, "Failed at getsockopt(%d, SOL_SOCKET, %d): %s\n", + sock, sockopt, strerror(err)); exit(err); } assert(len =3D=3D sizeof(val)); - assert(val =3D=3D on); + assert(val =3D=3D set_to); +} + +void child_steps(int sock, struct sockaddr_in addr, int run_old) +{ + /* Test 1: SO_TIMESTAMP */ + send_current_time(sock, addr); + + /* Test 2: SO_TIMESTAMPNS */ + printf("Test 2: SO_TIMESTAMPNS\n"); + set_socket_option(sock, SO_TIMESTAMPNS, 1); + receive_packet(sock, &get_timespec_from_so_timestampns); + set_socket_option(sock, SO_TIMESTAMPNS, 0); + + /* Test 3: SO_TIMESTAMPING */ + send_current_time(sock, addr); + + if (!run_old) { + return; + } + +#ifdef SO_TIMESTAMP_OLD + if (SO_TIMESTAMP_OLD !=3D SO_TIMESTAMP) { + /* Test 4a: SO_TIMESTAMP_OLD */ + printf("Test 4a: SO_TIMESTAMP_OLD\n"); + set_socket_option(sock, SO_TIMESTAMP_OLD, 1); + receive_packet(sock, &get_timespec_from_so_timestamp_old); + set_socket_option(sock, SO_TIMESTAMP_OLD, 0); + } +#ifdef SO_TIMESTAMP_NEW + else { + /* Test 4b: SO_TIMESTAMP_NEW */ + printf("Test 4b: SO_TIMESTAMP_NEW\n"); + set_socket_option(sock, SO_TIMESTAMP_NEW, 1); + receive_packet(sock, &get_timespec_from_so_timestamp_new); + set_socket_option(sock, SO_TIMESTAMP_NEW, 0); + } +#endif /* defined(SO_TIMESTAMP_NEW) */ +#endif /* defined(SO_TIMESTAMP_OLD) */ + +#ifdef SO_TIMESTAMPNS_OLD + if (SO_TIMESTAMPNS_OLD !=3D SO_TIMESTAMPNS) { + /* Test 5a: SO_TIMESTAMPNS_OLD */ + send_current_time(sock, addr); + } +#ifdef SO_TIMESTAMPNS_NEW + else { + /* Test 5b: SO_TIMESTAMPNS_NEW */ + send_current_time(sock, addr); + } +#endif /* defined(SO_TIMESTAMPNS_NEW) */ +#endif /* defined(SO_TIMESTAMPNS_OLD) */ + +#ifdef SO_TIMESTAMPING_OLD + if (SO_TIMESTAMPING_OLD !=3D SO_TIMESTAMPING) { + /* Test 6a: SO_TIMESTAMPING_OLD */ + printf("Test 6a: SO_TIMESTAMPING_OLD\n"); + set_socket_option(sock, SO_TIMESTAMPING_OLD, so_timestamping_flags= ); + receive_packet(sock, &get_timespec_from_so_timestamping_old); + set_socket_option(sock, SO_TIMESTAMPING_OLD, 0); + } +#ifdef SO_TIMESTAMPING_NEW + else { + /* Test 6b: SO_TIMESTAMPING_NEW */ + printf("Test 6b: SO_TIMESTAMPING_NEW\n"); + set_socket_option(sock, SO_TIMESTAMPING_NEW, so_timestamping_flags= ); + receive_packet(sock, &get_timespec_from_so_timestamping_new); + set_socket_option(sock, SO_TIMESTAMPING_NEW, 0); + } +#endif /* defined(SO_TIMESTAMPING_NEW) */ +#endif /* defined(SO_TIMESTAMPING_OLD) */ +} + +void parent_steps(int sock, struct sockaddr_in addr, int run_old) +{ + /* Test 1: SO_TIMESTAMP */ + printf("Test 1: SO_TIMESTAMP\n"); + set_socket_option(sock, SO_TIMESTAMP, 1); + receive_packet(sock, &get_timespec_from_so_timestamp); + set_socket_option(sock, SO_TIMESTAMP, 0); + + /* Test 2: SO_TIMESTAMPNS */ + send_current_time(sock, addr); + + /* Test 3: SO_TIMESTAMPING */ + printf("Test 3: SO_TIMESTAMPING\n"); + set_socket_option(sock, SO_TIMESTAMPING, so_timestamping_flags); + receive_packet(sock, &get_timespec_from_so_timestamping); + set_socket_option(sock, SO_TIMESTAMPING, 0); + + if (!run_old) { + return; + } + +#ifdef SO_TIMESTAMP_OLD + if (SO_TIMESTAMP_OLD !=3D SO_TIMESTAMP) { + /* Test 4a: SO_TIMESTAMP_OLD */ + send_current_time(sock, addr); + } +#ifdef SO_TIMESTAMP_NEW + else { + /* Test 4b: SO_TIMESTAMP_NEW */ + send_current_time(sock, addr); + } +#endif /* defined(SO_TIMESTAMP_NEW) */ +#endif /* defined(SO_TIMESTAMP_OLD) */ + +#ifdef SO_TIMESTAMPNS_OLD + if (SO_TIMESTAMPNS_OLD !=3D SO_TIMESTAMPNS) { + /* Test 5a: SO_TIMESTAMPNS_OLD */ + printf("Test 5a: SO_TIMESTAMPNS_OLD\n"); + set_socket_option(sock, SO_TIMESTAMPNS_OLD, 1); + receive_packet(sock, &get_timespec_from_so_timestampns_old); + set_socket_option(sock, SO_TIMESTAMPNS_OLD, 0); + } +#ifdef SO_TIMESTAMPNS_NEW + else { + /* Test 5b: SO_TIMESTAMPNS_NEW */ + printf("Test 5b: SO_TIMESTAMPNS_NEW\n"); + set_socket_option(sock, SO_TIMESTAMPNS_NEW, 1); + receive_packet(sock, &get_timespec_from_so_timestampns_new); + set_socket_option(sock, SO_TIMESTAMPNS_NEW, 0); + } +#endif /* defined(SO_TIMESTAMPNS_NEW) */ +#endif /* defined(SO_TIMESTAMPNS_OLD) */ + +#ifdef SO_TIMESTAMPING_OLD + if (SO_TIMESTAMPING_OLD !=3D SO_TIMESTAMPING) { + /* Test 6a: SO_TIMESTAMPING_OLD */ + send_current_time(sock, addr); + } +#ifdef SO_TIMESTAMPING_NEW + else { + /* Test 6b: SO_TIMESTAMPING_NEW */ + send_current_time(sock, addr); + } +#endif /* defined(SO_TIMESTAMPING_NEW) */ +#endif /* defined(SO_TIMESTAMPING_OLD) */ } =20 int main(int argc, char **argv) { int parent_sock, child_sock; struct sockaddr_in parent_sockaddr, child_sockaddr; - int pid; + int pid, run_old; struct timeval tv =3D {0, 0}; gettimeofday(&tv, NULL); =20 + /* Too close to y2038 old systems may not work. */ + run_old =3D tv.tv_sec < 0x7fffff00; + parent_sock =3D create_udp_socket(&parent_sockaddr); child_sock =3D create_udp_socket(&child_sockaddr); =20 @@ -226,64 +519,15 @@ int main(int argc, char **argv) if (pid < 0) { fprintf(stderr, "SKIPPED. Failed to fork: %s\n", strerror(errno)); } else if (pid =3D=3D 0) { - close(child_sock); - - /* Test 1: SO_TIMESTAMP */ - send_current_time(parent_sock, child_sockaddr); - - if (tv.tv_sec > 0x7fffff00) { - /* Too close to y2038 problem, old system may not work. */ - close(parent_sock); - return 0; - } - -#ifdef SO_TIMESTAMP_OLD - if (SO_TIMESTAMP_OLD !=3D SO_TIMESTAMP) { - /* Test 2a: SO_TIMESTAMP_OLD */ - set_socket_option(parent_sock, SO_TIMESTAMP_OLD, 1); - receive_packet(parent_sock, &get_timeval_from_so_timestamp_old= ); - set_socket_option(parent_sock, SO_TIMESTAMP_OLD, 0); - } -#ifdef SO_TIMESTAMP_NEW - else { - /* Test 2b: SO_TIMESTAMP_NEW */ - set_socket_option(parent_sock, SO_TIMESTAMP_NEW, 1); - receive_packet(parent_sock, &get_timeval_from_so_timestamp_new= ); - set_socket_option(parent_sock, SO_TIMESTAMP_NEW, 0); - } -#endif /* defined(SO_TIMESTAMP_NEW) */ -#endif /* defined(SO_TIMESTAMP_OLD) */ - close(parent_sock); + child_steps(child_sock, parent_sockaddr, run_old); + close(child_sock); } else { int child_status; - close(parent_sock); - - /* Test 1: SO_TIMESTAMP */ - set_socket_option(child_sock, SO_TIMESTAMP, 1); - receive_packet(child_sock, &get_timeval_from_so_timestamp); - set_socket_option(child_sock, SO_TIMESTAMP, 0); - - if (tv.tv_sec > 0x7fffff00) { - /* Too close to y2038 problem, old system may not work. */ - close(child_sock); - return 0; - } - -#ifdef SO_TIMESTAMP_OLD - if (SO_TIMESTAMP_OLD !=3D SO_TIMESTAMP) { - /* Test 2a: SO_TIMESTAMP_OLD */ - send_current_time(child_sock, parent_sockaddr); - } -#ifdef SO_TIMESTAMP_NEW - else { - /* Test 2b: SO_TIMESTAMP_NEW */ - send_current_time(child_sock, parent_sockaddr); - } -#endif /* defined(SO_TIMESTAMP_NEW) */ -#endif /* defined(SO_TIMESTAMP_OLD) */ =20 close(child_sock); + parent_steps(parent_sock, child_sockaddr, run_old); + close(parent_sock); =20 if (waitpid(pid, &child_status, 0) < 0) { int err =3D errno; --=20 2.29.2.684.gfbc64c5ab5-goog