linux-csky.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Mao Han <han_mao@c-sky.com>
To: linux-kernel@vger.kernel.org
Cc: Mao Han <han_mao@c-sky.com>, Guo Ren <guoren@kernel.org>,
	linux-csky@vger.kernel.org
Subject: [PATCH V3 6/6] csky: Fix perf record in kernel/user space
Date: Mon,  3 Jun 2019 14:46:25 +0800	[thread overview]
Message-ID: <79c0094b29f2315045a9a2544c9837bcf6f78fea.1559544301.git.han_mao@c-sky.com> (raw)
In-Reply-To: <cover.1559544301.git.han_mao@c-sky.com>
In-Reply-To: <cover.1559544301.git.han_mao@c-sky.com>

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 de95005..011fd9b 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


      parent reply	other threads:[~2019-06-03  6:47 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <cover.1559544301.git.han_mao@c-sky.com>
2019-06-03  6:46 ` [PATCH V3 1/6] csky: Init pmu as a device Mao Han
2019-06-03  6:46 ` [PATCH V3 2/6] csky: Add reg-io-width property for csky pmu Mao Han
2019-06-03  8:20   ` Guo Ren
2019-06-03  6:46 ` [PATCH V3 3/6] csky: Add pmu interrupt support Mao Han
2019-06-03  6:46 ` [PATCH V3 4/6] dt-bindings: csky: Add csky PMU bindings Mao Han
2019-06-03  6:46 ` [PATCH V3 5/6] csky: Fixup some error count in 810 & 860 Mao Han
2019-06-03  6:46 ` Mao Han [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=79c0094b29f2315045a9a2544c9837bcf6f78fea.1559544301.git.han_mao@c-sky.com \
    --to=han_mao@c-sky.com \
    --cc=guoren@kernel.org \
    --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).