xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bpf: Change func bpf_iter_unreg_target() signature

Browse Source 
Change func bpf_iter_unreg_target() parameter from target
name to target reg_info, similar to bpf_iter_reg_target().

Signed-off-by: Yonghong Song <yhs@fb.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Acked-by: Andrii Nakryiko <andriin@fb.com>
Link: https://lore.kernel.org/bpf/20200513180220.2949737-1-yhs@fb.com
This commit is contained in:
Yonghong Song
2020-05-13 11:02:20 -07:00
committed by Alexei Starovoitov
parent 15172a46fa
commit ab2ee4fcb9
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/bpf.h
View File

@@ -1154,7 +1154,7 @@ struct bpf_iter_meta {
}; };
int bpf_iter_reg_target(const struct bpf_iter_reg *reg_info); int bpf_iter_reg_target(const struct bpf_iter_reg *reg_info);
void bpf_iter_unreg_target(const char *target); void bpf_iter_unreg_target(const struct bpf_iter_reg *reg_info);
bool bpf_iter_prog_supported(struct bpf_prog *prog); bool bpf_iter_prog_supported(struct bpf_prog *prog);
int bpf_iter_link_attach(const union bpf_attr *attr, struct bpf_prog *prog); int bpf_iter_link_attach(const union bpf_attr *attr, struct bpf_prog *prog);
int bpf_iter_new_fd(struct bpf_link *link); int bpf_iter_new_fd(struct bpf_link *link);

4
kernel/bpf/bpf_iter.c
View File

@@ -257,14 +257,14 @@ int bpf_iter_reg_target(const struct bpf_iter_reg *reg_info)
return 0; return 0;
} }
void bpf_iter_unreg_target(const char *target) void bpf_iter_unreg_target(const struct bpf_iter_reg *reg_info)
{ {
struct bpf_iter_target_info *tinfo; struct bpf_iter_target_info *tinfo;
bool found = false; bool found = false;
mutex_lock(&targets_mutex); mutex_lock(&targets_mutex);
list_for_each_entry(tinfo, &targets, list) { list_for_each_entry(tinfo, &targets, list) {
if (!strcmp(target, tinfo->reg_info->target)) { if (reg_info == tinfo->reg_info) {
list_del(&tinfo->list); list_del(&tinfo->list);
kfree(tinfo); kfree(tinfo);
found = true; found = true;

2
net/ipv6/route.c
View File

@@ -6412,7 +6412,7 @@ static int __init bpf_iter_register(void)
static void bpf_iter_unregister(void) static void bpf_iter_unregister(void)
{ {
bpf_iter_unreg_target("ipv6_route"); bpf_iter_unreg_target(&ipv6_route_reg_info);
} }
#endif #endif
#endif #endif