Merge branch 'tracing/urgent' into tracing/ftrace (86665c75) · Commits · 戴 / test

arch/x86/kernel/ftrace.c

+0 −1

+1 −0

Original line number	Diff line number	Diff line
		@@ -132,6 +132,7 @@ void blk_rq_init(struct request_queue q, struct request rq)
		INIT_HLIST_NODE(&rq->hash);
		RB_CLEAR_NODE(&rq->rb_node);
		rq->cmd = rq->__cmd;
		rq->cmd_len = BLK_MAX_CDB;
		rq->tag = -1;
		rq->ref_count = 1;
		}

+6 −2

Original line number	Diff line number	Diff line
		@@ -356,6 +356,9 @@ struct ftrace_graph_ret {

		#ifdef CONFIG_FUNCTION_GRAPH_TRACER

		/* for init task */
		#define INIT_FTRACE_GRAPH .ret_stack = NULL

		/*
		* Stack of return addresses for functions
		* of a thread.
		@@ -429,10 +432,11 @@ static inline void unpause_graph_tracing(void)
		{
		atomic_dec(&current->tracing_graph_pause);
		}
		#else
		#else /* !CONFIG_FUNCTION_GRAPH_TRACER */

		#define __notrace_funcgraph
		#define __irq_entry
		#define INIT_FTRACE_GRAPH

		static inline void ftrace_graph_init_task(struct task_struct *t) { }
		static inline void ftrace_graph_exit_task(struct task_struct *t) { }
		@@ -444,7 +448,7 @@ static inline int task_curr_ret_stack(struct task_struct *tsk)

		static inline void pause_graph_tracing(void) { }
		static inline void unpause_graph_tracing(void) { }
		#endif
		#endif /* CONFIG_FUNCTION_GRAPH_TRACER */

		#ifdef CONFIG_TRACING
		#include <linux/sched.h>

+2 −0

Original line number	Diff line number	Diff line
		@@ -5,6 +5,7 @@
		#include <linux/irqflags.h>
		#include <linux/utsname.h>
		#include <linux/lockdep.h>
		#include <linux/ftrace.h>
		#include <linux/ipc.h>
		#include <linux/pid_namespace.h>
		#include <linux/user_namespace.h>
		@@ -185,6 +186,7 @@ extern struct cred init_cred;
		INIT_IDS \
		INIT_TRACE_IRQFLAGS \
		INIT_LOCKDEP \
		INIT_FTRACE_GRAPH \
		}

+4 −3

Original line number	Diff line number	Diff line
		@@ -327,10 +327,10 @@ static ssize_t blk_msg_write(struct file filp, const char __user buffer,
		char *msg;
		struct blk_trace *bt;

		if (count > BLK_TN_MAX_MSG)
		if (count >= BLK_TN_MAX_MSG)
		return -EINVAL;

		msg = kmalloc(count, GFP_KERNEL);
		msg = kmalloc(count + 1, GFP_KERNEL);
		if (msg == NULL)
		return -ENOMEM;

		@@ -339,6 +339,7 @@ static ssize_t blk_msg_write(struct file filp, const char __user buffer,
		return -EFAULT;
		}

		msg[count] = '\0';
		bt = filp->private_data;
		__trace_note_message(bt, "%s", msg);
		kfree(msg);
		@@ -642,7 +643,7 @@ static void blk_add_trace_rq(struct request_queue q, struct request rq,
		if (blk_pc_request(rq)) {
		what \|= BLK_TC_ACT(BLK_TC_PC);
		__blk_add_trace(bt, 0, rq->data_len, rw, what, rq->errors,
		sizeof(rq->cmd), rq->cmd);
		rq->cmd_len, rq->cmd);
		} else {
		what \|= BLK_TC_ACT(BLK_TC_FS);
		__blk_add_trace(bt, rq->hard_sector, rq->hard_nr_sectors << 9,