From patchwork Fri Jun 23 11:14:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikolay Borisov X-Patchwork-Id: 112082 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp5699711vqr; Fri, 23 Jun 2023 04:30:37 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4DrCC7rkwi59OMnvISAAV5NuSz98GZD1i3ingriIv/1O2GDlyaJ4YrVxsO3cmXoFdpinQl X-Received: by 2002:a17:903:2306:b0:1b2:436b:931c with SMTP id d6-20020a170903230600b001b2436b931cmr17914340plh.43.1687519836936; Fri, 23 Jun 2023 04:30:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687519836; cv=none; d=google.com; s=arc-20160816; b=gmDRjlLrCY4ocu0sfSi3i0yS5ZSL++3Qv4bZ8KtZthN97JlB71v1vw60mmkh0jsXQn pOaNAEt/taXaEgxL4GPk5taVc+2PKfPmYcLFZxOtfliDapgO7EnyWQwMqMWTBR+ZmEo2 07GTqS+RSUOyJA9+F+z6ZBwt2QxbBTOP8oh92hUyvAaV+M8nJVj5tmthFEO2Hq5CgJV5 6/gUs6NQOKZzDZu+xr6O68z/QAKcx4Uc4yypAVgiZpMSTB4ZA+qygKLmztiFQQOg+mxV 55SrdWJEA9NuCMcDK4rN0XrCIVSOk969JjycwfggdOdfCfsNymnNxD8uS6aRyH6rx+eX b4Uw== 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=0Yy85zR9fuPHZsIKybiFZXTFB/OLmUVvR9b3i0pMJzE=; b=ZQw+8J8vq7Y5HS8ETQ3vrMYmqLitzDWc5lcCKCCj+I3mf4CrgudLNL1LlxgRUwpTeM KA8B9obYeWxMvIzUMna3YTFNmXvQ6xSlczzyjEMWx9Ux+5qn7yEAHRrE3xhv/cAjIOuY c8i8aWn/7Uqlr5zY0WZvhdkZeI7/en0OSL8HW4Nk2SJgBA2/EPnBcVg0jouWWSEcpWek rnA0pZQRBx2Qa/UGjQMGOzouK1JgTnPTnFACPK66+g3DDsb40WQCamYPSvK4PWEQsHO4 d6M3OpDVVbBrgWxuLjjZeTJCw2wefeExBWjQeXpPvb6ihqASpOXexf04CkAzuW8buLgy dcew== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.com header.s=susede1 header.b=qDURYg8S; 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 v20-20020a170902f0d400b001aaebc66877si2023824pla.147.2023.06.23.04.30.24; Fri, 23 Jun 2023 04:30:36 -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=qDURYg8S; 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 S231843AbjFWLOY (ORCPT + 99 others); Fri, 23 Jun 2023 07:14:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54776 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231346AbjFWLOR (ORCPT ); Fri, 23 Jun 2023 07:14:17 -0400 Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2001:67c:2178:6::1c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 72D101FF9 for ; Fri, 23 Jun 2023 04:14:16 -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 104EC21B15; Fri, 23 Jun 2023 11:14:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1687518855; 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=0Yy85zR9fuPHZsIKybiFZXTFB/OLmUVvR9b3i0pMJzE=; b=qDURYg8SdKUS2CeWjKzKeaUE2JWhPqjAqw74ROnCesy7Xrt1T6opu1bv0KCx5b0kJdxR5R n2Nlp6Ku8HJK4DaAXcQeUF5NtHKmx2/kRkAMKtv6RPo3bDgj6TnSfP2oowpVrsImFXoUlB ++4SWHnumHiq1/eR7cbNFbkPSH/LDLY= 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 AE9111331F; Fri, 23 Jun 2023 11:14:14 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id EO3pJ4Z+lWTcFAAAMHmgww (envelope-from ); Fri, 23 Jun 2023 11:14:14 +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 3/6] x86/entry: Compile entry_SYSCALL32_ignore() unconditionally Date: Fri, 23 Jun 2023 14:14:06 +0300 Message-Id: <20230623111409.3047467-4-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?1769492800588317343?= X-GMAIL-MSGID: =?utf-8?q?1769492800588317343?= To limit the IA32 exposure on 64bit kernels while keeping the flexibility for the user to enable it when required, the compile time enable/disable via CONFIG_IA32_EMULATION is not good enough and will be complemented with a kernel command line option. Right now entry_SYSCALL32_ignore() is only compiled when CONFIG_IA32_EMULATION=n, but boot-time enable- / disablement obviously requires it to be unconditionally available. Remove the #ifndef CONFIG_IA32_EMULATION guard. Signed-off-by: Nikolay Borisov --- arch/x86/entry/entry_64.S | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S index ccce0ccd8589..7068af44008a 100644 --- a/arch/x86/entry/entry_64.S +++ b/arch/x86/entry/entry_64.S @@ -1514,7 +1514,6 @@ SYM_CODE_START(asm_exc_nmi) iretq SYM_CODE_END(asm_exc_nmi) -#ifndef CONFIG_IA32_EMULATION /* * This handles SYSCALL from 32-bit code. There is no way to program * MSRs to fully disable 32-bit SYSCALL. @@ -1525,7 +1524,6 @@ SYM_CODE_START(entry_SYSCALL32_ignore) mov $-ENOSYS, %eax sysretl SYM_CODE_END(entry_SYSCALL32_ignore) -#endif .pushsection .text, "ax" __FUNC_ALIGN