2021-04-18 11:32:45

by Alexandre Ghiti

Subject: [PATCH] riscv: Remove 32b kernel mapping from page table dump

The 32b kernel mapping lies in the linear mapping, there is no point in
printing its address in page table dump, so remove this leftover that
comes from moving the kernel mapping outside the linear mapping for 64b
kernel.

Fixes: e9efb21fe352 ("riscv: Prepare ptdump for vm layout dynamic addresses")
Signed-off-by: Alexandre Ghiti <[email protected]>
---
arch/riscv/mm/ptdump.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/riscv/mm/ptdump.c b/arch/riscv/mm/ptdump.c
index 0aba4421115c..a4ed4bdbbfde 100644
--- a/arch/riscv/mm/ptdump.c
+++ b/arch/riscv/mm/ptdump.c
@@ -76,8 +76,8 @@ enum address_markers_idx {
PAGE_OFFSET_NR,
#ifdef CONFIG_64BIT
MODULES_MAPPING_NR,
-#endif
KERNEL_MAPPING_NR,
+#endif
END_OF_SPACE_NR
};

@@ -99,8 +99,8 @@ static struct addr_marker address_markers[] = {
{0, "Linear mapping"},
#ifdef CONFIG_64BIT
{0, "Modules mapping"},
-#endif
{0, "Kernel mapping (kernel, BPF)"},
+#endif
{-1, NULL},
};

@@ -379,8 +379,8 @@ static int ptdump_init(void)
address_markers[PAGE_OFFSET_NR].start_address = PAGE_OFFSET;
#ifdef CONFIG_64BIT
address_markers[MODULES_MAPPING_NR].start_address = MODULES_VADDR;
-#endif
address_markers[KERNEL_MAPPING_NR].start_address = kernel_virt_addr;
+#endif

kernel_ptd_info.base_addr = KERN_VIRT_START;

--
2.20.1

2021-04-20 04:20:36

by Anup Patel

Subject: Re: [PATCH] riscv: Remove 32b kernel mapping from page table dump

On Sun, Apr 18, 2021 at 4:59 PM Alexandre Ghiti <[email protected]> wrote:
>
> The 32b kernel mapping lies in the linear mapping, there is no point in
> printing its address in page table dump, so remove this leftover that
> comes from moving the kernel mapping outside the linear mapping for 64b
> kernel.
>
> Fixes: e9efb21fe352 ("riscv: Prepare ptdump for vm layout dynamic addresses")
> Signed-off-by: Alexandre Ghiti <[email protected]>

Looks good to me.

Reviewed-by: Anup Patel <[email protected]>

Regards,
Anup

> ---
> arch/riscv/mm/ptdump.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/arch/riscv/mm/ptdump.c b/arch/riscv/mm/ptdump.c
> index 0aba4421115c..a4ed4bdbbfde 100644
> --- a/arch/riscv/mm/ptdump.c
> +++ b/arch/riscv/mm/ptdump.c
> @@ -76,8 +76,8 @@ enum address_markers_idx {
> PAGE_OFFSET_NR,
> #ifdef CONFIG_64BIT
> MODULES_MAPPING_NR,
> -#endif
> KERNEL_MAPPING_NR,
> +#endif
> END_OF_SPACE_NR
> };
>
> @@ -99,8 +99,8 @@ static struct addr_marker address_markers[] = {
> {0, "Linear mapping"},
> #ifdef CONFIG_64BIT
> {0, "Modules mapping"},
> -#endif
> {0, "Kernel mapping (kernel, BPF)"},
> +#endif
> {-1, NULL},
> };
>
> @@ -379,8 +379,8 @@ static int ptdump_init(void)
> address_markers[PAGE_OFFSET_NR].start_address = PAGE_OFFSET;
> #ifdef CONFIG_64BIT
> address_markers[MODULES_MAPPING_NR].start_address = MODULES_VADDR;
> -#endif
> address_markers[KERNEL_MAPPING_NR].start_address = kernel_virt_addr;
> +#endif
>
> kernel_ptd_info.base_addr = KERN_VIRT_START;
>
> --
> 2.20.1
>

2021-04-28 07:27:02

by Alexandre Ghiti

Subject: Re: [PATCH] riscv: Remove 32b kernel mapping from page table dump

Hi Palmer,

Le 4/20/21 à 12:19 AM, Anup Patel a écrit :
> On Sun, Apr 18, 2021 at 4:59 PM Alexandre Ghiti <[email protected]> wrote:
>>
>> The 32b kernel mapping lies in the linear mapping, there is no point in
>> printing its address in page table dump, so remove this leftover that
>> comes from moving the kernel mapping outside the linear mapping for 64b
>> kernel.
>>
>> Fixes: e9efb21fe352 ("riscv: Prepare ptdump for vm layout dynamic addresses")
>> Signed-off-by: Alexandre Ghiti <[email protected]>
>
> Looks good to me.
>
> Reviewed-by: Anup Patel <[email protected]>
>
> Regards,
> Anup
>
>> ---
>> arch/riscv/mm/ptdump.c | 6 +++---
>> 1 file changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/arch/riscv/mm/ptdump.c b/arch/riscv/mm/ptdump.c
>> index 0aba4421115c..a4ed4bdbbfde 100644
>> --- a/arch/riscv/mm/ptdump.c
>> +++ b/arch/riscv/mm/ptdump.c
>> @@ -76,8 +76,8 @@ enum address_markers_idx {
>> PAGE_OFFSET_NR,
>> #ifdef CONFIG_64BIT
>> MODULES_MAPPING_NR,
>> -#endif
>> KERNEL_MAPPING_NR,
>> +#endif
>> END_OF_SPACE_NR
>> };
>>
>> @@ -99,8 +99,8 @@ static struct addr_marker address_markers[] = {
>> {0, "Linear mapping"},
>> #ifdef CONFIG_64BIT
>> {0, "Modules mapping"},
>> -#endif
>> {0, "Kernel mapping (kernel, BPF)"},
>> +#endif
>> {-1, NULL},
>> };
>>
>> @@ -379,8 +379,8 @@ static int ptdump_init(void)
>> address_markers[PAGE_OFFSET_NR].start_address = PAGE_OFFSET;
>> #ifdef CONFIG_64BIT
>> address_markers[MODULES_MAPPING_NR].start_address = MODULES_VADDR;
>> -#endif
>> address_markers[KERNEL_MAPPING_NR].start_address = kernel_virt_addr;
>> +#endif
>>
>> kernel_ptd_info.base_addr = KERN_VIRT_START;
>>
>> --
>> 2.20.1
>>

Do you think you can take this patch too on for-next?

Thanks,

Alex