From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-oa1-x32.google.com (mail-oa1-x32.google.com [IPv6:2001:4860:4864:20::32]) by sourceware.org (Postfix) with ESMTPS id 3C0453858404 for ; Thu, 1 Jun 2023 18:00:55 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 3C0453858404 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linaro.org Received: by mail-oa1-x32.google.com with SMTP id 586e51a60fabf-1a28e087cf1so312963fac.3 for ; Thu, 01 Jun 2023 11:00:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1685642454; x=1688234454; h=content-transfer-encoding:in-reply-to:organization:from:references :cc:to:content-language:subject:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=mRPHikQXOXSNGIz36veVQUxY7c0dbvYn7QoX7KRaUYY=; b=pjGnQzdKRZGUQm+iiSuITla3POqsViFI+Vq2VNlHNYe/RlgB+MQwtCslvx37o5HMJC QNzMza62Ut36pZHdTVPv6FLyF+pLyOP5XVqyhC+Pe1G4QcYbbkD2TrOGghJRkQCJGm2i gWo7yD2A2aQGoqhGoKtCFYB/4En+4kb4jetUeREE2sPJyHPJEeaHmWekDu9h4umJzqSR yhmQ8emHS5SYhMO52az4yqiDUYUqG5FrzMHnBqVyGuW29p0wofHQ6t7zXh+9suyEjqkO s5jXywFuUV6v3ZIWyTBuX5Ir+xS6RGVY4elwfrNHDD28QxvKMxdQHtK134MN/xdKU10m aT2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685642454; x=1688234454; h=content-transfer-encoding:in-reply-to:organization:from:references :cc:to:content-language:subject:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=mRPHikQXOXSNGIz36veVQUxY7c0dbvYn7QoX7KRaUYY=; b=FcabBjHNXGILbDf4sYhBLZAp0acM4j4cL/kHwZU/t3M7nzGeg2infxrC2I/GRiIntZ tv9HH3mnbdU/0jJSwgNDsCj7SsSjWYY9NyTZFxBU00yTMiDApbQQ1S8ML8okDDxs1dUs RV54mNlfGbVpZVYna71jFclVgJz4J45E2veKz7Zq61yAyGkINCd/FezRDq5ovhuCDCYZ Ke4xsksD9g9X92SnGdRRUlg8Wktcom51vLj/ca8tkqPeRc+zxmZ2GZE20iojOBgnMW8n jlKw/kLWlpJt99cMw3bjo3+X/BZhyiC/TznLGkipGd1x5FcPbcISW+CZNZ894onBDk5L JjGg== X-Gm-Message-State: AC+VfDw9bhajukDQ6cBz55MrFPHNCAtEEhzRh+U5gx5AQR2BP8kHBjyx k9186q2wGZuYyXrn3tISoIxYhRjokznTvpPPvbuq3Q== X-Google-Smtp-Source: ACHHUZ7UyWhXZcXvUSrENHxB/34g2eqpE28pGN281M6agsURRWUy2iLrQ6B2NXLH2DMdXzhOy6s9oA== X-Received: by 2002:a05:6870:e393:b0:19e:e6e8:46f9 with SMTP id x19-20020a056870e39300b0019ee6e846f9mr10495895oad.30.1685642454629; Thu, 01 Jun 2023 11:00:54 -0700 (PDT) Received: from ?IPV6:2804:1b3:a7c1:4dd5:cc5a:e3f0:42a7:4888? ([2804:1b3:a7c1:4dd5:cc5a:e3f0:42a7:4888]) by smtp.gmail.com with ESMTPSA id h43-20020a056870172b00b0019e9dd601c1sm1931334oae.55.2023.06.01.11.00.52 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 01 Jun 2023 11:00:53 -0700 (PDT) Message-ID: <72820b0f-dd46-2663-b06c-9f33c3f1016d@linaro.org> Date: Thu, 1 Jun 2023 15:00:51 -0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.11.1 Subject: Re: [PATCH v2 2/2] Use __nonnull for the epoll_wait(2) family of syscalls Content-Language: en-US To: Alejandro Colomar , libc-alpha@sourceware.org Cc: Alejandro Colomar References: <6c399f6b-6e89-17c4-2a56-1219a1b86448@linaro.org> <20230531204422.18052-2-alx@kernel.org> From: Adhemerval Zanella Netto Organization: Linaro In-Reply-To: <20230531204422.18052-2-alx@kernel.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-12.4 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,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: On 31/05/23 17:44, Alejandro Colomar wrote: > Cc: Adhemerval Zanella Netto > Signed-off-by: Alejandro Colomar LGTM, although the buildbot failed to apply the patch for some reason [1]. It does apply if I use git-pw. Reviewed-by: Adhemerval Zanella [1] https://patchwork.sourceware.org/project/glibc/patch/20230531204422.18052-2-alx@kernel.org/ > --- > include/sys/epoll.h | 3 ++- > sysdeps/unix/sysv/linux/sys/epoll.h | 8 ++++---- > 2 files changed, 6 insertions(+), 5 deletions(-) > > diff --git a/include/sys/epoll.h b/include/sys/epoll.h > index 8049381a26..b23bc9c7c0 100644 > --- a/include/sys/epoll.h > +++ b/include/sys/epoll.h > @@ -9,7 +9,8 @@ libc_hidden_proto (epoll_pwait) > #else > extern int __epoll_pwait2_time64 (int fd, struct epoll_event *ev, int maxev, > const struct __timespec64 *tmo, > - const sigset_t *s); > + const sigset_t *s) > + __nonnull ((2)); > libc_hidden_proto (__epoll_pwait2_time64) > #endif > > diff --git a/sysdeps/unix/sysv/linux/sys/epoll.h b/sysdeps/unix/sysv/linux/sys/epoll.h > index b17d344e79..23872c9438 100644 > --- a/sysdeps/unix/sysv/linux/sys/epoll.h > +++ b/sysdeps/unix/sysv/linux/sys/epoll.h > @@ -123,7 +123,7 @@ extern int epoll_ctl (int __epfd, int __op, int __fd, > __THROW. */ > extern int epoll_wait (int __epfd, struct epoll_event *__events, > int __maxevents, int __timeout) > - __attr_access ((__write_only__, 2, 3)); > + __attr_access ((__write_only__, 2, 3)) __nonnull ((2)); > > > /* Same as epoll_wait, but the thread's signal mask is temporarily > @@ -134,7 +134,7 @@ extern int epoll_wait (int __epfd, struct epoll_event *__events, > extern int epoll_pwait (int __epfd, struct epoll_event *__events, > int __maxevents, int __timeout, > const __sigset_t *__ss) > - __attr_access ((__write_only__, 2, 3)); > + __attr_access ((__write_only__, 2, 3)) __nonnull ((2)); > > /* Same as epoll_pwait, but the timeout as a timespec. > > @@ -144,7 +144,7 @@ extern int epoll_pwait (int __epfd, struct epoll_event *__events, > extern int epoll_pwait2 (int __epfd, struct epoll_event *__events, > int __maxevents, const struct timespec *__timeout, > const __sigset_t *__ss) > - __attr_access ((__write_only__, 2, 3)); > + __attr_access ((__write_only__, 2, 3)) __nonnull ((2)); > #else > # ifdef __REDIRECT > extern int __REDIRECT (epoll_pwait2, (int __epfd, struct epoll_event *__ev, > @@ -152,7 +152,7 @@ extern int __REDIRECT (epoll_pwait2, (int __epfd, struct epoll_event *__ev, > const struct timespec *__timeout, > const __sigset_t *__ss), > __epoll_pwait2_time64) > - __attr_access ((__write_only__, 2, 3)); > + __attr_access ((__write_only__, 2, 3)) __nonnull ((2)); > # else > # define epoll_pwait2 __epoll_pwait2_time64 > # endif