From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by sourceware.org (Postfix) with ESMTP id 32E2E3894C1C for ; Mon, 14 Jun 2021 14:52:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 32E2E3894C1C Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-205-7QlxVW8NOwKY-ICURFJexw-1; Mon, 14 Jun 2021 10:52:06 -0400 X-MC-Unique: 7QlxVW8NOwKY-ICURFJexw-1 Received: by mail-qk1-f197.google.com with SMTP id x4-20020a3763040000b02903ab95237c25so6535243qkb.0 for ; Mon, 14 Jun 2021 07:52:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:organization :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=G+ObW9LQlxcGc/HmghbP7GQQgMU+Qv4LgFmWGJxHmAM=; b=G7j+1UKWeC5ftpVXmbY3FB6FFrNRTMkprDA2H88KN6k0paf2f13XCPF1d78y0XrxnT Qr6MMaB5znd9nKZcg6lPzCbySsORhu5P5ySN0XPjLEs3vOPdY0/naiDTmenCqDtEbLkb xtgZGGGMlzqBQWER7e2JmIk3j12pixquzu7g9dmEdW8dYHYNKTfpsbFvNiSk0F4ZM8OD LDqUTzHrIyLR6MbtCARu6ebzQep7pP+hlNSR1qVMdWyYOvb/sN+4tKGF2aaHvBvgISyB jpJpX5oPcww5oiKv8c5emEQ1gZ0i/fk9HpLag8oPepkEcm3DtRbZ3nr8lDOHRC64UWtJ Dj5Q== X-Gm-Message-State: AOAM532rJ8dJgNQa5BkLxfM7IYgxnoiq5NJfwyC5Y9PZ1khFfpOTMGaz 3HUkqfOOJX5kXX9wVQJ2t5cX1P4vHp3M/upMuUyA9NDJMW0ypQjkx6VYUFNItsnBf2GKhuGYjFp L+lTpPaCkEX9vXMMjuFZn X-Received: by 2002:a05:620a:e12:: with SMTP id y18mr16574497qkm.106.1623682325941; Mon, 14 Jun 2021 07:52:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwDDTbZ5+7pOv0fiRRQulWfO1oZdu96sOfDmrRT1ftGN6EtxD0BZa1Umkt3OINamc9f8bbDNg== X-Received: by 2002:a05:620a:e12:: with SMTP id y18mr16574472qkm.106.1623682325629; Mon, 14 Jun 2021 07:52:05 -0700 (PDT) Received: from [192.168.1.16] (198-84-214-74.cpe.teksavvy.com. [198.84.214.74]) by smtp.gmail.com with ESMTPSA id e127sm10438483qkf.62.2021.06.14.07.52.04 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 14 Jun 2021 07:52:04 -0700 (PDT) Subject: Re: [PATCH v3 04/24] linux: Add fallback for 64-bit time_t SO_{RCV,SND}TIMEO To: Adhemerval Zanella , libc-alpha@sourceware.org References: <20210607203613.282543-1-adhemerval.zanella@linaro.org> <20210607203613.282543-5-adhemerval.zanella@linaro.org> From: Carlos O'Donell Organization: Red Hat Message-ID: <45a5c243-bb5b-99d9-5317-70ecd3137947@redhat.com> Date: Mon, 14 Jun 2021 10:52:03 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.10.1 MIME-Version: 1.0 In-Reply-To: <20210607203613.282543-5-adhemerval.zanella@linaro.org> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, NICE_REPLY_A, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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-List-Received-Date: Mon, 14 Jun 2021 14:52:10 -0000 On 6/7/21 4:35 PM, Adhemerval Zanella wrote: > The constant values will be changed for __TIMESIZE=64, so binaries built > with 64-bit time support might fail to work properly on old kernels. > Both {get,set}sockopt will retry the syscall with the old constant > values and the timeout value adjusted when kernel returns ENOTPROTOPT. > > It also adds an internal only SO_{RCV,SND}TIMEO where > COMPAT_SO_{RCV,SND}TIMEO_OLD indicates pre 32 bit time support and > COMPAT_SO_{RCV,SND}TIMEO_NEW indicates time64 support. It allows to > refer to constant independently of the time_t ABI and kernel version > used. No regressions on x86_64 and i686 and reviewed resulting ABI for correctness. Reviewed-by: Carlos O'Donell Tested-by: carlos O'Donell > Checked on x86_64-linux-gnu and i686-linux-gnu (on 5.4 and on 4.15 > kernel). > --- > sysdeps/unix/sysv/linux/getsockopt.c | 70 ++++++++++++++++-- > .../sysv/linux/hppa/socket-constants-time64.h | 30 ++++++++ > .../sysv/linux/mips/socket-constants-time64.h | 30 ++++++++ > .../linux/powerpc/socket-constants-time64.h | 30 ++++++++ > sysdeps/unix/sysv/linux/setsockopt.c | 71 ++++++++++++++++--- > .../unix/sysv/linux/socket-constants-time64.h | 30 ++++++++ > .../linux/sparc/socket-constants-time64.h | 30 ++++++++ > 7 files changed, 276 insertions(+), 15 deletions(-) > create mode 100644 sysdeps/unix/sysv/linux/hppa/socket-constants-time64.h > create mode 100644 sysdeps/unix/sysv/linux/mips/socket-constants-time64.h > create mode 100644 sysdeps/unix/sysv/linux/powerpc/socket-constants-time64.h > create mode 100644 sysdeps/unix/sysv/linux/socket-constants-time64.h > create mode 100644 sysdeps/unix/sysv/linux/sparc/socket-constants-time64.h > > diff --git a/sysdeps/unix/sysv/linux/getsockopt.c b/sysdeps/unix/sysv/linux/getsockopt.c > index 76ee8a94d6..688a7de087 100644 > --- a/sysdeps/unix/sysv/linux/getsockopt.c > +++ b/sysdeps/unix/sysv/linux/getsockopt.c > @@ -15,16 +15,15 @@ > License along with the GNU C Library; if not, see > . */ > > -#include > -#include > #include > - > +#include > +#include > #include > -#include > -#include > +#include > > -int > -__getsockopt (int fd, int level, int optname, void *optval, socklen_t *len) > +static int > +getsockopt_syscall (int fd, int level, int optname, void *optval, > + socklen_t *len) > { > #ifdef __ASSUME_GETSOCKOPT_SYSCALL > return INLINE_SYSCALL (getsockopt, 5, fd, level, optname, optval, len); > @@ -32,4 +31,61 @@ __getsockopt (int fd, int level, int optname, void *optval, socklen_t *len) > return SOCKETCALL (getsockopt, fd, level, optname, optval, len); > #endif > } > + > +#ifndef __ASSUME_TIME64_SYSCALLS > +static int > +getsockopt32 (int fd, int level, int optname, void *optval, > + socklen_t *len) > +{ > + int r = -1; > + > + if (level != SOL_SOCKET) > + return r; > + > + switch (optname) > + { > + case COMPAT_SO_RCVTIMEO_NEW: > + case COMPAT_SO_SNDTIMEO_NEW: > + { > + if (optname == COMPAT_SO_RCVTIMEO_NEW) > + optname = COMPAT_SO_RCVTIMEO_OLD; > + if (optname == COMPAT_SO_SNDTIMEO_NEW) > + optname = COMPAT_SO_SNDTIMEO_OLD; > + > + struct __timeval32 tv32; > + r = getsockopt_syscall (fd, level, optname, &tv32, > + (socklen_t[]) { sizeof tv32 }); > + if (r < 0) > + break; > + > + /* POSIX states that if the size of the option value is greater than > + then option length, the option value argument shall be silently > + truncated. */ OK. > + if (*len >= sizeof (struct __timeval64)) > + { > + struct __timeval64 *tv64 = (struct __timeval64 *) optval; > + *tv64 = valid_timeval32_to_timeval64 (tv32); > + *len = sizeof (*tv64); > + } > + else > + memcpy (optval, &tv32, sizeof tv32); OK. Truncate. > + } > + } > + > + return r; > +} > +#endif > + > +int > +__getsockopt (int fd, int level, int optname, void *optval, socklen_t *len) > +{ > + int r = getsockopt_syscall (fd, level, optname, optval, len); > + > +#ifndef __ASSUME_TIME64_SYSCALLS > + if (r == -1 && errno == ENOPROTOOPT) > + r = getsockopt32 (fd, level, optname, optval, len); > +#endif > + > + return r; > +} > weak_alias (__getsockopt, getsockopt) > diff --git a/sysdeps/unix/sysv/linux/hppa/socket-constants-time64.h b/sysdeps/unix/sysv/linux/hppa/socket-constants-time64.h > new file mode 100644 > index 0000000000..9fe7576aaa > --- /dev/null > +++ b/sysdeps/unix/sysv/linux/hppa/socket-constants-time64.h > @@ -0,0 +1,30 @@ > +/* Compat socket constants used in 64-bit compat code. > + 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 > + . */ > + > +#ifndef _SOCKET_CONSTANTS_TIME64_H > +#define _SOCKET_CONSTANTS_TIME64_H > + > +/* The compat code requires the SO_* constants used for both 32 and 64-bit > + time_t, however they were only added on v5.1 kernel. */ > + > +#define COMPAT_SO_RCVTIMEO_OLD 4102 > +#define COMPAT_SO_SNDTIMEO_OLD 4101 > +#define COMPAT_SO_RCVTIMEO_NEW 16448 > +#define COMPAT_SO_SNDTIMEO_NEW 16449 > + > +#endif > diff --git a/sysdeps/unix/sysv/linux/mips/socket-constants-time64.h b/sysdeps/unix/sysv/linux/mips/socket-constants-time64.h > new file mode 100644 > index 0000000000..1252a8a23b > --- /dev/null > +++ b/sysdeps/unix/sysv/linux/mips/socket-constants-time64.h > @@ -0,0 +1,30 @@ > +/* Compat socket constants used in 64-bit compat code. > + 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 > + . */ > + > +#ifndef _SOCKET_CONSTANTS_TIME64_H > +#define _SOCKET_CONSTANTS_TIME64_H > + > +/* The compat code requires the SO_* constants used for both 32 and 64-bit > + time_t, however they were only added on v5.1 kernel. */ > + > +#define COMPAT_SO_RCVTIMEO_OLD 4102 > +#define COMPAT_SO_SNDTIMEO_OLD 4101 > +#define COMPAT_SO_RCVTIMEO_NEW 66 > +#define COMPAT_SO_SNDTIMEO_NEW 67 > + > +#endif > diff --git a/sysdeps/unix/sysv/linux/powerpc/socket-constants-time64.h b/sysdeps/unix/sysv/linux/powerpc/socket-constants-time64.h > new file mode 100644 > index 0000000000..26e8b710ab > --- /dev/null > +++ b/sysdeps/unix/sysv/linux/powerpc/socket-constants-time64.h > @@ -0,0 +1,30 @@ > +/* Compat socket constants used in 64-bit compat code. > + 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 > + . */ > + > +#ifndef _SOCKET_CONSTANTS_TIME64_H > +#define _SOCKET_CONSTANTS_TIME64_H > + > +/* The compat code requires the SO_* constants used for both 32 and 64-bit > + time_t, however they were only added on v5.1 kernel. */ > + > +#define COMPAT_SO_RCVTIMEO_OLD 18 > +#define COMPAT_SO_SNDTIMEO_OLD 19 > +#define COMPAT_SO_RCVTIMEO_NEW 66 > +#define COMPAT_SO_SNDTIMEO_NEW 67 > + > +#endif > diff --git a/sysdeps/unix/sysv/linux/setsockopt.c b/sysdeps/unix/sysv/linux/setsockopt.c > index 12fd7bdcde..6505202265 100644 > --- a/sysdeps/unix/sysv/linux/setsockopt.c > +++ b/sysdeps/unix/sysv/linux/setsockopt.c > @@ -15,21 +15,76 @@ > License along with the GNU C Library; if not, see > . */ > > -#include > -#include > #include > - > +#include > +#include > #include > -#include > -#include > +#include > > -int > -setsockopt (int fd, int level, int optname, const void *optval, socklen_t len) > +static int > +setsockopt_syscall (int fd, int level, int optname, const void *optval, > + socklen_t len) > { > #ifdef __ASSUME_SETSOCKOPT_SYSCALL > - return INLINE_SYSCALL (setsockopt, 5, fd, level, optname, optval, len); > + return INLINE_SYSCALL_CALL (setsockopt, fd, level, optname, optval, len); > #else > return SOCKETCALL (setsockopt, fd, level, optname, optval, len); > #endif > } > + > +#ifndef __ASSUME_TIME64_SYSCALLS > +static int > +setsockopt32 (int fd, int level, int optname, const void *optval, > + socklen_t len) > +{ > + int r = -1; > + > + if (level != SOL_SOCKET) > + return r; > + > + switch (optname) > + { > + case COMPAT_SO_RCVTIMEO_NEW: > + case COMPAT_SO_SNDTIMEO_NEW: > + { > + if (len < sizeof (struct __timeval64)) > + { > + __set_errno (EINVAL); > + break; > + } > + > + struct __timeval64 *tv64 = (struct __timeval64 *) optval; > + if (! in_time_t_range (tv64->tv_sec)) > + { > + __set_errno (EOVERFLOW); > + break; > + } > + > + if (optname == COMPAT_SO_RCVTIMEO_NEW) > + optname = COMPAT_SO_RCVTIMEO_OLD; > + if (optname == COMPAT_SO_SNDTIMEO_NEW) > + optname = COMPAT_SO_SNDTIMEO_OLD; > + > + struct __timeval32 tv32 = valid_timeval64_to_timeval32 (*tv64); > + > + r = setsockopt_syscall (fd, level, optname, &tv32, sizeof (tv32)); > + } > + } > + > + return r; > +} > +#endif > + > +int > +setsockopt (int fd, int level, int optname, const void *optval, socklen_t len) > +{ > + int r = setsockopt_syscall (fd, level, optname, optval, len); > + > +#ifndef __ASSUME_TIME64_SYSCALLS > + if (r == -1 && errno == ENOPROTOOPT) > + r = setsockopt32 (fd, level, optname, optval, len); > +#endif > + > + return r; > +} > weak_alias (setsockopt, __setsockopt) > diff --git a/sysdeps/unix/sysv/linux/socket-constants-time64.h b/sysdeps/unix/sysv/linux/socket-constants-time64.h > new file mode 100644 > index 0000000000..d09c39d6c2 > --- /dev/null > +++ b/sysdeps/unix/sysv/linux/socket-constants-time64.h > @@ -0,0 +1,30 @@ > +/* Compat socket constants used in 64-bit compat code. > + 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 > + . */ > + > +#ifndef _SOCKET_CONSTANTS_TIME64_H > +#define _SOCKET_CONSTANTS_TIME64_H > + > +/* The compat code requires the SO_* constants used for both 32 and 64-bit > + time_t, however they were only added on v5.1 kernel. */ > + > +#define COMPAT_SO_RCVTIMEO_OLD 20 > +#define COMPAT_SO_SNDTIMEO_OLD 21 > +#define COMPAT_SO_RCVTIMEO_NEW 66 > +#define COMPAT_SO_SNDTIMEO_NEW 67 > + > +#endif > diff --git a/sysdeps/unix/sysv/linux/sparc/socket-constants-time64.h b/sysdeps/unix/sysv/linux/sparc/socket-constants-time64.h > new file mode 100644 > index 0000000000..f4668db537 > --- /dev/null > +++ b/sysdeps/unix/sysv/linux/sparc/socket-constants-time64.h > @@ -0,0 +1,30 @@ > +/* Compat socket constants used in 64-bit compat code. > + 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 > + . */ > + > +#ifndef _SOCKET_CONSTANTS_TIME64_H > +#define _SOCKET_CONSTANTS_TIME64_H > + > +/* The compat code requires the SO_* constants used for both 32 and 64-bit > + time_t, however they were only added on v5.1 kernel. */ > + > +#define COMPAT_SO_RCVTIMEO_OLD 8192 > +#define COMPAT_SO_SNDTIMEO_OLD 16384 > +#define COMPAT_SO_RCVTIMEO_NEW 68 > +#define COMPAT_SO_SNDTIMEO_NEW 69 > + > +#endif > -- Cheers, Carlos.