From patchwork Fri Sep 15 12:11:43 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: 140468 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp1086942vqi; Fri, 15 Sep 2023 07:26:57 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG8wmkARgc9hgR/xoq+q1eqpQqW6XyGVGkgK30D+mMpA5Q4fh/0Rj/PNQK+0ViiExmugPjs X-Received: by 2002:a17:902:654e:b0:1bc:4f04:17f4 with SMTP id d14-20020a170902654e00b001bc4f0417f4mr5800943pln.30.1694788017108; Fri, 15 Sep 2023 07:26:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694788017; cv=none; d=google.com; s=arc-20160816; b=yu6+BIx0BgZqUji1CCUPi07/3ohYyWD8zehdbq2/EbUhmW1tS/g/ou5OQ+H54QZ+Y+ KltWckE8uad/iDlSlIQMudDr9A8YDD1z4YTZmxPBt6QEdWWbGeORu+C5dGGBnXQBaeN8 BESkjH+Jkr6zbb8rSV5cb6AN0bLUahr2XF8HwEKUZyEtAVc7DLzMFIGkvabczeE2EH0V JXJ1neKrygb6vhI/FgYeWu/JyQgt+j5V+u8m5gmaR0x5G4OYrG6yN9PuUq9z32TLqywL KznR9dSsdbzjnAZkNevXfcuBCQoFPQ+1HcIr0NL+LsIznluakiBIJu2+bHr7QweiKhvt Lliw== 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=sf8+ipFIGW8lCMat0xw/XNdWAC1viewZcVtxmsp/x0U=; fh=XQzvgGFN0vdKiMIeZ4ZfxAoeXyv3DYgAQ8NDVRT2sT8=; b=I+3zYyLdIgyU1O1vES3MTkRebshcU4SMJcil4szMnqXTfcTD3XPv+Pmg2xjfFVIMWv ZAHT9Y0pEHSZbDWOx3MPYfVf64PZj/nRtc6oc3ZQTqB1rhWMt04la3LuvpavleyqkqeV 3G1xi8cycLyNnP2y6B3nbiFiAqUJWPzvFKqmWQrJG0SQjb1VauN78rJ6UZ7eEYsHwKl1 7h1SpZs6c5yb3I/py62HgHjH1PFvRJH3kX1MnuEp7qfboZwAWLdxRys3JIijLRWhNZsL QRakWEtFQl4PP+yXLQkllEG+S8d69wsR6pPa8SQI+FScRFrt+93HInw3Z82uWs0DVuiB djog== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=mUC2Qel3; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 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 groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id l20-20020a170903005400b001c4352c2c9esi1038618pla.160.2023.09.15.07.26.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Sep 2023 07:26:57 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=mUC2Qel3; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 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 groat.vger.email (Postfix) with ESMTP id 3422D8376837; Fri, 15 Sep 2023 05:12:09 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234557AbjIOMLy (ORCPT + 32 others); Fri, 15 Sep 2023 08:11:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38238 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234485AbjIOMLw (ORCPT ); Fri, 15 Sep 2023 08:11:52 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 04765CD8; Fri, 15 Sep 2023 05:11:45 -0700 (PDT) Date: Fri, 15 Sep 2023 12:11:43 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1694779904; 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=sf8+ipFIGW8lCMat0xw/XNdWAC1viewZcVtxmsp/x0U=; b=mUC2Qel3sltvmLOTXakJ715eK7xB5znCGAWQ5alD8hpvazzAKnIwi8XyGQ7ReQKluuFTmj EJOWzynOWpGniunNp63nxCFX3oD4FjBw7IQpV3uNHQdJ+2IyJpTys/FQo65t6V4nxWsN+M Iv9VycxNaUR3pu3s7lgY3Dc0S/j1aE9MD377+HuuIYPxE9H4bEZY4IGzzAEjLmY8/DG1Be sEC4+OTdLwHha2gGPEtGZvpwAW/9TZY7E7/7IzqfwChbIPSToC1J6DwwXZ759q50rrZ3xm Q4+E254tpdV32vHPHM7GxgynoU8dF/sKmjhh8I3ossQvqvA+9YlyBfQJvRN5CA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1694779904; 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=sf8+ipFIGW8lCMat0xw/XNdWAC1viewZcVtxmsp/x0U=; b=ubhbxdYpUF9veLWJkUDWIEM5wNvO5KDRSyz+iD0cMDkCIybzYUFg/aaWXHdJEi0choVLAg WSzvwT4O+mhSl3CQ== From: "tip-bot2 for Jo Van Bulck" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/bugs] x86/pti: Fix kernel warnings for pti= and nopti cmdline options Cc: Jo Van Bulck , Ingo Molnar , Sohil Mehta , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20230819080921.5324-2-jo.vanbulck@cs.kuleuven.be> References: <20230819080921.5324-2-jo.vanbulck@cs.kuleuven.be> MIME-Version: 1.0 Message-ID: <169477990384.27769.14353312621627606791.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails 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 autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email 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 (groat.vger.email [0.0.0.0]); Fri, 15 Sep 2023 05:12:09 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777114039682512637 X-GMAIL-MSGID: 1777114039682512637 The following commit has been merged into the x86/bugs branch of tip: Commit-ID: 9fa4dc9797f2118a1e54e8df7f28a7fcc681cca9 Gitweb: https://git.kernel.org/tip/9fa4dc9797f2118a1e54e8df7f28a7fcc681cca9 Author: Jo Van Bulck AuthorDate: Sat, 19 Aug 2023 10:09:21 +02:00 Committer: Ingo Molnar CommitterDate: Fri, 15 Sep 2023 14:01:59 +02:00 x86/pti: Fix kernel warnings for pti= and nopti cmdline options Parse the pti= and nopti cmdline options using early_param to fix 'Unknown kernel command line parameters "nopti", will be passed to user space' warnings in the kernel log when nopti or pti= are passed to the kernel cmdline on x86 platforms. Additionally allow the kernel to warn for malformed pti= options. Signed-off-by: Jo Van Bulck Signed-off-by: Ingo Molnar Reviewed-by: Sohil Mehta Link: https://lore.kernel.org/r/20230819080921.5324-2-jo.vanbulck@cs.kuleuven.be --- arch/x86/mm/pti.c | 58 +++++++++++++++++++++++----------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/arch/x86/mm/pti.c b/arch/x86/mm/pti.c index 78414c6..5dd7339 100644 --- a/arch/x86/mm/pti.c +++ b/arch/x86/mm/pti.c @@ -69,6 +69,7 @@ static void __init pti_print_if_secure(const char *reason) pr_info("%s\n", reason); } +/* Assume mode is auto unless overridden via cmdline below. */ static enum pti_mode { PTI_AUTO = 0, PTI_FORCE_OFF, @@ -77,50 +78,49 @@ static enum pti_mode { void __init pti_check_boottime_disable(void) { - char arg[5]; - int ret; - - /* Assume mode is auto unless overridden. */ - pti_mode = PTI_AUTO; - if (hypervisor_is_type(X86_HYPER_XEN_PV)) { pti_mode = PTI_FORCE_OFF; pti_print_if_insecure("disabled on XEN PV."); return; } - ret = cmdline_find_option(boot_command_line, "pti", arg, sizeof(arg)); - if (ret > 0) { - if (ret == 3 && !strncmp(arg, "off", 3)) { - pti_mode = PTI_FORCE_OFF; - pti_print_if_insecure("disabled on command line."); - return; - } - if (ret == 2 && !strncmp(arg, "on", 2)) { - pti_mode = PTI_FORCE_ON; - pti_print_if_secure("force enabled on command line."); - goto enable; - } - if (ret == 4 && !strncmp(arg, "auto", 4)) { - pti_mode = PTI_AUTO; - goto autosel; - } - } - - if (cmdline_find_option_bool(boot_command_line, "nopti") || - cpu_mitigations_off()) { + if (cpu_mitigations_off()) pti_mode = PTI_FORCE_OFF; + if (pti_mode == PTI_FORCE_OFF) { pti_print_if_insecure("disabled on command line."); return; } -autosel: - if (!boot_cpu_has_bug(X86_BUG_CPU_MELTDOWN)) + if (pti_mode == PTI_FORCE_ON) + pti_print_if_secure("force enabled on command line."); + + if (pti_mode == PTI_AUTO && !boot_cpu_has_bug(X86_BUG_CPU_MELTDOWN)) return; -enable: + setup_force_cpu_cap(X86_FEATURE_PTI); } +static int __init pti_parse_cmdline(char *arg) +{ + if (!strcmp(arg, "off")) + pti_mode = PTI_FORCE_OFF; + else if (!strcmp(arg, "on")) + pti_mode = PTI_FORCE_ON; + else if (!strcmp(arg, "auto")) + pti_mode = PTI_AUTO; + else + return -EINVAL; + return 0; +} +early_param("pti", pti_parse_cmdline); + +static int __init pti_parse_cmdline_nopti(char *arg) +{ + pti_mode = PTI_FORCE_OFF; + return 0; +} +early_param("nopti", pti_parse_cmdline_nopti); + pgd_t __pti_set_user_pgtbl(pgd_t *pgdp, pgd_t pgd) { /*