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;
Message-ID: <e485409f-150d-4138-a030-c19041f0fc8f@suse.com>
Date:   Thu, 30 Nov 2023 18:00:16 +0200
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH] x86/ia32: State that IA32 emulation is disabled
Content-Language: en-US
To:     Borislav Petkov <bp@alien8.de>, X86 ML <x86@kernel.org>
Cc:     LKML <linux-kernel@vger.kernel.org>
References: <20231130155213.1407-1-bp@alien8.de>
From:   Nikolay Borisov <nik.borisov@suse.com>
In-Reply-To: <20231130155213.1407-1-bp@alien8.de>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?eG5MQlUvMk03MlN3ZE5xUkxnTmQ4SVl2VmsxMy9KQlcwY0pyeFhxV3V1Q0gy?=
 =?utf-8?B?ZUxmWjBWWXpkeUFsc1RMVW9INWJYUW5HVDdEekRuUjZodW1nSFppMUJKL0Yz?=
 =?utf-8?B?ZW9OTnV2cTkrZlFVUXh4NXNjQXg1TUZlNjBURjF4bVI0MnFHOHd2TjFwalJX?=
 =?utf-8?B?WTQyWDFBbVdiQ08vaU9DQnRYaEhSSVNoVzUvQUVBamdWUDF4NUxacE1HT1lP?=
 =?utf-8?B?ZlZ0QTJCZVlPd1NDdEVReFB5YTJKS0dSdU85ZmN6bURWZWEvWWNHTTFpaS9C?=
 =?utf-8?B?WDE2cWpoZFlMQXVIcVE5V3dRODFYTTRIK2NCcTRQS2NIS2dvTHc3WmthSmM2?=
 =?utf-8?B?ZFhUQWVsNHd3RktNSzEvVTViVU9aYlFaOUtWWFZDN3pYY0Njd21ISVNKVklk?=
 =?utf-8?B?Ky9EMzZzWlUvREhwVXMwMHZESTVKSDd1TU5oQ1BKTGVBdS8wbVA1d1E5VG5B?=
 =?utf-8?B?RDltVmNzZHpsTU9uUXVzZmIyZlVSdXVGVGpzU0xUVlVldzE4NHkyMExzRVRh?=
 =?utf-8?B?Yk95SkEwMHNUYzBSY3JCU1hQTXhCTmcyZ2dsV0I2SjRkVSt6L1VOTEFsSzRO?=
 =?utf-8?B?V0t3a3hoMUM0K3BWN3JpRDcyMnNRVFRZSyt4TkVMSnhMWnV3VE9rVGNJMi84?=
 =?utf-8?B?a2RKdFp0QVVBcEw3RDVXbURLMmFPdUI3ZHhZeStORjhPUDBMSEthVFVETWZR?=
 =?utf-8?B?T000Q3Joa0JGYzgrWWkzb2U1N2llSlkxWG9seURraFpOaUphcGgrTXdCd1hW?=
 =?utf-8?B?ZG8rUU9FZllIR2x4ZnlxTHE5dHlZT3RNZU1hQXMwM1IwM0Q3Y3cwR1pzVlpD?=
 =?utf-8?B?dWdsTVVxU21OVHJvZzN4T1ZETk4rSTdPckpGcUFTN2U4QWdsdzNvZ1BOSURu?=
 =?utf-8?B?M3NuTittbGVhNFo4STRLZHVQdHQzT2FHRXpRV1FiVitnRjJmWUZYZ2pVQmRZ?=
 =?utf-8?B?d0VvOFZud3F6T0JZejhnQ1JnZXNDVkkwbysxa2Q5UEU4cTl3UzBKRDVHcnVn?=
 =?utf-8?B?eThVUE5iYm5WcHdOZlh4T1NVbHZyU3VZZXFVaTJ0dE5pYnE5dE5YbnUydEt4?=
 =?utf-8?B?ekhXdGhqVTdwWUEraXNnV0diWTZ6TnFkcHIrMStmRm1nNWxPR2I3U2lnczlQ?=
 =?utf-8?B?VEY3K2s1cXpsTVhRdVJLWTVnNFBTWnh0SFRxNnYrdzBTU3UzTnlJaHI5Nlhw?=
 =?utf-8?B?ZHJub2hFKys4aUJJQkVtL1JRMVNWd3JCdlRhbkErYzBlcHZUOFAwNUNuUktP?=
 =?utf-8?B?TlZVckhRYUh0QXFUSHFxeFFlYTVPcmg3YXVqTTV6SzhBNW5RV3lheUhuYnJo?=
 =?utf-8?B?Ym9MckxrUlhkUFNwcnkyUjdTbHpLSVZSeTNOTXNMNDNZd2VXbFZPSStLYStL?=
 =?utf-8?B?dVlSREtRcTV5TlRrQzZ1ZGtCOU8xcFN5YjlnM0pYWlhOMVR3dk9aN2d1eEZS?=
 =?utf-8?B?YytEcEppL2hkREFyU2Uyakh6ZHRXZ05OY2xYVURHZUFZNytyQUw3SzZWTkI1?=
 =?utf-8?B?TU0yc05sSExEaHJUUU52KzY2K1Z4ZWdxUGdzSHBzMGVFNElGU2g1UWRCNkhY?=
 =?utf-8?B?Q01PMTdoanA0c2kxWVNPL24zekxOSWVKUVNUUGsrb3RvbC95WHA4OHhMNGZG?=
 =?utf-8?B?TnoycVdOa1NuNGlvYU4xTGJncGtDVTY3VE9rNzNNN042V1orVjJKbnlUNEdx?=
 =?utf-8?B?U2VBZnR1YTkwR2RvSm5NTXhpbnBOcU0ySkFjejJGN24rbnNDSXNCY2RRRC9n?=
 =?utf-8?B?WHBqTjVHZVpWL2g5cVFFUXB3YUhNa2hpb21vQ1R2QUhMS01QNUVDRzBvM3gx?=
 =?utf-8?B?amhNMzBjTW05RUxielU4cW81b1RTWTZaUWlCUzNRbGppVjV1KzdkMmtFL0Js?=
 =?utf-8?B?UWhUOFZ6SnBRR1VaYXk5MEE5cXFMNEQ4M25BY2tIQzd5akhtNVRLOE5OM0VE?=
 =?utf-8?B?VnJLOW9TOTNsdUpEdWV0bTUrWnlYdlFWL01FQ2F0WitVVjdETFplRUxGMW9R?=
 =?utf-8?B?dDdoQzZBanVENHRRSjd6LzNkWlZoMDBrdlFtbTc3UU1wTWFiMlpEeHBMTG4v?=
 =?utf-8?B?NU5oOEV6bFNNM3BhbDV3TzgxSGxlZ2J5dW1wMFRneHgyTE5FeVFXV1NTZ2dl?=
 =?utf-8?B?Wlh3L1VqWHV0SzVRd1U1dkFBbTkxbyt4dXFBVHc4WEQ2Syt2aFlxUTh6ckdE?=
 =?utf-8?Q?o6FfWUHUbpyDyG31qy+4i6S7fd9bFEvTpe5CsOPqFrWY?=
