2024-03-04 08:03:00

by Alexandre Ghiti

Subject: [PATCH] riscv: Fix compilation error with FAST_GUP and rv32

By surrounding the definition of pte_leaf_size() with a ifdef napot as
it should have been.

Fixes: e0fe5ab4192c ("riscv: Fix pte_leaf_size() for NAPOT")
Signed-off-by: Alexandre Ghiti <[email protected]>
---
arch/riscv/include/asm/pgtable.h | 2 ++
1 file changed, 2 insertions(+)

diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h
index 25ca14f6942c..54d26a07fa63 100644
--- a/arch/riscv/include/asm/pgtable.h
+++ b/arch/riscv/include/asm/pgtable.h
@@ -439,9 +439,11 @@ static inline pte_t pte_mkhuge(pte_t pte)
return pte;
}

+#ifdef CONFIG_RISCV_ISA_SVNAPOT
#define pte_leaf_size(pte) (pte_napot(pte) ? \
napot_cont_size(napot_cont_order(pte)) :\
PAGE_SIZE)
+#endif

#ifdef CONFIG_NUMA_BALANCING
/*
--
2.39.2

2024-03-04 16:48:05

by Randy Dunlap

Subject: Re: [PATCH] riscv: Fix compilation error with FAST_GUP and rv32

On 3/4/24 00:02, Alexandre Ghiti wrote:
> By surrounding the definition of pte_leaf_size() with a ifdef napot as
> it should have been.
>
> Fixes: e0fe5ab4192c ("riscv: Fix pte_leaf_size() for NAPOT")
> Signed-off-by: Alexandre Ghiti <[email protected]>


Reviewed-by: Randy Dunlap <[email protected]>
Tested-by: Randy Dunlap <[email protected]> # build-tested

Thanks.

> ---
> arch/riscv/include/asm/pgtable.h | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h
> index 25ca14f6942c..54d26a07fa63 100644
> --- a/arch/riscv/include/asm/pgtable.h
> +++ b/arch/riscv/include/asm/pgtable.h
> @@ -439,9 +439,11 @@ static inline pte_t pte_mkhuge(pte_t pte)
> return pte;
> }
>
> +#ifdef CONFIG_RISCV_ISA_SVNAPOT
> #define pte_leaf_size(pte) (pte_napot(pte) ? \
> napot_cont_size(napot_cont_order(pte)) :\
> PAGE_SIZE)
> +#endif
>
> #ifdef CONFIG_NUMA_BALANCING
> /*

--
#Randy

2024-03-15 17:22:38

by Palmer Dabbelt

Subject: Re: [PATCH] riscv: Fix compilation error with FAST_GUP and rv32

On Mon, 04 Mar 2024 08:47:43 PST (-0800), [email protected] wrote:
>
>
> On 3/4/24 00:02, Alexandre Ghiti wrote:
>> By surrounding the definition of pte_leaf_size() with a ifdef napot as
>> it should have been.
>>
>> Fixes: e0fe5ab4192c ("riscv: Fix pte_leaf_size() for NAPOT")
>> Signed-off-by: Alexandre Ghiti <[email protected]>
>
>
> Reviewed-by: Randy Dunlap <[email protected]>
> Tested-by: Randy Dunlap <[email protected]> # build-tested

Sorry for being slow here, I just realized this was a result of a
fixes/for-next semantic conflict. So I've merged this (on top of the
broken series) into for-next, but I'm going to hold off on sending
Linus a PR in order to let it get through the testers.

> Thanks.
>
>> ---
>> arch/riscv/include/asm/pgtable.h | 2 ++
>> 1 file changed, 2 insertions(+)
>>
>> diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h
>> index 25ca14f6942c..54d26a07fa63 100644
>> --- a/arch/riscv/include/asm/pgtable.h
>> +++ b/arch/riscv/include/asm/pgtable.h
>> @@ -439,9 +439,11 @@ static inline pte_t pte_mkhuge(pte_t pte)
>> return pte;
>> }
>>
>> +#ifdef CONFIG_RISCV_ISA_SVNAPOT
>> #define pte_leaf_size(pte) (pte_napot(pte) ? \
>> napot_cont_size(napot_cont_order(pte)) :\
>> PAGE_SIZE)
>> +#endif
>>
>> #ifdef CONFIG_NUMA_BALANCING
>> /*

2024-03-15 17:22:43

by patchwork-bot+linux-riscv

Subject: Re: [PATCH] riscv: Fix compilation error with FAST_GUP and rv32

Hello:

This patch was applied to riscv/linux.git (for-next)
by Palmer Dabbelt <[email protected]>:

On Mon, 4 Mar 2024 09:02:47 +0100 you wrote:
> By surrounding the definition of pte_leaf_size() with a ifdef napot as
> it should have been.
>
> Fixes: e0fe5ab4192c ("riscv: Fix pte_leaf_size() for NAPOT")
> Signed-off-by: Alexandre Ghiti <[email protected]>
> ---
> arch/riscv/include/asm/pgtable.h | 2 ++
> 1 file changed, 2 insertions(+)

Here is the summary with links:
- riscv: Fix compilation error with FAST_GUP and rv32
https://git.kernel.org/riscv/c/2bb7e0c49302

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html