mirror of
https://github.com/a52xq-dev/kernel.git
synced 2026-10-18 21:58:11 +07:00
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (25 commits) perf: Fix SIGIO handling perf top: Don't stop if no kernel symtab is found perf top: Handle kptr_restrict perf top: Remove unused macro perf events: initialize fd array to -1 instead of 0 perf tools: Make sure kptr_restrict warnings fit 80 col terms perf tools: Fix build on older systems perf symbols: Handle /proc/sys/kernel/kptr_restrict perf: Remove duplicate headers ftrace: Add internal recursive checks tracing: Update btrfs's tracepoints to use u64 interface tracing: Add __print_symbolic_u64 to avoid warnings on 32bit machine ftrace: Set ops->flag to enabled even on static function tracing tracing: Have event with function tracer check error return ftrace: Have ftrace_startup() return failure code jump_label: Check entries limit in __jump_label_update ftrace/recordmcount: Avoid STT_FUNC symbols as base on ARM scripts/tags.sh: Add magic for trace-events for etags too scripts/tags.sh: Fix ctags for DEFINE_EVENT() x86/ftrace: Fix compiler warning in ftrace.c ...
This commit is contained in:
Linus Torvalds
commit
c4a227d89f
34 changed files with 359 additions and 106 deletions
|
|
@ -16,7 +16,7 @@ static int validate_memory_access_address(unsigned long addr, int size)
|
|||
return bfin_mem_access_type(addr, size);
|
||||
}
|
||||
|
||||
long probe_kernel_read(void *dst, void *src, size_t size)
|
||||
long probe_kernel_read(void *dst, const void *src, size_t size)
|
||||
{
|
||||
unsigned long lsrc = (unsigned long)src;
|
||||
int mem_type;
|
||||
|
|
@ -55,7 +55,7 @@ long probe_kernel_read(void *dst, void *src, size_t size)
|
|||
return -EFAULT;
|
||||
}
|
||||
|
||||
long probe_kernel_write(void *dst, void *src, size_t size)
|
||||
long probe_kernel_write(void *dst, const void *src, size_t size)
|
||||
{
|
||||
unsigned long ldst = (unsigned long)dst;
|
||||
int mem_type;
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
* using the stura instruction.
|
||||
* Returns the number of bytes copied or -EFAULT.
|
||||
*/
|
||||
static long probe_kernel_write_odd(void *dst, void *src, size_t size)
|
||||
static long probe_kernel_write_odd(void *dst, const void *src, size_t size)
|
||||
{
|
||||
unsigned long count, aligned;
|
||||
int offset, mask;
|
||||
|
|
@ -45,7 +45,7 @@ static long probe_kernel_write_odd(void *dst, void *src, size_t size)
|
|||
return rc ? rc : count;
|
||||
}
|
||||
|
||||
long probe_kernel_write(void *dst, void *src, size_t size)
|
||||
long probe_kernel_write(void *dst, const void *src, size_t size)
|
||||
{
|
||||
long copied = 0;
|
||||
|
||||
|
|
|
|||
|
|
@ -123,7 +123,7 @@ static unsigned char *ftrace_call_replace(unsigned long ip, unsigned long addr)
|
|||
static atomic_t nmi_running = ATOMIC_INIT(0);
|
||||
static int mod_code_status; /* holds return value of text write */
|
||||
static void *mod_code_ip; /* holds the IP to write to */
|
||||
static void *mod_code_newcode; /* holds the text to write to the IP */
|
||||
static const void *mod_code_newcode; /* holds the text to write to the IP */
|
||||
|
||||
static unsigned nmi_wait_count;
|
||||
static atomic_t nmi_update_count = ATOMIC_INIT(0);
|
||||
|
|
@ -225,7 +225,7 @@ within(unsigned long addr, unsigned long start, unsigned long end)
|
|||
}
|
||||
|
||||
static int
|
||||
do_ftrace_mod_code(unsigned long ip, void *new_code)
|
||||
do_ftrace_mod_code(unsigned long ip, const void *new_code)
|
||||
{
|
||||
/*
|
||||
* On x86_64, kernel text mappings are mapped read-only with
|
||||
|
|
@ -266,8 +266,8 @@ static const unsigned char *ftrace_nop_replace(void)
|
|||
}
|
||||
|
||||
static int
|
||||
ftrace_modify_code(unsigned long ip, unsigned char *old_code,
|
||||
unsigned char *new_code)
|
||||
ftrace_modify_code(unsigned long ip, unsigned const char *old_code,
|
||||
unsigned const char *new_code)
|
||||
{
|
||||
unsigned char replaced[MCOUNT_INSN_SIZE];
|
||||
|
||||
|
|
@ -301,7 +301,7 @@ ftrace_modify_code(unsigned long ip, unsigned char *old_code,
|
|||
int ftrace_make_nop(struct module *mod,
|
||||
struct dyn_ftrace *rec, unsigned long addr)
|
||||
{
|
||||
unsigned char *new, *old;
|
||||
unsigned const char *new, *old;
|
||||
unsigned long ip = rec->ip;
|
||||
|
||||
old = ftrace_call_replace(ip, addr);
|
||||
|
|
@ -312,7 +312,7 @@ int ftrace_make_nop(struct module *mod,
|
|||
|
||||
int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr)
|
||||
{
|
||||
unsigned char *new, *old;
|
||||
unsigned const char *new, *old;
|
||||
unsigned long ip = rec->ip;
|
||||
|
||||
old = ftrace_nop_replace();
|
||||
|
|
|
|||
|
|
@ -316,16 +316,23 @@ static void op_amd_stop_ibs(void)
|
|||
wrmsrl(MSR_AMD64_IBSOPCTL, 0);
|
||||
}
|
||||
|
||||
static inline int eilvt_is_available(int offset)
|
||||
static inline int get_eilvt(int offset)
|
||||
{
|
||||
/* check if we may assign a vector */
|
||||
return !setup_APIC_eilvt(offset, 0, APIC_EILVT_MSG_NMI, 1);
|
||||
}
|
||||
|
||||
static inline int put_eilvt(int offset)
|
||||
{
|
||||
return !setup_APIC_eilvt(offset, 0, 0, 1);
|
||||
}
|
||||
|
||||
static inline int ibs_eilvt_valid(void)
|
||||
{
|
||||
int offset;
|
||||
u64 val;
|
||||
int valid = 0;
|
||||
|
||||
preempt_disable();
|
||||
|
||||
rdmsrl(MSR_AMD64_IBSCTL, val);
|
||||
offset = val & IBSCTL_LVT_OFFSET_MASK;
|
||||
|
|
@ -333,16 +340,20 @@ static inline int ibs_eilvt_valid(void)
|
|||
if (!(val & IBSCTL_LVT_OFFSET_VALID)) {
|
||||
pr_err(FW_BUG "cpu %d, invalid IBS interrupt offset %d (MSR%08X=0x%016llx)\n",
|
||||
smp_processor_id(), offset, MSR_AMD64_IBSCTL, val);
|
||||
return 0;
|
||||
goto out;
|
||||
}
|
||||
|
||||
if (!eilvt_is_available(offset)) {
|
||||
if (!get_eilvt(offset)) {
|
||||
pr_err(FW_BUG "cpu %d, IBS interrupt offset %d not available (MSR%08X=0x%016llx)\n",
|
||||
smp_processor_id(), offset, MSR_AMD64_IBSCTL, val);
|
||||
return 0;
|
||||
goto out;
|
||||
}
|
||||
|
||||
return 1;
|
||||
valid = 1;
|
||||
out:
|
||||
preempt_enable();
|
||||
|
||||
return valid;
|
||||
}
|
||||
|
||||
static inline int get_ibs_offset(void)
|
||||
|
|
@ -600,67 +611,69 @@ static int setup_ibs_ctl(int ibs_eilvt_off)
|
|||
|
||||
static int force_ibs_eilvt_setup(void)
|
||||
{
|
||||
int i;
|
||||
int offset;
|
||||
int ret;
|
||||
|
||||
/* find the next free available EILVT entry */
|
||||
for (i = 1; i < 4; i++) {
|
||||
if (!eilvt_is_available(i))
|
||||
continue;
|
||||
ret = setup_ibs_ctl(i);
|
||||
if (ret)
|
||||
return ret;
|
||||
pr_err(FW_BUG "using offset %d for IBS interrupts\n", i);
|
||||
return 0;
|
||||
/*
|
||||
* find the next free available EILVT entry, skip offset 0,
|
||||
* pin search to this cpu
|
||||
*/
|
||||
preempt_disable();
|
||||
for (offset = 1; offset < APIC_EILVT_NR_MAX; offset++) {
|
||||
if (get_eilvt(offset))
|
||||
break;
|
||||
}
|
||||
preempt_enable();
|
||||
|
||||
if (offset == APIC_EILVT_NR_MAX) {
|
||||
printk(KERN_DEBUG "No EILVT entry available\n");
|
||||
return -EBUSY;
|
||||
}
|
||||
|
||||
printk(KERN_DEBUG "No EILVT entry available\n");
|
||||
|
||||
return -EBUSY;
|
||||
}
|
||||
|
||||
static int __init_ibs_nmi(void)
|
||||
{
|
||||
int ret;
|
||||
|
||||
if (ibs_eilvt_valid())
|
||||
return 0;
|
||||
|
||||
ret = force_ibs_eilvt_setup();
|
||||
ret = setup_ibs_ctl(offset);
|
||||
if (ret)
|
||||
return ret;
|
||||
goto out;
|
||||
|
||||
if (!ibs_eilvt_valid())
|
||||
return -EFAULT;
|
||||
if (!ibs_eilvt_valid()) {
|
||||
ret = -EFAULT;
|
||||
goto out;
|
||||
}
|
||||
|
||||
pr_err(FW_BUG "using offset %d for IBS interrupts\n", offset);
|
||||
pr_err(FW_BUG "workaround enabled for IBS LVT offset\n");
|
||||
|
||||
return 0;
|
||||
out:
|
||||
preempt_disable();
|
||||
put_eilvt(offset);
|
||||
preempt_enable();
|
||||
return ret;
|
||||
}
|
||||
|
||||
/*
|
||||
* check and reserve APIC extended interrupt LVT offset for IBS if
|
||||
* available
|
||||
*
|
||||
* init_ibs() preforms implicitly cpu-local operations, so pin this
|
||||
* thread to its current CPU
|
||||
*/
|
||||
|
||||
static void init_ibs(void)
|
||||
{
|
||||
preempt_disable();
|
||||
|
||||
ibs_caps = get_ibs_caps();
|
||||
|
||||
if (!ibs_caps)
|
||||
return;
|
||||
|
||||
if (ibs_eilvt_valid())
|
||||
goto out;
|
||||
|
||||
if (__init_ibs_nmi() < 0)
|
||||
ibs_caps = 0;
|
||||
else
|
||||
printk(KERN_INFO "oprofile: AMD IBS detected (0x%08x)\n", ibs_caps);
|
||||
if (!force_ibs_eilvt_setup())
|
||||
goto out;
|
||||
|
||||
/* Failed to setup ibs */
|
||||
ibs_caps = 0;
|
||||
return;
|
||||
|
||||
out:
|
||||
preempt_enable();
|
||||
printk(KERN_INFO "oprofile: AMD IBS detected (0x%08x)\n", ibs_caps);
|
||||
}
|
||||
|
||||
static int (*create_arch_files)(struct super_block *sb, struct dentry *root);
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
#define EVENT_BUFFER_H
|
||||
|
||||
#include <linux/types.h>
|
||||
#include <asm/mutex.h>
|
||||
#include <linux/mutex.h>
|
||||
|
||||
int alloc_event_buffer(void);
|
||||
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
#include <linux/moduleparam.h>
|
||||
#include <linux/workqueue.h>
|
||||
#include <linux/time.h>
|
||||
#include <asm/mutex.h>
|
||||
#include <linux/mutex.h>
|
||||
|
||||
#include "oprof.h"
|
||||
#include "event_buffer.h"
|
||||
|
|
|
|||
|
|
@ -16,6 +16,11 @@ struct trace_print_flags {
|
|||
const char *name;
|
||||
};
|
||||
|
||||
struct trace_print_flags_u64 {
|
||||
unsigned long long mask;
|
||||
const char *name;
|
||||
};
|
||||
|
||||
const char *ftrace_print_flags_seq(struct trace_seq *p, const char *delim,
|
||||
unsigned long flags,
|
||||
const struct trace_print_flags *flag_array);
|
||||
|
|
@ -23,6 +28,13 @@ const char *ftrace_print_flags_seq(struct trace_seq *p, const char *delim,
|
|||
const char *ftrace_print_symbols_seq(struct trace_seq *p, unsigned long val,
|
||||
const struct trace_print_flags *symbol_array);
|
||||
|
||||
#if BITS_PER_LONG == 32
|
||||
const char *ftrace_print_symbols_seq_u64(struct trace_seq *p,
|
||||
unsigned long long val,
|
||||
const struct trace_print_flags_u64
|
||||
*symbol_array);
|
||||
#endif
|
||||
|
||||
const char *ftrace_print_hex_seq(struct trace_seq *p,
|
||||
const unsigned char *buf, int len);
|
||||
|
||||
|
|
|
|||
|
|
@ -1546,7 +1546,7 @@ struct task_struct {
|
|||
#ifdef CONFIG_TRACING
|
||||
/* state flags for use by tracers */
|
||||
unsigned long trace;
|
||||
/* bitmask of trace recursion */
|
||||
/* bitmask and counter of trace recursion */
|
||||
unsigned long trace_recursion;
|
||||
#endif /* CONFIG_TRACING */
|
||||
#ifdef CONFIG_CGROUP_MEM_RES_CTLR /* memcg uses this to do batch job */
|
||||
|
|
|
|||
|
|
@ -93,8 +93,8 @@ static inline unsigned long __copy_from_user_nocache(void *to,
|
|||
* Safely read from address @src to the buffer at @dst. If a kernel fault
|
||||
* happens, handle that and return -EFAULT.
|
||||
*/
|
||||
extern long probe_kernel_read(void *dst, void *src, size_t size);
|
||||
extern long __probe_kernel_read(void *dst, void *src, size_t size);
|
||||
extern long probe_kernel_read(void *dst, const void *src, size_t size);
|
||||
extern long __probe_kernel_read(void *dst, const void *src, size_t size);
|
||||
|
||||
/*
|
||||
* probe_kernel_write(): safely attempt to write to a location
|
||||
|
|
@ -105,7 +105,7 @@ extern long __probe_kernel_read(void *dst, void *src, size_t size);
|
|||
* Safely write to address @dst from the buffer at @src. If a kernel fault
|
||||
* happens, handle that and return -EFAULT.
|
||||
*/
|
||||
extern long notrace probe_kernel_write(void *dst, void *src, size_t size);
|
||||
extern long notrace __probe_kernel_write(void *dst, void *src, size_t size);
|
||||
extern long notrace probe_kernel_write(void *dst, const void *src, size_t size);
|
||||
extern long notrace __probe_kernel_write(void *dst, const void *src, size_t size);
|
||||
|
||||
#endif /* __LINUX_UACCESS_H__ */
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ struct extent_buffer;
|
|||
{ BTRFS_SHARED_DATA_REF_KEY, "SHARED_DATA_REF" })
|
||||
|
||||
#define __show_root_type(obj) \
|
||||
__print_symbolic(obj, \
|
||||
__print_symbolic_u64(obj, \
|
||||
{ BTRFS_ROOT_TREE_OBJECTID, "ROOT_TREE" }, \
|
||||
{ BTRFS_EXTENT_TREE_OBJECTID, "EXTENT_TREE" }, \
|
||||
{ BTRFS_CHUNK_TREE_OBJECTID, "CHUNK_TREE" }, \
|
||||
|
|
@ -125,7 +125,7 @@ DEFINE_EVENT(btrfs__inode, btrfs_inode_evict,
|
|||
);
|
||||
|
||||
#define __show_map_type(type) \
|
||||
__print_symbolic(type, \
|
||||
__print_symbolic_u64(type, \
|
||||
{ EXTENT_MAP_LAST_BYTE, "LAST_BYTE" }, \
|
||||
{ EXTENT_MAP_HOLE, "HOLE" }, \
|
||||
{ EXTENT_MAP_INLINE, "INLINE" }, \
|
||||
|
|
|
|||
|
|
@ -205,6 +205,19 @@
|
|||
ftrace_print_symbols_seq(p, value, symbols); \
|
||||
})
|
||||
|
||||
#undef __print_symbolic_u64
|
||||
#if BITS_PER_LONG == 32
|
||||
#define __print_symbolic_u64(value, symbol_array...) \
|
||||
({ \
|
||||
static const struct trace_print_flags_u64 symbols[] = \
|
||||
{ symbol_array, { -1, NULL } }; \
|
||||
ftrace_print_symbols_seq_u64(p, value, symbols); \
|
||||
})
|
||||
#else
|
||||
#define __print_symbolic_u64(value, symbol_array...) \
|
||||
__print_symbolic(value, symbol_array)
|
||||
#endif
|
||||
|
||||
#undef __print_hex
|
||||
#define __print_hex(buf, buf_len) ftrace_print_hex_seq(p, buf, buf_len)
|
||||
|
||||
|
|
|
|||
|
|
@ -5028,6 +5028,14 @@ static int __perf_event_overflow(struct perf_event *event, int nmi,
|
|||
else
|
||||
perf_event_output(event, nmi, data, regs);
|
||||
|
||||
if (event->fasync && event->pending_kill) {
|
||||
if (nmi) {
|
||||
event->pending_wakeup = 1;
|
||||
irq_work_queue(&event->pending);
|
||||
} else
|
||||
perf_event_wakeup(event);
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -105,9 +105,12 @@ static int __jump_label_text_reserved(struct jump_entry *iter_start,
|
|||
}
|
||||
|
||||
static void __jump_label_update(struct jump_label_key *key,
|
||||
struct jump_entry *entry, int enable)
|
||||
struct jump_entry *entry,
|
||||
struct jump_entry *stop, int enable)
|
||||
{
|
||||
for (; entry->key == (jump_label_t)(unsigned long)key; entry++) {
|
||||
for (; (entry < stop) &&
|
||||
(entry->key == (jump_label_t)(unsigned long)key);
|
||||
entry++) {
|
||||
/*
|
||||
* entry->code set to 0 invalidates module init text sections
|
||||
* kernel_text_address() verifies we are not in core kernel
|
||||
|
|
@ -181,7 +184,11 @@ static void __jump_label_mod_update(struct jump_label_key *key, int enable)
|
|||
struct jump_label_mod *mod = key->next;
|
||||
|
||||
while (mod) {
|
||||
__jump_label_update(key, mod->entries, enable);
|
||||
struct module *m = mod->mod;
|
||||
|
||||
__jump_label_update(key, mod->entries,
|
||||
m->jump_entries + m->num_jump_entries,
|
||||
enable);
|
||||
mod = mod->next;
|
||||
}
|
||||
}
|
||||
|
|
@ -245,7 +252,8 @@ static int jump_label_add_module(struct module *mod)
|
|||
key->next = jlm;
|
||||
|
||||
if (jump_label_enabled(key))
|
||||
__jump_label_update(key, iter, JUMP_LABEL_ENABLE);
|
||||
__jump_label_update(key, iter, iter_stop,
|
||||
JUMP_LABEL_ENABLE);
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
|
@ -371,7 +379,7 @@ static void jump_label_update(struct jump_label_key *key, int enable)
|
|||
|
||||
/* if there are no users, entry can be NULL */
|
||||
if (entry)
|
||||
__jump_label_update(key, entry, enable);
|
||||
__jump_label_update(key, entry, __stop___jump_table, enable);
|
||||
|
||||
#ifdef CONFIG_MODULES
|
||||
__jump_label_mod_update(key, enable);
|
||||
|
|
|
|||
|
|
@ -109,12 +109,18 @@ ftrace_ops_list_func(unsigned long ip, unsigned long parent_ip);
|
|||
static void ftrace_global_list_func(unsigned long ip,
|
||||
unsigned long parent_ip)
|
||||
{
|
||||
struct ftrace_ops *op = rcu_dereference_raw(ftrace_global_list); /*see above*/
|
||||
struct ftrace_ops *op;
|
||||
|
||||
if (unlikely(trace_recursion_test(TRACE_GLOBAL_BIT)))
|
||||
return;
|
||||
|
||||
trace_recursion_set(TRACE_GLOBAL_BIT);
|
||||
op = rcu_dereference_raw(ftrace_global_list); /*see above*/
|
||||
while (op != &ftrace_list_end) {
|
||||
op->func(ip, parent_ip);
|
||||
op = rcu_dereference_raw(op->next); /*see above*/
|
||||
};
|
||||
trace_recursion_clear(TRACE_GLOBAL_BIT);
|
||||
}
|
||||
|
||||
static void ftrace_pid_func(unsigned long ip, unsigned long parent_ip)
|
||||
|
|
@ -1638,12 +1644,12 @@ static void ftrace_startup_enable(int command)
|
|||
ftrace_run_update_code(command);
|
||||
}
|
||||
|
||||
static void ftrace_startup(struct ftrace_ops *ops, int command)
|
||||
static int ftrace_startup(struct ftrace_ops *ops, int command)
|
||||
{
|
||||
bool hash_enable = true;
|
||||
|
||||
if (unlikely(ftrace_disabled))
|
||||
return;
|
||||
return -ENODEV;
|
||||
|
||||
ftrace_start_up++;
|
||||
command |= FTRACE_ENABLE_CALLS;
|
||||
|
|
@ -1662,6 +1668,8 @@ static void ftrace_startup(struct ftrace_ops *ops, int command)
|
|||
ftrace_hash_rec_enable(ops, 1);
|
||||
|
||||
ftrace_startup_enable(command);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void ftrace_shutdown(struct ftrace_ops *ops, int command)
|
||||
|
|
@ -2501,7 +2509,7 @@ static void __enable_ftrace_function_probe(void)
|
|||
|
||||
ret = __register_ftrace_function(&trace_probe_ops);
|
||||
if (!ret)
|
||||
ftrace_startup(&trace_probe_ops, 0);
|
||||
ret = ftrace_startup(&trace_probe_ops, 0);
|
||||
|
||||
ftrace_probe_registered = 1;
|
||||
}
|
||||
|
|
@ -3466,7 +3474,11 @@ device_initcall(ftrace_nodyn_init);
|
|||
static inline int ftrace_init_dyn_debugfs(struct dentry *d_tracer) { return 0; }
|
||||
static inline void ftrace_startup_enable(int command) { }
|
||||
/* Keep as macros so we do not need to define the commands */
|
||||
# define ftrace_startup(ops, command) do { } while (0)
|
||||
# define ftrace_startup(ops, command) \
|
||||
({ \
|
||||
(ops)->flags |= FTRACE_OPS_FL_ENABLED; \
|
||||
0; \
|
||||
})
|
||||
# define ftrace_shutdown(ops, command) do { } while (0)
|
||||
# define ftrace_startup_sysctl() do { } while (0)
|
||||
# define ftrace_shutdown_sysctl() do { } while (0)
|
||||
|
|
@ -3484,6 +3496,10 @@ ftrace_ops_list_func(unsigned long ip, unsigned long parent_ip)
|
|||
{
|
||||
struct ftrace_ops *op;
|
||||
|
||||
if (unlikely(trace_recursion_test(TRACE_INTERNAL_BIT)))
|
||||
return;
|
||||
|
||||
trace_recursion_set(TRACE_INTERNAL_BIT);
|
||||
/*
|
||||
* Some of the ops may be dynamically allocated,
|
||||
* they must be freed after a synchronize_sched().
|
||||
|
|
@ -3496,6 +3512,7 @@ ftrace_ops_list_func(unsigned long ip, unsigned long parent_ip)
|
|||
op = rcu_dereference_raw(op->next);
|
||||
};
|
||||
preempt_enable_notrace();
|
||||
trace_recursion_clear(TRACE_INTERNAL_BIT);
|
||||
}
|
||||
|
||||
static void clear_ftrace_swapper(void)
|
||||
|
|
@ -3799,7 +3816,7 @@ int register_ftrace_function(struct ftrace_ops *ops)
|
|||
|
||||
ret = __register_ftrace_function(ops);
|
||||
if (!ret)
|
||||
ftrace_startup(ops, 0);
|
||||
ret = ftrace_startup(ops, 0);
|
||||
|
||||
|
||||
out_unlock:
|
||||
|
|
@ -4045,7 +4062,7 @@ int register_ftrace_graph(trace_func_graph_ret_t retfunc,
|
|||
ftrace_graph_return = retfunc;
|
||||
ftrace_graph_entry = entryfunc;
|
||||
|
||||
ftrace_startup(&global_ops, FTRACE_START_FUNC_RET);
|
||||
ret = ftrace_startup(&global_ops, FTRACE_START_FUNC_RET);
|
||||
|
||||
out:
|
||||
mutex_unlock(&ftrace_lock);
|
||||
|
|
|
|||
|
|
@ -2216,7 +2216,7 @@ static noinline void trace_recursive_fail(void)
|
|||
|
||||
printk_once(KERN_WARNING "Tracing recursion: depth[%ld]:"
|
||||
"HC[%lu]:SC[%lu]:NMI[%lu]\n",
|
||||
current->trace_recursion,
|
||||
trace_recursion_buffer(),
|
||||
hardirq_count() >> HARDIRQ_SHIFT,
|
||||
softirq_count() >> SOFTIRQ_SHIFT,
|
||||
in_nmi());
|
||||
|
|
@ -2226,9 +2226,9 @@ static noinline void trace_recursive_fail(void)
|
|||
|
||||
static inline int trace_recursive_lock(void)
|
||||
{
|
||||
current->trace_recursion++;
|
||||
trace_recursion_inc();
|
||||
|
||||
if (likely(current->trace_recursion < TRACE_RECURSIVE_DEPTH))
|
||||
if (likely(trace_recursion_buffer() < TRACE_RECURSIVE_DEPTH))
|
||||
return 0;
|
||||
|
||||
trace_recursive_fail();
|
||||
|
|
@ -2238,9 +2238,9 @@ static inline int trace_recursive_lock(void)
|
|||
|
||||
static inline void trace_recursive_unlock(void)
|
||||
{
|
||||
WARN_ON_ONCE(!current->trace_recursion);
|
||||
WARN_ON_ONCE(!trace_recursion_buffer());
|
||||
|
||||
current->trace_recursion--;
|
||||
trace_recursion_dec();
|
||||
}
|
||||
|
||||
#else
|
||||
|
|
|
|||
|
|
@ -784,4 +784,19 @@ extern const char *__stop___trace_bprintk_fmt[];
|
|||
FTRACE_ENTRY(call, struct_name, id, PARAMS(tstruct), PARAMS(print))
|
||||
#include "trace_entries.h"
|
||||
|
||||
/* Only current can touch trace_recursion */
|
||||
#define trace_recursion_inc() do { (current)->trace_recursion++; } while (0)
|
||||
#define trace_recursion_dec() do { (current)->trace_recursion--; } while (0)
|
||||
|
||||
/* Ring buffer has the 10 LSB bits to count */
|
||||
#define trace_recursion_buffer() ((current)->trace_recursion & 0x3ff)
|
||||
|
||||
/* for function tracing recursion */
|
||||
#define TRACE_INTERNAL_BIT (1<<11)
|
||||
#define TRACE_GLOBAL_BIT (1<<12)
|
||||
|
||||
#define trace_recursion_set(bit) do { (current)->trace_recursion |= (bit); } while (0)
|
||||
#define trace_recursion_clear(bit) do { (current)->trace_recursion &= ~(bit); } while (0)
|
||||
#define trace_recursion_test(bit) ((current)->trace_recursion & (bit))
|
||||
|
||||
#endif /* _LINUX_KERNEL_TRACE_H */
|
||||
|
|
|
|||
|
|
@ -1657,7 +1657,12 @@ static struct ftrace_ops trace_ops __initdata =
|
|||
|
||||
static __init void event_trace_self_test_with_function(void)
|
||||
{
|
||||
register_ftrace_function(&trace_ops);
|
||||
int ret;
|
||||
ret = register_ftrace_function(&trace_ops);
|
||||
if (WARN_ON(ret < 0)) {
|
||||
pr_info("Failed to enable function tracer for event tests\n");
|
||||
return;
|
||||
}
|
||||
pr_info("Running tests again, along with the function tracer\n");
|
||||
event_trace_self_tests();
|
||||
unregister_ftrace_function(&trace_ops);
|
||||
|
|
|
|||
|
|
@ -353,6 +353,33 @@ ftrace_print_symbols_seq(struct trace_seq *p, unsigned long val,
|
|||
}
|
||||
EXPORT_SYMBOL(ftrace_print_symbols_seq);
|
||||
|
||||
#if BITS_PER_LONG == 32
|
||||
const char *
|
||||
ftrace_print_symbols_seq_u64(struct trace_seq *p, unsigned long long val,
|
||||
const struct trace_print_flags_u64 *symbol_array)
|
||||
{
|
||||
int i;
|
||||
const char *ret = p->buffer + p->len;
|
||||
|
||||
for (i = 0; symbol_array[i].name; i++) {
|
||||
|
||||
if (val != symbol_array[i].mask)
|
||||
continue;
|
||||
|
||||
trace_seq_puts(p, symbol_array[i].name);
|
||||
break;
|
||||
}
|
||||
|
||||
if (!p->len)
|
||||
trace_seq_printf(p, "0x%llx", val);
|
||||
|
||||
trace_seq_putc(p, 0);
|
||||
|
||||
return ret;
|
||||
}
|
||||
EXPORT_SYMBOL(ftrace_print_symbols_seq_u64);
|
||||
#endif
|
||||
|
||||
const char *
|
||||
ftrace_print_hex_seq(struct trace_seq *p, const unsigned char *buf, int buf_len)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -415,15 +415,13 @@ static void watchdog_nmi_disable(int cpu) { return; }
|
|||
#endif /* CONFIG_HARDLOCKUP_DETECTOR */
|
||||
|
||||
/* prepare/enable/disable routines */
|
||||
static int watchdog_prepare_cpu(int cpu)
|
||||
static void watchdog_prepare_cpu(int cpu)
|
||||
{
|
||||
struct hrtimer *hrtimer = &per_cpu(watchdog_hrtimer, cpu);
|
||||
|
||||
WARN_ON(per_cpu(softlockup_watchdog, cpu));
|
||||
hrtimer_init(hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
|
||||
hrtimer->function = watchdog_timer_fn;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int watchdog_enable(int cpu)
|
||||
|
|
@ -542,17 +540,16 @@ static int __cpuinit
|
|||
cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
|
||||
{
|
||||
int hotcpu = (unsigned long)hcpu;
|
||||
int err = 0;
|
||||
|
||||
switch (action) {
|
||||
case CPU_UP_PREPARE:
|
||||
case CPU_UP_PREPARE_FROZEN:
|
||||
err = watchdog_prepare_cpu(hotcpu);
|
||||
watchdog_prepare_cpu(hotcpu);
|
||||
break;
|
||||
case CPU_ONLINE:
|
||||
case CPU_ONLINE_FROZEN:
|
||||
if (watchdog_enabled)
|
||||
err = watchdog_enable(hotcpu);
|
||||
watchdog_enable(hotcpu);
|
||||
break;
|
||||
#ifdef CONFIG_HOTPLUG_CPU
|
||||
case CPU_UP_CANCELED:
|
||||
|
|
|
|||
|
|
@ -15,10 +15,10 @@
|
|||
* happens, handle that and return -EFAULT.
|
||||
*/
|
||||
|
||||
long __weak probe_kernel_read(void *dst, void *src, size_t size)
|
||||
long __weak probe_kernel_read(void *dst, const void *src, size_t size)
|
||||
__attribute__((alias("__probe_kernel_read")));
|
||||
|
||||
long __probe_kernel_read(void *dst, void *src, size_t size)
|
||||
long __probe_kernel_read(void *dst, const void *src, size_t size)
|
||||
{
|
||||
long ret;
|
||||
mm_segment_t old_fs = get_fs();
|
||||
|
|
@ -43,10 +43,10 @@ EXPORT_SYMBOL_GPL(probe_kernel_read);
|
|||
* Safely write to address @dst from the buffer at @src. If a kernel fault
|
||||
* happens, handle that and return -EFAULT.
|
||||
*/
|
||||
long __weak probe_kernel_write(void *dst, void *src, size_t size)
|
||||
long __weak probe_kernel_write(void *dst, const void *src, size_t size)
|
||||
__attribute__((alias("__probe_kernel_write")));
|
||||
|
||||
long __probe_kernel_write(void *dst, void *src, size_t size)
|
||||
long __probe_kernel_write(void *dst, const void *src, size_t size)
|
||||
{
|
||||
long ret;
|
||||
mm_segment_t old_fs = get_fs();
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue