diff options
| author | Alexei Starovoitov <ast@kernel.org> | 2021-11-12 10:19:10 -0800 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2021-11-12 10:19:10 -0800 |
| commit | 7cc595a60187bcfaf8a8013539900154eccb4d3f (patch) | |
| tree | 293ae437aeb1c13fd0ead6e9d4291326a64e97e5 /kernel/trace/bpf_trace.c | |
| parent | 314f14abdeca78de6b16f97d796a9966ce4b90ae (diff) | |
| parent | d19ddb476a539fd78ad1028ae13bb38506286931 (diff) | |
Merge branch 'introduce btf_tracing_ids'
Song Liu says:
====================
Changes v2 => v3:
1. Fix bug in task_iter.c. (Kernel test robot <lkp@intel.com>)
Changes v1 => v2:
1. Add patch 2/2. (Alexei)
1/2 fixes issue with btf_task_struct_ids w/o CONFIG_DEBUG_INFO_BTF.
2/2 replaces btf_task_struct_ids with easier to understand btf_tracing_ids.
====================
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Diffstat (limited to 'kernel/trace/bpf_trace.c')
| -rw-r--r-- | kernel/trace/bpf_trace.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c index 390176a3031a..25ea521fb8f1 100644 --- a/kernel/trace/bpf_trace.c +++ b/kernel/trace/bpf_trace.c @@ -764,7 +764,7 @@ const struct bpf_func_proto bpf_get_current_task_btf_proto = { .func = bpf_get_current_task_btf, .gpl_only = true, .ret_type = RET_PTR_TO_BTF_ID, - .ret_btf_id = &btf_task_struct_ids[0], + .ret_btf_id = &btf_tracing_ids[BTF_TRACING_TYPE_TASK], }; BPF_CALL_1(bpf_task_pt_regs, struct task_struct *, task) @@ -779,7 +779,7 @@ const struct bpf_func_proto bpf_task_pt_regs_proto = { .func = bpf_task_pt_regs, .gpl_only = true, .arg1_type = ARG_PTR_TO_BTF_ID, - .arg1_btf_id = &btf_task_struct_ids[0], + .arg1_btf_id = &btf_tracing_ids[BTF_TRACING_TYPE_TASK], .ret_type = RET_PTR_TO_BTF_ID, .ret_btf_id = &bpf_task_pt_regs_ids[0], }; |