From patchwork Tue May 23 10:22:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tiezhu Yang X-Patchwork-Id: 97953 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2033298vqo; Tue, 23 May 2023 03:28:13 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ77va9H+2DiwNGXjAMgCCDx2bjVSM/oNVSYLnl4wU8l+3EKQGs8kDXNLc94oRHAVRsy1PbO X-Received: by 2002:a17:90a:7482:b0:253:5605:ddd9 with SMTP id p2-20020a17090a748200b002535605ddd9mr11295503pjk.35.1684837692857; Tue, 23 May 2023 03:28:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684837692; cv=none; d=google.com; s=arc-20160816; b=WFbCGMseje2RQI6uRdGRaWvh+DwQI3ZOBZuk7nbF5NPXXuQury9wV97obNswQ0PZ2A HDAhGWSdWMhTtYOGB3Wvz0bpZRCQbzsIu+YsdjeFGys1yhzGU6H1iAqtm4D06ChfyTkq Sc5i4yamSTz+te+8m37Qnbdt3OsvN43td0Zrsq3alZixHFTs8MVJmCE589SaTloVP5YP 2D6Q8MkcZyTGC+tdpsqNWJHtBSrkz8c72tvSHkCwgLTu2n4J8VPh4SvqDGXQMWYc4yi5 03v2ctOOqJYetEWzNTODsiQoEZKR+fYMzWVOWgXI//3zBhDfRoDnh46NeL7R/V+/oF82 5Lxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from; bh=YqBKdcQLaAS2ofDYxyDsKQ+mNH1qxU6m2VVNPf2AbGM=; b=aoiXo6xnROJoqm7+A0joyEn7WD/ZgmI9vRDiCAfidGceL4JMF32CNPZwj9TX8GZdZE XTKCneCUoOJIJsIvunFjPFwQmxb6GNJgOoIDB+dG1Pxh8wUGZjCt5rnkoV/HQveHbHsj T3TlCgXtThQjBc7N1JYFuNsJvr965K3K6IBDR/rXcDpB9LqxuRjvV3oOfjegOifb4Pql Ume22OOCiG8yhtVgApy0tmd4Do+VGJ/HaDXx+Ll9ljQ1Fe2sVATm8W+Y+sc/IF1WXBzv 9T7o7Vu+xFSMoVLtrH1KefV2UEibEFBz7b+OH5cD8LVh9849rL44RDm+U43kr3GbbzhY TFfA== 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 cu15-20020a17090afa8f00b00233e301c780si8369025pjb.31.2023.05.23.03.27.58; Tue, 23 May 2023 03:28:12 -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 S236530AbjEWKWW (ORCPT + 99 others); Tue, 23 May 2023 06:22:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51774 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232621AbjEWKWU (ORCPT ); Tue, 23 May 2023 06:22:20 -0400 Received: from mail.loongson.cn (mail.loongson.cn [114.242.206.163]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 6E5B4FD; Tue, 23 May 2023 03:22:17 -0700 (PDT) Received: from loongson.cn (unknown [113.200.148.30]) by gateway (Coremail) with SMTP id _____8Bx2fHYk2xkoAgAAA--.124S3; Tue, 23 May 2023 18:22:16 +0800 (CST) Received: from linux.localdomain (unknown [113.200.148.30]) by localhost.localdomain (Coremail) with SMTP id AQAAf8BxkrDWk2xk3CNwAA--.57318S3; Tue, 23 May 2023 18:22:15 +0800 (CST) From: Tiezhu Yang To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Ian Rogers , Adrian Hunter Cc: Hans-Peter Nilsson , Leo Yan , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, loongarch@lists.linux.dev, loongson-kernel@lists.loongnix.cn Subject: [PATCH 1/2] perf arm64: Handle __NR3264_ prefixed syscall number Date: Tue, 23 May 2023 18:22:06 +0800 Message-Id: <1684837327-18203-2-git-send-email-yangtiezhu@loongson.cn> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1684837327-18203-1-git-send-email-yangtiezhu@loongson.cn> References: <1684837327-18203-1-git-send-email-yangtiezhu@loongson.cn> X-CM-TRANSID: AQAAf8BxkrDWk2xk3CNwAA--.57318S3 X-CM-SenderInfo: p1dqw3xlh2x3gn0dqz5rrqw2lrqou0/ X-Coremail-Antispam: 1Uk129KBjvJXoW7trWxur1DKr43Xr1kCr1UGFg_yoW8JF4kpr s5C34DtayrWF1Iyw1xursIqFZ3Ca1kJF1Ygry0yrZakrnxJ3WrKryFq3Z0kFWxX34xK3yj vFyrtFy5XF48XrJanT9S1TB71UUUUbJqnTZGkaVYY2UrUUUUj1kv1TuYvTs0mT0YCTnIWj qI5I8CrVACY4xI64kE6c02F40Ex7xfYxn0WfASr-VFAUDa7-sFnT9fnUUIcSsGvfJTRUUU bSxYFVCjjxCrM7AC8VAFwI0_Jr0_Gr1l1xkIjI8I6I8E6xAIw20EY4v20xvaj40_Wr0E3s 1l1IIY67AEw4v_Jrv_JF1l8cAvFVAK0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xv wVC0I7IYx2IY67AKxVW5JVW7JwA2z4x0Y4vE2Ix0cI8IcVCY1x0267AKxVW8JVWxJwA2z4 x0Y4vEx4A2jsIE14v26r4UJVWxJr1l84ACjcxK6I8E87Iv6xkF7I0E14v26r4UJVWxJr1l n4kS14v26r1q6r43M2AIxVAIcxkEcVAq07x20xvEncxIr21l57IF6xkI12xvs2x26I8E6x ACxx1l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1q6rW5McIj6I8E 87Iv67AKxVW8JVWxJwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lc7CjxV Aaw2AFwI0_Jw0_GFyl42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1l4IxY O2xFxVAFwI0_Jw0_GFylx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGV WUWwC2zVAF1VAY17CE14v26r1q6r43MIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_ Xr0_Ar1lIxAIcVC0I7IYx2IY6xkF7I0E14v26r4j6F4UMIIF0xvE42xK8VAvwI8IcIk0rV WUJVWUCwCI42IY6I8E87Iv67AKxVW8JVWxJwCI42IY6I8E87Iv6xkF7I0E14v26r4j6r4U JbIYCTnIWIevJa73UjIFyTuYvjxUstxhDUUUU X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,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?1766680368584919714?= X-GMAIL-MSGID: =?utf-8?q?1766680368584919714?= After commit 9854e7ad35fe ("perf arm64: Simplify mksyscalltbl"), in the generated syscall table file syscalls.c, there exist some __NR3264_ prefixed syscall numbers such as [__NR3264_ftruncate], it looks like not so good, just do some small filter operations to handle __NR3264_ prefixed syscall number as a digital number. Without this patch: [__NR3264_ftruncate] = "ftruncate", With this patch: [46] = "ftruncate", Signed-off-by: Tiezhu Yang Reviewed-by: Leo Yan --- tools/perf/arch/arm64/entry/syscalls/mksyscalltbl | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/perf/arch/arm64/entry/syscalls/mksyscalltbl b/tools/perf/arch/arm64/entry/syscalls/mksyscalltbl index 22cdf91..59ab7939 100755 --- a/tools/perf/arch/arm64/entry/syscalls/mksyscalltbl +++ b/tools/perf/arch/arm64/entry/syscalls/mksyscalltbl @@ -39,7 +39,8 @@ create_table() echo "};" } -$gcc -E -dM -x c -I $incpath/include/uapi $input \ - |sed -ne 's/^#define __NR_//p' \ - |sort -t' ' -k2 -n \ +$gcc -E -dM -x c -I $incpath/include/uapi $input \ + |awk '{if ($2~"__NR" && $3 !~"__NR3264_") {print}}' \ + |sed -ne 's/^#define __NR_//p;s/^#define __NR3264_//p' \ + |sort -t' ' -k2 -n \ |create_table From patchwork Tue May 23 10:22:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tiezhu Yang X-Patchwork-Id: 97955 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2035464vqo; Tue, 23 May 2023 03:33:03 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6N7V8zZFltguStR3mjeGXc6bCu1mKaOBSl9lBv/+DUSIfkwHaGxwSy63U+AdwiHK9ml+po X-Received: by 2002:a05:6a00:2302:b0:64d:4188:ae86 with SMTP id h2-20020a056a00230200b0064d4188ae86mr15596202pfh.6.1684837982783; Tue, 23 May 2023 03:33:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684837982; cv=none; d=google.com; s=arc-20160816; b=tKPBMe4ADe3c1sv+unuUSDuMF2v4PKzSvW+1fb+5sUj/zQAsLXh0THJH5e3Y/1UyM1 sJvloueS5Bu9+ja+ypqqHffiyOubfpCjOlGBGJ7sUEYqPS6QNLD7hHHEaZZDhuIzm/mY x1MXU4CGFC6WjcTDou3p1C7xacNnFGD/BN+zCar8jixbBFRrShCaTJBEoLN1MMLCOJRt g+SkbUJ4rFU1Yqb9SFSXAR5eTX6lsGqqyf8pt+4mue0a+VDtlKqCkLOjv5fv/kzVZsyk ahfRAEuAFMzCKN5eMw1S20OYM0Nk3Eff+dVMf/3WPmZI0YHkwUl4DCtB99CyTS9VyWR4 HqbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from; bh=Mkm/udS9tZbufIz/OriCPuu+HiwfGz+5c2yB2XsVyIY=; b=r1onmGDKLplsmWs17+MV3HG8Avvx/ckawn56XvSrWXBpy3xOP0dXubP5T8qbCwrhHS R1n4SmBlqTwUg1yuRDuSS8nJVB1vUHzObO3JEPN3uz7ZQe2W6Ajxyz056oVewkPGcLmy pELF+ub+R2Eghzykx2Gy5rPNEQWy7Lk+Xkg+gNfVX+CWX9VPME63BL9cUy7vyMErM/Yp 8i1rO0Lc0CywZMZoBdb9c9udM6zvFNXdYTs3tmJmZaCcY1gcE9nNOH2OHKPVeChnAYbq lfDfw9TAm3FEjquwsEIlzX1A+V7IbVV4p7raRy0oh3iLTjO4s9mjkcQD1p/UhR3wv38D PRzQ== 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 t68-20020a625f47000000b0064d3894678bsi3430953pfb.64.2023.05.23.03.32.47; Tue, 23 May 2023 03:33:02 -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 S236533AbjEWKWY (ORCPT + 99 others); Tue, 23 May 2023 06:22:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51778 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236512AbjEWKWV (ORCPT ); Tue, 23 May 2023 06:22:21 -0400 Received: from mail.loongson.cn (mail.loongson.cn [114.242.206.163]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id C3B2F109; Tue, 23 May 2023 03:22:17 -0700 (PDT) Received: from loongson.cn (unknown [113.200.148.30]) by gateway (Coremail) with SMTP id _____8BxmPHYk2xkrAgAAA--.136S3; Tue, 23 May 2023 18:22:16 +0800 (CST) Received: from linux.localdomain (unknown [113.200.148.30]) by localhost.localdomain (Coremail) with SMTP id AQAAf8BxkrDWk2xk3CNwAA--.57318S4; Tue, 23 May 2023 18:22:16 +0800 (CST) From: Tiezhu Yang To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Ian Rogers , Adrian Hunter Cc: Hans-Peter Nilsson , Leo Yan , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, loongarch@lists.linux.dev, loongson-kernel@lists.loongnix.cn Subject: [PATCH 2/2] perf LoongArch: Simplify mksyscalltbl Date: Tue, 23 May 2023 18:22:07 +0800 Message-Id: <1684837327-18203-3-git-send-email-yangtiezhu@loongson.cn> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1684837327-18203-1-git-send-email-yangtiezhu@loongson.cn> References: <1684837327-18203-1-git-send-email-yangtiezhu@loongson.cn> X-CM-TRANSID: AQAAf8BxkrDWk2xk3CNwAA--.57318S4 X-CM-SenderInfo: p1dqw3xlh2x3gn0dqz5rrqw2lrqou0/ X-Coremail-Antispam: 1Uk129KBjvJXoW7Zry5GF45JF1xWr4rurWDXFb_yoW8Zr4xpF s3Cr9rta1rZr1xCwnF9r42qryrCws7Jr1YvFyvy3ySvw13C34rAry8Was3GFyxG3y8trWF vryFqryUKa18XaDanT9S1TB71UUUUbJqnTZGkaVYY2UrUUUUj1kv1TuYvTs0mT0YCTnIWj qI5I8CrVACY4xI64kE6c02F40Ex7xfYxn0WfASr-VFAUDa7-sFnT9fnUUIcSsGvfJTRUUU bh8YFVCjjxCrM7AC8VAFwI0_Jr0_Gr1l1xkIjI8I6I8E6xAIw20EY4v20xvaj40_Wr0E3s 1l1IIY67AEw4v_Jrv_JF1l8cAvFVAK0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xv wVC0I7IYx2IY67AKxVW7JVWDJwA2z4x0Y4vE2Ix0cI8IcVCY1x0267AKxVWxJVW8Jr1l84 ACjcxK6I8E87Iv67AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVCY1x0267AKxVW8Jr0_Cr1U M2kKe7AKxVWUtVW8ZwAS0I0E0xvYzxvE52x082IY62kv0487Mc804VCY07AIYIkI8VC2zV CFFI0UMc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWrXVW3AwAv7VC2 z280aVAFwI0_Cr0_Gr1UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCY1x 0262kKe7AKxVWUtVW8ZwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwCF I7km07C267AKxVWUtVW8ZwC20s026c02F40E14v26r1j6r18MI8I3I0E7480Y4vE14v26r 106r1rMI8E67AF67kF1VAFwI0_Jw0_GFylIxkGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AK xVW5JVW7JwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Gr0_Cr1lIxAIcVCF04k26cxKx2IYs7 xG6r1j6r1xMIIF0xvEx4A2jsIE14v26F4j6r4UJwCI42IY6I8E87Iv6xkF7I0E14v26r4j 6r4UJbIYCTnIWIevJa73UjIFyTuYvjxU3o7KUUUUU X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,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?1766680672756712662?= X-GMAIL-MSGID: =?utf-8?q?1766680672756712662?= In order to print the numerical entries of the syscall table, there is no need to call the host compiler to build and then run a program, this can be done directly by the shell script. This is similar with commit 9854e7ad35fe ("perf arm64: Simplify mksyscalltbl"). Signed-off-by: Tiezhu Yang Reviewed-by: Leo Yan --- .../arch/loongarch/entry/syscalls/mksyscalltbl | 32 ++++++---------------- 1 file changed, 8 insertions(+), 24 deletions(-) diff --git a/tools/perf/arch/loongarch/entry/syscalls/mksyscalltbl b/tools/perf/arch/loongarch/entry/syscalls/mksyscalltbl index c52156f..d7d97d5 100755 --- a/tools/perf/arch/loongarch/entry/syscalls/mksyscalltbl +++ b/tools/perf/arch/loongarch/entry/syscalls/mksyscalltbl @@ -22,40 +22,24 @@ create_table_from_c() { local sc nr last_sc - create_table_exe=`mktemp ${TMPDIR:-/tmp}/create-table-XXXXXX` - - { - - cat <<-_EoHEADER - #include - #include "$input" - int main(int argc, char *argv[]) - { - _EoHEADER - while read sc nr; do - printf "%s\n" " printf(\"\\t[%d] = \\\"$sc\\\",\\n\", $nr);" - last_sc=$nr + printf "%s\n" " [$nr] = \"$sc\"," + last_sc=$sc done - printf "%s\n" " printf(\"#define SYSCALLTBL_LOONGARCH_MAX_ID %d\\n\", $last_sc);" - printf "}\n" - - } | $hostcc -I $incpath/include/uapi -o $create_table_exe -x c - - - $create_table_exe - - rm -f $create_table_exe + printf "%s\n" "#define SYSCALLTBL_LOONGARCH_MAX_ID __NR_$last_sc" } create_table() { + echo "#include \"$input\"" echo "static const char *syscalltbl_loongarch[] = {" create_table_from_c echo "};" } -$gcc -E -dM -x c -I $incpath/include/uapi $input \ - |sed -ne 's/^#define __NR_//p' \ - |sort -t' ' -k2 -n \ +$gcc -E -dM -x c -I $incpath/include/uapi $input \ + |awk '{if ($2~"__NR" && $3 !~"__NR3264_") {print}}' \ + |sed -ne 's/^#define __NR_//p;s/^#define __NR3264_//p' \ + |sort -t' ' -k2 -n \ |create_table