History

perf/cgroup: Reorder perf_cgroup_connect()

Move perf_cgroup_connect() after perf_event_alloc(), such that we can find/use the PMU's cpu context.

Peter Zijlstra committed 6 years ago

Commit 98add2a1 parent 2c2366c1 file · +8 −8Browse files

Showing the changes to kernel (1 of 1 file). Show all

Unified · Split

kernel/events/core.c+8−8
@@ -10774,12 +10774,6 @@ perf_event_alloc(struct perf_event_attr *attr, int cpu, · 10773 unmodified lines
1077410774 if (!has_branch_stack(event))
1077510775 event->attr.branch_sample_type = 0;
1077610776
10777− if (cgroup_fd != -1) {
10778− err = perf_cgroup_connect(cgroup_fd, event, attr, group_leader);
10779− if (err)
10780− goto err_ns;
10781− }
10782−
1078310777 pmu = perf_init_event(event);
1078410778 if (IS_ERR(pmu)) {
1078510779 err = PTR_ERR(pmu);
@@ -10801,6 +10795,12 @@ perf_event_alloc(struct perf_event_attr *attr, int cpu, · 15 unmodified lines
1080110795 goto err_pmu;
1080210796 }
1080310797
10798+ if (cgroup_fd != -1) {
10799+ err = perf_cgroup_connect(cgroup_fd, event, attr, group_leader);
10800+ if (err)
10801+ goto err_pmu;
10802+ }
10803+
1080410804 err = exclusive_event_init(event);
1080510805 if (err)
1080610806 goto err_pmu;
@@ -10861,12 +10861,12 @@ err_per_task: · 54 unmodified lines
1086110861 exclusive_event_destroy(event);
1086210862
1086310863 err_pmu:
10864+ if (is_cgroup_event(event))
10865+ perf_detach_cgroup(event);
1086410866 if (event->destroy)
1086510867 event->destroy(event);
1086610868 module_put(pmu->module);
1086710869 err_ns:
10868− if (is_cgroup_event(event))
10869− perf_detach_cgroup(event);
1087010870 if (event->ns)
1087110871 put_pid_ns(event->ns);
1087210872 if (event->hw.target)

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t