Received-SPF: pass (google.com: domain of linux-kernel+bounces-197380-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 3/7] selftests/x86: build fsgsbase_restore.c with clang
Date: Fri, 31 May 2024 12:38:34 -0700
Message-ID: <20240531193838.108454-4-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?r/EPgmt8j3KggWG+L4lY0sOTlnbjPNzLXrxQRJ9zNtL/1pNzf3po7GAX4USR?=
 =?us-ascii?Q?T2OMt8vgBWve/WYGPAILzsJqDtbLsEBjJRnfYK1PAlyf+UKJ/pQT1T1q5+02?=
 =?us-ascii?Q?o76NSl287G+ooMyvh7qZaS39N0t94t6mTfaQdNGf85eNmMiXDfnVw7iL0nUG?=
 =?us-ascii?Q?apZ03t8zRMQQmMVJqhA5qaoog04yZiO3Hh5kpuGEik+L+IjN0CYj5d1q4V6g?=
 =?us-ascii?Q?67j73213Qbm6ZH8OCNh4MyiszCZ3LIK+EWhLe+tqlA9hGnup+LKj9s6n1+xJ?=
 =?us-ascii?Q?26bpArYJk1p8WD7322knQUPRfSWn8VqQY/m+xLquXsGJrS2V/8sggxHj/vnn?=
 =?us-ascii?Q?ugB6Lj7TZ1WvIQaUeW38o/hcqsIf4uC5VdKjy02k2QuLYCtPYecgihrV+5oT?=
 =?us-ascii?Q?+hZVREOEuayYFZJp8Igvtabq5ALLI74PyE3ImhIZDRSMMYGYKonaWByPaGpA?=
 =?us-ascii?Q?Bi0n4RUYJJVlvVcJCFK4Nu0mj2/unNc22R0Eijpml2G8W1tKlor7gF9n3XzX?=
 =?us-ascii?Q?FUIQU6ReGUblmknJvmm13Ca8ZreJCBm4jY+mza1H0asTnVaQluU9KPhEeQfo?=
 =?us-ascii?Q?3atjgDD633Oc9fOvH1hvSepB+q3AyXa/KNeecANKB1XBMHRrFesGNrsowtD3?=
 =?us-ascii?Q?GolDhKsJdLlgOFapDdXhdTa+Zrmd8SShdMdrIrLaGhckW8yr9+BFClQ8gLFj?=
 =?us-ascii?Q?jvyRf9c5O6OoGeSt11OqisOxL/r9uwdPdFI6AxPLOX7Bgbln+f3WPsxj9b63?=
 =?us-ascii?Q?1y2kCC/ZkGBF1vosaZg0ijR80pQ4TnA78eajgJN3kUtv+D1S7ChMV2GwbhuY?=
 =?us-ascii?Q?RUMqqbNrVMea9LEv+Q2WxTj+P6gKIPhqzRo600PdaMgoh35m3wv2tG1WdhAA?=
 =?us-ascii?Q?h50+8K+hkYEWJBJBE/FWjZ0jBfG5xiYT0U9pbBLVIBQHAllYxBIid0xIYDbQ?=
 =?us-ascii?Q?tzCzA6AYHYhPrdELVwWpVWhVGgmnbNhs7axBsgzJ4LTXB32QG4/NyFmgdU6j?=
 =?us-ascii?Q?yzEPPDtiglYfH37teBl9ByphWCMgGSab401k05syOIx2qrbSJ8fauo9AZkN6?=
 =?us-ascii?Q?xQCHx71S1cEpkQeirx4HsLqeRY1yVnHR4Hc+FcHMV0qyL7fc14eHiU0w2qyg?=
 =?us-ascii?Q?Jvnrw61xAM25AYIirksj0hj03sCJHC9mEb4DXnVLGGTJgPCszoVMgzCHG967?=
 =?us-ascii?Q?7Hoev3O6Tuvr+TVyHsOZrDL5i2gb5Hu4SdlCsVaFPFW6NgIubXX+5IinyCb3?=
 =?us-ascii?Q?HdEicLcaUl/cFH1teYW/KkwQzbLMlEwrVisoMaIy1tjrdp0Km8REQbzhtAgv?=
 =?us-ascii?Q?rQDxM3Czl/qDBaTKuYNvbnnTkDKRfCMW/B6hp45YOvMQPT6rCpzyxBvhjTNL?=
 =?us-ascii?Q?phDD/kNr/QiyDcqVSJoutebiQ2QK0Cp9I3ZEmF2NpfQfxK/gjwumEJFmH7vq?=
 =?us-ascii?Q?/WJssT79+rKpLTwZ9Dpd/PykkX07g2UybUHEqGXpihpcGj6V/7GK+kyGOo46?=
 =?us-ascii?Q?/AaD1MzQJZV2FpfHDehRL9kQJ1Zt8boVB4dC5h3M1g+M9Umi0mYcmfTE04Yx?=
 =?us-ascii?Q?M+3GqAHEuiBGR3T4n9E3Dd1xZgkk9VG3mYVmEXG7?=
