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

Commit 29510ec3 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-2.6-trace into perf/core
parents 398995ce 95950c2e

include/linux/ftrace.h

+26 −7
Original line number Diff line number Diff line
@@ -29,9 +29,22 @@ ftrace_enable_sysctl(struct ctl_table *table, int write, 


typedef void (*ftrace_func_t)(unsigned long ip, unsigned long parent_ip);



struct ftrace_hash;



enum {

	FTRACE_OPS_FL_ENABLED		= 1 << 0,

	FTRACE_OPS_FL_GLOBAL		= 1 << 1,

	FTRACE_OPS_FL_DYNAMIC		= 1 << 2,

};



struct ftrace_ops {

	ftrace_func_t			func;

	struct ftrace_ops		*next;

	unsigned long			flags;

#ifdef CONFIG_DYNAMIC_FTRACE

	struct ftrace_hash		*notrace_hash;

	struct ftrace_hash		*filter_hash;

#endif

};



extern int function_trace_stop;
@@ -146,12 +159,13 @@ extern void unregister_ftrace_function_probe_all(char *glob); 
extern int ftrace_text_reserved(void *start, void *end);



enum {

	FTRACE_FL_FREE		= (1 << 0),

	FTRACE_FL_FILTER	= (1 << 1),

	FTRACE_FL_ENABLED	= (1 << 2),

	FTRACE_FL_NOTRACE	= (1 << 3),

	FTRACE_FL_ENABLED	= (1 << 30),

	FTRACE_FL_FREE		= (1 << 31),

};



#define FTRACE_FL_MASK		(0x3UL << 30)

#define FTRACE_REF_MAX		((1 << 30) - 1)



struct dyn_ftrace {

	union {

		unsigned long		ip; /* address of mcount call-site */
@@ -165,7 +179,12 @@ struct dyn_ftrace { 
};



int ftrace_force_update(void);

void ftrace_set_filter(unsigned char *buf, int len, int reset);

void ftrace_set_filter(struct ftrace_ops *ops, unsigned char *buf,

		       int len, int reset);

void ftrace_set_notrace(struct ftrace_ops *ops, unsigned char *buf,

			int len, int reset);

void ftrace_set_global_filter(unsigned char *buf, int len, int reset);

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);

include/linux/kernel.h

+1 −0
Original line number Diff line number Diff line
@@ -283,6 +283,7 @@ extern char *get_options(const char *str, int nints, int *ints); 
extern unsigned long long memparse(const char *ptr, char **retptr);



extern int core_kernel_text(unsigned long addr);

extern int core_kernel_data(unsigned long addr);

extern int __kernel_text_address(unsigned long addr);

extern int kernel_text_address(unsigned long addr);

extern int func_ptr_is_kernel_text(void *ptr);

kernel/extable.c

+8 −0
Original line number Diff line number Diff line
@@ -72,6 +72,14 @@ int core_kernel_text(unsigned long addr) 
	return 0;

}



int core_kernel_data(unsigned long addr)

{

	if (addr >= (unsigned long)_sdata &&

	    addr < (unsigned long)_edata)

		return 1;

	return 0;

}



int __kernel_text_address(unsigned long addr)

{

	if (core_kernel_text(addr))

kernel/trace/ftrace.c

+857 −135

File changed.

Preview size limit exceeded, changes collapsed.

kernel/trace/trace.h

+2 −0
Original line number Diff line number Diff line
@@ -419,6 +419,8 @@ extern void trace_find_cmdline(int pid, char comm[]); 
extern unsigned long ftrace_update_tot_cnt;

#define DYN_FTRACE_TEST_NAME trace_selftest_dynamic_test_func

extern int DYN_FTRACE_TEST_NAME(void);

#define DYN_FTRACE_TEST_NAME2 trace_selftest_dynamic_test_func2

extern int DYN_FTRACE_TEST_NAME2(void);

#endif



extern int ring_buffer_expanded;