Skip to content

bpf: Add LINK_DETACH for iter and perf links #5673

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
kernel-patches-daemon-bpf-rc wants to merge 1 commit into from
Closed

bpf: Add LINK_DETACH for iter and perf links #5673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions kernel/bpf/bpf_iter.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,6 +397,12 @@ static void bpf_iter_link_release(struct bpf_link *link)
iter_link->tinfo->reg_info->detach_target(&iter_link->aux);
}

static int bpf_iter_link_detach(struct bpf_link *link)
{
bpf_iter_link_release(link);
return 0;
}

static void bpf_iter_link_dealloc(struct bpf_link *link)
{
struct bpf_iter_link *iter_link =
Expand Down Expand Up @@ -490,6 +496,7 @@ static int bpf_iter_link_fill_link_info(const struct bpf_link *link,

static const struct bpf_link_ops bpf_iter_link_lops = {
.release = bpf_iter_link_release,
.detach = bpf_iter_link_detach,
.dealloc = bpf_iter_link_dealloc,
.update_prog = bpf_iter_link_replace,
.show_fdinfo = bpf_iter_link_show_fdinfo,
Expand Down
7 changes: 7 additions & 0 deletions kernel/bpf/syscall.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3740,6 +3740,12 @@ static void bpf_perf_link_release(struct bpf_link *link)
fput(perf_link->perf_file);
}

static int bpf_perf_link_detach(struct bpf_link *link)
{
bpf_perf_link_release(link);
return 0;
}

static void bpf_perf_link_dealloc(struct bpf_link *link)
{
struct bpf_perf_link *perf_link = container_of(link, struct bpf_perf_link, link);
Expand Down Expand Up @@ -4034,6 +4040,7 @@ static void bpf_perf_link_show_fdinfo(const struct bpf_link *link,

static const struct bpf_link_ops bpf_perf_link_lops = {
.release = bpf_perf_link_release,
.detach = bpf_perf_link_detach,
.dealloc = bpf_perf_link_dealloc,
.fill_link_info = bpf_perf_link_fill_link_info,
.show_fdinfo = bpf_perf_link_show_fdinfo,
Expand Down
Loading