iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

perf: Simplify group_sched_in()

Browse Source 
Collate the error paths. Code duplication only leads to divergence and
extra bugs.

Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20201029162901.972161394@infradead.org
This commit is contained in:
Peter Zijlstra 2020-10-29 16:29:15 +01:00
parent 8c7855d829
commit 251ff2d493
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
kernel/events/core.c
View File

@ -2580,11 +2580,8 @@ group_sched_in(struct perf_event *group_event,
pmu->start_txn(pmu, PERF_PMU_TXN_ADD); pmu->start_txn(pmu, PERF_PMU_TXN_ADD);
if (event_sched_in(group_event, cpuctx, ctx)) { if (event_sched_in(group_event, cpuctx, ctx))
pmu->cancel_txn(pmu); goto error;
perf_mux_hrtimer_restart(cpuctx);
return -EAGAIN;
}
/* /*
* Schedule in siblings as one group (if any): * Schedule in siblings as one group (if any):
@ -2613,10 +2610,9 @@ group_error:
} }
event_sched_out(group_event, cpuctx, ctx); event_sched_out(group_event, cpuctx, ctx);
error:
pmu->cancel_txn(pmu); pmu->cancel_txn(pmu);
perf_mux_hrtimer_restart(cpuctx); perf_mux_hrtimer_restart(cpuctx);
return -EAGAIN; return -EAGAIN;
} }