From: Greg KH <gregkh@suse.de>
To: linux-kernel@vger.kernel.org, stable@kernel.org
Cc: stable-review@kernel.org, torvalds@linux-foundation.org,
akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk,
Eric B Munson <emunson@mgebm.net>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>
Subject: [06/91] powerpc/oprofile: Handle events that raise an exception without overflowing
Date: Wed, 15 Jun 2011 17:15:03 -0700 [thread overview]
Message-ID: <20110616001609.884535540@clark.kroah.org> (raw)
In-Reply-To: <20110616001900.GA25375@kroah.com>
2.6.32-longterm review patch. If anyone has any objections, please let us know.
------------------
From: Eric B Munson <emunson@mgebm.net>
commit ad5d5292f16c6c1d7d3e257c4c7407594286b97e upstream.
Commit 0837e3242c73566fc1c0196b4ec61779c25ffc93 fixes a situation on POWER7
where events can roll back if a specualtive event doesn't actually complete.
This can raise a performance monitor exception. We need to catch this to ensure
that we reset the PMC. In all cases the PMC will be less than 256 cycles from
overflow.
This patch lifts Anton's fix for the problem in perf and applies it to oprofile
as well.
Signed-off-by: Eric B Munson <emunson@mgebm.net>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
arch/powerpc/oprofile/op_model_power4.c | 24 +++++++++++++++++++++++-
1 file changed, 23 insertions(+), 1 deletion(-)
--- a/arch/powerpc/oprofile/op_model_power4.c
+++ b/arch/powerpc/oprofile/op_model_power4.c
@@ -261,6 +261,28 @@ static int get_kernel(unsigned long pc,
return is_kernel;
}
+static bool pmc_overflow(unsigned long val)
+{
+ if ((int)val < 0)
+ return true;
+
+ /*
+ * Events on POWER7 can roll back if a speculative event doesn't
+ * eventually complete. Unfortunately in some rare cases they will
+ * raise a performance monitor exception. We need to catch this to
+ * ensure we reset the PMC. In all cases the PMC will be 256 or less
+ * cycles from overflow.
+ *
+ * We only do this if the first pass fails to find any overflowing
+ * PMCs because a user might set a period of less than 256 and we
+ * don't want to mistakenly reset them.
+ */
+ if (__is_processor(PV_POWER7) && ((0x80000000 - val) <= 256))
+ return true;
+
+ return false;
+}
+
static void power4_handle_interrupt(struct pt_regs *regs,
struct op_counter_config *ctr)
{
@@ -281,7 +303,7 @@ static void power4_handle_interrupt(stru
for (i = 0; i < cur_cpu_spec->num_pmcs; ++i) {
val = classic_ctr_read(i);
- if (val < 0) {
+ if (pmc_overflow(val)) {
if (oprofile_running && ctr[i].enabled) {
oprofile_add_ext_sample(pc, regs, i, is_kernel);
classic_ctr_write(i, reset_value[i]);
next prev parent reply other threads:[~2011-06-16 7:29 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-16 0:19 [00/91] 2.6.32.42-longterm review Greg KH
2011-06-16 0:14 ` [01/91] ftrace: Only update the function code on write to filter files Greg KH
2011-06-16 0:14 ` [02/91] kmemleak: Do not return a pointer to an object that kmemleak did not get Greg KH
2011-06-16 0:15 ` [03/91] [CPUFREQ] CPU hotplug, re-create sysfs directory and symlinks Greg KH
2011-06-16 0:15 ` [04/91] [CPUFREQ] Fix memory leak in cpufreq_stat Greg KH
2011-06-16 0:15 ` [05/91] powerpc/kexec: Fix memory corruption from unallocated slaves Greg KH
2011-06-16 0:15 ` Greg KH [this message]
2011-06-16 0:15 ` [07/91] block: rescan partitions on invalidated devices on -ENOMEDIA Greg KH
2011-06-16 0:15 ` [08/91] block: add proper state guards to __elv_next_request Greg KH
2011-06-16 0:15 ` [09/91] mtd: mtdconcat: fix NAND OOB write Greg KH
2011-06-16 0:15 ` [10/91] x86, 64-bit: Fix copy_[to/from]_user() checks for the Greg KH
2011-06-16 0:15 ` [11/91] ext3: Fix fs corruption when make_indexed_dir() fails Greg KH
2011-06-16 0:15 ` [12/91] jbd: Fix forever sleeping process in do_get_write_access() Greg KH
2011-06-16 0:15 ` [13/91] jbd: fix fsync() tid wraparound bug Greg KH
2011-06-16 0:15 ` [14/91] ext4: release page cache in ext4_mb_load_buddy error path Greg KH
2011-06-16 0:15 ` [15/91] [SCSI] Fix Ultrastor asm snippet Greg KH
2011-06-16 0:15 ` [16/91] x86, amd: Do not enable ARAT feature on AMD processors below Greg KH
2011-06-16 0:15 ` [17/91] x86, amd: Use _safe() msr access for GartTlbWlk disable code Greg KH
2011-06-16 0:15 ` [18/91] rcu: Fix unpaired rcu_irq_enter() from locking selftests Greg KH
2011-06-16 0:15 ` [19/91] staging: usbip: fix wrong endian conversion Greg KH
2011-06-16 0:15 ` [20/91] Fix for buffer overflow in ldm_frag_add not sufficient Greg KH
2011-06-16 0:15 ` [21/91] seqlock: Dont smp_rmb in seqlock reader spin loop Greg KH
2011-06-16 0:15 ` [22/91] ALSA: HDA: Use one dmic only for Dell Studio 1558 Greg KH
2011-06-16 0:15 ` [23/91] ASoC: Ensure output PGA is enabled for line outputs in Greg KH
2011-06-16 0:15 ` [24/91] ASoC: Add some missing volume update bit sets for wm_hubs Greg KH
2011-06-16 0:15 ` [25/91] mm/page_alloc.c: prevent unending loop in Greg KH
2011-06-16 0:15 ` [26/91] PCI: allow matching of prefetchable resources to Greg KH
2011-06-16 0:15 ` [27/91] loop: limit max_part module param to DISK_MAX_PARTS Greg KH
2011-06-16 0:15 ` [28/91] loop: handle on-demand devices correctly Greg KH
2011-06-16 0:15 ` [29/91] USB: CP210x Add 4 Device IDs for AC-Services Devices Greg KH
2011-06-16 0:15 ` [30/91] USB: moto_modem: Add USB identifier for the Motorola VE240 Greg KH
2011-06-16 0:15 ` [31/91] USB: serial: ftdi_sio: adding support for TavIR STK500 Greg KH
2011-06-16 0:15 ` [32/91] USB: gamin_gps: Fix for data transfer problems in native Greg KH
2011-06-16 0:15 ` [33/91] usb/gadget: at91sam9g20 fix end point max packet size Greg KH
2011-06-16 0:15 ` [34/91] usb: gadget: rndis: dont test against req->length Greg KH
2011-06-16 0:15 ` [35/91] xhci: Fix full speed bInterval encoding Greg KH
2011-06-16 0:15 ` [36/91] OHCI: fix regression caused by nVidia shutdown workaround Greg KH
2011-06-16 0:15 ` [37/91] p54usb: add zoom 4410 usbid Greg KH
2011-06-16 0:15 ` [38/91] eCryptfs: Allow 2 scatterlist entries for encrypted Greg KH
2011-06-16 0:15 ` [39/91] UBIFS: fix a rare memory leak in ro to rw remounting path Greg KH
2011-06-16 0:15 ` [40/91] i8k: Avoid lahf in 64-bit code Greg KH
2011-06-16 0:15 ` [53/91] UBIFS: fix shrinker object count reports Greg KH
2011-06-16 0:15 ` [54/91] UBIFS: fix memory leak on error path Greg KH
2011-06-16 0:15 ` [55/91] nbd: limit module parameters to a sane value Greg KH
2011-06-17 20:36 ` [Stable-review] [00/91] 2.6.32.42-longterm review Nikola Ciprich
2011-06-20 22:28 ` Greg KH
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=20110616001609.884535540@clark.kroah.org \
--to=gregkh@suse.de \
--cc=akpm@linux-foundation.org \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=benh@kernel.crashing.org \
--cc=emunson@mgebm.net \
--cc=linux-kernel@vger.kernel.org \
--cc=stable-review@kernel.org \
--cc=stable@kernel.org \
--cc=torvalds@linux-foundation.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
all inboxes | Powered by JetHome®