From: Hari Bathini <hbathini@linux.ibm.com>
To: linuxppc-dev <linuxppc-dev@lists.ozlabs.org>, bpf@vger.kernel.org
Cc: Song Liu <songliubraving@fb.com>,
Daniel Borkmann <daniel@iogearbox.net>,
Alexei Starovoitov <ast@kernel.org>,
Andrii Nakryiko <andrii@kernel.org>,
"Naveen N. Rao" <naveen.n.rao@linux.ibm.com>
Subject: [PATCH v4 5/5] powerpc/bpf: use patch_instructions()
Date: Fri, 8 Sep 2023 18:57:40 +0530 [thread overview]
Message-ID: <20230908132740.718103-6-hbathini@linux.ibm.com> (raw)
In-Reply-To: <20230908132740.718103-1-hbathini@linux.ibm.com>
Use the newly introduced patch_instructions() that handles patching
multiple instructions with one call. This improves speed of exectution
for JIT'ing bpf programs.
Without this patch (on a POWER9 lpar):
# time modprobe test_bpf
real 2m59.681s
user 0m0.000s
sys 1m44.160s
#
With this patch (on a POWER9 lpar):
# time modprobe test_bpf
real 0m5.013s
user 0m0.000s
sys 0m4.216s
#
Signed-off-by: Hari Bathini <hbathini@linux.ibm.com>
---
arch/powerpc/net/bpf_jit_comp.c | 34 ++++++---------------------------
1 file changed, 6 insertions(+), 28 deletions(-)
diff --git a/arch/powerpc/net/bpf_jit_comp.c b/arch/powerpc/net/bpf_jit_comp.c
index c89ff34504a1..1e5000d18321 100644
--- a/arch/powerpc/net/bpf_jit_comp.c
+++ b/arch/powerpc/net/bpf_jit_comp.c
@@ -26,28 +26,6 @@ static void bpf_jit_fill_ill_insns(void *area, unsigned int size)
memset32(area, BREAKPOINT_INSTRUCTION, size / 4);
}
-/*
- * Patch 'len' bytes of instructions from opcode to addr, one instruction
- * at a time. Returns addr on success. ERR_PTR(-EINVAL), otherwise.
- */
-static void *bpf_patch_instructions(void *addr, void *opcode, size_t len, bool fill_insn)
-{
- while (len > 0) {
- ppc_inst_t insn = ppc_inst_read(opcode);
- int ilen = ppc_inst_len(insn);
-
- if (patch_instruction(addr, insn))
- return ERR_PTR(-EINVAL);
-
- len -= ilen;
- addr = addr + ilen;
- if (!fill_insn)
- opcode = opcode + ilen;
- }
-
- return addr;
-}
-
int bpf_jit_emit_exit_insn(u32 *image, struct codegen_context *ctx, int tmp_reg, long exit_addr)
{
if (!exit_addr || is_offset_in_branch_range(exit_addr - (ctx->idx * 4))) {
@@ -330,31 +308,31 @@ int bpf_add_extable_entry(struct bpf_prog *fp, u32 *image, u32 *fimage, int pass
void *bpf_arch_text_copy(void *dst, void *src, size_t len)
{
- void *ret;
+ int err;
if (WARN_ON_ONCE(core_kernel_text((unsigned long)dst)))
return ERR_PTR(-EINVAL);
mutex_lock(&text_mutex);
- ret = bpf_patch_instructions(dst, src, len, false);
+ err = patch_instructions(dst, src, len, false);
mutex_unlock(&text_mutex);
- return ret;
+ return err ? ERR_PTR(err) : dst;
}
int bpf_arch_text_invalidate(void *dst, size_t len)
{
u32 insn = BREAKPOINT_INSTRUCTION;
- void *ret;
+ int ret;
if (WARN_ON_ONCE(core_kernel_text((unsigned long)dst)))
return -EINVAL;
mutex_lock(&text_mutex);
- ret = bpf_patch_instructions(dst, &insn, len, true);
+ ret = patch_instructions(dst, &insn, len, true);
mutex_unlock(&text_mutex);
- return IS_ERR(ret) ? PTR_ERR(ret) : 0;
+ return ret;
}
void bpf_jit_free(struct bpf_prog *fp)
--
2.41.0
next prev parent reply other threads:[~2023-09-08 13:33 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-08 13:27 [PATCH v4 0/5] powerpc/bpf: use BPF prog pack allocator Hari Bathini
2023-09-08 13:27 ` [PATCH v4 1/5] powerpc/bpf: implement bpf_arch_text_copy Hari Bathini
2023-09-25 22:01 ` Song Liu
2023-09-08 13:27 ` [PATCH v4 2/5] powerpc/bpf: implement bpf_arch_text_invalidate for bpf_prog_pack Hari Bathini
2023-09-08 13:27 ` [PATCH v4 3/5] powerpc/bpf: use bpf_jit_binary_pack_[alloc|finalize|free] Hari Bathini
2023-09-25 22:15 ` Song Liu
2023-09-08 13:27 ` [PATCH v4 4/5] powerpc/code-patching: introduce patch_instructions() Hari Bathini
2023-09-25 22:50 ` Song Liu
2023-09-26 6:51 ` Christophe Leroy
2023-09-28 20:09 ` Hari Bathini
2023-09-08 13:27 ` Hari Bathini [this message]
2023-09-25 6:56 ` [PATCH v4 0/5] powerpc/bpf: use BPF prog pack allocator Hari Bathini
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=20230908132740.718103-6-hbathini@linux.ibm.com \
--to=hbathini@linux.ibm.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=naveen.n.rao@linux.ibm.com \
--cc=songliubraving@fb.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 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).