From patchwork Thu Sep 14 11:27:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 140263 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp902783vqi; Fri, 15 Sep 2023 02:00:18 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFHDFnmIkmXaARM8Yc7fKCspV4WjdwvyOLCDT+c9llq8Xp3RR+o/fSNy3rv6vPdSorKtxYm X-Received: by 2002:a92:c807:0:b0:34f:3b12:799e with SMTP id v7-20020a92c807000000b0034f3b12799emr1567388iln.0.1694768418368; Fri, 15 Sep 2023 02:00:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694768418; cv=none; d=google.com; s=arc-20160816; b=H9c5y1eFxl7wWaLhzbsXKbBP8dDXhLhse8El+QyRKPjpuwsd1A1jiq8xHbhI+veMVJ +d3eu65C5344C+9Di/Ur17Tbk6V+6vcIjhsbjAeolpqjZF3Eo6gpwMrNCfkDq1+9Mj68 /LCwAr7NN9+veNDq3fLbPEJiGcMdCnHvE6f0GUxyi9n0IUxZuhBv/vkUhvPlwgbVdG9f s2bYJTMKTIls9KA4RREp+qCcQjlh4JnTt/AYCfFvgDDpIZraeUXlTV61BRr+N/wIazOx lhBiNjx9xLqaAN5e2sY+7pHonw8pChTe9Z2U1EfkjI19YMAlCoyZwa1xz9yTqzdQKzuq nf/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=rRBlDdvNX+xiBakKbGmgdBA7yGQ28OOQgzP56FD+i7o=; fh=n7fF7QC0RNRn6F3FQu0v+CrFD4hMTQOXYoV2ln8SMUQ=; b=wF60Tx7n6bYstaosCNiIK6fQVCVLhMXcTVzuj54Vkpaej0zQKCUNjz4FgHmgdeGuw5 MUCrNsF5eVcruMxYt0hg1Z7Auklk2mZxc317VjMUYA5kKkypmdj4PCFbMXdUo8AKbsr8 0wxkdjHFPrp2amRZa7LFcONU8zuRf9Ee1IMFjc7NOlVWOcQaWZK7Xx/dPMU/T/QEstVy p4gdSBCg0RfbQ0RplcNu5ZjNVDgR1mEJ5h/J0ubkVkx0axyY/ilX0asMxk4Pol97BpmG E6ckiirfSnWkW+J3f+wpDc+e6ABodeoqM/In22CUqg4YLqeERkh2zIMpeqfLja7MRSrL 2K3g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=4eBXmGwc; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=In2b9ZSl; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id g5-20020a636b05000000b0057760853711si2798555pgc.273.2023.09.15.02.00.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Sep 2023 02:00:18 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=4eBXmGwc; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=In2b9ZSl; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 2C8EF82F27D2; Thu, 14 Sep 2023 04:27:18 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237507AbjINL1R (ORCPT + 35 others); Thu, 14 Sep 2023 07:27:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56020 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233594AbjINL1J (ORCPT ); Thu, 14 Sep 2023 07:27:09 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BD18C1FC4; Thu, 14 Sep 2023 04:27:05 -0700 (PDT) Date: Thu, 14 Sep 2023 11:27:03 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1694690824; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rRBlDdvNX+xiBakKbGmgdBA7yGQ28OOQgzP56FD+i7o=; b=4eBXmGwcp83L99p3eMsO+ARfOgjRZqEqHGoDav2I0yZssORjx44c7YX1C9ywMIAVebEq3u hUPWQkobsA3tavka9SESEfMjqIZjEFaP6OwvlRdxwbsakwbBAIz1ojG5TqOt6SzHKJbdZe KyYzu7a+m2fZBhcCfDVhmsQYXrMpNNL9+/uNKSSopNrY20iCGrXMIagm5EKjnzBhpK336y zV0FmdNXyafLXBGs6qFY9/BWDUmlMUwseCv2ANIAd99QwHq6FnGrL9cJfbXbRIgxY+rydq OUuYzkYVp6zsAdDWh7JWhL62GR7Bk+aKaBH2X2nb8sezDIBOJe+V600zp3eJ7A== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1694690824; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rRBlDdvNX+xiBakKbGmgdBA7yGQ28OOQgzP56FD+i7o=; b=In2b9ZSlDBtF2SH7VtsLcsUbsaHO229ih/cCaClOJpQrPZQ1AVpZc+vjaMh0fvxSlgtGOX EOoWkNhY+5FHdtDw== From: "tip-bot2 for Nikolay Borisov" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/entry] x86/entry: Compile entry_SYSCALL32_ignore() unconditionally Cc: Nikolay Borisov , Thomas Gleixner , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20230623111409.3047467-4-nik.borisov@suse.com> References: <20230623111409.3047467-4-nik.borisov@suse.com> MIME-Version: 1.0 Message-ID: <169469082375.27769.12443727333195550673.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Thu, 14 Sep 2023 04:27:18 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1769492800588317343 X-GMAIL-MSGID: 1777093489371151716 The following commit has been merged into the x86/entry branch of tip: Commit-ID: 370dcd58548a360bbf8a65b89b410d09f56bf0c6 Gitweb: https://git.kernel.org/tip/370dcd58548a360bbf8a65b89b410d09f56bf0c6 Author: Nikolay Borisov AuthorDate: Fri, 23 Jun 2023 14:14:06 +03:00 Committer: Thomas Gleixner CommitterDate: Thu, 14 Sep 2023 13:19:53 +02:00 x86/entry: Compile entry_SYSCALL32_ignore() unconditionally 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 Signed-off-by: Thomas Gleixner Link: https://lore.kernel.org/r/20230623111409.3047467-4-nik.borisov@suse.com --- 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 3be71ac..f71664d 100644 --- a/arch/x86/entry/entry_64.S +++ b/arch/x86/entry/entry_64.S @@ -1511,7 +1511,6 @@ nmi_restore: 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. @@ -1522,7 +1521,6 @@ SYM_CODE_START(entry_SYSCALL32_ignore) mov $-ENOSYS, %eax sysretl SYM_CODE_END(entry_SYSCALL32_ignore) -#endif .pushsection .text, "ax" __FUNC_ALIGN