linux-kernel - [PATCH 18/20] x86/smap: Use alternative_io() in smap

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <1f39866bca670a7d0087febee29ab5061b8f9fef.1741988314.git.jpoimboe@kernel.org>
Date: Fri, 14 Mar 2025 14:41:31 -0700
From: Josh Poimboeuf <jpoimboe@...nel.org>
To: x86@...nel.org
Cc: linux-kernel@...r.kernel.org,
	Linus Torvalds <torvalds@...ux-foundation.org>,
	Peter Zijlstra <peterz@...radead.org>,
	Borislav Petkov <bp@...en8.de>,
	"H. Peter Anvin" <hpa@...or.com>,
	Uros Bizjak <ubizjak@...il.com>,
	Andrew Cooper <andrew.cooper3@...rix.com>,
	Ingo Molnar <mingo@...nel.org>
Subject: [PATCH 18/20] x86/smap: Use alternative_io() in smap_{save,restore}()

Use the standard alternative_io() interface.

Signed-off-by: Josh Poimboeuf <jpoimboe@...nel.org>
---
 arch/x86/include/asm/smap.h | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/arch/x86/include/asm/smap.h b/arch/x86/include/asm/smap.h
index 60ea21b4c8b7..8b77ddcb37e7 100644
--- a/arch/x86/include/asm/smap.h
+++ b/arch/x86/include/asm/smap.h
@@ -39,20 +39,22 @@ static __always_inline unsigned long smap_save(void)
 {
 	unsigned long flags;
 
-	asm volatile ("# smap_save\n\t"
-		      ALTERNATIVE("",
-				  "pushf; pop %[flags]; clac\n\t", X86_FEATURE_SMAP)
-		      : [flags] "=rm" (flags) : : "memory", "cc");
+	alternative_io("",
+		       "pushf; pop %[flags]; clac\n\t", X86_FEATURE_SMAP,
+		       ARG([flags] "=rm" (flags)),
+		       ARG(),
+		       ARG("memory", "cc"));
 
 	return flags;
 }
 
 static __always_inline void smap_restore(unsigned long flags)
 {
-	asm volatile ("# smap_restore\n\t"
-		      ALTERNATIVE("",
-				  "push %[flags]; popf\n\t", X86_FEATURE_SMAP)
-		      : : [flags] "g" (flags) : "memory", "cc");
+	alternative_io("",
+		       "push %[flags]; popf\n\t", X86_FEATURE_SMAP,
+		       ARG(),
+		       ARG([flags] "g" (flags)),
+		       ARG("memory", "cc"));
 }
 
 /* These macros can be used in asm() statements */
-- 
2.48.1