[PATCH -fixes] riscv: Fix PTDUMP output now BPF region moved back to module region

[PATCH -fixes] riscv: Fix PTDUMP output now BPF region moved back to module region

[Alexandre Ghiti]

BPF region was moved back to the region below the kernel at the end of the
module region in commit 3a02764c372c ("riscv: Ensure BPF_JIT_REGION_START
aligned with PMD size"), so reflect this change in kernel page table
output.

Signed-off-by: Alexandre Ghiti <alex@ghiti.fr>
---
 arch/riscv/mm/ptdump.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/riscv/mm/ptdump.c b/arch/riscv/mm/ptdump.c
index 0536ac84b730..22d6555d89dc 100644
--- a/arch/riscv/mm/ptdump.c
+++ b/arch/riscv/mm/ptdump.c
@@ -98,8 +98,8 @@ static struct addr_marker address_markers[] = {
 	{0, "vmalloc() end"},
 	{0, "Linear mapping"},
 #ifdef CONFIG_64BIT
-	{0, "Modules mapping"},
-	{0, "Kernel mapping (kernel, BPF)"},
+	{0, "Modules/BPF mapping"},
+	{0, "Kernel mapping"},
 #endif
 	{-1, NULL},
 };
-- 
2.30.2


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

Re: [PATCH -fixes] riscv: Fix PTDUMP output now BPF region moved back to module region

[Jisheng Zhang]

On Thu, 24 Jun 2021 14:17:21 +0200
Alexandre Ghiti <alex@ghiti.fr> wrote:

> BPF region was moved back to the region below the kernel at the end of the
> module region in commit 3a02764c372c ("riscv: Ensure BPF_JIT_REGION_START
> aligned with PMD size"), so reflect this change in kernel page table
> output.

Nice catch!

> 
> Signed-off-by: Alexandre Ghiti <alex@ghiti.fr>

Reviewed-by: Jisheng Zhang <jszhang@kernel.org>

> ---
>  arch/riscv/mm/ptdump.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/riscv/mm/ptdump.c b/arch/riscv/mm/ptdump.c
> index 0536ac84b730..22d6555d89dc 100644
> --- a/arch/riscv/mm/ptdump.c
> +++ b/arch/riscv/mm/ptdump.c
> @@ -98,8 +98,8 @@ static struct addr_marker address_markers[] = {
>  	{0, "vmalloc() end"},
>  	{0, "Linear mapping"},
>  #ifdef CONFIG_64BIT
> -	{0, "Modules mapping"},
> -	{0, "Kernel mapping (kernel, BPF)"},
> +	{0, "Modules/BPF mapping"},
> +	{0, "Kernel mapping"},
>  #endif
>  	{-1, NULL},
>  };



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

Re: [PATCH -fixes] riscv: Fix PTDUMP output now BPF region moved back to module region

[Palmer Dabbelt]

On Thu, 24 Jun 2021 05:17:21 PDT (-0700), alex@ghiti.fr wrote:
> BPF region was moved back to the region below the kernel at the end of the
> module region in commit 3a02764c372c ("riscv: Ensure BPF_JIT_REGION_START
> aligned with PMD size"), so reflect this change in kernel page table
> output.
>
> Signed-off-by: Alexandre Ghiti <alex@ghiti.fr>
> ---
>  arch/riscv/mm/ptdump.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/riscv/mm/ptdump.c b/arch/riscv/mm/ptdump.c
> index 0536ac84b730..22d6555d89dc 100644
> --- a/arch/riscv/mm/ptdump.c
> +++ b/arch/riscv/mm/ptdump.c
> @@ -98,8 +98,8 @@ static struct addr_marker address_markers[] = {
>  	{0, "vmalloc() end"},
>  	{0, "Linear mapping"},
>  #ifdef CONFIG_64BIT
> -	{0, "Modules mapping"},
> -	{0, "Kernel mapping (kernel, BPF)"},
> +	{0, "Modules/BPF mapping"},
> +	{0, "Kernel mapping"},
>  #endif
>  	{-1, NULL},
>  };

Thanks, this is on for-next.

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

Re: [PATCH -fixes] riscv: Fix PTDUMP output now BPF region moved back to module region

[Alex Ghiti]

Le 7/07/2021 à 01:16, Palmer Dabbelt a écrit :
> On Thu, 24 Jun 2021 05:17:21 PDT (-0700), alex@ghiti.fr wrote:
>> BPF region was moved back to the region below the kernel at the end of 
>> the
>> module region in commit 3a02764c372c ("riscv: Ensure BPF_JIT_REGION_START
>> aligned with PMD size"), so reflect this change in kernel page table
>> output.
>>
>> Signed-off-by: Alexandre Ghiti <alex@ghiti.fr>
>> ---
>>  arch/riscv/mm/ptdump.c | 4 ++--
>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/arch/riscv/mm/ptdump.c b/arch/riscv/mm/ptdump.c
>> index 0536ac84b730..22d6555d89dc 100644
>> --- a/arch/riscv/mm/ptdump.c
>> +++ b/arch/riscv/mm/ptdump.c
>> @@ -98,8 +98,8 @@ static struct addr_marker address_markers[] = {
>>      {0, "vmalloc() end"},
>>      {0, "Linear mapping"},
>>  #ifdef CONFIG_64BIT
>> -    {0, "Modules mapping"},
>> -    {0, "Kernel mapping (kernel, BPF)"},
>> +    {0, "Modules/BPF mapping"},
>> +    {0, "Kernel mapping"},
>>  #endif
>>      {-1, NULL},
>>  };
> 
> Thanks, this is on for-next.

As this fix was for 5.13, I add stable in cc.

Cc: stable@vger.kernel.org # v5.13

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

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