[PATCH v2] riscv: Allow to downgrade paging mode from the command line

[PATCH v2] riscv: Allow to downgrade paging mode from the command line

[Alexandre Ghiti]

Add 2 early command line parameters called "no5lvl" and "no4lvl" (using
the same naming as x86) to allow a user to downgrade from sv57 (the
default mode if the hardware supports it) to sv48 or 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.

Signed-off-by: Alexandre Ghiti <alexghiti@rivosinc.com>
---

v2:
- Honor CMDLINE_EXTEND and CMDLINE_FORCE as noticed by Björn

 .../admin-guide/kernel-parameters.txt         |  5 +-
 arch/riscv/mm/init.c                          | 72 +++++++++++++++++--
 2 files changed, 70 insertions(+), 7 deletions(-)

diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index a465d5242774..6741524aa980 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -3548,7 +3548,10 @@
 			emulation library even if a 387 maths coprocessor
 			is present.
 
-	no5lvl		[X86-64] Disable 5-level paging mode. Forces
+	no4lvl		[RISCV] Disable 4-level paging mode. Forces
+			kernel to use 3-level paging instead.
+
+	no5lvl		[X86-64,RISCV] Disable 5-level paging mode. Forces
 			kernel to use 4-level paging instead.
 
 	nofsgsbase	[X86] Disables FSGSBASE instructions.
diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c
index b56a0a75533f..d90fbe9ad494 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

[PATCH v2] riscv: Allow to downgrade paging mode from the command line

[Alexandre Ghiti]

Add 2 early command line parameters called "no5lvl" and "no4lvl" (using
the same naming as x86) to allow a user to downgrade from sv57 (the
default mode if the hardware supports it) to sv48 or 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.

Signed-off-by: Alexandre Ghiti <alexghiti@rivosinc.com>
---

v2:
- Honor CMDLINE_EXTEND and CMDLINE_FORCE as noticed by Björn

 .../admin-guide/kernel-parameters.txt         |  5 +-
 arch/riscv/mm/init.c                          | 72 +++++++++++++++++--
 2 files changed, 70 insertions(+), 7 deletions(-)

diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index a465d5242774..6741524aa980 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -3548,7 +3548,10 @@
 			emulation library even if a 387 maths coprocessor
 			is present.
 
-	no5lvl		[X86-64] Disable 5-level paging mode. Forces
+	no4lvl		[RISCV] Disable 4-level paging mode. Forces
+			kernel to use 3-level paging instead.
+
+	no5lvl		[X86-64,RISCV] Disable 5-level paging mode. Forces
 			kernel to use 4-level paging instead.
 
 	nofsgsbase	[X86] Disables FSGSBASE instructions.
diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c
index b56a0a75533f..d90fbe9ad494 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


_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv

Re: [PATCH v2] riscv: Allow to downgrade paging mode from the command line

[Björn Töpel]

Alexandre Ghiti <alexghiti@rivosinc.com> writes:

> Add 2 early command line parameters called "no5lvl" and "no4lvl" (using
> the same naming as x86) to allow a user to downgrade from sv57 (the
> default mode if the hardware supports it) to sv48 or 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.
>
> Signed-off-by: Alexandre Ghiti <alexghiti@rivosinc.com>

Reviewed-by: Björn Töpel <bjorn@kernel.org>

Re: [PATCH v2] riscv: Allow to downgrade paging mode from the command line

[Björn Töpel]

Alexandre Ghiti <alexghiti@rivosinc.com> writes:

> Add 2 early command line parameters called "no5lvl" and "no4lvl" (using
> the same naming as x86) to allow a user to downgrade from sv57 (the
> default mode if the hardware supports it) to sv48 or 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.
>
> Signed-off-by: Alexandre Ghiti <alexghiti@rivosinc.com>

Reviewed-by: Björn Töpel <bjorn@kernel.org>

_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv

Re: [PATCH v2] riscv: Allow to downgrade paging mode from the command line

[Conor Dooley]

[-- Attachment #1.1: Type: text/plain, Size: 5963 bytes --]

Hey Alex,

On Thu, Dec 15, 2022 at 09:19:48AM +0100, Alexandre Ghiti wrote:
> Add 2 early command line parameters called "no5lvl" and "no4lvl" (using
> the same naming as x86) to allow a user to downgrade from sv57 (the
> default mode if the hardware supports it) to sv48 or sv39.

Pardon my innocence here, but does the "no4lvl" option not also allow
downgrading from sv48 to sv39? If that's the case, I assume the message
could be amended on application.

> 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.

I don't have a suggestion for you, so I am just airing my thoughts
really - are we likely to end up confusing people as it's not
immediately obvious that these options do not work if KASAN is enabled?
I know KASAN really isn't something you want in a production kernel,
but should we be flagging the incompatibility somewhere that "users"
would see?
kernel-parameters.txt does usually seem to mention config options where
relevant, and in the case of iommu.strict also mentions some arch
specific behaviour. Should we mention it there then?

Thanks,
Conor.

> Signed-off-by: Alexandre Ghiti <alexghiti@rivosinc.com>
> ---
> 
> v2:
> - Honor CMDLINE_EXTEND and CMDLINE_FORCE as noticed by Björn
> 
>  .../admin-guide/kernel-parameters.txt         |  5 +-
>  arch/riscv/mm/init.c                          | 72 +++++++++++++++++--
>  2 files changed, 70 insertions(+), 7 deletions(-)
> 
> diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
> index a465d5242774..6741524aa980 100644
> --- a/Documentation/admin-guide/kernel-parameters.txt
> +++ b/Documentation/admin-guide/kernel-parameters.txt
> @@ -3548,7 +3548,10 @@
>  			emulation library even if a 387 maths coprocessor
>  			is present.
>  
> -	no5lvl		[X86-64] Disable 5-level paging mode. Forces
> +	no4lvl		[RISCV] Disable 4-level paging mode. Forces
> +			kernel to use 3-level paging instead.
> +
> +	no5lvl		[X86-64,RISCV] Disable 5-level paging mode. Forces
>  			kernel to use 4-level paging instead.
>  
>  	nofsgsbase	[X86] Disables FSGSBASE instructions.
> diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c
> index b56a0a75533f..d90fbe9ad494 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
> 
> 

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]

