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;
From:   Borislav Petkov <bp@alien8.de>
To:     X86 ML <x86@kernel.org>
Cc:     LKML <linux-kernel@vger.kernel.org>,
        Nikolay Borisov <nik.borisov@suse.com>
Subject: [PATCH] x86/ia32: State that IA32 emulation is disabled
Date:   Thu, 30 Nov 2023 16:52:13 +0100
Message-ID: <20231130155213.1407-1-bp@alien8.de>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

From: "Borislav Petkov (AMD)" <bp@alien8.de>

Issue a short message once, on the first try to load a 32-bit process to
save people time when wondering why it won't load and says:

  -bash: ./strsep32: cannot execute binary file: Exec format error

No functional changes.

Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Cc: Nikolay Borisov <nik.borisov@suse.com>
---
 arch/x86/include/asm/elf.h  | 2 +-
 arch/x86/include/asm/ia32.h | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/arch/x86/include/asm/elf.h b/arch/x86/include/asm/elf.h
index a0234dfd1031..1e16bd5ac781 100644
--- a/arch/x86/include/asm/elf.h
+++ b/arch/x86/include/asm/elf.h
@@ -150,7 +150,7 @@ do {						\
 	((x)->e_machine =3D=3D EM_X86_64)
=20
 #define compat_elf_check_arch(x)					\
-	((elf_check_arch_ia32(x) && ia32_enabled()) ||			\
+	((elf_check_arch_ia32(x) && ia32_enabled_verbose()) ||		\
 	 (IS_ENABLED(CONFIG_X86_X32_ABI) && (x)->e_machine =3D=3D EM_X86_64))
=20
 static inline void elf_common_init(struct thread_struct *t,
diff --git a/arch/x86/include/asm/ia32.h b/arch/x86/include/asm/ia32.h
index 5a2ae24b1204..43e02b52ad19 100644
--- a/arch/x86/include/asm/ia32.h
+++ b/arch/x86/include/asm/ia32.h
@@ -2,7 +2,6 @@
 #ifndef _ASM_X86_IA32_H
 #define _ASM_X86_IA32_H
=20
-
 #ifdef CONFIG_IA32_EMULATION
=20
 #include <linux/compat.h>
@@ -84,4 +83,12 @@ static inline bool ia32_enabled(void)
=20
 #endif
=20
+static inline bool ia32_enabled_verbose(void)
+{
+#ifdef CONFIG_IA32_EMULATION
+	pr_notice_once("32-bit emulation disabled. You can reenable with ia32_e=
mulation=3Don\n");
+#endif
+	return ia32_enabled();
+}
+
 #endif /* _ASM_X86_IA32_H */
--=20
2.42.0.rc0.25.ga82fb66fed25