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
10774 if (!has_branch_stack(event))10774 if (!has_branch_stack(event))
10775 event->attr.branch_sample_type = 0;10775 event->attr.branch_sample_type = 0;
10776 10776
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
10783 pmu = perf_init_event(event);10777 pmu = perf_init_event(event);
10784 if (IS_ERR(pmu)) {10778 if (IS_ERR(pmu)) {
10785 err = PTR_ERR(pmu);10779 err = PTR_ERR(pmu);
@@ -10801,6 +10795,12 @@ perf_event_alloc(struct perf_event_attr *attr, int cpu, · 15 unmodified lines
10801 goto err_pmu;10795 goto err_pmu;
10802 }10796 }
10803 10797
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
10804 err = exclusive_event_init(event);10804 err = exclusive_event_init(event);
10805 if (err)10805 if (err)
10806 goto err_pmu;10806 goto err_pmu;
@@ -10861,12 +10861,12 @@ err_per_task: · 54 unmodified lines
10861 exclusive_event_destroy(event);10861 exclusive_event_destroy(event);
10862 10862
10863err_pmu:10863err_pmu:
10864 if (is_cgroup_event(event))
10865 perf_detach_cgroup(event);
10864 if (event->destroy)10866 if (event->destroy)
10865 event->destroy(event);10867 event->destroy(event);
10866 module_put(pmu->module);10868 module_put(pmu->module);
10867err_ns:10869err_ns:
10868 if (is_cgroup_event(event))
10869 perf_detach_cgroup(event);
10870 if (event->ns)10870 if (event->ns)
10871 put_pid_ns(event->ns);10871 put_pid_ns(event->ns);
10872 if (event->hw.target)10872 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