LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Deng-Cheng Zhu <dengcheng.zhu@gmail.com>
To: ralf@linux-mips.org, a.p.zijlstra@chello.nl, fweisbec@gmail.com,
	will.deacon@arm.com
Cc: linux-mips@linux-mips.org, linux-kernel@vger.kernel.org,
	wuzhangjin@gmail.com, paulus@samba.org, mingo@elte.hu,
	acme@redhat.com, dengcheng.zhu@gmail.com, matt@console-pimps.org,
	sshtylyov@mvista.com, ddaney@caviumnetworks.com
Subject: [PATCH v4 3/5] MIPS/Perf-events: Fix event check in validate_event()
Date: Fri, 21 Jan 2011 16:19:19 +0800	[thread overview]
Message-ID: <1295597961-7565-4-git-send-email-dengcheng.zhu@gmail.com> (raw)
In-Reply-To: <1295597961-7565-1-git-send-email-dengcheng.zhu@gmail.com>

Ignore events that are in off/error state or belong to a different PMU.

This patch originates from the following commit for ARM by Will Deacon:

- 65b4711ff513767341aa1915c822de6ec0de65cb
    ARM: 6352/1: perf: fix event validation

    The validate_event function in the ARM perf events backend has the
    following problems:

    1.) Events that are disabled count towards the cost.
    2.) Events associated with other PMUs [for example, software events or
        breakpoints] do not count towards the cost, but do fail validation,
        causing the group to fail.

    This patch changes validate_event so that it ignores events in the
    PERF_EVENT_STATE_OFF state or that are scheduled for other PMUs.

Changes:
v4 - v3:
o None
v3 - v2:
o Keep all mentioned commits in the form of number + title + original
summary + (MIPS specific info when needed).
v2 - v1:
o Corrected the return value of the event check in validate_event().

Acked-by: Will Deacon <will.deacon@arm.com>
Acked-by: David Daney <ddaney@caviumnetworks.com>
Signed-off-by: Deng-Cheng Zhu <dengcheng.zhu@gmail.com>
---
 arch/mips/kernel/perf_event.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/arch/mips/kernel/perf_event.c b/arch/mips/kernel/perf_event.c
index 1ee44a3..3d55761 100644
--- a/arch/mips/kernel/perf_event.c
+++ b/arch/mips/kernel/perf_event.c
@@ -486,8 +486,9 @@ static int validate_event(struct cpu_hw_events *cpuc,
 {
 	struct hw_perf_event fake_hwc = event->hw;
 
-	if (event->pmu && event->pmu != &pmu)
-		return 0;
+	/* Allow mixed event group. So return 1 to pass validation. */
+	if (event->pmu != &pmu || event->state <= PERF_EVENT_STATE_OFF)
+		return 1;
 
 	return mipspmu->alloc_counter(cpuc, &fake_hwc) >= 0;
 }
-- 
1.7.1


  parent reply	other threads:[~2011-01-21  8:20 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-01-21  8:19 [PATCH v4 0/5] MIPS/Perf-events: Sync with mainline upper layer (v4) Deng-Cheng Zhu
2011-01-21  8:19 ` [PATCH v4 1/5] MIPS/Perf-events: Work with irq_work Deng-Cheng Zhu
2011-01-21  8:19 ` [PATCH v4 2/5] MIPS/Perf-events: Work with the new PMU interface Deng-Cheng Zhu
2011-01-21  8:19 ` Deng-Cheng Zhu [this message]
2011-01-21 11:14   ` [PATCH v4 3/5] MIPS/Perf-events: Fix event check in validate_event() Sergei Shtylyov
2011-01-24  7:38     ` Deng-Cheng Zhu
2011-01-21  8:19 ` [PATCH v4 4/5] MIPS/Perf-events: Work with the new callchain interface Deng-Cheng Zhu
2011-01-21  8:19 ` [PATCH v4 5/5] MIPS/Perf-events: Use unsigned delta for right shift in event update Deng-Cheng Zhu

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=1295597961-7565-4-git-send-email-dengcheng.zhu@gmail.com \
    --to=dengcheng.zhu@gmail.com \
    --cc=a.p.zijlstra@chello.nl \
    --cc=acme@redhat.com \
    --cc=ddaney@caviumnetworks.com \
    --cc=fweisbec@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mips@linux-mips.org \
    --cc=matt@console-pimps.org \
    --cc=mingo@elte.hu \
    --cc=paulus@samba.org \
    --cc=ralf@linux-mips.org \
    --cc=sshtylyov@mvista.com \
    --cc=will.deacon@arm.com \
    --cc=wuzhangjin@gmail.com \
    --subject='Re: [PATCH v4 3/5] MIPS/Perf-events: Fix event check in validate_event()' \
    /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

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).