From: Andrew Donnellan <ajd@linux.ibm.com>
To: Benjamin Gray <bgray@linux.ibm.com>, linuxppc-dev@lists.ozlabs.org
Cc: peterz@infradead.org, npiggin@gmail.com, ardb@kernel.org,
jbaron@akamai.com, rostedt@goodmis.org, jpoimboe@kernel.org
Subject: Re: [PATCH v3 3/6] powerpc/module: Optimise nearby branches in ELF V2 ABI stub
Date: Thu, 06 Oct 2022 19:24:52 +1100 [thread overview]
Message-ID: <2e13f9e24866c493c2ec656d3ca625df9f4ca14f.camel@linux.ibm.com> (raw)
In-Reply-To: <20221005053234.29312-4-bgray@linux.ibm.com>
On Wed, 2022-10-05 at 16:32 +1100, Benjamin Gray wrote:
> Inserts a direct branch to the stub target when possible, replacing
> the
> mtctr/btctr sequence.
>
> The load into r12 could potentially be skipped too, but that change
> would need to refactor the arguments to indicate that the address
> does not have a separate local entry point.
>
> This helps the static call implementation, where modules calling
> their
> own trampolines are called through this stub and the trampoline is
> easily within range of a direct branch.
>
> Signed-off-by: Benjamin Gray <bgray@linux.ibm.com>
I'm not well versed in this code but nothing stands out as problematic
and it makes sense.
Reviewed-by: Andrew Donnellan <ajd@linux.ibm.com>
> ---
> arch/powerpc/kernel/module_64.c | 12 ++++++++++++
> 1 file changed, 12 insertions(+)
>
> diff --git a/arch/powerpc/kernel/module_64.c
> b/arch/powerpc/kernel/module_64.c
> index 4d816f7785b4..13ce7a4d8a8d 100644
> --- a/arch/powerpc/kernel/module_64.c
> +++ b/arch/powerpc/kernel/module_64.c
> @@ -141,6 +141,12 @@ static u32 ppc64_stub_insns[] = {
> PPC_RAW_BCTR(),
> };
>
> +#ifdef CONFIG_PPC64_ELF_ABI_V1
> +#define PPC64_STUB_MTCTR_OFFSET 5
> +#else
> +#define PPC64_STUB_MTCTR_OFFSET 4
> +#endif
> +
> /* Count how many different 24-bit relocations (different symbol,
> different addend) */
> static unsigned int count_relocs(const Elf64_Rela *rela, unsigned
> int num)
> @@ -426,6 +432,7 @@ static inline int create_stub(const Elf64_Shdr
> *sechdrs,
> struct module *me,
> const char *name)
> {
> + int err;
> long reladdr;
> func_desc_t desc;
> int i;
> @@ -439,6 +446,11 @@ static inline int create_stub(const Elf64_Shdr
> *sechdrs,
> return 0;
> }
>
> + /* Replace indirect branch sequence with direct branch where
> possible */
> + err = patch_branch(&entry->jump[PPC64_STUB_MTCTR_OFFSET],
> addr, 0);
> + if (err && err != -ERANGE)
> + return 0;
> +
> /* Stub uses address relative to r2. */
> reladdr = (unsigned long)entry - my_r2(sechdrs, me);
> if (reladdr > 0x7FFFFFFF || reladdr < -(0x80000000L)) {
--
Andrew Donnellan OzLabs, ADL Canberra
ajd@linux.ibm.com IBM Australia Limited
next prev parent reply other threads:[~2022-10-06 8:26 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-05 5:32 [PATCH v3 0/6] Out-of-line static calls for powerpc64 ELF V2 Benjamin Gray
2022-10-05 5:32 ` [PATCH v3 1/6] powerpc/code-patching: Implement generic text patching function Benjamin Gray
2022-10-05 17:55 ` Christophe Leroy
2022-10-06 3:36 ` Benjamin Gray
2022-10-06 9:19 ` Christophe Leroy
2022-10-06 21:53 ` Benjamin Gray
2022-10-05 5:32 ` [PATCH v3 2/6] powerpc/module: Handle caller-saved TOC in module linker Benjamin Gray
2022-10-05 19:18 ` Christophe Leroy
2022-10-06 3:51 ` Andrew Donnellan
2022-10-06 4:39 ` Benjamin Gray
2022-10-05 5:32 ` [PATCH v3 3/6] powerpc/module: Optimise nearby branches in ELF V2 ABI stub Benjamin Gray
2022-10-05 19:21 ` Christophe Leroy
2022-10-06 8:24 ` Andrew Donnellan [this message]
2022-10-05 5:32 ` [PATCH v3 4/6] static_call: Move static call selftest to static_call_selftest.c Benjamin Gray
2022-10-05 19:22 ` Christophe Leroy
2022-10-05 5:32 ` [PATCH v3 5/6] powerpc/64: Add support for out-of-line static calls Benjamin Gray
2022-10-05 19:38 ` Christophe Leroy
2022-10-06 0:39 ` Michael Ellerman
2022-10-06 5:01 ` Benjamin Gray
2022-10-06 18:22 ` Segher Boessenkool
2022-10-06 18:38 ` Christophe Leroy
2022-10-06 20:45 ` Segher Boessenkool
2022-10-06 20:50 ` Christophe Leroy
2022-10-06 21:04 ` Segher Boessenkool
2022-10-05 5:32 ` [PATCH v3 6/6] powerpc: Add tests " Benjamin Gray
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=2e13f9e24866c493c2ec656d3ca625df9f4ca14f.camel@linux.ibm.com \
--to=ajd@linux.ibm.com \
--cc=ardb@kernel.org \
--cc=bgray@linux.ibm.com \
--cc=jbaron@akamai.com \
--cc=jpoimboe@kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=npiggin@gmail.com \
--cc=peterz@infradead.org \
--cc=rostedt@goodmis.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).