From nobody Fri Feb 13 14:10:31 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1768DCE7A88 for ; Sat, 23 Sep 2023 12:20:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231671AbjIWMUZ (ORCPT ); Sat, 23 Sep 2023 08:20:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60988 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231607AbjIWMUQ (ORCPT ); Sat, 23 Sep 2023 08:20:16 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D6DA719F; Sat, 23 Sep 2023 05:20:08 -0700 (PDT) Date: Sat, 23 Sep 2023 12:20:04 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1695471605; 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=YaH82Qg0REdS/rhhkNFax1UzkciLIXMxnC2+Hqyy6PY=; b=VMKaaScBFtXP0vV1h3Jz/Z7vdCJkXHbpeA501n8oxrDfYKYW/bHo0c/RwqTbrAhB7Jn6kU qjenwCfzYThssBm2Kc5zFRTgUtUY/M7icHWK6ns17oc7u4k7oU5e9RRVTlWWesCDaWdT0A Eoivh308YgWGVYnUgNv9SJqpxXcxa6WtyzWJ2b3Gdgmq1aOTxM6paVSb6PvFKQ1dJukx8B pIFEWYuLsAm3Z5XLAMtdlJd2qt1fagzfxcQWJFwBaj2/Ok5N9R5ZT+srZ2nMc8LWSCl5Kq sg+fI2r4e/RmhehyQnHyqDiBylG94e4wNhGDZMa9GatmrHW+g3qhMpYIy8cgVg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1695471605; 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=YaH82Qg0REdS/rhhkNFax1UzkciLIXMxnC2+Hqyy6PY=; b=krEAHnwTw07aarUVT9jWjGLXO/PUCufUgEz4AJrmZAoXk7A3Wmkxaq1XXLsGpfKZ7Ocigm xx+XPN70tq3ggfAg== 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: <169547160485.27769.7181650143283871949.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the x86/bugs branch of tip: Commit-ID: e2efc8e7d36a38e0a1f7724e74ff7c885963e7ca Gitweb: https://git.kernel.org/tip/e2efc8e7d36a38e0a1f7724e74ff7c885= 963e7ca Author: Jo Van Bulck AuthorDate: Sat, 19 Aug 2023 10:09:21 +02:00 Committer: Ingo Molnar CommitterDate: Sat, 23 Sep 2023 14:13:03 +02:00 x86/pti: Fix kernel warnings for pti=3D and nopti cmdline options Parse the pti=3D 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=3D are passed to the kernel cmdline on x86 platforms. Additionally allow the kernel to warn for malformed pti=3D 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.kuleuv= en.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); } =20 +/* Assume mode is auto unless overridden via cmdline below. */ static enum pti_mode { PTI_AUTO =3D 0, PTI_FORCE_OFF, @@ -77,50 +78,49 @@ static enum pti_mode { =20 void __init pti_check_boottime_disable(void) { - char arg[5]; - int ret; - - /* Assume mode is auto unless overridden. */ - pti_mode =3D PTI_AUTO; - if (hypervisor_is_type(X86_HYPER_XEN_PV)) { pti_mode =3D PTI_FORCE_OFF; pti_print_if_insecure("disabled on XEN PV."); return; } =20 - ret =3D cmdline_find_option(boot_command_line, "pti", arg, sizeof(arg)); - if (ret > 0) { - if (ret =3D=3D 3 && !strncmp(arg, "off", 3)) { - pti_mode =3D PTI_FORCE_OFF; - pti_print_if_insecure("disabled on command line."); - return; - } - if (ret =3D=3D 2 && !strncmp(arg, "on", 2)) { - pti_mode =3D PTI_FORCE_ON; - pti_print_if_secure("force enabled on command line."); - goto enable; - } - if (ret =3D=3D 4 && !strncmp(arg, "auto", 4)) { - pti_mode =3D PTI_AUTO; - goto autosel; - } - } - - if (cmdline_find_option_bool(boot_command_line, "nopti") || - cpu_mitigations_off()) { + if (cpu_mitigations_off()) pti_mode =3D PTI_FORCE_OFF; + if (pti_mode =3D=3D PTI_FORCE_OFF) { pti_print_if_insecure("disabled on command line."); return; } =20 -autosel: - if (!boot_cpu_has_bug(X86_BUG_CPU_MELTDOWN)) + if (pti_mode =3D=3D PTI_FORCE_ON) + pti_print_if_secure("force enabled on command line."); + + if (pti_mode =3D=3D PTI_AUTO && !boot_cpu_has_bug(X86_BUG_CPU_MELTDOWN)) return; -enable: + setup_force_cpu_cap(X86_FEATURE_PTI); } =20 +static int __init pti_parse_cmdline(char *arg) +{ + if (!strcmp(arg, "off")) + pti_mode =3D PTI_FORCE_OFF; + else if (!strcmp(arg, "on")) + pti_mode =3D PTI_FORCE_ON; + else if (!strcmp(arg, "auto")) + pti_mode =3D PTI_AUTO; + else + return -EINVAL; + return 0; +} +early_param("pti", pti_parse_cmdline); + +static int __init pti_parse_cmdline_nopti(char *arg) +{ + pti_mode =3D PTI_FORCE_OFF; + return 0; +} +early_param("nopti", pti_parse_cmdline_nopti); + pgd_t __pti_set_user_pgtbl(pgd_t *pgdp, pgd_t pgd) { /*