* [PATCH v2] riscv: mm: Fix incorrect ASID argument when flushing TLB @ 2023-03-13 3:49 Dylan Jhong 2023-03-13 5:58 ` Sergey Matyukevich ` (2 more replies) 0 siblings, 3 replies; 8+ messages in thread From: Dylan Jhong @ 2023-03-13 3:49 UTC (permalink / raw) To: linux-kernel, linux-riscv Cc: guoren, sergey.matyukevich, aou, palmer, paul.walmsley, x5710999x, tim609, peterlin, ycliang, Dylan Jhong Currently, we pass the CONTEXTID instead of the ASID to the TLB flush function. We should only take the ASID field to prevent from touching the reserved bit field. Fixes: 3f1e782998cd ("riscv: add ASID-based tlbflushing methods") Signed-off-by: Dylan Jhong <dylan@andestech.com> --- Changes from v2: - Remove unsued EXPORT_SYMBOL() --- arch/riscv/include/asm/tlbflush.h | 2 ++ arch/riscv/mm/context.c | 2 +- arch/riscv/mm/tlbflush.c | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/riscv/include/asm/tlbflush.h b/arch/riscv/include/asm/tlbflush.h index 907b9efd39a8..597d6d8aec28 100644 --- a/arch/riscv/include/asm/tlbflush.h +++ b/arch/riscv/include/asm/tlbflush.h @@ -12,6 +12,8 @@ #include <asm/errata_list.h> #ifdef CONFIG_MMU +extern unsigned long asid_mask; + static inline void local_flush_tlb_all(void) { __asm__ __volatile__ ("sfence.vma" : : : "memory"); diff --git a/arch/riscv/mm/context.c b/arch/riscv/mm/context.c index 80ce9caba8d2..6d1aeb063e81 100644 --- a/arch/riscv/mm/context.c +++ b/arch/riscv/mm/context.c @@ -22,7 +22,7 @@ DEFINE_STATIC_KEY_FALSE(use_asid_allocator); static unsigned long asid_bits; static unsigned long num_asids; -static unsigned long asid_mask; +unsigned long asid_mask; static atomic_long_t current_version; diff --git a/arch/riscv/mm/tlbflush.c b/arch/riscv/mm/tlbflush.c index ce7dfc81bb3f..ba4c27187c95 100644 --- a/arch/riscv/mm/tlbflush.c +++ b/arch/riscv/mm/tlbflush.c @@ -27,7 +27,7 @@ static void __sbi_tlb_flush_range(struct mm_struct *mm, unsigned long start, /* check if the tlbflush needs to be sent to other CPUs */ broadcast = cpumask_any_but(cmask, cpuid) < nr_cpu_ids; if (static_branch_unlikely(&use_asid_allocator)) { - unsigned long asid = atomic_long_read(&mm->context.id); + unsigned long asid = atomic_long_read(&mm->context.id) & asid_mask; /* * TLB will be immediately flushed on harts concurrently -- 2.34.1 _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH v2] riscv: mm: Fix incorrect ASID argument when flushing TLB 2023-03-13 3:49 [PATCH v2] riscv: mm: Fix incorrect ASID argument when flushing TLB Dylan Jhong @ 2023-03-13 5:58 ` Sergey Matyukevich 2023-03-14 2:22 ` Zong Li 2023-03-23 21:00 ` patchwork-bot+linux-riscv 2 siblings, 0 replies; 8+ messages in thread From: Sergey Matyukevich @ 2023-03-13 5:58 UTC (permalink / raw) To: Dylan Jhong Cc: linux-kernel, linux-riscv, guoren, sergey.matyukevich, aou, palmer, paul.walmsley, x5710999x, tim609, peterlin, ycliang > Currently, we pass the CONTEXTID instead of the ASID to the TLB flush > function. We should only take the ASID field to prevent from touching > the reserved bit field. > > Fixes: 3f1e782998cd ("riscv: add ASID-based tlbflushing methods") > Signed-off-by: Dylan Jhong <dylan@andestech.com> > --- > Changes from v2: > - Remove unsued EXPORT_SYMBOL() > --- > arch/riscv/include/asm/tlbflush.h | 2 ++ > arch/riscv/mm/context.c | 2 +- > arch/riscv/mm/tlbflush.c | 2 +- > 3 files changed, 4 insertions(+), 2 deletions(-) > > diff --git a/arch/riscv/include/asm/tlbflush.h b/arch/riscv/include/asm/tlbflush.h > index 907b9efd39a8..597d6d8aec28 100644 > --- a/arch/riscv/include/asm/tlbflush.h > +++ b/arch/riscv/include/asm/tlbflush.h > @@ -12,6 +12,8 @@ > #include <asm/errata_list.h> > > #ifdef CONFIG_MMU > +extern unsigned long asid_mask; > + > static inline void local_flush_tlb_all(void) > { > __asm__ __volatile__ ("sfence.vma" : : : "memory"); > diff --git a/arch/riscv/mm/context.c b/arch/riscv/mm/context.c > index 80ce9caba8d2..6d1aeb063e81 100644 > --- a/arch/riscv/mm/context.c > +++ b/arch/riscv/mm/context.c > @@ -22,7 +22,7 @@ DEFINE_STATIC_KEY_FALSE(use_asid_allocator); > > static unsigned long asid_bits; > static unsigned long num_asids; > -static unsigned long asid_mask; > +unsigned long asid_mask; > > static atomic_long_t current_version; > > diff --git a/arch/riscv/mm/tlbflush.c b/arch/riscv/mm/tlbflush.c > index ce7dfc81bb3f..ba4c27187c95 100644 > --- a/arch/riscv/mm/tlbflush.c > +++ b/arch/riscv/mm/tlbflush.c > @@ -27,7 +27,7 @@ static void __sbi_tlb_flush_range(struct mm_struct *mm, unsigned long start, > /* check if the tlbflush needs to be sent to other CPUs */ > broadcast = cpumask_any_but(cmask, cpuid) < nr_cpu_ids; > if (static_branch_unlikely(&use_asid_allocator)) { > - unsigned long asid = atomic_long_read(&mm->context.id); > + unsigned long asid = atomic_long_read(&mm->context.id) & asid_mask; > > /* > * TLB will be immediately flushed on harts concurrently Reviewed-by: Sergey Matyukevich <sergey.matyukevich@syntacore.com> Thanks ! _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2] riscv: mm: Fix incorrect ASID argument when flushing TLB 2023-03-13 3:49 [PATCH v2] riscv: mm: Fix incorrect ASID argument when flushing TLB Dylan Jhong 2023-03-13 5:58 ` Sergey Matyukevich @ 2023-03-14 2:22 ` Zong Li 2023-03-14 7:27 ` Dylan Jhong 2023-03-23 21:00 ` patchwork-bot+linux-riscv 2 siblings, 1 reply; 8+ messages in thread From: Zong Li @ 2023-03-14 2:22 UTC (permalink / raw) To: Dylan Jhong Cc: linux-kernel, linux-riscv, guoren, sergey.matyukevich, aou, palmer, paul.walmsley, x5710999x, tim609, peterlin, ycliang Dylan Jhong <dylan@andestech.com> 於 2023年3月13日 週一 下午12:29寫道: > > Currently, we pass the CONTEXTID instead of the ASID to the TLB flush > function. We should only take the ASID field to prevent from touching > the reserved bit field. > > Fixes: 3f1e782998cd ("riscv: add ASID-based tlbflushing methods") > Signed-off-by: Dylan Jhong <dylan@andestech.com> > --- Hi Dylan, Thanks for your patch, if I remember correctly, there was a patch from Alistair Francis did the similar fix. Perhaps we should track that patch to see why it doesn't be merged. Thanks. http://lists.infradead.org/pipermail/linux-riscv/2022-March/013558.html > Changes from v2: > - Remove unsued EXPORT_SYMBOL() > --- > arch/riscv/include/asm/tlbflush.h | 2 ++ > arch/riscv/mm/context.c | 2 +- > arch/riscv/mm/tlbflush.c | 2 +- > 3 files changed, 4 insertions(+), 2 deletions(-) > > diff --git a/arch/riscv/include/asm/tlbflush.h b/arch/riscv/include/asm/tlbflush.h > index 907b9efd39a8..597d6d8aec28 100644 > --- a/arch/riscv/include/asm/tlbflush.h > +++ b/arch/riscv/include/asm/tlbflush.h > @@ -12,6 +12,8 @@ > #include <asm/errata_list.h> > > #ifdef CONFIG_MMU > +extern unsigned long asid_mask; > + > static inline void local_flush_tlb_all(void) > { > __asm__ __volatile__ ("sfence.vma" : : : "memory"); > diff --git a/arch/riscv/mm/context.c b/arch/riscv/mm/context.c > index 80ce9caba8d2..6d1aeb063e81 100644 > --- a/arch/riscv/mm/context.c > +++ b/arch/riscv/mm/context.c > @@ -22,7 +22,7 @@ DEFINE_STATIC_KEY_FALSE(use_asid_allocator); > > static unsigned long asid_bits; > static unsigned long num_asids; > -static unsigned long asid_mask; > +unsigned long asid_mask; > > static atomic_long_t current_version; > > diff --git a/arch/riscv/mm/tlbflush.c b/arch/riscv/mm/tlbflush.c > index ce7dfc81bb3f..ba4c27187c95 100644 > --- a/arch/riscv/mm/tlbflush.c > +++ b/arch/riscv/mm/tlbflush.c > @@ -27,7 +27,7 @@ static void __sbi_tlb_flush_range(struct mm_struct *mm, unsigned long start, > /* check if the tlbflush needs to be sent to other CPUs */ > broadcast = cpumask_any_but(cmask, cpuid) < nr_cpu_ids; > if (static_branch_unlikely(&use_asid_allocator)) { > - unsigned long asid = atomic_long_read(&mm->context.id); > + unsigned long asid = atomic_long_read(&mm->context.id) & asid_mask; > > /* > * TLB will be immediately flushed on harts concurrently > -- > 2.34.1 > _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2] riscv: mm: Fix incorrect ASID argument when flushing TLB 2023-03-14 2:22 ` Zong Li @ 2023-03-14 7:27 ` Dylan Jhong 2023-03-21 2:42 ` Dylan Jhong 0 siblings, 1 reply; 8+ messages in thread From: Dylan Jhong @ 2023-03-14 7:27 UTC (permalink / raw) To: Zong Li Cc: linux-kernel, linux-riscv, guoren, sergey.matyukevich, aou, palmer, paul.walmsley, x5710999x, tim609, peterlin, ycliang, alistair.francis On Tue, Mar 14, 2023 at 10:22:43AM +0800, Zong Li wrote: > Dylan Jhong <dylan@andestech.com> 於 2023年3月13日 週一 下午12:29寫道: > > > > Currently, we pass the CONTEXTID instead of the ASID to the TLB flush > > function. We should only take the ASID field to prevent from touching > > the reserved bit field. > > > > Fixes: 3f1e782998cd ("riscv: add ASID-based tlbflushing methods") > > Signed-off-by: Dylan Jhong <dylan@andestech.com> > > --- > > Hi Dylan, > Thanks for your patch, if I remember correctly, there was a patch from > Alistair Francis did the similar fix. Perhaps we should track that > patch to see why it doesn't be merged. Thanks. > > http://lists.infradead.org/pipermail/linux-riscv/2022-March/013558.html > Hi Zong, Thanks for the reminder, I didn't notice that Alistair had sent the same patch before. Hi Palmer, Alistair http://lists.infradead.org/pipermail/linux-riscv/2022-March/013597.html This patch does not seem to be cherry-picked back to the released linux kernel, and I have not seen the v4 patch. May I ask how is the follow-up progress of this patch? Best, Dylan > > Changes from v2: > > - Remove unsued EXPORT_SYMBOL() > > --- > > arch/riscv/include/asm/tlbflush.h | 2 ++ > > arch/riscv/mm/context.c | 2 +- > > arch/riscv/mm/tlbflush.c | 2 +- > > 3 files changed, 4 insertions(+), 2 deletions(-) > > > > diff --git a/arch/riscv/include/asm/tlbflush.h b/arch/riscv/include/asm/tlbflush.h > > index 907b9efd39a8..597d6d8aec28 100644 > > --- a/arch/riscv/include/asm/tlbflush.h > > +++ b/arch/riscv/include/asm/tlbflush.h > > @@ -12,6 +12,8 @@ > > #include <asm/errata_list.h> > > > > #ifdef CONFIG_MMU > > +extern unsigned long asid_mask; > > + > > static inline void local_flush_tlb_all(void) > > { > > __asm__ __volatile__ ("sfence.vma" : : : "memory"); > > diff --git a/arch/riscv/mm/context.c b/arch/riscv/mm/context.c > > index 80ce9caba8d2..6d1aeb063e81 100644 > > --- a/arch/riscv/mm/context.c > > +++ b/arch/riscv/mm/context.c > > @@ -22,7 +22,7 @@ DEFINE_STATIC_KEY_FALSE(use_asid_allocator); > > > > static unsigned long asid_bits; > > static unsigned long num_asids; > > -static unsigned long asid_mask; > > +unsigned long asid_mask; > > > > static atomic_long_t current_version; > > > > diff --git a/arch/riscv/mm/tlbflush.c b/arch/riscv/mm/tlbflush.c > > index ce7dfc81bb3f..ba4c27187c95 100644 > > --- a/arch/riscv/mm/tlbflush.c > > +++ b/arch/riscv/mm/tlbflush.c > > @@ -27,7 +27,7 @@ static void __sbi_tlb_flush_range(struct mm_struct *mm, unsigned long start, > > /* check if the tlbflush needs to be sent to other CPUs */ > > broadcast = cpumask_any_but(cmask, cpuid) < nr_cpu_ids; > > if (static_branch_unlikely(&use_asid_allocator)) { > > - unsigned long asid = atomic_long_read(&mm->context.id); > > + unsigned long asid = atomic_long_read(&mm->context.id) & asid_mask; > > > > /* > > * TLB will be immediately flushed on harts concurrently > > -- > > 2.34.1 > > _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2] riscv: mm: Fix incorrect ASID argument when flushing TLB 2023-03-14 7:27 ` Dylan Jhong @ 2023-03-21 2:42 ` Dylan Jhong 2023-03-22 5:45 ` Palmer Dabbelt 0 siblings, 1 reply; 8+ messages in thread From: Dylan Jhong @ 2023-03-21 2:42 UTC (permalink / raw) To: Zong Li Cc: linux-kernel, linux-riscv, guoren, sergey.matyukevich, aou, palmer, paul.walmsley, x5710999x, tim609, peterlin, ycliang, alistair.francis On Tue, Mar 14, 2023 at 03:27:30PM +0800, Dylan Jhong wrote: > On Tue, Mar 14, 2023 at 10:22:43AM +0800, Zong Li wrote: > > Dylan Jhong <dylan@andestech.com> 於 2023年3月13日 週一 下午12:29寫道: > > > > > > Currently, we pass the CONTEXTID instead of the ASID to the TLB flush > > > function. We should only take the ASID field to prevent from touching > > > the reserved bit field. > > > > > > Fixes: 3f1e782998cd ("riscv: add ASID-based tlbflushing methods") > > > Signed-off-by: Dylan Jhong <dylan@andestech.com> > > > --- > > > > Hi Dylan, > > Thanks for your patch, if I remember correctly, there was a patch from > > Alistair Francis did the similar fix. Perhaps we should track that > > patch to see why it doesn't be merged. Thanks. > > > > http://lists.infradead.org/pipermail/linux-riscv/2022-March/013558.html > > > Hi Zong, > Thanks for the reminder, I didn't notice that Alistair had sent the same patch before. > > Hi Palmer, Alistair > http://lists.infradead.org/pipermail/linux-riscv/2022-March/013597.html > This patch does not seem to be cherry-picked back to the released linux kernel, > and I have not seen the v4 patch. May I ask how is the follow-up progress of this patch? > > Best, > Dylan > Hi Palmer, Ping. Any update on this? Best, Dylan > > > Changes from v2: > > > - Remove unsued EXPORT_SYMBOL() > > > --- > > > arch/riscv/include/asm/tlbflush.h | 2 ++ > > > arch/riscv/mm/context.c | 2 +- > > > arch/riscv/mm/tlbflush.c | 2 +- > > > 3 files changed, 4 insertions(+), 2 deletions(-) > > > > > > diff --git a/arch/riscv/include/asm/tlbflush.h b/arch/riscv/include/asm/tlbflush.h > > > index 907b9efd39a8..597d6d8aec28 100644 > > > --- a/arch/riscv/include/asm/tlbflush.h > > > +++ b/arch/riscv/include/asm/tlbflush.h > > > @@ -12,6 +12,8 @@ > > > #include <asm/errata_list.h> > > > > > > #ifdef CONFIG_MMU > > > +extern unsigned long asid_mask; > > > + > > > static inline void local_flush_tlb_all(void) > > > { > > > __asm__ __volatile__ ("sfence.vma" : : : "memory"); > > > diff --git a/arch/riscv/mm/context.c b/arch/riscv/mm/context.c > > > index 80ce9caba8d2..6d1aeb063e81 100644 > > > --- a/arch/riscv/mm/context.c > > > +++ b/arch/riscv/mm/context.c > > > @@ -22,7 +22,7 @@ DEFINE_STATIC_KEY_FALSE(use_asid_allocator); > > > > > > static unsigned long asid_bits; > > > static unsigned long num_asids; > > > -static unsigned long asid_mask; > > > +unsigned long asid_mask; > > > > > > static atomic_long_t current_version; > > > > > > diff --git a/arch/riscv/mm/tlbflush.c b/arch/riscv/mm/tlbflush.c > > > index ce7dfc81bb3f..ba4c27187c95 100644 > > > --- a/arch/riscv/mm/tlbflush.c > > > +++ b/arch/riscv/mm/tlbflush.c > > > @@ -27,7 +27,7 @@ static void __sbi_tlb_flush_range(struct mm_struct *mm, unsigned long start, > > > /* check if the tlbflush needs to be sent to other CPUs */ > > > broadcast = cpumask_any_but(cmask, cpuid) < nr_cpu_ids; > > > if (static_branch_unlikely(&use_asid_allocator)) { > > > - unsigned long asid = atomic_long_read(&mm->context.id); > > > + unsigned long asid = atomic_long_read(&mm->context.id) & asid_mask; > > > > > > /* > > > * TLB will be immediately flushed on harts concurrently > > > -- > > > 2.34.1 > > > _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2] riscv: mm: Fix incorrect ASID argument when flushing TLB 2023-03-21 2:42 ` Dylan Jhong @ 2023-03-22 5:45 ` Palmer Dabbelt 2023-03-23 20:47 ` Palmer Dabbelt 0 siblings, 1 reply; 8+ messages in thread From: Palmer Dabbelt @ 2023-03-22 5:45 UTC (permalink / raw) To: dylan Cc: zongbox, linux-kernel, linux-riscv, guoren, sergey.matyukevich, aou, Paul Walmsley, x5710999x, tim609, peterlin, ycliang, Alistair Francis On Mon, 20 Mar 2023 19:42:37 PDT (-0700), dylan@andestech.com wrote: > On Tue, Mar 14, 2023 at 03:27:30PM +0800, Dylan Jhong wrote: >> On Tue, Mar 14, 2023 at 10:22:43AM +0800, Zong Li wrote: >> > Dylan Jhong <dylan@andestech.com> 於 2023年3月13日 週一 下午12:29寫道: >> > > >> > > Currently, we pass the CONTEXTID instead of the ASID to the TLB flush >> > > function. We should only take the ASID field to prevent from touching >> > > the reserved bit field. >> > > >> > > Fixes: 3f1e782998cd ("riscv: add ASID-based tlbflushing methods") >> > > Signed-off-by: Dylan Jhong <dylan@andestech.com> >> > > --- >> > >> > Hi Dylan, >> > Thanks for your patch, if I remember correctly, there was a patch from >> > Alistair Francis did the similar fix. Perhaps we should track that >> > patch to see why it doesn't be merged. Thanks. >> > >> > http://lists.infradead.org/pipermail/linux-riscv/2022-March/013558.html >> > >> Hi Zong, >> Thanks for the reminder, I didn't notice that Alistair had sent the same patch before. >> >> Hi Palmer, Alistair >> http://lists.infradead.org/pipermail/linux-riscv/2022-March/013597.html >> This patch does not seem to be cherry-picked back to the released linux kernel, >> and I have not seen the v4 patch. May I ask how is the follow-up progress of this patch? Sorry about that, I guess I left it kind of vague as to who was doing what. It looks like we've ended up with enough includes that v3 actually builds now, it's queued up and should end up in fixes tomorrow morning. Thanks! >> >> Best, >> Dylan >> > > Hi Palmer, > > Ping. Any update on this? > > Best, > Dylan > >> > > Changes from v2: >> > > - Remove unsued EXPORT_SYMBOL() >> > > --- >> > > arch/riscv/include/asm/tlbflush.h | 2 ++ >> > > arch/riscv/mm/context.c | 2 +- >> > > arch/riscv/mm/tlbflush.c | 2 +- >> > > 3 files changed, 4 insertions(+), 2 deletions(-) >> > > >> > > diff --git a/arch/riscv/include/asm/tlbflush.h b/arch/riscv/include/asm/tlbflush.h >> > > index 907b9efd39a8..597d6d8aec28 100644 >> > > --- a/arch/riscv/include/asm/tlbflush.h >> > > +++ b/arch/riscv/include/asm/tlbflush.h >> > > @@ -12,6 +12,8 @@ >> > > #include <asm/errata_list.h> >> > > >> > > #ifdef CONFIG_MMU >> > > +extern unsigned long asid_mask; >> > > + >> > > static inline void local_flush_tlb_all(void) >> > > { >> > > __asm__ __volatile__ ("sfence.vma" : : : "memory"); >> > > diff --git a/arch/riscv/mm/context.c b/arch/riscv/mm/context.c >> > > index 80ce9caba8d2..6d1aeb063e81 100644 >> > > --- a/arch/riscv/mm/context.c >> > > +++ b/arch/riscv/mm/context.c >> > > @@ -22,7 +22,7 @@ DEFINE_STATIC_KEY_FALSE(use_asid_allocator); >> > > >> > > static unsigned long asid_bits; >> > > static unsigned long num_asids; >> > > -static unsigned long asid_mask; >> > > +unsigned long asid_mask; >> > > >> > > static atomic_long_t current_version; >> > > >> > > diff --git a/arch/riscv/mm/tlbflush.c b/arch/riscv/mm/tlbflush.c >> > > index ce7dfc81bb3f..ba4c27187c95 100644 >> > > --- a/arch/riscv/mm/tlbflush.c >> > > +++ b/arch/riscv/mm/tlbflush.c >> > > @@ -27,7 +27,7 @@ static void __sbi_tlb_flush_range(struct mm_struct *mm, unsigned long start, >> > > /* check if the tlbflush needs to be sent to other CPUs */ >> > > broadcast = cpumask_any_but(cmask, cpuid) < nr_cpu_ids; >> > > if (static_branch_unlikely(&use_asid_allocator)) { >> > > - unsigned long asid = atomic_long_read(&mm->context.id); >> > > + unsigned long asid = atomic_long_read(&mm->context.id) & asid_mask; >> > > >> > > /* >> > > * TLB will be immediately flushed on harts concurrently >> > > -- >> > > 2.34.1 >> > > _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2] riscv: mm: Fix incorrect ASID argument when flushing TLB 2023-03-22 5:45 ` Palmer Dabbelt @ 2023-03-23 20:47 ` Palmer Dabbelt 0 siblings, 0 replies; 8+ messages in thread From: Palmer Dabbelt @ 2023-03-23 20:47 UTC (permalink / raw) To: dylan Cc: zongbox, linux-kernel, linux-riscv, guoren, sergey.matyukevich, aou, Paul Walmsley, x5710999x, tim609, peterlin, ycliang, Alistair Francis On Tue, 21 Mar 2023 22:45:17 PDT (-0700), Palmer Dabbelt wrote: > On Mon, 20 Mar 2023 19:42:37 PDT (-0700), dylan@andestech.com wrote: >> On Tue, Mar 14, 2023 at 03:27:30PM +0800, Dylan Jhong wrote: >>> On Tue, Mar 14, 2023 at 10:22:43AM +0800, Zong Li wrote: >>> > Dylan Jhong <dylan@andestech.com> 於 2023年3月13日 週一 下午12:29寫道: >>> > > >>> > > Currently, we pass the CONTEXTID instead of the ASID to the TLB flush >>> > > function. We should only take the ASID field to prevent from touching >>> > > the reserved bit field. >>> > > >>> > > Fixes: 3f1e782998cd ("riscv: add ASID-based tlbflushing methods") >>> > > Signed-off-by: Dylan Jhong <dylan@andestech.com> >>> > > --- >>> > >>> > Hi Dylan, >>> > Thanks for your patch, if I remember correctly, there was a patch from >>> > Alistair Francis did the similar fix. Perhaps we should track that >>> > patch to see why it doesn't be merged. Thanks. >>> > >>> > http://lists.infradead.org/pipermail/linux-riscv/2022-March/013558.html >>> > >>> Hi Zong, >>> Thanks for the reminder, I didn't notice that Alistair had sent the same patch before. >>> >>> Hi Palmer, Alistair >>> http://lists.infradead.org/pipermail/linux-riscv/2022-March/013597.html >>> This patch does not seem to be cherry-picked back to the released linux kernel, >>> and I have not seen the v4 patch. May I ask how is the follow-up progress of this patch? > > Sorry about that, I guess I left it kind of vague as to who was doing > what. It looks like we've ended up with enough includes that v3 > actually builds now, it's queued up and should end up in fixes tomorrow > morning. Turns out that one still fails some configs, and the one posted here doesn't. So I've got the new one on fixes. Thanks! > > Thanks! > >>> >>> Best, >>> Dylan >>> >> >> Hi Palmer, >> >> Ping. Any update on this? >> >> Best, >> Dylan >> >>> > > Changes from v2: >>> > > - Remove unsued EXPORT_SYMBOL() >>> > > --- >>> > > arch/riscv/include/asm/tlbflush.h | 2 ++ >>> > > arch/riscv/mm/context.c | 2 +- >>> > > arch/riscv/mm/tlbflush.c | 2 +- >>> > > 3 files changed, 4 insertions(+), 2 deletions(-) >>> > > >>> > > diff --git a/arch/riscv/include/asm/tlbflush.h b/arch/riscv/include/asm/tlbflush.h >>> > > index 907b9efd39a8..597d6d8aec28 100644 >>> > > --- a/arch/riscv/include/asm/tlbflush.h >>> > > +++ b/arch/riscv/include/asm/tlbflush.h >>> > > @@ -12,6 +12,8 @@ >>> > > #include <asm/errata_list.h> >>> > > >>> > > #ifdef CONFIG_MMU >>> > > +extern unsigned long asid_mask; >>> > > + >>> > > static inline void local_flush_tlb_all(void) >>> > > { >>> > > __asm__ __volatile__ ("sfence.vma" : : : "memory"); >>> > > diff --git a/arch/riscv/mm/context.c b/arch/riscv/mm/context.c >>> > > index 80ce9caba8d2..6d1aeb063e81 100644 >>> > > --- a/arch/riscv/mm/context.c >>> > > +++ b/arch/riscv/mm/context.c >>> > > @@ -22,7 +22,7 @@ DEFINE_STATIC_KEY_FALSE(use_asid_allocator); >>> > > >>> > > static unsigned long asid_bits; >>> > > static unsigned long num_asids; >>> > > -static unsigned long asid_mask; >>> > > +unsigned long asid_mask; >>> > > >>> > > static atomic_long_t current_version; >>> > > >>> > > diff --git a/arch/riscv/mm/tlbflush.c b/arch/riscv/mm/tlbflush.c >>> > > index ce7dfc81bb3f..ba4c27187c95 100644 >>> > > --- a/arch/riscv/mm/tlbflush.c >>> > > +++ b/arch/riscv/mm/tlbflush.c >>> > > @@ -27,7 +27,7 @@ static void __sbi_tlb_flush_range(struct mm_struct *mm, unsigned long start, >>> > > /* check if the tlbflush needs to be sent to other CPUs */ >>> > > broadcast = cpumask_any_but(cmask, cpuid) < nr_cpu_ids; >>> > > if (static_branch_unlikely(&use_asid_allocator)) { >>> > > - unsigned long asid = atomic_long_read(&mm->context.id); >>> > > + unsigned long asid = atomic_long_read(&mm->context.id) & asid_mask; >>> > > >>> > > /* >>> > > * TLB will be immediately flushed on harts concurrently >>> > > -- >>> > > 2.34.1 >>> > > _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2] riscv: mm: Fix incorrect ASID argument when flushing TLB 2023-03-13 3:49 [PATCH v2] riscv: mm: Fix incorrect ASID argument when flushing TLB Dylan Jhong 2023-03-13 5:58 ` Sergey Matyukevich 2023-03-14 2:22 ` Zong Li @ 2023-03-23 21:00 ` patchwork-bot+linux-riscv 2 siblings, 0 replies; 8+ messages in thread From: patchwork-bot+linux-riscv @ 2023-03-23 21:00 UTC (permalink / raw) To: Dylan Jhong Cc: linux-riscv, linux-kernel, guoren, sergey.matyukevich, aou, palmer, paul.walmsley, x5710999x, tim609, peterlin, ycliang Hello: This patch was applied to riscv/linux.git (fixes) by Palmer Dabbelt <palmer@rivosinc.com>: On Mon, 13 Mar 2023 11:49:06 +0800 you wrote: > Currently, we pass the CONTEXTID instead of the ASID to the TLB flush > function. We should only take the ASID field to prevent from touching > the reserved bit field. > > Fixes: 3f1e782998cd ("riscv: add ASID-based tlbflushing methods") > Signed-off-by: Dylan Jhong <dylan@andestech.com> > > [...] Here is the summary with links: - [v2] riscv: mm: Fix incorrect ASID argument when flushing TLB https://git.kernel.org/riscv/c/9a801afd3eb9 You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2023-03-23 21:00 UTC | newest] Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2023-03-13 3:49 [PATCH v2] riscv: mm: Fix incorrect ASID argument when flushing TLB Dylan Jhong 2023-03-13 5:58 ` Sergey Matyukevich 2023-03-14 2:22 ` Zong Li 2023-03-14 7:27 ` Dylan Jhong 2023-03-21 2:42 ` Dylan Jhong 2023-03-22 5:45 ` Palmer Dabbelt 2023-03-23 20:47 ` Palmer Dabbelt 2023-03-23 21:00 ` patchwork-bot+linux-riscv
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).