torvalds/linux
torvalds/linux
2
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-04 20:19:47 +08:00
Code

bpf: Clean up individual BTF_ID code

Browse Source 
Use BTF_ID_LIST_SINGLE(a, b, c) instead of
BTF_ID_LIST(a)
BTF_ID(b, c)

Signed-off-by: Feng Yang <yangfeng@kylinos.cn>
Link: https://lore.kernel.org/r/20250710055419.70544-1-yangfeng59949@163.com
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
This commit is contained in:
Feng Yang 2025-07-10 13:54:19 +08:00 committed by Alexei Starovoitov
parent 1f489662fb
commit 62ef449b8d
8 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
kernel/bpf/btf.c
View File

@ -6200,8 +6200,7 @@ int get_kern_ctx_btf_id(struct bpf_verifier_log *log, enum bpf_prog_type prog_ty
return kctx_type_id; return kctx_type_id;
} }
BTF_ID_LIST(bpf_ctx_convert_btf_id) BTF_ID_LIST_SINGLE(bpf_ctx_convert_btf_id, struct, bpf_ctx_convert)
BTF_ID(struct, bpf_ctx_convert)
static struct btf *btf_parse_base(struct btf_verifier_env *env, const char *name, static struct btf *btf_parse_base(struct btf_verifier_env *env, const char *name,
void *data, unsigned int data_size) void *data, unsigned int data_size)

3
kernel/bpf/link_iter.c
View File

