powerpc64/bpf: fix JIT code size calculation of bpf trampoline #8714
+23
−6
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![kernel-patches-daemon-bpf[bot]](https://avatars.githubusercontent.com/u/70728002?s=60&v=4){kind=small}
|
Upstream branch: 9aa8fe2 |
|
Upstream branch: 9aa8fe2 |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/947435=>bpf-next
branch
from
c3588fa to
c0e3c74
Compare
|
Upstream branch: 9aa8fe2 |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/947435=>bpf-next
branch
from
c0e3c74 to
8397e95
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
35ab59d to
bf339f7
Compare
|
Upstream branch: 9aa8fe2 |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/947435=>bpf-next
branch
from
8397e95 to
66328f6
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
bf339f7 to
9809c6b
Compare
|
Upstream branch: aa918db |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/947435=>bpf-next
branch
from
66328f6 to
f412339
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
9809c6b to
0a09ea9
Compare
|
Upstream branch: 4e82c87 |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/947435=>bpf-next
branch
from
f412339 to
95b9f5b
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
0a09ea9 to
1a03c01
Compare
|
Upstream branch: 4e82c87 |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/947435=>bpf-next
branch
from
95b9f5b to
e9d4cfe
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
1a03c01 to
a4b8db7
Compare
|
Upstream branch: 1e7857b |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/947435=>bpf-next
branch
from
e9d4cfe to
751ee52
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
a4b8db7 to
17475dd
Compare
|
Upstream branch: 1e7857b |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/947435=>bpf-next
branch
from
751ee52 to
8f382fc
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
17475dd to
f11a40d
Compare
The JIT compile of ldimm instructions can be anywhere between 1-5
instructions long depending on the value being loaded.
arch_bpf_trampoline_size() provides JIT size of the BPF trampoline
before the buffer for JIT'ing it is allocated. BPF trampoline JIT
code has ldimm instructions that need to load the value of pointer
to struct bpf_tramp_image. But this pointer value is not same while
calling arch_bpf_trampoline_size() & arch_prepare_bpf_trampoline().
So, the size arrived at using arch_bpf_trampoline_size() can vary
from the size needed in arch_prepare_bpf_trampoline(). When the
number of ldimm instructions emitted in arch_bpf_trampoline_size()
is less than the number of ldimm instructions emitted during the
actual JIT compile of trampoline, the below warning is produced:
WARNING: CPU: 8 PID: 204190 at arch/powerpc/net/bpf_jit_comp.c:981 __arch_prepare_bpf_trampoline.isra.0+0xd2c/0xdcc
which is:
/* Make sure the trampoline generation logic doesn't overflow */
if (image && WARN_ON_ONCE(&image[ctx->idx] >
(u32 *)rw_image_end - BPF_INSN_SAFETY)) {
Pass NULL as the first argument to __arch_prepare_bpf_trampoline()
call from arch_bpf_trampoline_size() function, to differentiate it
from how arch_prepare_bpf_trampoline() calls it and ensure maximum
possible instructions are emitted in arch_bpf_trampoline_size() for
ldimm instructions that load a different value during the actual JIT
compile of BPF trampoline.
Fixes: d243b62 ("powerpc64/bpf: Add support for bpf trampolines")
Reported-by: Venkat Rao Bagalkote <[email protected]>
Closes: https://lore.kernel.org/all/[email protected]/
Cc: [email protected] # v6.13+
Signed-off-by: Hari Bathini <[email protected]>
Tested-by: Venkat Rao Bagalkote <[email protected]>
|
Upstream branch: 25601e8 |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/947435=>bpf-next
branch
from
8f382fc to
1bff14a
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Pull request for series with
subject: powerpc64/bpf: fix JIT code size calculation of bpf trampoline
version: 1
url: https://patchwork.kernel.org/project/netdevbpf/list/?series=947435