From patchwork Wed Feb 22 11:55: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: 60489 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp531909wrd; Wed, 22 Feb 2023 03:57:51 -0800 (PST) X-Google-Smtp-Source: AK7set/A/bUnZoA1SreTkyezEApgFQarf/szA6REGerUA9/GK+9Q4Wl9sTzvVlOQexPlRTewgxGT X-Received: by 2002:a17:906:6a2a:b0:8aa:b866:af5a with SMTP id qw42-20020a1709066a2a00b008aab866af5amr20143005ejc.36.1677067071282; Wed, 22 Feb 2023 03:57:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677067071; cv=none; d=google.com; s=arc-20160816; b=TTm3mwpTnqOutyIKjIgdnPL0Uepb9A9va1/S6ESmYc6YvG4zELQ2ZQvi8klSrJkrh7 ayubkuZuX0IjUGA0mVmuEDgthfdX6/yrZ0YrmuVN54T4h+IlUOj9CPSAzptsyrekRgqI rwkFzCp3uxZtKcXnPCWK0Fn2HblWPz16GtsKL+cvYIbOJ9ldXz81pJJgrLADt1vxlVjs eGdgp3ONFXaiIH3+exuKYdmvsaTlGO9xC4S/NLoJyhDR6O9GOtu7Rs3WR9yZB3O/uzvs Bon6exZRrwaz56gEiHNiOIh0LTLFM6shwonCf9ok9QcbSqhsHns4RSSDB8GYyOXz/xo9 Jb1Q== 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=klopg2KIQp/KU52YrAS6NQSkXSwSdHtIvBny5HOaaeI=; b=x1h7v5kr9FRhYCCVOKr1wB6nDnkfGBkyGH7Auu9baW+5/gPzrbccnaE1Elt5IFtbD9 lGmNVNwoVxT5S3aZzDtuKLxPVFp+C2kdVmmdeISRsvxq3+gp2rID8inHiStZfdUON5gu 8O2V7t6uLz5nEq95eMZ0ypyLjgDNu3Cz1A5ninT7mIvWVXTYylsMM3UrwVogNUOgJ1mc Y3hl/ZPWJWY4asWnSkCt1A10N/E6qwTAfPlRG3Rn9yMazoUJtxkq1FkOlcAfJcl465Sz 85M9cRi4nBKEccMHNP29ClrH5+dQj0tly/jAKwSs5ocXY+FsNAgc2wL5AQPVvQrTTyr/ OdVQ== 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 t17-20020a170906c39100b008b1801be2e6si16442415ejz.453.2023.02.22.03.57.28; Wed, 22 Feb 2023 03:57:51 -0800 (PST) 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 S231370AbjBVLz1 (ORCPT + 99 others); Wed, 22 Feb 2023 06:55:27 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43272 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231149AbjBVLzZ (ORCPT ); Wed, 22 Feb 2023 06:55:25 -0500 Received: from loongson.cn (mail.loongson.cn [114.242.206.163]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id DBB9937B44; Wed, 22 Feb 2023 03:55:22 -0800 (PST) Received: from loongson.cn (unknown [113.200.148.30]) by gateway (Coremail) with SMTP id _____8DxAf+pAvZj7pEDAA--.1804S3; Wed, 22 Feb 2023 19:55:21 +0800 (CST) Received: from linux.localdomain (unknown [113.200.148.30]) by localhost.localdomain (Coremail) with SMTP id AQAAf8Cx2r2nAvZjar04AA--.38065S4; Wed, 22 Feb 2023 19:55:21 +0800 (CST) From: Tiezhu Yang To: Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko Cc: bpf@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH bpf-next 2/3] selftests/bpf: Check __TARGET_ARCH_loongarch if target is bpf for LoongArch Date: Wed, 22 Feb 2023 19:55:07 +0800 Message-Id: <1677066908-15224-3-git-send-email-yangtiezhu@loongson.cn> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1677066908-15224-1-git-send-email-yangtiezhu@loongson.cn> References: <1677066908-15224-1-git-send-email-yangtiezhu@loongson.cn> X-CM-TRANSID: AQAAf8Cx2r2nAvZjar04AA--.38065S4 X-CM-SenderInfo: p1dqw3xlh2x3gn0dqz5rrqw2lrqou0/ X-Coremail-Antispam: 1Uk129KBjvJXoW7Aw1UGr45uw45Cw1DCFWfXwb_yoW8Cw4fpF WkCr9FyFWUurWFk3s5JFy09Fy7J3s7tr4UtFWFg34kWFWrJ3W8Gws2krZrCasaga97tFna 9ry7K3y5Wa18Aw7anT9S1TB71UUUUUDqnTZGkaVYY2UrUUUUj1kv1TuYvTs0mT0YCTnIWj qI5I8CrVACY4xI64kE6c02F40Ex7xfYxn0WfASr-VFAUDa7-sFnT9fnUUIcSsGvfJTRUUU b7AYFVCjjxCrM7AC8VAFwI0_Jr0_Gr1l1xkIjI8I6I8E6xAIw20EY4v20xvaj40_Wr0E3s 1l1IIY67AEw4v_Jrv_JF1l8cAvFVAK0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xv wVC0I7IYx2IY67AKxVW8JVW5JwA2z4x0Y4vE2Ix0cI8IcVCY1x0267AKxVW8JVWxJwA2z4 x0Y4vEx4A2jsIE14v26F4UJVW0owA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_Cr1j6rxdM2AI xVAIcxkEcVAq07x20xvEncxIr21l57IF6xkI12xvs2x26I8E6xACxx1l5I8CrVACY4xI64 kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1q6rW5McIj6I8E87Iv67AKxVWxJVW8Jr1l Ox8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JMxAIw28IcxkI7VAKI48JMxC20s 026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_ JrI_JrWlx4CE17CEb7AF67AKxVWUAVWUtwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14 v26r1I6r4UMIIF0xvE2Ix0cI8IcVCY1x0267AKxVW8JVWxJwCI42IY6xAIw20EY4v20xva j40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Gr0_Cr1lIxAIcVC2z280aVCY1x0267AKxVW8JV W8JrUvcSsGvfC2KfnxnUUI43ZEXa7IU8jZX5UUUUU== X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_PASS, SPF_PASS 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?1758532281342881805?= X-GMAIL-MSGID: =?utf-8?q?1758532281342881805?= If target is bpf, there is no __loongarch__ definition, __BITS_PER_LONG defaults to 32, __NR_nanosleep is not defined: #if defined(__ARCH_WANT_TIME32_SYSCALLS) || __BITS_PER_LONG != 32 #define __NR_nanosleep 101 __SC_3264(__NR_nanosleep, sys_nanosleep_time32, sys_nanosleep) #endif Check __TARGET_ARCH_loongarch to include arch specified bitsperlong.h, then __BITS_PER_LONG is 64, __NR_nanosleep can also be defined to fix the following build errors: clang -g -Werror -D__TARGET_ARCH_loongarch ... -target bpf -c progs/test_vmlinux.c ... progs/test_vmlinux.c:24:18: error: use of undeclared identifier '__NR_nanosleep' if (args->id != __NR_nanosleep) ^ progs/test_vmlinux.c:42:12: error: use of undeclared identifier '__NR_nanosleep' if (id != __NR_nanosleep) ^ progs/test_vmlinux.c:60:12: error: use of undeclared identifier '__NR_nanosleep' if (id != __NR_nanosleep) ^ 3 errors generated. make: *** [Makefile:572: tools/testing/selftests/bpf/test_vmlinux.bpf.o] Error 1 make: Leaving directory 'tools/testing/selftests/bpf' Signed-off-by: Tiezhu Yang --- tools/include/uapi/asm/bitsperlong.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/include/uapi/asm/bitsperlong.h b/tools/include/uapi/asm/bitsperlong.h index da52065..10b4023 100644 --- a/tools/include/uapi/asm/bitsperlong.h +++ b/tools/include/uapi/asm/bitsperlong.h @@ -17,7 +17,7 @@ #include "../../../arch/riscv/include/uapi/asm/bitsperlong.h" #elif defined(__alpha__) #include "../../../arch/alpha/include/uapi/asm/bitsperlong.h" -#elif defined(__loongarch__) +#elif defined(__loongarch__) || defined(__TARGET_ARCH_loongarch) #include "../../../arch/loongarch/include/uapi/asm/bitsperlong.h" #else #include