Message ID | 20221102170254.1925-1-jszhang@kernel.org (mailing list archive) |
---|---|
State | Accepted |
Commit | 74f6bb55c834da6d4bac24f44868202743189b2b |
Delegated to: | Palmer Dabbelt |
Headers | show |
Series | [v2] riscv: vdso: fix section overlapping under some conditions | expand |
Context | Check | Description |
---|---|---|
conchuod/cc_maintainers | warning | 1 maintainers not CCed: foo.bar@bar.com |
conchuod/patch_count | success | Link |
conchuod/cover_letter | success | Single patches do not need cover letters |
conchuod/tree_selection | success | Guessed tree name to be for-next |
conchuod/fixes_present | success | Fixes tag not required for -next series |
conchuod/verify_signedoff | success | Signed-off-by tag matches author and committer |
conchuod/kdoc | success | Errors and warnings before: 0 this patch: 0 |
conchuod/module_param | success | Was 0 now: 0 |
conchuod/build_warn_rv64 | fail | Errors and warnings before: 0 this patch: 0 |
conchuod/dtb_warn_rv64 | success | Errors and warnings before: 0 this patch: 0 |
conchuod/header_inline | success | No static functions without inline keyword in header files |
conchuod/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 7 lines checked |
conchuod/source_inline | success | Was 0 now: 0 |
conchuod/verify_fixes | success | No Fixes tag |
On Thu, Nov 03, 2022 at 01:02:54AM +0800, Jisheng Zhang wrote: > lkp reported a build error, I tried the config and can reproduce > build error as below: > > VDSOLD arch/riscv/kernel/vdso/vdso.so.dbg > ld.lld: error: section .note file range overlaps with .text > >>> .note range is [0x7C8, 0x803] > >>> .text range is [0x800, 0x1993] > > ld.lld: error: section .text file range overlaps with .dynamic > >>> .text range is [0x800, 0x1993] > >>> .dynamic range is [0x808, 0x937] > > ld.lld: error: section .note virtual address range overlaps with .text > >>> .note range is [0x7C8, 0x803] > >>> .text range is [0x800, 0x1993] > > Fix it by setting DISABLE_BRANCH_PROFILING which will disable branch > tracing for vdso, thus avoid useless _ftrace_annotated_branch section > and _ftrace_branch section. Although we can also fix it by removing > the hardcoded .text begin address, but I think that's another story > and should be put into another patch. > > Link: https://lore.kernel.org/lkml/202210122123.Cc4FPShJ-lkp@intel.com/#r > Reported-by: kernel test robot <lkp@intel.com> > Signed-off-by: Jisheng Zhang <jszhang@kernel.org> Gentle ping? This fix is still missing in mainline. > --- > > Since v1: > - fix the issue by setting DISABLE_BRANCH_PROFILING > > arch/riscv/kernel/vdso/Makefile | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/arch/riscv/kernel/vdso/Makefile b/arch/riscv/kernel/vdso/Makefile > index f2e065671e4d..d6092ff678fd 100644 > --- a/arch/riscv/kernel/vdso/Makefile > +++ b/arch/riscv/kernel/vdso/Makefile > @@ -17,6 +17,7 @@ vdso-syms += flush_icache > obj-vdso = $(patsubst %, %.o, $(vdso-syms)) note.o > > ccflags-y := -fno-stack-protector > +ccflags-y += -DDISABLE_BRANCH_PROFILING > > ifneq ($(c-gettimeofday-y),) > CFLAGS_vgettimeofday.o += -fPIC -include $(c-gettimeofday-y) > -- > 2.37.2 > > > _______________________________________________ > linux-riscv mailing list > linux-riscv@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-riscv
Hello: This patch was applied to riscv/linux.git (fixes) by Palmer Dabbelt <palmer@rivosinc.com>: On Thu, 3 Nov 2022 01:02:54 +0800 you wrote: > lkp reported a build error, I tried the config and can reproduce > build error as below: > > VDSOLD arch/riscv/kernel/vdso/vdso.so.dbg > ld.lld: error: section .note file range overlaps with .text > >>> .note range is [0x7C8, 0x803] > >>> .text range is [0x800, 0x1993] > > [...] Here is the summary with links: - [v2] riscv: vdso: fix section overlapping under some conditions https://git.kernel.org/riscv/c/74f6bb55c834 You are awesome, thank you!
diff --git a/arch/riscv/kernel/vdso/Makefile b/arch/riscv/kernel/vdso/Makefile index f2e065671e4d..d6092ff678fd 100644 --- a/arch/riscv/kernel/vdso/Makefile +++ b/arch/riscv/kernel/vdso/Makefile @@ -17,6 +17,7 @@ vdso-syms += flush_icache obj-vdso = $(patsubst %, %.o, $(vdso-syms)) note.o ccflags-y := -fno-stack-protector +ccflags-y += -DDISABLE_BRANCH_PROFILING ifneq ($(c-gettimeofday-y),) CFLAGS_vgettimeofday.o += -fPIC -include $(c-gettimeofday-y)