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

Commit 1b3fa2ce authored by Frederic Weisbecker's avatar Frederic Weisbecker Committed by Ingo Molnar
Browse files

tracing/x86: basic implementation of syscall tracing for x86 



Provide the x86 trace callbacks to trace syscalls.

Signed-off-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
Acked-by: default avatarSteven Rostedt <rostedt@goodmis.org>
Cc: Lai Jiangshan <laijs@cn.fujitsu.com>
LKML-Reference: <1236401580-5758-3-git-send-email-fweisbec@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent ee08c6ec

arch/x86/Kconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -35,6 +35,7 @@ config X86 
	select HAVE_FUNCTION_GRAPH_TRACER

	select HAVE_FUNCTION_GRAPH_TRACER

	select HAVE_FUNCTION_TRACE_MCOUNT_TEST

	select HAVE_FUNCTION_TRACE_MCOUNT_TEST

	select HAVE_FTRACE_NMI_ENTER if DYNAMIC_FTRACE

	select HAVE_FTRACE_NMI_ENTER if DYNAMIC_FTRACE

	select HAVE_FTRACE_SYSCALLS

	select HAVE_KVM

	select HAVE_KVM

	select HAVE_ARCH_KGDB

	select HAVE_ARCH_KGDB

	select HAVE_ARCH_TRACEHOOK

	select HAVE_ARCH_TRACEHOOK

arch/x86/include/asm/thread_info.h

+6 −3
Original line number Original line Diff line number Diff line
@@ -94,6 +94,7 @@ struct thread_info { 
#define TIF_FORCED_TF		24	/* true if TF in eflags artificially */

#define TIF_FORCED_TF		24	/* true if TF in eflags artificially */

#define TIF_DEBUGCTLMSR		25	/* uses thread_struct.debugctlmsr */

#define TIF_DEBUGCTLMSR		25	/* uses thread_struct.debugctlmsr */

#define TIF_DS_AREA_MSR		26      /* uses thread_struct.ds_area_msr */

#define TIF_DS_AREA_MSR		26      /* uses thread_struct.ds_area_msr */

#define TIF_SYSCALL_FTRACE	27	/* for ftrace syscall instrumentation */





#define _TIF_SYSCALL_TRACE	(1 << TIF_SYSCALL_TRACE)

#define _TIF_SYSCALL_TRACE	(1 << TIF_SYSCALL_TRACE)

#define _TIF_NOTIFY_RESUME	(1 << TIF_NOTIFY_RESUME)

#define _TIF_NOTIFY_RESUME	(1 << TIF_NOTIFY_RESUME)
@@ -115,15 +116,17 @@ struct thread_info { 
#define _TIF_FORCED_TF		(1 << TIF_FORCED_TF)

#define _TIF_FORCED_TF		(1 << TIF_FORCED_TF)

#define _TIF_DEBUGCTLMSR	(1 << TIF_DEBUGCTLMSR)

#define _TIF_DEBUGCTLMSR	(1 << TIF_DEBUGCTLMSR)

#define _TIF_DS_AREA_MSR	(1 << TIF_DS_AREA_MSR)

#define _TIF_DS_AREA_MSR	(1 << TIF_DS_AREA_MSR)

#define _TIF_SYSCALL_FTRACE	(1 << TIF_SYSCALL_FTRACE)





/* work to do in syscall_trace_enter() */

/* work to do in syscall_trace_enter() */

#define _TIF_WORK_SYSCALL_ENTRY	\

#define _TIF_WORK_SYSCALL_ENTRY	\

	(_TIF_SYSCALL_TRACE | _TIF_SYSCALL_EMU | \

	(_TIF_SYSCALL_TRACE | _TIF_SYSCALL_EMU | _TIF_SYSCALL_FTRACE |	\

	 _TIF_SYSCALL_AUDIT | _TIF_SECCOMP | _TIF_SINGLESTEP)

	 _TIF_SYSCALL_AUDIT | _TIF_SECCOMP | _TIF_SINGLESTEP)





/* work to do in syscall_trace_leave() */

/* work to do in syscall_trace_leave() */

#define _TIF_WORK_SYSCALL_EXIT	\

#define _TIF_WORK_SYSCALL_EXIT	\

	(_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | _TIF_SINGLESTEP)

	(_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | _TIF_SINGLESTEP |	\

	 _TIF_SYSCALL_FTRACE)





/* work to do on interrupt/exception return */

/* work to do on interrupt/exception return */

#define _TIF_WORK_MASK							\

#define _TIF_WORK_MASK							\
@@ -132,7 +135,7 @@ struct thread_info { 
	   _TIF_SINGLESTEP|_TIF_SECCOMP|_TIF_SYSCALL_EMU))

	   _TIF_SINGLESTEP|_TIF_SECCOMP|_TIF_SYSCALL_EMU))





/* work to do on any return to user space */

/* work to do on any return to user space */

#define _TIF_ALLWORK_MASK (0x0000FFFF & ~_TIF_SECCOMP)

#define _TIF_ALLWORK_MASK ((0x0000FFFF & ~_TIF_SECCOMP) | _TIF_SYSCALL_FTRACE)





/* Only used for 64 bit */

/* Only used for 64 bit */

#define _TIF_DO_NOTIFY_MASK						\

#define _TIF_DO_NOTIFY_MASK						\

arch/x86/kernel/ptrace.c

+7 −0
Original line number Original line Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <linux/audit.h>

#include <linux/audit.h>

#include <linux/seccomp.h>

#include <linux/seccomp.h>

#include <linux/signal.h>

#include <linux/signal.h>

#include <linux/ftrace.h>





#include <asm/uaccess.h>

#include <asm/uaccess.h>

#include <asm/pgtable.h>

#include <asm/pgtable.h>
@@ -1416,6 +1417,9 @@ asmregparm long syscall_trace_enter(struct pt_regs *regs) 
	    tracehook_report_syscall_entry(regs))

	    tracehook_report_syscall_entry(regs))

		ret = -1L;

		ret = -1L;





	if (unlikely(test_thread_flag(TIF_SYSCALL_FTRACE)))

		ftrace_syscall_enter(regs);



	if (unlikely(current->audit_context)) {

	if (unlikely(current->audit_context)) {

		if (IS_IA32)

		if (IS_IA32)

			audit_syscall_entry(AUDIT_ARCH_I386,

			audit_syscall_entry(AUDIT_ARCH_I386,
@@ -1439,6 +1443,9 @@ asmregparm void syscall_trace_leave(struct pt_regs *regs) 
	if (unlikely(current->audit_context))

	if (unlikely(current->audit_context))

		audit_syscall_exit(AUDITSC_RESULT(regs->ax), regs->ax);

		audit_syscall_exit(AUDITSC_RESULT(regs->ax), regs->ax);





	if (unlikely(test_thread_flag(TIF_SYSCALL_FTRACE)))

		ftrace_syscall_exit(regs);



	if (test_thread_flag(TIF_SYSCALL_TRACE))

	if (test_thread_flag(TIF_SYSCALL_TRACE))

		tracehook_report_syscall_exit(regs, 0);

		tracehook_report_syscall_exit(regs, 0);