perf_events: fix validate_event bug
Subsystems (2)
PATCH 1/1 perf_events: fix validate_event bug
The validate_event() was failing on valid event combinations. The function was assuming that if x86_schedule_event() returned 0, it meant error. But x86_schedule_event() returns the counter index and 0 is a perfectly valid value. An error is returned if the function returns a negative value.
Furthermore, validate_event() was also failing for event groups because the event->pmu was not set until after hw_perf_pmu_init().
--
arch/x86/kernel/cpu/perf_event.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
arch/x86/kernel/cpu/perf_event.c +1 -4
@@ -2229,10 +2229,7 @@ validate_event(struct cpu_hw_events *cpuc, struct perf_event *event) {struct hw_perf_event fake_event = event->hw; -if (event->pmu != &pmu) -return 0 ; - -return x86_schedule_event (cpuc, &fake_event); +return x86_schedule_event (cpuc, &fake_event) >=0 ; }static int validate_group (struct perf_event *event)
Peter Zijlstra
maintainerQuoted 6 lines · Stephane Eranian
The
validate_event()was failing on valid event combinations. The function was assuming that ifx86_schedule_event()returned 0, it meant error. Butx86_schedule_event()returns the counter index and 0 is a perfectly valid value. An error is returned if the function returns a negative value.
Good point.
Quoted 3 lines
Furthermore, validate_event() was also failing for event groups because the event->pmu was not set until after hw_perf_pmu_init().
(hw_perf_event_init, right?)
Won't this give very funny results for mixed pmu groups?
How about something like:
if (event->pmu && event->pmu != &pmu)
return 0;
That should deal with new events, who do not yet have their pmu set and for those we know they're for us, but exclude events for other PMUs.
Quoted 21 lines
Signed-off-by Stephane Eranian <[email protected]>--
arch/x86/kernel/cpu/perf_event.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)arch/x86/kernel/cpu/perf_event.c +1
-4@@ -2229,10 +2229,7 @@ validate_event(struct cpu_hw_events *cpuc, struct perf_event *event) {struct hw_perf_event fake_event = event->hw; -if (event->pmu != &pmu) -return 0 ; - -return x86_schedule_event (cpuc, &fake_event); +return x86_schedule_event (cpuc, &fake_event) >=0 ; }static int validate_group (struct perf_event *event)
Hi,
Sorry for the delay,
Quoted 8 lines · Peter Zijlstra
Quoted 6 lines · Stephane Eranian
The
validate_event()was failing on valid event combinations. The function was assuming that ifx86_schedule_event()returned 0, it meant error. Butx86_schedule_event()returns the counter index and 0 is a perfectly valid value. An error is returned if the function returns a negative value.
Quoted 8 lines
Good point.
Quoted 3 lines
Furthermore,
validate_event()was also failing for event groups because theevent->pmuwas not set until afterhw_perf_pmu_init().(
hw_perf_event_init, right?)
Yes.
Quoted 2 lines
Won't this give very funny results for mixed pmu groups?
What do you mean by 'mixed pmu groups'?
Quoted 32 lines
How about something like:
if (
event->pmu&&event->pmu!= &pmu)
return 0;That should deal with new events, who do not yet have their pmu set and for those we know they're for us, but exclude events for other PMUs.
Quoted 21 lines
Signed-off-by Stephane Eranian <[email protected]>--
arch/x86/kernel/cpu/perf_event.c | 5 +----1 file changed, 1 insertion(+), 4 deletions(-)arch/x86/kernel/cpu/perf_event.c +1
-4@@ -2229,10 +2229,7 @@ validate_event(struct cpu_hw_events *cpuc, struct perf_event *event) { struct hw_perf_event fake_event = event->hw; - if (event->pmu != &pmu) - return 0; - - return x86_schedule_event(cpuc, &fake_event); + return x86_schedule_event(cpuc, &fake_event) >= 0; } static int validate_group(struct perf_event *event)
Peter Zijlstra
maintainerQuoted 4 lines · stephane eranian
Quoted 2 lines
Won't this give very funny results for mixed pmu groups?
What do you mean by 'mixed pmu groups'?
We currently have a number of struct pmu objects:
perf_ops_generic
perf_ops_cpu_clock
perf_ops_task_clock
which are all software based PMUs, and one of:
pmu (arch/x86/kernel/cpu/perf_event.c)
power_pmu (arch/powerpc/kernel/perf_event.c)
To represent the hardware PMU.
Now say you mix software events and hardware events into a single group, the loop in validate_group:
list_for_each_entry(sibling, &leader->sibling_list, group_entry) {
if (!validate_event(&fake_pmu, sibling))
return -ENOSPC;}
could pass a !hardware event into validate_event(), which currently ignores it because event->pmu won't be &pmu, however if you remove that check, it'll try and call x86 routines on a software event, which is bound to go funny.
Now Frederic is going to make things more interesting by representing HW breakpoints as another HW PMU (the distinction between hw/sw pmu is in scheduling, you can always schedule a software event).
This weakens the !is_software_event(), in that !software doesn't tell you which hardware event it is -- something which needs mending in your more complex x86 constraints scheduling patch.
Quoted 28 lines · Peter Zijlstra
Quoted 4 lines · stephane eranian
Quoted 2 lines
Won't this give very funny results for mixed pmu groups?
What do you mean by 'mixed pmu groups'?
We currently have a number of struct pmu objects:
perf_ops_generic
perf_ops_cpu_clock
perf_ops_task_clockwhich are all software based PMUs, and one of:
pmu (arch/x86/kernel/cpu/perf_event.c)
power_pmu (arch/powerpc/kernel/perf_event.c)To represent the hardware PMU.
Now say you mix software events and hardware events into a single group, the loop in
validate_group:list_for_each_entry(sibling,
&leader->sibling_list,group_entry) { if (!validate_event(&fake_pmu, sibling))
return-ENOSPC;
}
Quoted 5 lines
could pass a !hardware event into
validate_event(), which currently ignores it becauseevent->pmuwon't be &pmu, however if you remove that check, it'll try and call x86 routines on a software event, which is bound to go funny.
Ok, so it seems the only valid test to check if the event is related to the HW PMU is to compare event->pmu with pmu (arch/x86/.../perf_event.c).
In that case you first suggestion is fine.
Quoted 8 lines
Now Frederic is going to make things more interesting by representing HW breakpoints as another HW PMU (the distinction between hw/sw pmu is in scheduling, you can always schedule a software event).
This weakens the !is_software_event(), in that !software doesn't tell you which hardware event it is -- something which needs mending in your more complex x86 constraints scheduling patch.
That means we can drop is_software_event() in this code and instead define locally
in x86 a is_hw_pmu_event() function as event->pmu == &pmu.
Quoted 3 lines · stephane eranian
That means we can drop
is_software_event()in this code and instead define locally
in x86 ais_hw_pmu_event()function asevent->pmu== &pmu.
I'd have to see the patch, but that doesn't feel entirely right, because there is a unique characteristic of software events, compared to hardware or breakpoint events: they are never capacity constrained. In the past, only hardware events were capacity constrained, which meant that all the decisions about whether a group could go on could be done in the hardware PMU backend. Now we have two sources of capacity constraints, so it may be that a group can't go on even if the hardware PMU has capacity. That's going to be somewhat interesting to get completely right, I think.
Paul.
Quoted 6 lines · Paul Mackerras
Quoted 3 lines · stephane eranian
That means we can drop
is_software_event()in this code and instead define locally
in x86 ais_hw_pmu_event()function asevent->pmu== &pmu.
Quoted 10 lines
I'd have to see the patch, but that doesn't feel entirely right, because there is a unique characteristic of software events, compared to hardware or breakpoint events: they are never capacity constrained. In the past, only hardware events were capacity constrained, which meant that all the decisions about whether a group could go on could be done in the hardware PMU backend. Now we have two sources of capacity constraints, so it may be that a group can't go on even if the hardware PMU has capacity. That's going to be somewhat interesting to get completely right, I think.
I was talking of is_software_event() in the context of the hardware PMU code. The reason you were using this function is simply to skip SW events because, as you said, they are never constrained and also because they are not related to HW PMU.
You are right about HW breakpoints, because now you have a new source of constraints. Only the breakpoint code knows about those constraints.
It seems to me you have two ways of solving this:
1- push the algorithm to assign events to counters up in the generic code 2- have the generic code invoke all possible constraint sources on each group
I have already said that I would not recommend initially going with 1- because constraints are very diverse in their nature. It is not as simple as 1 event = 1 bitmask of valid counters. Things can be more dynamic than that, e.g., on AMD64, whereby for certain events the bitmask depends on what is going on in the other cores on the socket. There are also similar constraints on advanced Intel features.
So unlike what I heard early on, constraints are not going away, instead they are
changing in nature and to something much more complex to deal with.
I believe that until all PMU event assignment logic is implemented in the PMU specific code, it would be very presumptuous to try and design that generic algorithm.
So I would go with 2, at least initially.
Peter Zijlstra
maintainerQuoted 3 lines · stephane eranian
It seems to me you have two ways of solving this:
1- push the algorithm to assign events to counters up in the generic code 2- have the generic code invoke all possible constraint sources on each group
2, is what it currently does.
Since we can only add a single event to a group at a time, and we know the previous group was schedulable, we only need to validate the constraints on the pmu of the new event.
PATCH 1/1 perf_events: fix validate_event bug
In reply to Stephane Eranian The validate_event() was failing on valid event combinations. The function was assuming that if x86_schedule_event() returned 0, it meant error. But x86_schedule_event() returns the counter index and 0 is a perfectly valid value. An error is returned if the function returns a negative value.
Furthermore, validate_event() was also failing for event groups because the event->pmu was not set until after hw_perf_event_init().
--
arch/x86/kernel/cpu/perf_event.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/kernel/cpu/perf_event.c +2 -2
@@ -2229,10 +2229,10 @@ validate_event(struct cpu_hw_events *cpuc, struct perf_event *event) {struct hw_perf_event fake_event = event->hw; -if (event->pmu != &pmu) +if (event->pmu && event->pmu != &pmu)return 0 ; -return x86_schedule_event (cpuc, &fake_event); +return x86_schedule_event (cpuc, &fake_event) >=0 ; }static int validate_group (struct perf_event *event)
[tip:perf/core] perf_events, x86: Fix validate_event bug
Commit-ID: 1261a02a0c0ab8e643125705f0d1d83e5090e4d1 Gitweb: http://git.kernel.org/tip/1261a02a0c0ab8e643125705f0d1d83e5090e4d1 Author: Stephane Eranian <[email protected]> AuthorDate: Tue, 24 Nov 2009 05:27:18 -0800 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 24 Nov 2009 19:23:48 +0100
perf_events, x86: Fix validate_event bug
The validate_event() was failing on valid event combinations. The function was assuming that if x86_schedule_event() returned 0, it meant error. But x86_schedule_event() returns the counter index and 0 is a perfectly valid value. An error is returned if the function returns a negative value.
Furthermore, validate_event() was also failing for event groups because the event->pmu was not set until after hw_perf_event_init().
LKML-Reference: <[email protected]>
--
arch/x86/kernel/cpu/perf_event.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- arch/x86/kernel/cpu/perf_event.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
arch/x86/kernel/cpu/perf_event.c +2 -2
@@ -2229,10 +2229,10 @@ validate_event(struct cpu_hw_events *cpuc, struct perf_event *event) {struct hw_perf_event fake_event = event->hw; -if (event->pmu != &pmu) +if (event->pmu && event->pmu != &pmu)return 0 ; -return x86_schedule_event (cpuc, &fake_event); +return x86_schedule_event (cpuc, &fake_event) >=0 ; }static int validate_group (struct perf_event *event)