[PATCH] perf/x86: Remove redundant calls to perf_pmu_{dis|en}able

[PATCH] perf/x86: Remove redundant calls to perf_pmu_{dis|en}able

[David Ahern]

perf_pmu_disable is called before pmu->add and perf_pmu_enable is called
afterwards. No need to call these inside of x86_pmu_add as well.

Signed-off-by: David Ahern <dsahern@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
---
 arch/x86/kernel/cpu/perf_event.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
index b71a7f86d68a..2d1675816bef 100644
--- a/arch/x86/kernel/cpu/perf_event.c
+++ b/arch/x86/kernel/cpu/perf_event.c
@@ -1033,7 +1033,6 @@ static int x86_pmu_add(struct perf_event *event, int flags)
 
 	hwc = &event->hw;
 
-	perf_pmu_disable(event->pmu);
 	n0 = cpuc->n_events;
 	ret = n = collect_events(cpuc, event, false);
 	if (ret < 0)
@@ -1071,7 +1070,6 @@ static int x86_pmu_add(struct perf_event *event, int flags)
 
 	ret = 0;
 out:
-	perf_pmu_enable(event->pmu);
 	return ret;
 }
 
-- 
1.9.3 (Apple Git-50)

Re: [PATCH] perf/x86: Remove redundant calls to perf_pmu_{dis|en}able

[David Ahern]

Hi Peter:

On 2/18/15 10:45 AM, David Ahern wrote:
> perf_pmu_disable is called before pmu->add and perf_pmu_enable is called
> afterwards. No need to call these inside of x86_pmu_add as well.

Does this make sense or did I miss something about the 
pmu_enable/disable functions?

David

>
> Signed-off-by: David Ahern <dsahern@gmail.com>
> Cc: Peter Zijlstra <peterz@infradead.org>
> ---
>   arch/x86/kernel/cpu/perf_event.c | 2 --
>   1 file changed, 2 deletions(-)
>
> diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
> index b71a7f86d68a..2d1675816bef 100644
> --- a/arch/x86/kernel/cpu/perf_event.c
> +++ b/arch/x86/kernel/cpu/perf_event.c
> @@ -1033,7 +1033,6 @@ static int x86_pmu_add(struct perf_event *event, int flags)
>
>   	hwc = &event->hw;
>
> -	perf_pmu_disable(event->pmu);
>   	n0 = cpuc->n_events;
>   	ret = n = collect_events(cpuc, event, false);
>   	if (ret < 0)
> @@ -1071,7 +1070,6 @@ static int x86_pmu_add(struct perf_event *event, int flags)
>
>   	ret = 0;
>   out:
> -	perf_pmu_enable(event->pmu);
>   	return ret;
>   }
>
>

Re: [PATCH] perf/x86: Remove redundant calls to perf_pmu_{dis|en}able

[Peter Zijlstra]

On Mon, Feb 23, 2015 at 09:49:35AM -0700, David Ahern wrote:
> Hi Peter:
> 
> On 2/18/15 10:45 AM, David Ahern wrote:
> >perf_pmu_disable is called before pmu->add and perf_pmu_enable is called
> >afterwards. No need to call these inside of x86_pmu_add as well.
> 
> Does this make sense or did I miss something about the pmu_enable/disable
> functions?

No, I think you're right. Applied, thanks!

[tip:perf/core] perf/x86: Remove redundant calls to perf_pmu_{dis|en}able()

[tip-bot for David Ahern]

Commit-ID:  9332d250b4b4f67c633894b311e022e3cf943bd5
Gitweb:     http://git.kernel.org/tip/9332d250b4b4f67c633894b311e022e3cf943bd5
Author:     David Ahern <dsahern@gmail.com>
AuthorDate: Wed, 18 Feb 2015 10:45:43 -0700
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Fri, 27 Mar 2015 09:49:44 +0100

perf/x86: Remove redundant calls to perf_pmu_{dis|en}able()

perf_pmu_disable() is called before pmu->add() and perf_pmu_enable() is called
afterwards. No need to call these inside of x86_pmu_add() as well.

Signed-off-by: David Ahern <dsahern@gmail.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1424281543-67335-1-git-send-email-dsahern@gmail.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 arch/x86/kernel/cpu/perf_event.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
index ec6e982..ac41b3a 100644
--- a/arch/x86/kernel/cpu/perf_event.c
+++ b/arch/x86/kernel/cpu/perf_event.c
@@ -1044,7 +1044,6 @@ static int x86_pmu_add(struct perf_event *event, int flags)
 
 	hwc = &event->hw;
 
-	perf_pmu_disable(event->pmu);
 	n0 = cpuc->n_events;
 	ret = n = collect_events(cpuc, event, false);
 	if (ret < 0)
@@ -1082,7 +1081,6 @@ done_collect:
 
 	ret = 0;
 out:
-	perf_pmu_enable(event->pmu);
 	return ret;
 }