2014-06-15 05:55:46

by Vince Weaver

Subject: [PATCH 1/6] arc,perf: Use common PMU interrupt disabled code

Transition to using the new generic PERF_PMU_CAP_NO_INTERRUPT method for
failing a sampling event when no PMU interrupt is available.

Signed-off-by: Vince Weaver <[email protected]>

diff --git a/arch/arc/kernel/perf_event.c b/arch/arc/kernel/perf_event.c
index 63177e4..b9a5685 100644
--- a/arch/arc/kernel/perf_event.c
+++ b/arch/arc/kernel/perf_event.c
@@ -99,10 +99,6 @@ static int arc_pmu_event_init(struct perf_event *event)
struct hw_perf_event *hwc = &event->hw;
int ret;

- /* ARC 700 PMU does not support sampling events */
- if (is_sampling_event(event))
- return -ENOENT;
-
switch (event->attr.type) {
case PERF_TYPE_HARDWARE:
if (event->attr.config >= PERF_COUNT_HW_MAX)
@@ -298,6 +294,9 @@ static int arc_pmu_device_probe(struct platform_device *pdev)
.read = arc_pmu_read,
};

+ /* ARC 700 PMU does not support sampling events */
+ arc_pmu->pmu.capabilities |= PERF_PMU_CAP_NO_INTERRUPT;
+
ret = perf_pmu_register(&arc_pmu->pmu, pdev->name, PERF_TYPE_RAW);

return ret;

2014-06-16 13:16:23

by Vineet Gupta

Subject: Re: [PATCH 1/6] arc,perf: Use common PMU interrupt disabled code

On Sunday 15 June 2014 11:25 AM, Vince Weaver wrote:
> Transition to using the new generic PERF_PMU_CAP_NO_INTERRUPT method for
> failing a sampling event when no PMU interrupt is available.
>
> Signed-off-by: Vince Weaver <[email protected]>

Acked-by: Vineet Gupta <[email protected]>

Thx,
-Vineet

>
> diff --git a/arch/arc/kernel/perf_event.c b/arch/arc/kernel/perf_event.c
> index 63177e4..b9a5685 100644
> --- a/arch/arc/kernel/perf_event.c
> +++ b/arch/arc/kernel/perf_event.c
> @@ -99,10 +99,6 @@ static int arc_pmu_event_init(struct perf_event *event)
> struct hw_perf_event *hwc = &event->hw;
> int ret;
>
> - /* ARC 700 PMU does not support sampling events */
> - if (is_sampling_event(event))
> - return -ENOENT;
> -
> switch (event->attr.type) {
> case PERF_TYPE_HARDWARE:
> if (event->attr.config >= PERF_COUNT_HW_MAX)
> @@ -298,6 +294,9 @@ static int arc_pmu_device_probe(struct platform_device *pdev)
> .read = arc_pmu_read,
> };
>
> + /* ARC 700 PMU does not support sampling events */
> + arc_pmu->pmu.capabilities |= PERF_PMU_CAP_NO_INTERRUPT;
> +
> ret = perf_pmu_register(&arc_pmu->pmu, pdev->name, PERF_TYPE_RAW);
>
> return ret;
>

2014-06-19 12:38:20

by tip-bot for Vasyl Gomonovych

Subject: [tip:perf/core] arc, perf: Use common PMU interrupt disabled code

Commit-ID: 2cc9e588b0ff80c209c59a3e369c73e591535ba8
Gitweb: http://git.kernel.org/tip/2cc9e588b0ff80c209c59a3e369c73e591535ba8
Author: Vince Weaver <[email protected]>
AuthorDate: Sun, 15 Jun 2014 02:00:18 -0400
Committer: Ingo Molnar <[email protected]>
CommitDate: Wed, 18 Jun 2014 18:43:44 +0200

arc, perf: Use common PMU interrupt disabled code

Transition to using the new generic PERF_PMU_CAP_NO_INTERRUPT method for
failing a sampling event when no PMU interrupt is available.

Signed-off-by: Vince Weaver <[email protected]>
Acked-by: Vineet Gupta <[email protected]>
Signed-off-by: Peter Zijlstra <[email protected]>
Cc: Arnaldo Carvalho de Melo <[email protected]>
Cc: Grant Likely <[email protected]>
Cc: Paul Mackerras <[email protected]>
Cc: Rob Herring <[email protected]>
Link: http://lkml.kernel.org/r/alpine.DEB.2.10.1406150159280.16738@vincent-weaver-1.umelst.maine.edu
Signed-off-by: Ingo Molnar <[email protected]>
---
arch/arc/kernel/perf_event.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/arch/arc/kernel/perf_event.c b/arch/arc/kernel/perf_event.c
index 63177e4..b9a5685 100644
--- a/arch/arc/kernel/perf_event.c
+++ b/arch/arc/kernel/perf_event.c
@@ -99,10 +99,6 @@ static int arc_pmu_event_init(struct perf_event *event)
struct hw_perf_event *hwc = &event->hw;
int ret;

- /* ARC 700 PMU does not support sampling events */
- if (is_sampling_event(event))
- return -ENOENT;
-
switch (event->attr.type) {
case PERF_TYPE_HARDWARE:
if (event->attr.config >= PERF_COUNT_HW_MAX)
@@ -298,6 +294,9 @@ static int arc_pmu_device_probe(struct platform_device *pdev)
.read = arc_pmu_read,
};

+ /* ARC 700 PMU does not support sampling events */
+ arc_pmu->pmu.capabilities |= PERF_PMU_CAP_NO_INTERRUPT;
+
ret = perf_pmu_register(&arc_pmu->pmu, pdev->name, PERF_TYPE_RAW);

return ret;