[-- Attachment #2: Type: text/plain, Size: 161 bytes --]

_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv

Re: [PATCH v2] riscv: Allow to downgrade paging mode from the command line

[Conor Dooley]

[-- Attachment #1: Type: text/plain, Size: 5963 bytes --]

Hey Alex,

On Thu, Dec 15, 2022 at 09:19:48AM +0100, Alexandre Ghiti wrote:
> Add 2 early command line parameters called "no5lvl" and "no4lvl" (using
> the same naming as x86) to allow a user to downgrade from sv57 (the
> default mode if the hardware supports it) to sv48 or sv39.

Pardon my innocence here, but does the "no4lvl" option not also allow
downgrading from sv48 to sv39? If that's the case, I assume the message
could be amended on application.

> 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.

I don't have a suggestion for you, so I am just airing my thoughts
really - are we likely to end up confusing people as it's not
immediately obvious that these options do not work if KASAN is enabled?
I know KASAN really isn't something you want in a production kernel,
but should we be flagging the incompatibility somewhere that "users"
would see?
kernel-parameters.txt does usually seem to mention config options where
relevant, and in the case of iommu.strict also mentions some arch
specific behaviour. Should we mention it there then?

Thanks,
Conor.

> Signed-off-by: Alexandre Ghiti <alexghiti@rivosinc.com>
> ---
> 
> v2:
> - Honor CMDLINE_EXTEND and CMDLINE_FORCE as noticed by Björn
> 
>  .../admin-guide/kernel-parameters.txt         |  5 +-
>  arch/riscv/mm/init.c                          | 72 +++++++++++++++++--
>  2 files changed, 70 insertions(+), 7 deletions(-)
> 
> diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
> index a465d5242774..6741524aa980 100644
> --- a/Documentation/admin-guide/kernel-parameters.txt
> +++ b/Documentation/admin-guide/kernel-parameters.txt
> @@ -3548,7 +3548,10 @@
>  			emulation library even if a 387 maths coprocessor
>  			is present.
>  
> -	no5lvl		[X86-64] Disable 5-level paging mode. Forces
> +	no4lvl		[RISCV] Disable 4-level paging mode. Forces
> +			kernel to use 3-level paging instead.
> +
> +	no5lvl		[X86-64,RISCV] Disable 5-level paging mode. Forces
>  			kernel to use 4-level paging instead.
>  
>  	nofsgsbase	[X86] Disables FSGSBASE instructions.
> diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c
> index b56a0a75533f..d90fbe9ad494 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
> 
> 

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]

Re: [PATCH v2] riscv: Allow to downgrade paging mode from the command line

[Alexandre Ghiti]

Hi Conor,

On Wed, Dec 21, 2022 at 11:27 PM Conor Dooley <conor@kernel.org> wrote:
>
> Hey Alex,
>
> On Thu, Dec 15, 2022 at 09:19:48AM +0100, Alexandre Ghiti wrote:
> > Add 2 early command line parameters called "no5lvl" and "no4lvl" (using
> > the same naming as x86) to allow a user to downgrade from sv57 (the
> > default mode if the hardware supports it) to sv48 or sv39.
>
> Pardon my innocence here, but does the "no4lvl" option not also allow
> downgrading from sv48 to sv39? If that's the case, I assume the message
> could be amended on application.

Yes it does, it actually sets satp_mode to sv39, I'll massage the
commit log in the v3 (if I need one for your comments below).

>
> > 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.
>
> I don't have a suggestion for you, so I am just airing my thoughts
> really - are we likely to end up confusing people as it's not
> immediately obvious that these options do not work if KASAN is enabled?
> I know KASAN really isn't something you want in a production kernel,
> but should we be flagging the incompatibility somewhere that "users"
> would see?
> kernel-parameters.txt does usually seem to mention config options where
> relevant, and in the case of iommu.strict also mentions some arch
> specific behaviour. Should we mention it there then?

That's indeed a 'weird' restriction that we should mention, I'll see
if that can be done here, thanks.
Also note that I think there is something wrong with kasan outline
code generation that makes it fail to work whereas IMO it should, I'm
currently looking into this.

Thanks for your comments, always helpful,

Alex

>
> Thanks,
> Conor.
>
> > Signed-off-by: Alexandre Ghiti <alexghiti@rivosinc.com>
> > ---
> >
> > v2:
> > - Honor CMDLINE_EXTEND and CMDLINE_FORCE as noticed by Björn
> >
> >  .../admin-guide/kernel-parameters.txt         |  5 +-
> >  arch/riscv/mm/init.c                          | 72 +++++++++++++++++--
> >  2 files changed, 70 insertions(+), 7 deletions(-)
> >
> > diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
> > index a465d5242774..6741524aa980 100644
> > --- a/Documentation/admin-guide/kernel-parameters.txt
> > +++ b/Documentation/admin-guide/kernel-parameters.txt
> > @@ -3548,7 +3548,10 @@
> >                       emulation library even if a 387 maths coprocessor
> >                       is present.
> >
> > -     no5lvl          [X86-64] Disable 5-level paging mode. Forces
> > +     no4lvl          [RISCV] Disable 4-level paging mode. Forces
> > +                     kernel to use 3-level paging instead.
> > +
> > +     no5lvl          [X86-64,RISCV] Disable 5-level paging mode. Forces
> >                       kernel to use 4-level paging instead.
> >
> >       nofsgsbase      [X86] Disables FSGSBASE instructions.
> > diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c
> > index b56a0a75533f..d90fbe9ad494 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
> >
> >

Re: [PATCH v2] riscv: Allow to downgrade paging mode from the command line

[Alexandre Ghiti]

Hi Conor,

On Wed, Dec 21, 2022 at 11:27 PM Conor Dooley <conor@kernel.org> wrote:
>
> Hey Alex,
>
> On Thu, Dec 15, 2022 at 09:19:48AM +0100, Alexandre Ghiti wrote:
> > Add 2 early command line parameters called "no5lvl" and "no4lvl" (using
> > the same naming as x86) to allow a user to downgrade from sv57 (the
> > default mode if the hardware supports it) to sv48 or sv39.
>
> Pardon my innocence here, but does the "no4lvl" option not also allow
> downgrading from sv48 to sv39? If that's the case, I assume the message
> could be amended on application.

Yes it does, it actually sets satp_mode to sv39, I'll massage the
commit log in the v3 (if I need one for your comments below).

>
> > 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.
>
> I don't have a suggestion for you, so I am just airing my thoughts
> really - are we likely to end up confusing people as it's not
> immediately obvious that these options do not work if KASAN is enabled?
> I know KASAN really isn't something you want in a production kernel,
> but should we be flagging the incompatibility somewhere that "users"
> would see?
> kernel-parameters.txt does usually seem to mention config options where
> relevant, and in the case of iommu.strict also mentions some arch
> specific behaviour. Should we mention it there then?

That's indeed a 'weird' restriction that we should mention, I'll see
if that can be done here, thanks.
Also note that I think there is something wrong with kasan outline
code generation that makes it fail to work whereas IMO it should, I'm
currently looking into this.

Thanks for your comments, always helpful,

Alex

>
> Thanks,
> Conor.
>
> > Signed-off-by: Alexandre Ghiti <alexghiti@rivosinc.com>
> > ---
> >
> > v2:
> > - Honor CMDLINE_EXTEND and CMDLINE_FORCE as noticed by Björn
> >
> >  .../admin-guide/kernel-parameters.txt         |  5 +-
> >  arch/riscv/mm/init.c                          | 72 +++++++++++++++++--
> >  2 files changed, 70 insertions(+), 7 deletions(-)
> >
> > diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
> > index a465d5242774..6741524aa980 100644
> > --- a/Documentation/admin-guide/kernel-parameters.txt
> > +++ b/Documentation/admin-guide/kernel-parameters.txt
> > @@ -3548,7 +3548,10 @@
> >                       emulation library even if a 387 maths coprocessor
> >                       is present.
> >
> > -     no5lvl          [X86-64] Disable 5-level paging mode. Forces
> > +     no4lvl          [RISCV] Disable 4-level paging mode. Forces
> > +                     kernel to use 3-level paging instead.
> > +
> > +     no5lvl          [X86-64,RISCV] Disable 5-level paging mode. Forces
> >                       kernel to use 4-level paging instead.
> >
> >       nofsgsbase      [X86] Disables FSGSBASE instructions.
> > diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c
> > index b56a0a75533f..d90fbe9ad494 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
> >
> >

_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv