AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

Revert "perf: Rework perf_event_exit_event()"

Browse Source 
This reverts commit 94902ee299 which is
upstream commit ef54c1a476aef7eef26fe13ea10dc090952c00f8.

Reverting for now due to issues that need to get fixed upstream.

Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Sasha Levin 2021-11-24 19:18:11 -05:00 committed by Greg Kroah-Hartman
parent 6718f79c40
commit d35250ec5a
2 changed files with 69 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/linux/perf_event.h
View File

@ -607,7 +607,6 @@ struct swevent_hlist {
#define PERF_ATTACH_TASK_DATA 0x08 #define PERF_ATTACH_TASK_DATA 0x08
#define PERF_ATTACH_ITRACE 0x10 #define PERF_ATTACH_ITRACE 0x10
#define PERF_ATTACH_SCHED_CB 0x20 #define PERF_ATTACH_SCHED_CB 0x20
#define PERF_ATTACH_CHILD 0x40
struct perf_cgroup; struct perf_cgroup;
struct perf_buffer; struct perf_buffer;

134
kernel/events/core.c
View File

@ -2209,26 +2209,6 @@ static void perf_group_detach(struct perf_event *event)
perf_event__header_size(leader); perf_event__header_size(leader);
} }
static void sync_child_event(struct perf_event *child_event);
static void perf_child_detach(struct perf_event *event)
{
struct perf_event *parent_event = event->parent;
if (!(event->attach_state & PERF_ATTACH_CHILD))
return;
event->attach_state &= ~PERF_ATTACH_CHILD;
if (WARN_ON_ONCE(!parent_event))
return;
lockdep_assert_held(&parent_event->child_mutex);
sync_child_event(event);
list_del_init(&event->child_list);
}
static bool is_orphaned_event(struct perf_event *event) static bool is_orphaned_event(struct perf_event *event)
{ {
return event->state == PERF_EVENT_STATE_DEAD; return event->state == PERF_EVENT_STATE_DEAD;
@ -2336,7 +2316,6 @@ group_sched_out(struct perf_event *group_event,
} }
#define DETACH_GROUP 0x01UL #define DETACH_GROUP 0x01UL
#define DETACH_CHILD 0x02UL
/* /*
* Cross CPU call to remove a performance event * Cross CPU call to remove a performance event
@ -2360,8 +2339,6 @@ __perf_remove_from_context(struct perf_event *event,
event_sched_out(event, cpuctx, ctx); event_sched_out(event, cpuctx, ctx);
if (flags & DETACH_GROUP) if (flags & DETACH_GROUP)
perf_group_detach(event); perf_group_detach(event);
if (flags & DETACH_CHILD)
perf_child_detach(event);
list_del_event(event, ctx); list_del_event(event, ctx);
if (!ctx->nr_events && ctx->is_active) { if (!ctx->nr_events && ctx->is_active) {
@ -2390,21 +2367,25 @@ static void perf_remove_from_context(struct perf_event *event, unsigned long fla
lockdep_assert_held(&ctx->mutex); lockdep_assert_held(&ctx->mutex);
event_function_call(event, __perf_remove_from_context, (void *)flags);
/* /*
* Because of perf_event_exit_task(), perf_remove_from_context() ought * The above event_function_call() can NO-OP when it hits
* to work in the face of TASK_TOMBSTONE, unlike every other * TASK_TOMBSTONE. In that case we must already have been detached
* event_function_call() user. * from the context (by perf_event_exit_event()) but the grouping
* might still be in-tact.
*/
WARN_ON_ONCE(event->attach_state & PERF_ATTACH_CONTEXT);
if ((flags & DETACH_GROUP) &&
(event->attach_state & PERF_ATTACH_GROUP)) {
/*
* Since in that case we cannot possibly be scheduled, simply
* detach now.
*/ */
raw_spin_lock_irq(&ctx->lock); raw_spin_lock_irq(&ctx->lock);
if (!ctx->is_active) { perf_group_detach(event);
__perf_remove_from_context(event, __get_cpu_context(ctx),
ctx, (void *)flags);
raw_spin_unlock_irq(&ctx->lock); raw_spin_unlock_irq(&ctx->lock);
return;
} }
raw_spin_unlock_irq(&ctx->lock);
event_function_call(event, __perf_remove_from_context, (void *)flags);
} }
/* /*
@ -12296,17 +12277,14 @@ void perf_pmu_migrate_context(struct pmu *pmu, int src_cpu, int dst_cpu)
} }
EXPORT_SYMBOL_GPL(perf_pmu_migrate_context); EXPORT_SYMBOL_GPL(perf_pmu_migrate_context);
static void sync_child_event(struct perf_event *child_event) static void sync_child_event(struct perf_event *child_event,
struct task_struct *child)
{ {
struct perf_event *parent_event = child_event->parent; struct perf_event *parent_event = child_event->parent;
u64 child_val; u64 child_val;
if (child_event->attr.inherit_stat) { if (child_event->attr.inherit_stat)
struct task_struct *task = child_event->ctx->task; perf_event_read_event(child_event, child);
if (task && task != TASK_TOMBSTONE)
perf_event_read_event(child_event, task);
}
child_val = perf_event_count(child_event); child_val = perf_event_count(child_event);
@ -12321,53 +12299,60 @@ static void sync_child_event(struct perf_event *child_event)
} }
static void static void
perf_event_exit_event(struct perf_event *event, struct perf_event_context *ctx) perf_event_exit_event(struct perf_event *child_event,
struct perf_event_context *child_ctx,
struct task_struct *child)
{ {
struct perf_event *parent_event = event->parent; struct perf_event *parent_event = child_event->parent;
unsigned long detach_flags = 0;
if (parent_event) {
/* /*
* Do not destroy the 'original' grouping; because of the * Do not destroy the 'original' grouping; because of the context
* context switch optimization the original events could've * switch optimization the original events could've ended up in a
* ended up in a random child task. * random child task.
* *
* If we were to destroy the original group, all group related * If we were to destroy the original group, all group related
* operations would cease to function properly after this * operations would cease to function properly after this random
* random child dies. * child dies.
* *
* Do destroy all inherited groups, we don't care about those * Do destroy all inherited groups, we don't care about those
* and being thorough is better. * and being thorough is better.
*/ */
detach_flags = DETACH_GROUP | DETACH_CHILD; raw_spin_lock_irq(&child_ctx->lock);
mutex_lock(&parent_event->child_mutex); WARN_ON_ONCE(child_ctx->is_active);
}
perf_remove_from_context(event, detach_flags); if (parent_event)
perf_group_detach(child_event);
raw_spin_lock_irq(&ctx->lock); list_del_event(child_event, child_ctx);
if (event->state > PERF_EVENT_STATE_EXIT) perf_event_set_state(child_event, PERF_EVENT_STATE_EXIT); /* is_event_hup() */
perf_event_set_state(event, PERF_EVENT_STATE_EXIT); raw_spin_unlock_irq(&child_ctx->lock);
raw_spin_unlock_irq(&ctx->lock);
/*
* Child events can be freed.
*/
if (parent_event) {
mutex_unlock(&parent_event->child_mutex);
/*
* Kick perf_poll() for is_event_hup();
*/
perf_event_wakeup(parent_event);
free_event(event);
put_event(parent_event);
return;
}
/* /*
* Parent events are governed by their filedesc, retain them. * Parent events are governed by their filedesc, retain them.
*/ */
perf_event_wakeup(event); if (!parent_event) {
perf_event_wakeup(child_event);
return;
}
/*
* Child events can be cleaned up.
*/
sync_child_event(child_event, child);
/*
* Remove this event from the parent's list
*/
WARN_ON_ONCE(parent_event->ctx->parent_ctx);
mutex_lock(&parent_event->child_mutex);
list_del_init(&child_event->child_list);
mutex_unlock(&parent_event->child_mutex);
/*
* Kick perf_poll() for is_event_hup().
*/
perf_event_wakeup(parent_event);
free_event(child_event);
put_event(parent_event);
} }
static void perf_event_exit_task_context(struct task_struct *child, int ctxn) static void perf_event_exit_task_context(struct task_struct *child, int ctxn)
@ -12424,7 +12409,7 @@ static void perf_event_exit_task_context(struct task_struct *child, int ctxn)
perf_event_task(child, child_ctx, 0); perf_event_task(child, child_ctx, 0);
list_for_each_entry_safe(child_event, next, &child_ctx->event_list, event_entry) list_for_each_entry_safe(child_event, next, &child_ctx->event_list, event_entry)
perf_event_exit_event(child_event, child_ctx); perf_event_exit_event(child_event, child_ctx, child);
mutex_unlock(&child_ctx->mutex); mutex_unlock(&child_ctx->mutex);
@ -12684,7 +12669,6 @@ inherit_event(struct perf_event *parent_event,
*/ */
raw_spin_lock_irqsave(&child_ctx->lock, flags); raw_spin_lock_irqsave(&child_ctx->lock, flags);
add_event_to_ctx(child_event, child_ctx); add_event_to_ctx(child_event, child_ctx);
child_event->attach_state |= PERF_ATTACH_CHILD;
raw_spin_unlock_irqrestore(&child_ctx->lock, flags); raw_spin_unlock_irqrestore(&child_ctx->lock, flags);
/* /*