| Message ID | 20230808-riscv_static-v1-1-9f3dc99dafe8@google.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | riscv: mm: fix 2 instances of -Wmissing-variable-declarations | expand |
| Context | Check | Description |
|---|---|---|
| conchuod/cover_letter | success | Single patches do not need cover letters |
| conchuod/tree_selection | success | Guessed tree name to be for-next at HEAD 174e8ac0272d |
| conchuod/fixes_present | success | Fixes tag not required for -next series |
| conchuod/maintainers_pattern | success | MAINTAINERS pattern errors before the patch: 4 and now 4 |
| conchuod/verify_signedoff | success | Signed-off-by tag matches author and committer |
| conchuod/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| conchuod/build_rv64_clang_allmodconfig | success | Errors and warnings before: 2786 this patch: 2786 |
| conchuod/module_param | success | Was 0 now: 0 |
| conchuod/build_rv64_gcc_allmodconfig | success | Errors and warnings before: 15671 this patch: 15671 |
| conchuod/build_rv32_defconfig | success | Build OK |
| conchuod/dtb_warn_rv64 | success | Errors and warnings before: 12 this patch: 12 |
| conchuod/header_inline | success | No static functions without inline keyword in header files |
| conchuod/checkpatch | warning | CHECK: Consider using #include <linux/pgtable.h> instead of <asm/pgtable.h> |
| conchuod/build_rv64_nommu_k210_defconfig | success | Build OK |
| conchuod/verify_fixes | success | No Fixes tag |
| conchuod/build_rv64_nommu_virt_defconfig | success | Build OK |
On Tue, Aug 08, 2023 at 09:15:41AM -0700, Nick Desaulniers wrote: > I'm looking to enable -Wmissing-variable-declarations behind W=1. 0day > bot spotted the following instance in ARCH=riscv builds: > > arch/riscv/mm/init.c:276:7: warning: no previous extern declaration > for non-static variable 'trampoline_pg_dir' > [-Wmissing-variable-declarations] > 276 | pgd_t trampoline_pg_dir[PTRS_PER_PGD] __page_aligned_bss; > | ^ > arch/riscv/mm/init.c:276:1: note: declare 'static' if the variable is > not intended to be used outside of this translation unit > 276 | pgd_t trampoline_pg_dir[PTRS_PER_PGD] __page_aligned_bss; > | ^ > arch/riscv/mm/init.c:279:7: warning: no previous extern declaration > for non-static variable 'early_pg_dir' > [-Wmissing-variable-declarations] > 279 | pgd_t early_pg_dir[PTRS_PER_PGD] __initdata __aligned(PAGE_SIZE); > | ^ > arch/riscv/mm/init.c:279:1: note: declare 'static' if the variable is > not intended to be used outside of this translation unit > 279 | pgd_t early_pg_dir[PTRS_PER_PGD] __initdata __aligned(PAGE_SIZE); > | ^ > > These symbols are referenced by more than one translation unit, so make > sure they're both declared and include the correct header for their > declarations. Finally, sort the list of includes to help keep them tidy. > > Reported-by: kernel test robot <lkp@intel.com> > Closes: https://lore.kernel.org/llvm/202308081000.tTL1ElTr-lkp@intel.com/ > Signed-off-by: Nick Desaulniers <ndesaulniers@google.com> > --- > arch/riscv/include/asm/pgtable.h | 1 + > arch/riscv/mm/init.c | 9 +++++---- > 2 files changed, 6 insertions(+), 4 deletions(-) > > diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h > index 75970ee2bda2..4c8c0f83a974 100644 > --- a/arch/riscv/include/asm/pgtable.h > +++ b/arch/riscv/include/asm/pgtable.h > @@ -188,6 +188,7 @@ extern struct pt_alloc_ops pt_ops __initdata; > #define PAGE_KERNEL_IO __pgprot(_PAGE_IOREMAP) > > extern pgd_t swapper_pg_dir[]; > +extern pgd_t trampoline_pg_dir[]; Missing early_pg_dir too? It looks like there is already a declaration in arch/riscv/mm/kasan_init.c that could be hoisted here? > > #ifdef CONFIG_TRANSPARENT_HUGEPAGE > static inline int pmd_present(pmd_t pmd) > diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c > index 9ce504737d18..cc0e06b4f223 100644 > --- a/arch/riscv/mm/init.c > +++ b/arch/riscv/mm/init.c > @@ -26,12 +26,13 @@ > #include <linux/kfence.h> > > #include <asm/fixmap.h> > -#include <asm/tlbflush.h> > -#include <asm/sections.h> > -#include <asm/soc.h> > #include <asm/io.h> > -#include <asm/ptdump.h> > #include <asm/numa.h> > +#include <asm/pgtable.h> > +#include <asm/ptdump.h> > +#include <asm/sections.h> > +#include <asm/soc.h> > +#include <asm/tlbflush.h> > > #include "../kernel/head.h" > > > --- > base-commit: 14f9643dc90adea074a0ffb7a17d337eafc6a5cc > change-id: 20230808-riscv_static-348036edcae7 > > Best regards, > -- > Nick Desaulniers <ndesaulniers@google.com> >
On Tue, Aug 8, 2023 at 9:24 AM Nathan Chancellor <nathan@kernel.org> wrote: > > On Tue, Aug 08, 2023 at 09:15:41AM -0700, Nick Desaulniers wrote: > > diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h > > index 75970ee2bda2..4c8c0f83a974 100644 > > --- a/arch/riscv/include/asm/pgtable.h > > +++ b/arch/riscv/include/asm/pgtable.h > > @@ -188,6 +188,7 @@ extern struct pt_alloc_ops pt_ops __initdata; > > #define PAGE_KERNEL_IO __pgprot(_PAGE_IOREMAP) > > > > extern pgd_t swapper_pg_dir[]; > > +extern pgd_t trampoline_pg_dir[]; > > Missing early_pg_dir too? It looks like there is already a declaration > in arch/riscv/mm/kasan_init.c that could be hoisted here? Yep, will respin. Good catch!
diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h index 75970ee2bda2..4c8c0f83a974 100644 --- a/arch/riscv/include/asm/pgtable.h +++ b/arch/riscv/include/asm/pgtable.h @@ -188,6 +188,7 @@ extern struct pt_alloc_ops pt_ops __initdata; #define PAGE_KERNEL_IO __pgprot(_PAGE_IOREMAP) extern pgd_t swapper_pg_dir[]; +extern pgd_t trampoline_pg_dir[]; #ifdef CONFIG_TRANSPARENT_HUGEPAGE static inline int pmd_present(pmd_t pmd) diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c index 9ce504737d18..cc0e06b4f223 100644 --- a/arch/riscv/mm/init.c +++ b/arch/riscv/mm/init.c @@ -26,12 +26,13 @@ #include <linux/kfence.h> #include <asm/fixmap.h> -#include <asm/tlbflush.h> -#include <asm/sections.h> -#include <asm/soc.h> #include <asm/io.h> -#include <asm/ptdump.h> #include <asm/numa.h> +#include <asm/pgtable.h> +#include <asm/ptdump.h> +#include <asm/sections.h> +#include <asm/soc.h> +#include <asm/tlbflush.h> #include "../kernel/head.h"
I'm looking to enable -Wmissing-variable-declarations behind W=1. 0day bot spotted the following instance in ARCH=riscv builds: arch/riscv/mm/init.c:276:7: warning: no previous extern declaration for non-static variable 'trampoline_pg_dir' [-Wmissing-variable-declarations] 276 | pgd_t trampoline_pg_dir[PTRS_PER_PGD] __page_aligned_bss; | ^ arch/riscv/mm/init.c:276:1: note: declare 'static' if the variable is not intended to be used outside of this translation unit 276 | pgd_t trampoline_pg_dir[PTRS_PER_PGD] __page_aligned_bss; | ^ arch/riscv/mm/init.c:279:7: warning: no previous extern declaration for non-static variable 'early_pg_dir' [-Wmissing-variable-declarations] 279 | pgd_t early_pg_dir[PTRS_PER_PGD] __initdata __aligned(PAGE_SIZE); | ^ arch/riscv/mm/init.c:279:1: note: declare 'static' if the variable is not intended to be used outside of this translation unit 279 | pgd_t early_pg_dir[PTRS_PER_PGD] __initdata __aligned(PAGE_SIZE); | ^ These symbols are referenced by more than one translation unit, so make sure they're both declared and include the correct header for their declarations. Finally, sort the list of includes to help keep them tidy. Reported-by: kernel test robot <lkp@intel.com> Closes: https://lore.kernel.org/llvm/202308081000.tTL1ElTr-lkp@intel.com/ Signed-off-by: Nick Desaulniers <ndesaulniers@google.com> --- arch/riscv/include/asm/pgtable.h | 1 + arch/riscv/mm/init.c | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) --- base-commit: 14f9643dc90adea074a0ffb7a17d337eafc6a5cc change-id: 20230808-riscv_static-348036edcae7 Best regards,