X-OriginatorOrg: suse.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 593118f6-09a5-4167-cea7-08dbf1bd724a
X-MS-Exchange-CrossTenant-AuthSource: PA4PR04MB7790.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Nov 2023 16:00:17.2584
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: lpbVT+vgJPdymPDb1fzpLqSaK4BJK53lEPW7MhOOly0A2RmWvmRmiLNkshhmLv9Lbix0KCO43bpJFOyh5+toJw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB9819
X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
	DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,
	SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable
	autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Thu, 30 Nov 2023 08:00:31 -0800 (PST)


On 30.11.23 г. 17:52 ч., Borislav Petkov wrote:
> 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 == EM_X86_64)
>   
>   #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 == EM_X86_64))
>   
>   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
>   
> -
>   #ifdef CONFIG_IA32_EMULATION
>   
>   #include <linux/compat.h>
> @@ -84,4 +83,12 @@ static inline bool ia32_enabled(void)
>   
>   #endif
>   
> +static inline bool ia32_enabled_verbose(void)
> +{
> +#ifdef CONFIG_IA32_EMULATION

Hang on, this is wrong, it should be CONFIG_IA32_EMULATION_DEFAULT_DISABLED
> +	pr_notice_once("32-bit emulation disabled. You can reenable with ia32_emulation=on\n");
> +#endif
> +	return ia32_enabled();
> +}
> +
>   #endif /* _ASM_X86_IA32_H */