@ -78,8 +78,7 @@ static const struct seq_operations bpf_link_seq_ops = {
.show = bpf_link_seq_show, .show = bpf_link_seq_show,
}; };
BTF_ID_LIST(btf_bpf_link_id) BTF_ID_LIST_SINGLE(btf_bpf_link_id, struct, bpf_link)
BTF_ID(struct, bpf_link)
static const struct bpf_iter_seq_info bpf_link_seq_info = { static const struct bpf_iter_seq_info bpf_link_seq_info = {
.seq_ops = &bpf_link_seq_ops, .seq_ops = &bpf_link_seq_ops,

3
kernel/bpf/prog_iter.c
View File

@ -78,8 +78,7 @@ static const struct seq_operations bpf_prog_seq_ops = {
.show = bpf_prog_seq_show, .show = bpf_prog_seq_show,
}; };
BTF_ID_LIST(btf_bpf_prog_id) BTF_ID_LIST_SINGLE(btf_bpf_prog_id, struct, bpf_prog)
BTF_ID(struct, bpf_prog)
static const struct bpf_iter_seq_info bpf_prog_seq_info = { static const struct bpf_iter_seq_info bpf_prog_seq_info = {
.seq_ops = &bpf_prog_seq_ops, .seq_ops = &bpf_prog_seq_ops,

3
kernel/kallsyms.c
View File

@ -829,8 +829,7 @@ static struct bpf_iter_reg ksym_iter_reg_info = {
.seq_info = &ksym_iter_seq_info, .seq_info = &ksym_iter_seq_info,
}; };
BTF_ID_LIST(btf_ksym_iter_id) BTF_ID_LIST_SINGLE(btf_ksym_iter_id, struct, kallsym_iter)
BTF_ID(struct, kallsym_iter)
static int __init bpf_ksym_iter_register(void) static int __init bpf_ksym_iter_register(void)
{ {

3
kernel/trace/bpf_trace.c
View File

@ -781,8 +781,7 @@ BPF_CALL_1(bpf_task_pt_regs, struct task_struct *, task)
return (unsigned long) task_pt_regs(task); return (unsigned long) task_pt_regs(task);
} }
BTF_ID_LIST(bpf_task_pt_regs_ids) BTF_ID_LIST_SINGLE(bpf_task_pt_regs_ids, struct, pt_regs)
BTF_ID(struct, pt_regs)
const struct bpf_func_proto bpf_task_pt_regs_proto = { const struct bpf_func_proto bpf_task_pt_regs_proto = {
.func = bpf_task_pt_regs, .func = bpf_task_pt_regs,

3
net/ipv6/route.c
View File

@ -6805,8 +6805,7 @@ void __init ip6_route_init_special_entries(void)
#if defined(CONFIG_BPF_SYSCALL) && defined(CONFIG_PROC_FS) #if defined(CONFIG_BPF_SYSCALL) && defined(CONFIG_PROC_FS)
DEFINE_BPF_ITER_FUNC(ipv6_route, struct bpf_iter_meta *meta, struct fib6_info *rt) DEFINE_BPF_ITER_FUNC(ipv6_route, struct bpf_iter_meta *meta, struct fib6_info *rt)
BTF_ID_LIST(btf_fib6_info_id) BTF_ID_LIST_SINGLE(btf_fib6_info_id, struct, fib6_info)
BTF_ID(struct, fib6_info)
static const struct bpf_iter_seq_info ipv6_route_seq_info = { static const struct bpf_iter_seq_info ipv6_route_seq_info = {
.seq_ops = &ipv6_route_seq_ops, .seq_ops = &ipv6_route_seq_ops,

3
net/netlink/af_netlink.c
View File

@ -2869,8 +2869,7 @@ static const struct rhashtable_params netlink_rhashtable_params = {
}; };
#if defined(CONFIG_BPF_SYSCALL) && defined(CONFIG_PROC_FS) #if defined(CONFIG_BPF_SYSCALL) && defined(CONFIG_PROC_FS)
BTF_ID_LIST(btf_netlink_sock_id) BTF_ID_LIST_SINGLE(btf_netlink_sock_id, struct, netlink_sock)
BTF_ID(struct, netlink_sock)
static const struct bpf_iter_seq_info netlink_seq_info = { static const struct bpf_iter_seq_info netlink_seq_info = {
.seq_ops = &netlink_seq_ops, .seq_ops = &netlink_seq_ops,

9
net/sched/bpf_qdisc.c
View File

@ -130,8 +130,7 @@ static int bpf_qdisc_btf_struct_access(struct bpf_verifier_log *log,
return 0; return 0;
} }
BTF_ID_LIST(bpf_qdisc_init_prologue_ids) BTF_ID_LIST_SINGLE(bpf_qdisc_init_prologue_ids, func, bpf_qdisc_init_prologue)
BTF_ID(func, bpf_qdisc_init_prologue)
static int bpf_qdisc_gen_prologue(struct bpf_insn *insn_buf, bool direct_write, static int bpf_qdisc_gen_prologue(struct bpf_insn *insn_buf, bool direct_write,
const struct bpf_prog *prog) const struct bpf_prog *prog)
@ -161,8 +160,7 @@ static int bpf_qdisc_gen_prologue(struct bpf_insn *insn_buf, bool direct_write,
return insn - insn_buf; return insn - insn_buf;
} }
BTF_ID_LIST(bpf_qdisc_reset_destroy_epilogue_ids) BTF_ID_LIST_SINGLE(bpf_qdisc_reset_destroy_epilogue_ids, func, bpf_qdisc_reset_destroy_epilogue)
BTF_ID(func, bpf_qdisc_reset_destroy_epilogue)
static int bpf_qdisc_gen_epilogue(struct bpf_insn *insn_buf, const struct bpf_prog *prog, static int bpf_qdisc_gen_epilogue(struct bpf_insn *insn_buf, const struct bpf_prog *prog,
s16 ctx_stack_off) s16 ctx_stack_off)
@ -451,8 +449,7 @@ static struct bpf_struct_ops bpf_Qdisc_ops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}; };
BTF_ID_LIST(bpf_sk_buff_dtor_ids) BTF_ID_LIST_SINGLE(bpf_sk_buff_dtor_ids, func, bpf_kfree_skb)
BTF_ID(func, bpf_kfree_skb)
static int __init bpf_qdisc_kfunc_init(void) static int __init bpf_qdisc_kfunc_init(void)
{ {