2024-01-30 11:55:49

by Alexandre Ghiti

[permalink] [raw]
Subject: [PATCH -fixes] riscv: Fix arch_tlbbatch_flush() by clearing the batch cpumask

We must clear the cpumask once we have flushed the batch, otherwise cpus
get accumulated and we end sending IPIs to more cpus than needed.

Fixes: 54d7431af73e ("riscv: Add support for BATCHED_UNMAP_TLB_FLUSH")
Signed-off-by: Alexandre Ghiti <[email protected]>
---
arch/riscv/mm/tlbflush.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/arch/riscv/mm/tlbflush.c b/arch/riscv/mm/tlbflush.c
index 99c3e037f127..c8efc3f87a0f 100644
--- a/arch/riscv/mm/tlbflush.c
+++ b/arch/riscv/mm/tlbflush.c
@@ -240,4 +240,5 @@ void arch_tlbbatch_flush(struct arch_tlbflush_unmap_batch *batch)
{
__flush_tlb_range(NULL, &batch->cpumask,
0, FLUSH_TLB_MAX_SIZE, PAGE_SIZE);
+ cpumask_clear(&batch->cpumask);
}
--
2.39.2



2024-02-06 00:27:06

by Charlie Jenkins

[permalink] [raw]
Subject: Re: [PATCH -fixes] riscv: Fix arch_tlbbatch_flush() by clearing the batch cpumask

On Tue, Jan 30, 2024 at 12:55:08PM +0100, Alexandre Ghiti wrote:
> We must clear the cpumask once we have flushed the batch, otherwise cpus
> get accumulated and we end sending IPIs to more cpus than needed.
>
> Fixes: 54d7431af73e ("riscv: Add support for BATCHED_UNMAP_TLB_FLUSH")
> Signed-off-by: Alexandre Ghiti <[email protected]>
> ---
> arch/riscv/mm/tlbflush.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/arch/riscv/mm/tlbflush.c b/arch/riscv/mm/tlbflush.c
> index 99c3e037f127..c8efc3f87a0f 100644
> --- a/arch/riscv/mm/tlbflush.c
> +++ b/arch/riscv/mm/tlbflush.c
> @@ -240,4 +240,5 @@ void arch_tlbbatch_flush(struct arch_tlbflush_unmap_batch *batch)
> {
> __flush_tlb_range(NULL, &batch->cpumask,
> 0, FLUSH_TLB_MAX_SIZE, PAGE_SIZE);
> + cpumask_clear(&batch->cpumask);
> }
> --
> 2.39.2
>
>
> _______________________________________________
> linux-riscv mailing list
> [email protected]
> http://lists.infradead.org/mailman/listinfo/linux-riscv

Reviewed-by: Charlie Jenkins <[email protected]>


2024-02-06 10:28:07

by Jisheng Zhang

[permalink] [raw]
Subject: Re: [PATCH -fixes] riscv: Fix arch_tlbbatch_flush() by clearing the batch cpumask

On Mon, Feb 05, 2024 at 04:26:55PM -0800, Charlie Jenkins wrote:
> On Tue, Jan 30, 2024 at 12:55:08PM +0100, Alexandre Ghiti wrote:
> > We must clear the cpumask once we have flushed the batch, otherwise cpus
> > get accumulated and we end sending IPIs to more cpus than needed.
> >
> > Fixes: 54d7431af73e ("riscv: Add support for BATCHED_UNMAP_TLB_FLUSH")
> > Signed-off-by: Alexandre Ghiti <[email protected]>

Reviewed-by: Jisheng Zhang <[email protected]>
> > ---
> > arch/riscv/mm/tlbflush.c | 1 +
> > 1 file changed, 1 insertion(+)
> >
> > diff --git a/arch/riscv/mm/tlbflush.c b/arch/riscv/mm/tlbflush.c
> > index 99c3e037f127..c8efc3f87a0f 100644
> > --- a/arch/riscv/mm/tlbflush.c
> > +++ b/arch/riscv/mm/tlbflush.c
> > @@ -240,4 +240,5 @@ void arch_tlbbatch_flush(struct arch_tlbflush_unmap_batch *batch)
> > {
> > __flush_tlb_range(NULL, &batch->cpumask,
> > 0, FLUSH_TLB_MAX_SIZE, PAGE_SIZE);
> > + cpumask_clear(&batch->cpumask);
> > }
> > --
> > 2.39.2
> >
> >
> > _______________________________________________
> > linux-riscv mailing list
> > [email protected]
> > http://lists.infradead.org/mailman/listinfo/linux-riscv
>
> Reviewed-by: Charlie Jenkins <[email protected]>
>

