From patchwork Sun Nov 5 11:34:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Patchwork-Id: 161635 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:8f47:0:b0:403:3b70:6f57 with SMTP id j7csp2078624vqu; Sun, 5 Nov 2023 03:35:21 -0800 (PST) X-Google-Smtp-Source: AGHT+IHHhCW0lzeRx1QJoNFJLLOcv4dECAY2GK67yqyhybQqWsuvBd8EbtjR950SVSpuRDRT0+97 X-Received: by 2002:a05:6a20:429f:b0:169:7d6f:9f22 with SMTP id o31-20020a056a20429f00b001697d6f9f22mr31192912pzj.54.1699184121352; Sun, 05 Nov 2023 03:35:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699184121; cv=none; d=google.com; s=arc-20160816; b=qqVbGUhz5GKkDyoarVWhpAuw1aZdQJOXYitxeHiyrTZ+y3MrUH105xBf5oT5fFfNR7 Xvj4D9STbL/U9fyZE4MC/Wa5hrR+LPTfxgfka4tQ5tWH8LK5RZ100DXnbcbtMYgYSwza 0ArJ8m8hm+UvRc52XOyQRP2x6kkhyH/0nvUi4SQyPqfFMHKIAWzKzppxwCJErrBO5r2F ZuaWzQqSEztM+g4uc+nATfNcUGpuaLvSSg5G26uekzZyhJ3PpE5QVHVVPC+LfsUIomqb u7IZK1+QHvWJun7KHO5E0+G1LQ1LSB3B8YAy/3n9XTY8gXmOdlbsYuOzpOTO/81EeuQf wo6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=fHr2dnV5BkoFfg4FIppcwFFK1hSNx/DhgBxvOrh4BH0=; fh=JRNmh72HsCuY/8FIVPb28sVny+CmDHBEFeZkZsBPzMc=; b=JltOKJVxavvUOngXMIl0iXPCKuhWD33TMp9i11zEjpcZjT3UJVWJCfhsESTMFC3bxg AYwbJtIBchfJ5xb9a+CLL36a05t69zLKQXHuIHY0SvqqeSY2bV9Ztr/yS5A2YOiGZgUm N140Xx0jEZStK73rnX1Anhab5aajT0sTQboyK9egLdPIpTbwcnKIUBaAFMlqSQFZ6Jwg xu16YWWNziDf/dy3iz6jSooJdP1WXti08hH7SzBUUdLEaa9qM9AZ/1MduNhiCbGqXj6C V+M01wGbN0ySryebqUZ6XToGEc6KyS48zgZtd7E+4jIxNBF39qw9L7ZiCpZkb3WTrkEz iMyw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@weissschuh.net header.s=mail header.b=ggObUooO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id gx18-20020a17090b125200b002802c0c4cdasi5873508pjb.181.2023.11.05.03.35.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Nov 2023 03:35:21 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@weissschuh.net header.s=mail header.b=ggObUooO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 3069A804DDAD; Sun, 5 Nov 2023 03:35:20 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230370AbjKELfR (ORCPT + 34 others); Sun, 5 Nov 2023 06:35:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58190 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229621AbjKELfJ (ORCPT ); Sun, 5 Nov 2023 06:35:09 -0500 Received: from todd.t-8ch.de (todd.t-8ch.de [159.69.126.157]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0CB05EB; Sun, 5 Nov 2023 03:35:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=weissschuh.net; s=mail; t=1699184102; bh=bfoswv7ncWkCUqW4AE0EZoLtlErB+6knnnYOlA24mFg=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=ggObUooOsP16O4x6BewBPKt6dbJAKMDPCMukaNrJQ4tPmNjjhReY/M/3h2igCqr9e 8QDP9goT7oeZIGARnHqLn5ovBLbsZDsGMGdu0gdHzujocpCrT2c2D4SvmTm8BtFWmq HZob2QtRpfTDqOfB4RWC1qBbqcLoN1DTldflgf14= From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Date: Sun, 05 Nov 2023 12:34:58 +0100 Subject: [PATCH v2 1/6] tools/nolibc: error out on unsupported architecture MIME-Version: 1.0 Message-Id: <20231105-nolibc-mips-be-v2-1-4ec993cb5407@weissschuh.net> References: <20231105-nolibc-mips-be-v2-0-4ec993cb5407@weissschuh.net> In-Reply-To: <20231105-nolibc-mips-be-v2-0-4ec993cb5407@weissschuh.net> To: Willy Tarreau , Shuah Khan Cc: Zhangjin Wu , linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Mailer: b4 0.12.4 X-Developer-Signature: v=1; a=ed25519-sha256; t=1699184102; l=839; i=linux@weissschuh.net; s=20221212; h=from:subject:message-id; bh=bfoswv7ncWkCUqW4AE0EZoLtlErB+6knnnYOlA24mFg=; b=h1P8i1kDOIISeYbFLfzWqMLh6zBFs5DBo7Ec2xs4xRvaX+LTXzcXL3OdniFMrew7OO+bp1Vbg 4liZd88i89SDABWH8QxgfHjGsWri5e7JtAdVORS/QKYZtWAg8u/Az5q X-Developer-Key: i=linux@weissschuh.net; a=ed25519; pk=KcycQgFPX2wGR5azS7RhpBqedglOZVgRPfdFSPB1LNw= X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Sun, 05 Nov 2023 03:35:20 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781723689215304306 X-GMAIL-MSGID: 1781723689215304306 When an architecture is unsupported arch.h would silently continue. This leads to a lot of followup errors because my_syscallX() is not defined and the startup code is missing. Avoid these confusing errors and fail the build early with a clear error message and location. Signed-off-by: Thomas Weißschuh Acked-by: Willy Tarreau --- tools/include/nolibc/arch.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/include/nolibc/arch.h b/tools/include/nolibc/arch.h index e276fb0680af..2f72ccac0378 100644 --- a/tools/include/nolibc/arch.h +++ b/tools/include/nolibc/arch.h @@ -33,6 +33,8 @@ #include "arch-s390.h" #elif defined(__loongarch__) #include "arch-loongarch.h" +#else +#error Unsupported Architecture #endif #endif /* _NOLIBC_ARCH_H */ From patchwork Sun Nov 5 11:34:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Patchwork-Id: 161639 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:8f47:0:b0:403:3b70:6f57 with SMTP id j7csp2078728vqu; Sun, 5 Nov 2023 03:35:37 -0800 (PST) X-Google-Smtp-Source: AGHT+IEgCPxLkfWnvP0jQfFTX4T4vlAlF76XQq+0E9kCIITQAZWnLFQ+/JVA70akmNwcrFR4F6Of X-Received: by 2002:a05:6e02:174d:b0:359:5b5c:9ce4 with SMTP id y13-20020a056e02174d00b003595b5c9ce4mr12673316ill.19.1699184137074; Sun, 05 Nov 2023 03:35:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699184137; cv=none; d=google.com; s=arc-20160816; b=Ixfhc/wVCXO0kC1YUzL5xpHsnwiyaRDD+9WAYEa40HDi1OkTZ/69F3MSfCj/qlZEUM BkenE7SUsx0iLsKAkWrr6/YN0Oo3srvOAmCFeWjiuK4zYo2FF2rfTVCxp5MAEcDb96z7 +PtCqtZTnEtLRjQGaAEs03qdDnvFACc5hZYSGX+2/mN0ciaR0mW9V+U8JS+7nDBQB3xI c70f14XnBoUHyf4KZvgudAWHbVIfH615qug12CUwOfTuPtWMy8FQFPnzHr+fVMlwzuGa 8yY6gEKQFDXN0PnkOsn0ZpBIjxMft2wEapp7h1fC4/GtRpS5sejW4AKZCUXjyc3OFNbU twow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=IFligo1OQR+SG0AAeNQblN6kfOo4n/vpVqKlYUS+ko4=; fh=JRNmh72HsCuY/8FIVPb28sVny+CmDHBEFeZkZsBPzMc=; b=IK/5mxx+etWkpaxHzwQN9SiZ7QQN+KL8EgXt6YWrCinlR5T+KvDrUUUf9IC4u9sJHK mMdeHP+UldYi4XblSkDSFkGPd61HotM24dksxBU2NRdbitFzTZ32gxw/5N1tcYldBjSN hmOQf48MpF2tQ5ZRlk69BOlalp9rSFTfWeGxWxhaTdAC3FOPWI7ypEKcMxhHsNAeCqIN 4i1vENjx5tESLkyc3YqD3ih85KxKA80USMhO2aMGQx8SwlZ/Q5ifiZPvgEDp9VcX9n/u IpHlNKgODro1+qhIhAFhb6xN2kc4sUD/e/yLceIYEU+O3qB73PHgk9BoG0fFDxfmNZt6 Wnkg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@weissschuh.net header.s=mail header.b=Ve2zD0Vq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id az2-20020a056a02004200b005b9607e3e65si6337855pgb.870.2023.11.05.03.35.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Nov 2023 03:35:37 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@weissschuh.net header.s=mail header.b=Ve2zD0Vq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 5F2F6806FAB3; Sun, 5 Nov 2023 03:35:30 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230325AbjKELfP (ORCPT + 34 others); Sun, 5 Nov 2023 06:35:15 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58192 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229638AbjKELfJ (ORCPT ); Sun, 5 Nov 2023 06:35:09 -0500 Received: from todd.t-8ch.de (todd.t-8ch.de [159.69.126.157]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0CC6DFA; Sun, 5 Nov 2023 03:35:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=weissschuh.net; s=mail; t=1699184102; bh=a+9ND8eF9nLxQ/1grgp4DdoijTDtNpAFxfKUQan+h7M=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=Ve2zD0Vq063PtHS4Lxh8WD9DDxhauFe4gHtNgrPbeBRPljXDqfv9QoEwCmNhDHS5G lK+C2gEE8yzKYMICNcftDE47lMiW6NgIo7LWWV3anX8+XsFPaz8Sp1XhSo9XZsdW1H ii5nZg6Avq/KlnIbXcQNrDtFPCCNW2vdI4iLK6GI= From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Date: Sun, 05 Nov 2023 12:34:59 +0100 Subject: [PATCH v2 2/6] tools/nolibc: move MIPS ABI validation into arch-mips.h MIME-Version: 1.0 Message-Id: <20231105-nolibc-mips-be-v2-2-4ec993cb5407@weissschuh.net> References: <20231105-nolibc-mips-be-v2-0-4ec993cb5407@weissschuh.net> In-Reply-To: <20231105-nolibc-mips-be-v2-0-4ec993cb5407@weissschuh.net> To: Willy Tarreau , Shuah Khan Cc: Zhangjin Wu , linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Mailer: b4 0.12.4 X-Developer-Signature: v=1; a=ed25519-sha256; t=1699184102; l=1437; i=linux@weissschuh.net; s=20221212; h=from:subject:message-id; bh=a+9ND8eF9nLxQ/1grgp4DdoijTDtNpAFxfKUQan+h7M=; b=eJbW210gN9ZiHm9562zmKqj43K5z7WF41/80UWLA634WixdMeLP8a2IsPlrCKGle0tYPZ1JqO GdIZVn6/JIlCIdaJL0d032Me/fqn7ESrBaPMTAywCsnqJU/ue/4XLzz X-Developer-Key: i=linux@weissschuh.net; a=ed25519; pk=KcycQgFPX2wGR5azS7RhpBqedglOZVgRPfdFSPB1LNw= X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Sun, 05 Nov 2023 03:35:30 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781723705463541090 X-GMAIL-MSGID: 1781723705463541090 When installing nolibc to a sysroot arch.h is not used so its ABI check is bypassed. This makes is possible to compile nolibc with a non O32 ABI which may build but can not run. Move the check into arch-mips.h so it will always be evaluated. Signed-off-by: Thomas Weißschuh Acked-by: Willy Tarreau --- tools/include/nolibc/arch-mips.h | 4 ++++ tools/include/nolibc/arch.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/include/nolibc/arch-mips.h b/tools/include/nolibc/arch-mips.h index 4ab6fa54beee..3a2c76716b83 100644 --- a/tools/include/nolibc/arch-mips.h +++ b/tools/include/nolibc/arch-mips.h @@ -10,6 +10,10 @@ #include "compiler.h" #include "crt.h" +#if !defined(_ABIO32) +#error Unsupported MIPS ABI +#endif + /* Syscalls for MIPS ABI O32 : * - WARNING! there's always a delayed slot! * - WARNING again, the syntax is different, registers take a '$' and numbers diff --git a/tools/include/nolibc/arch.h b/tools/include/nolibc/arch.h index 2f72ccac0378..c8f4e5d3add9 100644 --- a/tools/include/nolibc/arch.h +++ b/tools/include/nolibc/arch.h @@ -23,7 +23,7 @@ #include "arch-arm.h" #elif defined(__aarch64__) #include "arch-aarch64.h" -#elif defined(__mips__) && defined(_ABIO32) +#elif defined(__mips__) #include "arch-mips.h" #elif defined(__powerpc__) #include "arch-powerpc.h" From patchwork Sun Nov 5 11:35:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Patchwork-Id: 161640 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:8f47:0:b0:403:3b70:6f57 with SMTP id j7csp2078791vqu; Sun, 5 Nov 2023 03:35:50 -0800 (PST) X-Google-Smtp-Source: AGHT+IHiji4dIHkL5Tn8D20+GofTRPiHmHAwgeA//OQOoLOW3wAlJtc1Cqym7FUWHOwOhzumihtw X-Received: by 2002:a05:6e02:2164:b0:359:6a34:9043 with SMTP id s4-20020a056e02216400b003596a349043mr7703169ilv.6.1699184149996; Sun, 05 Nov 2023 03:35:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699184149; cv=none; d=google.com; s=arc-20160816; b=nhF5Vkz0c/hcfX3jw8Kz/fBDGvjxtEWA+t4Uh7HO+ZT2ZnqbwhJDX14+vv1O0/lsvm YOf17QHkERNPgE0wKksRhz68ALxcv96jDy9jcLFGtNEYmijuulpnbd0Em/4vLP+ccm6O LO4iRfSKPuLjNxtLc6efAa7Hf35KWZhOaP6rBmap+840UQOiLB1nUOfV1hefi9566tk2 iajit31ftVBuayWBlrBUktkzbbGj1Auaiit9668J4enqxQRzyvseguumxecpHStTczCy /YVu1y8WO/ndbsI0yaiEGQpRsguzh8aO7DEwHAFfYRcgtmxxe3VJvdx1ELP5IchULXzr tZow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=tlkSibk6p9uvds55oING7URug8JtBVbTAOkziKnwflQ=; fh=JRNmh72HsCuY/8FIVPb28sVny+CmDHBEFeZkZsBPzMc=; b=LV3L7xplvkf2XSORevlOgfTBqLKyi88KPkoF8JQ+ObageyE7SB52z4erPaWkISuwOn RBUGEXXPKEcvbj7++4eP3ntp59k8LsjhRZL6JJJ9k0kCdd49R0IWGTM7RGbvqZMWTZtu Bqit0mxlckeGQ451ap2RnivvVkrEZHBFge+drduYXtoXN9kjWF0uYdPz6WyBibJURF0g qDo+JL2uROY+yH/3bZ5LjZuWAORG37EZ+GDqatzsV936pB3IKSL6fBy090tU/ie2Mt3J y2Uu3jKFyLuBjHOOcI11THgSvD2fdQYnrcf2gZAG8MPtcH/a0wb+mxN9rd5CulSW3n8/ fHIQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@weissschuh.net header.s=mail header.b=aQnhtEh4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id n10-20020a170903404a00b001c5fa6d75acsi5434119pla.494.2023.11.05.03.35.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Nov 2023 03:35:49 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; Authentication-Results: mx.google.com; dkim=pass header.i=@weissschuh.net header.s=mail header.b=aQnhtEh4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id DC807806034A; Sun, 5 Nov 2023 03:35:38 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230395AbjKELfT (ORCPT + 34 others); Sun, 5 Nov 2023 06:35:19 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58204 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230236AbjKELfK (ORCPT ); Sun, 5 Nov 2023 06:35:10 -0500 Received: from todd.t-8ch.de (todd.t-8ch.de [159.69.126.157]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0AF97E1; Sun, 5 Nov 2023 03:35:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=weissschuh.net; s=mail; t=1699184102; bh=IdJFXFy2rUhosoH8Z7h6MB9DWZTcM5ZHRroV78U+Fiw=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=aQnhtEh4oHnnVRhhOMGSxfSYjJY8wGO/yqMvBBwPv7MsQ+hUu15HzjWjM6EzPMXW0 ghAOBZ/OpaLrcWc7aKgKMYdpV0uTb3lzcS/oqS2GWTNdZ9n2qKUIyRneCIpPFpjVrp GBmwNIxwKAt14r8Uz6lbBupZPeZo5RKYKzGEWbMg= From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Date: Sun, 05 Nov 2023 12:35:00 +0100 Subject: [PATCH v2 3/6] selftests/nolibc: use XARCH for MIPS MIME-Version: 1.0 Message-Id: <20231105-nolibc-mips-be-v2-3-4ec993cb5407@weissschuh.net> References: <20231105-nolibc-mips-be-v2-0-4ec993cb5407@weissschuh.net> In-Reply-To: <20231105-nolibc-mips-be-v2-0-4ec993cb5407@weissschuh.net> To: Willy Tarreau , Shuah Khan Cc: Zhangjin Wu , linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Mailer: b4 0.12.4 X-Developer-Signature: v=1; a=ed25519-sha256; t=1699184102; l=4274; i=linux@weissschuh.net; s=20221212; h=from:subject:message-id; bh=IdJFXFy2rUhosoH8Z7h6MB9DWZTcM5ZHRroV78U+Fiw=; b=ilBW37jFgjSgNWl7vowrgRQbusU+xSSnJUlYm4CP5feL39NDJ8YsItziynNCdK0syWRtcrgi4 +8BzjAQeX7eDVyaAzOq7uwqnbvGyFDQcIKnZHAbY/NwPzRSW8Uk3Lte X-Developer-Key: i=linux@weissschuh.net; a=ed25519; pk=KcycQgFPX2wGR5azS7RhpBqedglOZVgRPfdFSPB1LNw= X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Sun, 05 Nov 2023 03:35:39 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781723719048071234 X-GMAIL-MSGID: 1781723719048071234 MIPS has many different configurations prepare the support of additional ones by moving the build of MIPS to the generic XARCH infrastructure. Signed-off-by: Thomas Weißschuh Acked-by: Willy Tarreau --- tools/testing/selftests/nolibc/Makefile | 12 +++++++----- tools/testing/selftests/nolibc/run-tests.sh | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/tools/testing/selftests/nolibc/Makefile b/tools/testing/selftests/nolibc/Makefile index c5df1617cbc3..71fa5fdd10b6 100644 --- a/tools/testing/selftests/nolibc/Makefile +++ b/tools/testing/selftests/nolibc/Makefile @@ -40,12 +40,14 @@ objtree ?= $(srctree) # configure default variants for target kernel supported architectures XARCH_powerpc = ppc +XARCH_mips = mips32le XARCH = $(or $(XARCH_$(ARCH)),$(ARCH)) # map from user input variants to their kernel supported architectures ARCH_ppc = powerpc ARCH_ppc64 = powerpc ARCH_ppc64le = powerpc +ARCH_mips32le = mips ARCH := $(or $(ARCH_$(XARCH)),$(XARCH)) # kernel image names by architecture @@ -54,7 +56,7 @@ IMAGE_x86_64 = arch/x86/boot/bzImage IMAGE_x86 = arch/x86/boot/bzImage IMAGE_arm64 = arch/arm64/boot/Image IMAGE_arm = arch/arm/boot/zImage -IMAGE_mips = vmlinuz +IMAGE_mips32le = vmlinuz IMAGE_ppc = vmlinux IMAGE_ppc64 = vmlinux IMAGE_ppc64le = arch/powerpc/boot/zImage @@ -70,7 +72,7 @@ DEFCONFIG_x86_64 = defconfig DEFCONFIG_x86 = defconfig DEFCONFIG_arm64 = defconfig DEFCONFIG_arm = multi_v7_defconfig -DEFCONFIG_mips = malta_defconfig +DEFCONFIG_mips32le = malta_defconfig DEFCONFIG_ppc = pmac32_defconfig DEFCONFIG_ppc64 = powernv_be_defconfig DEFCONFIG_ppc64le = powernv_defconfig @@ -88,7 +90,7 @@ QEMU_ARCH_x86_64 = x86_64 QEMU_ARCH_x86 = x86_64 QEMU_ARCH_arm64 = aarch64 QEMU_ARCH_arm = arm -QEMU_ARCH_mips = mipsel # works with malta_defconfig +QEMU_ARCH_mips32le = mipsel # works with malta_defconfig QEMU_ARCH_ppc = ppc QEMU_ARCH_ppc64 = ppc64 QEMU_ARCH_ppc64le = ppc64 @@ -110,7 +112,7 @@ QEMU_ARGS_x86_64 = -M pc -append "console=ttyS0,9600 i8042.noaux panic=-1 $( QEMU_ARGS_x86 = -M pc -append "console=ttyS0,9600 i8042.noaux panic=-1 $(TEST:%=NOLIBC_TEST=%)" QEMU_ARGS_arm64 = -M virt -cpu cortex-a53 -append "panic=-1 $(TEST:%=NOLIBC_TEST=%)" QEMU_ARGS_arm = -M virt -append "panic=-1 $(TEST:%=NOLIBC_TEST=%)" -QEMU_ARGS_mips = -M malta -append "panic=-1 $(TEST:%=NOLIBC_TEST=%)" +QEMU_ARGS_mips32le = -M malta -append "panic=-1 $(TEST:%=NOLIBC_TEST=%)" QEMU_ARGS_ppc = -M g3beige -append "console=ttyS0 panic=-1 $(TEST:%=NOLIBC_TEST=%)" QEMU_ARGS_ppc64 = -M powernv -append "console=hvc0 panic=-1 $(TEST:%=NOLIBC_TEST=%)" QEMU_ARGS_ppc64le = -M powernv -append "console=hvc0 panic=-1 $(TEST:%=NOLIBC_TEST=%)" @@ -134,7 +136,7 @@ CFLAGS_ppc = -m32 -mbig-endian -mno-vsx $(call cc-option,-mmultiple) CFLAGS_ppc64 = -m64 -mbig-endian -mno-vsx $(call cc-option,-mmultiple) CFLAGS_ppc64le = -m64 -mlittle-endian -mno-vsx $(call cc-option,-mabi=elfv2) CFLAGS_s390 = -m64 -CFLAGS_mips = -EL +CFLAGS_mips32le = -EL CFLAGS_STACKPROTECTOR ?= $(call cc-option,-mstack-protector-guard=global $(call cc-option,-fstack-protector-all)) CFLAGS ?= -Os -fno-ident -fno-asynchronous-unwind-tables -std=c89 -W -Wall -Wextra \ $(call cc-option,-fno-stack-protector) \ diff --git a/tools/testing/selftests/nolibc/run-tests.sh b/tools/testing/selftests/nolibc/run-tests.sh index 1bf020d49f54..8f2c3bc572cb 100755 --- a/tools/testing/selftests/nolibc/run-tests.sh +++ b/tools/testing/selftests/nolibc/run-tests.sh @@ -14,7 +14,7 @@ cache_dir="${XDG_CACHE_HOME:-"$HOME"/.cache}" download_location="${cache_dir}/crosstools/" build_location="$(realpath "${cache_dir}"/nolibc-tests/)" perform_download=0 -archs="i386 x86_64 arm64 arm mips ppc ppc64 ppc64le riscv s390 loongarch" +archs="i386 x86_64 arm64 arm mips32le ppc ppc64 ppc64le riscv s390 loongarch" TEMP=$(getopt -o 'j:d:c:b:a:ph' -n "$0" -- "$@") From patchwork Sun Nov 5 11:35:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Patchwork-Id: 161637 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:8f47:0:b0:403:3b70:6f57 with SMTP id j7csp2078713vqu; Sun, 5 Nov 2023 03:35:34 -0800 (PST) X-Google-Smtp-Source: AGHT+IFT1AZfaSdhgNlMQKAX0LFj5oPPO5dvZqHXOyGn7o3P6oa66KdrxxRDEiXSqcqqe88vsTC1 X-Received: by 2002:a05:6a00:138a:b0:68e:3772:4e40 with SMTP id t10-20020a056a00138a00b0068e37724e40mr25487427pfg.3.1699184134497; Sun, 05 Nov 2023 03:35:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699184134; cv=none; d=google.com; s=arc-20160816; b=gXpjiNaANTWw/ous80047Z731LSV+hNxsz2/dO9V3CJUgTatIEQMkM+m6EymsmInNt FQ100Uq5dcYPF7Jr+Um6ucj89NJsQvdU8o+yLKOSLLCy1tbzmaeFzevpDDhb3s0lPCHB Wj7Yp4w7eteJZLbmB+tS69ywOCYqv5VWoHdqdiOH0a49wtVSy8l0HogISAVBCltS2DPE 6u7Y35Yf8Y7r4Tb7LwJFuFA5Lo4wDHdVpVzngx58T2UWEVr1f9JK7PTgGfAsEELpSKSa i+RklNvcSdEOFDunhB8xpqu7I7XFr/Jumhu9vQvQaw04igWE4kM54bhDm81CfgjWCtOx yuKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=KY31/ZsDQAxzuzDPIV+MG4w4BNakt6Zl7Zfmu6oCTj4=; fh=JRNmh72HsCuY/8FIVPb28sVny+CmDHBEFeZkZsBPzMc=; b=xClna/MO+Cc3tKZqUxF0Fi3wqOrhVC+PEsWpcKLVa80tcW5Kh55b4z0UiUmRtphmAj SVhRumvJ8dIzBs+kvatiedy4Q30PJAsAjCl1eslhZTYZZ2pqnD3ZNddKn7zrXQSiAJBU 3Rl8le3lWKxhKESY+2pNMSDPQR6lxyhWqRrAZ9dK4g35c7pdpS9EYUVuzEIWLxjlUEC5 HoQO50/Ye8ekFaXqvy2teT+VCArHZ5Gchc5YjJbbvgEOY/mCdspgYeng3JhFQGIvB77L 4ZlqimvnOGZKcAb8bPU2M0toOdzqC15JHfEYvl6g+CsZN0y7UFuoZL9/7WxViIX8M7QH 920w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@weissschuh.net header.s=mail header.b=TIQDSiJs; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id y26-20020aa7855a000000b00690258a9766si5398397pfn.373.2023.11.05.03.35.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Nov 2023 03:35:34 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@weissschuh.net header.s=mail header.b=TIQDSiJs; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 5B7BC8057947; Sun, 5 Nov 2023 03:35:27 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230250AbjKELfK (ORCPT + 34 others); Sun, 5 Nov 2023 06:35:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58176 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229527AbjKELfJ (ORCPT ); Sun, 5 Nov 2023 06:35:09 -0500 Received: from todd.t-8ch.de (todd.t-8ch.de [IPv6:2a01:4f8:c010:41de::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E0785DE; Sun, 5 Nov 2023 03:35:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=weissschuh.net; s=mail; t=1699184102; bh=1Fz6cfHmleRuZplVAtovhMSjgDBjjcDGQMidibUEkzU=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=TIQDSiJsOnarAiJSnsHU0m5JNYUon3j+xe55ZpI3ASxwzTIdF0eaB5HwHvoxtZN5z NrciJwTZ9Q4iy5MsV+N0PWd4NOO5SytwWLUlsu2fM4LMiVbxXNSc0bi3EmcUNRLWAb ZHZcN8LXskLLUAAOy2ch6nDl7bdehQAz3gVQ45DU= From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Date: Sun, 05 Nov 2023 12:35:01 +0100 Subject: [PATCH v2 4/6] selftests/nolibc: explicitly specify ABI for MIPS MIME-Version: 1.0 Message-Id: <20231105-nolibc-mips-be-v2-4-4ec993cb5407@weissschuh.net> References: <20231105-nolibc-mips-be-v2-0-4ec993cb5407@weissschuh.net> In-Reply-To: <20231105-nolibc-mips-be-v2-0-4ec993cb5407@weissschuh.net> To: Willy Tarreau , Shuah Khan Cc: Zhangjin Wu , linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Mailer: b4 0.12.4 X-Developer-Signature: v=1; a=ed25519-sha256; t=1699184102; l=1085; i=linux@weissschuh.net; s=20221212; h=from:subject:message-id; bh=1Fz6cfHmleRuZplVAtovhMSjgDBjjcDGQMidibUEkzU=; b=Hk54/oIuM0hpLZtNUSMLxOrddWKinH9QQOjKhEmDZbcOfHO90O9MYdjAXrwxRX2SJmnhU9pZB 9pyHB9q9OlEBM1MUDRc/Ty5Su5pt844ry1CojReLjuUXqfGxyMr6vK3 X-Developer-Key: i=linux@weissschuh.net; a=ed25519; pk=KcycQgFPX2wGR5azS7RhpBqedglOZVgRPfdFSPB1LNw= X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Sun, 05 Nov 2023 03:35:27 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781723702862814094 X-GMAIL-MSGID: 1781723702862814094 More ABIs exist, for better clarity specify it explicitly everywhere. Signed-off-by: Thomas Weißschuh Acked-by: Willy Tarreau --- tools/testing/selftests/nolibc/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/nolibc/Makefile b/tools/testing/selftests/nolibc/Makefile index 71fa5fdd10b6..6a5e67f65daa 100644 --- a/tools/testing/selftests/nolibc/Makefile +++ b/tools/testing/selftests/nolibc/Makefile @@ -136,7 +136,7 @@ CFLAGS_ppc = -m32 -mbig-endian -mno-vsx $(call cc-option,-mmultiple) CFLAGS_ppc64 = -m64 -mbig-endian -mno-vsx $(call cc-option,-mmultiple) CFLAGS_ppc64le = -m64 -mlittle-endian -mno-vsx $(call cc-option,-mabi=elfv2) CFLAGS_s390 = -m64 -CFLAGS_mips32le = -EL +CFLAGS_mips32le = -EL -mabi=32 CFLAGS_STACKPROTECTOR ?= $(call cc-option,-mstack-protector-guard=global $(call cc-option,-fstack-protector-all)) CFLAGS ?= -Os -fno-ident -fno-asynchronous-unwind-tables -std=c89 -W -Wall -Wextra \ $(call cc-option,-fno-stack-protector) \ From patchwork Sun Nov 5 11:35:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Patchwork-Id: 161636 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:8f47:0:b0:403:3b70:6f57 with SMTP id j7csp2078703vqu; Sun, 5 Nov 2023 03:35:33 -0800 (PST) X-Google-Smtp-Source: AGHT+IGIO7v80/kaoLCBA3T3uWo075/IimstQauiKGnYm+Z/EM0ksvKfNjmnMenfPW54K7vl7OcI X-Received: by 2002:a9d:6206:0:b0:6c4:7e5a:6db6 with SMTP id g6-20020a9d6206000000b006c47e5a6db6mr26928476otj.17.1699184133162; Sun, 05 Nov 2023 03:35:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699184133; cv=none; d=google.com; s=arc-20160816; b=tkStGxWuhJQQxi0ZiMZZ8CeoTGPVPiACPildmt1JEJVtx6WG+HibFNGsD/EXmkBT6o v41ks9qSg6P1DUlyCxL54WpHSgxaott9j39C1s1EkQudgLLL+UdMOQQoHjF87vZ9gIce QNccNz+Atw+jM1zIbl1QESovgtcAu8i/QJ5mhPrkQ2Xokocs3RE4bqlyDjjuma4mI+Po 7Ey31pIyHo5MumXfvLmtnghmS3Vlrtaxu2nnL9ZYMQAZz2JoxFlHlRlxAVgn6KlQRzpo +h+o19kLjsykzLpdXV+qlb38+SsT+/fFfJmpeCBQ39kNQcVZaU+kAj9epZsJyxaKZiEZ vNoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=zLqKfeKqW/rZzsEheNF2TrenXf0J9xnPfWqf/1RPlIk=; fh=JRNmh72HsCuY/8FIVPb28sVny+CmDHBEFeZkZsBPzMc=; b=nAfDowm4N6IAjedkO3d1PG//kUMP1c0+OyTrbwhOO8RlnEdwxJSCG11hRvdd5Gfmv4 duYYdmA8aCBj2dAivvxe/vxyKAFb9mZs6CeMo1cHchdhczOx6/N4CB6IAhVOg1Ytstid Wr/rNjv6SVVxUs/V/q2aOX4jOlrJ/lSw7AdEDy1/uWRdTpgYna5niWSjLnl/b/LVcGbj FcDjR9l8KzbNAEjM91In9xlmSCN60DeRjWarQy5Xno36hxRmhyPNpeplRpZugA1TFWxq gqJk6pWLFrFmZ8baBxNuFTUXXQ7GVn332bEEpqsSJHhTqc+0Y1OwcAWWn+Sk0r/5fjzL N6BQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@weissschuh.net header.s=mail header.b=msFqDpcX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id ne9-20020a17090b374900b002764fc15dd3si5555369pjb.37.2023.11.05.03.35.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Nov 2023 03:35:33 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@weissschuh.net header.s=mail header.b=msFqDpcX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id A38238057943; Sun, 5 Nov 2023 03:35:25 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230302AbjKELfM (ORCPT + 34 others); Sun, 5 Nov 2023 06:35:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58182 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229447AbjKELfJ (ORCPT ); Sun, 5 Nov 2023 06:35:09 -0500 Received: from todd.t-8ch.de (todd.t-8ch.de [IPv6:2a01:4f8:c010:41de::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3BEC2F2; Sun, 5 Nov 2023 03:35:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=weissschuh.net; s=mail; t=1699184103; bh=nyrjPvpNj7WNK2ijhv221XrS7R5GMOB+fysjKb+NE6o=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=msFqDpcXSSjuZeof1fOOu4F3KvdFjPlRQWnmsbkx5IncwISbVjpvwj1+4HSuM14NX mpPaEfVWolk/aS1Vg1HWeHSomdt/kCxJL9Oe/EC8g0GVQ+cSdnRImwt7jO4a+NJHT0 QsaOO4ZajOXcaaF3oKamxoRIjWA3iE2L8ukPUUPk= From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Date: Sun, 05 Nov 2023 12:35:02 +0100 Subject: [PATCH v2 5/6] selftests/nolibc: extraconfig support MIME-Version: 1.0 Message-Id: <20231105-nolibc-mips-be-v2-5-4ec993cb5407@weissschuh.net> References: <20231105-nolibc-mips-be-v2-0-4ec993cb5407@weissschuh.net> In-Reply-To: <20231105-nolibc-mips-be-v2-0-4ec993cb5407@weissschuh.net> To: Willy Tarreau , Shuah Khan Cc: Zhangjin Wu , linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Mailer: b4 0.12.4 X-Developer-Signature: v=1; a=ed25519-sha256; t=1699184102; l=1285; i=linux@weissschuh.net; s=20221212; h=from:subject:message-id; bh=nyrjPvpNj7WNK2ijhv221XrS7R5GMOB+fysjKb+NE6o=; b=pMFDcAOHYf4oHIZkEkSHQT55uQDBq91NgSrk1f7kzN2JjkQ9CLhIP4kxLS0KgKkI32bVdqLIH 2KcXs4Yuyf3DEiRrfyVY62+QU7RUH9pQxmmtF8Ce1pAS4EZ0OTMGa1l X-Developer-Key: i=linux@weissschuh.net; a=ed25519; pk=KcycQgFPX2wGR5azS7RhpBqedglOZVgRPfdFSPB1LNw= X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Sun, 05 Nov 2023 03:35:25 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781723702015455177 X-GMAIL-MSGID: 1781723702015455177 Allow some postprocessing of defconfig files. Suggested-by: Zhangjin Wu Signed-off-by: Thomas Weißschuh Acked-by: Willy Tarreau --- tools/testing/selftests/nolibc/Makefile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/testing/selftests/nolibc/Makefile b/tools/testing/selftests/nolibc/Makefile index 6a5e67f65daa..6a1f7f9edf91 100644 --- a/tools/testing/selftests/nolibc/Makefile +++ b/tools/testing/selftests/nolibc/Makefile @@ -81,6 +81,8 @@ DEFCONFIG_s390 = defconfig DEFCONFIG_loongarch = defconfig DEFCONFIG = $(DEFCONFIG_$(XARCH)) +EXTRACONFIG = $(EXTRACONFIG_$(XARCH)) + # optional tests to run (default = all) TEST = @@ -227,6 +229,10 @@ initramfs: nolibc-test defconfig: $(Q)$(MAKE) -C $(srctree) ARCH=$(ARCH) CC=$(CC) CROSS_COMPILE=$(CROSS_COMPILE) mrproper $(DEFCONFIG) prepare + $(Q)if [ -n "$(EXTRACONFIG)" ]; then \ + $(srctree)/scripts/config --file $(objtree)/.config $(EXTRACONFIG); \ + $(MAKE) -C $(srctree) ARCH=$(ARCH) CC=$(CC) CROSS_COMPILE=$(CROSS_COMPILE) olddefconfig < /dev/null; \ + fi kernel: $(Q)$(MAKE) -C $(srctree) ARCH=$(ARCH) CC=$(CC) CROSS_COMPILE=$(CROSS_COMPILE) $(IMAGE_NAME) From patchwork Sun Nov 5 11:35:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Patchwork-Id: 161638 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:8f47:0:b0:403:3b70:6f57 with SMTP id j7csp2078716vqu; Sun, 5 Nov 2023 03:35:35 -0800 (PST) X-Google-Smtp-Source: AGHT+IGGf32Wpp1ntL7GNSAR10ra6LfhUdrYAIymSbXLgldDAS/UtfPQhCwlJJhJNhSk/bUopRsP X-Received: by 2002:a92:c569:0:b0:34f:2756:8fd with SMTP id b9-20020a92c569000000b0034f275608fdmr34217722ilj.9.1699184134922; Sun, 05 Nov 2023 03:35:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699184134; cv=none; d=google.com; s=arc-20160816; b=LyzbIvD6MlERjmgpNTx0kAgjLg2vDrY42jwAeutp+u5Ym77JZglxjWglHf0xDqnC/X PLeUYZR61tvIaOjBzZH0ZtfM9PIcLwUnOz8nuvBkUZ/+8/hKVUD/xGhCaOqc2tQse9Rv SbnlLyYu3AdU7QNoPPsYVd9sAz1IgVZt/nNxpWUDgC/OTdfV+b8fhc0Vq/3b2RQJh0x1 ScIF1y0pkC3qJJU6VlXJ5ALF/oP/IOUX559ghpkySUqEVb95bw1Ge9q6Nogr581vvkpG H2qGir18g5wT66iMoHodzP+WRVzFNL4Zq3TT9hUKHereWq/c8s3n1k0Ty0zUjJKkkk52 KrXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=bsLPDWh17Ciof3rGgE8X5yKonVJvNwfJMgbQkbEYK5w=; fh=JRNmh72HsCuY/8FIVPb28sVny+CmDHBEFeZkZsBPzMc=; b=TMICFGpCTsINwMiOrsomgDnz6Deidhv0YwSLVY+g77n+0+APxoxYmSJwTbU/S4f0Iz degcLWh8e0X3171Wg1YWUyi262sKmNnLHnxyH2jOONnv5RVefJPfLfLlx50+DxwKBdJ3 pI0aemBNwXesPjHuVqcrWY3KkXYgmgL+3PYf7htm/B2B+FSzU4qpTnHK/vuljSLpxTtI wTLDEBPd/et0sHfZ8iBprKwHG5lv5RNe9NKHHCTF2kuTw5VaP22CcOMxcj57x+AYc2O0 oEcd0YB7eHSkYt1cNRTH/exop+pal4sI1kxYOcCg35GHZWOEOjljq1ptc8ZHV2D05Jfm cEMg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@weissschuh.net header.s=mail header.b=TQXfTOvi; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id cf8-20020a056a02084800b005b3bcd9d7f8si6276309pgb.808.2023.11.05.03.35.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Nov 2023 03:35:34 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@weissschuh.net header.s=mail header.b=TQXfTOvi; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 28D8580ADF31; Sun, 5 Nov 2023 03:35:34 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230458AbjKELfY (ORCPT + 34 others); Sun, 5 Nov 2023 06:35:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58220 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230259AbjKELfL (ORCPT ); Sun, 5 Nov 2023 06:35:11 -0500 Received: from todd.t-8ch.de (todd.t-8ch.de [IPv6:2a01:4f8:c010:41de::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 396FEF2; Sun, 5 Nov 2023 03:35:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=weissschuh.net; s=mail; t=1699184103; bh=JMznj9mOW7CN1oWuJEQJDJv9JNNBt8ZPWdQQ6heUErg=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=TQXfTOvi4UfwXiDRBcFkg5309vTVzgWrz0rUXBX6i4cPRvLckKZI0XB9eTr2f9D2l nXAPe+yHJCpCsuYsAgCMZtZ1+8SgfcSTX/nPhpGc3FotkMcPBEKYHq7EWBcNHV/6Z7 6/YmhWRrRVI+P39tlbTrthzvB5rt8REXNh6uxyl8= From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Date: Sun, 05 Nov 2023 12:35:03 +0100 Subject: [PATCH v2 6/6] selftests/nolibc: add configuration for mipso32be MIME-Version: 1.0 Message-Id: <20231105-nolibc-mips-be-v2-6-4ec993cb5407@weissschuh.net> References: <20231105-nolibc-mips-be-v2-0-4ec993cb5407@weissschuh.net> In-Reply-To: <20231105-nolibc-mips-be-v2-0-4ec993cb5407@weissschuh.net> To: Willy Tarreau , Shuah Khan Cc: Zhangjin Wu , linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Mailer: b4 0.12.4 X-Developer-Signature: v=1; a=ed25519-sha256; t=1699184102; l=3924; i=linux@weissschuh.net; s=20221212; h=from:subject:message-id; bh=JMznj9mOW7CN1oWuJEQJDJv9JNNBt8ZPWdQQ6heUErg=; b=e2lPYtGp8wPa8drS+Pws16dnNRxF+v35zT7XNC20bGKTaCuDR3t3uX4E6S541i328LKhkkazb FogZug63MYaB4tBz+mNy4sxa0BcZ7K1qiuLPXDEMkaHDFwZKjzbhqqh X-Developer-Key: i=linux@weissschuh.net; a=ed25519; pk=KcycQgFPX2wGR5azS7RhpBqedglOZVgRPfdFSPB1LNw= X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Sun, 05 Nov 2023 03:35:34 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781723703389513451 X-GMAIL-MSGID: 1781723703389513451 Allow testing MIPS O32 big endian. Signed-off-by: Thomas Weißschuh Acked-by: Willy Tarreau --- tools/testing/selftests/nolibc/Makefile | 7 +++++++ tools/testing/selftests/nolibc/run-tests.sh | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/nolibc/Makefile b/tools/testing/selftests/nolibc/Makefile index 6a1f7f9edf91..508435b8ac2a 100644 --- a/tools/testing/selftests/nolibc/Makefile +++ b/tools/testing/selftests/nolibc/Makefile @@ -48,6 +48,7 @@ ARCH_ppc = powerpc ARCH_ppc64 = powerpc ARCH_ppc64le = powerpc ARCH_mips32le = mips +ARCH_mips32be = mips ARCH := $(or $(ARCH_$(XARCH)),$(XARCH)) # kernel image names by architecture @@ -57,6 +58,7 @@ IMAGE_x86 = arch/x86/boot/bzImage IMAGE_arm64 = arch/arm64/boot/Image IMAGE_arm = arch/arm/boot/zImage IMAGE_mips32le = vmlinuz +IMAGE_mips32be = vmlinuz IMAGE_ppc = vmlinux IMAGE_ppc64 = vmlinux IMAGE_ppc64le = arch/powerpc/boot/zImage @@ -73,6 +75,7 @@ DEFCONFIG_x86 = defconfig DEFCONFIG_arm64 = defconfig DEFCONFIG_arm = multi_v7_defconfig DEFCONFIG_mips32le = malta_defconfig +DEFCONFIG_mips32be = malta_defconfig DEFCONFIG_ppc = pmac32_defconfig DEFCONFIG_ppc64 = powernv_be_defconfig DEFCONFIG_ppc64le = powernv_defconfig @@ -81,6 +84,7 @@ DEFCONFIG_s390 = defconfig DEFCONFIG_loongarch = defconfig DEFCONFIG = $(DEFCONFIG_$(XARCH)) +EXTRACONFIG_mips32be = -d CONFIG_CPU_LITTLE_ENDIAN -e CONFIG_CPU_BIG_ENDIAN EXTRACONFIG = $(EXTRACONFIG_$(XARCH)) # optional tests to run (default = all) @@ -93,6 +97,7 @@ QEMU_ARCH_x86 = x86_64 QEMU_ARCH_arm64 = aarch64 QEMU_ARCH_arm = arm QEMU_ARCH_mips32le = mipsel # works with malta_defconfig +QEMU_ARCH_mips32be = mips QEMU_ARCH_ppc = ppc QEMU_ARCH_ppc64 = ppc64 QEMU_ARCH_ppc64le = ppc64 @@ -115,6 +120,7 @@ QEMU_ARGS_x86 = -M pc -append "console=ttyS0,9600 i8042.noaux panic=-1 $( QEMU_ARGS_arm64 = -M virt -cpu cortex-a53 -append "panic=-1 $(TEST:%=NOLIBC_TEST=%)" QEMU_ARGS_arm = -M virt -append "panic=-1 $(TEST:%=NOLIBC_TEST=%)" QEMU_ARGS_mips32le = -M malta -append "panic=-1 $(TEST:%=NOLIBC_TEST=%)" +QEMU_ARGS_mips32be = -M malta -append "panic=-1 $(TEST:%=NOLIBC_TEST=%)" QEMU_ARGS_ppc = -M g3beige -append "console=ttyS0 panic=-1 $(TEST:%=NOLIBC_TEST=%)" QEMU_ARGS_ppc64 = -M powernv -append "console=hvc0 panic=-1 $(TEST:%=NOLIBC_TEST=%)" QEMU_ARGS_ppc64le = -M powernv -append "console=hvc0 panic=-1 $(TEST:%=NOLIBC_TEST=%)" @@ -139,6 +145,7 @@ CFLAGS_ppc64 = -m64 -mbig-endian -mno-vsx $(call cc-option,-mmultiple) CFLAGS_ppc64le = -m64 -mlittle-endian -mno-vsx $(call cc-option,-mabi=elfv2) CFLAGS_s390 = -m64 CFLAGS_mips32le = -EL -mabi=32 +CFLAGS_mips32be = -EB -mabi=32 CFLAGS_STACKPROTECTOR ?= $(call cc-option,-mstack-protector-guard=global $(call cc-option,-fstack-protector-all)) CFLAGS ?= -Os -fno-ident -fno-asynchronous-unwind-tables -std=c89 -W -Wall -Wextra \ $(call cc-option,-fno-stack-protector) \ diff --git a/tools/testing/selftests/nolibc/run-tests.sh b/tools/testing/selftests/nolibc/run-tests.sh index 8f2c3bc572cb..3a1eaccfbd8d 100755 --- a/tools/testing/selftests/nolibc/run-tests.sh +++ b/tools/testing/selftests/nolibc/run-tests.sh @@ -14,7 +14,7 @@ cache_dir="${XDG_CACHE_HOME:-"$HOME"/.cache}" download_location="${cache_dir}/crosstools/" build_location="$(realpath "${cache_dir}"/nolibc-tests/)" perform_download=0 -archs="i386 x86_64 arm64 arm mips32le ppc ppc64 ppc64le riscv s390 loongarch" +archs="i386 x86_64 arm64 arm mips32le mips32be ppc ppc64 ppc64le riscv s390 loongarch" TEMP=$(getopt -o 'j:d:c:b:a:ph' -n "$0" -- "$@")