| Message ID | 20221011071128.3470622-4-houtao@huaweicloud.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | BPF |
| Headers | show |
| Series | Remove unnecessary RCU grace period chaining | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Clearly marked for bpf-next |
| netdev/fixes_present | success | Fixes tag not required for -next series |
| netdev/subject_prefix | success | Link |
| netdev/cover_letter | success | Series has a cover letter |
| netdev/patch_count | success | Link |
| netdev/header_inline | success | No static functions without inline keyword in header files |
| netdev/build_32bit | success | Errors and warnings before: 9 this patch: 9 |
| netdev/cc_maintainers | warning | 2 maintainers not CCed: song@kernel.org martin.lau@linux.dev |
| netdev/build_clang | success | Errors and warnings before: 5 this patch: 5 |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Signed-off-by tag matches author and committer |
| netdev/check_selftest | success | No net selftest shell script |
| netdev/verify_fixes | success | No Fixes tag |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 9 this patch: 9 |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 16 lines checked |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/source_inline | success | Was 0 now: 0 |
| bpf/vmtest-bpf-next-PR | fail | PR summary |
| bpf/vmtest-bpf-next-VM_Test-4 | success | Logs for llvm-toolchain |
| bpf/vmtest-bpf-next-VM_Test-5 | success | Logs for set-matrix |
| bpf/vmtest-bpf-next-VM_Test-2 | success | Logs for build for x86_64 with gcc |
| bpf/vmtest-bpf-next-VM_Test-3 | success | Logs for build for x86_64 with llvm-16 |
| bpf/vmtest-bpf-next-VM_Test-1 | success | Logs for build for s390x with gcc |
| bpf/vmtest-bpf-next-VM_Test-7 | success | Logs for test_maps on x86_64 with gcc |
| bpf/vmtest-bpf-next-VM_Test-8 | success | Logs for test_maps on x86_64 with llvm-16 |
| bpf/vmtest-bpf-next-VM_Test-10 | fail | Logs for test_progs on x86_64 with gcc |
| bpf/vmtest-bpf-next-VM_Test-13 | fail | Logs for test_progs_no_alu32 on x86_64 with gcc |
| bpf/vmtest-bpf-next-VM_Test-14 | fail | Logs for test_progs_no_alu32 on x86_64 with llvm-16 |
| bpf/vmtest-bpf-next-VM_Test-16 | success | Logs for test_verifier on x86_64 with gcc |
| bpf/vmtest-bpf-next-VM_Test-17 | success | Logs for test_verifier on x86_64 with llvm-16 |
| bpf/vmtest-bpf-next-VM_Test-6 | success | Logs for test_maps on s390x with gcc |
| bpf/vmtest-bpf-next-VM_Test-11 | fail | Logs for test_progs on x86_64 with llvm-16 |
| bpf/vmtest-bpf-next-VM_Test-9 | success | Logs for test_progs on s390x with gcc |
| bpf/vmtest-bpf-next-VM_Test-15 | success | Logs for test_verifier on s390x with gcc |
| bpf/vmtest-bpf-next-VM_Test-12 | success | Logs for test_progs_no_alu32 on s390x with gcc |
On Tue, Oct 11, 2022 at 03:11:28PM +0800, Hou Tao wrote: > From: Hou Tao <houtao1@huawei.com> > > To support sleepable uprobe bpf program, the freeing of trace program > array chains a RCU-tasks-trace grace period with a normal RCU grace > period. But considering in the current implementation of RCU-tasks-trace > that one RCU-tasks-trace grace period implies one normal RCU grace > period, so it is not need for such chaining and it is safe to free the > array in the callback of call_rcu_tasks_trace(). And the same here. ;-) Thanx, Paul > Signed-off-by: Hou Tao <houtao1@huawei.com> > --- > kernel/bpf/core.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c > index 711fd293b6de..f943620b55b0 100644 > --- a/kernel/bpf/core.c > +++ b/kernel/bpf/core.c > @@ -2247,12 +2247,15 @@ void bpf_prog_array_free(struct bpf_prog_array *progs) > kfree_rcu(progs, rcu); > } > > +/* Now RCU Tasks grace period implies RCU grace period, so no need to call > + * kfree_rcu(), just call kfree() directly. > + */ > static void __bpf_prog_array_free_sleepable_cb(struct rcu_head *rcu) > { > struct bpf_prog_array *progs; > > progs = container_of(rcu, struct bpf_prog_array, rcu); > - kfree_rcu(progs, rcu); > + kfree(progs); > } > > void bpf_prog_array_free_sleepable(struct bpf_prog_array *progs) > -- > 2.29.2 >
diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c index 711fd293b6de..f943620b55b0 100644 --- a/kernel/bpf/core.c +++ b/kernel/bpf/core.c @@ -2247,12 +2247,15 @@ void bpf_prog_array_free(struct bpf_prog_array *progs) kfree_rcu(progs, rcu); } +/* Now RCU Tasks grace period implies RCU grace period, so no need to call + * kfree_rcu(), just call kfree() directly. + */ static void __bpf_prog_array_free_sleepable_cb(struct rcu_head *rcu) { struct bpf_prog_array *progs; progs = container_of(rcu, struct bpf_prog_array, rcu); - kfree_rcu(progs, rcu); + kfree(progs); } void bpf_prog_array_free_sleepable(struct bpf_prog_array *progs)