Fix ftrace for livepatch + BPF fexit programs #10118
Closed
Conversation
This file contains hidden or 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
|
Upstream branch: 8ce93aa |
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf_base
branch
from
986b6fd to
87c66e9
Compare
|
Upstream branch: 2cbb259 |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/1016392=>bpf
branch
from
e1e56a7 to
e79d44e
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf_base
branch
from
87c66e9 to
6f7697d
Compare
|
Upstream branch: 14a7f23 |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/1016392=>bpf
branch
from
e79d44e to
53ffcd0
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf_base
branch
from
6f7697d to
55ff712
Compare
|
Upstream branch: be708ed |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/1016392=>bpf
branch
from
53ffcd0 to
b978fd4
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf_base
branch
from
55ff712 to
1af0040
Compare
|
Upstream branch: ba36dd5 |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/1016392=>bpf
branch
from
b978fd4 to
55aa10c
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf_base
branch
from
1af0040 to
7ea1d98
Compare
|
Upstream branch: 6146a0f |
When livepatch is attached to the same function as bpf trampoline with
a fexit program, bpf trampoline code calls register_ftrace_direct()
twice. The first time will fail with -EAGAIN, and the second time it
will succeed. This requires register_ftrace_direct() to unregister
the address on the first attempt. Otherwise, the bpf trampoline cannot
attach. Here is an easy way to reproduce this issue:
insmod samples/livepatch/livepatch-sample.ko
bpftrace -e 'fexit:cmdline_proc_show {}'
ERROR: Unable to attach probe: fexit:vmlinux:cmdline_proc_show...
Fix this by cleaning up the hash when register_ftrace_function_nolock hits
errors.
Also, move the code that resets ops->func and ops->trampoline to the error
path of register_ftrace_direct(); and add a helper function reset_direct()
in register_ftrace_direct() and unregister_ftrace_direct().
Fixes: d05cb47 ("ftrace: Fix modification of direct_function hash while in use")
Cc: [email protected] # v6.6+
Reported-by: Andrey Grodzovsky <[email protected]>
Closes: https://lore.kernel.org/live-patching/[email protected]/
Cc: Steven Rostedt (Google) <[email protected]>
Cc: Masami Hiramatsu (Google) <[email protected]>
Acked-and-tested-by: Andrey Grodzovsky <[email protected]>
Signed-off-by: Song Liu <[email protected]>
Reviewed-by: Jiri Olsa <[email protected]>
ftrace_hash_ipmodify_enable() checks IPMODIFY and DIRECT ftrace_ops on the same kernel function. When needed, ftrace_hash_ipmodify_enable() calls ops->ops_func() to prepare the direct ftrace (BPF trampoline) to share the same function as the IPMODIFY ftrace (livepatch). ftrace_hash_ipmodify_enable() is called in register_ftrace_direct() path, but not called in modify_ftrace_direct() path. As a result, the following operations will break livepatch: 1. Load livepatch to a kernel function; 2. Attach fentry program to the kernel function; 3. Attach fexit program to the kernel function. After 3, the kernel function being used will not be the livepatched version, but the original version. Fix this by adding __ftrace_hash_update_ipmodify() to __modify_ftrace_direct() and adjust some logic around the call. Signed-off-by: Song Liu <[email protected]> Reviewed-by: Jiri Olsa <[email protected]>
Both livepatch and BPF trampoline use ftrace. Special attention is needed
when livepatch and fexit program touch the same function at the same
time, because livepatch updates a kernel function and the BPF trampoline
need to call into the right version of the kernel function.
Use samples/livepatch/livepatch-sample.ko for the test.
The test covers two cases:
1) When a fentry program is loaded first. This exercises the
modify_ftrace_direct code path.
2) When a fentry program is loaded first. This exercises the
register_ftrace_direct code path.
Signed-off-by: Song Liu <[email protected]>
Reviewed-by: Jiri Olsa <[email protected]>
kernel-patches-daemon-bpf
bot
force-pushed
the
series/1016392=>bpf
branch
from
55aa10c to
aebeefa
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf_base
branch
from
7ea1d98 to
8b55cb4
Compare
|
At least one diff in series https://patchwork.kernel.org/project/netdevbpf/list/?series=1016392 irrelevant now. Closing PR. |
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: Fix ftrace for livepatch + BPF fexit programs
version: 4
url: https://patchwork.kernel.org/project/netdevbpf/list/?series=1016392