Skip to content

[Deepin-Kernel-SIG] [linux 6.6-y] [Upstream] perf: Fix dangling cgroup pointer in cpuctx #1292

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

Open
opsiff wants to merge 1 commit into
base: linux-6.6.y
Choose a base branch
from
Open

[Deepin-Kernel-SIG] [linux 6.6-y] [Upstream] perf: Fix dangling cgroup pointer in cpuctx #1292

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
21 changes: 6 additions & 15 deletions kernel/events/core.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2056,18 +2056,6 @@ list_del_event(struct perf_event *event, struct perf_event_context *ctx)
if (event->group_leader == event)
del_event_from_groups(event, ctx);

/*
* If event was in error state, then keep it
* that way, otherwise bogus counts will be
* returned on read(). The only way to get out
* of error state is by explicit re-enabling
* of the event
*/
if (event->state > PERF_EVENT_STATE_OFF) {
perf_cgroup_event_disable(event, ctx);
perf_event_set_state(event, PERF_EVENT_STATE_OFF);
}

ctx->generation++;
event->pmu_ctx->nr_events--;
}
Expand Down Expand Up @@ -2381,11 +2369,14 @@ __perf_remove_from_context(struct perf_event *event,
*/
if (flags & DETACH_EXIT)
state = PERF_EVENT_STATE_EXIT;
if (flags & DETACH_DEAD) {
event->pending_disable = 1;
if (flags & DETACH_DEAD)
state = PERF_EVENT_STATE_DEAD;
}

event_sched_out(event, ctx);

if (event->state > PERF_EVENT_STATE_OFF)
perf_cgroup_event_disable(event, ctx);

perf_event_set_state(event, min(event->state, state));
if (flags & DETACH_GROUP)
perf_group_detach(event);
Expand Down
Loading