From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-oa1-x2f.google.com (mail-oa1-x2f.google.com [IPv6:2001:4860:4864:20::2f]) by sourceware.org (Postfix) with ESMTPS id C33883836409 for ; Thu, 12 May 2022 13:01:27 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org C33883836409 Received: by mail-oa1-x2f.google.com with SMTP id 586e51a60fabf-deb9295679so6503938fac.6 for ; Thu, 12 May 2022 06:01:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:references:from:in-reply-to :content-transfer-encoding; bh=q6Sv6r39HYX4Xz4hiHBzzJiUIyB5euXW5W6WSzVL7Dk=; b=ttH/S3nPFU7WZumu0Jl35FrcB/hz7sI0n2EpumCuVa5AEoc65JhKyYRKDCeOP1ysMd h/OMOBlGvgYay9m2045rMiShvn7DD1g+8wn2o4lwansfqtlBPkqY5QAiZ/lCsgVZAMil I9T2vP+ohge5sG0S4ne6qEDoiM465qR83SDXLhps/PSQWasCDCf3BKoWCfNhKGCgDgfO nZtfWxoEANYcdbHAWV7AIOFS8Mp8Ito90S56TbbBAuwWr1hLV84Ee6TihlLODQchbD7V J2TAQg/QvWhLlN+mCAY7/NCOeoXYqYF3L3Jg60taU64Bbw/6Tl6vS9RJhLMNW6DWYy7b qjQA== X-Gm-Message-State: AOAM53080OMi2f/8ejFKfVq0KBAzD8+FVTHdH3lBWHHAoqPFUk1bkEDs 2Tna+MEAKWNPCbW2lfwZbsdldSnMFsj/3A== X-Google-Smtp-Source: ABdhPJz1BWPfFd2wx3lyRphac8QbGZv90bVNpP4qwWD9iatTQNyy8CQbtpgKhO/tF4F3hQ7IS2PMdw== X-Received: by 2002:a05:6870:f2a9:b0:e5:8106:4486 with SMTP id u41-20020a056870f2a900b000e581064486mr5556875oap.109.1652360485110; Thu, 12 May 2022 06:01:25 -0700 (PDT) Received: from ?IPV6:2804:431:c7ca:5fbd:6a01:8849:5cb:128b? ([2804:431:c7ca:5fbd:6a01:8849:5cb:128b]) by smtp.gmail.com with ESMTPSA id k124-20020a4a4a82000000b0035eb4e5a6besm2109769oob.20.2022.05.12.06.01.21 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 12 May 2022 06:01:23 -0700 (PDT) Message-ID: <38fd6825-2b79-0350-2de4-3c87c97fdd48@linaro.org> Date: Thu, 12 May 2022 10:01:19 -0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.9.0 Subject: Re: [PATCH v5 1/2] Linux: Introduce __brk_call for invoking the brk system call Content-Language: en-US To: Florian Weimer , libc-alpha@sourceware.org References: From: Adhemerval Zanella In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-14.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, 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 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: Thu, 12 May 2022 13:01:33 -0000 On 09/05/2022 15:18, Florian Weimer via Libc-alpha wrote: > Alpha and sparc can now use the generic implementation. LGTM, thanks. Reviewed-by: Adhemerval Zanella > --- > sysdeps/unix/sysv/linux/alpha/brk_call.h | 28 +++++++++ > sysdeps/unix/sysv/linux/brk.c | 3 +- > sysdeps/unix/sysv/linux/brk_call.h | 25 ++++++++ > sysdeps/unix/sysv/linux/sparc/brk.c | 58 ------------------- > .../linux/{alpha/brk.c => sparc/brk_call.h} | 35 +++++------ > 5 files changed, 71 insertions(+), 78 deletions(-) > create mode 100644 sysdeps/unix/sysv/linux/alpha/brk_call.h > create mode 100644 sysdeps/unix/sysv/linux/brk_call.h > delete mode 100644 sysdeps/unix/sysv/linux/sparc/brk.c > rename sysdeps/unix/sysv/linux/{alpha/brk.c => sparc/brk_call.h} (61%) > > diff --git a/sysdeps/unix/sysv/linux/alpha/brk_call.h b/sysdeps/unix/sysv/linux/alpha/brk_call.h > new file mode 100644 > index 0000000000..b8088cf13f > --- /dev/null > +++ b/sysdeps/unix/sysv/linux/alpha/brk_call.h > @@ -0,0 +1,28 @@ > +/* Invoke the brk system call. Alpha version. > + Copyright (C) 2022 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 > + . */ > + > +static inline void * > +__brk_call (void *addr) > +{ > + unsigned long int result = INTERNAL_SYSCALL_CALL (brk, addr); > + if (result == -ENOMEM) > + /* Mimic the default error reporting behavior. */ > + return addr; > + else > + return (void *) result; > +} > diff --git a/sysdeps/unix/sysv/linux/brk.c b/sysdeps/unix/sysv/linux/brk.c > index abbabc9e8b..9264a5a4a2 100644 > --- a/sysdeps/unix/sysv/linux/brk.c > +++ b/sysdeps/unix/sysv/linux/brk.c > @@ -19,6 +19,7 @@ > #include > #include > #include > +#include > > /* This must be initialized data because commons can't have aliases. */ > void *__curbrk = 0; > @@ -33,7 +34,7 @@ weak_alias (__curbrk, ___brk_addr) > int > __brk (void *addr) > { > - __curbrk = (void *) INTERNAL_SYSCALL_CALL (brk, addr); > + __curbrk = __brk_call (addr); > if (__curbrk < addr) > { > __set_errno (ENOMEM); > diff --git a/sysdeps/unix/sysv/linux/brk_call.h b/sysdeps/unix/sysv/linux/brk_call.h > new file mode 100644 > index 0000000000..72370c25d7 > --- /dev/null > +++ b/sysdeps/unix/sysv/linux/brk_call.h > @@ -0,0 +1,25 @@ > +/* Invoke the brk system call. Generic Linux version. > + Copyright (C) 2022 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 > + . */ > + > +static inline void * > +__brk_call (void *addr) > +{ > + /* The default implementation reports errors through an unchanged > + break. */ > + return (void *) INTERNAL_SYSCALL_CALL (brk, addr); > +} > diff --git a/sysdeps/unix/sysv/linux/sparc/brk.c b/sysdeps/unix/sysv/linux/sparc/brk.c > deleted file mode 100644 > index c5c1ee0282..0000000000 > --- a/sysdeps/unix/sysv/linux/sparc/brk.c > +++ /dev/null > @@ -1,58 +0,0 @@ > -/* Change data segment. Linux SPARC version. > - Copyright (C) 2021-2022 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 > - . */ > - > -#include > -#include > -#include > - > -/* This must be initialized data because commons can't have aliases. */ > -void *__curbrk = 0; > - > -#if HAVE_INTERNAL_BRK_ADDR_SYMBOL > -/* Old braindamage in GCC's crtstuff.c requires this symbol in an attempt > - to work around different old braindamage in the old Linux ELF dynamic > - linker. */ > -weak_alias (__curbrk, ___brk_addr) > -#endif > - > -#ifdef __arch64__ > -# define SYSCALL_NUM "0x6d" > -#else > -# define SYSCALL_NUM "0x10" > -#endif > - > -int > -__brk (void *addr) > -{ > - register long int g1 asm ("g1") = __NR_brk; > - register long int o0 asm ("o0") = (long int) addr; > - asm volatile ("ta " SYSCALL_NUM > - : "=r"(o0) > - : "r"(g1), "0"(o0) > - : "cc"); > - __curbrk = (void *) o0; > - > - if (__curbrk < addr) > - { > - __set_errno (ENOMEM); > - return -1; > - } > - > - return 0; > -} > -weak_alias (__brk, brk) > diff --git a/sysdeps/unix/sysv/linux/alpha/brk.c b/sysdeps/unix/sysv/linux/sparc/brk_call.h > similarity index 61% > rename from sysdeps/unix/sysv/linux/alpha/brk.c > rename to sysdeps/unix/sysv/linux/sparc/brk_call.h > index 32082a4fae..59ce521660 100644 > --- a/sysdeps/unix/sysv/linux/alpha/brk.c > +++ b/sysdeps/unix/sysv/linux/sparc/brk_call.h > @@ -1,5 +1,5 @@ > -/* Change data segment size. Linux/Alpha. > - Copyright (C) 2020-2022 Free Software Foundation, Inc. > +/* Invoke the brk system call. Sparc version. > + Copyright (C) 2022 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 > @@ -16,23 +16,20 @@ > License along with the GNU C Library. If not, see > . */ > > -#include > -#include > -#include > +#ifdef __arch64__ > +# define SYSCALL_NUM "0x6d" > +#else > +# define SYSCALL_NUM "0x10" > +#endif > > -void *__curbrk = 0; > - > -int > -__brk (void *addr) > +static inline void * > +__brk_call (void *addr) > { > - /* Alpha brk returns -ENOMEM in case of failure. */ > - __curbrk = (void *) INTERNAL_SYSCALL_CALL (brk, addr); > - if ((unsigned long) __curbrk == -ENOMEM) > - { > - __set_errno (ENOMEM); > - return -1; > - } > - > - return 0; > + register long int g1 asm ("g1") = __NR_brk; > + register long int o0 asm ("o0") = (long int) addr; > + asm volatile ("ta " SYSCALL_NUM > + : "=r"(o0) > + : "r"(g1), "0"(o0) > + : "cc"); > + return (void *) o0; > } > -weak_alias (__brk, brk) > > base-commit: a2a6bce7d7e52c1c34369a7da62c501cc350bc31