[v1] LoongArch/tlb: fix "error: parameter 'ptep' set but not used" due to __tlb_remove_tlb_entry()

Commit Message

David Hildenbrand April 16, 2024, 2:49 p.m. UTC

With LLVM=1 and W=1 we get:

  ./include/asm-generic/tlb.h:629:10: error: parameter 'ptep' set
  but not used [-Werror,-Wunused-but-set-parameter]

We fixed a similar issue via Arnd in the introducing commit, missed the
loongarch variant. Turns out, there is no need for loongarch to have a
custom variant, so let's just drop it and rely on the asm-generic one.

Reported-by: Miguel Ojeda <[e-mail]>
Closes: https://lkml.kernel.org/r/[e-mail]
Fixes: 4d5bf0b6183f ("mm/mmu_gather: add tlb_remove_tlb_entries()")
Tested-by: Arnd Bergmann <[e-mail]>
Cc: Andrew Morton <[e-mail]>
Cc: Huacai Chen <[e-mail]>
Cc: WANG Xuerui <[e-mail]>
Cc: Nathan Chancellor <[e-mail]>
Signed-off-by: David Hildenbrand <[e-mail]>
---
 arch/loongarch/include/asm/tlb.h | 2 --
 1 file changed, 2 deletions(-)

Comments

Miguel Ojeda April 16, 2024, 7:24 p.m. UTC | #1

On Tue, Apr 16, 2024 at 4:49 PM David Hildenbrand <[e-mail]> wrote:
>
> With LLVM=1 and W=1 we get:

Hmm... I didn't need W=1 to trigger it (LLVM 18.1.2).

> Reported-by: Miguel Ojeda <[e-mail]>

Thanks, looks good to me -- built-tested:

Reviewed-by: Miguel Ojeda <[e-mail]>
Tested-by: Miguel Ojeda <[e-mail]>

Cheers,
Miguel

Huacai Chen April 17, 2024, 3:18 a.m. UTC | #2

Queued for loongarch-fixes, thanks.

Huacai

On Wed, Apr 17, 2024 at 3:25 AM Miguel Ojeda
<[e-mail]> wrote:
>
> On Tue, Apr 16, 2024 at 4:49 PM David Hildenbrand <[e-mail]> wrote:
> >
> > With LLVM=1 and W=1 we get:
>
> Hmm... I didn't need W=1 to trigger it (LLVM 18.1.2).
>
> > Reported-by: Miguel Ojeda <[e-mail]>
>
> Thanks, looks good to me -- built-tested:
>
> Reviewed-by: Miguel Ojeda <[e-mail]>
> Tested-by: Miguel Ojeda <[e-mail]>
>
> Cheers,
> Miguel

Andrew Morton April 17, 2024, 8:58 p.m. UTC | #3

On Wed, 17 Apr 2024 11:18:27 +0800 Huacai Chen <[e-mail]> wrote:

> On Wed, Apr 17, 2024 at 3:25 AM Miguel Ojeda
> <[e-mail]> wrote:
> >
> > On Tue, Apr 16, 2024 at 4:49 PM David Hildenbrand <[e-mail]> wrote:
> > >
> > > With LLVM=1 and W=1 we get:
> >
> > Hmm... I didn't need W=1 to trigger it (LLVM 18.1.2).
> >
> > > Reported-by: Miguel Ojeda <[e-mail]>
> >
> > Thanks, looks good to me -- built-tested:
> >
> > Reviewed-by: Miguel Ojeda <[e-mail]>
> > Tested-by: Miguel Ojeda <[e-mail]>
> >
>
> Queued for loongarch-fixes, thanks.
> 

(top-posting repaired so I can sensibly reply to this.  Please avoid
top-posting!)

I'd rather carry this in mm.git with your ack please.  Otherwise mm.git
won't compile without it and if I retain this patch we'll get
duplicate-patch emails from Stephen and I won't be able to merge
mm.git's mm-nonmm-stable tree into Linus until loongarch-fixes has
merged.

Huacai Chen April 18, 2024, 3:03 a.m. UTC | #4

Hi, Andrew,

On Thu, Apr 18, 2024 at 4:58 AM Andrew Morton <[e-mail]> wrote:
>
> On Wed, 17 Apr 2024 11:18:27 +0800 Huacai Chen <[e-mail]> wrote:
>
> > On Wed, Apr 17, 2024 at 3:25 AM Miguel Ojeda
> > <[e-mail]> wrote:
> > >
> > > On Tue, Apr 16, 2024 at 4:49 PM David Hildenbrand <[e-mail]> wrote:
> > > >
> > > > With LLVM=1 and W=1 we get:
> > >
> > > Hmm... I didn't need W=1 to trigger it (LLVM 18.1.2).
> > >
> > > > Reported-by: Miguel Ojeda <[e-mail]>
> > >
> > > Thanks, looks good to me -- built-tested:
> > >
> > > Reviewed-by: Miguel Ojeda <[e-mail]>
> > > Tested-by: Miguel Ojeda <[e-mail]>
> > >
> >
> > Queued for loongarch-fixes, thanks.
> >
>
> (top-posting repaired so I can sensibly reply to this.  Please avoid
> top-posting!)
Sorry, I only top-posting with "Queued ...", "Applied ..." because I
saw others do like this. If this is also unacceptable, I will not do
it again.

>
> I'd rather carry this in mm.git with your ack please.  Otherwise mm.git
> won't compile without it and if I retain this patch we'll get
> duplicate-patch emails from Stephen and I won't be able to merge
> mm.git's mm-nonmm-stable tree into Linus until loongarch-fixes has
> merged.
loongarch-next always merges loongarch-fixes, so when I apply a patch
it will be in linux-next. Now this patch I have already applied to
loongarch-fixes and loongarch-next. In future, I will give an Acked-by
for you if needed.

Huacai

>
>

Patch

diff --git a/arch/loongarch/include/asm/tlb.h b/arch/loongarch/include/asm/tlb.h
index da7a3b5b9374a..e071f5e9e8580 100644
--- a/arch/loongarch/include/asm/tlb.h
+++ b/arch/loongarch/include/asm/tlb.h
@@ -132,8 +132,6 @@  static __always_inline void invtlb_all(u32 op, u32 info, u64 addr)
 		);
 }
 
-#define __tlb_remove_tlb_entry(tlb, ptep, address) do { } while (0)
-
 static void tlb_flush(struct mmu_gather *tlb);
 
 #define tlb_flush tlb_flush