Received-SPF: pass (google.com: domain of linux-kernel+bounces-197381-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
From: John Hubbard <jhubbard@nvidia.com>
To: Shuah Khan <shuah@kernel.org>
Cc: angquan yu <angquan21@gmail.com>,
	"Kirill A . Shutemov" <kirill.shutemov@linux.intel.com>,
	Ingo Molnar <mingo@kernel.org>,
	Binbin Wu <binbin.wu@linux.intel.com>,
	Alexey Dobriyan <adobriyan@gmail.com>,
	Rick Edgecombe <rick.p.edgecombe@intel.com>,
	Sohil Mehta <sohil.mehta@intel.com>,
	Yu-cheng Yu <yu-cheng.yu@intel.com>,
	Dave Hansen <dave.hansen@linux.intel.com>,
	Muhammad Usama Anjum <usama.anjum@collabora.com>,
	Valentin Obst <kernel@valentinobst.de>,
	linux-kselftest@vger.kernel.org,
	LKML <linux-kernel@vger.kernel.org>,
	llvm@lists.linux.dev,
	x86@kernel.org,
	John Hubbard <jhubbard@nvidia.com>
Subject: [PATCH v3 4/7] selftests/x86: build sysret_rip.c with clang
Date: Fri, 31 May 2024 12:38:35 -0700
Message-ID: <20240531193838.108454-5-jhubbard@nvidia.com>
In-Reply-To: <20240531193838.108454-1-jhubbard@nvidia.com>
References: <20240531193838.108454-1-jhubbard@nvidia.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?us-ascii?Q?1lzfvi86/FlpeuPQlVzXYMHjVdl0oU30EyQHMJkKag9Co3s3KPz0X9levqmB?=
 =?us-ascii?Q?yVosz30cEOa1DBPKGhd5DUxeJdcB3YA6jAvMdSJE5rLNq3DWGVvZsfvsfnne?=
 =?us-ascii?Q?kzD/Gc07kUfqOBk7hW88MDiXdclIdkVBtRRzdeD8KrfQKpaKrc+gCZomoE9u?=
 =?us-ascii?Q?DfexIOj0LcGCeMvhnl6ZB+bOnAEIeGYUDwMLeuHW2x/pcGWSJzHZOLrHOgET?=
 =?us-ascii?Q?DYOMJFMW0K5Lz9PYOKY7YXWlq6h09/lzRMEycCOnQZ133muyrlXzbx+hQQhN?=
 =?us-ascii?Q?qH/ystjH+2vk8AQZrlDNir6lujYQomyAgrBcuCjxyJe8nDcQ7H0bPeXOw6Xg?=
 =?us-ascii?Q?QpF54s6KUFhb/Eoz9eQT/9l00Nj886hbUzxrNa3B3dX0jOcTB8jSVsVzghoL?=
 =?us-ascii?Q?194UVf3Cra+/V6KELwcvnfmW4M5AwTrrq49XQrRF/2BSZZjx5pTU4jFL0rVm?=
 =?us-ascii?Q?G4UiNGkACGGn9/rFktzEgje8xDa2DulN/Lgf+ltCvkbqXglRUWl4Pk3FxTvF?=
 =?us-ascii?Q?gsVT+gtyniPxs1Lbeyt92HjHNkbH7e40gOapDbDe+cpXNWEckgr6l/AtoAzx?=
 =?us-ascii?Q?BtVjJCBUocD0ojMCTSwaShQkO7AmMM6F+CJfbGBiugPf5/fz/sKwIvS1v659?=
 =?us-ascii?Q?arCq2+Xz73UklT23JVT+IKlFqo2z4tDPZfETft51plotOfi12RRIvVl0tdIS?=
 =?us-ascii?Q?I0XdpiM5w0WJP24XmA+lUz+GzCfxKjKLyYvHb8/Q6u78FKCajl18zad3XSgg?=
 =?us-ascii?Q?1Fc5JuQT79TSvPBzTBSMc7hXN97mGSumlREqVEzask9P3FHhls89QwAPrftx?=
 =?us-ascii?Q?E6UQKHIOWxGEiKocQectCjQaeiS3HWsIGtvhzwVnRsVVmbz3RT7bt78dxFgH?=
 =?us-ascii?Q?EcINfIaOJyZfn290nemLoBpl0dvtzyd2dyW2tiGGbfmBoH8DqDlYDrkzUynB?=
 =?us-ascii?Q?A73eCSPa9N1Jks/7O4YA64SJYdgaDliQDTYomjej/vQZ3FrARzNywKrpV89x?=
 =?us-ascii?Q?7Fnx02R6YYYlp0Hhd8hjs2m/ZjFwN3VdxP806sUBPN5IZ3YUqSY3kC9BRIPb?=
 =?us-ascii?Q?qYxgHoq/xWeldoarJ+auPfP4X84UmI5WuKdSSBVjYAcLq5Hq8+DR9j1zXlNQ?=
 =?us-ascii?Q?LFTHaTlEofEWXqdIbn+enxkYz4SpRDlZur84UGACvg3xg19fDekeEeUDr6GR?=
 =?us-ascii?Q?Rypuh90YR4cMHKktdUcC6wF6DlUZuUVBA5aENnQFxlhxmXq7eBDuB1MiqUw7?=
 =?us-ascii?Q?3j1//hpwR1YKONgEtj7go9kTWmhCISGVPY0eBsCQ6+I2TWpm2dfroSLDsPtt?=
 =?us-ascii?Q?lPJH0FjlqG29NP5m3MC+g5OrE77ZqOuYmxEJEtZ1iVMp1P5R9fyUSu3sZeVC?=
 =?us-ascii?Q?fIq0/TRyK522Bc8MCIMQPb4/hxlmRfGs3utp2tcFVAmwZAYyFqYG/wkSEpal?=
 =?us-ascii?Q?dCeluvUJR5gyLokXWkFJ7jCeomJrz2vELrj6bCuu9fe3opU3DpAyNEvwHjCs?=
 =?us-ascii?Q?a1uaegN+wzi+GXIbzGTiJOgD492ZH6s2+di12gFbMVj3J6A0O8xHMOy12avX?=
 =?us-ascii?Q?jTimR8T200RdzHOqXbYjpLnqgKiVIHFtvzG7mhl4?=
X-OriginatorOrg: Nvidia.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 729b9ecf-a275-4fe8-b3b7-08dc81a94767
X-MS-Exchange-CrossTenant-AuthSource: BY5PR12MB4130.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 May 2024 19:38:42.7901
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: EvW7Hb3uRG2KZIuo/OQPjtyXAuLUHe/cJAXEvpJbTV7XNj6hAyrymJG/LpsoIO3k+iTszBRi5s66u9yAnopvYg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB7712

When building with clang, via:

    make LLVM=1 -C tools/testing/selftests

...the build fails because clang's inline asm doesn't support all of the
features that are used in the asm() snippet in sysret_rip.c.

Fix this by moving the asm code into the clang_helpers_64.S file, where
it can be built with the assembler's full set of features.

Signed-off-by: John Hubbard <jhubbard@nvidia.com>
---
 tools/testing/selftests/x86/Makefile          |  1 +
 .../testing/selftests/x86/clang_helpers_64.S  | 16 +++++++++++++++
 tools/testing/selftests/x86/sysret_rip.c      | 20 ++++++-------------
 3 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/tools/testing/selftests/x86/Makefile b/tools/testing/selftests/x86/Makefile
index 99bc2ef84f5a..d0bb32bd5538 100644
--- a/tools/testing/selftests/x86/Makefile
+++ b/tools/testing/selftests/x86/Makefile
@@ -115,6 +115,7 @@ $(eval $(call extra-files,ptrace_syscall_32,raw_syscall_helper_32.S))
 $(eval $(call extra-files,test_syscall_vdso_32,thunks_32.S))
 $(eval $(call extra-files,fsgsbase_restore_64,clang_helpers_64.S))
 $(eval $(call extra-files,fsgsbase_restore_32,clang_helpers_32.S))
+$(eval $(call extra-files,sysret_rip_64,clang_helpers_64.S))
 
 # check_initial_reg_state is special: it needs a custom entry, and it
 # needs to be static so that its interpreter doesn't destroy its initial
diff --git a/tools/testing/selftests/x86/clang_helpers_64.S b/tools/testing/selftests/x86/clang_helpers_64.S
index 0d81c71cad97..185a69dbf39c 100644
--- a/tools/testing/selftests/x86/clang_helpers_64.S
+++ b/tools/testing/selftests/x86/clang_helpers_64.S
@@ -9,4 +9,20 @@ dereference_seg_base:
 	mov %gs:(0), %rax
 	ret
 
+.global test_page
+.global test_syscall_insn
+
+.pushsection ".text", "ax"
+.balign 4096
+test_page: .globl test_page
+	.fill 4094,1,0xcc
+
+test_syscall_insn:
+	syscall
+
+.ifne . - test_page - 4096
+	.error "test page is not one page long"
+.endif
+.popsection
+
 .section .note.GNU-stack,"",%progbits
diff --git a/tools/testing/selftests/x86/sysret_rip.c b/tools/testing/selftests/x86/sysret_rip.c
index 84d74be1d902..b30de9aaa6d4 100644
--- a/tools/testing/selftests/x86/sysret_rip.c
+++ b/tools/testing/selftests/x86/sysret_rip.c
@@ -22,21 +22,13 @@
 #include <sys/mman.h>
 #include <assert.h>
 
-
-asm (
-	".pushsection \".text\", \"ax\"\n\t"
-	".balign 4096\n\t"
-	"test_page: .globl test_page\n\t"
-	".fill 4094,1,0xcc\n\t"
-	"test_syscall_insn:\n\t"
-	"syscall\n\t"
-	".ifne . - test_page - 4096\n\t"
-	".error \"test page is not one page long\"\n\t"
-	".endif\n\t"
-	".popsection"
-    );
-
+/*
+ * These items are in clang_helpers_64.S, in order to avoid clang inline asm
+ * limitations:
+ */
+void test_syscall_ins(void);
 extern const char test_page[];
+
 static void const *current_test_page_addr = test_page;
 
 static void sethandler(int sig, void (*handler)(int, siginfo_t *, void *),
-- 
2.45.1