[PATCH] s390: oprofile.
From: Martin Schwidefsky <[email protected]>
Add oprofile support for s/390.
diffstat:
arch/s390/Kconfig | 1
arch/s390/Makefile | 3 +
arch/s390/defconfig | 5 ++
arch/s390/kernel/Makefile | 2 -
arch/s390/kernel/compat_wrapper.S | 8 ++++
arch/s390/kernel/irq.c | 72 ++++++++++++++++++++++++++++++++++++++
arch/s390/kernel/sys_s390.c | 1
arch/s390/kernel/syscalls.S | 2 -
arch/s390/kernel/time.c | 50 ++++++++++++++++++++++++++
arch/s390/oprofile/Kconfig | 23 ++++++++++++
arch/s390/oprofile/Makefile | 12 ++++++
arch/s390/oprofile/init.c | 26 +++++++++++++
drivers/s390/cio/cio.c | 9 ----
include/asm-s390/unistd.h | 1
14 files changed, 204 insertions(+), 11 deletions(-)
diff -urN linux-2.6/arch/s390/Kconfig linux-2.6-s390/arch/s390/Kconfig
--- linux-2.6/arch/s390/Kconfig Sun Apr 4 05:36:56 2004
+++ linux-2.6-s390/arch/s390/Kconfig Wed Apr 21 16:29:40 2004
@@ -349,6 +349,7 @@
source "fs/Kconfig"
+source "arch/s390/oprofile/Kconfig"
menu "Kernel hacking"
diff -urN linux-2.6/arch/s390/Makefile linux-2.6-s390/arch/s390/Makefile
--- linux-2.6/arch/s390/Makefile Sun Apr 4 05:36:26 2004
+++ linux-2.6-s390/arch/s390/Makefile Wed Apr 21 16:29:40 2004
@@ -50,6 +50,9 @@
drivers-y += drivers/s390/
drivers-$(CONFIG_MATHEMU) += arch/$(ARCH)/math-emu/
+#based on arch/i386/Makefile: "must be linked after kernel/"
+drivers-$(CONFIG_OPROFILE) += arch/s390/oprofile/
+
boot := arch/$(ARCH)/boot
all: image
diff -urN linux-2.6/arch/s390/defconfig linux-2.6-s390/arch/s390/defconfig
--- linux-2.6/arch/s390/defconfig Wed Apr 21 16:29:36 2004
+++ linux-2.6-s390/arch/s390/defconfig Wed Apr 21 16:29:40 2004
@@ -463,6 +463,11 @@
# CONFIG_NLS is not set
#
+# Profiling support
+#
+# CONFIG_PROFILING is not set
+
+#
# Kernel hacking
#
CONFIG_DEBUG_KERNEL=y
diff -urN linux-2.6/arch/s390/kernel/Makefile linux-2.6-s390/arch/s390/kernel/Makefile
--- linux-2.6/arch/s390/kernel/Makefile Sun Apr 4 05:38:20 2004
+++ linux-2.6-s390/arch/s390/kernel/Makefile Wed Apr 21 16:29:40 2004
@@ -6,7 +6,7 @@
obj-y := bitmap.o traps.o time.o process.o \
setup.o sys_s390.o ptrace.o signal.o cpcmd.o ebcdic.o \
- semaphore.o s390_ext.o debug.o
+ semaphore.o s390_ext.o debug.o irq.o
extra-$(CONFIG_ARCH_S390_31) += head.o
extra-$(CONFIG_ARCH_S390X) += head64.o
diff -urN linux-2.6/arch/s390/kernel/compat_wrapper.S linux-2.6-s390/arch/s390/kernel/compat_wrapper.S
--- linux-2.6/arch/s390/kernel/compat_wrapper.S Wed Apr 21 16:29:36 2004
+++ linux-2.6-s390/arch/s390/kernel/compat_wrapper.S Wed Apr 21 16:29:40 2004
@@ -1234,6 +1234,14 @@
lgfr %r5,%r5 # int
jg sys_epoll_wait # branch to system call
+ .globl sys32_lookup_dcookie_wrapper
+sys32_lookup_dcookie_wrapper:
+ sllg %r2,%r2,32 # get high word of 64bit dcookie
+ or %r2,%r3 # get low word of 64bit dcookie
+ llgtr %r3,%r4 # char *
+ llgfr %r4,%r5 # size_t
+ jg sys_lookup_dcookie
+
.globl sys32_fadvise64_wrapper
sys32_fadvise64_wrapper:
lgfr %r2,%r2 # int
diff -urN linux-2.6/arch/s390/kernel/irq.c linux-2.6-s390/arch/s390/kernel/irq.c
--- linux-2.6/arch/s390/kernel/irq.c Thu Jan 1 01:00:00 1970
+++ linux-2.6-s390/arch/s390/kernel/irq.c Wed Apr 21 16:29:40 2004
@@ -0,0 +1,72 @@
+/*
+ * arch/s390/kernel/irq.c
+ *
+ * Contains functions related to oprofile taken from patch
+ * linux-2.4.20-s390-oprofile.patch.
+ *
+ * Copyrith (C) 2003 IBM Deutschland Entwicklung GmbH, IBM Corporation
+ * Author(s): Thomas Spatzier ([email protected])
+ *
+ */
+#include <linux/threads.h>
+#include <linux/smp_lock.h>
+#include <linux/init.h>
+#include <linux/proc_fs.h>
+
+#include <asm/system.h>
+#include <asm/io.h>
+#include <asm/pgtable.h>
+#include <asm/delay.h>
+#include <asm/lowcore.h>
+#include <asm/uaccess.h>
+
+
+static struct proc_dir_entry * root_irq_dir;
+
+#define HEX_DIGITS 8 /* Same as other 64-bit arches. XXX */
+
+static int prof_cpu_mask_read_proc (char *page, char **start, off_t off,
+ int count, int *eof, void *data)
+{
+ unsigned long *mask = (unsigned long *) data;
+ if (count < HEX_DIGITS+1)
+ return -EINVAL;
+ return sprintf (page, "%08lx\n", *mask);
+}
+
+static int prof_cpu_mask_write_proc (struct file *file, const char *buffer,
+ unsigned long count, void *data)
+{
+ unsigned long* mask;
+ unsigned char hexnum[HEX_DIGITS];
+
+ mask = (unsigned long*)data;
+ if (!count)
+ return -EINVAL;
+ if (copy_from_user(hexnum, buffer, count))
+ return -EFAULT;
+
+ *mask = simple_strtoul(hexnum, NULL, 16);
+ return count;
+}
+
+unsigned long prof_cpu_mask = -1;
+
+void init_irq_proc(void)
+{
+ struct proc_dir_entry *entry;
+
+ /* create /proc/irq */
+ root_irq_dir = proc_mkdir("irq", 0);
+
+ /* create /proc/irq/prof_cpu_mask */
+ entry = create_proc_entry("prof_cpu_mask", 0600, root_irq_dir);
+
+ if (!entry)
+ return;
+
+ entry->nlink = 1;
+ entry->data = (void *)&prof_cpu_mask;
+ entry->read_proc = prof_cpu_mask_read_proc;
+ entry->write_proc = prof_cpu_mask_write_proc;
+}
diff -urN linux-2.6/arch/s390/kernel/sys_s390.c linux-2.6-s390/arch/s390/kernel/sys_s390.c
--- linux-2.6/arch/s390/kernel/sys_s390.c Sun Apr 4 05:36:56 2004
+++ linux-2.6-s390/arch/s390/kernel/sys_s390.c Wed Apr 21 16:29:40 2004
@@ -4,6 +4,7 @@
* S390 version
* Copyright (C) 1999,2000 IBM Deutschland Entwicklung GmbH, IBM Corporation
* Author(s): Martin Schwidefsky ([email protected]),
+ * Thomas Spatzier ([email protected])
*
* Derived from "arch/i386/kernel/sys_i386.c"
*
diff -urN linux-2.6/arch/s390/kernel/syscalls.S linux-2.6-s390/arch/s390/kernel/syscalls.S
--- linux-2.6/arch/s390/kernel/syscalls.S Wed Apr 21 16:29:15 2004
+++ linux-2.6-s390/arch/s390/kernel/syscalls.S Wed Apr 21 16:29:40 2004
@@ -118,7 +118,7 @@
SYSCALL(sys_newlstat,sys_newlstat,compat_sys_newlstat_wrapper)
SYSCALL(sys_newfstat,sys_newfstat,compat_sys_newfstat_wrapper)
NI_SYSCALL /* old uname syscall */
-NI_SYSCALL /* reserved for sys_lookup_dcache */
+SYSCALL(sys_lookup_dcookie,sys_lookup_dcookie,sys32_lookup_dcookie_wrapper) /* 110 */
SYSCALL(sys_vhangup,sys_vhangup,sys_vhangup)
NI_SYSCALL /* old "idle" system call */
NI_SYSCALL /* vm86old for i386 */
diff -urN linux-2.6/arch/s390/kernel/time.c linux-2.6-s390/arch/s390/kernel/time.c
--- linux-2.6/arch/s390/kernel/time.c Sun Apr 4 05:36:14 2004
+++ linux-2.6-s390/arch/s390/kernel/time.c Wed Apr 21 16:29:40 2004
@@ -24,6 +24,7 @@
#include <linux/init.h>
#include <linux/smp.h>
#include <linux/types.h>
+#include <linux/profile.h>
#include <linux/timex.h>
#include <linux/config.h>
@@ -177,6 +178,54 @@
#endif /* CONFIG_ARCH_S390X */
+
+#if defined(CONFIG_OPROFILE) || defined(CONFIG_OPROFILE_MODULE)
+extern char _stext, _etext;
+
+/*
+ * The profiling function is SMP safe. (nothing can mess
+ * around with "current", and the profiling counters are
+ * updated with atomic operations). This is especially
+ * useful with a profiling multiplier != 1
+ */
+static inline void s390_do_profile(struct pt_regs * regs)
+{
+ unsigned long eip;
+ extern unsigned long prof_cpu_mask;
+
+ profile_hook(regs);
+
+ if (user_mode(regs))
+ return;
+
+ if (!prof_buffer)
+ return;
+
+ eip = instruction_pointer(regs);
+
+ /*
+ * Only measure the CPUs specified by /proc/irq/prof_cpu_mask.
+ * (default is all CPUs.)
+ */
+ if (!((1<<smp_processor_id()) & prof_cpu_mask))
+ return;
+
+ eip -= (unsigned long) &_stext;
+ eip >>= prof_shift;
+ /*
+ * Don't ignore out-of-bounds EIP values silently,
+ * put them into the last histogram slot, so if
+ * present, they will show up as a sharp peak.
+ */
+ if (eip > prof_len-1)
+ eip = prof_len-1;
+ atomic_inc((atomic_t *)&prof_buffer[eip]);
+}
+#else
+#define s390_do_profile(regs) do { ; } while(0)
+#endif /* CONFIG_OPROFILE */
+
+
/*
* timer_interrupt() needs to keep up the real-time clock,
* as well as call the "do_timer()" routine every clocktick
@@ -231,6 +280,7 @@
while (ticks--)
do_timer(regs);
#endif
+ s390_do_profile(regs);
}
#ifdef CONFIG_VIRT_TIMER
diff -urN linux-2.6/arch/s390/oprofile/Kconfig linux-2.6-s390/arch/s390/oprofile/Kconfig
--- linux-2.6/arch/s390/oprofile/Kconfig Thu Jan 1 01:00:00 1970
+++ linux-2.6-s390/arch/s390/oprofile/Kconfig Wed Apr 21 16:29:40 2004
@@ -0,0 +1,23 @@
+
+menu "Profiling support"
+ depends on EXPERIMENTAL
+
+config PROFILING
+ bool "Profiling support (EXPERIMENTAL)"
+ help
+ Say Y here to enable the extended profiling support mechanisms used
+ by profilers such as OProfile.
+
+
+config OPROFILE
+ tristate "OProfile system profiling (EXPERIMENTAL)"
+ depends on PROFILING
+ help
+ OProfile is a profiling system capable of profiling the
+ whole system, include the kernel, kernel modules, libraries,
+ and applications.
+
+ If unsure, say N.
+
+endmenu
+
diff -urN linux-2.6/arch/s390/oprofile/Makefile linux-2.6-s390/arch/s390/oprofile/Makefile
--- linux-2.6/arch/s390/oprofile/Makefile Thu Jan 1 01:00:00 1970
+++ linux-2.6-s390/arch/s390/oprofile/Makefile Wed Apr 21 16:29:40 2004
@@ -0,0 +1,12 @@
+obj-$(CONFIG_OPROFILE) += oprofile.o
+
+DRIVER_OBJS = $(addprefix ../../../drivers/oprofile/, \
+ oprof.o cpu_buffer.o buffer_sync.o \
+ event_buffer.o oprofile_files.o \
+ oprofilefs.o oprofile_stats.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
+#oprofile-$(CONFIG_X86_IO_APIC) += nmi_timer_int.o
diff -urN linux-2.6/arch/s390/oprofile/init.c linux-2.6-s390/arch/s390/oprofile/init.c
--- linux-2.6/arch/s390/oprofile/init.c Thu Jan 1 01:00:00 1970
+++ linux-2.6-s390/arch/s390/oprofile/init.c Wed Apr 21 16:29:40 2004
@@ -0,0 +1,26 @@
+/**
+ * arch/s390/oprofile/init.c
+ *
+ * S390 Version
+ * Copyright (C) 2003 IBM Deutschland Entwicklung GmbH, IBM Corporation
+ * Author(s): Thomas Spatzier ([email protected])
+ *
+ * @remark Copyright 2002 OProfile authors
+ */
+
+#include <linux/oprofile.h>
+#include <linux/init.h>
+#include <linux/errno.h>
+
+//extern int irq_init(struct oprofile_operations** ops);
+extern void timer_init(struct oprofile_operations** ops);
+
+int __init oprofile_arch_init(struct oprofile_operations** ops)
+{
+ timer_init(ops);
+ return 0;
+}
+
+void oprofile_arch_exit(void)
+{
+}
diff -urN linux-2.6/drivers/s390/cio/cio.c linux-2.6-s390/drivers/s390/cio/cio.c
--- linux-2.6/drivers/s390/cio/cio.c Wed Apr 21 16:29:36 2004
+++ linux-2.6-s390/drivers/s390/cio/cio.c Wed Apr 21 16:29:40 2004
@@ -52,15 +52,6 @@
__setup ("cio_msg=", cio_setup);
-
-#ifdef CONFIG_PROC_FS
-void
-init_irq_proc(void)
-{
- /* For now, nothing... */
-}
-#endif
-
/*
* Function: cio_debug_init
* Initializes three debug logs (under /proc/s390dbf) for common I/O:
diff -urN linux-2.6/include/asm-s390/unistd.h linux-2.6-s390/include/asm-s390/unistd.h
--- linux-2.6/include/asm-s390/unistd.h Wed Apr 21 16:29:18 2004
+++ linux-2.6-s390/include/asm-s390/unistd.h Wed Apr 21 16:29:40 2004
@@ -105,6 +105,7 @@
#define __NR_stat 106
#define __NR_lstat 107
#define __NR_fstat 108
+#define __NR_lookup_dcookie 110
#define __NR_vhangup 111
#define __NR_idle 112
#define __NR_wait4 114
On Wed, Apr 21, 2004 at 04:48:29PM +0200, Martin Schwidefsky wrote:
> +++ linux-2.6-s390/arch/s390/kernel/irq.c Wed Apr 21 16:29:40 2004
> @@ -0,0 +1,72 @@
> +/*
> + * arch/s390/kernel/irq.c
> + *
> + * Contains functions related to oprofile taken from patch
> + * linux-2.4.20-s390-oprofile.patch.
> + *
> + * Copyrith (C) 2003 IBM Deutschland Entwicklung GmbH, IBM Corporation
> + * Author(s): Thomas Spatzier ([email protected])
> + *
> + */
Don't you think the name for this file is completly wrong? And a patch
name in the comment about this file doesn't exactly help either..
> +#include <linux/smp_lock.h>
What do you need this one for?
> +#include <linux/init.h>
doesn't seem to be need either.
> +#include <asm/system.h>
dito?
> +#include <asm/io.h>
dito. I wonder why this actually exists on s390..
> +#include <asm/pgtable.h>
> +#include <asm/delay.h>
dito.
> +static inline void s390_do_profile(struct pt_regs * regs)
> +{
> + unsigned long eip;
> + extern unsigned long prof_cpu_mask;
> +
> + profile_hook(regs);
> +
> + if (user_mode(regs))
> + return;
> +
> + if (!prof_buffer)
> + return;
> +
> + eip = instruction_pointer(regs);
> +
> + /*
> + * Only measure the CPUs specified by /proc/irq/prof_cpu_mask.
> + * (default is all CPUs.)
> + */
> + if (!((1<<smp_processor_id()) & prof_cpu_mask))
shouldn't this be cpumask_t arithmetic?
> +//extern int irq_init(struct oprofile_operations** ops);
why this?
Hi Christoph,
nitpicking again?
> Don't you think the name for this file is completly wrong? And a patch
> name in the comment about this file doesn't exactly help either..
Hmm, traditionally it has been irq.c but you're probably right. profile.c
is a better name for it.
> +#include <linux/smp_lock.h>
> +#include <linux/init.h>
> +#include <asm/system.h>
> +#include <asm/io.h>
> +#include <asm/pgtable.h>
> +#include <asm/delay.h>
These can indeed go.
> > + if (!((1<<smp_processor_id()) & prof_cpu_mask))
>
> shouldn't this be cpumask_t arithmetic?
Yes, it HAS to be cpumask arithmetic.
> > +//extern int irq_init(struct oprofile_operations** ops);
>
> why this?
Leftovers.
I'll fix these things right away. Thanks for the hints.
blue skies,
Martin
Linux/390 Design & Development, IBM Deutschland Entwicklung GmbH
Sch?naicherstr. 220, D-71032 B?blingen, Telefon: 49 - (0)7031 - 16-2247
E-Mail: [email protected]
Hi Christoph,
I changed the things you pointed out. Better now?
blues skies,
Martin.
---
[PATCH] s390: oprofile.
From: Martin Schwidefsky <[email protected]>
Add oprofile support for s/390.
diffstat:
arch/s390/Kconfig | 1
arch/s390/Makefile | 3 +
arch/s390/defconfig | 5 +++
arch/s390/kernel/Makefile | 2 -
arch/s390/kernel/compat_wrapper.S | 8 +++++
arch/s390/kernel/profile.c | 58 ++++++++++++++++++++++++++++++++++++++
arch/s390/kernel/syscalls.S | 2 -
arch/s390/kernel/time.c | 50 ++++++++++++++++++++++++++++++++
arch/s390/oprofile/Kconfig | 23 +++++++++++++++
arch/s390/oprofile/Makefile | 12 +++++++
arch/s390/oprofile/init.c | 26 +++++++++++++++++
drivers/s390/cio/cio.c | 9 -----
include/asm-s390/unistd.h | 1
13 files changed, 189 insertions(+), 11 deletions(-)
diff -urN linux-2.6/arch/s390/Kconfig linux-2.6-s390/arch/s390/Kconfig
--- linux-2.6/arch/s390/Kconfig Sun Apr 4 05:36:56 2004
+++ linux-2.6-s390/arch/s390/Kconfig Wed Apr 21 20:25:32 2004
@@ -349,6 +349,7 @@
source "fs/Kconfig"
+source "arch/s390/oprofile/Kconfig"
menu "Kernel hacking"
diff -urN linux-2.6/arch/s390/Makefile linux-2.6-s390/arch/s390/Makefile
--- linux-2.6/arch/s390/Makefile Sun Apr 4 05:36:26 2004
+++ linux-2.6-s390/arch/s390/Makefile Wed Apr 21 20:25:32 2004
@@ -50,6 +50,9 @@
drivers-y += drivers/s390/
drivers-$(CONFIG_MATHEMU) += arch/$(ARCH)/math-emu/
+#based on arch/i386/Makefile: "must be linked after kernel/"
+drivers-$(CONFIG_OPROFILE) += arch/s390/oprofile/
+
boot := arch/$(ARCH)/boot
all: image
diff -urN linux-2.6/arch/s390/defconfig linux-2.6-s390/arch/s390/defconfig
--- linux-2.6/arch/s390/defconfig Wed Apr 21 20:25:28 2004
+++ linux-2.6-s390/arch/s390/defconfig Wed Apr 21 20:25:32 2004
@@ -463,6 +463,11 @@
# CONFIG_NLS is not set
#
+# Profiling support
+#
+# CONFIG_PROFILING is not set
+
+#
# Kernel hacking
#
CONFIG_DEBUG_KERNEL=y
diff -urN linux-2.6/arch/s390/kernel/Makefile linux-2.6-s390/arch/s390/kernel/Makefile
--- linux-2.6/arch/s390/kernel/Makefile Sun Apr 4 05:38:20 2004
+++ linux-2.6-s390/arch/s390/kernel/Makefile Wed Apr 21 20:25:32 2004
@@ -6,7 +6,7 @@
obj-y := bitmap.o traps.o time.o process.o \
setup.o sys_s390.o ptrace.o signal.o cpcmd.o ebcdic.o \
- semaphore.o s390_ext.o debug.o
+ semaphore.o s390_ext.o debug.o profile.o
extra-$(CONFIG_ARCH_S390_31) += head.o
extra-$(CONFIG_ARCH_S390X) += head64.o
diff -urN linux-2.6/arch/s390/kernel/compat_wrapper.S linux-2.6-s390/arch/s390/kernel/compat_wrapper.S
--- linux-2.6/arch/s390/kernel/compat_wrapper.S Wed Apr 21 20:25:28 2004
+++ linux-2.6-s390/arch/s390/kernel/compat_wrapper.S Wed Apr 21 20:25:32 2004
@@ -1234,6 +1234,14 @@
lgfr %r5,%r5 # int
jg sys_epoll_wait # branch to system call
+ .globl sys32_lookup_dcookie_wrapper
+sys32_lookup_dcookie_wrapper:
+ sllg %r2,%r2,32 # get high word of 64bit dcookie
+ or %r2,%r3 # get low word of 64bit dcookie
+ llgtr %r3,%r4 # char *
+ llgfr %r4,%r5 # size_t
+ jg sys_lookup_dcookie
+
.globl sys32_fadvise64_wrapper
sys32_fadvise64_wrapper:
lgfr %r2,%r2 # int
diff -urN linux-2.6/arch/s390/kernel/profile.c linux-2.6-s390/arch/s390/kernel/profile.c
--- linux-2.6/arch/s390/kernel/profile.c Thu Jan 1 01:00:00 1970
+++ linux-2.6-s390/arch/s390/kernel/profile.c Wed Apr 21 20:25:32 2004
@@ -0,0 +1,58 @@
+/*
+ * arch/s390/kernel/profile.c
+ *
+ * Copyrith (C) 2003 IBM Deutschland Entwicklung GmbH, IBM Corporation
+ * Author(s): Thomas Spatzier ([email protected])
+ *
+ */
+#include <linux/proc_fs.h>
+
+static struct proc_dir_entry * root_irq_dir;
+
+#define HEX_DIGITS 8 /* Same as other 64-bit arches. XXX */
+
+static int prof_cpu_mask_read_proc (char *page, char **start, off_t off,
+ int count, int *eof, void *data)
+{
+ int len = cpumask_scnprintf(page, count, *(cpumask_t *)data);
+ if (count - len < 2)
+ return -EINVAL;
+ len += sprintf(page + len, "\n");
+ return len;
+}
+
+static int prof_cpu_mask_write_proc (struct file *file, const char *buffer,
+ unsigned long count, void *data)
+{
+ cpumask_t *mask = (cpumask_t *)data;
+ unsigned long full_count = count, err;
+ cpumask_t new_value;
+
+ err = cpumask_parse(buffer, count, new_value);
+ if (err)
+ return err;
+
+ *mask = new_value;
+ return full_count;
+}
+
+cpumask_t prof_cpu_mask = CPU_MASK_ALL;
+
+void init_irq_proc(void)
+{
+ struct proc_dir_entry *entry;
+
+ /* create /proc/irq */
+ root_irq_dir = proc_mkdir("irq", 0);
+
+ /* create /proc/irq/prof_cpu_mask */
+ entry = create_proc_entry("prof_cpu_mask", 0600, root_irq_dir);
+
+ if (!entry)
+ return;
+
+ entry->nlink = 1;
+ entry->data = (void *)&prof_cpu_mask;
+ entry->read_proc = prof_cpu_mask_read_proc;
+ entry->write_proc = prof_cpu_mask_write_proc;
+}
diff -urN linux-2.6/arch/s390/kernel/syscalls.S linux-2.6-s390/arch/s390/kernel/syscalls.S
--- linux-2.6/arch/s390/kernel/syscalls.S Wed Apr 21 20:25:05 2004
+++ linux-2.6-s390/arch/s390/kernel/syscalls.S Wed Apr 21 20:25:32 2004
@@ -118,7 +118,7 @@
SYSCALL(sys_newlstat,sys_newlstat,compat_sys_newlstat_wrapper)
SYSCALL(sys_newfstat,sys_newfstat,compat_sys_newfstat_wrapper)
NI_SYSCALL /* old uname syscall */
-NI_SYSCALL /* reserved for sys_lookup_dcache */
+SYSCALL(sys_lookup_dcookie,sys_lookup_dcookie,sys32_lookup_dcookie_wrapper) /* 110 */
SYSCALL(sys_vhangup,sys_vhangup,sys_vhangup)
NI_SYSCALL /* old "idle" system call */
NI_SYSCALL /* vm86old for i386 */
diff -urN linux-2.6/arch/s390/kernel/time.c linux-2.6-s390/arch/s390/kernel/time.c
--- linux-2.6/arch/s390/kernel/time.c Sun Apr 4 05:36:14 2004
+++ linux-2.6-s390/arch/s390/kernel/time.c Wed Apr 21 20:25:32 2004
@@ -24,6 +24,7 @@
#include <linux/init.h>
#include <linux/smp.h>
#include <linux/types.h>
+#include <linux/profile.h>
#include <linux/timex.h>
#include <linux/config.h>
@@ -177,6 +178,54 @@
#endif /* CONFIG_ARCH_S390X */
+
+#if defined(CONFIG_OPROFILE) || defined(CONFIG_OPROFILE_MODULE)
+extern char _stext, _etext;
+
+/*
+ * The profiling function is SMP safe. (nothing can mess
+ * around with "current", and the profiling counters are
+ * updated with atomic operations). This is especially
+ * useful with a profiling multiplier != 1
+ */
+static inline void s390_do_profile(struct pt_regs * regs)
+{
+ unsigned long eip;
+ extern cpumask_t prof_cpu_mask;
+
+ profile_hook(regs);
+
+ if (user_mode(regs))
+ return;
+
+ if (!prof_buffer)
+ return;
+
+ eip = instruction_pointer(regs);
+
+ /*
+ * Only measure the CPUs specified by /proc/irq/prof_cpu_mask.
+ * (default is all CPUs.)
+ */
+ if (!cpu_isset(smp_processor_id(), prof_cpu_mask))
+ return;
+
+ eip -= (unsigned long) &_stext;
+ eip >>= prof_shift;
+ /*
+ * Don't ignore out-of-bounds EIP values silently,
+ * put them into the last histogram slot, so if
+ * present, they will show up as a sharp peak.
+ */
+ if (eip > prof_len-1)
+ eip = prof_len-1;
+ atomic_inc((atomic_t *)&prof_buffer[eip]);
+}
+#else
+#define s390_do_profile(regs) do { ; } while(0)
+#endif /* CONFIG_OPROFILE */
+
+
/*
* timer_interrupt() needs to keep up the real-time clock,
* as well as call the "do_timer()" routine every clocktick
@@ -231,6 +280,7 @@
while (ticks--)
do_timer(regs);
#endif
+ s390_do_profile(regs);
}
#ifdef CONFIG_VIRT_TIMER
diff -urN linux-2.6/arch/s390/oprofile/Kconfig linux-2.6-s390/arch/s390/oprofile/Kconfig
--- linux-2.6/arch/s390/oprofile/Kconfig Thu Jan 1 01:00:00 1970
+++ linux-2.6-s390/arch/s390/oprofile/Kconfig Wed Apr 21 20:25:32 2004
@@ -0,0 +1,23 @@
+
+menu "Profiling support"
+ depends on EXPERIMENTAL
+
+config PROFILING
+ bool "Profiling support (EXPERIMENTAL)"
+ help
+ Say Y here to enable the extended profiling support mechanisms used
+ by profilers such as OProfile.
+
+
+config OPROFILE
+ tristate "OProfile system profiling (EXPERIMENTAL)"
+ depends on PROFILING
+ help
+ OProfile is a profiling system capable of profiling the
+ whole system, include the kernel, kernel modules, libraries,
+ and applications.
+
+ If unsure, say N.
+
+endmenu
+
diff -urN linux-2.6/arch/s390/oprofile/Makefile linux-2.6-s390/arch/s390/oprofile/Makefile
--- linux-2.6/arch/s390/oprofile/Makefile Thu Jan 1 01:00:00 1970
+++ linux-2.6-s390/arch/s390/oprofile/Makefile Wed Apr 21 20:25:32 2004
@@ -0,0 +1,12 @@
+obj-$(CONFIG_OPROFILE) += oprofile.o
+
+DRIVER_OBJS = $(addprefix ../../../drivers/oprofile/, \
+ oprof.o cpu_buffer.o buffer_sync.o \
+ event_buffer.o oprofile_files.o \
+ oprofilefs.o oprofile_stats.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
+#oprofile-$(CONFIG_X86_IO_APIC) += nmi_timer_int.o
diff -urN linux-2.6/arch/s390/oprofile/init.c linux-2.6-s390/arch/s390/oprofile/init.c
--- linux-2.6/arch/s390/oprofile/init.c Thu Jan 1 01:00:00 1970
+++ linux-2.6-s390/arch/s390/oprofile/init.c Wed Apr 21 20:25:32 2004
@@ -0,0 +1,26 @@
+/**
+ * arch/s390/oprofile/init.c
+ *
+ * S390 Version
+ * Copyright (C) 2003 IBM Deutschland Entwicklung GmbH, IBM Corporation
+ * Author(s): Thomas Spatzier ([email protected])
+ *
+ * @remark Copyright 2002 OProfile authors
+ */
+
+#include <linux/oprofile.h>
+#include <linux/init.h>
+#include <linux/errno.h>
+
+//extern int irq_init(struct oprofile_operations** ops);
+extern void timer_init(struct oprofile_operations** ops);
+
+int __init oprofile_arch_init(struct oprofile_operations** ops)
+{
+ timer_init(ops);
+ return 0;
+}
+
+void oprofile_arch_exit(void)
+{
+}
diff -urN linux-2.6/drivers/s390/cio/cio.c linux-2.6-s390/drivers/s390/cio/cio.c
--- linux-2.6/drivers/s390/cio/cio.c Wed Apr 21 20:25:29 2004
+++ linux-2.6-s390/drivers/s390/cio/cio.c Wed Apr 21 20:25:32 2004
@@ -52,15 +52,6 @@
__setup ("cio_msg=", cio_setup);
-
-#ifdef CONFIG_PROC_FS
-void
-init_irq_proc(void)
-{
- /* For now, nothing... */
-}
-#endif
-
/*
* Function: cio_debug_init
* Initializes three debug logs (under /proc/s390dbf) for common I/O:
diff -urN linux-2.6/include/asm-s390/unistd.h linux-2.6-s390/include/asm-s390/unistd.h
--- linux-2.6/include/asm-s390/unistd.h Wed Apr 21 20:25:09 2004
+++ linux-2.6-s390/include/asm-s390/unistd.h Wed Apr 21 20:25:32 2004
@@ -105,6 +105,7 @@
#define __NR_stat 106
#define __NR_lstat 107
#define __NR_fstat 108
+#define __NR_lookup_dcookie 110
#define __NR_vhangup 111
#define __NR_idle 112
#define __NR_wait4 114
On Wed, Apr 21, 2004 at 08:50:51PM +0200, Martin Schwidefsky wrote:
> Hi Christoph,
> I changed the things you pointed out. Better now?
Could you also delete unrelated lines from arch/s390/oprofile/Makefile.
> +++ linux-2.6-s390/arch/s390/oprofile/Makefile Wed Apr 21 20:25:32 2004
> +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
> +#oprofile-$(CONFIG_X86_IO_APIC) += nmi_timer_int.o
The X86 stuff should go away.
Sam
> Could you also delete unrelated lines from arch/s390/oprofile/Makefile.
>
> > +++ linux-2.6-s390/arch/s390/oprofile/Makefile Wed Apr 21
20:25:32 2004
> > +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
> > +#oprofile-$(CONFIG_X86_IO_APIC) +=
nmi_timer_int.o
>
> The X86 stuff should go away.
Ok, just removed this from my patch. Anything else before I re-sent
it to Andrew?
blue skies,
Martin