From: Paul E. M. <pa...@ke...> - 2021-01-14 15:24:43
|
On Thu, Jan 14, 2021 at 05:05:30PM +0530, Viresh Kumar wrote: > The "oprofile" user-space tools don't use the kernel OPROFILE support > any more, and haven't in a long time. User-space has been converted to > the perf interfaces. > > Remove kernel's old oprofile support. > > Suggested-by: Christoph Hellwig <hc...@in...> > Suggested-by: Linus Torvalds <tor...@li...> > Signed-off-by: Viresh Kumar <vir...@li...> For the RCU update: Acked-by: Paul E. McKenney <pa...@ke...> > --- > Documentation/RCU/NMI-RCU.rst | 3 +- > .../admin-guide/kernel-parameters.txt | 14 - > Documentation/process/magic-number.rst | 1 - > .../it_IT/process/magic-number.rst | 1 - > .../zh_CN/process/magic-number.rst | 1 - > MAINTAINERS | 11 - > arch/Kconfig | 32 - > drivers/oprofile/buffer_sync.c | 591 ------------------ > drivers/oprofile/buffer_sync.h | 22 - > drivers/oprofile/cpu_buffer.c | 465 -------------- > drivers/oprofile/cpu_buffer.h | 121 ---- > drivers/oprofile/event_buffer.c | 209 ------- > drivers/oprofile/event_buffer.h | 40 -- > drivers/oprofile/nmi_timer_int.c | 157 ----- > drivers/oprofile/oprof.c | 286 --------- > drivers/oprofile/oprof.h | 50 -- > drivers/oprofile/oprofile_files.c | 201 ------ > drivers/oprofile/oprofile_perf.c | 328 ---------- > drivers/oprofile/oprofile_stats.c | 84 --- > drivers/oprofile/oprofile_stats.h | 33 - > drivers/oprofile/oprofilefs.c | 300 --------- > drivers/oprofile/timer_int.c | 122 ---- > include/linux/oprofile.h | 209 ------- > init/Kconfig | 2 +- > 24 files changed, 2 insertions(+), 3281 deletions(-) > delete mode 100644 drivers/oprofile/buffer_sync.c > delete mode 100644 drivers/oprofile/buffer_sync.h > delete mode 100644 drivers/oprofile/cpu_buffer.c > delete mode 100644 drivers/oprofile/cpu_buffer.h > delete mode 100644 drivers/oprofile/event_buffer.c > delete mode 100644 drivers/oprofile/event_buffer.h > delete mode 100644 drivers/oprofile/nmi_timer_int.c > delete mode 100644 drivers/oprofile/oprof.c > delete mode 100644 drivers/oprofile/oprof.h > delete mode 100644 drivers/oprofile/oprofile_files.c > delete mode 100644 drivers/oprofile/oprofile_perf.c > delete mode 100644 drivers/oprofile/oprofile_stats.c > delete mode 100644 drivers/oprofile/oprofile_stats.h > delete mode 100644 drivers/oprofile/oprofilefs.c > delete mode 100644 drivers/oprofile/timer_int.c > delete mode 100644 include/linux/oprofile.h > > diff --git a/Documentation/RCU/NMI-RCU.rst b/Documentation/RCU/NMI-RCU.rst > index 180958388ff9..2a92bc685ef1 100644 > --- a/Documentation/RCU/NMI-RCU.rst > +++ b/Documentation/RCU/NMI-RCU.rst > @@ -8,8 +8,7 @@ Although RCU is usually used to protect read-mostly data structures, > it is possible to use RCU to provide dynamic non-maskable interrupt > handlers, as well as dynamic irq handlers. This document describes > how to do this, drawing loosely from Zwane Mwaikambo's NMI-timer > -work in "arch/x86/oprofile/nmi_timer_int.c" and in > -"arch/x86/kernel/traps.c". > +work in "arch/x86/kernel/traps.c". > > The relevant pieces of code are listed below, each followed by a > brief explanation:: > diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt > index 9e3cdb271d06..e860c681766b 100644 > --- a/Documentation/admin-guide/kernel-parameters.txt > +++ b/Documentation/admin-guide/kernel-parameters.txt > @@ -3458,20 +3458,6 @@ > For example, to override I2C bus2: > omap_mux=i2c2_scl.i2c2_scl=0x100,i2c2_sda.i2c2_sda=0x100 > > - oprofile.timer= [HW] > - Use timer interrupt instead of performance counters > - > - oprofile.cpu_type= Force an oprofile cpu type > - This might be useful if you have an older oprofile > - userland or if you want common events. > - Format: { arch_perfmon } > - arch_perfmon: [X86] Force use of architectural > - perfmon on Intel CPUs instead of the > - CPU specific event set. > - timer: [X86] Force use of architectural NMI > - timer mode (see also oprofile.timer > - for generic hr timer mode) > - > oops=panic Always panic on oopses. Default is to just kill the > process, but there is a small probability of > deadlocking the machine. > diff --git a/Documentation/process/magic-number.rst b/Documentation/process/magic-number.rst > index e02ff5ffb653..c6dfe060ec2f 100644 > --- a/Documentation/process/magic-number.rst > +++ b/Documentation/process/magic-number.rst > @@ -135,7 +135,6 @@ FW_HEADER_MAGIC 0x65726F66 fw_header ``drivers/atm/fo > SLOT_MAGIC 0x67267321 slot ``drivers/hotplug/cpqphp.h`` > SLOT_MAGIC 0x67267322 slot ``drivers/hotplug/acpiphp.h`` > LO_MAGIC 0x68797548 nbd_device ``include/linux/nbd.h`` > -OPROFILE_MAGIC 0x6f70726f super_block ``drivers/oprofile/oprofilefs.h`` > M3_STATE_MAGIC 0x734d724d m3_state ``sound/oss/maestro3.c`` > VMALLOC_MAGIC 0x87654320 snd_alloc_track ``sound/core/memory.c`` > KMALLOC_MAGIC 0x87654321 snd_alloc_track ``sound/core/memory.c`` > diff --git a/Documentation/translations/it_IT/process/magic-number.rst b/Documentation/translations/it_IT/process/magic-number.rst > index 0243d32a0b59..1af30f4228f2 100644 > --- a/Documentation/translations/it_IT/process/magic-number.rst > +++ b/Documentation/translations/it_IT/process/magic-number.rst > @@ -141,7 +141,6 @@ FW_HEADER_MAGIC 0x65726F66 fw_header ``drivers/atm/fo > SLOT_MAGIC 0x67267321 slot ``drivers/hotplug/cpqphp.h`` > SLOT_MAGIC 0x67267322 slot ``drivers/hotplug/acpiphp.h`` > LO_MAGIC 0x68797548 nbd_device ``include/linux/nbd.h`` > -OPROFILE_MAGIC 0x6f70726f super_block ``drivers/oprofile/oprofilefs.h`` > M3_STATE_MAGIC 0x734d724d m3_state ``sound/oss/maestro3.c`` > VMALLOC_MAGIC 0x87654320 snd_alloc_track ``sound/core/memory.c`` > KMALLOC_MAGIC 0x87654321 snd_alloc_track ``sound/core/memory.c`` > diff --git a/Documentation/translations/zh_CN/process/magic-number.rst b/Documentation/translations/zh_CN/process/magic-number.rst > index de182bf4191c..7bb9d4165ed3 100644 > --- a/Documentation/translations/zh_CN/process/magic-number.rst > +++ b/Documentation/translations/zh_CN/process/magic-number.rst > @@ -124,7 +124,6 @@ FW_HEADER_MAGIC 0x65726F66 fw_header ``drivers/atm/fo > SLOT_MAGIC 0x67267321 slot ``drivers/hotplug/cpqphp.h`` > SLOT_MAGIC 0x67267322 slot ``drivers/hotplug/acpiphp.h`` > LO_MAGIC 0x68797548 nbd_device ``include/linux/nbd.h`` > -OPROFILE_MAGIC 0x6f70726f super_block ``drivers/oprofile/oprofilefs.h`` > M3_STATE_MAGIC 0x734d724d m3_state ``sound/oss/maestro3.c`` > VMALLOC_MAGIC 0x87654320 snd_alloc_track ``sound/core/memory.c`` > KMALLOC_MAGIC 0x87654321 snd_alloc_track ``sound/core/memory.c`` > diff --git a/MAINTAINERS b/MAINTAINERS > index cc1e6a5ee6e6..ae2c2cef9d96 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -1414,7 +1414,6 @@ F: arch/arm*/include/asm/hw_breakpoint.h > F: arch/arm*/include/asm/perf_event.h > F: arch/arm*/kernel/hw_breakpoint.c > F: arch/arm*/kernel/perf_* > -F: arch/arm/oprofile/common.c > F: drivers/perf/ > F: include/linux/perf/arm_pmu.h > > @@ -4083,7 +4082,6 @@ W: http://www.ibm.com/developerworks/power/cell/ > F: arch/powerpc/include/asm/cell*.h > F: arch/powerpc/include/asm/spu*.h > F: arch/powerpc/include/uapi/asm/spu*.h > -F: arch/powerpc/oprofile/*cell* > F: arch/powerpc/platforms/cell/ > > CELLWISE CW2015 BATTERY DRIVER > @@ -13311,15 +13309,6 @@ S: Maintained > T: git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git > F: sound/drivers/opl4/ > > -OPROFILE > -M: Robert Richter <rr...@ke...> > -L: opr...@li... > -S: Maintained > -F: arch/*/include/asm/oprofile*.h > -F: arch/*/oprofile/ > -F: drivers/oprofile/ > -F: include/linux/oprofile.h > - > ORACLE CLUSTER FILESYSTEM 2 (OCFS2) > M: Mark Fasheh <ma...@fa...> > M: Joel Becker <jl...@ev...> > diff --git a/arch/Kconfig b/arch/Kconfig > index 24862d15f3a3..40277027a255 100644 > --- a/arch/Kconfig > +++ b/arch/Kconfig > @@ -33,38 +33,6 @@ config HOTPLUG_SMT > config GENERIC_ENTRY > bool > > -config OPROFILE > - tristate "OProfile system profiling" > - depends on PROFILING > - depends on HAVE_OPROFILE > - select RING_BUFFER > - select RING_BUFFER_ALLOW_SWAP > - help > - OProfile is a profiling system capable of profiling the > - whole system, include the kernel, kernel modules, libraries, > - and applications. > - > - If unsure, say N. > - > -config OPROFILE_EVENT_MULTIPLEX > - bool "OProfile multiplexing support (EXPERIMENTAL)" > - default n > - depends on OPROFILE && X86 > - help > - The number of hardware counters is limited. The multiplexing > - feature enables OProfile to gather more events than counters > - are provided by the hardware. This is realized by switching > - between events at a user specified time interval. > - > - If unsure, say N. > - > -config HAVE_OPROFILE > - bool > - > -config OPROFILE_NMI_TIMER > - def_bool y > - depends on PERF_EVENTS && HAVE_PERF_EVENTS_NMI && !PPC64 > - > config KPROBES > bool "Kprobes" > depends on MODULES > diff --git a/drivers/oprofile/buffer_sync.c b/drivers/oprofile/buffer_sync.c > deleted file mode 100644 > index cc917865f13a..000000000000 > --- a/drivers/oprofile/buffer_sync.c > +++ /dev/null > @@ -1,591 +0,0 @@ > -/** > - * @file buffer_sync.c > - * > - * @remark Copyright 2002-2009 OProfile authors > - * @remark Read the file COPYING > - * > - * @author John Levon <le...@mo...> > - * @author Barry Kasindorf > - * @author Robert Richter <rob...@am...> > - * > - * This is the core of the buffer management. Each > - * CPU buffer is processed and entered into the > - * global event buffer. Such processing is necessary > - * in several circumstances, mentioned below. > - * > - * The processing does the job of converting the > - * transitory EIP value into a persistent dentry/offset > - * value that the profiler can record at its leisure. > - * > - * See fs/dcookies.c for a description of the dentry/offset > - * objects. > - */ > - > -#include <linux/file.h> > -#include <linux/mm.h> > -#include <linux/workqueue.h> > -#include <linux/notifier.h> > -#include <linux/dcookies.h> > -#include <linux/profile.h> > -#include <linux/module.h> > -#include <linux/fs.h> > -#include <linux/oprofile.h> > -#include <linux/sched.h> > -#include <linux/sched/mm.h> > -#include <linux/sched/task.h> > -#include <linux/gfp.h> > - > -#include "oprofile_stats.h" > -#include "event_buffer.h" > -#include "cpu_buffer.h" > -#include "buffer_sync.h" > - > -static LIST_HEAD(dying_tasks); > -static LIST_HEAD(dead_tasks); > -static cpumask_var_t marked_cpus; > -static DEFINE_SPINLOCK(task_mortuary); > -static void process_task_mortuary(void); > - > -/* Take ownership of the task struct and place it on the > - * list for processing. Only after two full buffer syncs > - * does the task eventually get freed, because by then > - * we are sure we will not reference it again. > - * Can be invoked from softirq via RCU callback due to > - * call_rcu() of the task struct, hence the _irqsave. > - */ > -static int > -task_free_notify(struct notifier_block *self, unsigned long val, void *data) > -{ > - unsigned long flags; > - struct task_struct *task = data; > - spin_lock_irqsave(&task_mortuary, flags); > - list_add(&task->tasks, &dying_tasks); > - spin_unlock_irqrestore(&task_mortuary, flags); > - return NOTIFY_OK; > -} > - > - > -/* The task is on its way out. A sync of the buffer means we can catch > - * any remaining samples for this task. > - */ > -static int > -task_exit_notify(struct notifier_block *self, unsigned long val, void *data) > -{ > - /* To avoid latency problems, we only process the current CPU, > - * hoping that most samples for the task are on this CPU > - */ > - sync_buffer(raw_smp_processor_id()); > - return 0; > -} > - > - > -/* The task is about to try a do_munmap(). We peek at what it's going to > - * do, and if it's an executable region, process the samples first, so > - * we don't lose any. This does not have to be exact, it's a QoI issue > - * only. > - */ > -static int > -munmap_notify(struct notifier_block *self, unsigned long val, void *data) > -{ > - unsigned long addr = (unsigned long)data; > - struct mm_struct *mm = current->mm; > - struct vm_area_struct *mpnt; > - > - mmap_read_lock(mm); > - > - mpnt = find_vma(mm, addr); > - if (mpnt && mpnt->vm_file && (mpnt->vm_flags & VM_EXEC)) { > - mmap_read_unlock(mm); > - /* To avoid latency problems, we only process the current CPU, > - * hoping that most samples for the task are on this CPU > - */ > - sync_buffer(raw_smp_processor_id()); > - return 0; > - } > - > - mmap_read_unlock(mm); > - return 0; > -} > - > - > -/* We need to be told about new modules so we don't attribute to a previously > - * loaded module, or drop the samples on the floor. > - */ > -static int > -module_load_notify(struct notifier_block *self, unsigned long val, void *data) > -{ > -#ifdef CONFIG_MODULES > - if (val != MODULE_STATE_COMING) > - return NOTIFY_DONE; > - > - /* FIXME: should we process all CPU buffers ? */ > - mutex_lock(&buffer_mutex); > - add_event_entry(ESCAPE_CODE); > - add_event_entry(MODULE_LOADED_CODE); > - mutex_unlock(&buffer_mutex); > -#endif > - return NOTIFY_OK; > -} > - > - > -static struct notifier_block task_free_nb = { > - .notifier_call = task_free_notify, > -}; > - > -static struct notifier_block task_exit_nb = { > - .notifier_call = task_exit_notify, > -}; > - > -static struct notifier_block munmap_nb = { > - .notifier_call = munmap_notify, > -}; > - > -static struct notifier_block module_load_nb = { > - .notifier_call = module_load_notify, > -}; > - > -static void free_all_tasks(void) > -{ > - /* make sure we don't leak task structs */ > - process_task_mortuary(); > - process_task_mortuary(); > -} > - > -int sync_start(void) > -{ > - int err; > - > - if (!zalloc_cpumask_var(&marked_cpus, GFP_KERNEL)) > - return -ENOMEM; > - > - err = task_handoff_register(&task_free_nb); > - if (err) > - goto out1; > - err = profile_event_register(PROFILE_TASK_EXIT, &task_exit_nb); > - if (err) > - goto out2; > - err = profile_event_register(PROFILE_MUNMAP, &munmap_nb); > - if (err) > - goto out3; > - err = register_module_notifier(&module_load_nb); > - if (err) > - goto out4; > - > - start_cpu_work(); > - > -out: > - return err; > -out4: > - profile_event_unregister(PROFILE_MUNMAP, &munmap_nb); > -out3: > - profile_event_unregister(PROFILE_TASK_EXIT, &task_exit_nb); > -out2: > - task_handoff_unregister(&task_free_nb); > - free_all_tasks(); > -out1: > - free_cpumask_var(marked_cpus); > - goto out; > -} > - > - > -void sync_stop(void) > -{ > - end_cpu_work(); > - unregister_module_notifier(&module_load_nb); > - profile_event_unregister(PROFILE_MUNMAP, &munmap_nb); > - profile_event_unregister(PROFILE_TASK_EXIT, &task_exit_nb); > - task_handoff_unregister(&task_free_nb); > - barrier(); /* do all of the above first */ > - > - flush_cpu_work(); > - > - free_all_tasks(); > - free_cpumask_var(marked_cpus); > -} > - > - > -/* Optimisation. We can manage without taking the dcookie sem > - * because we cannot reach this code without at least one > - * dcookie user still being registered (namely, the reader > - * of the event buffer). */ > -static inline unsigned long fast_get_dcookie(const struct path *path) > -{ > - unsigned long cookie; > - > - if (path->dentry->d_flags & DCACHE_COOKIE) > - return (unsigned long)path->dentry; > - get_dcookie(path, &cookie); > - return cookie; > -} > - > - > -/* Look up the dcookie for the task's mm->exe_file, > - * which corresponds loosely to "application name". This is > - * not strictly necessary but allows oprofile to associate > - * shared-library samples with particular applications > - */ > -static unsigned long get_exec_dcookie(struct mm_struct *mm) > -{ > - unsigned long cookie = NO_COOKIE; > - struct file *exe_file; > - > - if (!mm) > - goto done; > - > - exe_file = get_mm_exe_file(mm); > - if (!exe_file) > - goto done; > - > - cookie = fast_get_dcookie(&exe_file->f_path); > - fput(exe_file); > -done: > - return cookie; > -} > - > - > -/* Convert the EIP value of a sample into a persistent dentry/offset > - * pair that can then be added to the global event buffer. We make > - * sure to do this lookup before a mm->mmap modification happens so > - * we don't lose track. > - * > - * The caller must ensure the mm is not nil (ie: not a kernel thread). > - */ > -static unsigned long > -lookup_dcookie(struct mm_struct *mm, unsigned long addr, off_t *offset) > -{ > - unsigned long cookie = NO_COOKIE; > - struct vm_area_struct *vma; > - > - mmap_read_lock(mm); > - for (vma = find_vma(mm, addr); vma; vma = vma->vm_next) { > - > - if (addr < vma->vm_start || addr >= vma->vm_end) > - continue; > - > - if (vma->vm_file) { > - cookie = fast_get_dcookie(&vma->vm_file->f_path); > - *offset = (vma->vm_pgoff << PAGE_SHIFT) + addr - > - vma->vm_start; > - } else { > - /* must be an anonymous map */ > - *offset = addr; > - } > - > - break; > - } > - > - if (!vma) > - cookie = INVALID_COOKIE; > - mmap_read_unlock(mm); > - > - return cookie; > -} > - > -static unsigned long last_cookie = INVALID_COOKIE; > - > -static void add_cpu_switch(int i) > -{ > - add_event_entry(ESCAPE_CODE); > - add_event_entry(CPU_SWITCH_CODE); > - add_event_entry(i); > - last_cookie = INVALID_COOKIE; > -} > - > -static void add_kernel_ctx_switch(unsigned int in_kernel) > -{ > - add_event_entry(ESCAPE_CODE); > - if (in_kernel) > - add_event_entry(KERNEL_ENTER_SWITCH_CODE); > - else > - add_event_entry(KERNEL_EXIT_SWITCH_CODE); > -} > - > -static void > -add_user_ctx_switch(struct task_struct const *task, unsigned long cookie) > -{ > - add_event_entry(ESCAPE_CODE); > - add_event_entry(CTX_SWITCH_CODE); > - add_event_entry(task->pid); > - add_event_entry(cookie); > - /* Another code for daemon back-compat */ > - add_event_entry(ESCAPE_CODE); > - add_event_entry(CTX_TGID_CODE); > - add_event_entry(task->tgid); > -} > - > - > -static void add_cookie_switch(unsigned long cookie) > -{ > - add_event_entry(ESCAPE_CODE); > - add_event_entry(COOKIE_SWITCH_CODE); > - add_event_entry(cookie); > -} > - > - > -static void add_trace_begin(void) > -{ > - add_event_entry(ESCAPE_CODE); > - add_event_entry(TRACE_BEGIN_CODE); > -} > - > -static void add_data(struct op_entry *entry, struct mm_struct *mm) > -{ > - unsigned long code, pc, val; > - unsigned long cookie; > - off_t offset; > - > - if (!op_cpu_buffer_get_data(entry, &code)) > - return; > - if (!op_cpu_buffer_get_data(entry, &pc)) > - return; > - if (!op_cpu_buffer_get_size(entry)) > - return; > - > - if (mm) { > - cookie = lookup_dcookie(mm, pc, &offset); > - > - if (cookie == NO_COOKIE) > - offset = pc; > - if (cookie == INVALID_COOKIE) { > - atomic_inc(&oprofile_stats.sample_lost_no_mapping); > - offset = pc; > - } > - if (cookie != last_cookie) { > - add_cookie_switch(cookie); > - last_cookie = cookie; > - } > - } else > - offset = pc; > - > - add_event_entry(ESCAPE_CODE); > - add_event_entry(code); > - add_event_entry(offset); /* Offset from Dcookie */ > - > - while (op_cpu_buffer_get_data(entry, &val)) > - add_event_entry(val); > -} > - > -static inline void add_sample_entry(unsigned long offset, unsigned long event) > -{ > - add_event_entry(offset); > - add_event_entry(event); > -} > - > - > -/* > - * Add a sample to the global event buffer. If possible the > - * sample is converted into a persistent dentry/offset pair > - * for later lookup from userspace. Return 0 on failure. > - */ > -static int > -add_sample(struct mm_struct *mm, struct op_sample *s, int in_kernel) > -{ > - unsigned long cookie; > - off_t offset; > - > - if (in_kernel) { > - add_sample_entry(s->eip, s->event); > - return 1; > - } > - > - /* add userspace sample */ > - > - if (!mm) { > - atomic_inc(&oprofile_stats.sample_lost_no_mm); > - return 0; > - } > - > - cookie = lookup_dcookie(mm, s->eip, &offset); > - > - if (cookie == INVALID_COOKIE) { > - atomic_inc(&oprofile_stats.sample_lost_no_mapping); > - return 0; > - } > - > - if (cookie != last_cookie) { > - add_cookie_switch(cookie); > - last_cookie = cookie; > - } > - > - add_sample_entry(offset, s->event); > - > - return 1; > -} > - > - > -static void release_mm(struct mm_struct *mm) > -{ > - if (!mm) > - return; > - mmput(mm); > -} > - > -static inline int is_code(unsigned long val) > -{ > - return val == ESCAPE_CODE; > -} > - > - > -/* Move tasks along towards death. Any tasks on dead_tasks > - * will definitely have no remaining references in any > - * CPU buffers at this point, because we use two lists, > - * and to have reached the list, it must have gone through > - * one full sync already. > - */ > -static void process_task_mortuary(void) > -{ > - unsigned long flags; > - LIST_HEAD(local_dead_tasks); > - struct task_struct *task; > - struct task_struct *ttask; > - > - spin_lock_irqsave(&task_mortuary, flags); > - > - list_splice_init(&dead_tasks, &local_dead_tasks); > - list_splice_init(&dying_tasks, &dead_tasks); > - > - spin_unlock_irqrestore(&task_mortuary, flags); > - > - list_for_each_entry_safe(task, ttask, &local_dead_tasks, tasks) { > - list_del(&task->tasks); > - free_task(task); > - } > -} > - > - > -static void mark_done(int cpu) > -{ > - int i; > - > - cpumask_set_cpu(cpu, marked_cpus); > - > - for_each_online_cpu(i) { > - if (!cpumask_test_cpu(i, marked_cpus)) > - return; > - } > - > - /* All CPUs have been processed at least once, > - * we can process the mortuary once > - */ > - process_task_mortuary(); > - > - cpumask_clear(marked_cpus); > -} > - > - > -/* FIXME: this is not sufficient if we implement syscall barrier backtrace > - * traversal, the code switch to sb_sample_start at first kernel enter/exit > - * switch so we need a fifth state and some special handling in sync_buffer() > - */ > -typedef enum { > - sb_bt_ignore = -2, > - sb_buffer_start, > - sb_bt_start, > - sb_sample_start, > -} sync_buffer_state; > - > -/* Sync one of the CPU's buffers into the global event buffer. > - * Here we need to go through each batch of samples punctuated > - * by context switch notes, taking the task's mmap_lock and doing > - * lookup in task->mm->mmap to convert EIP into dcookie/offset > - * value. > - */ > -void sync_buffer(int cpu) > -{ > - struct mm_struct *mm = NULL; > - struct mm_struct *oldmm; > - unsigned long val; > - struct task_struct *new; > - unsigned long cookie = 0; > - int in_kernel = 1; > - sync_buffer_state state = sb_buffer_start; > - unsigned int i; > - unsigned long available; > - unsigned long flags; > - struct op_entry entry; > - struct op_sample *sample; > - > - mutex_lock(&buffer_mutex); > - > - add_cpu_switch(cpu); > - > - op_cpu_buffer_reset(cpu); > - available = op_cpu_buffer_entries(cpu); > - > - for (i = 0; i < available; ++i) { > - sample = op_cpu_buffer_read_entry(&entry, cpu); > - if (!sample) > - break; > - > - if (is_code(sample->eip)) { > - flags = sample->event; > - if (flags & TRACE_BEGIN) { > - state = sb_bt_start; > - add_trace_begin(); > - } > - if (flags & KERNEL_CTX_SWITCH) { > - /* kernel/userspace switch */ > - in_kernel = flags & IS_KERNEL; > - if (state == sb_buffer_start) > - state = sb_sample_start; > - add_kernel_ctx_switch(flags & IS_KERNEL); > - } > - if (flags & USER_CTX_SWITCH > - && op_cpu_buffer_get_data(&entry, &val)) { > - /* userspace context switch */ > - new = (struct task_struct *)val; > - oldmm = mm; > - release_mm(oldmm); > - mm = get_task_mm(new); > - if (mm != oldmm) > - cookie = get_exec_dcookie(mm); > - add_user_ctx_switch(new, cookie); > - } > - if (op_cpu_buffer_get_size(&entry)) > - add_data(&entry, mm); > - continue; > - } > - > - if (state < sb_bt_start) > - /* ignore sample */ > - continue; > - > - if (add_sample(mm, sample, in_kernel)) > - continue; > - > - /* ignore backtraces if failed to add a sample */ > - if (state == sb_bt_start) { > - state = sb_bt_ignore; > - atomic_inc(&oprofile_stats.bt_lost_no_mapping); > - } > - } > - release_mm(mm); > - > - mark_done(cpu); > - > - mutex_unlock(&buffer_mutex); > -} > - > -/* The function can be used to add a buffer worth of data directly to > - * the kernel buffer. The buffer is assumed to be a circular buffer. > - * Take the entries from index start and end at index end, wrapping > - * at max_entries. > - */ > -void oprofile_put_buff(unsigned long *buf, unsigned int start, > - unsigned int stop, unsigned int max) > -{ > - int i; > - > - i = start; > - > - mutex_lock(&buffer_mutex); > - while (i != stop) { > - add_event_entry(buf[i++]); > - > - if (i >= max) > - i = 0; > - } > - > - mutex_unlock(&buffer_mutex); > -} > - > diff --git a/drivers/oprofile/buffer_sync.h b/drivers/oprofile/buffer_sync.h > deleted file mode 100644 > index 3110732c1835..000000000000 > --- a/drivers/oprofile/buffer_sync.h > +++ /dev/null > @@ -1,22 +0,0 @@ > -/** > - * @file buffer_sync.h > - * > - * @remark Copyright 2002 OProfile authors > - * @remark Read the file COPYING > - * > - * @author John Levon <le...@mo...> > - */ > - > -#ifndef OPROFILE_BUFFER_SYNC_H > -#define OPROFILE_BUFFER_SYNC_H > - > -/* add the necessary profiling hooks */ > -int sync_start(void); > - > -/* remove the hooks */ > -void sync_stop(void); > - > -/* sync the given CPU's buffer */ > -void sync_buffer(int cpu); > - > -#endif /* OPROFILE_BUFFER_SYNC_H */ > diff --git a/drivers/oprofile/cpu_buffer.c b/drivers/oprofile/cpu_buffer.c > deleted file mode 100644 > index 9210a95cb4e6..000000000000 > --- a/drivers/oprofile/cpu_buffer.c > +++ /dev/null > @@ -1,465 +0,0 @@ > -/** > - * @file cpu_buffer.c > - * > - * @remark Copyright 2002-2009 OProfile authors > - * @remark Read the file COPYING > - * > - * @author John Levon <le...@mo...> > - * @author Barry Kasindorf <bar...@am...> > - * @author Robert Richter <rob...@am...> > - * > - * Each CPU has a local buffer that stores PC value/event > - * pairs. We also log context switches when we notice them. > - * Eventually each CPU's buffer is processed into the global > - * event buffer by sync_buffer(). > - * > - * We use a local buffer for two reasons: an NMI or similar > - * interrupt cannot synchronise, and high sampling rates > - * would lead to catastrophic global synchronisation if > - * a global buffer was used. > - */ > - > -#include <linux/sched.h> > -#include <linux/oprofile.h> > -#include <linux/errno.h> > - > -#include <asm/ptrace.h> > - > -#include "event_buffer.h" > -#include "cpu_buffer.h" > -#include "buffer_sync.h" > -#include "oprof.h" > - > -#define OP_BUFFER_FLAGS 0 > - > -static struct trace_buffer *op_ring_buffer; > -DEFINE_PER_CPU(struct oprofile_cpu_buffer, op_cpu_buffer); > - > -static void wq_sync_buffer(struct work_struct *work); > - > -#define DEFAULT_TIMER_EXPIRE (HZ / 10) > -static int work_enabled; > - > -unsigned long oprofile_get_cpu_buffer_size(void) > -{ > - return oprofile_cpu_buffer_size; > -} > - > -void oprofile_cpu_buffer_inc_smpl_lost(void) > -{ > - struct oprofile_cpu_buffer *cpu_buf = this_cpu_ptr(&op_cpu_buffer); > - > - cpu_buf->sample_lost_overflow++; > -} > - > -void free_cpu_buffers(void) > -{ > - if (op_ring_buffer) > - ring_buffer_free(op_ring_buffer); > - op_ring_buffer = NULL; > -} > - > -#define RB_EVENT_HDR_SIZE 4 > - > -int alloc_cpu_buffers(void) > -{ > - int i; > - > - unsigned long buffer_size = oprofile_cpu_buffer_size; > - unsigned long byte_size = buffer_size * (sizeof(struct op_sample) + > - RB_EVENT_HDR_SIZE); > - > - op_ring_buffer = ring_buffer_alloc(byte_size, OP_BUFFER_FLAGS); > - if (!op_ring_buffer) > - goto fail; > - > - for_each_possible_cpu(i) { > - struct oprofile_cpu_buffer *b = &per_cpu(op_cpu_buffer, i); > - > - b->last_task = NULL; > - b->last_is_kernel = -1; > - b->tracing = 0; > - b->buffer_size = buffer_size; > - b->sample_received = 0; > - b->sample_lost_overflow = 0; > - b->backtrace_aborted = 0; > - b->sample_invalid_eip = 0; > - b->cpu = i; > - INIT_DELAYED_WORK(&b->work, wq_sync_buffer); > - } > - return 0; > - > -fail: > - free_cpu_buffers(); > - return -ENOMEM; > -} > - > -void start_cpu_work(void) > -{ > - int i; > - > - work_enabled = 1; > - > - for_each_online_cpu(i) { > - struct oprofile_cpu_buffer *b = &per_cpu(op_cpu_buffer, i); > - > - /* > - * Spread the work by 1 jiffy per cpu so they dont all > - * fire at once. > - */ > - schedule_delayed_work_on(i, &b->work, DEFAULT_TIMER_EXPIRE + i); > - } > -} > - > -void end_cpu_work(void) > -{ > - work_enabled = 0; > -} > - > -void flush_cpu_work(void) > -{ > - int i; > - > - for_each_online_cpu(i) { > - struct oprofile_cpu_buffer *b = &per_cpu(op_cpu_buffer, i); > - > - /* these works are per-cpu, no need for flush_sync */ > - flush_delayed_work(&b->work); > - } > -} > - > -/* > - * This function prepares the cpu buffer to write a sample. > - * > - * Struct op_entry is used during operations on the ring buffer while > - * struct op_sample contains the data that is stored in the ring > - * buffer. Struct entry can be uninitialized. The function reserves a > - * data array that is specified by size. Use > - * op_cpu_buffer_write_commit() after preparing the sample. In case of > - * errors a null pointer is returned, otherwise the pointer to the > - * sample. > - * > - */ > -struct op_sample > -*op_cpu_buffer_write_reserve(struct op_entry *entry, unsigned long size) > -{ > - entry->event = ring_buffer_lock_reserve > - (op_ring_buffer, sizeof(struct op_sample) + > - size * sizeof(entry->sample->data[0])); > - if (!entry->event) > - return NULL; > - entry->sample = ring_buffer_event_data(entry->event); > - entry->size = size; > - entry->data = entry->sample->data; > - > - return entry->sample; > -} > - > -int op_cpu_buffer_write_commit(struct op_entry *entry) > -{ > - return ring_buffer_unlock_commit(op_ring_buffer, entry->event); > -} > - > -struct op_sample *op_cpu_buffer_read_entry(struct op_entry *entry, int cpu) > -{ > - struct ring_buffer_event *e; > - e = ring_buffer_consume(op_ring_buffer, cpu, NULL, NULL); > - if (!e) > - return NULL; > - > - entry->event = e; > - entry->sample = ring_buffer_event_data(e); > - entry->size = (ring_buffer_event_length(e) - sizeof(struct op_sample)) > - / sizeof(entry->sample->data[0]); > - entry->data = entry->sample->data; > - return entry->sample; > -} > - > -unsigned long op_cpu_buffer_entries(int cpu) > -{ > - return ring_buffer_entries_cpu(op_ring_buffer, cpu); > -} > - > -static int > -op_add_code(struct oprofile_cpu_buffer *cpu_buf, unsigned long backtrace, > - int is_kernel, struct task_struct *task) > -{ > - struct op_entry entry; > - struct op_sample *sample; > - unsigned long flags; > - int size; > - > - flags = 0; > - > - if (backtrace) > - flags |= TRACE_BEGIN; > - > - /* notice a switch from user->kernel or vice versa */ > - is_kernel = !!is_kernel; > - if (cpu_buf->last_is_kernel != is_kernel) { > - cpu_buf->last_is_kernel = is_kernel; > - flags |= KERNEL_CTX_SWITCH; > - if (is_kernel) > - flags |= IS_KERNEL; > - } > - > - /* notice a task switch */ > - if (cpu_buf->last_task != task) { > - cpu_buf->last_task = task; > - flags |= USER_CTX_SWITCH; > - } > - > - if (!flags) > - /* nothing to do */ > - return 0; > - > - if (flags & USER_CTX_SWITCH) > - size = 1; > - else > - size = 0; > - > - sample = op_cpu_buffer_write_reserve(&entry, size); > - if (!sample) > - return -ENOMEM; > - > - sample->eip = ESCAPE_CODE; > - sample->event = flags; > - > - if (size) > - op_cpu_buffer_add_data(&entry, (unsigned long)task); > - > - op_cpu_buffer_write_commit(&entry); > - > - return 0; > -} > - > -static inline int > -op_add_sample(struct oprofile_cpu_buffer *cpu_buf, > - unsigned long pc, unsigned long event) > -{ > - struct op_entry entry; > - struct op_sample *sample; > - > - sample = op_cpu_buffer_write_reserve(&entry, 0); > - if (!sample) > - return -ENOMEM; > - > - sample->eip = pc; > - sample->event = event; > - > - return op_cpu_buffer_write_commit(&entry); > -} > - > -/* > - * This must be safe from any context. > - * > - * is_kernel is needed because on some architectures you cannot > - * tell if you are in kernel or user space simply by looking at > - * pc. We tag this in the buffer by generating kernel enter/exit > - * events whenever is_kernel changes > - */ > -static int > -log_sample(struct oprofile_cpu_buffer *cpu_buf, unsigned long pc, > - unsigned long backtrace, int is_kernel, unsigned long event, > - struct task_struct *task) > -{ > - struct task_struct *tsk = task ? task : current; > - cpu_buf->sample_received++; > - > - if (pc == ESCAPE_CODE) { > - cpu_buf->sample_invalid_eip++; > - return 0; > - } > - > - if (op_add_code(cpu_buf, backtrace, is_kernel, tsk)) > - goto fail; > - > - if (op_add_sample(cpu_buf, pc, event)) > - goto fail; > - > - return 1; > - > -fail: > - cpu_buf->sample_lost_overflow++; > - return 0; > -} > - > -static inline void oprofile_begin_trace(struct oprofile_cpu_buffer *cpu_buf) > -{ > - cpu_buf->tracing = 1; > -} > - > -static inline void oprofile_end_trace(struct oprofile_cpu_buffer *cpu_buf) > -{ > - cpu_buf->tracing = 0; > -} > - > -static inline void > -__oprofile_add_ext_sample(unsigned long pc, struct pt_regs * const regs, > - unsigned long event, int is_kernel, > - struct task_struct *task) > -{ > - struct oprofile_cpu_buffer *cpu_buf = this_cpu_ptr(&op_cpu_buffer); > - unsigned long backtrace = oprofile_backtrace_depth; > - > - /* > - * if log_sample() fail we can't backtrace since we lost the > - * source of this event > - */ > - if (!log_sample(cpu_buf, pc, backtrace, is_kernel, event, task)) > - /* failed */ > - return; > - > - if (!backtrace) > - return; > - > - oprofile_begin_trace(cpu_buf); > - oprofile_ops.backtrace(regs, backtrace); > - oprofile_end_trace(cpu_buf); > -} > - > -void oprofile_add_ext_hw_sample(unsigned long pc, struct pt_regs * const regs, > - unsigned long event, int is_kernel, > - struct task_struct *task) > -{ > - __oprofile_add_ext_sample(pc, regs, event, is_kernel, task); > -} > - > -void oprofile_add_ext_sample(unsigned long pc, struct pt_regs * const regs, > - unsigned long event, int is_kernel) > -{ > - __oprofile_add_ext_sample(pc, regs, event, is_kernel, NULL); > -} > - > -void oprofile_add_sample(struct pt_regs * const regs, unsigned long event) > -{ > - int is_kernel; > - unsigned long pc; > - > - if (likely(regs)) { > - is_kernel = !user_mode(regs); > - pc = profile_pc(regs); > - } else { > - is_kernel = 0; /* This value will not be used */ > - pc = ESCAPE_CODE; /* as this causes an early return. */ > - } > - > - __oprofile_add_ext_sample(pc, regs, event, is_kernel, NULL); > -} > - > -/* > - * Add samples with data to the ring buffer. > - * > - * Use oprofile_add_data(&entry, val) to add data and > - * oprofile_write_commit(&entry) to commit the sample. > - */ > -void > -oprofile_write_reserve(struct op_entry *entry, struct pt_regs * const regs, > - unsigned long pc, int code, int size) > -{ > - struct op_sample *sample; > - int is_kernel = !user_mode(regs); > - struct oprofile_cpu_buffer *cpu_buf = this_cpu_ptr(&op_cpu_buffer); > - > - cpu_buf->sample_received++; > - > - /* no backtraces for samples with data */ > - if (op_add_code(cpu_buf, 0, is_kernel, current)) > - goto fail; > - > - sample = op_cpu_buffer_write_reserve(entry, size + 2); > - if (!sample) > - goto fail; > - sample->eip = ESCAPE_CODE; > - sample->event = 0; /* no flags */ > - > - op_cpu_buffer_add_data(entry, code); > - op_cpu_buffer_add_data(entry, pc); > - > - return; > - > -fail: > - entry->event = NULL; > - cpu_buf->sample_lost_overflow++; > -} > - > -int oprofile_add_data(struct op_entry *entry, unsigned long val) > -{ > - if (!entry->event) > - return 0; > - return op_cpu_buffer_add_data(entry, val); > -} > - > -int oprofile_add_data64(struct op_entry *entry, u64 val) > -{ > - if (!entry->event) > - return 0; > - if (op_cpu_buffer_get_size(entry) < 2) > - /* > - * the function returns 0 to indicate a too small > - * buffer, even if there is some space left > - */ > - return 0; > - if (!op_cpu_buffer_add_data(entry, (u32)val)) > - return 0; > - return op_cpu_buffer_add_data(entry, (u32)(val >> 32)); > -} > - > -int oprofile_write_commit(struct op_entry *entry) > -{ > - if (!entry->event) > - return -EINVAL; > - return op_cpu_buffer_write_commit(entry); > -} > - > -void oprofile_add_pc(unsigned long pc, int is_kernel, unsigned long event) > -{ > - struct oprofile_cpu_buffer *cpu_buf = this_cpu_ptr(&op_cpu_buffer); > - log_sample(cpu_buf, pc, 0, is_kernel, event, NULL); > -} > - > -void oprofile_add_trace(unsigned long pc) > -{ > - struct oprofile_cpu_buffer *cpu_buf = this_cpu_ptr(&op_cpu_buffer); > - > - if (!cpu_buf->tracing) > - return; > - > - /* > - * broken frame can give an eip with the same value as an > - * escape code, abort the trace if we get it > - */ > - if (pc == ESCAPE_CODE) > - goto fail; > - > - if (op_add_sample(cpu_buf, pc, 0)) > - goto fail; > - > - return; > -fail: > - cpu_buf->tracing = 0; > - cpu_buf->backtrace_aborted++; > - return; > -} > - > -/* > - * This serves to avoid cpu buffer overflow, and makes sure > - * the task mortuary progresses > - * > - * By using schedule_delayed_work_on and then schedule_delayed_work > - * we guarantee this will stay on the correct cpu > - */ > -static void wq_sync_buffer(struct work_struct *work) > -{ > - struct oprofile_cpu_buffer *b = > - container_of(work, struct oprofile_cpu_buffer, work.work); > - if (b->cpu != smp_processor_id() && !cpu_online(b->cpu)) { > - cancel_delayed_work(&b->work); > - return; > - } > - sync_buffer(b->cpu); > - > - /* don't re-add the work if we're shutting down */ > - if (work_enabled) > - schedule_delayed_work(&b->work, DEFAULT_TIMER_EXPIRE); > -} > diff --git a/drivers/oprofile/cpu_buffer.h b/drivers/oprofile/cpu_buffer.h > deleted file mode 100644 > index 31478c0cff87..000000000000 > --- a/drivers/oprofile/cpu_buffer.h > +++ /dev/null > @@ -1,121 +0,0 @@ > -/** > - * @file cpu_buffer.h > - * > - * @remark Copyright 2002-2009 OProfile authors > - * @remark Read the file COPYING > - * > - * @author John Levon <le...@mo...> > - * @author Robert Richter <rob...@am...> > - */ > - > -#ifndef OPROFILE_CPU_BUFFER_H > -#define OPROFILE_CPU_BUFFER_H > - > -#include <linux/types.h> > -#include <linux/spinlock.h> > -#include <linux/workqueue.h> > -#include <linux/cache.h> > -#include <linux/sched.h> > -#include <linux/ring_buffer.h> > - > -struct task_struct; > - > -int alloc_cpu_buffers(void); > -void free_cpu_buffers(void); > - > -void start_cpu_work(void); > -void end_cpu_work(void); > -void flush_cpu_work(void); > - > -/* CPU buffer is composed of such entries (which are > - * also used for context switch notes) > - */ > -struct op_sample { > - unsigned long eip; > - unsigned long event; > - unsigned long data[]; > -}; > - > -struct op_entry; > - > -struct oprofile_cpu_buffer { > - unsigned long buffer_size; > - struct task_struct *last_task; > - int last_is_kernel; > - int tracing; > - unsigned long sample_received; > - unsigned long sample_lost_overflow; > - unsigned long backtrace_aborted; > - unsigned long sample_invalid_eip; > - int cpu; > - struct delayed_work work; > -}; > - > -DECLARE_PER_CPU(struct oprofile_cpu_buffer, op_cpu_buffer); > - > -/* > - * Resets the cpu buffer to a sane state. > - * > - * reset these to invalid values; the next sample collected will > - * populate the buffer with proper values to initialize the buffer > - */ > -static inline void op_cpu_buffer_reset(int cpu) > -{ > - struct oprofile_cpu_buffer *cpu_buf = &per_cpu(op_cpu_buffer, cpu); > - > - cpu_buf->last_is_kernel = -1; > - cpu_buf->last_task = NULL; > -} > - > -/* > - * op_cpu_buffer_add_data() and op_cpu_buffer_write_commit() may be > - * called only if op_cpu_buffer_write_reserve() did not return NULL or > - * entry->event != NULL, otherwise entry->size or entry->event will be > - * used uninitialized. > - */ > - > -struct op_sample > -*op_cpu_buffer_write_reserve(struct op_entry *entry, unsigned long size); > -int op_cpu_buffer_write_commit(struct op_entry *entry); > -struct op_sample *op_cpu_buffer_read_entry(struct op_entry *entry, int cpu); > -unsigned long op_cpu_buffer_entries(int cpu); > - > -/* returns the remaining free size of data in the entry */ > -static inline > -int op_cpu_buffer_add_data(struct op_entry *entry, unsigned long val) > -{ > - if (!entry->size) > - return 0; > - *entry->data = val; > - entry->size--; > - entry->data++; > - return entry->size; > -} > - > -/* returns the size of data in the entry */ > -static inline > -int op_cpu_buffer_get_size(struct op_entry *entry) > -{ > - return entry->size; > -} > - > -/* returns 0 if empty or the size of data including the current value */ > -static inline > -int op_cpu_buffer_get_data(struct op_entry *entry, unsigned long *val) > -{ > - int size = entry->size; > - if (!size) > - return 0; > - *val = *entry->data; > - entry->size--; > - entry->data++; > - return size; > -} > - > -/* extra data flags */ > -#define KERNEL_CTX_SWITCH (1UL << 0) > -#define IS_KERNEL (1UL << 1) > -#define TRACE_BEGIN (1UL << 2) > -#define USER_CTX_SWITCH (1UL << 3) > - > -#endif /* OPROFILE_CPU_BUFFER_H */ > diff --git a/drivers/oprofile/event_buffer.c b/drivers/oprofile/event_buffer.c > deleted file mode 100644 > index 6c9edc8bbc95..000000000000 > --- a/drivers/oprofile/event_buffer.c > +++ /dev/null > @@ -1,209 +0,0 @@ > -/** > - * @file event_buffer.c > - * > - * @remark Copyright 2002 OProfile authors > - * @remark Read the file COPYING > - * > - * @author John Levon <le...@mo...> > - * > - * This is the global event buffer that the user-space > - * daemon reads from. The event buffer is an untyped array > - * of unsigned longs. Entries are prefixed by the > - * escape value ESCAPE_CODE followed by an identifying code. > - */ > - > -#include <linux/vmalloc.h> > -#include <linux/oprofile.h> > -#include <linux/sched/signal.h> > -#include <linux/capability.h> > -#include <linux/dcookies.h> > -#include <linux/fs.h> > -#include <linux/uaccess.h> > - > -#include "oprof.h" > -#include "event_buffer.h" > -#include "oprofile_stats.h" > - > -DEFINE_MUTEX(buffer_mutex); > - > -static unsigned long buffer_opened; > -static DECLARE_WAIT_QUEUE_HEAD(buffer_wait); > -static unsigned long *event_buffer; > -static unsigned long buffer_size; > -static unsigned long buffer_watershed; > -static size_t buffer_pos; > -/* atomic_t because wait_event checks it outside of buffer_mutex */ > -static atomic_t buffer_ready = ATOMIC_INIT(0); > - > -/* > - * Add an entry to the event buffer. When we get near to the end we > - * wake up the process sleeping on the read() of the file. To protect > - * the event_buffer this function may only be called when buffer_mutex > - * is set. > - */ > -void add_event_entry(unsigned long value) > -{ > - /* > - * This shouldn't happen since all workqueues or handlers are > - * canceled or flushed before the event buffer is freed. > - */ > - if (!event_buffer) { > - WARN_ON_ONCE(1); > - return; > - } > - > - if (buffer_pos == buffer_size) { > - atomic_inc(&oprofile_stats.event_lost_overflow); > - return; > - } > - > - event_buffer[buffer_pos] = value; > - if (++buffer_pos == buffer_size - buffer_watershed) { > - atomic_set(&buffer_ready, 1); > - wake_up(&buffer_wait); > - } > -} > - > - > -/* Wake up the waiting process if any. This happens > - * on "echo 0 >/dev/oprofile/enable" so the daemon > - * processes the data remaining in the event buffer. > - */ > -void wake_up_buffer_waiter(void) > -{ > - mutex_lock(&buffer_mutex); > - atomic_set(&buffer_ready, 1); > - wake_up(&buffer_wait); > - mutex_unlock(&buffer_mutex); > -} > - > - > -int alloc_event_buffer(void) > -{ > - unsigned long flags; > - > - raw_spin_lock_irqsave(&oprofilefs_lock, flags); > - buffer_size = oprofile_buffer_size; > - buffer_watershed = oprofile_buffer_watershed; > - raw_spin_unlock_irqrestore(&oprofilefs_lock, flags); > - > - if (buffer_watershed >= buffer_size) > - return -EINVAL; > - > - buffer_pos = 0; > - event_buffer = vmalloc(array_size(buffer_size, sizeof(unsigned long))); > - if (!event_buffer) > - return -ENOMEM; > - > - return 0; > -} > - > - > -void free_event_buffer(void) > -{ > - mutex_lock(&buffer_mutex); > - vfree(event_buffer); > - buffer_pos = 0; > - event_buffer = NULL; > - mutex_unlock(&buffer_mutex); > -} > - > - > -static int event_buffer_open(struct inode *inode, struct file *file) > -{ > - int err = -EPERM; > - > - if (!perfmon_capable()) > - return -EPERM; > - > - if (test_and_set_bit_lock(0, &buffer_opened)) > - return -EBUSY; > - > - /* Register as a user of dcookies > - * to ensure they persist for the lifetime of > - * the open event file > - */ > - err = -EINVAL; > - file->private_data = dcookie_register(); > - if (!file->private_data) > - goto out; > - > - if ((err = oprofile_setup())) > - goto fail; > - > - /* NB: the actual start happens from userspace > - * echo 1 >/dev/oprofile/enable > - */ > - > - return nonseekable_open(inode, file); > - > -fail: > - dcookie_unregister(file->private_data); > -out: > - __clear_bit_unlock(0, &buffer_opened); > - return err; > -} > - > - > -static int event_buffer_release(struct inode *inode, struct file *file) > -{ > - oprofile_stop(); > - oprofile_shutdown(); > - dcookie_unregister(file->private_data); > - buffer_pos = 0; > - atomic_set(&buffer_ready, 0); > - __clear_bit_unlock(0, &buffer_opened); > - return 0; > -} > - > - > -static ssize_t event_buffer_read(struct file *file, char __user *buf, > - size_t count, loff_t *offset) > -{ > - int retval = -EINVAL; > - size_t const max = buffer_size * sizeof(unsigned long); > - > - /* handling partial reads is more trouble than it's worth */ > - if (count != max || *offset) > - return -EINVAL; > - > - wait_event_interruptible(buffer_wait, atomic_read(&buffer_ready)); > - > - if (signal_pending(current)) > - return -EINTR; > - > - /* can't currently happen */ > - if (!atomic_read(&buffer_ready)) > - return -EAGAIN; > - > - mutex_lock(&buffer_mutex); > - > - /* May happen if the buffer is freed during pending reads. */ > - if (!event_buffer) { > - retval = -EINTR; > - goto out; > - } > - > - atomic_set(&buffer_ready, 0); > - > - retval = -EFAULT; > - > - count = buffer_pos * sizeof(unsigned long); > - > - if (copy_to_user(buf, event_buffer, count)) > - goto out; > - > - retval = count; > - buffer_pos = 0; > - > -out: > - mutex_unlock(&buffer_mutex); > - return retval; > -} > - > -const struct file_operations event_buffer_fops = { > - .open = event_buffer_open, > - .release = event_buffer_release, > - .read = event_buffer_read, > - .llseek = no_llseek, > -}; > diff --git a/drivers/oprofile/event_buffer.h b/drivers/oprofile/event_buffer.h > deleted file mode 100644 > index a8d5bb3cba89..000000000000 > --- a/drivers/oprofile/event_buffer.h > +++ /dev/null > @@ -1,40 +0,0 @@ > -/** > - * @file event_buffer.h > - * > - * @remark Copyright 2002 OProfile authors > - * @remark Read the file COPYING > - * > - * @author John Levon <le...@mo...> > - */ > - > -#ifndef EVENT_BUFFER_H > -#define EVENT_BUFFER_H > - > -#include <linux/types.h> > -#include <linux/mutex.h> > - > -int alloc_event_buffer(void); > - > -void free_event_buffer(void); > - > -/** > - * Add data to the event buffer. > - * The data passed is free-form, but typically consists of > - * file offsets, dcookies, context information, and ESCAPE codes. > - */ > -void add_event_entry(unsigned long data); > - > -/* wake up the process sleeping on the event file */ > -void wake_up_buffer_waiter(void); > - > -#define INVALID_COOKIE ~0UL > -#define NO_COOKIE 0UL > - > -extern const struct file_operations event_buffer_fops; > - > -/* mutex between sync_cpu_buffers() and the > - * file reading code. > - */ > -extern struct mutex buffer_mutex; > - > -#endif /* EVENT_BUFFER_H */ > diff --git a/drivers/oprofile/nmi_timer_int.c b/drivers/oprofile/nmi_timer_int.c > deleted file mode 100644 > index f343bd96609a..000000000000 > --- a/drivers/oprofile/nmi_timer_int.c > +++ /dev/null > @@ -1,157 +0,0 @@ > -// SPDX-License-Identifier: GPL-2.0 > -/** > - * @file nmi_timer_int.c > - * > - * @remark Copyright 2011 Advanced Micro Devices, Inc. > - * > - * @author Robert Richter <rob...@am...> > - */ > - > -#include <linux/init.h> > -#include <linux/smp.h> > -#include <linux/errno.h> > -#include <linux/oprofile.h> > -#include <linux/perf_event.h> > - > -#ifdef CONFIG_OPROFILE_NMI_TIMER > - > -static DEFINE_PER_CPU(struct perf_event *, nmi_timer_events); > -static int ctr_running; > - > -static struct perf_event_attr nmi_timer_attr = { > - .type = PERF_TYPE_HARDWARE, > - .config = PERF_COUNT_HW_CPU_CYCLES, > - .size = sizeof(struct perf_event_attr), > - .pinned = 1, > - .disabled = 1, > -}; > - > -static void nmi_timer_callback(struct perf_event *event, > - struct perf_sample_data *data, > - struct pt_regs *regs) > -{ > - event->hw.interrupts = 0; /* don't throttle interrupts */ > - oprofile_add_sample(regs, 0); > -} > - > -static int nmi_timer_start_cpu(int cpu) > -{ > - struct perf_event *event = per_cpu(nmi_timer_events, cpu); > - > - if (!event) { > - event = perf_event_create_kernel_counter(&nmi_timer_attr, cpu, NULL, > - nmi_timer_callback, NULL); > - if (IS_ERR(event)) > - return PTR_ERR(event); > - per_cpu(nmi_timer_events, cpu) = event; > - } > - > - if (event && ctr_running) > - perf_event_enable(event); > - > - return 0; > -} > - > -static void nmi_timer_stop_cpu(int cpu) > -{ > - struct perf_event *event = per_cpu(nmi_timer_events, cpu); > - > - if (event && ctr_running) > - perf_event_disable(event); > -} > - > -static int nmi_timer_cpu_online(unsigned int cpu) > -{ > - nmi_timer_start_cpu(cpu); > - return 0; > -} > -static int nmi_timer_cpu_predown(unsigned int cpu) > -{ > - nmi_timer_stop_cpu(cpu); > - return 0; > -} > - > -static int nmi_timer_start(void) > -{ > - int cpu; > - > - get_online_cpus(); > - ctr_running = 1; > - for_each_online_cpu(cpu) > - nmi_timer_start_cpu(cpu); > - put_online_cpus(); > - > - return 0; > -} > - > -static void nmi_timer_stop(void) > -{ > - int cpu; > - > - get_online_cpus(); > - for_each_online_cpu(cpu) > - nmi_timer_stop_cpu(cpu); > - ctr_running = 0; > - put_online_cpus(); > -} > - > -static enum cpuhp_state hp_online; > - > -static void nmi_timer_shutdown(void) > -{ > - struct perf_event *event; > - int cpu; > - > - cpuhp_remove_state(hp_online); > - for_each_possible_cpu(cpu) { > - event = per_cpu(nmi_timer_events, cpu); > - if (!event) > - continue; > - perf_event_disable(event); > - per_cpu(nmi_timer_events, cpu) = NULL; > - perf_event_release_kernel(event); > - } > -} > - > -static int nmi_timer_setup(void) > -{ > - int err; > - u64 period; > - > - /* clock cycles per tick: */ > - period = (u64)cpu_khz * 1000; > - do_div(period, HZ); > - nmi_timer_attr.sample_period = period; > - > - err = cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "oprofile/nmi:online", > - nmi_timer_cpu_online, nmi_timer_cpu_predown); > - if (err < 0) { > - nmi_timer_shutdown(); > - return err; > - } > - hp_online = err; > - return 0; > -} > - > -int __init op_nmi_timer_init(struct oprofile_operations *ops) > -{ > - int err = 0; > - > - err = nmi_timer_setup(); > - if (err) > - return err; > - nmi_timer_shutdown(); /* only check, don't alloc */ > - > - ops->create_files = NULL; > - ops->setup = nmi_timer_setup; > - ops->shutdown = nmi_timer_shutdown; > - ops->start = nmi_timer_start; > - ops->stop = nmi_timer_stop; > - ops->cpu_type = "timer"; > - > - printk(KERN_INFO "oprofile: using NMI timer interrupt.\n"); > - > - return 0; > -} > - > -#endif > diff --git a/drivers/oprofile/oprof.c b/drivers/oprofile/oprof.c > deleted file mode 100644 > index ed2c3ec07024..000000000000 > --- a/drivers/oprofile/oprof.c > +++ /dev/null > @@ -1,286 +0,0 @@ > -/** > - * @file oprof.c > - * > - * @remark Copyright 2002 OProfile authors > - * @remark Read the file COPYING > - * > - * @author John Levon <le...@mo...> > - */ > - > -#include <linux/kernel.h> > -#include <linux/module.h> > -#include <linux/init.h> > -#include <linux/oprofile.h> > -#include <linux/moduleparam.h> > -#include <linux/workqueue.h> > -#include <linux/time.h> > -#include <linux/mutex.h> > - > -#include "oprof.h" > -#include "event_buffer.h" > -#include "cpu_buffer.h" > -#include "buffer_sync.h" > -#include "oprofile_stats.h" > - > -struct oprofile_operations oprofile_ops; > - > -unsigned long oprofile_started; > -unsigned long oprofile_backtrace_depth; > -static unsigned long is_setup; > -static DEFINE_MUTEX(start_mutex); > - > -/* timer > - 0 - use performance monitoring hardware if available > - 1 - use the timer int mechanism regardless > - */ > -static int timer = 0; > - > -int oprofile_setup(void) > -{ > - int err; > - > - mutex_lock(&start_mutex); > - > - if ((err = alloc_cpu_buffers())) > - goto out; > - > - if ((err = alloc_event_buffer())) > - goto out1; > - > - if (oprofile_ops.setup && (err = oprofile_ops.setup())) > - goto out2; > - > - /* Note even though this starts part of the > - * profiling overhead, it's necessary to prevent > - * us missing task deaths and eventually oopsing > - * when trying to process the event buffer. > - */ > - if (oprofile_ops.sync_start) { > - int sync_ret = oprofile_ops.sync_start(); > - switch (sync_ret) { > - case 0: > - goto post_sync; > - case 1: > - goto do_generic; > - case -1: > - goto out3; > - default: > - goto out3; > - } > - } > -do_generic: > - if ((err = sync_start())) > - goto out3; > - > -post_sync: > - is_setup = 1; > - mutex_unlock(&start_mutex); > - return 0; > - > -out3: > - if (oprofile_ops.shutdown) > - oprofile_ops.shutdown(); > -out2: > - free_event_buffer(); > -out1: > - free_cpu_buffers(); > -out: > - mutex_unlock(&start_mutex); > - return err; > -} > - > -#ifdef CONFIG_OPROFILE_EVENT_MULTIPLEX > - > -static void switch_worker(struct work_struct *work); > -static DECLARE_DELAYED_WORK(switch_work, switch_worker); > - > -static void start_switch_worker(void) > -{ > - if (oprofile_ops.switch_events) > - schedule_delayed_work(&switch_work, oprofile_time_slice); > -} > - > -static void stop_switch_worker(void) > -{ > - cancel_delayed_work_sync(&switch_work); > -} > - > -static void switch_worker(struct work_struct *work) > -{ > - if (oprofile_ops.switch_events()) > - return; > - > - atomic_inc(&oprofile_stats.multiplex_counter); > - start_switch_worker(); > -} > - > -/* User inputs in ms, converts to jiffies */ > -int oprofile_set_timeout(unsigned long val_msec) > -{ > - int err = 0; > - unsigned long time_slice; > - > - mutex_lock(&start_mutex); > - > - if (oprofile_started) { > - err = -EBUSY; > - goto out; > - } > - > - if (!oprofile_ops.switch_events) { > - err = -EINVAL; > - goto out; > - } > - > - time_slice = msecs_to_jiffies(val_msec); > - if (time_slice == MAX_JIFFY_OFFSET) { > - err = -EINVAL; > - goto out; > - } > - > - oprofile_time_slice = time_slice; > - > -out: > - mutex_unlock(&start_mutex); > - return err; > - > -} > - > -#else > - > -static inline void start_switch_worker(void) { } > -static inline void stop_switch_worker(void) { } > - > -#endif > - > -/* Actually start profiling (echo 1>/dev/oprofile/enable) */ > -int oprofile_start(void) > -{ > - int err = -EINVAL; > - > - mutex_lock(&start_mutex); > - > - if (!is_setup) > - goto out; > - > - err = 0; > - > - if (oprofile_started) > - goto out; > - > - oprofile_reset_stats(); > - > - if ((err = oprofile_ops.start())) > - goto out; > - > - start_switch_worker(); > - > - oprofile_started = 1; > -out: > - mutex_unlock(&start_mutex); > - return err; > -} > - > - > -/* echo 0>/dev/oprofile/enable */ > -void oprofile_stop(void) > -{ > - mutex_lock(&start_mutex); > - if (!oprofile_started) > - goto out; > - oprofile_ops.stop(); > - oprofile_started = 0; > - > - stop_switch_worker(); > - > - /* wake up the daemon to read what remains */ > - wake_up_buffer_waiter(); > -out: > - mutex_unlock(&start_mutex); > -} > - > - > -void oprofile_shutdown(void) > -{ > - mutex_lock(&start_mutex); > - if (oprofile_ops.sync_stop) { > - int sync_ret = oprofile_ops.sync_stop(); > - switch (sync_ret) { > - case 0: > - goto post_sync; > - case 1: > - goto do_generic; > - default: > - goto post_sync; > - } > - } > -do_generic: > - sync_stop(); > -post_sync: > - if (oprofile_ops.shutdown) > - oprofile_ops.shutdown(); > - is_setup = 0; > - free_event_buffer(); > - free_cpu_buffers(); > - mutex_unlock(&start_mutex); > -} > - > -int oprofile_set_ulong(unsigned long *addr, unsigned long val) > -{ > - int err = -EBUSY; > - > - mutex_lock(&start_mutex); > - if (!oprofile_started) { > - *addr = val; > - err = 0; > - } > - mutex_unlock(&start_mutex); > - > - return err; > -} > - > -static int timer_mode; > - > -static int __init oprofile_init(void) > -{ > - int err; > - > - /* always init architecture to setup backtrace support */ > - timer_mode = 0; > - err = oprofile_arch_init(&oprofile_ops); > - if (!err) { > - if (!timer && !oprofilefs_register()) > - return 0; > - oprofile_arch_exit(); > - } > - > - /* setup timer mode: */ > - timer_mode = 1; > - /* no nmi timer mode if oprofile.timer is set */ > - if (timer || op_nmi_timer_init(&oprofile_ops)) { > - err = oprofile_timer_init(&oprofile_ops); > - if (err) > - return err; > - } > - > - return oprofilefs_register(); > -} > - > - > -static void __exit oprofile_exit(void) > -{ > - oprofilefs_unregister(); > - if (!timer_mode) > - oprofile_arch_exit(); > -} > - > - > -module_init(oprofile_init); > -module_exit(oprofile_exit); > - > -module_param_named(timer, timer, int, 0644); > -MODULE_PARM_DESC(timer, "force use of timer interrupt"); > - > -MODULE_LICENSE("GPL"); > -MODULE_AUTHOR("John Levon <le...@mo...>"); > -MODULE_DESCRIPTION("OProfile system profiler"); > diff --git a/drivers/oprofile/oprof.h b/drivers/oprofile/oprof.h > deleted file mode 100644 > index d5412060ab0f..000000000000 > --- a/drivers/oprofile/oprof.h > +++ /dev/null > @@ -1,50 +0,0 @@ > -/** > - * @file oprof.h > - * > - * @remark Copyright 2002 OProfile authors > - * @remark Read the file COPYING > - * > - * @author John Levon <le...@mo...> > - */ > - > -#ifndef OPROF_H > -#define OPROF_H > - > -int oprofile_setup(void); > -void oprofile_shutdown(void); > - > -int oprofilefs_register(void); > -void oprofilefs_unregister(void); > - > -int oprofile_start(void); > -void oprofile_stop(void); > - > -struct oprofile_operations; > - > -extern unsigned long oprofile_buffer_size; > -extern unsigned long oprofile_cpu_buffer_size; > -extern unsigned long oprofile_buffer_watershed; > -extern unsigned long oprofile_time_slice; > - > -extern struct oprofile_operations oprofile_ops; > -extern unsigned long oprofile_started; > -extern unsigned long oprofile_backtrace_depth; > - > -struct dentry; > - > -void oprofile_create_files(struct dentry *root); > -int oprofile_timer_init(struct oprofile_operations *ops); > -#ifdef CONFIG_OPROFILE_NMI_TIMER > -int op_nmi_timer_init(struct oprofile_operations *ops); > -#else > -static inline int op_nmi_timer_init(struct oprofile_operations *ops) > -{ > - return -ENODEV; > -} > -#endif > - > -... [truncated message content] |