From: Peter Zijlstra <peterz@infradead.org>
To: mingo@kernel.org, peterz@infradead.org
Cc: vincent.weaver@maine.edu, eranian@google.com, jolsa@redhat.com,
linux-kernel@vger.kernel.org
Subject: [PATCH v2 08/11] perf/x86: Remove pointless tests
Date: Fri, 22 May 2015 15:29:13 +0200 [thread overview]
Message-ID: <20150522133136.079512913@infradead.org> (raw)
In-Reply-To: 20150522132905.416122812@infradead.org
[-- Attachment #1: peterz-pmu-sched-7.patch --]
[-- Type: text/plain, Size: 1236 bytes --]
Both intel_commit_scheduling() and intel_get_excl_contraints() test
for cntr < 0.
The only way that can happen (aside from a bug) is through
validate_event(), however that is already captured by the
cpuc->is_fake test.
So remove these test and simplify the code.
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
---
arch/x86/kernel/cpu/perf_event_intel.c | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
--- a/arch/x86/kernel/cpu/perf_event_intel.c
+++ b/arch/x86/kernel/cpu/perf_event_intel.c
@@ -1955,12 +1955,10 @@ static void intel_commit_scheduling(stru
lockdep_assert_held(&excl_cntrs->lock);
- if (cntr >= 0) {
- if (c->flags & PERF_X86_EVENT_EXCL)
- xl->init_state[cntr] = INTEL_EXCL_EXCLUSIVE;
- else
- xl->init_state[cntr] = INTEL_EXCL_SHARED;
- }
+ if (c->flags & PERF_X86_EVENT_EXCL)
+ xl->init_state[cntr] = INTEL_EXCL_EXCLUSIVE;
+ else
+ xl->init_state[cntr] = INTEL_EXCL_SHARED;
}
static void
@@ -2028,10 +2026,6 @@ intel_get_excl_constraints(struct cpu_hw
if (!(c->flags & PERF_X86_EVENT_DYNAMIC)) {
struct event_constraint *cx;
- /* sanity check */
- if (idx < 0)
- return &emptyconstraint;
-
/*
* grab pre-allocated constraint entry
*/
next prev parent reply other threads:[~2015-05-22 13:33 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-22 13:29 [PATCH v2 00/11] Various x86 pmu scheduling patches Peter Zijlstra
2015-05-22 13:29 ` [PATCH v2 01/11] perf,x86: Fix event/group validation Peter Zijlstra
2015-05-22 13:40 ` Peter Zijlstra
2015-05-26 9:24 ` Stephane Eranian
2015-05-26 10:12 ` Peter Zijlstra
2015-05-26 11:46 ` Stephane Eranian
2015-05-26 12:16 ` Peter Zijlstra
2015-05-26 12:25 ` Stephane Eranian
2015-05-26 13:22 ` Peter Zijlstra
2015-05-26 13:44 ` Stephane Eranian
2015-05-22 13:29 ` [PATCH v2 02/11] perf/x86: Improve HT workaround GP counter constraint Peter Zijlstra
2015-05-22 13:42 ` Peter Zijlstra
2015-05-26 9:37 ` Stephane Eranian
2015-05-26 10:15 ` Peter Zijlstra
2015-05-26 11:47 ` Stephane Eranian
2015-05-26 13:19 ` Peter Zijlstra
2015-05-26 16:07 ` Peter Zijlstra
2015-05-27 9:01 ` Stephane Eranian
2015-05-27 10:11 ` Peter Zijlstra
2015-05-27 11:39 ` Stephane Eranian
2015-05-27 10:13 ` Peter Zijlstra
2015-05-27 11:44 ` Stephane Eranian
2015-05-26 23:33 ` Andi Kleen
2015-05-27 7:48 ` Peter Zijlstra
2015-05-27 14:00 ` Andi Kleen
2015-05-22 13:29 ` [PATCH v2 03/11] perf/x86: Correct local vs remote sibling state Peter Zijlstra
2015-05-26 11:48 ` Stephane Eranian
2015-05-22 13:29 ` [PATCH v2 04/11] perf/x86: Use lockdep Peter Zijlstra
2015-05-22 13:29 ` [PATCH v2 05/11] perf/x86: Simplify dynamic constraint code somewhat Peter Zijlstra
2015-05-22 13:29 ` [PATCH v2 06/11] perf/x86: Make WARNs consistent Peter Zijlstra
2015-05-22 13:29 ` [PATCH v2 07/11] perf/x86: Move intel_commit_scheduling() Peter Zijlstra
2015-05-22 13:29 ` Peter Zijlstra [this message]
2015-05-22 13:29 ` [PATCH v2 09/11] perf/x86: Remove intel_excl_states::init_state Peter Zijlstra
2015-05-22 13:29 ` [PATCH v2 10/11] perf,x86: Simplify logic Peter Zijlstra
2015-05-22 13:29 ` [PATCH v2 11/11] perf/x86: Simplify put_exclusive_constraints Peter Zijlstra
2015-05-22 13:38 ` Peter Zijlstra
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=20150522133136.079512913@infradead.org \
--to=peterz@infradead.org \
--cc=eranian@google.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=vincent.weaver@maine.edu \
/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).