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 5E960C38142 for ; Mon, 23 Jan 2023 10:51:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231940AbjAWKvl (ORCPT ); Mon, 23 Jan 2023 05:51:41 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38038 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230081AbjAWKvj (ORCPT ); Mon, 23 Jan 2023 05:51:39 -0500 Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6FA94526A for ; Mon, 23 Jan 2023 02:51:38 -0800 (PST) Received: by mail-wm1-x336.google.com with SMTP id g10so8650662wmo.1 for ; Mon, 23 Jan 2023 02:51:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=iNaYtofYaUyTu++408RIjM6QxaU0XNloE1hvcqkby0M=; b=rDa7owbGuSkE3kuoTleIjKtzirtAYql6CGKhcf0keDRcGl8pQsGjMYN73lFNqOV8hk ErtqRBPbWZj36cGdiBrSqyT8VHMI4qXnK1gsOConP8PyaMMIgjDYbB1Lp2zQ3UEgFmRF U+ewrNjsq3dFBWjsWv5YJYXI6Dns592TJdXxosTgtZMWJ94djjfLsqZvFqUQT5AH+1N+ a8wrvnK6MgYThcOuiAUKAmicd+/zgQTc0WlirsKVLjium4bhLYXr+2eqopXoY6u8654e amLr/0tIIq7Z5wCxQgwJnHZhGuYdsUftHIfu/DbhohTPIZ/gEFdGuwJ9e9k17Sxo96IP zoMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=iNaYtofYaUyTu++408RIjM6QxaU0XNloE1hvcqkby0M=; b=jiqpPugxKOv+nIdZWyHM3NjNbONqVXAjwq7d3KuCLM1y5843ueF6ndQc4Cpycx5fuB OO1wCzzp3Dp+daANlEaYBOM8F2fi72LUdSxHOPGxQXG0ZA9K/rdDHYw6FWuohRn2g8Gs QQkkKNRzrMpERoSfqUgbK+gV/NMsgXgTsxC15f4vFZ+UJEt8hXmSfyr1fpfsqJahv/2O XY6mT4TSOP3wTrRCY7vWFV0gNiQJWH8l3TcEgVwvM4f2xj9rDOiAVqdmxbNlqZFtJjiY hNI51qWY6BD4QObxl4OTYBm0VPJWVfWEmTsSfZdrf0MYsXZO1xQoreM/lL89eCN//g6s SODw== X-Gm-Message-State: AFqh2kpsGugKhyWdyYN+pvsIhfYrNrTodNTuanhZfKiIHmhOivk29uIi UQk6y6qCbwieU87Z5BmX69dKGQ== X-Google-Smtp-Source: AMrXdXsAESMORx1h1OUNLEJAF0WchGSuYmV8oWCgP5HlMv9UyaB2e6hZpTe1dGLOU3jyksQeyDhkVw== X-Received: by 2002:a05:600c:3b05:b0:3d6:b691:b80d with SMTP id m5-20020a05600c3b0500b003d6b691b80dmr23667309wms.21.1674471096950; Mon, 23 Jan 2023 02:51:36 -0800 (PST) Received: from alex-rivos.ba.rivosinc.com (lfbn-lyo-1-450-160.w2-7.abo.wanadoo.fr. [2.7.42.160]) by smtp.gmail.com with ESMTPSA id o24-20020a05600c511800b003d9de0c39fasm13684770wms.36.2023.01.23.02.51.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Jan 2023 02:51:36 -0800 (PST) From: Alexandre Ghiti To: Jonathan Corbet , Paul Walmsley , Palmer Dabbelt , Albert Ou , Conor Dooley , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org Cc: Alexandre Ghiti , =?UTF-8?q?Bj=C3=B6rn=20T=C3=B6pel?= Subject: [PATCH resend v3] riscv: Allow to downgrade paging mode from the command line Date: Mon, 23 Jan 2023 11:51:35 +0100 Message-Id: <20230123105135.814154-1-alexghiti@rivosinc.com> X-Mailer: git-send-email 2.37.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add 2 early command line parameters that allow to downgrade satp mode (using the same naming as x86): - "no5lvl": use a 4-level page table (down from sv57 to sv48) - "no4lvl": use a 3-level page table (down from sv57/sv48 to sv39) Note that going through the device tree to get the kernel command line works with ACPI too since the efi stub creates a device tree anyway with the command line. Also, as those params are treated very early in the boot process and we use standard device tree functions that may be kasan instrumented, we only enable them for !KASAN configurations. Reviewed-by: Björn Töpel Signed-off-by: Alexandre Ghiti --- v3: - Massage commit log to make no4lvl clearer, as asked by Conor - Add a note to kernel-parameters.txt regarding the impossibility to use those parameters when KASAN is enabled, as suggested by Conor - Add RB from Björn v2: - Honor CMDLINE_EXTEND and CMDLINE_FORCE as noticed by Björn .../admin-guide/kernel-parameters.txt | 9 ++- arch/riscv/mm/init.c | 72 +++++++++++++++++-- 2 files changed, 74 insertions(+), 7 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index 6cfa6e3996cf..fd647412ec91 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -3578,8 +3578,15 @@ emulation library even if a 387 maths coprocessor is present. - no5lvl [X86-64] Disable 5-level paging mode. Forces + no4lvl [RISCV] Disable 4-level and 5-level paging modes. Forces + kernel to use 3-level paging instead. + Note: On RISC-V, this can't be used when KASAN is + enabled. + + no5lvl [X86-64,RISCV] Disable 5-level paging mode. Forces kernel to use 4-level paging instead. + Note: On RISC-V, this can't be used when KASAN is + enabled. nofsgsbase [X86] Disables FSGSBASE instructions. diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c index 478d6763a01a..10f99fa74368 100644 --- a/arch/riscv/mm/init.c +++ b/arch/riscv/mm/init.c @@ -746,17 +746,77 @@ static void __init disable_pgtable_l4(void) satp_mode = SATP_MODE_39; } +#ifndef CONFIG_KASAN +static __init bool match_noXlvl(const char *cmdline) +{ + if (strstr(cmdline, "no5lvl")) { + disable_pgtable_l5(); + } else if (strstr(cmdline, "no4lvl")) { + disable_pgtable_l5(); + disable_pgtable_l4(); + return true; + } + + return false; +} + +static int __init print_no4lvl(char *p) +{ + pr_info("Disabled 4-level and 5-level paging"); + return 0; +} +early_param("no4lvl", print_no4lvl); + +static int __init print_no5lvl(char *p) +{ + pr_info("Disabled 5-level paging"); + return 0; +} +early_param("no5lvl", print_no5lvl); +#endif + /* * There is a simple way to determine if 4-level is supported by the * underlying hardware: establish 1:1 mapping in 4-level page table mode * then read SATP to see if the configuration was taken into account * meaning sv48 is supported. */ -static __init void set_satp_mode(void) +static __init void set_satp_mode(uintptr_t dtb_pa) { u64 identity_satp, hw_satp; uintptr_t set_satp_mode_pmd = ((unsigned long)set_satp_mode) & PMD_MASK; - bool check_l4 = false; + +#ifndef CONFIG_KASAN + /* + * The below fdt functions are kasan instrumented, since at this point + * there is no mapping for the kasan shadow memory, this can't be used + * when kasan is enabled. + */ + int chosen_node; + unsigned int fdt_cmdline_size = 0; + + if (!IS_ENABLED(CONFIG_CMDLINE_FORCE)) { + chosen_node = fdt_path_offset((void *)dtb_pa, "/chosen"); + if (chosen_node >= 0) { + const char *fdt_cmdline; + + fdt_cmdline = fdt_getprop((void *)dtb_pa, chosen_node, + "bootargs", NULL); + if (fdt_cmdline) { + if (match_noXlvl(fdt_cmdline)) + return; + fdt_cmdline_size = strlen(fdt_cmdline); + } + } + } + + if (IS_ENABLED(CONFIG_CMDLINE_EXTEND) || + IS_ENABLED(CONFIG_CMDLINE_FORCE) || + fdt_cmdline_size == 0 /* CONFIG_CMDLINE_FALLBACK */) { + if (match_noXlvl(CONFIG_CMDLINE)) + return; + } +#endif create_p4d_mapping(early_p4d, set_satp_mode_pmd, (uintptr_t)early_pud, @@ -775,7 +835,8 @@ static __init void set_satp_mode(void) retry: create_pgd_mapping(early_pg_dir, set_satp_mode_pmd, - check_l4 ? (uintptr_t)early_pud : (uintptr_t)early_p4d, + pgtable_l5_enabled ? + (uintptr_t)early_p4d : (uintptr_t)early_pud, PGDIR_SIZE, PAGE_TABLE); identity_satp = PFN_DOWN((uintptr_t)&early_pg_dir) | satp_mode; @@ -786,9 +847,8 @@ static __init void set_satp_mode(void) local_flush_tlb_all(); if (hw_satp != identity_satp) { - if (!check_l4) { + if (pgtable_l5_enabled) { disable_pgtable_l5(); - check_l4 = true; memset(early_pg_dir, 0, PAGE_SIZE); goto retry; } @@ -979,7 +1039,7 @@ asmlinkage void __init setup_vm(uintptr_t dtb_pa) #endif #if defined(CONFIG_64BIT) && !defined(CONFIG_XIP_KERNEL) - set_satp_mode(); + set_satp_mode(dtb_pa); #endif kernel_map.va_pa_offset = PAGE_OFFSET - kernel_map.phys_addr; -- 2.37.2