From: Helge Deller <deller@gmx.de>
To: Mark Rutland <mark.rutland@arm.com>,
linux-arm-kernel@lists.infradead.org,
Jessica Yu <jeyu@kernel.org>,
"James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
Cc: linux-kernel@vger.kernel.org, amit.kachhap@arm.com,
catalin.marinas@arm.com, duwe@suse.de, james.morse@arm.com,
jpoimboe@redhat.com, jthierry@redhat.com,
linux-parisc@vger.kernel.org, mingo@redhat.com,
peterz@infradead.org, rostedt@goodmis.org, svens@stackframe.org,
takahiro.akashi@linaro.org, will@kernel.org
Subject: Re: [PATCHv2 2/8] module/ftrace: handle patchable-function-entry
Date: Mon, 4 Nov 2019 21:58:26 +0100 [thread overview]
Message-ID: <ac753055-1542-1636-b95a-bac5c3014643@gmx.de> (raw)
In-Reply-To: <20191104155132.GA1643@lakrids.cambridge.arm.com>
Hi Mark,
On 04.11.19 16:51, Mark Rutland wrote:
> Hi Jessica, Helge,
>
> Are you ok with the module and parisc changes, repectively?
Sure, please add my:
Acked-by: Helge Deller <deller@gmx.de>
Helge
> The kbuild test robot is happy building this for multiple architectures,
> Sven has tested that this works correctly on parisc, and others have
> tested other architectures.
>
> I'd like to queue this in the arm64 tree soon if possible.
>
> Thanks,
> Mark.
>
> On Tue, Oct 29, 2019 at 04:58:26PM +0000, Mark Rutland wrote:
>> When using patchable-function-entry, the compiler will record the
>> callsites into a section named "__patchable_function_entries" rather
>> than "__mcount_loc". Let's abstract this difference behind a new
>> FTRACE_CALLSITE_SECTION, so that architectures don't have to handle this
>> explicitly (e.g. with custom module linker scripts).
>>
>> As parisc currently handles this explicitly, it is fixed up accordingly,
>> with its custom linker script removed. Since FTRACE_CALLSITE_SECTION is
>> only defined when DYNAMIC_FTRACE is selected, the parisc module loading
>> code is updated to only use the definition in that case. When
>> DYNAMIC_FTRACE is not selected, modules shouldn't have this section, so
>> this removes some redundant work in that case.
>>
>> I built parisc generic-{32,64}bit_defconfig with DYNAMIC_FTRACE enabled,
>> and verified that the section made it into the .ko files for modules.
>>
>> Signed-off-by: Mark Rutland <mark.rutland@arm.com>
>> Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
>> Cc: Helge Deller <deller@gmx.de>
>> Cc: Ingo Molnar <mingo@redhat.com>
>> Cc: James E.J. Bottomley <James.Bottomley@HansenPartnership.com>
>> Cc: Jessica Yu <jeyu@kernel.org>
>> Cc: Steven Rostedt <rostedt@goodmis.org>
>> Cc: Sven Schnelle <svens@stackframe.org>
>> Cc: linux-parisc@vger.kernel.org
>> ---
>> arch/parisc/Makefile | 1 -
>> arch/parisc/kernel/module.c | 10 +++++++---
>> arch/parisc/kernel/module.lds | 7 -------
>> include/linux/ftrace.h | 5 +++++
>> kernel/module.c | 2 +-
>> 5 files changed, 13 insertions(+), 12 deletions(-)
>> delete mode 100644 arch/parisc/kernel/module.lds
>>
>> diff --git a/arch/parisc/Makefile b/arch/parisc/Makefile
>> index 36b834f1c933..dca8f2de8cf5 100644
>> --- a/arch/parisc/Makefile
>> +++ b/arch/parisc/Makefile
>> @@ -60,7 +60,6 @@ KBUILD_CFLAGS += -DCC_USING_PATCHABLE_FUNCTION_ENTRY=1 \
>> -DFTRACE_PATCHABLE_FUNCTION_SIZE=$(NOP_COUNT)
>>
>> CC_FLAGS_FTRACE := -fpatchable-function-entry=$(NOP_COUNT),$(shell echo $$(($(NOP_COUNT)-1)))
>> -KBUILD_LDS_MODULE += $(srctree)/arch/parisc/kernel/module.lds
>> endif
>>
>> OBJCOPY_FLAGS =-O binary -R .note -R .comment -S
>> diff --git a/arch/parisc/kernel/module.c b/arch/parisc/kernel/module.c
>> index ac5f34993b53..1c50093e2ebe 100644
>> --- a/arch/parisc/kernel/module.c
>> +++ b/arch/parisc/kernel/module.c
>> @@ -43,6 +43,7 @@
>> #include <linux/elf.h>
>> #include <linux/vmalloc.h>
>> #include <linux/fs.h>
>> +#include <linux/ftrace.h>
>> #include <linux/string.h>
>> #include <linux/kernel.h>
>> #include <linux/bug.h>
>> @@ -862,7 +863,7 @@ int module_finalize(const Elf_Ehdr *hdr,
>> const char *strtab = NULL;
>> const Elf_Shdr *s;
>> char *secstrings;
>> - int err, symindex = -1;
>> + int symindex = -1;
>> Elf_Sym *newptr, *oldptr;
>> Elf_Shdr *symhdr = NULL;
>> #ifdef DEBUG
>> @@ -946,11 +947,13 @@ int module_finalize(const Elf_Ehdr *hdr,
>> /* patch .altinstructions */
>> apply_alternatives(aseg, aseg + s->sh_size, me->name);
>>
>> +#ifdef CONFIG_DYNAMIC_FTRACE
>> /* For 32 bit kernels we're compiling modules with
>> * -ffunction-sections so we must relocate the addresses in the
>> - *__mcount_loc section.
>> + * ftrace callsite section.
>> */
>> - if (symindex != -1 && !strcmp(secname, "__mcount_loc")) {
>> + if (symindex != -1 && !strcmp(secname, FTRACE_CALLSITE_SECTION)) {
>> + int err;
>> if (s->sh_type == SHT_REL)
>> err = apply_relocate((Elf_Shdr *)sechdrs,
>> strtab, symindex,
>> @@ -962,6 +965,7 @@ int module_finalize(const Elf_Ehdr *hdr,
>> if (err)
>> return err;
>> }
>> +#endif
>> }
>> return 0;
>> }
>> diff --git a/arch/parisc/kernel/module.lds b/arch/parisc/kernel/module.lds
>> deleted file mode 100644
>> index 1a9a92aca5c8..000000000000
>> --- a/arch/parisc/kernel/module.lds
>> +++ /dev/null
>> @@ -1,7 +0,0 @@
>> -/* SPDX-License-Identifier: GPL-2.0 */
>> -
>> -SECTIONS {
>> - __mcount_loc : {
>> - *(__patchable_function_entries)
>> - }
>> -}
>> diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h
>> index 9867d90d635e..9141f2263286 100644
>> --- a/include/linux/ftrace.h
>> +++ b/include/linux/ftrace.h
>> @@ -738,6 +738,11 @@ static inline unsigned long get_lock_parent_ip(void)
>>
>> #ifdef CONFIG_FTRACE_MCOUNT_RECORD
>> extern void ftrace_init(void);
>> +#ifdef CC_USING_PATCHABLE_FUNCTION_ENTRY
>> +#define FTRACE_CALLSITE_SECTION "__patchable_function_entries"
>> +#else
>> +#define FTRACE_CALLSITE_SECTION "__mcount_loc"
>> +#endif
>> #else
>> static inline void ftrace_init(void) { }
>> #endif
>> diff --git a/kernel/module.c b/kernel/module.c
>> index ff2d7359a418..acf7962936c4 100644
>> --- a/kernel/module.c
>> +++ b/kernel/module.c
>> @@ -3222,7 +3222,7 @@ static int find_module_sections(struct module *mod, struct load_info *info)
>> #endif
>> #ifdef CONFIG_FTRACE_MCOUNT_RECORD
>> /* sechdrs[0].sh_size is always zero */
>> - mod->ftrace_callsites = section_objs(info, "__mcount_loc",
>> + mod->ftrace_callsites = section_objs(info, FTRACE_CALLSITE_SECTION,
>> sizeof(*mod->ftrace_callsites),
>> &mod->num_ftrace_callsites);
>> #endif
>> --
>> 2.11.0
>>
next prev parent reply other threads:[~2019-11-04 20:59 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-29 16:58 [PATCHv2 0/8] arm64: ftrace cleanup + FTRACE_WITH_REGS Mark Rutland
2019-10-29 16:58 ` [PATCHv2 1/8] ftrace: add ftrace_init_nop() Mark Rutland
2019-10-30 15:00 ` Miroslav Benes
2019-11-02 12:19 ` Amit Daniel Kachhap
2019-11-04 13:11 ` Steven Rostedt
2019-11-05 6:59 ` Amit Kachhap
2019-11-04 13:36 ` Mark Rutland
2019-11-05 6:47 ` Amit Kachhap
2019-11-06 14:15 ` Mark Rutland
2019-11-07 4:40 ` Amit Kachhap
2019-11-04 13:16 ` Steven Rostedt
2019-11-04 13:38 ` Mark Rutland
2019-11-04 13:53 ` Steven Rostedt
2019-10-29 16:58 ` [PATCHv2 2/8] module/ftrace: handle patchable-function-entry Mark Rutland
2019-10-30 15:03 ` Torsten Duwe
2019-10-31 9:02 ` Mark Rutland
2019-10-31 11:42 ` Torsten Duwe
2019-10-31 13:00 ` Mark Rutland
2019-11-04 13:28 ` Steven Rostedt
2019-11-04 14:00 ` Mark Rutland
2019-11-04 13:25 ` Steven Rostedt
2019-11-04 15:51 ` Mark Rutland
2019-11-04 20:58 ` Helge Deller [this message]
2019-11-05 8:59 ` Miroslav Benes
2019-10-29 16:58 ` [PATCHv2 3/8] arm64: module: rework special section handling Mark Rutland
2019-10-30 15:25 ` Miroslav Benes
2019-10-29 16:58 ` [PATCHv2 4/8] arm64: module/ftrace: intialize PLT at load time Mark Rutland
2019-11-02 12:20 ` Amit Daniel Kachhap
2019-11-04 13:55 ` Mark Rutland
2019-10-29 16:58 ` [PATCHv2 5/8] arm64: insn: add encoder for MOV (register) Mark Rutland
2019-10-29 16:58 ` [PATCHv2 6/8] arm64: asm-offsets: add S_FP Mark Rutland
2019-10-29 16:58 ` [PATCHv2 7/8] arm64: implement ftrace with regs Mark Rutland
2019-11-02 12:21 ` Amit Daniel Kachhap
2019-11-04 13:51 ` Mark Rutland
[not found] ` <CANW9uyug8WKN2fR-FmcW-C_OO_OQ_AvukM+BR7wqiJ9eFQMO9Q@mail.gmail.com>
2019-11-15 7:45 ` Torsten Duwe
2019-11-15 13:59 ` Mark Rutland
2019-10-29 16:58 ` [PATCHv2 8/8] arm64: ftrace: minimize ifdeffery Mark Rutland
2019-10-30 17:02 ` [PATCHv2 0/8] arm64: ftrace cleanup + FTRACE_WITH_REGS Torsten Duwe
2019-10-31 17:16 ` Torsten Duwe
2019-11-01 9:08 ` Mark Rutland
2019-11-01 15:39 ` Sven Schnelle
2019-11-01 16:28 ` Mark Rutland
2019-11-02 12:12 ` Amit Daniel Kachhap
2019-11-04 12:56 ` Will Deacon
2019-11-04 13:03 ` Amit Kachhap
2019-11-04 14:04 ` Mark Rutland
2019-11-05 7:06 ` Amit Kachhap
2019-11-07 11:31 ` Catalin Marinas
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=ac753055-1542-1636-b95a-bac5c3014643@gmx.de \
--to=deller@gmx.de \
--cc=James.Bottomley@HansenPartnership.com \
--cc=amit.kachhap@arm.com \
--cc=catalin.marinas@arm.com \
--cc=duwe@suse.de \
--cc=james.morse@arm.com \
--cc=jeyu@kernel.org \
--cc=jpoimboe@redhat.com \
--cc=jthierry@redhat.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-parisc@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=rostedt@goodmis.org \
--cc=svens@stackframe.org \
--cc=takahiro.akashi@linaro.org \
--cc=will@kernel.org \
/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 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).