From: Nathan Chancellor <nathan@kernel.org>
To: Steven Rostedt <rostedt@goodmis.org>
Cc: linux-kernel@vger.kernel.org,
Masami Hiramatsu <mhiramat@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Mathieu Desnoyers <mathieu.desnoyers@efficios.com>,
Andrew Morton <akpm@linux-foundation.org>,
bpf <bpf@vger.kernel.org>, Peter Zijlstra <peterz@infradead.org>,
Linus Torvalds <torvalds@linux-foundation.org>,
Masahiro Yamada <masahiroy@kernel.org>,
Nicolas Schier <nicolas@fjasle.eu>,
Zheng Yejian <zhengyejian1@huawei.com>,
Martin Kelly <martin.kelly@crowdstrike.com>,
Christophe Leroy <christophe.leroy@csgroup.eu>,
Josh Poimboeuf <jpoimboe@redhat.com>,
Heiko Carstens <hca@linux.ibm.com>,
Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will@kernel.org>, Vasily Gorbik <gor@linux.ibm.com>,
Alexander Gordeev <agordeev@linux.ibm.com>
Subject: Re: [for-next][PATCH 4/6] scripts/sorttable: Zero out weak functions in mcount_loc table
Date: Mon, 24 Feb 2025 10:08:05 -0800 [thread overview]
Message-ID: <20250224180805.GA1536711@ax162> (raw)
In-Reply-To: <20250219151904.476350486@goodmis.org>
Hi Steve,
On Wed, Feb 19, 2025 at 10:18:19AM -0500, Steven Rostedt wrote:
> diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
> index 728ecda6e8d4..e3f89924f603 100644
> --- a/kernel/trace/ftrace.c
> +++ b/kernel/trace/ftrace.c
> @@ -7004,6 +7004,7 @@ static int ftrace_process_locs(struct module *mod,
> unsigned long count;
> unsigned long *p;
> unsigned long addr;
> + unsigned long kaslr;
> unsigned long flags = 0; /* Shut up gcc */
> int ret = -ENOMEM;
>
> @@ -7052,6 +7053,9 @@ static int ftrace_process_locs(struct module *mod,
> ftrace_pages->next = start_pg;
> }
>
> + /* For zeroed locations that were shifted for core kernel */
> + kaslr = !mod ? kaslr_offset() : 0;
> +
> p = start;
> pg = start_pg;
> while (p < end) {
> @@ -7063,7 +7067,7 @@ static int ftrace_process_locs(struct module *mod,
> * object files to satisfy alignments.
> * Skip any NULL pointers.
> */
> - if (!addr) {
> + if (!addr || addr == kaslr) {
> skipped++;
> continue;
> }
Our CI and KernelCI reports that this change as commit ef378c3b8233
("scripts/sorttable: Zero out weak functions in mcount_loc table") in
next-20250224 breaks when an architecture does not have kaslr_offset()
defined:
$ make -skj"$(nproc)" ARCH=arm CROSS_COMPILE=arm-linux-gnueabi- mrproper allmodconfig kernel/trace/ftrace.o
kernel/trace/ftrace.c: In function 'ftrace_process_locs':
kernel/trace/ftrace.c:7074:24: error: implicit declaration of function 'kaslr_offset' [-Wimplicit-function-declaration]
7074 | kaslr = !mod ? kaslr_offset() : 0;
| ^~~~~~~~~~~~
https://lore.kernel.org/CACo-S-0GeJjWWcrGvos_Avg2FwGU2tj2QZpgoHOvPT+YbyknSg@mail.gmail.com/
Cheers,
Nathan
next prev parent reply other threads:[~2025-02-24 18:08 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-19 15:18 [for-next][PATCH 0/6] ftrace: scripts/sorttable: Add arm64 and remove weak functions Steven Rostedt
2025-02-19 15:18 ` [for-next][PATCH 1/6] arm64: scripts/sorttable: Implement sorting mcount_loc at boot for arm64 Steven Rostedt
2025-02-19 15:18 ` [for-next][PATCH 2/6] scripts/sorttable: Have mcount rela sort use direct values Steven Rostedt
2025-02-19 15:18 ` [for-next][PATCH 3/6] scripts/sorttable: Always use an array for the mcount_loc sorting Steven Rostedt
2025-02-19 15:18 ` [for-next][PATCH 4/6] scripts/sorttable: Zero out weak functions in mcount_loc table Steven Rostedt
2025-02-24 18:08 ` Nathan Chancellor [this message]
2025-02-24 18:15 ` Steven Rostedt
2025-02-25 2:56 ` Nathan Chancellor
2025-02-25 3:28 ` Steven Rostedt
2025-02-25 15:47 ` Steven Rostedt
2025-02-25 18:00 ` Nathan Chancellor
2025-02-19 15:18 ` [for-next][PATCH 5/6] ftrace: Update the mcount_loc check of skipped entries Steven Rostedt
2025-02-19 15:18 ` [for-next][PATCH 6/6] ftrace: Have ftrace pages output reflect freed pages Steven Rostedt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250224180805.GA1536711@ax162 \
--to=nathan@kernel.org \
--cc=agordeev@linux.ibm.com \
--cc=akpm@linux-foundation.org \
--cc=bpf@vger.kernel.org \
--cc=catalin.marinas@arm.com \
--cc=christophe.leroy@csgroup.eu \
--cc=gor@linux.ibm.com \
--cc=hca@linux.ibm.com \
--cc=jpoimboe@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=martin.kelly@crowdstrike.com \
--cc=masahiroy@kernel.org \
--cc=mathieu.desnoyers@efficios.com \
--cc=mhiramat@kernel.org \
--cc=nicolas@fjasle.eu \
--cc=peterz@infradead.org \
--cc=rostedt@goodmis.org \
--cc=torvalds@linux-foundation.org \
--cc=will@kernel.org \
--cc=zhengyejian1@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.