From patchwork Sun Jun 4 05:39:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhangjin Wu X-Patchwork-Id: 102951 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp1996808vqr; Sat, 3 Jun 2023 23:18:49 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6m2pHeEe/XWHBqPbNDzc7VhPOEXHNQWl6Nzz2hUo0hnulxlj9uTHgZOUia48ua6Wpd00t1 X-Received: by 2002:a17:902:e74f:b0:1b2:665:d251 with SMTP id p15-20020a170902e74f00b001b20665d251mr277036plf.47.1685859529324; Sat, 03 Jun 2023 23:18:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685859529; cv=none; d=google.com; s=arc-20160816; b=oIapDtZcXFVR/ufQ7Esaa4B4ZIWDtUNRrzfwK+fmNhSndaqL1edq1IyJ+kcs9YlTH5 0QW7RM3NiO9UucqZAg4jw5yoXeN8LhbivsBNyK6cfotYQA5FiEBXIyb51NVeGw2om95q NgW7jQ4Oh74SPTIHF/i2e1kjPpCR4DDlu7Mo+rW5l95ZUg9P8yc87KFkw1ZU+h6TUf88 nbaSv6dX4r0EvT7CSr7TdnySYMS4qUfHOg5NdcHpCbrYdCvFUanLp3gY8gZQXlYBK22V 2apHC4mtIShGVeabIsJPq/p9aUOlnWYEidTiqXaARatBhpqVJlzDKAXlQDalQcIyyZWc IEeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:feedback-id:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from; bh=Nqm1VyesZeZqARz54aVnHHVxlrs6jU9+hoUKBVRTlws=; b=tTeNi580SSTEXxHwVX5n1VTCRCbAlL4dnCapz2TjprMFy8wtQBWzHfP2f5dEiozoMW kBRU90w8NkttZn5Kj0d/XBrWzVkGXaFVVKAM4jN6t3TMPCvE19x3gfyZtNPWfzwOiBre ohOYilUl4+ePqXtjwwswhmMWWipEh/G3daqTMvZR1rFoB+AdYG139mj2a4ohp0As6CmJ 45vNSx6s7tRrcbm2UZAOWxsHBV4lJ0SBqOwdgpj48qzm1TK+qo/IlljrC+ZA/GE49V8C sao5/TYGcQB9txWJvjqjvpz33B01VHHhoW9sFclaKabxCnSuDtqJGXU6XhhiyT/H8jGZ L2eg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k13-20020a170902c40d00b001a691f376e8si3731794plk.415.2023.06.03.23.18.35; Sat, 03 Jun 2023 23:18:49 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229718AbjFDFmk (ORCPT + 99 others); Sun, 4 Jun 2023 01:42:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33666 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229462AbjFDFmi (ORCPT ); Sun, 4 Jun 2023 01:42:38 -0400 Received: from bg4.exmail.qq.com (bg4.exmail.qq.com [43.154.54.12]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DD412D2; Sat, 3 Jun 2023 22:42:36 -0700 (PDT) X-QQ-mid: bizesmtp72t1685857346t5xr8sni Received: from linux-lab-host.localdomain ( [61.141.77.49]) by bizesmtp.qq.com (ESMTP) with id ; Sun, 04 Jun 2023 13:42:25 +0800 (CST) X-QQ-SSF: 01200000000000D0V000000A0000000 X-QQ-FEAT: Z2qCHCq1/922HOu2rI3BNb7YZnwq6I3XqG+zETTdRX5VsVqTCcaEqWdJ/xe8Z nyxTVuLQd3K6s8lYS4Qgz4f0pv/WAO12sNEiy+9qWHlqo5jTMfgKcP3i63dAjba4Dysgloc Hm16xIq/C730s527UMkx8tR+oOeoz8YIinChVkV78frR33mszF+YhAzfvGGCSRQCtbSb+oX nTj+SzN5TCXcn7OkkJ7nFrXv8+dJu0PtIN+2aAgwVhP6Xbn9tAX2inmqu5dwvjx8K3jpeu7 0p4Ag9EspgteAHAvgrqlXocbra5y+qJmTRonXAqsZ9yN9VUhbtHOxVgUYE+6tbxM7kaeCse 8i67iyDZsITzvq1dype13lr1sYOAUfVG0VWOX3FbPOzygs8+PuFSEA//QvLKw== X-QQ-GoodBg: 0 X-BIZMAIL-ID: 5104637929055565147 From: Zhangjin Wu To: w@1wt.eu Cc: falcon@tinylab.org, arnd@arndb.de, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-riscv@lists.infradead.org, thomas@t-8ch.de Subject: [PATCH 3/4] tools/nolibc: sys.h: apply __syscall_ret() helper Date: Sun, 4 Jun 2023 13:39:03 +0800 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:tinylab.org:qybglogicsvrsz:qybglogicsvrsz3a-3 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_PASS,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 lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767751841842076470?= X-GMAIL-MSGID: =?utf-8?q?1767751841842076470?= Use __syscall_ret() helper to shrink the code lines of brk() and getpagesize(), 10 lines removed. Signed-off-by: Zhangjin Wu --- tools/include/nolibc/sys.h | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/tools/include/nolibc/sys.h b/tools/include/nolibc/sys.h index 937a8578e3d4..976f23d1fdad 100644 --- a/tools/include/nolibc/sys.h +++ b/tools/include/nolibc/sys.h @@ -81,13 +81,9 @@ void *sys_brk(void *addr) static __attribute__((unused)) int brk(void *addr) { - void *ret = sys_brk(addr); + int ret = sys_brk(addr) ? 0 : -ENOMEM; - if (!ret) { - SET_ERRNO(ENOMEM); - return -1; - } - return 0; + return __syscall_ret(ret); } static __attribute__((unused)) @@ -550,15 +546,9 @@ static unsigned long getauxval(unsigned long key); static __attribute__((unused)) long getpagesize(void) { - long ret; + long ret = getauxval(AT_PAGESZ) ?: -ENOENT; - ret = getauxval(AT_PAGESZ); - if (!ret) { - SET_ERRNO(ENOENT); - return -1; - } - - return ret; + return __syscall_ret(ret); }