Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 675eef66 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'tip/perf/core' of... 

Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/core
parents 03f70388 96de37b6

Documentation/kernel-parameters.txt

+8 −0
Original line number Diff line number Diff line
@@ -2437,6 +2437,14 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
	stacktrace	[FTRACE]

			Enabled the stack tracer on boot up.



	stacktrace_filter=[function-list]

			[FTRACE] Limit the functions that the stack tracer

			will trace at boot up. function-list is a comma separated

			list of functions. This list can be changed at run

			time by the stack_trace_filter file in the debugfs

			tracing directory. Note, this enables stack tracing

			and the stacktrace above is not needed.



	sti=		[PARISC,HW]

			Format: <num>

			Set the STI (builtin display/keyboard on the HP-PARISC

include/linux/compiler-gcc.h

+5 −0
Original line number Diff line number Diff line
@@ -50,6 +50,11 @@ 
# define inline		inline		__attribute__((always_inline))

# define __inline__	__inline__	__attribute__((always_inline))

# define __inline	__inline	__attribute__((always_inline))

#else

/* A lot of inline functions can cause havoc with function tracing */

# define inline		inline		notrace

# define __inline__	__inline__	notrace

# define __inline	__inline	notrace

#endif



#define __deprecated			__attribute__((deprecated))

include/linux/ftrace.h

+72 −5
Original line number Diff line number Diff line
@@ -133,6 +133,8 @@ struct ftrace_func_command { 
int ftrace_arch_code_modify_prepare(void);

int ftrace_arch_code_modify_post_process(void);



void ftrace_bug(int err, unsigned long ip);



struct seq_file;



struct ftrace_probe_ops {
@@ -161,7 +163,6 @@ extern int ftrace_text_reserved(void *start, void *end); 


enum {

	FTRACE_FL_ENABLED	= (1 << 30),

	FTRACE_FL_FREE		= (1 << 31),

};



#define FTRACE_FL_MASK		(0x3UL << 30)
@@ -172,10 +173,7 @@ struct dyn_ftrace { 
		unsigned long		ip; /* address of mcount call-site */

		struct dyn_ftrace	*freelist;

	};

	union {

	unsigned long		flags;

		struct dyn_ftrace	*newlist;

	};

	struct dyn_arch_ftrace		arch;

};
@@ -190,6 +188,56 @@ void ftrace_set_global_notrace(unsigned char *buf, int len, int reset); 
int register_ftrace_command(struct ftrace_func_command *cmd);

int unregister_ftrace_command(struct ftrace_func_command *cmd);



enum {

	FTRACE_UPDATE_CALLS		= (1 << 0),

	FTRACE_DISABLE_CALLS		= (1 << 1),

	FTRACE_UPDATE_TRACE_FUNC	= (1 << 2),

	FTRACE_START_FUNC_RET		= (1 << 3),

	FTRACE_STOP_FUNC_RET		= (1 << 4),

};



enum {

	FTRACE_UPDATE_IGNORE,

	FTRACE_UPDATE_MAKE_CALL,

	FTRACE_UPDATE_MAKE_NOP,

};



enum {

	FTRACE_ITER_FILTER	= (1 << 0),

	FTRACE_ITER_NOTRACE	= (1 << 1),

	FTRACE_ITER_PRINTALL	= (1 << 2),

	FTRACE_ITER_DO_HASH	= (1 << 3),

	FTRACE_ITER_HASH	= (1 << 4),

	FTRACE_ITER_ENABLED	= (1 << 5),

};



void arch_ftrace_update_code(int command);



struct ftrace_rec_iter;



struct ftrace_rec_iter *ftrace_rec_iter_start(void);

struct ftrace_rec_iter *ftrace_rec_iter_next(struct ftrace_rec_iter *iter);

struct dyn_ftrace *ftrace_rec_iter_record(struct ftrace_rec_iter *iter);



int ftrace_update_record(struct dyn_ftrace *rec, int enable);

int ftrace_test_record(struct dyn_ftrace *rec, int enable);

void ftrace_run_stop_machine(int command);

int ftrace_location(unsigned long ip);



extern ftrace_func_t ftrace_trace_function;



int ftrace_regex_open(struct ftrace_ops *ops, int flag,

		  struct inode *inode, struct file *file);

ssize_t ftrace_filter_write(struct file *file, const char __user *ubuf,

			    size_t cnt, loff_t *ppos);

ssize_t ftrace_notrace_write(struct file *file, const char __user *ubuf,

			     size_t cnt, loff_t *ppos);

loff_t ftrace_regex_lseek(struct file *file, loff_t offset, int origin);

int ftrace_regex_release(struct inode *inode, struct file *file);



void __init

ftrace_set_early_filter(struct ftrace_ops *ops, char *buf, int enable);



/* defined in arch */

extern int ftrace_ip_converted(unsigned long ip);

extern int ftrace_dyn_arch_init(void *data);
@@ -284,6 +332,25 @@ static inline int ftrace_text_reserved(void *start, void *end) 
{

	return 0;

}



/*

 * Again users of functions that have ftrace_ops may not

 * have them defined when ftrace is not enabled, but these

 * functions may still be called. Use a macro instead of inline.

 */

#define ftrace_regex_open(ops, flag, inod, file) ({ -ENODEV; })

#define ftrace_set_early_filter(ops, buf, enable) do { } while (0)



static inline ssize_t ftrace_filter_write(struct file *file, const char __user *ubuf,

			    size_t cnt, loff_t *ppos) { return -ENODEV; }

static inline ssize_t ftrace_notrace_write(struct file *file, const char __user *ubuf,

			     size_t cnt, loff_t *ppos) { return -ENODEV; }

static inline loff_t ftrace_regex_lseek(struct file *file, loff_t offset, int origin)

{

	return -ENODEV;

}

static inline int

ftrace_regex_release(struct inode *inode, struct file *file) { return -ENODEV; }

#endif /* CONFIG_DYNAMIC_FTRACE */



/* totally disable ftrace - can not re-enable after this */