From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-qk1-x743.google.com (mail-qk1-x743.google.com [IPv6:2607:f8b0:4864:20::743]) by sourceware.org (Postfix) with ESMTPS id 03AEC3857000 for ; Tue, 1 Dec 2020 12:32:35 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 03AEC3857000 Received: by mail-qk1-x743.google.com with SMTP id y197so1002675qkb.7 for ; Tue, 01 Dec 2020 04:32:35 -0800 (PST) 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:autocrypt :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=LQodlSGddclNQZl88X+QyQr5dyW2IKmuETSj0Q5Sgtk=; b=oElkTZFM9Gp8agaNiInbl6ZnyIGq0Odu5yOp9B7fMma6LSNaiGSNrne+8cikqwXl+v y7Hbm8wHJYsGt4pfkBEd3m1gYBYat4A4wMZvAeb5H8YH3lLlNORmB25f8ZmWFe/tY2Wt AaPAo/COcM9P/oBxzpCjRNW3PgGDnE03qDls3JaJ3g5kDJlpgU4kSUFXibQw7NbG5yTW t8Zbkw0J5332XlyZkymYCj9Y2p0GP4IpswsUYecXb91D2RSjDF4nePN1gTTBDFNjtpsr rxqRXxOD0ruPnI/SHMr4n8vVYVTJv8y3Lm8gz97gs3WrPGQQXGsS0uK0G3J8RpwNCUMQ ikiw== X-Gm-Message-State: AOAM5339qY4D/W5Uipf4xYT4r+cA3AAdtDoZNPsk4Qpq65b3lnX9BOub 3j9VR+TIb+nehJIiSvXm3T7Q2w== X-Google-Smtp-Source: ABdhPJzED3Ir3ECkW3HmHdYk/gb2QVbm+hmSmoYaN4nwMO+oa55242SVlWxFTjQeSMlhjrkiL/xGaw== X-Received: by 2002:a37:a484:: with SMTP id n126mr2603338qke.277.1606825954555; Tue, 01 Dec 2020 04:32:34 -0800 (PST) Received: from [192.168.1.4] ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id e4sm1864952qtc.54.2020.12.01.04.32.31 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 01 Dec 2020 04:32:33 -0800 (PST) Subject: Re: [PATCH 2/2] y2038: Convert gai_suspend to support 64 bit time To: Lukasz Majewski , Joseph Myers , Paul Eggert Cc: Alistair Francis , Arnd Bergmann , Alistair Francis , GNU C Library , Florian Weimer , Carlos O'Donell , Stepan Golosunov , Andreas Schwab , Zack Weinberg References: <20201201094437.23804-1-lukma@denx.de> <20201201094437.23804-2-lukma@denx.de> From: Adhemerval Zanella Autocrypt: addr=adhemerval.zanella@linaro.org; prefer-encrypt=mutual; keydata= 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 Message-ID: <41d154f8-30c5-bd20-d02e-d9dee457c58b@linaro.org> Date: Tue, 1 Dec 2020 09:32:29 -0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <20201201094437.23804-2-lukma@denx.de> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-14.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, NICE_REPLY_A, RCVD_IN_DNSWL_NONE, 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: Tue, 01 Dec 2020 12:32:36 -0000 On 01/12/2020 06:44, Lukasz Majewski wrote: > This change uses (in gai_misc.h): > - __futex_abstimed_wait64 (instead of futex_reltimed_wait) > - __futex_abstimed_wait_cancellable64 > (instead of futex_reltimed_wait_cancellable) > from ./sysdeps/nptl/futex-helpers.h > > The gai_suspend() accepts relative timeout, which then is converted to > absolute one. > > The i686-gnu port (HURD) do not define DONT_NEED_GAI_MISC_COND and as it > doesn't (yet) support 64 bit time it uses not converted > pthread_cond_timedwait(). > > The __gai_suspend() is supposed to be run on ports with __TIMESIZE !=64 and > __WORDSIZE==32. It internally utilizes __gai_suspend_time64() and hence the > conversion from 32 bit struct timespec to 64 bit one is required. > > For ports supporting 64 bit time the __gai_suspend_time64() will be used > either via alias (to __gai_suspend when __TIMESIZE==64) or redirection > (when -D_TIME_BITS=64 is passed). > > Build tests: > ./src/scripts/build-many-glibcs.py glibcs LGTM, thanks. As a side note we can now remove futex_reltimed_wait{_cancelable} and make the __futex_abstimed_wait{_cancelable64} the futex block function. Reviewed-by: Adhemerval Zanella > --- > include/netdb.h | 7 +++++ > resolv/gai_suspend.c | 61 ++++++++++++++++++++++++----------------- > sysdeps/nptl/gai_misc.h | 11 +++++--- > 3 files changed, 50 insertions(+), 29 deletions(-) > > diff --git a/include/netdb.h b/include/netdb.h > index 49d63c1338..645b85dc62 100644 > --- a/include/netdb.h > +++ b/include/netdb.h > @@ -194,6 +194,13 @@ extern int ruserpass (const char *host, const char **aname, > const char **apass); > libc_hidden_proto (ruserpass) > > +# if __TIMESIZE == 64 > +# define __gai_suspend_time64 __gai_suspend > +# else > +extern int __gai_suspend_time64 (const struct gaicb *const list[], int ent, > + const struct __timespec64 *timeout); > +libanl_hidden_proto (__gai_suspend_time64) > +# endif > > /* The following definition has been removed from the public header > since we don't want people to use them. */ Ok. > diff --git a/resolv/gai_suspend.c b/resolv/gai_suspend.c > index 734f9b4500..d75abeb7e3 100644 > --- a/resolv/gai_suspend.c > +++ b/resolv/gai_suspend.c > @@ -24,10 +24,9 @@ > > #include > > - > int > -gai_suspend (const struct gaicb *const list[], int ent, > - const struct timespec *timeout) > +__gai_suspend_time64 (const struct gaicb *const list[], int ent, > + const struct __timespec64 *timeout) > { > struct waitlist waitlist[ent]; > struct requestlist *requestlist[ent]; > @@ -63,6 +62,19 @@ gai_suspend (const struct gaicb *const list[], int ent, > } > } > > + struct __timespec64 ts; > + if (timeout != NULL) > + { > + __clock_gettime64 (CLOCK_MONOTONIC, &ts); > + ts.tv_sec += timeout->tv_sec; > + ts.tv_nsec += timeout->tv_nsec; > + if (ts.tv_nsec >= 1000000000) > + { > + ts.tv_nsec -= 1000000000; > + ts.tv_sec++; > + } > + } > + > if (none) > { > if (cnt < ent) > @@ -83,29 +95,11 @@ gai_suspend (const struct gaicb *const list[], int ent, > > #ifdef DONT_NEED_GAI_MISC_COND > result = 0; > - GAI_MISC_WAIT (result, cntr, timeout, 1); > + GAI_MISC_WAIT (result, cntr, timeout == NULL ? NULL : &ts, 1); > #else > - if (timeout == NULL) > - result = pthread_cond_wait (&cond, &__gai_requests_mutex); > - else > - { > - /* We have to convert the relative timeout value into an > - absolute time value with pthread_cond_timedwait expects. */ > - struct timespec now; > - struct timespec abstime; > - > - __clock_gettime (CLOCK_REALTIME, &now); > - abstime.tv_nsec = timeout->tv_nsec + now.tv_nsec; > - abstime.tv_sec = timeout->tv_sec + now.tv_sec; > - if (abstime.tv_nsec >= 1000000000) > - { > - abstime.tv_nsec -= 1000000000; > - abstime.tv_sec += 1; > - } > - > - result = pthread_cond_timedwait (&cond, &__gai_requests_mutex, > - &abstime); > - } > + struct timespec ts32 = valid_timespec64_to_timespec (ts); > + result = pthread_cond_timedwait (&cond, &__gai_requests_mutex, > + timeout == NULL ? NULL : &ts32); > #endif > > /* Now remove the entry in the waiting list for all requests Ok. > @@ -155,3 +149,20 @@ gai_suspend (const struct gaicb *const list[], int ent, > > return result; > } > + > +#if __TIMESIZE != 64 > +libanl_hidden_def (__gai_suspend_time64) > + > +int > +__gai_suspend (const struct gaicb *const list[], int ent, > + const struct timespec *timeout) > +{ > + struct __timespec64 ts64; > + > + if (timeout != NULL) > + ts64 = valid_timespec_to_timespec64 (*timeout); > + > + return __gai_suspend_time64 (list, ent, timeout != NULL ? &ts64 : NULL); > +} > +#endif > +weak_alias (__gai_suspend, gai_suspend) Ok. > diff --git a/sysdeps/nptl/gai_misc.h b/sysdeps/nptl/gai_misc.h > index c1d5e2e6f0..c72a863974 100644 > --- a/sysdeps/nptl/gai_misc.h > +++ b/sysdeps/nptl/gai_misc.h > @@ -46,11 +46,12 @@ > do \ > { \ > if (cancel) \ > - status = futex_reltimed_wait_cancelable ( \ > - (unsigned int *) futexaddr, oldval, timeout, FUTEX_PRIVATE); \ > + status = __futex_abstimed_wait_cancelable64 ( \ > + (unsigned int *) futexaddr, oldval, CLOCK_MONOTONIC, timeout, \ > + FUTEX_PRIVATE); \ > else \ > - status = futex_reltimed_wait ((unsigned int *) futexaddr, \ > - oldval, timeout, FUTEX_PRIVATE); \ > + status = __futex_abstimed_wait64 ((unsigned int *) futexaddr, \ > + oldval, CLOCK_REALTIME, timeout, FUTEX_PRIVATE); \ > if (status != EAGAIN) \ > break; \ > \ > @@ -62,6 +63,8 @@ > result = EINTR; \ > else if (status == ETIMEDOUT) \ > result = EAGAIN; \ > + else if (status == EOVERFLOW) \ > + result = EOVERFLOW; \ > else \ > assert (status == 0 || status == EAGAIN); \ > \ > Ok.