* Re: [PATCH] s390 (6/6): oprofile for s390.
@ 2004-04-29 12:39 Arnd Bergmann
0 siblings, 0 replies; 4+ messages in thread
From: Arnd Bergmann @ 2004-04-29 12:39 UTC (permalink / raw)
To: Martin Schwidefsky; +Cc: Andrew Morton, linux-kernel, Philippe Elie
Martin Schwidefsky wrote:
> > > +#if defined(CONFIG_OPROFILE) || defined(CONFIG_OPROFILE_MODULE)
> >
> > this must depend on CONFIG_PROFILING ?
>
> Currently oprofile is the only profiling method implemented for s390.
> So this doesn't really change much. But in principle you are right,
> as soon as a second profiling method gets added this would have to
> be changed to CONFIG_PROFILING.
No, it should already be changed now, because the code is also needed
for readprofile. CONFIG_PROFILING should enable the generic profiling
code here, even if CONFIG_OPROFILE is not set.
Note that the identical code on i386 is always compiled in, regardless
of CONFIG_PROFILING and CONFIG_OPROFILE.
Arnd <><
===
Enable basic profiling code on s390 depending on CONFIG_PROFILING,
not CONFIG_OPROFILE.
===== arch/s390/kernel/time.c 1.25 vs edited =====
--- 1.25/arch/s390/kernel/time.c Wed Apr 28 19:51:41 2004
+++ edited/arch/s390/kernel/time.c Thu Apr 29 11:13:36 2004
@@ -179,7 +179,7 @@
#endif /* CONFIG_ARCH_S390X */
-#if defined(CONFIG_OPROFILE) || defined(CONFIG_OPROFILE_MODULE)
+#ifdef CONFIG_PROFILING
extern char _stext, _etext;
/*
@@ -223,7 +223,7 @@
}
#else
#define s390_do_profile(regs) do { ; } while(0)
-#endif /* CONFIG_OPROFILE */
+#endif /* CONFIG_PROFILING */
/*
===== arch/s390/oprofile/Kconfig 1.1 vs edited =====
--- 1.1/arch/s390/oprofile/Kconfig Wed Apr 28 19:51:41 2004
+++ edited/arch/s390/oprofile/Kconfig Thu Apr 29 11:16:21 2004
@@ -5,8 +5,8 @@
config PROFILING
bool "Profiling support (EXPERIMENTAL)"
help
- Say Y here to enable the extended profiling support mechanisms used
- by profilers such as OProfile.
+ Say Y here to enable profiling support mechanisms used by
+ profilers such as readprofile or OProfile.
config OPROFILE
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] s390 (6/6): oprofile for s390.
@ 2004-04-29 8:18 Martin Schwidefsky
0 siblings, 0 replies; 4+ messages in thread
From: Martin Schwidefsky @ 2004-04-29 8:18 UTC (permalink / raw)
To: Philippe Elie; +Cc: akpm, linux-kernel
> > +#if defined(CONFIG_OPROFILE) || defined(CONFIG_OPROFILE_MODULE)
>
> this must depend on CONFIG_PROFILING ?
Currently oprofile is the only profiling method implemented for s390.
So this doesn't really change much. But in principle you are right,
as soon as a second profiling method gets added this would have to
be changed to CONFIG_PROFILING.
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: schwidefsky@de.ibm.com
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] s390 (6/6): oprofile for s390.
2004-04-28 16:51 Martin Schwidefsky
@ 2004-04-29 6:04 ` Philippe Elie
0 siblings, 0 replies; 4+ messages in thread
From: Philippe Elie @ 2004-04-29 6:04 UTC (permalink / raw)
To: Martin Schwidefsky; +Cc: akpm, linux-kernel
On Wed, 28 Apr 2004 at 18:51 +0000, Martin Schwidefsky wrote:
> [PATCH] s390: oprofile.
>
> From: Martin Schwidefsky <schwidefsky@de.ibm.com>
>
> Add oprofile support for s/390.
we ack'ed this on oprofile mail list except:
> --- linux-2.6/arch/s390/kernel/time.c Wed Apr 28 17:51:14 2004
> +#if defined(CONFIG_OPROFILE) || defined(CONFIG_OPROFILE_MODULE)
this must depend on CONFIG_PROFILING ?
> + */
> +static inline void s390_do_profile(struct pt_regs * regs)
> +{
regards,
Phil
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] s390 (6/6): oprofile for s390.
@ 2004-04-28 16:51 Martin Schwidefsky
2004-04-29 6:04 ` Philippe Elie
0 siblings, 1 reply; 4+ messages in thread
From: Martin Schwidefsky @ 2004-04-28 16:51 UTC (permalink / raw)
To: akpm, linux-kernel
[PATCH] s390: oprofile.
From: Martin Schwidefsky <schwidefsky@de.ibm.com>
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 | 56 ++++++++++++++++++++++++++++++++++++++
arch/s390/kernel/syscalls.S | 2 -
arch/s390/kernel/time.c | 50 +++++++++++++++++++++++++++++++++
arch/s390/oprofile/Kconfig | 23 +++++++++++++++
arch/s390/oprofile/Makefile | 9 ++++++
arch/s390/oprofile/init.c | 26 +++++++++++++++++
drivers/s390/cio/cio.c | 9 ------
include/asm-s390/unistd.h | 1
13 files changed, 184 insertions(+), 11 deletions(-)
diff -urN linux-2.6/arch/s390/Kconfig linux-2.6-s390/arch/s390/Kconfig
--- linux-2.6/arch/s390/Kconfig Wed Apr 28 17:51:14 2004
+++ linux-2.6-s390/arch/s390/Kconfig Wed Apr 28 17:51:41 2004
@@ -368,6 +368,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 Wed Apr 28 17:51:14 2004
+++ linux-2.6-s390/arch/s390/Makefile Wed Apr 28 17:51:41 2004
@@ -50,6 +50,9 @@
drivers-y += drivers/s390/
drivers-$(CONFIG_MATHEMU) += arch/$(ARCH)/math-emu/
+# 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 28 17:51:14 2004
+++ linux-2.6-s390/arch/s390/defconfig Wed Apr 28 17:51:41 2004
@@ -464,6 +464,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 28 17:51:41 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 28 17:51:14 2004
+++ linux-2.6-s390/arch/s390/kernel/compat_wrapper.S Wed Apr 28 17:51:41 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 28 17:51:41 2004
@@ -0,0 +1,56 @@
+/*
+ * arch/s390/kernel/profile.c
+ *
+ * Copyright (C) 2003 IBM Deutschland Entwicklung GmbH, IBM Corporation
+ * Author(s): Thomas Spatzier (tspat@de.ibm.com)
+ *
+ */
+#include <linux/proc_fs.h>
+
+static struct proc_dir_entry * root_irq_dir;
+
+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 28 17:51:14 2004
+++ linux-2.6-s390/arch/s390/kernel/syscalls.S Wed Apr 28 17:51:41 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 Wed Apr 28 17:51:14 2004
+++ linux-2.6-s390/arch/s390/kernel/time.c Wed Apr 28 17:51:41 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 28 17:51:41 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 28 17:51:41 2004
@@ -0,0 +1,9 @@
+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
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 28 17:51:41 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 (tspat@de.ibm.com)
+ *
+ * @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 28 17:51:15 2004
+++ linux-2.6-s390/drivers/s390/cio/cio.c Wed Apr 28 17:51:41 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 28 17:51:17 2004
+++ linux-2.6-s390/include/asm-s390/unistd.h Wed Apr 28 17:51:41 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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2004-04-29 12:40 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2004-04-29 12:39 [PATCH] s390 (6/6): oprofile for s390 Arnd Bergmann
-- strict thread matches above, loose matches on Subject: below --
2004-04-29 8:18 Martin Schwidefsky
2004-04-28 16:51 Martin Schwidefsky
2004-04-29 6:04 ` Philippe Elie
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome