From nobody Thu Sep 11 23:36:34 2025 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 58733EE49AA for ; Sat, 19 Aug 2023 08:10:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231464AbjHSIKJ (ORCPT ); Sat, 19 Aug 2023 04:10:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38288 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230222AbjHSIKH (ORCPT ); Sat, 19 Aug 2023 04:10:07 -0400 Received: from icts-p-cavuit-4.kulnet.kuleuven.be (icts-p-cavuit-4.kulnet.kuleuven.be [134.58.240.134]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 78FA51BD4 for ; Sat, 19 Aug 2023 01:09:53 -0700 (PDT) X-KULeuven-Envelope-From: jo.vanbulck@cs.kuleuven.be X-KULeuven-Scanned: Found to be clean X-KULeuven-ID: 6D942121.AD261 X-KULeuven-Information: Katholieke Universiteit Leuven Received: from icts-p-ceifnet-smtps-1.kuleuven.be (icts-p-ceifnet-smtps.service.icts.svcd [IPv6:2a02:2c40:0:51:145:242:ac11:22]) by icts-p-cavuit-4.kulnet.kuleuven.be (Postfix) with ESMTP id 6D942121; Sat, 19 Aug 2023 10:09:50 +0200 (CEST) BCmilterd-Mark-Subject: no BCmilterd-Errors: BCmilterd-Report: SA-HVU#DKIM_VALID_AU#0.00,SA-HVU#DKIM_VALID#0.00,SA-HVU#DKIM_SIGNED#0.00 X-CAV-Cluster: smtps DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=cs.kuleuven.be; s=cav; t=1692432590; bh=JllzdJwYt80RHUoWs4XJ7GSSHyLDoibHfdAXtLvTOn8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=HS1pv/ow0+Snh8OQE3Q4nncQ3obo5jZaq/aGmENiK+G78pAr0OgWbPz5XC2Bz6jJG XkUnKDP8epatrfjmFKEpiYvQ0NiNz1G7NsCbDLe4ebyOrlJMdCiGuzjONCxCRWXE34 D0/1wimLIHdFK6qWZzIZ3xELkJ9VHE8b2SxoDgdg= Received: from localhost.localdomain (ptr-94-109-233-233.dyn.orange.be [94.109.233.233]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by icts-p-ceifnet-smtps-1.kuleuven.be (Postfix) with ESMTPSA id 85229D4EB5306; Sat, 19 Aug 2023 10:09:43 +0200 (CEST) X-Kuleuven: This mail passed the K.U.Leuven mailcluster From: Jo Van Bulck To: linux-kernel@vger.kernel.org, dave.hansen@linux.intel.com, luto@kernel.org, peterz@infradead.org, mingo@redhat.com, sohil.mehta@intel.com Cc: x86@kernel.org, bp@alien8.de, tglx@linutronix.de, hpa@zytor.com, Jo Van Bulck Subject: [PATCH v4 1/1] x86/pti: Fix kernel warnings for pti= and nopti cmdline options Date: Sat, 19 Aug 2023 10:09:21 +0200 Message-Id: <20230819080921.5324-2-jo.vanbulck@cs.kuleuven.be> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230819080921.5324-1-jo.vanbulck@cs.kuleuven.be> References: <20230819080921.5324-1-jo.vanbulck@cs.kuleuven.be> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Sohil Mehta Link: https://lore.kernel.org/all/b9bbb279-fa8f-0784-900f-114ce186cbb3@inte= l.com/ --- 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 78414c6d1..5dd733944 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) { /* --=20 2.25.1