X-OriginatorOrg: Nvidia.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 41ec0ea3-9747-4a06-4d20-08dc81a94726
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.3617
 (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: Rz/TvqQZPWRsrcDomN7e6KpAjq7Knvl1XKZj3YHQt4wBAaljqJT8kBP8eul2+sTBttnt5Gj2DpylX3fITAcNRg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB7712

When building with clang, via:

    make LLVM=1 -C tools/testing/selftests

Fix this by moving the inline asm to "pure" assembly, in two new files:
clang_helpers_32.S, clang_helpers_64.S.

As a bonus, the pure asm avoids the need for ifdefs, and is now very
simple and easy on the eyes.

Signed-off-by: John Hubbard <jhubbard@nvidia.com>
---
 tools/testing/selftests/x86/Makefile           |  2 ++
 tools/testing/selftests/x86/clang_helpers_32.S | 11 +++++++++++
 tools/testing/selftests/x86/clang_helpers_64.S | 12 ++++++++++++
 tools/testing/selftests/x86/fsgsbase_restore.c | 11 +++++------
 4 files changed, 30 insertions(+), 6 deletions(-)
 create mode 100644 tools/testing/selftests/x86/clang_helpers_32.S
 create mode 100644 tools/testing/selftests/x86/clang_helpers_64.S

diff --git a/tools/testing/selftests/x86/Makefile b/tools/testing/selftests/x86/Makefile
index c1269466e0f8..99bc2ef84f5a 100644
--- a/tools/testing/selftests/x86/Makefile
+++ b/tools/testing/selftests/x86/Makefile
@@ -113,6 +113,8 @@ endef
 $(eval $(call extra-files,sysret_ss_attrs_64,thunks.S))
 $(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))
 
 # 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_32.S b/tools/testing/selftests/x86/clang_helpers_32.S
new file mode 100644
index 000000000000..dc16271bac70
--- /dev/null
+++ b/tools/testing/selftests/x86/clang_helpers_32.S
@@ -0,0 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ * 32-bit assembly helpers for asm operations that lack support in both gcc and
+ * clang. For example, clang asm does not support segment prefixes.
+ */
+.global dereference_seg_base
+dereference_seg_base:
+	mov %fs:(0), %eax
+	ret
+
+.section .note.GNU-stack,"",%progbits
diff --git a/tools/testing/selftests/x86/clang_helpers_64.S b/tools/testing/selftests/x86/clang_helpers_64.S
new file mode 100644
index 000000000000..0d81c71cad97
--- /dev/null
+++ b/tools/testing/selftests/x86/clang_helpers_64.S
@@ -0,0 +1,12 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ * 64-bit assembly helpers for asm operations that lack support in both gcc and
+ * clang. For example, clang asm does not support segment prefixes.
+ */
+.global dereference_seg_base
+
+dereference_seg_base:
+	mov %gs:(0), %rax
+	ret
+
+.section .note.GNU-stack,"",%progbits
diff --git a/tools/testing/selftests/x86/fsgsbase_restore.c b/tools/testing/selftests/x86/fsgsbase_restore.c
index 6fffadc51579..224058c1e4b2 100644
--- a/tools/testing/selftests/x86/fsgsbase_restore.c
+++ b/tools/testing/selftests/x86/fsgsbase_restore.c
@@ -39,12 +39,11 @@
 # define SEG "%fs"
 #endif
 
-static unsigned int dereference_seg_base(void)
-{
-	int ret;
-	asm volatile ("mov %" SEG ":(0), %0" : "=rm" (ret));
-	return ret;
-}
+/*
+ * Defined in clang_helpers_[32|64].S, because unlike gcc, clang inline asm does
+ * not support segmentation prefixes.
+ */
+unsigned int dereference_seg_base(void);
 
 static void init_seg(void)
 {
-- 
2.45.1