From patchwork Thu Aug 22 07:13:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Leroy X-Patchwork-Id: 13772839 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 825C9C3DA4A for ; Thu, 22 Aug 2024 07:15:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 810B680016; Thu, 22 Aug 2024 03:15:02 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7962580012; Thu, 22 Aug 2024 03:15:02 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5E86380016; Thu, 22 Aug 2024 03:15:02 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 3751C80012 for ; Thu, 22 Aug 2024 03:15:02 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id EB51112141D for ; Thu, 22 Aug 2024 07:15:01 +0000 (UTC) X-FDA: 82479019602.03.F518EE4 Received: from pegase2.c-s.fr (pegase2.c-s.fr [93.17.235.10]) by imf06.hostedemail.com (Postfix) with ESMTP id A2F12180004 for ; Thu, 22 Aug 2024 07:14:59 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=csgroup.eu; spf=pass (imf06.hostedemail.com: domain of christophe.leroy@csgroup.eu designates 93.17.235.10 as permitted sender) smtp.mailfrom=christophe.leroy@csgroup.eu ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1724310809; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tWKrp512V31tWku8K/xJg7PzthyMYDtDCWjizHCsvmU=; b=mSFNQao7yeWWNbi/HigWcmdQjxOse1JrsFTgquE4b4ZV+0dF2X5DyFWghrMBZDcLCpefVG K5h2vA7ng9WCpgirAicGh9Q4Ilz+mqD4B4c2G3Oc1f/5xdATJZY6F2quNfs7PmpTn5LCP8 2YZrOgksIzbq6bjVbaGQQIy7RvipIvI= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1724310810; a=rsa-sha256; cv=none; b=YKq/G4Vl07RpNUj0/SkJ2O9HTnRjifCz9pUAp/RUyUKasHjj3kUFElacORHKr0ZucoL7Do 1hZ43P47D3D2KddreBsoSvd+hPMjP1+FbmWOU+lHKCrSSt5XJExyvCILEtfnooG5Dg0FS/ U3pLcBRpjQD+YSW73LqKGS4LVvvzY0U= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=csgroup.eu; spf=pass (imf06.hostedemail.com: domain of christophe.leroy@csgroup.eu designates 93.17.235.10 as permitted sender) smtp.mailfrom=christophe.leroy@csgroup.eu Received: from localhost (mailhub3.si.c-s.fr [172.26.127.67]) by localhost (Postfix) with ESMTP id 4WqDvQ4rYFz9sT7; Thu, 22 Aug 2024 09:13:38 +0200 (CEST) X-Virus-Scanned: amavisd-new at c-s.fr Received: from pegase2.c-s.fr ([172.26.127.65]) by localhost (pegase2.c-s.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id n4SVLNdodNdx; Thu, 22 Aug 2024 09:13:38 +0200 (CEST) Received: from messagerie.si.c-s.fr (messagerie.si.c-s.fr [192.168.25.192]) by pegase2.c-s.fr (Postfix) with ESMTP id 4WqDvQ3xMdz9sSy; Thu, 22 Aug 2024 09:13:38 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 73F9A8B77E; Thu, 22 Aug 2024 09:13:38 +0200 (CEST) X-Virus-Scanned: amavisd-new at c-s.fr Received: from messagerie.si.c-s.fr ([127.0.0.1]) by localhost (messagerie.si.c-s.fr [127.0.0.1]) (amavisd-new, port 10023) with ESMTP id HFEB0Yp4iArX; Thu, 22 Aug 2024 09:13:38 +0200 (CEST) Received: from PO20335.idsi0.si.c-s.fr (PO16920.IDSI0.si.c-s.fr [192.168.232.181]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 6065C8B77D; Thu, 22 Aug 2024 09:13:37 +0200 (CEST) From: Christophe Leroy To: Michael Ellerman , Nicholas Piggin , Christophe Leroy , Naveen N Rao , Andy Lutomirski , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , "Theodore Ts'o" , "Jason A. Donenfeld" , Arnd Bergmann , Andrew Morton , Steven Rostedt , Masami Hiramatsu , Mathieu Desnoyers , Vincenzo Frascino , Shuah Khan Cc: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-arch@vger.kernel.org, linux-mm@kvack.org, linux-trace-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [PATCH v2 15/17] selftests: vdso: Fix build of test_vdso_chacha Date: Thu, 22 Aug 2024 09:13:23 +0200 Message-ID: <50cc36936b310d8dd6d7539c552cc8dd84052020.1724309198.git.christophe.leroy@csgroup.eu> X-Mailer: git-send-email 2.44.0 In-Reply-To: References: MIME-Version: 1.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1724310795; l=3948; i=christophe.leroy@csgroup.eu; s=20211009; h=from:subject:message-id; bh=myEwghlIo0VFEa/kCbUR8jkMcaOa8Dz8PO/V1GnGZDU=; b=3pzQ86+owF0quZVMNfNkNt1pF9agoztEqTpacb3+y5tzmYnNz4M7kg6ndA6tudWCTTaQ+v5Ls uth/LEL3EsrDJl98Nr2BREqhGR2wN0QN52ZMiThEVDzt+0TzB1GKIi/ X-Developer-Key: i=christophe.leroy@csgroup.eu; a=ed25519; pk=HIzTzUj91asvincQGOFx6+ZF5AoUuP9GdOtQChs7Mm0= X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: A2F12180004 X-Stat-Signature: 1njdrnnix1hokbfd616y696tgnpe3pjd X-Rspam-User: X-HE-Tag: 1724310899-835222 X-HE-Meta: U2FsdGVkX1/ACE2x/+/VAR3eopQVpAdQJ0i6gzpC3ulkymobfEPiPNDVqpBSl7n42UT0SyEmuyO7fBswddZxzuBmSRX/9vM8rqgyZGu2OogBjXN56AXEDGeOb/W3HL2bnchGfCXL0KjlJ6Y7AeUpX6YlLGfdfsYgFoMMFcXsgZBql64IBJDm5Gg9pW0YcEZVdrTlawKi+OHih9M6uMeoSmmg9Jao4W1r8F3eMBu9UCAAW5qtrvmaCnJ4LbJVlelLxkYMLqMHPJ9xI2g3eaxSNrOIQWTFvhV+atNRqBzhoYTE/kUlymXnnkAF3P1xZrwlAAMlP6GSZfiWRqdDBmWVDnr1NmMQm2MMsjDUgYcufnjy7fjiTDjcjt+HYSsMnK3GQUZ4wH+J9kdGukZV2yIJMm6rzZgOL71h8H/OVBZ1S+ShEKWFX4fEpM3o9SaEOm4JsRYTP+BzTpW7uGoI4Wwe2cgcbDsWN5WQru+/W3H9jSuKTvTaUexYpsUxMK51VurW0R5y9ZguXsB5GSYngBaI+niA5UIIbF8XDLgerJbFzwaVRzLb0390OQ9bzEmDBCZ5L5cJprlSxlNsFNslgdSGm8ssp3eKwqe1f/BWDLsGyBXJly2CiGjEBmUBU6OMKcDDzvmSs75o2wEh4Yckitm+/LBEK+/wQ4pN6uSDHh22130ywciRdZIqtUX/6NhKSizoDfD5IWXu8Te7MQrN+pEG3aXWiiSyoA7LmROS4boLXfT1ti6dytCVrJT1TXxnZJ6pO1jb4cfs8nEYQv2DLaz3bXU8trDad+GdVZqviGXo6v8yF3hiU5WJWCFMgP0SXt/8HqOWwSr8wXUVcPDiyVL4+ytoy3zKaVyLi+uTWtMOGrawMIo/ihqCoWpeGyGhoERCxd5tQqEZ1hjQ8bf76ugxs7AU4KKpAUOaMIxl39G8BVztdQSFFcm9H1INIyEeF/8EO26lXQEIVpM+AUuumpB BPvVkIaN chUWnBIZ7A5/TouMFMzQk9wDwuTc1T5akbZKoRZrX1+raR+AngYv5L01ChOOR60DUrOr8w9nf3I1LMl2+yhK7LI7OG+G42If55xMEZQop6+VsW0S8Ew1lVk1o9vI8R/llOkRPx1f/Zrwn/wUYA0uGRRCfyHeU1VoN2pUC8I4R2Y4Y4S8= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Building test_vdso_chacha on powerpc leads to following issue: In file included from /home/chleroy/linux-powerpc/include/linux/limits.h:7, from /opt/powerpc64-e5500--glibc--stable-2024.02-1/powerpc64-buildroot-linux-gnu/sysroot/usr/include/bits/local_lim.h:38, from /opt/powerpc64-e5500--glibc--stable-2024.02-1/powerpc64-buildroot-linux-gnu/sysroot/usr/include/bits/posix1_lim.h:161, from /opt/powerpc64-e5500--glibc--stable-2024.02-1/powerpc64-buildroot-linux-gnu/sysroot/usr/include/limits.h:195, from /opt/powerpc64-e5500--glibc--stable-2024.02-1/lib/gcc/powerpc64-buildroot-linux-gnu/12.3.0/include-fixed/limits.h:203, from /opt/powerpc64-e5500--glibc--stable-2024.02-1/lib/gcc/powerpc64-buildroot-linux-gnu/12.3.0/include-fixed/syslimits.h:7, from /opt/powerpc64-e5500--glibc--stable-2024.02-1/lib/gcc/powerpc64-buildroot-linux-gnu/12.3.0/include-fixed/limits.h:34, from /tmp/sodium/usr/local/include/sodium/export.h:7, from /tmp/sodium/usr/local/include/sodium/crypto_stream_chacha20.h:14, from vdso_test_chacha.c:6: /opt/powerpc64-e5500--glibc--stable-2024.02-1/powerpc64-buildroot-linux-gnu/sysroot/usr/include/bits/xopen_lim.h:99:6: error: missing binary operator before token "(" 99 | # if INT_MAX == 32767 | ^~~~~~~ /opt/powerpc64-e5500--glibc--stable-2024.02-1/powerpc64-buildroot-linux-gnu/sysroot/usr/include/bits/xopen_lim.h:102:7: error: missing binary operator before token "(" 102 | # if INT_MAX == 2147483647 | ^~~~~~~ /opt/powerpc64-e5500--glibc--stable-2024.02-1/powerpc64-buildroot-linux-gnu/sysroot/usr/include/bits/xopen_lim.h:126:6: error: missing binary operator before token "(" 126 | # if LONG_MAX == 2147483647 | ^~~~~~~~ This is due to kernel include/linux/limits.h being included instead of libc's limits.h This is because directory include/ is added through option -isystem so it goes prior to glibc's include directory. Replace -isystem by -idirafter But this implies that now tools/include/linux/linkage.h is included instead of include/linux/linkage.h, so define a stub for SYM_FUNC_START() and SYM_FUNC_END(). Signed-off-by: Christophe Leroy --- tools/include/linux/linkage.h | 4 ++++ tools/testing/selftests/vDSO/Makefile | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/include/linux/linkage.h b/tools/include/linux/linkage.h index bc763d500262..a48ff086899c 100644 --- a/tools/include/linux/linkage.h +++ b/tools/include/linux/linkage.h @@ -1,4 +1,8 @@ #ifndef _TOOLS_INCLUDE_LINUX_LINKAGE_H #define _TOOLS_INCLUDE_LINUX_LINKAGE_H +#define SYM_FUNC_START(x) .globl x; x: + +#define SYM_FUNC_END(x) + #endif /* _TOOLS_INCLUDE_LINUX_LINKAGE_H */ diff --git a/tools/testing/selftests/vDSO/Makefile b/tools/testing/selftests/vDSO/Makefile index c9a819cacbf2..10ffdda3f2fa 100644 --- a/tools/testing/selftests/vDSO/Makefile +++ b/tools/testing/selftests/vDSO/Makefile @@ -42,7 +42,7 @@ $(OUTPUT)/vdso_test_getrandom: CFLAGS += -isystem $(top_srcdir)/tools/include \ $(OUTPUT)/vdso_test_chacha: $(top_srcdir)/tools/arch/$(ARCH)/vdso/vgetrandom-chacha.S $(OUTPUT)/vdso_test_chacha: CFLAGS += -idirafter $(top_srcdir)/tools/include \ - -isystem $(top_srcdir)/arch/$(ARCH)/include \ - -isystem $(top_srcdir)/include \ + -idirafter $(top_srcdir)/arch/$(ARCH)/include \ + -idirafter $(top_srcdir)/include \ -D__ASSEMBLY__ -DBULID_VDSO -DCONFIG_FUNCTION_ALIGNMENT=0 \ -Wa,--noexecstack $(SODIUM)