linux-csky.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Guo Ren <guoren@kernel.org>
To: Mao Han <han_mao@c-sky.com>
Cc: linux-kernel@vger.kernel.org, linux-csky@vger.kernel.org
Subject: Re: [PATCH V4 6/6] csky: Fix perf record in kernel/user space
Date: Tue, 4 Jun 2019 14:36:45 +0800	[thread overview]
Message-ID: <CAJF2gTSS7UhBOPYp=SMYAZ-OMhV21=4v3Gcp_80038QKLFWa6w@mail.gmail.com> (raw)
In-Reply-To: <3a6a5379b4f692773d82ff5ad18a7b22ceaf5a80.1559614824.git.han_mao@c-sky.com>

Just move attr.exclude_user after switch, like this:

OK?

diff --git a/arch/csky/kernel/perf_event.c b/arch/csky/kernel/perf_event.c
index 376c972..3470cfa 100644
--- a/arch/csky/kernel/perf_event.c
+++ b/arch/csky/kernel/perf_event.c
@@ -844,15 +844,6 @@ static int csky_pmu_event_init(struct perf_event *event)
        struct hw_perf_event *hwc = &event->hw;
        int ret;

-       if (event->attr.exclude_user)
-               csky_pmu.hpcr = BIT(2);
-       else if (event->attr.exclude_kernel)
-               csky_pmu.hpcr = BIT(3);
-       else
-               csky_pmu.hpcr = BIT(2) | BIT(3);
-
-       csky_pmu.hpcr |= BIT(1) | BIT(0);
-
        switch (event->attr.type) {
        case PERF_TYPE_HARDWARE:
                if (event->attr.config >= PERF_COUNT_HW_MAX)
@@ -861,21 +852,31 @@ static int csky_pmu_event_init(struct perf_event *event)
                if (ret == HW_OP_UNSUPPORTED)
                        return -ENOENT;
                hwc->idx = ret;
-               return 0;
+               break;
        case PERF_TYPE_HW_CACHE:
                ret = csky_pmu_cache_event(event->attr.config);
                if (ret == CACHE_OP_UNSUPPORTED)
                        return -ENOENT;
                hwc->idx = ret;
-               return 0;
+               break;
        case PERF_TYPE_RAW:
                if (hw_raw_read_mapping[event->attr.config] == NULL)
                        return -ENOENT;
                hwc->idx = event->attr.config;
-               return 0;
+               break;
        default:
                return -ENOENT;
        }
+
+       if (event->attr.exclude_user)
+               csky_pmu.hpcr = BIT(2);
+       else if (event->attr.exclude_kernel)
+               csky_pmu.hpcr = BIT(3);
+       else
+               csky_pmu.hpcr = BIT(2) | BIT(3);
+
+       csky_pmu.hpcr |= BIT(1) | BIT(0);
+
 }

On Tue, Jun 4, 2019 at 10:25 AM Mao Han <han_mao@c-sky.com> wrote:
>
> csky_pmu_event_init is called several times during the perf record
> initialzation. After configure the event counter in either kernel
> space or user space, csky_pmu_event_init is called twice with no
> attr specified. Configuration will be overwritten with sampling in
> both kernel space and user space. --all-kernel/--all-user is
> useless without this patch applied.
>
> Signed-off-by: Mao Han <han_mao@c-sky.com>
> Cc: Guo Ren <guoren@kernel.org>
> Cc: linux-csky@vger.kernel.org
> ---
>  arch/csky/kernel/perf_event.c | 6 ++++++
>  1 file changed, 6 insertions(+)
>
> diff --git a/arch/csky/kernel/perf_event.c b/arch/csky/kernel/perf_event.c
> index dc84dc7..e3308ab 100644
> --- a/arch/csky/kernel/perf_event.c
> +++ b/arch/csky/kernel/perf_event.c
> @@ -983,6 +983,12 @@ static int csky_pmu_event_init(struct perf_event *event)
>         struct hw_perf_event *hwc = &event->hw;
>         int ret;
>
> +       if (event->attr.type != PERF_TYPE_HARDWARE &&
> +           event->attr.type != PERF_TYPE_HW_CACHE &&
> +           event->attr.type != PERF_TYPE_RAW) {
> +               return -ENOENT;
> +       }
> +
>         if (event->attr.exclude_user)
>                 csky_pmu.hpcr = BIT(2);
>         else if (event->attr.exclude_kernel)
> --
> 2.7.4
>

      reply	other threads:[~2019-06-04  6:37 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-06-04  2:23 [PATCH V4 0/6] csky: Add pmu hardware sampling support Mao Han
2019-06-04  2:23 ` [PATCH V4 1/6] csky: Init pmu as a device Mao Han
2019-06-04  5:50   ` Guo Ren
2019-06-04  2:23 ` [PATCH V4 2/6] csky: Add count-width property for csky pmu Mao Han
2019-06-04  5:35   ` Guo Ren
2019-06-04  2:23 ` [PATCH V4 3/6] csky: Add pmu interrupt support Mao Han
2019-06-04  6:31   ` Guo Ren
2019-06-04  2:23 ` [PATCH V4 4/6] dt-bindings: csky: Add csky PMU bindings Mao Han
2019-06-04  5:38   ` Guo Ren
2019-06-04  2:23 ` [PATCH V4 5/6] csky: Fixup some error count in 810 & 860 Mao Han
2019-06-04  2:24 ` [PATCH V4 6/6] csky: Fix perf record in kernel/user space Mao Han
2019-06-04  6:36   ` Guo Ren [this message]

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='CAJF2gTSS7UhBOPYp=SMYAZ-OMhV21=4v3Gcp_80038QKLFWa6w@mail.gmail.com' \
    --to=guoren@kernel.org \
    --cc=han_mao@c-sky.com \
    --cc=linux-csky@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    /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: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).