From patchwork Fri Jun 23 11:14:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikolay Borisov X-Patchwork-Id: 112079 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp5698758vqr; Fri, 23 Jun 2023 04:28:50 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7inoFe5uV987982WKxof3ndWcCsfCEFi1N9zTvxZEA7UKOnGdbBokD9NLyxcE9Q5pxBAcI X-Received: by 2002:a05:6a20:4313:b0:11e:e940:441e with SMTP id h19-20020a056a20431300b0011ee940441emr16031607pzk.25.1687519729944; Fri, 23 Jun 2023 04:28:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687519729; cv=none; d=google.com; s=arc-20160816; b=CTPys/0cFTkuEy7CNJdyDDldNfoEtE9C6fk4VU1KzMPrtI/FX1fLeJZE+yzSAN4pZk E9nkNcK1b7GXPvkjyRQDQzUGCz9iyYcDcibC01nFMP5FPgwqJvOlFSXbRc9tDKvYHbFj C62OtzxK5ivnod75Gac4yqtbdG75vO+iwnpW83V8117BAxD0aKscEcemPfvBovVlwcPX Ll1OF08t0m3nVyWbj6jRqXmTVIpNs3LWSGGMB+V8NaBVXboM3WZOM6ktcNGRrHd5QkNt 6UUC82DJS9/aG+ekOV+BcbXFCNfubBO8SHEiFGy6o8ci+SZJHUl6ZDxHXV90nd1Z1sAv zVvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=AYuj5naZGeFE0xaFXho8MoJJxnJ3BHmuLKgH1l9RAc8=; b=SjV7g7oIgJsnng1qBS53HPxyneA0ODZTBnxUsluBMvB1OM+aj55R5vuhsGHM4hP3qN 87SmzPn+cll67dNgY2KQncDRGB6YzP5EmjcPjQaCT35B4wfRGGWHQPK5M8wlFdU8pKpw 3wBQY6N2Z3XEP6tLaWOs6zyxN9Aa/7Ce7OEsrHyb1/qWg0p5i2hn/rY2sMSNwOwa/SHd KG0P3vrxWL78g31LQypPXq75fuDEtb1Q7hH3k0HuON5kF66BNEJw8SlHLBxEsgWa/Fys SGOn/A6AWjBDCNw8ZXJCHYUXrPVFCS+7SR0ZSOxf4uXJbqYw0Wev5Q7hGVRu3qfT6Lj9 NzQQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.com header.s=susede1 header.b=qeafabWY; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k10-20020a170902c40a00b001b23b699747si10089401plk.10.2023.06.23.04.28.36; Fri, 23 Jun 2023 04:28:49 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=susede1 header.b=qeafabWY; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231820AbjFWLOU (ORCPT + 99 others); Fri, 23 Jun 2023 07:14:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54758 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229451AbjFWLOQ (ORCPT ); Fri, 23 Jun 2023 07:14:16 -0400 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 85F0DB7 for ; Fri, 23 Jun 2023 04:14:15 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 3341021B12; Fri, 23 Jun 2023 11:14:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1687518854; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AYuj5naZGeFE0xaFXho8MoJJxnJ3BHmuLKgH1l9RAc8=; b=qeafabWYCNR+xeqCAO7OzR4ueyvG2NgkXINY4JmKwTLYfTZmHo4hzIJDQ0Gv0bT48yN4HT zMl96mZ2JNNps134yjbi/J0sV/ZGrXOJ9gSHEmY2DnBBO/kb0RlxELe02ayyHOms8EiW3X ybMExMxcjKJy2UuDNSqAN3jIyRP6cJI= Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id C79151331F; Fri, 23 Jun 2023 11:14:13 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id CF7kLYV+lWTcFAAAMHmgww (envelope-from ); Fri, 23 Jun 2023 11:14:13 +0000 From: Nikolay Borisov To: x86@kernel.org Cc: linux-kernel@vger.kernel.org, mohocko@suse.com, jslaby@suse.cz, Nikolay Borisov Subject: [PATCH v4 1/6] x86: Introduce ia32_enabled() Date: Fri, 23 Jun 2023 14:14:04 +0300 Message-Id: <20230623111409.3047467-2-nik.borisov@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230623111409.3047467-1-nik.borisov@suse.com> References: <20230623111409.3047467-1-nik.borisov@suse.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1769492688225577697?= X-GMAIL-MSGID: =?utf-8?q?1769492688225577697?= IA32 support on 64bit kernels depends on whether CONFIG_IA32_EMULATION is selected or not. As it is a compile time option it doesn't provide the flexibility to have distributions set their own policy for IA32 support and give the user the flexibility to override it. As a first step introduce ia32_enabled() which abstracts whether IA32 compat is turned on or off. Upcoming patches will implement the ability to set IA32 compat state at boot time. Signed-off-by: Nikolay Borisov --- arch/x86/entry/common.c | 4 ++++ arch/x86/include/asm/ia32.h | 16 +++++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/arch/x86/entry/common.c b/arch/x86/entry/common.c index 6c2826417b33..ef5a154a7413 100644 --- a/arch/x86/entry/common.c +++ b/arch/x86/entry/common.c @@ -96,6 +96,10 @@ static __always_inline int syscall_32_enter(struct pt_regs *regs) return (int)regs->orig_ax; } +#ifdef CONFIG_IA32_EMULATION +bool __ia32_enabled = true; +#endif + /* * Invoke a 32-bit syscall. Called with IRQs on in CONTEXT_KERNEL. */ diff --git a/arch/x86/include/asm/ia32.h b/arch/x86/include/asm/ia32.h index fada857f0a1e..5a2ae24b1204 100644 --- a/arch/x86/include/asm/ia32.h +++ b/arch/x86/include/asm/ia32.h @@ -68,6 +68,20 @@ extern void ia32_pick_mmap_layout(struct mm_struct *mm); #endif -#endif /* CONFIG_IA32_EMULATION */ +extern bool __ia32_enabled; + +static inline bool ia32_enabled(void) +{ + return __ia32_enabled; +} + +#else /* !CONFIG_IA32_EMULATION */ + +static inline bool ia32_enabled(void) +{ + return IS_ENABLED(CONFIG_X86_32); +} + +#endif #endif /* _ASM_X86_IA32_H */