Commit ab2ee4fc authored by Yonghong Song's avatar Yonghong Song Committed by Alexei Starovoitov
Browse files

bpf: Change func bpf_iter_unreg_target() signature 



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

Signed-off-by: default avatarYonghong Song <yhs@fb.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Acked-by: default avatarAndrii Nakryiko <andriin@fb.com>
Link: https://lore.kernel.org/bpf/20200513180220.2949737-1-yhs@fb.com
parent 15172a46

include/linux/bpf.h

+1 −1
Original line number Diff line number Diff line
@@ -1154,7 +1154,7 @@ struct bpf_iter_meta { 
};



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);

int bpf_iter_link_attach(const union bpf_attr *attr, struct bpf_prog *prog);

int bpf_iter_new_fd(struct bpf_link *link);

kernel/bpf/bpf_iter.c

+2 −2
Original line number Diff line number Diff line
@@ -257,14 +257,14 @@ int bpf_iter_reg_target(const struct bpf_iter_reg *reg_info) 
	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;

	bool found = false;



	mutex_lock(&targets_mutex);

	list_for_each_entry(tinfo, &targets, list) {

		if (!strcmp(target, tinfo->reg_info->target)) {

		if (reg_info == tinfo->reg_info) {

			list_del(&tinfo->list);

			kfree(tinfo);

			found = true;

net/ipv6/route.c

+1 −1
Original line number Diff line number Diff line
@@ -6412,7 +6412,7 @@ static int __init bpf_iter_register(void) 


static void bpf_iter_unregister(void)

{

	bpf_iter_unreg_target("ipv6_route");

	bpf_iter_unreg_target(&ipv6_route_reg_info);

}

#endif

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE