From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS3215 2.6.0.0/16 X-Spam-Status: No, score=-4.1 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED,SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by dcvr.yhbt.net (Postfix) with ESMTPS id 48BB51F953 for ; Thu, 25 Nov 2021 23:39:52 +0000 (UTC) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 4E9B7385800C for ; Thu, 25 Nov 2021 23:39:49 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4E9B7385800C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1637883589; bh=HSjIyog47sIRKihkYDRZGU22bwqER//Giy9NILLCVUc=; h=Date:To:Subject:References:In-Reply-To:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=Bg8IpLYf9gIQmGyVnrB15yS1cRJcIcVCENHRAS3QuYDsuyaz2Ker8HccdSsUky80n iVeR6hZ16ZpHg7OjmCfNaMi5xbPzwSFwu7tiig0t+TO9VVcU7KU7kGgjy4dLtWM167 pOAhthqmB+eR/ESyCmLpRPBTA/set90LBCav6KvQ= Received: from mail-pg1-x534.google.com (mail-pg1-x534.google.com [IPv6:2607:f8b0:4864:20::534]) by sourceware.org (Postfix) with ESMTPS id A108D385840C for ; Thu, 25 Nov 2021 23:39:28 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org A108D385840C Received: by mail-pg1-x534.google.com with SMTP id r5so6455125pgi.6 for ; Thu, 25 Nov 2021 15:39:28 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=HSjIyog47sIRKihkYDRZGU22bwqER//Giy9NILLCVUc=; b=kX3tRaMLKzSiVJalnx88N4gykLXkck4QqaiKPpuCM0BX0Kue35tRjSNUNhOA9I3v+F 7gBBblSLTsvLUDU+wddlZ/D/9vWpNw1rac58FgjOIo80L0d3D/XgThZvzS3pt3PFzDvS wMZWdwkmED9+Uud4pR1g0wiD8EcYjT/s99KoHFq/5nkDGBPRcNn2TvKb0ex2Cm3hPP59 fW4jV+o6W5gotRATFOX2t0YL8OqIlDTbbKifYdUTUrNMS2eTuUEJg3QYykj95W1lX/1e FVePsoFxdeK5XwmIrmIDFR/0nzs1IMtowqHnaJCU26eAQ7QhApnA7JiXAYNDsxTfhOL7 E8pA== X-Gm-Message-State: AOAM532TE9vRWd7h5php5qHseNcNiQAIGbdqHVyJsNBwMVWzlsB4BQrj 64UxCzi5JMm4/T8ibPo1cK8= X-Google-Smtp-Source: ABdhPJwTY+n1o86GfUhFRVMUb5bG0T0E2qgs5Li89Bo/Mtdmehq+B+/Ps3uraTAGngdShV9V3A57cA== X-Received: by 2002:a05:6a00:2311:b0:431:c19f:2a93 with SMTP id h17-20020a056a00231100b00431c19f2a93mr17487149pfh.11.1637883567621; Thu, 25 Nov 2021 15:39:27 -0800 (PST) Received: from localhost ([2409:10:24a0:4700:e8ad:216a:2a9d:6d0c]) by smtp.gmail.com with ESMTPSA id c3sm4369669pfm.177.2021.11.25.15.39.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Nov 2021 15:39:26 -0800 (PST) Date: Fri, 26 Nov 2021 08:39:25 +0900 To: Adhemerval Zanella Subject: Re: [PATCH 2/6] linux: Add prlimit64 C implementation Message-ID: References: <20211122185437.1934590-1-adhemerval.zanella@linaro.org> <20211122185437.1934590-3-adhemerval.zanella@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20211122185437.1934590-3-adhemerval.zanella@linaro.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: , From: Stafford Horne via Libc-alpha Reply-To: Stafford Horne Cc: libc-alpha@sourceware.org Errors-To: libc-alpha-bounces+e=80x24.org@sourceware.org Sender: "Libc-alpha" On Mon, Nov 22, 2021 at 03:54:33PM -0300, Adhemerval Zanella wrote: > The LFS prlimit64 requires a arch-specific implementation in > syscalls.list. Instead add a generic one that handles the > required symbol alias for __RLIM_T_MATCHES_RLIM64_T. > > HPPA is the only outlier which requires a different default > symbol. > > Checked on x86_64-linux-gnu and with build for the affected ABIs. > --- > sysdeps/unix/sysv/linux/Makefile | 2 +- > sysdeps/unix/sysv/linux/arm/syscalls.list | 2 - > .../linux/generic/wordsize-32/syscalls.list | 4 -- > sysdeps/unix/sysv/linux/hppa/prlimit64.c | 2 + > sysdeps/unix/sysv/linux/hppa/syscalls.list | 1 - > sysdeps/unix/sysv/linux/i386/syscalls.list | 2 - > sysdeps/unix/sysv/linux/m68k/syscalls.list | 1 - > .../unix/sysv/linux/microblaze/syscalls.list | 1 - > .../unix/sysv/linux/mips/mips32/syscalls.list | 3 -- > .../sysv/linux/mips/mips64/n32/syscalls.list | 2 - > .../sysv/linux/mips/mips64/n64/syscalls.list | 2 - > .../linux/powerpc/powerpc32/syscalls.list | 2 - > sysdeps/unix/sysv/linux/prlimit.c | 2 + > sysdeps/unix/sysv/linux/prlimit64.c | 39 +++++++++++++++++++ > .../sysv/linux/s390/s390-32/syscalls.list | 1 - > sysdeps/unix/sysv/linux/sh/syscalls.list | 2 - > .../sysv/linux/sparc/sparc32/syscalls.list | 2 - > .../unix/sysv/linux/wordsize-64/syscalls.list | 1 - > 18 files changed, 44 insertions(+), 27 deletions(-) > delete mode 100644 sysdeps/unix/sysv/linux/generic/wordsize-32/syscalls.list > create mode 100644 sysdeps/unix/sysv/linux/hppa/prlimit64.c > delete mode 100644 sysdeps/unix/sysv/linux/mips/mips32/syscalls.list > create mode 100644 sysdeps/unix/sysv/linux/prlimit64.c > diff --git a/sysdeps/unix/sysv/linux/prlimit.c b/sysdeps/unix/sysv/linux/prlimit.c > index c12de52693..f9d9911a04 100644 > --- a/sysdeps/unix/sysv/linux/prlimit.c > +++ b/sysdeps/unix/sysv/linux/prlimit.c > @@ -18,6 +18,7 @@ > #include > #include Possibly a comment here saying something like. /* For ports that support the 64-bit ABI we do not need to define prlimit and instead prlimit aliases to prlimit64. See the prlimit64 implementation. */ > +#if !__RLIM_T_MATCHES_RLIM64_T > int > prlimit (__pid_t pid, enum __rlimit_resource resource, > const struct rlimit *new_rlimit, struct rlimit *old_rlimit) > @@ -73,3 +74,4 @@ prlimit (__pid_t pid, enum __rlimit_resource resource, > > return res; > } > +#endif /* __RLIM_T_MATCHES_RLIM64_T */ > diff --git a/sysdeps/unix/sysv/linux/prlimit64.c b/sysdeps/unix/sysv/linux/prlimit64.c > new file mode 100644 > index 0000000000..e3a8718b98 > --- /dev/null > +++ b/sysdeps/unix/sysv/linux/prlimit64.c > @@ -0,0 +1,39 @@ > +/* Get/set resource limits. Linux specific syscall. > + Copyright (C) 2020 Free Software Foundation, Inc. 2021. > + 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 > + . */ > + > +#define prlimit __redirect_prlimit > +#include > +#undef prlimit > +#include > + > +int > +__prlimit64 (pid_t pid, enum __rlimit_resource resource, > + const struct rlimit64 *new_rlimit, struct rlimit64 *old_rlimit) > +{ > + return INLINE_SYSCALL_CALL (prlimit64, pid, resource, new_rlimit, > + old_rlimit); > +} > +#ifdef VERSION_prlimit64 > +# include > +versioned_symbol (libc, __prlimit64, prlimit64, VERSION_prlimit64); > +#else > +strong_alias (__prlimit64, prlimit64) > +# if __RLIM_T_MATCHES_RLIM64_T > +strong_alias (prlimit64, prlimit) > +# endif > +#endif > diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/syscalls.list b/sysdeps/unix/sysv/linux/s390/s390-32/syscalls.list > index 8e9b7c4b71..91d78d91ef 100644 > --- a/sysdeps/unix/sysv/linux/s390/s390-32/syscalls.list > +++ b/sysdeps/unix/sysv/linux/s390/s390-32/syscalls.list > @@ -15,5 +15,4 @@ getgroups - getgroups32 i:ip __getgroups getgroups > setfsgid - setfsgid32 Ei:i setfsgid > setfsuid - setfsuid32 Ei:i setfsuid > > -prlimit64 EXTRA prlimit64 i:iipp prlimit64 > personality EXTRA personality Ei:i __personality personality > diff --git a/sysdeps/unix/sysv/linux/sh/syscalls.list b/sysdeps/unix/sysv/linux/sh/syscalls.list > index 6ff3e8eb8a..78b2348c05 100644 > --- a/sysdeps/unix/sysv/linux/sh/syscalls.list > +++ b/sysdeps/unix/sysv/linux/sh/syscalls.list > @@ -15,6 +15,4 @@ getgroups - getgroups32 i:ip __getgroups getgroups > setfsgid - setfsgid32 Ei:i setfsgid > setfsuid - setfsuid32 Ei:i setfsuid > > -prlimit64 EXTRA prlimit64 i:iipp prlimit64 > - > personality EXTRA personality Ei:i __personality personality > diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/syscalls.list b/sysdeps/unix/sysv/linux/sparc/sparc32/syscalls.list > index 4fcae65451..9e4eb0a165 100644 > --- a/sysdeps/unix/sysv/linux/sparc/sparc32/syscalls.list > +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/syscalls.list > @@ -14,5 +14,3 @@ getgroups - getgroups32 i:ip __getgroups getgroups > > setfsgid - setfsgid32 Ei:i setfsgid > setfsuid - setfsuid32 Ei:i setfsuid > - > -prlimit64 EXTRA prlimit64 i:iipp prlimit64 > diff --git a/sysdeps/unix/sysv/linux/wordsize-64/syscalls.list b/sysdeps/unix/sysv/linux/wordsize-64/syscalls.list > index 8d97a32344..3232f11f51 100644 > --- a/sysdeps/unix/sysv/linux/wordsize-64/syscalls.list > +++ b/sysdeps/unix/sysv/linux/wordsize-64/syscalls.list > @@ -1,5 +1,4 @@ > # File name Caller Syscall name # args Strong name Weak names > > sendfile - sendfile i:iipi sendfile sendfile64 > -prlimit EXTRA prlimit64 i:iipp prlimit prlimit64 > personality EXTRA personality i:i __personality personality > -- > 2.32.0 Other than the year issue (as I understand the patch is from your old branch..). It looks fine to me. -Stafford