From: Suzuki K Poulose <suzuki.poulose@arm.com> To: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org, will.deacon@arm.com, mark.rutland@arm.com, robin.murphy@arm.com, Suzuki K Poulose <suzuki.poulose@arm.com> Subject: [PATCH v2 4/5] arm_pmu: Tidy up clear_event_idx call backs Date: Tue, 29 May 2018 11:55:55 +0100 [thread overview] Message-ID: <1527591356-10934-5-git-send-email-suzuki.poulose@arm.com> (raw) In-Reply-To: <1527591356-10934-1-git-send-email-suzuki.poulose@arm.com> The armpmu uses get_event_idx callback to allocate an event counter for a given event, which marks the selected counter as "used". Now, when we delete the counter, the arm_pmu goes ahead and clears the "used" bit and then invokes the "clear_event_idx" call back, which kind of splits the job between the core code and the backend. Tidy this up by relying on the clear_event_idx to do the book keeping, if available. Otherwise, let the core driver do the default "clear" bit operation. This will be useful for adding the chained event support, where we leave the event idx maintenance to the backend. Cc: Mark Rutland <mark.rutland@arm.com> Cc: Will Deacon <will.deacon@arm.com> Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com> --- arch/arm/kernel/perf_event_v7.c | 2 ++ drivers/perf/arm_pmu.c | 15 +++++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/arch/arm/kernel/perf_event_v7.c b/arch/arm/kernel/perf_event_v7.c index 5f342fc..5e78faa 100644 --- a/arch/arm/kernel/perf_event_v7.c +++ b/arch/arm/kernel/perf_event_v7.c @@ -1638,6 +1638,7 @@ static void krait_pmu_clear_event_idx(struct pmu_hw_events *cpuc, bool venum_event = EVENT_VENUM(hwc->config_base); bool krait_event = EVENT_CPU(hwc->config_base); + clear_bit(hwc->idx, cpuc->used_mask); if (venum_event || krait_event) { bit = krait_event_to_bit(event, region, group); clear_bit(bit, cpuc->used_mask); @@ -1967,6 +1968,7 @@ static void scorpion_pmu_clear_event_idx(struct pmu_hw_events *cpuc, bool venum_event = EVENT_VENUM(hwc->config_base); bool scorpion_event = EVENT_CPU(hwc->config_base); + clear_bit(hwc->idx, cpuc->used_mask); if (venum_event || scorpion_event) { bit = scorpion_event_to_bit(event, region, group); clear_bit(bit, cpuc->used_mask); diff --git a/drivers/perf/arm_pmu.c b/drivers/perf/arm_pmu.c index ff858e6..9ae7e68 100644 --- a/drivers/perf/arm_pmu.c +++ b/drivers/perf/arm_pmu.c @@ -226,6 +226,16 @@ static void armpmu_start(struct perf_event *event, int flags) armpmu->enable(event); } +static void armpmu_clear_event_idx(struct arm_pmu *armpmu, + struct pmu_hw_events *hw_events, + struct perf_event *event) +{ + if (armpmu->clear_event_idx) + armpmu->clear_event_idx(hw_events, event); + else + clear_bit(event->hw.idx, hw_events->used_mask); +} + static void armpmu_del(struct perf_event *event, int flags) { @@ -236,10 +246,7 @@ armpmu_del(struct perf_event *event, int flags) armpmu_stop(event, PERF_EF_UPDATE); hw_events->events[idx] = NULL; - clear_bit(idx, hw_events->used_mask); - if (armpmu->clear_event_idx) - armpmu->clear_event_idx(hw_events, event); - + armpmu_clear_event_idx(armpmu, hw_events, event); perf_event_update_userpage(event); } -- 2.7.4
WARNING: multiple messages have this Message-ID (diff)
From: suzuki.poulose@arm.com (Suzuki K Poulose) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 4/5] arm_pmu: Tidy up clear_event_idx call backs Date: Tue, 29 May 2018 11:55:55 +0100 [thread overview] Message-ID: <1527591356-10934-5-git-send-email-suzuki.poulose@arm.com> (raw) In-Reply-To: <1527591356-10934-1-git-send-email-suzuki.poulose@arm.com> The armpmu uses get_event_idx callback to allocate an event counter for a given event, which marks the selected counter as "used". Now, when we delete the counter, the arm_pmu goes ahead and clears the "used" bit and then invokes the "clear_event_idx" call back, which kind of splits the job between the core code and the backend. Tidy this up by relying on the clear_event_idx to do the book keeping, if available. Otherwise, let the core driver do the default "clear" bit operation. This will be useful for adding the chained event support, where we leave the event idx maintenance to the backend. Cc: Mark Rutland <mark.rutland@arm.com> Cc: Will Deacon <will.deacon@arm.com> Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com> --- arch/arm/kernel/perf_event_v7.c | 2 ++ drivers/perf/arm_pmu.c | 15 +++++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/arch/arm/kernel/perf_event_v7.c b/arch/arm/kernel/perf_event_v7.c index 5f342fc..5e78faa 100644 --- a/arch/arm/kernel/perf_event_v7.c +++ b/arch/arm/kernel/perf_event_v7.c @@ -1638,6 +1638,7 @@ static void krait_pmu_clear_event_idx(struct pmu_hw_events *cpuc, bool venum_event = EVENT_VENUM(hwc->config_base); bool krait_event = EVENT_CPU(hwc->config_base); + clear_bit(hwc->idx, cpuc->used_mask); if (venum_event || krait_event) { bit = krait_event_to_bit(event, region, group); clear_bit(bit, cpuc->used_mask); @@ -1967,6 +1968,7 @@ static void scorpion_pmu_clear_event_idx(struct pmu_hw_events *cpuc, bool venum_event = EVENT_VENUM(hwc->config_base); bool scorpion_event = EVENT_CPU(hwc->config_base); + clear_bit(hwc->idx, cpuc->used_mask); if (venum_event || scorpion_event) { bit = scorpion_event_to_bit(event, region, group); clear_bit(bit, cpuc->used_mask); diff --git a/drivers/perf/arm_pmu.c b/drivers/perf/arm_pmu.c index ff858e6..9ae7e68 100644 --- a/drivers/perf/arm_pmu.c +++ b/drivers/perf/arm_pmu.c @@ -226,6 +226,16 @@ static void armpmu_start(struct perf_event *event, int flags) armpmu->enable(event); } +static void armpmu_clear_event_idx(struct arm_pmu *armpmu, + struct pmu_hw_events *hw_events, + struct perf_event *event) +{ + if (armpmu->clear_event_idx) + armpmu->clear_event_idx(hw_events, event); + else + clear_bit(event->hw.idx, hw_events->used_mask); +} + static void armpmu_del(struct perf_event *event, int flags) { @@ -236,10 +246,7 @@ armpmu_del(struct perf_event *event, int flags) armpmu_stop(event, PERF_EF_UPDATE); hw_events->events[idx] = NULL; - clear_bit(idx, hw_events->used_mask); - if (armpmu->clear_event_idx) - armpmu->clear_event_idx(hw_events, event); - + armpmu_clear_event_idx(armpmu, hw_events, event); perf_event_update_userpage(event); } -- 2.7.4
next prev parent reply other threads:[~2018-05-29 10:56 UTC|newest] Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-05-29 10:55 [PATCH v2 0/5] arm64: perf: Support for chained counters Suzuki K Poulose 2018-05-29 10:55 ` Suzuki K Poulose 2018-05-29 10:55 ` [PATCH v2 1/5] arm_pmu: Clean up maximum period handling Suzuki K Poulose 2018-05-29 10:55 ` Suzuki K Poulose 2018-05-29 10:55 ` [PATCH v2 2/5] arm_pmu: Change API to support 64bit counter values Suzuki K Poulose 2018-05-29 10:55 ` Suzuki K Poulose 2018-05-29 10:55 ` [PATCH v2 3/5] arm_pmu: Add support for 64bit event counters Suzuki K Poulose 2018-05-29 10:55 ` Suzuki K Poulose 2018-06-06 16:48 ` Mark Rutland 2018-06-06 16:48 ` Mark Rutland 2018-06-07 7:34 ` Suzuki K Poulose 2018-06-07 7:34 ` Suzuki K Poulose 2018-05-29 10:55 ` Suzuki K Poulose [this message] 2018-05-29 10:55 ` [PATCH v2 4/5] arm_pmu: Tidy up clear_event_idx call backs Suzuki K Poulose 2018-05-29 10:55 ` [PATCH v2 5/5] arm64: perf: Add support for chaining event counters Suzuki K Poulose 2018-05-29 10:55 ` Suzuki K Poulose 2018-06-06 18:01 ` Mark Rutland 2018-06-06 18:01 ` Mark Rutland 2018-06-08 14:46 ` Suzuki K Poulose 2018-06-08 14:46 ` Suzuki K Poulose 2018-06-08 15:24 ` Mark Rutland 2018-06-08 15:24 ` Mark Rutland 2018-06-08 16:05 ` Suzuki K Poulose 2018-06-08 16:05 ` Suzuki K Poulose 2018-06-11 13:54 ` Suzuki K Poulose 2018-06-11 13:54 ` Suzuki K Poulose 2018-06-11 14:24 ` Mark Rutland 2018-06-11 14:24 ` Mark Rutland 2018-06-11 16:18 ` Suzuki K Poulose 2018-06-11 16:18 ` Suzuki K Poulose 2018-06-05 15:00 ` [PATCH v2 0/5] arm64: perf: Support for chained counters Julien Thierry 2018-06-05 15:00 ` Julien Thierry
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1527591356-10934-5-git-send-email-suzuki.poulose@arm.com \ --to=suzuki.poulose@arm.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=mark.rutland@arm.com \ --cc=robin.murphy@arm.com \ --cc=will.deacon@arm.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.