Commit d88b71d4 authored by Andrii Nakryiko's avatar Andrii Nakryiko Committed by Daniel Borkmann
Browse files

libbpf: Remove unused bpf_link's destroy operation, but add dealloc 



bpf_link->destroy() isn't used by any code, so remove it. Instead, add ability
to override deallocation procedure, with default doing plain free(link). This
is necessary for cases when we want to "subclass" struct bpf_link to keep
extra information, as is the case in the next patch adding struct
bpf_link_perf.

Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Link: https://lore.kernel.org/bpf/20210815070609.987780-9-andrii@kernel.org
parent 61c7aa50

tools/lib/bpf/libbpf.c

+5 −4
Original line number Diff line number Diff line
@@ -8810,7 +8810,7 @@ int bpf_prog_load_xattr(const struct bpf_prog_load_attr *attr, 


struct bpf_link {

	int (*detach)(struct bpf_link *link);

	int (*destroy)(struct bpf_link *link);

	void (*dealloc)(struct bpf_link *link);

	char *pin_path;		/* NULL, if not pinned */

	int fd;			/* hook FD, -1 if not applicable */

	bool disconnected;
@@ -8849,10 +8849,11 @@ int bpf_link__destroy(struct bpf_link *link) 


	if (!link->disconnected && link->detach)

		err = link->detach(link);

	if (link->destroy)

		link->destroy(link);

	if (link->pin_path)

		free(link->pin_path);

	if (link->dealloc)

		link->dealloc(link);

	else

		free(link);



	return libbpf_err(err);