From: John Levon <levon@movementarian.org>
To: torvalds@transmeta.com, linux-kernel@vger.kernel.org
Subject: [PATCH 2/8] OProfile update
Date: Sun, 4 May 2003 00:44:06 +0100 [thread overview]
Message-ID: <1052005446607@movementarian.org> (raw)
In-Reply-To: <10520054422453@movementarian.org>
Consolidate all the arch copies of timer_int.c into one place. Also fixes
a problem with PA-RISC not using instruction_pointer() when it should.
diff -Naur -X dontdiff linux-cvs/arch/alpha/oprofile/Makefile linux-me/arch/alpha/oprofile/Makefile
--- linux-cvs/arch/alpha/oprofile/Makefile 2003-02-23 18:27:21.000000000 +0000
+++ linux-me/arch/alpha/oprofile/Makefile 2003-04-29 01:17:51.000000000 +0100
@@ -5,7 +5,8 @@
DRIVER_OBJS = $(addprefix ../../../drivers/oprofile/, \
oprof.o cpu_buffer.o buffer_sync.o \
event_buffer.o oprofile_files.o \
- oprofilefs.o oprofile_stats.o )
+ oprofilefs.o oprofile_stats.o \
+ timer_int.o )
oprofile-y := $(DRIVER_OBJS) common.o
oprofile-$(CONFIG_ALPHA_GENERIC) += op_model_ev4.o \
diff -Naur -X dontdiff linux-cvs/arch/i386/oprofile/init.c linux-me/arch/i386/oprofile/init.c
--- linux-cvs/arch/i386/oprofile/init.c 2003-04-05 18:44:23.000000000 +0100
+++ linux-me/arch/i386/oprofile/init.c 2003-04-29 01:17:00.000000000 +0100
@@ -11,22 +11,19 @@
#include <linux/init.h>
/* We support CPUs that have performance counters like the Pentium Pro
- * with NMI mode samples. Other x86 CPUs use a simple interrupt keyed
- * off the timer interrupt, which cannot profile interrupts-disabled
- * code unlike the NMI-based code.
+ * with the NMI mode driver.
*/
extern int nmi_init(struct oprofile_operations ** ops);
extern void nmi_exit(void);
-extern void timer_init(struct oprofile_operations ** ops);
int __init oprofile_arch_init(struct oprofile_operations ** ops)
{
#ifdef CONFIG_X86_LOCAL_APIC
- if (!nmi_init(ops))
+ return nmi_init(ops);
+#else
+ return -ENODEV;
#endif
- timer_init(ops);
- return 0;
}
diff -Naur -X dontdiff linux-cvs/arch/i386/oprofile/Makefile linux-me/arch/i386/oprofile/Makefile
--- linux-cvs/arch/i386/oprofile/Makefile 2003-02-11 20:25:24.000000000 +0000
+++ linux-me/arch/i386/oprofile/Makefile 2003-04-29 01:11:32.000000000 +0100
@@ -3,8 +3,9 @@
DRIVER_OBJS = $(addprefix ../../../drivers/oprofile/, \
oprof.o cpu_buffer.o buffer_sync.o \
event_buffer.o oprofile_files.o \
- oprofilefs.o oprofile_stats.o )
+ oprofilefs.o oprofile_stats.o \
+ timer_int.o )
-oprofile-y := $(DRIVER_OBJS) init.o timer_int.o
+oprofile-y := $(DRIVER_OBJS) init.o
oprofile-$(CONFIG_X86_LOCAL_APIC) += nmi_int.o op_model_athlon.o \
op_model_ppro.o op_model_p4.o
diff -Naur -X dontdiff linux-cvs/arch/i386/oprofile/nmi_int.c linux-me/arch/i386/oprofile/nmi_int.c
--- linux-cvs/arch/i386/oprofile/nmi_int.c 2003-04-05 18:44:23.000000000 +0100
+++ linux-me/arch/i386/oprofile/nmi_int.c 2003-04-29 01:16:50.000000000 +0100
@@ -314,13 +314,13 @@
__u8 family = current_cpu_data.x86;
if (!cpu_has_apic)
- return 0;
+ return -ENODEV;
switch (vendor) {
case X86_VENDOR_AMD:
/* Needs to be at least an Athlon (or hammer in 32bit mode) */
if (family < 6)
- return 0;
+ return -ENODEV;
model = &op_athlon_spec;
nmi_ops.cpu_type = "i386/athlon";
break;
@@ -331,30 +331,30 @@
/* Pentium IV */
case 0xf:
if (!p4_init())
- return 0;
+ return -ENODEV;
break;
/* A P6-class processor */
case 6:
if (!ppro_init())
- return 0;
+ return -ENODEV;
break;
default:
- return 0;
+ return -ENODEV;
}
break;
#endif /* !CONFIG_X86_64 */
default:
- return 0;
+ return -ENODEV;
}
init_driverfs();
using_nmi = 1;
*ops = &nmi_ops;
printk(KERN_INFO "oprofile: using NMI interrupt.\n");
- return 1;
+ return 0;
}
diff -Naur -X dontdiff linux-cvs/arch/i386/oprofile/timer_int.c linux-me/arch/i386/oprofile/timer_int.c
--- linux-cvs/arch/i386/oprofile/timer_int.c 2003-02-11 20:26:06.000000000 +0000
+++ linux-me/arch/i386/oprofile/timer_int.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,58 +0,0 @@
-/**
- * @file timer_int.c
- *
- * @remark Copyright 2002 OProfile authors
- * @remark Read the file COPYING
- *
- * @author John Levon <levon@movementarian.org>
- */
-
-#include <linux/kernel.h>
-#include <linux/notifier.h>
-#include <linux/smp.h>
-#include <linux/irq.h>
-#include <linux/oprofile.h>
-#include <asm/ptrace.h>
-
-#include "op_counter.h"
-
-static int timer_notify(struct notifier_block * self, unsigned long val, void * data)
-{
- struct pt_regs * regs = (struct pt_regs *)data;
- int cpu = smp_processor_id();
- unsigned long eip = instruction_pointer(regs);
-
- oprofile_add_sample(eip, !user_mode(regs), 0, cpu);
- return 0;
-}
-
-
-static struct notifier_block timer_notifier = {
- .notifier_call = timer_notify,
-};
-
-
-static int timer_start(void)
-{
- return register_profile_notifier(&timer_notifier);
-}
-
-
-static void timer_stop(void)
-{
- unregister_profile_notifier(&timer_notifier);
-}
-
-
-static struct oprofile_operations timer_ops = {
- .start = timer_start,
- .stop = timer_stop,
- .cpu_type = "timer"
-};
-
-
-void __init timer_init(struct oprofile_operations ** ops)
-{
- *ops = &timer_ops;
- printk(KERN_INFO "oprofile: using timer interrupt.\n");
-}
diff -Naur -X dontdiff linux-cvs/arch/parisc/oprofile/init.c linux-me/arch/parisc/oprofile/init.c
--- linux-cvs/arch/parisc/oprofile/init.c 2003-04-05 18:44:29.000000000 +0100
+++ linux-me/arch/parisc/oprofile/init.c 2003-04-29 01:24:09.000000000 +0100
@@ -15,8 +15,7 @@
int __init oprofile_arch_init(struct oprofile_operations ** ops)
{
- timer_init(ops);
- return 0;
+ return -ENODEV;
}
diff -Naur -X dontdiff linux-cvs/arch/parisc/oprofile/Makefile linux-me/arch/parisc/oprofile/Makefile
--- linux-cvs/arch/parisc/oprofile/Makefile 2003-01-13 21:24:33.000000000 +0000
+++ linux-me/arch/parisc/oprofile/Makefile 2003-04-29 01:24:18.000000000 +0100
@@ -3,6 +3,7 @@
DRIVER_OBJS = $(addprefix ../../../drivers/oprofile/, \
oprof.o cpu_buffer.o buffer_sync.o \
event_buffer.o oprofile_files.o \
- oprofilefs.o oprofile_stats.o )
+ oprofilefs.o oprofile_stats.o \
+ timer_int.o )
-oprofile-y := $(DRIVER_OBJS) init.o timer_int.o
+oprofile-y := $(DRIVER_OBJS) init.o
diff -Naur -X dontdiff linux-cvs/arch/parisc/oprofile/timer_int.c linux-me/arch/parisc/oprofile/timer_int.c
--- linux-cvs/arch/parisc/oprofile/timer_int.c 2003-02-11 20:26:06.000000000 +0000
+++ linux-me/arch/parisc/oprofile/timer_int.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,58 +0,0 @@
-/**
- * @file timer_int.c
- *
- * @remark Copyright 2002 OProfile authors
- * @remark Read the file COPYING
- *
- * @author John Levon <levon@movementarian.org>
- */
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/notifier.h>
-#include <linux/smp.h>
-#include <linux/irq.h>
-#include <linux/oprofile.h>
-#include <asm/ptrace.h>
-
-static int timer_notify(struct notifier_block * self, unsigned long val, void * data)
-{
- struct pt_regs * regs = (struct pt_regs *)data;
- int cpu = smp_processor_id();
- unsigned long pc = regs->iaoq[0];
- int is_kernel = !user_mode(regs);
-
- oprofile_add_sample(pc, is_kernel, 0, cpu);
- return 0;
-}
-
-
-static struct notifier_block timer_notifier = {
- .notifier_call = timer_notify,
-};
-
-
-static int timer_start(void)
-{
- return register_profile_notifier(&timer_notifier);
-}
-
-
-static void timer_stop(void)
-{
- unregister_profile_notifier(&timer_notifier);
-}
-
-
-static struct oprofile_operations timer_ops = {
- .start = timer_start,
- .stop = timer_stop,
- .cpu_type = "timer"
-};
-
-
-void __init timer_init(struct oprofile_operations ** ops)
-{
- *ops = &timer_ops;
- printk(KERN_INFO "oprofile: using timer interrupt.\n");
-}
diff -Naur -X dontdiff linux-cvs/arch/ppc64/oprofile/init.c linux-me/arch/ppc64/oprofile/init.c
--- linux-cvs/arch/ppc64/oprofile/init.c 2003-04-05 18:44:32.000000000 +0100
+++ linux-me/arch/ppc64/oprofile/init.c 2003-04-29 01:23:33.000000000 +0100
@@ -15,8 +15,7 @@
int __init oprofile_arch_init(struct oprofile_operations ** ops)
{
- timer_init(ops);
- return 0;
+ return -ENODEV;
}
diff -Naur -X dontdiff linux-cvs/arch/ppc64/oprofile/Makefile linux-me/arch/ppc64/oprofile/Makefile
--- linux-cvs/arch/ppc64/oprofile/Makefile 2003-01-02 19:32:40.000000000 +0000
+++ linux-me/arch/ppc64/oprofile/Makefile 2003-04-29 01:24:29.000000000 +0100
@@ -3,6 +3,7 @@
DRIVER_OBJS := $(addprefix ../../../drivers/oprofile/, \
oprof.o cpu_buffer.o buffer_sync.o \
event_buffer.o oprofile_files.o \
- oprofilefs.o oprofile_stats.o )
+ oprofilefs.o oprofile_stats.o \
+ timer_int.o )
-oprofile-y := $(DRIVER_OBJS) init.o timer_int.o
+oprofile-y := $(DRIVER_OBJS) init.o
diff -Naur -X dontdiff linux-cvs/arch/ppc64/oprofile/timer_int.c linux-me/arch/ppc64/oprofile/timer_int.c
--- linux-cvs/arch/ppc64/oprofile/timer_int.c 2003-02-22 07:55:49.000000000 +0000
+++ linux-me/arch/ppc64/oprofile/timer_int.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,59 +0,0 @@
-/**
- * @file timer_int.c
- *
- * @remark Copyright 2002 OProfile authors
- * @remark Read the file COPYING
- *
- * @author John Levon <levon@movementarian.org>
- */
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/notifier.h>
-#include <linux/smp.h>
-#include <linux/irq.h>
-#include <linux/oprofile.h>
-#include <linux/profile.h>
-#include <asm/ptrace.h>
-
-static int timer_notify(struct notifier_block * self, unsigned long val, void * data)
-{
- struct pt_regs * regs = (struct pt_regs *)data;
- int cpu = smp_processor_id();
- unsigned long pc = instruction_pointer(regs);
- int is_kernel = !user_mode(regs);
-
- oprofile_add_sample(pc, is_kernel, 0, cpu);
- return 0;
-}
-
-
-static struct notifier_block timer_notifier = {
- .notifier_call = timer_notify,
-};
-
-
-static int timer_start(void)
-{
- return register_profile_notifier(&timer_notifier);
-}
-
-
-static void timer_stop(void)
-{
- unregister_profile_notifier(&timer_notifier);
-}
-
-
-static struct oprofile_operations timer_ops = {
- .start = timer_start,
- .stop = timer_stop,
- .cpu_type = "timer"
-};
-
-
-void __init timer_init(struct oprofile_operations ** ops)
-{
- *ops = &timer_ops;
- printk(KERN_INFO "oprofile: using timer interrupt.\n");
-}
diff -Naur -X dontdiff linux-cvs/arch/sparc64/oprofile/init.c linux-me/arch/sparc64/oprofile/init.c
--- linux-cvs/arch/sparc64/oprofile/init.c 2003-04-05 18:44:34.000000000 +0100
+++ linux-me/arch/sparc64/oprofile/init.c 2003-04-29 01:23:09.000000000 +0100
@@ -15,8 +15,7 @@
int __init oprofile_arch_init(struct oprofile_operations ** ops)
{
- timer_init(ops);
- return 0;
+ return -ENODEV;
}
diff -Naur -X dontdiff linux-cvs/arch/sparc64/oprofile/Makefile linux-me/arch/sparc64/oprofile/Makefile
--- linux-cvs/arch/sparc64/oprofile/Makefile 2002-12-09 01:58:08.000000000 +0000
+++ linux-me/arch/sparc64/oprofile/Makefile 2003-04-29 01:20:27.000000000 +0100
@@ -3,6 +3,7 @@
DRIVER_OBJS = $(addprefix ../../../drivers/oprofile/, \
oprof.o cpu_buffer.o buffer_sync.o \
event_buffer.o oprofile_files.o \
- oprofilefs.o oprofile_stats.o )
+ oprofilefs.o oprofile_stats.o \
+ timer_int.o )
-oprofile-y := $(DRIVER_OBJS) init.o timer_int.o
+oprofile-y := $(DRIVER_OBJS) init.o
diff -Naur -X dontdiff linux-cvs/arch/sparc64/oprofile/timer_int.c linux-me/arch/sparc64/oprofile/timer_int.c
--- linux-cvs/arch/sparc64/oprofile/timer_int.c 2003-02-20 01:03:34.000000000 +0000
+++ linux-me/arch/sparc64/oprofile/timer_int.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,59 +0,0 @@
-/**
- * @file timer_int.c
- *
- * @remark Copyright 2002 OProfile authors
- * @remark Read the file COPYING
- *
- * @author John Levon <levon@movementarian.org>
- */
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/notifier.h>
-#include <linux/smp.h>
-#include <linux/irq.h>
-#include <linux/oprofile.h>
-#include <linux/profile.h>
-#include <asm/ptrace.h>
-
-static int timer_notify(struct notifier_block * self, unsigned long val, void * data)
-{
- struct pt_regs * regs = (struct pt_regs *)data;
- int cpu = smp_processor_id();
- unsigned long pc = instruction_pointer(regs);
- int is_kernel = !user_mode(regs);
-
- oprofile_add_sample(pc, is_kernel, 0, cpu);
- return 0;
-}
-
-
-static struct notifier_block timer_notifier = {
- .notifier_call = timer_notify,
-};
-
-
-static int timer_start(void)
-{
- return register_profile_notifier(&timer_notifier);
-}
-
-
-static void timer_stop(void)
-{
- unregister_profile_notifier(&timer_notifier);
-}
-
-
-static struct oprofile_operations timer_ops = {
- .start = timer_start,
- .stop = timer_stop,
- .cpu_type = "timer"
-};
-
-
-void __init timer_init(struct oprofile_operations ** ops)
-{
- *ops = &timer_ops;
- printk(KERN_INFO "oprofile: using timer interrupt.\n");
-}
diff -Naur -X dontdiff linux-cvs/arch/x86_64/oprofile/Makefile linux-me/arch/x86_64/oprofile/Makefile
--- linux-cvs/arch/x86_64/oprofile/Makefile 2002-12-28 19:54:15.000000000 +0000
+++ linux-me/arch/x86_64/oprofile/Makefile 2003-04-29 01:19:24.000000000 +0100
@@ -9,9 +9,10 @@
DRIVER_OBJS = $(addprefix ../../../drivers/oprofile/, \
oprof.o cpu_buffer.o buffer_sync.o \
event_buffer.o oprofile_files.o \
- oprofilefs.o oprofile_stats.o )
+ oprofilefs.o oprofile_stats.o \
+ timer_int.o )
-oprofile-objs := $(DRIVER_OBJS) init.o timer_int.o
+oprofile-objs := $(DRIVER_OBJS) init.o
oprofile-$(CONFIG_X86_LOCAL_APIC) += nmi_int.o op_model_athlon.o
@@ -23,11 +24,9 @@
@ln -sf ../../i386/oprofile/op_model_athlon.c $(obj)/op_model_athlon.c
$(obj)/init.c: ${INCL}
@ln -sf ../../i386/oprofile/init.c $(obj)/init.c
-$(obj)/timer_int.c: ${INCL}
- @ln -sf ../../i386/oprofile/timer_int.c $(obj)/timer_int.c
$(obj)/op_counter.h:
@ln -sf ../../i386/oprofile/op_counter.h $(obj)/op_counter.h
$(obj)/op_x86_model.h:
@ln -sf ../../i386/oprofile/op_x86_model.h $(obj)/op_x86_model.h
-clean-files += op_x86_model.h op_counter.h timer_int.c init.c \
+clean-files += op_x86_model.h op_counter.h init.c \
op_model_athlon.c nmi_int.c
diff -Naur -X dontdiff linux-cvs/drivers/oprofile/timer_int.c linux-me/drivers/oprofile/timer_int.c
--- linux-cvs/drivers/oprofile/timer_int.c 1970-01-01 01:00:00.000000000 +0100
+++ linux-me/drivers/oprofile/timer_int.c 2003-04-29 01:25:24.000000000 +0100
@@ -0,0 +1,56 @@
+/**
+ * @file timer_int.c
+ *
+ * @remark Copyright 2002 OProfile authors
+ * @remark Read the file COPYING
+ *
+ * @author John Levon <levon@movementarian.org>
+ */
+
+#include <linux/kernel.h>
+#include <linux/notifier.h>
+#include <linux/smp.h>
+#include <linux/irq.h>
+#include <linux/oprofile.h>
+#include <asm/ptrace.h>
+
+static int timer_notify(struct notifier_block * self, unsigned long val, void * data)
+{
+ struct pt_regs * regs = (struct pt_regs *)data;
+ int cpu = smp_processor_id();
+ unsigned long eip = instruction_pointer(regs);
+
+ oprofile_add_sample(eip, !user_mode(regs), 0, cpu);
+ return 0;
+}
+
+
+static struct notifier_block timer_notifier = {
+ .notifier_call = timer_notify,
+};
+
+
+static int timer_start(void)
+{
+ return register_profile_notifier(&timer_notifier);
+}
+
+
+static void timer_stop(void)
+{
+ unregister_profile_notifier(&timer_notifier);
+}
+
+
+static struct oprofile_operations timer_ops = {
+ .start = timer_start,
+ .stop = timer_stop,
+ .cpu_type = "timer"
+};
+
+
+void __init timer_init(struct oprofile_operations ** ops)
+{
+ *ops = &timer_ops;
+ printk(KERN_INFO "oprofile: using timer interrupt.\n");
+}
diff -Naur -X dontdiff linux-cvs/drivers/oprofile/oprof.c linux-me/drivers/oprofile/oprof.c
--- linux-cvs/drivers/oprofile/oprof.c 2003-04-05 18:44:50.000000000 +0100
+++ linux-me/drivers/oprofile/oprof.c 2003-04-30 19:58:07.000000000 +0100
@@ -119,14 +119,23 @@
}
+extern void timer_init(struct oprofile_operations ** ops);
+
+
static int __init oprofile_init(void)
{
int err;
/* Architecture must fill in the interrupt ops and the
- * logical CPU type.
+ * logical CPU type, or we can fall back to the timer
+ * interrupt profiler.
*/
err = oprofile_arch_init(&oprofile_ops);
+ if (err == -ENODEV) {
+ timer_init(&oprofile_ops);
+ err = 0;
+ }
+
if (err)
goto out;
next prev parent reply other threads:[~2003-05-03 23:33 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2003-05-03 23:44 [PATCH 1/8] OProfile update John Levon
2003-05-03 23:44 ` John Levon [this message]
2003-05-03 23:44 ` [PATCH 3/8] " John Levon
2003-05-03 23:44 ` [PATCH 4/8] " John Levon
2003-05-03 23:44 ` [PATCH 5/8] " John Levon
2003-05-03 23:44 ` [PATCH 6/8] " John Levon
2003-05-03 23:44 ` [PATCH 7/8] " John Levon
2003-05-03 23:44 ` [PATCH 8/8] " John Levon
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=1052005446607@movementarian.org \
--to=levon@movementarian.org \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@transmeta.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.