oprofile updates for v2.6.39

Ingo,

please pull oprofile updates for v2.6.39 (tip/perf/core):

git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile.git core

There are only updates for the s390 architecture.

I dropped the __exit attribute patch in this pull request.

Thanks,

-Robert

The following changes since commit 137ee20ddd10fdc20600c389fe63edab0c39cb1a:

Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core (2011-03-11 09:28:31 +0100)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile.git core

Heinz Graalfs (4):
oprofile: Introduce new oprofile sample add function (oprofile_add_ext_hw_sample) oprofile, s390: Add support for hardware based sampling on System z processors oprofile, s390: Enhance OProfile to support System zs hardware sampling feature oprofile, s390: Remove hwsampler_files.c and merge it into init.c

Robert Richter (3):
oprofile, s390: Rework hwsampler implementation oprofile, s390: Fix section mismatch of function hws_cpu_callback() oprofile, s390: Cleanups

 arch/s390/oprofile/Makefile    |    2 +-
 arch/s390/oprofile/hwsampler.c | 1256 ++++++++++++++++++++++++++++++++++++++++
 arch/s390/oprofile/hwsampler.h |  113 ++++
 arch/s390/oprofile/init.c      |  165 ++++++-
 drivers/oprofile/cpu_buffer.c  |   24 +-
 drivers/oprofile/timer_int.c   |    4 +-
 include/linux/oprofile.h       |    7 +
 7 files changed, 1558 insertions(+), 13 deletions(-)
 create mode 100644 arch/s390/oprofile/hwsampler.c
 create mode 100644 arch/s390/oprofile/hwsampler.h

Advanced Micro Devices, Inc.
Operating System Research Center

Pulled, thanks a lot Robert!

Ingo

Ingo,

please consider to pull one more late patch from oprofile/core. We would like to see it in v2.6.39. It's a small change unlikely to break anything and it completes the Sandy Bridge support in oprofile.

Thanks,

-Robert

The following changes since commit ec6b426c4dbb9eef40375c389746cab7e931a584:

oprofile, s390: Cleanups (2011-03-16 14:30:40 +0100)

are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile.git core

Andi Kleen (1):
oprofile, x86: Allow setting EDGE/INV/CMASK for counter events

 arch/x86/oprofile/nmi_int.c    |    5 +++++
 arch/x86/oprofile/op_counter.h |    1 +
 2 files changed, 6 insertions(+), 0 deletions(-)

From: Andi Kleen <[email protected]>
Date: Wed, 16 Mar 2011 15:44:33 -0400
Subject: [PATCH] oprofile, x86: Allow setting EDGE/INV/CMASK for counter events

For some performance events it's useful to set the EDGE and INV bits and the CMASK mask in the counter control register. The list of predefined events Intel releases for each CPU has some events which require these settings to get more "natural" to use higher level events.

oprofile currently doesn't allow this.

This patch adds new extra configuration fields for them, so that they can be specified in oprofilefs.

An updated oprofile daemon can then make use of this to set them.

v2: Write back masked extra value to variable.

---
 arch/x86/oprofile/nmi_int.c    |    5 +++++
 arch/x86/oprofile/op_counter.h |    1 +
 2 files changed, 6 insertions(+), 0 deletions(-)

index e2b7b0c..ee165f1 100644
@@ -49,6 +49,10 @@ u64 op_x86_get_ctrl(struct op_x86_model_spec const *model,
 	val |= counter_config->user ? ARCH_PERFMON_EVENTSEL_USR : 0;
 	val |= counter_config->kernel ? ARCH_PERFMON_EVENTSEL_OS : 0;
 	val |= (counter_config->unit_mask & 0xFF) << 8;
+	counter_config->extra &= (ARCH_PERFMON_EVENTSEL_INV |
+				  ARCH_PERFMON_EVENTSEL_EDGE |
+				  ARCH_PERFMON_EVENTSEL_CMASK);
+	val |= counter_config->extra;
 	event &= model->event_mask ? model->event_mask : 0xFF;
 	val |= event & 0xFF;
 	val |= (event & 0x0F00) << 24;

@@ -440,6 +444,7 @@ static int nmi_create_files(struct super_block *sb, struct dentry *root)
 		oprofilefs_create_ulong(sb, dir, "unit_mask", &counter_config[i].unit_mask);
 		oprofilefs_create_ulong(sb, dir, "kernel", &counter_config[i].kernel);
 		oprofilefs_create_ulong(sb, dir, "user", &counter_config[i].user);
+		oprofilefs_create_ulong(sb, dir, "extra", &counter_config[i].extra);
 	}
 
 	return 0;

index e28398d..0b7b7b1 100644
@@ -22,6 +22,7 @@ struct op_counter_config {
 	unsigned long kernel;
 	unsigned long user;
 	unsigned long unit_mask;
+	unsigned long extra;
 };
 
 extern struct op_counter_config counter_config[];

1.7.3.4




-- 
Advanced Micro Devices, Inc.
Operating System Research Center