2024-02-07 19:24:08

by Samuel Holland

[permalink] [raw]
Subject: Re: [PATCH -fixes] riscv: Fix arch_tlbbatch_flush() by clearing the batch cpumask

Hi Alex,

On 2024-01-30 5:55 AM, Alexandre Ghiti wrote:
> We must clear the cpumask once we have flushed the batch, otherwise cpus
> get accumulated and we end sending IPIs to more cpus than needed.
>
> Fixes: 54d7431af73e ("riscv: Add support for BATCHED_UNMAP_TLB_FLUSH")
> Signed-off-by: Alexandre Ghiti <[email protected]>
> ---
> arch/riscv/mm/tlbflush.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/arch/riscv/mm/tlbflush.c b/arch/riscv/mm/tlbflush.c
> index 99c3e037f127..c8efc3f87a0f 100644
> --- a/arch/riscv/mm/tlbflush.c
> +++ b/arch/riscv/mm/tlbflush.c
> @@ -240,4 +240,5 @@ void arch_tlbbatch_flush(struct arch_tlbflush_unmap_batch *batch)
> {
> __flush_tlb_range(NULL, &batch->cpumask,
> 0, FLUSH_TLB_MAX_SIZE, PAGE_SIZE);
> + cpumask_clear(&batch->cpumask);
> }

This patch doesn't apply to fixes -- it looks like it was based on "riscv: Call
secondary mmu notifier when flushing the tlb"[1], which has not been merged and
would go in for-next anyway. Otherwise:

Reviewed-by: Samuel Holland <[email protected]>

[1]: https://lore.kernel.org/all/[email protected]/


2024-02-07 19:35:22

by Palmer Dabbelt

[permalink] [raw]
Subject: Re: [PATCH -fixes] riscv: Fix arch_tlbbatch_flush() by clearing the batch cpumask

On Wed, 07 Feb 2024 11:23:55 PST (-0800), [email protected] wrote:
> Hi Alex,
>
> On 2024-01-30 5:55 AM, Alexandre Ghiti wrote:
>> We must clear the cpumask once we have flushed the batch, otherwise cpus
>> get accumulated and we end sending IPIs to more cpus than needed.
>>
>> Fixes: 54d7431af73e ("riscv: Add support for BATCHED_UNMAP_TLB_FLUSH")
>> Signed-off-by: Alexandre Ghiti <[email protected]>
>> ---
>> arch/riscv/mm/tlbflush.c | 1 +
>> 1 file changed, 1 insertion(+)
>>
>> diff --git a/arch/riscv/mm/tlbflush.c b/arch/riscv/mm/tlbflush.c
>> index 99c3e037f127..c8efc3f87a0f 100644
>> --- a/arch/riscv/mm/tlbflush.c
>> +++ b/arch/riscv/mm/tlbflush.c
>> @@ -240,4 +240,5 @@ void arch_tlbbatch_flush(struct arch_tlbflush_unmap_batch *batch)
>> {
>> __flush_tlb_range(NULL, &batch->cpumask,
>> 0, FLUSH_TLB_MAX_SIZE, PAGE_SIZE);
>> + cpumask_clear(&batch->cpumask);
>> }
>
> This patch doesn't apply to fixes -- it looks like it was based on "riscv: Call
> secondary mmu notifier when flushing the tlb"[1], which has not been merged and
> would go in for-next anyway. Otherwise:
>
> Reviewed-by: Samuel Holland <[email protected]>
>
> [1]: https://lore.kernel.org/all/[email protected]/

Ya and for some reason it trips up "patch -p1", which applies it to some
other function. I just merged it manually a few minutes ago and it's in
the tester...

Subject: Re: [PATCH -fixes] riscv: Fix arch_tlbbatch_flush() by clearing the batch cpumask

Hello:

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

On Tue, 30 Jan 2024 12:55:08 +0100 you wrote:
> We must clear the cpumask once we have flushed the batch, otherwise cpus
> get accumulated and we end sending IPIs to more cpus than needed.
>
> Fixes: 54d7431af73e ("riscv: Add support for BATCHED_UNMAP_TLB_FLUSH")
> Signed-off-by: Alexandre Ghiti <[email protected]>
> ---
> arch/riscv/mm/tlbflush.c | 1 +
> 1 file changed, 1 insertion(+)

Here is the summary with links:
- [-fixes] riscv: Fix arch_tlbbatch_flush() by clearing the batch cpumask
https://git.kernel.org/riscv/c/3951f6add519

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