[meta-mentor] [PATCH 3/5] Utilize layer-specific bbappends
Michael Brown
eichisama at gmail.com
Tue May 14 15:04:03 PDT 2013
From: Christopher Larson <chris_larson at mentor.com>
This silences the bbappend warnings.
Signed-off-by: Christopher Larson <chris_larson at mentor.com>
(cherry picked from commit 923f9428ec800892cebbb52fb6925a3fa2451ebc)
Signed-off-by: Michael Brown <mw_brown at mentor.com>
---
.../linux}/linux-imx_3.0.15.bbappend | 0
...dd-tracepoints-for-queueing-skb-to-rcvbuf.patch | 32 ++++-----
...dd-tracepoints-for-queueing-skb-to-rcvbuf.patch | 21 +++---
...pport-for-the-generic-syscall.h-interface.patch | 3 +-
.../0002-ARM-add-TRACEHOOK-support.patch | 53 +++++++-------
.../0003-ARM-support-syscall-tracing.patch | 73 ++++++++++----------
.../0004-syscall.h-include-linux-sched.h.patch | 9 ++-
.../commit-4ff16c2_imx_backport.patch | 56 +++++++--------
.../linux}/linux-imx_3.0.15/defconfig | 0
.../recipes-kernel/linux}/linux-qoriq-sdk.bbappend | 1 -
...dd-tracepoints-for-queueing-skb-to-rcvbuf.patch | 32 ++++-----
...dd-tracepoints-for-queueing-skb-to-rcvbuf.patch | 21 +++---
.../linux-qoriq-sdk/commit-4ff16c2_backport.patch | 56 +++++++--------
.../boot-format/boot-format_git.bbappend | 0
.../gnome-disk-utility_2.32.0.bbappend | 0
.../linux}/linux-omap4_3.1.0.bbappend | 0
...pport-for-the-generic-syscall.h-interface.patch | 3 +-
.../0002-ARM-add-TRACEHOOK-support.patch | 53 +++++++-------
.../0003-ARM-support-syscall-tracing.patch | 73 ++++++++++----------
.../0004-syscall.h-include-linux-sched.h.patch | 9 ++-
.../linux}/linux-omap4_3.1.0/commit-4ff16c2.patch | 30 ++++----
.../linux}/linux-omap4_3.1.0/stap-opts.cfg | 0
.../recipes-core}/systemd/systemd_git.bbappend | 0
23 files changed, 257 insertions(+), 268 deletions(-)
rename {recipes/lttng-2.0 => fsl-arm/recipes-kernel/linux}/linux-imx_3.0.15.bbappend (100%)
rename {recipes/lttng-2.0/linux-qoriq-sdk => fsl-arm/recipes-kernel/linux/linux-imx_3.0.15}/0001-core-add-tracepoints-for-queueing-skb-to-rcvbuf.patch (92%)
rename {recipes/lttng-2.0 => fsl-arm/recipes-kernel/linux}/linux-imx_3.0.15/0001-udp-add-tracepoints-for-queueing-skb-to-rcvbuf.patch (95%)
rename {recipes/lttng-2.0/linux-omap4_3.1.0 => fsl-arm/recipes-kernel/linux/linux-imx_3.0.15}/arm-tracehook/0001-ARM-add-support-for-the-generic-syscall.h-interface.patch (99%)
rename {recipes/lttng-2.0 => fsl-arm/recipes-kernel/linux}/linux-imx_3.0.15/arm-tracehook/0002-ARM-add-TRACEHOOK-support.patch (81%)
rename {recipes/lttng-2.0 => fsl-arm/recipes-kernel/linux}/linux-imx_3.0.15/arm-tracehook/0003-ARM-support-syscall-tracing.patch (89%)
rename {recipes/lttng-2.0 => fsl-arm/recipes-kernel/linux}/linux-imx_3.0.15/arm-tracehook/0004-syscall.h-include-linux-sched.h.patch (98%)
rename {recipes/lttng-2.0 => fsl-arm/recipes-kernel/linux}/linux-imx_3.0.15/commit-4ff16c2_imx_backport.patch (87%)
rename {recipes/lttng-2.0 => fsl-arm/recipes-kernel/linux}/linux-imx_3.0.15/defconfig (100%)
rename {recipes/lttng-2.0 => fsl/recipes-kernel/linux}/linux-qoriq-sdk.bbappend (99%)
rename {recipes/lttng-2.0/linux-imx_3.0.15 => fsl/recipes-kernel/linux/linux-qoriq-sdk}/0001-core-add-tracepoints-for-queueing-skb-to-rcvbuf.patch (92%)
rename {recipes/lttng-2.0 => fsl/recipes-kernel/linux}/linux-qoriq-sdk/0001-udp-add-tracepoints-for-queueing-skb-to-rcvbuf.patch (95%)
rename {recipes/lttng-2.0 => fsl/recipes-kernel/linux}/linux-qoriq-sdk/commit-4ff16c2_backport.patch (87%)
rename {recipes => fsl/recipes-tools}/boot-format/boot-format_git.bbappend (100%)
rename {recipes => gnome-layer/recipes-gnome}/gnome-disk-utility/gnome-disk-utility_2.32.0.bbappend (100%)
rename {recipes/lttng-2.0 => meta-ti/recipes-kernel/linux}/linux-omap4_3.1.0.bbappend (100%)
rename {recipes/lttng-2.0/linux-imx_3.0.15 => meta-ti/recipes-kernel/linux/linux-omap4_3.1.0}/arm-tracehook/0001-ARM-add-support-for-the-generic-syscall.h-interface.patch (99%)
rename {recipes/lttng-2.0 => meta-ti/recipes-kernel/linux}/linux-omap4_3.1.0/arm-tracehook/0002-ARM-add-TRACEHOOK-support.patch (82%)
rename {recipes/lttng-2.0 => meta-ti/recipes-kernel/linux}/linux-omap4_3.1.0/arm-tracehook/0003-ARM-support-syscall-tracing.patch (89%)
rename {recipes/lttng-2.0 => meta-ti/recipes-kernel/linux}/linux-omap4_3.1.0/arm-tracehook/0004-syscall.h-include-linux-sched.h.patch (98%)
rename {recipes/lttng-2.0 => meta-ti/recipes-kernel/linux}/linux-omap4_3.1.0/commit-4ff16c2.patch (94%)
rename {recipes/lttng-2.0 => meta-ti/recipes-kernel/linux}/linux-omap4_3.1.0/stap-opts.cfg (100%)
rename {recipes => systemd-layer/recipes-core}/systemd/systemd_git.bbappend (100%)
diff --git a/recipes/lttng-2.0/linux-imx_3.0.15.bbappend b/fsl-arm/recipes-kernel/linux/linux-imx_3.0.15.bbappend
similarity index 100%
rename from recipes/lttng-2.0/linux-imx_3.0.15.bbappend
rename to fsl-arm/recipes-kernel/linux/linux-imx_3.0.15.bbappend
diff --git a/recipes/lttng-2.0/linux-qoriq-sdk/0001-core-add-tracepoints-for-queueing-skb-to-rcvbuf.patch b/fsl-arm/recipes-kernel/linux/linux-imx_3.0.15/0001-core-add-tracepoints-for-queueing-skb-to-rcvbuf.patch
similarity index 92%
rename from recipes/lttng-2.0/linux-qoriq-sdk/0001-core-add-tracepoints-for-queueing-skb-to-rcvbuf.patch
rename to fsl-arm/recipes-kernel/linux/linux-imx_3.0.15/0001-core-add-tracepoints-for-queueing-skb-to-rcvbuf.patch
index 97d6ee8..c352f59 100644
--- a/recipes/lttng-2.0/linux-qoriq-sdk/0001-core-add-tracepoints-for-queueing-skb-to-rcvbuf.patch
+++ b/fsl-arm/recipes-kernel/linux/linux-imx_3.0.15/0001-core-add-tracepoints-for-queueing-skb-to-rcvbuf.patch
@@ -105,36 +105,36 @@ Index: git/net/core/net-traces.c
#include <trace/events/napi.h>
#include <trace/events/udp.h>
+#include <trace/events/sock.h>
-
+
EXPORT_TRACEPOINT_SYMBOL_GPL(kfree_skb);
-
+
Index: git/net/core/sock.c
===================================================================
--- git.orig/net/core/sock.c
+++ git/net/core/sock.c
@@ -128,6 +128,8 @@
-
+
#include <linux/filter.h>
-
+
+#include <trace/events/sock.h>
+
#ifdef CONFIG_INET
#include <net/tcp.h>
#endif
@@ -292,6 +294,7 @@ int sock_queue_rcv_skb(struct sock *sk,
- if (atomic_read(&sk->sk_rmem_alloc) + skb->truesize >=
- (unsigned)sk->sk_rcvbuf) {
- atomic_inc(&sk->sk_drops);
+ if (atomic_read(&sk->sk_rmem_alloc) + skb->truesize >=
+ (unsigned)sk->sk_rcvbuf) {
+ atomic_inc(&sk->sk_drops);
+ trace_sock_rcvqueue_full(sk, skb);
- return -ENOMEM;
- }
-
+ return -ENOMEM;
+ }
+
@@ -1737,6 +1740,8 @@ suppress_allocation:
- return 1;
- }
-
+ return 1;
+ }
+
+ trace_sock_exceed_buf_limit(sk, prot, allocated);
+
- /* Alas. Undo changes. */
- sk->sk_forward_alloc -= amt * SK_MEM_QUANTUM;
- atomic_long_sub(amt, prot->memory_allocated);
+ /* Alas. Undo changes. */
+ sk->sk_forward_alloc -= amt * SK_MEM_QUANTUM;
+ atomic_long_sub(amt, prot->memory_allocated);
diff --git a/recipes/lttng-2.0/linux-imx_3.0.15/0001-udp-add-tracepoints-for-queueing-skb-to-rcvbuf.patch b/fsl-arm/recipes-kernel/linux/linux-imx_3.0.15/0001-udp-add-tracepoints-for-queueing-skb-to-rcvbuf.patch
similarity index 95%
rename from recipes/lttng-2.0/linux-imx_3.0.15/0001-udp-add-tracepoints-for-queueing-skb-to-rcvbuf.patch
rename to fsl-arm/recipes-kernel/linux/linux-imx_3.0.15/0001-udp-add-tracepoints-for-queueing-skb-to-rcvbuf.patch
index 15712f8..28a30a3 100644
--- a/recipes/lttng-2.0/linux-imx_3.0.15/0001-udp-add-tracepoints-for-queueing-skb-to-rcvbuf.patch
+++ b/fsl-arm/recipes-kernel/linux/linux-imx_3.0.15/0001-udp-add-tracepoints-for-queueing-skb-to-rcvbuf.patch
@@ -70,9 +70,9 @@ index 7f1bb2a..13aab64 100644
#include <trace/events/net.h>
#include <trace/events/napi.h>
+#include <trace/events/udp.h>
-
+
EXPORT_TRACEPOINT_SYMBOL_GPL(kfree_skb);
-
+
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index abca870..37aa9bf 100644
--- a/net/ipv4/udp.c
@@ -83,16 +83,15 @@ index abca870..37aa9bf 100644
#include <net/xfrm.h>
+#include <trace/events/udp.h>
#include "udp_impl.h"
-
+
struct udp_table udp_table __read_mostly;
@@ -1363,6 +1364,7 @@ static int __udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
- is_udplite);
- UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
- kfree_skb(skb);
+ is_udplite);
+ UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
+ kfree_skb(skb);
+ trace_udp_fail_queue_rcv_skb(rc, sk);
- return -1;
- }
-
---
-1.7.10.4
+ return -1;
+ }
+--
+1.7.10.4
diff --git a/recipes/lttng-2.0/linux-omap4_3.1.0/arm-tracehook/0001-ARM-add-support-for-the-generic-syscall.h-interface.patch b/fsl-arm/recipes-kernel/linux/linux-imx_3.0.15/arm-tracehook/0001-ARM-add-support-for-the-generic-syscall.h-interface.patch
similarity index 99%
rename from recipes/lttng-2.0/linux-omap4_3.1.0/arm-tracehook/0001-ARM-add-support-for-the-generic-syscall.h-interface.patch
rename to fsl-arm/recipes-kernel/linux/linux-imx_3.0.15/arm-tracehook/0001-ARM-add-support-for-the-generic-syscall.h-interface.patch
index 96889af..f2361d3 100644
--- a/recipes/lttng-2.0/linux-omap4_3.1.0/arm-tracehook/0001-ARM-add-support-for-the-generic-syscall.h-interface.patch
+++ b/fsl-arm/recipes-kernel/linux/linux-imx_3.0.15/arm-tracehook/0001-ARM-add-support-for-the-generic-syscall.h-interface.patch
@@ -113,6 +113,5 @@ index 0000000..c334a23
+}
+
+#endif /* _ASM_ARM_SYSCALL_H */
---
+--
1.7.0.4
-
diff --git a/recipes/lttng-2.0/linux-imx_3.0.15/arm-tracehook/0002-ARM-add-TRACEHOOK-support.patch b/fsl-arm/recipes-kernel/linux/linux-imx_3.0.15/arm-tracehook/0002-ARM-add-TRACEHOOK-support.patch
similarity index 81%
rename from recipes/lttng-2.0/linux-imx_3.0.15/arm-tracehook/0002-ARM-add-TRACEHOOK-support.patch
rename to fsl-arm/recipes-kernel/linux/linux-imx_3.0.15/arm-tracehook/0002-ARM-add-TRACEHOOK-support.patch
index 38289bb..a5ed19a 100644
--- a/recipes/lttng-2.0/linux-imx_3.0.15/arm-tracehook/0002-ARM-add-TRACEHOOK-support.patch
+++ b/fsl-arm/recipes-kernel/linux/linux-imx_3.0.15/arm-tracehook/0002-ARM-add-TRACEHOOK-support.patch
@@ -20,28 +20,28 @@ Index: git/arch/arm/Kconfig
--- git.orig/arch/arm/Kconfig
+++ git/arch/arm/Kconfig
@@ -10,6 +10,7 @@ config ARM
- select GENERIC_ATOMIC64 if (CPU_V6 || !CPU_32v6K || !AEABI)
- select HAVE_OPROFILE if (HAVE_PERF_EVENTS)
- select HAVE_ARCH_KGDB
+ select GENERIC_ATOMIC64 if (CPU_V6 || !CPU_32v6K || !AEABI)
+ select HAVE_OPROFILE if (HAVE_PERF_EVENTS)
+ select HAVE_ARCH_KGDB
+ select HAVE_ARCH_TRACEHOOK
- select HAVE_KPROBES if (!XIP_KERNEL && !THUMB2_KERNEL)
- select HAVE_KRETPROBES if (HAVE_KPROBES)
- select HAVE_FUNCTION_TRACER if (!XIP_KERNEL)
+ select HAVE_KPROBES if (!XIP_KERNEL && !THUMB2_KERNEL)
+ select HAVE_KRETPROBES if (HAVE_KPROBES)
+ select HAVE_FUNCTION_TRACER if (!XIP_KERNEL)
Index: git/arch/arm/include/asm/ptrace.h
===================================================================
--- git.orig/arch/arm/include/asm/ptrace.h
+++ git/arch/arm/include/asm/ptrace.h
@@ -235,6 +235,11 @@ static inline unsigned long kernel_stack
- return regs->ARM_sp;
+ return regs->ARM_sp;
}
-
+
+static inline unsigned long user_stack_pointer(struct pt_regs *regs)
+{
+ return regs->ARM_sp;
+}
+
#endif /* __KERNEL__ */
-
+
#endif /* __ASSEMBLY__ */
Index: git/arch/arm/kernel/ptrace.c
===================================================================
@@ -52,22 +52,22 @@ Index: git/arch/arm/kernel/ptrace.c
#include <linux/hw_breakpoint.h>
#include <linux/regset.h>
+#include <linux/tracehook.h>
-
+
#include <asm/pgtable.h>
#include <asm/system.h>
@@ -928,8 +929,6 @@ asmlinkage int syscall_trace(int why, st
-
- if (!test_thread_flag(TIF_SYSCALL_TRACE))
- return scno;
+
+ if (!test_thread_flag(TIF_SYSCALL_TRACE))
+ return scno;
- if (!(current->ptrace & PT_PTRACED))
- return scno;
-
- /*
- * Save IP. IP is used to denote syscall entry/exit:
+
+ /*
+ * Save IP. IP is used to denote syscall entry/exit:
@@ -940,19 +939,11 @@ asmlinkage int syscall_trace(int why, st
-
- current_thread_info()->syscall = scno;
-
+
+ current_thread_info()->syscall = scno;
+
- /* the 0x80 provides a way for the tracing parent to distinguish
- between a syscall stop and SIGTRAP delivery */
- ptrace_notify(SIGTRAP | ((current->ptrace & PT_TRACESYSGOOD)
@@ -86,19 +86,18 @@ Index: git/arch/arm/kernel/ptrace.c
+ else if (tracehook_report_syscall_entry(regs))
+ current_thread_info()->syscall = -1;
+
- regs->ARM_ip = ip;
-
- return current_thread_info()->syscall;
+ regs->ARM_ip = ip;
+
+ return current_thread_info()->syscall;
Index: git/arch/arm/kernel/signal.c
===================================================================
--- git.orig/arch/arm/kernel/signal.c
+++ git/arch/arm/kernel/signal.c
@@ -645,6 +645,8 @@ handle_signal(unsigned long sig, struct
- recalc_sigpending();
- spin_unlock_irq(&tsk->sighand->siglock);
-
+ recalc_sigpending();
+ spin_unlock_irq(&tsk->sighand->siglock);
+
+ tracehook_signal_handler(sig, info, ka, regs, 0);
+
- return 0;
+ return 0;
}
-
diff --git a/recipes/lttng-2.0/linux-imx_3.0.15/arm-tracehook/0003-ARM-support-syscall-tracing.patch b/fsl-arm/recipes-kernel/linux/linux-imx_3.0.15/arm-tracehook/0003-ARM-support-syscall-tracing.patch
similarity index 89%
rename from recipes/lttng-2.0/linux-imx_3.0.15/arm-tracehook/0003-ARM-support-syscall-tracing.patch
rename to fsl-arm/recipes-kernel/linux/linux-imx_3.0.15/arm-tracehook/0003-ARM-support-syscall-tracing.patch
index 0db55fa..992bbb6 100644
--- a/recipes/lttng-2.0/linux-imx_3.0.15/arm-tracehook/0003-ARM-support-syscall-tracing.patch
+++ b/fsl-arm/recipes-kernel/linux/linux-imx_3.0.15/arm-tracehook/0003-ARM-support-syscall-tracing.patch
@@ -27,27 +27,27 @@ Index: git/arch/arm/Kconfig
--- git.orig/arch/arm/Kconfig
+++ git/arch/arm/Kconfig
@@ -11,6 +11,7 @@ config ARM
- select HAVE_OPROFILE if (HAVE_PERF_EVENTS)
- select HAVE_ARCH_KGDB
- select HAVE_ARCH_TRACEHOOK
+ select HAVE_OPROFILE if (HAVE_PERF_EVENTS)
+ select HAVE_ARCH_KGDB
+ select HAVE_ARCH_TRACEHOOK
+ select HAVE_SYSCALL_TRACEPOINTS
- select HAVE_KPROBES if (!XIP_KERNEL && !THUMB2_KERNEL)
- select HAVE_KRETPROBES if (HAVE_KPROBES)
- select HAVE_FUNCTION_TRACER if (!XIP_KERNEL)
+ select HAVE_KPROBES if (!XIP_KERNEL && !THUMB2_KERNEL)
+ select HAVE_KRETPROBES if (HAVE_KPROBES)
+ select HAVE_FUNCTION_TRACER if (!XIP_KERNEL)
Index: git/arch/arm/include/asm/syscall.h
===================================================================
--- git.orig/arch/arm/include/asm/syscall.h
+++ git/arch/arm/include/asm/syscall.h
@@ -9,6 +9,10 @@
-
+
#include <linux/err.h>
-
+
+#include <asm/unistd.h>
+
+#define NR_syscalls (__NR_syscalls)
+
extern const unsigned long sys_call_table[];
-
+
static inline int syscall_get_nr(struct task_struct *task,
Index: git/arch/arm/include/asm/thread_info.h
===================================================================
@@ -58,7 +58,7 @@ Index: git/arch/arm/include/asm/thread_info.h
#define TIF_RESTORE_SIGMASK 20
#define TIF_SECCOMP 21
+#define TIF_SYSCALL_TRACEPOINT 22
-
+
#define _TIF_SIGPENDING (1 << TIF_SIGPENDING)
#define _TIF_NEED_RESCHED (1 << TIF_NEED_RESCHED)
@@ -155,6 +156,7 @@ extern void vfp_flush_hwstate(struct thr
@@ -66,7 +66,7 @@ Index: git/arch/arm/include/asm/thread_info.h
#define _TIF_RESTORE_SIGMASK (1 << TIF_RESTORE_SIGMASK)
#define _TIF_SECCOMP (1 << TIF_SECCOMP)
+#define _TIF_SYSCALL_TRACEPOINT (1 << TIF_SYSCALL_TRACEPOINT)
-
+
/*
* Change these and you break ASM code in entry-common.S
Index: git/arch/arm/include/asm/unistd.h
@@ -75,7 +75,7 @@ Index: git/arch/arm/include/asm/unistd.h
+++ git/arch/arm/include/asm/unistd.h
@@ -404,6 +404,14 @@
#define __NR_setns (__NR_SYSCALL_BASE+375)
-
+
/*
+ * This may need to be greater than __NR_last_syscall+1 in order to
+ * account for the padding in the syscall table
@@ -95,7 +95,7 @@ Index: git/arch/arm/kernel/entry-common.S
@@ -79,6 +79,11 @@ no_work_pending:
ENDPROC(ret_to_user_from_irq)
ENDPROC(ret_to_user)
-
+
+.macro test_syscall_tracing reg
+ tst \reg, #_TIF_SYSCALL_TRACE
+ tsteq \reg, #_TIF_SYSCALL_TRACEPOINT
@@ -105,16 +105,16 @@ Index: git/arch/arm/kernel/entry-common.S
* This is how we return from a fork.
*/
@@ -87,7 +92,7 @@ ENTRY(ret_from_fork)
- get_thread_info tsk
- ldr r1, [tsk, #TI_FLAGS] @ check for syscall tracing
- mov why, #1
+ get_thread_info tsk
+ ldr r1, [tsk, #TI_FLAGS] @ check for syscall tracing
+ mov why, #1
- tst r1, #_TIF_SYSCALL_TRACE @ are we tracing syscalls?
+ test_syscall_tracing r1
- beq ret_slow_syscall
- mov r1, sp
- mov r0, #1 @ trace exit [IP = 1]
+ beq ret_slow_syscall
+ mov r1, sp
+ mov r0, #1 @ trace exit [IP = 1]
@@ -98,6 +103,13 @@ ENDPROC(ret_from_fork)
- .equ NR_syscalls,0
+ .equ NR_syscalls,0
#define CALL(x) .equ NR_syscalls,NR_syscalls+1
#include "calls.S"
+
@@ -126,16 +126,16 @@ Index: git/arch/arm/kernel/entry-common.S
+
#undef CALL
#define CALL(x) .long x
-
+
@@ -443,7 +455,7 @@ ENTRY(vector_swi)
1:
#endif
-
+
- tst r10, #_TIF_SYSCALL_TRACE @ are we tracing syscalls?
+ test_syscall_tracing r10
- bne __sys_trace
-
- cmp scno, #NR_syscalls @ check upper syscall limit
+ bne __sys_trace
+
+ cmp scno, #NR_syscalls @ check upper syscall limit
Index: git/arch/arm/kernel/ptrace.c
===================================================================
--- git.orig/arch/arm/kernel/ptrace.c
@@ -143,7 +143,7 @@ Index: git/arch/arm/kernel/ptrace.c
@@ -28,6 +28,9 @@
#include <asm/system.h>
#include <asm/traps.h>
-
+
+#define CREATE_TRACE_POINTS
+#include <trace/events/syscalls.h>
+
@@ -152,18 +152,18 @@ Index: git/arch/arm/kernel/ptrace.c
/*
@@ -927,7 +930,8 @@ asmlinkage int syscall_trace(int why, st
{
- unsigned long ip;
-
+ unsigned long ip;
+
- if (!test_thread_flag(TIF_SYSCALL_TRACE))
+ if (!test_thread_flag(TIF_SYSCALL_TRACE) &&
+ !test_thread_flag(TIF_SYSCALL_TRACEPOINT))
- return scno;
-
- /*
+ return scno;
+
+ /*
@@ -939,10 +943,19 @@ asmlinkage int syscall_trace(int why, st
-
- current_thread_info()->syscall = scno;
-
+
+ current_thread_info()->syscall = scno;
+
- if (why)
- tracehook_report_syscall_exit(regs, 0);
- else if (tracehook_report_syscall_entry(regs))
@@ -181,6 +181,5 @@ Index: git/arch/arm/kernel/ptrace.c
+ else
+ trace_sys_enter(regs, scno);
+ }
-
- regs->ARM_ip = ip;
-
+
+ regs->ARM_ip = ip;
diff --git a/recipes/lttng-2.0/linux-imx_3.0.15/arm-tracehook/0004-syscall.h-include-linux-sched.h.patch b/fsl-arm/recipes-kernel/linux/linux-imx_3.0.15/arm-tracehook/0004-syscall.h-include-linux-sched.h.patch
similarity index 98%
rename from recipes/lttng-2.0/linux-imx_3.0.15/arm-tracehook/0004-syscall.h-include-linux-sched.h.patch
rename to fsl-arm/recipes-kernel/linux/linux-imx_3.0.15/arm-tracehook/0004-syscall.h-include-linux-sched.h.patch
index bb46693..3b2794b 100644
--- a/recipes/lttng-2.0/linux-imx_3.0.15/arm-tracehook/0004-syscall.h-include-linux-sched.h.patch
+++ b/fsl-arm/recipes-kernel/linux/linux-imx_3.0.15/arm-tracehook/0004-syscall.h-include-linux-sched.h.patch
@@ -17,12 +17,11 @@ index 47486a4..9fdded6 100644
+++ b/arch/arm/include/asm/syscall.h
@@ -8,6 +8,7 @@
#define _ASM_ARM_SYSCALL_H
-
+
#include <linux/err.h>
+#include <linux/sched.h>
-
+
#include <asm/unistd.h>
-
---
-1.7.0.4
+--
+1.7.0.4
diff --git a/recipes/lttng-2.0/linux-imx_3.0.15/commit-4ff16c2_imx_backport.patch b/fsl-arm/recipes-kernel/linux/linux-imx_3.0.15/commit-4ff16c2_imx_backport.patch
similarity index 87%
rename from recipes/lttng-2.0/linux-imx_3.0.15/commit-4ff16c2_imx_backport.patch
rename to fsl-arm/recipes-kernel/linux/linux-imx_3.0.15/commit-4ff16c2_imx_backport.patch
index 10d72cc..a33402d 100644
--- a/recipes/lttng-2.0/linux-imx_3.0.15/commit-4ff16c2_imx_backport.patch
+++ b/fsl-arm/recipes-kernel/linux/linux-imx_3.0.15/commit-4ff16c2_imx_backport.patch
@@ -3,23 +3,23 @@ Author: David Smith <dsmith at redhat.com>
Date: Tue Feb 7 10:11:05 2012 -0600
tracepoint, vfs, sched: Add exec() tracepoint
-
+
Added a minimal exec tracepoint. Exec is an important major event
in the life of a task, like fork(), clone() or exit(), all of
which we already trace.
-
+
[ We also do scheduling re-balancing during exec() - so it's useful
from a scheduler instrumentation POV as well. ]
-
+
If you want to watch a task start up, when it gets exec'ed is a good place
to start. With the addition of this tracepoint, exec's can be monitored
and better picture of general system activity can be obtained. This
tracepoint will also enable better process life tracking, allowing you to
answer questions like "what process keeps starting up binary X?".
-
+
This tracepoint can also be useful in ftrace filtering and trigger
conditions: i.e. starting or stopping filtering when exec is called.
-
+
Signed-off-by: David Smith <dsmith at redhat.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
Cc: Steven Rostedt <rostedt at goodmis.org>
@@ -37,57 +37,57 @@ Index: git/fs/exec.c
@@ -61,6 +61,8 @@
#include <asm/tlb.h>
#include "internal.h"
-
+
+#include <trace/events/sched.h>
+
int core_uses_pid;
char core_pattern[CORENAME_MAX_SIZE] = "core";
unsigned int core_pipe_limit;
@@ -1353,6 +1355,7 @@
- unsigned int depth = bprm->recursion_depth;
- int try,retval;
- struct linux_binfmt *fmt;
+ unsigned int depth = bprm->recursion_depth;
+ int try,retval;
+ struct linux_binfmt *fmt;
+ pid_t old_pid;
-
- retval = security_bprm_check(bprm);
- if (retval)
+
+ retval = security_bprm_check(bprm);
+ if (retval)
@@ -1362,6 +1365,9 @@
- if (retval)
- return retval;
-
+ if (retval)
+ return retval;
+
+ /* Need to fetch pid before load_binary changes it */
+ old_pid = current->pid;
+
- retval = -ENOENT;
- for (try=0; try<2; try++) {
- read_lock(&binfmt_lock);
+ retval = -ENOENT;
+ for (try=0; try<2; try++) {
+ read_lock(&binfmt_lock);
@@ -1380,8 +1386,10 @@
- */
- bprm->recursion_depth = depth;
- if (retval >= 0) {
+ */
+ bprm->recursion_depth = depth;
+ if (retval >= 0) {
- if (depth == 0)
+ if (depth == 0) {
- tracehook_report_exec(fmt, bprm, regs);
+ tracehook_report_exec(fmt, bprm, regs);
+ trace_sched_process_exec(current, old_pid, bprm);
+ }
- put_binfmt(fmt);
- allow_write_access(bprm->file);
- if (bprm->file)
+ put_binfmt(fmt);
+ allow_write_access(bprm->file);
+ if (bprm->file)
Index: git/include/trace/events/sched.h
===================================================================
--- git.orig/include/trace/events/sched.h 2012-10-17 00:34:12.000000000 -0700
+++ git/include/trace/events/sched.h 2012-10-17 00:42:37.220894218 -0700
@@ -6,6 +6,7 @@
-
+
#include <linux/sched.h>
#include <linux/tracepoint.h>
+#include <linux/binfmts.h>
-
+
/*
* Tracepoint for calling kthread_stop, performed to end a kthread:
@@ -275,6 +276,32 @@
);
-
+
/*
+ * Tracepoint for exec:
+ */
diff --git a/recipes/lttng-2.0/linux-imx_3.0.15/defconfig b/fsl-arm/recipes-kernel/linux/linux-imx_3.0.15/defconfig
similarity index 100%
rename from recipes/lttng-2.0/linux-imx_3.0.15/defconfig
rename to fsl-arm/recipes-kernel/linux/linux-imx_3.0.15/defconfig
diff --git a/recipes/lttng-2.0/linux-qoriq-sdk.bbappend b/fsl/recipes-kernel/linux/linux-qoriq-sdk.bbappend
similarity index 99%
rename from recipes/lttng-2.0/linux-qoriq-sdk.bbappend
rename to fsl/recipes-kernel/linux/linux-qoriq-sdk.bbappend
index 337accd..b1064cb 100644
--- a/recipes/lttng-2.0/linux-qoriq-sdk.bbappend
+++ b/fsl/recipes-kernel/linux/linux-qoriq-sdk.bbappend
@@ -6,4 +6,3 @@ SRC_URI_append := "file://commit-4ff16c2_backport.patch \
file://0001-udp-add-tracepoints-for-queueing-skb-to-rcvbuf.patch \
file://0001-core-add-tracepoints-for-queueing-skb-to-rcvbuf.patch \
"
-
diff --git a/recipes/lttng-2.0/linux-imx_3.0.15/0001-core-add-tracepoints-for-queueing-skb-to-rcvbuf.patch b/fsl/recipes-kernel/linux/linux-qoriq-sdk/0001-core-add-tracepoints-for-queueing-skb-to-rcvbuf.patch
similarity index 92%
rename from recipes/lttng-2.0/linux-imx_3.0.15/0001-core-add-tracepoints-for-queueing-skb-to-rcvbuf.patch
rename to fsl/recipes-kernel/linux/linux-qoriq-sdk/0001-core-add-tracepoints-for-queueing-skb-to-rcvbuf.patch
index 97d6ee8..c352f59 100644
--- a/recipes/lttng-2.0/linux-imx_3.0.15/0001-core-add-tracepoints-for-queueing-skb-to-rcvbuf.patch
+++ b/fsl/recipes-kernel/linux/linux-qoriq-sdk/0001-core-add-tracepoints-for-queueing-skb-to-rcvbuf.patch
@@ -105,36 +105,36 @@ Index: git/net/core/net-traces.c
#include <trace/events/napi.h>
#include <trace/events/udp.h>
+#include <trace/events/sock.h>
-
+
EXPORT_TRACEPOINT_SYMBOL_GPL(kfree_skb);
-
+
Index: git/net/core/sock.c
===================================================================
--- git.orig/net/core/sock.c
+++ git/net/core/sock.c
@@ -128,6 +128,8 @@
-
+
#include <linux/filter.h>
-
+
+#include <trace/events/sock.h>
+
#ifdef CONFIG_INET
#include <net/tcp.h>
#endif
@@ -292,6 +294,7 @@ int sock_queue_rcv_skb(struct sock *sk,
- if (atomic_read(&sk->sk_rmem_alloc) + skb->truesize >=
- (unsigned)sk->sk_rcvbuf) {
- atomic_inc(&sk->sk_drops);
+ if (atomic_read(&sk->sk_rmem_alloc) + skb->truesize >=
+ (unsigned)sk->sk_rcvbuf) {
+ atomic_inc(&sk->sk_drops);
+ trace_sock_rcvqueue_full(sk, skb);
- return -ENOMEM;
- }
-
+ return -ENOMEM;
+ }
+
@@ -1737,6 +1740,8 @@ suppress_allocation:
- return 1;
- }
-
+ return 1;
+ }
+
+ trace_sock_exceed_buf_limit(sk, prot, allocated);
+
- /* Alas. Undo changes. */
- sk->sk_forward_alloc -= amt * SK_MEM_QUANTUM;
- atomic_long_sub(amt, prot->memory_allocated);
+ /* Alas. Undo changes. */
+ sk->sk_forward_alloc -= amt * SK_MEM_QUANTUM;
+ atomic_long_sub(amt, prot->memory_allocated);
diff --git a/recipes/lttng-2.0/linux-qoriq-sdk/0001-udp-add-tracepoints-for-queueing-skb-to-rcvbuf.patch b/fsl/recipes-kernel/linux/linux-qoriq-sdk/0001-udp-add-tracepoints-for-queueing-skb-to-rcvbuf.patch
similarity index 95%
rename from recipes/lttng-2.0/linux-qoriq-sdk/0001-udp-add-tracepoints-for-queueing-skb-to-rcvbuf.patch
rename to fsl/recipes-kernel/linux/linux-qoriq-sdk/0001-udp-add-tracepoints-for-queueing-skb-to-rcvbuf.patch
index 15712f8..28a30a3 100644
--- a/recipes/lttng-2.0/linux-qoriq-sdk/0001-udp-add-tracepoints-for-queueing-skb-to-rcvbuf.patch
+++ b/fsl/recipes-kernel/linux/linux-qoriq-sdk/0001-udp-add-tracepoints-for-queueing-skb-to-rcvbuf.patch
@@ -70,9 +70,9 @@ index 7f1bb2a..13aab64 100644
#include <trace/events/net.h>
#include <trace/events/napi.h>
+#include <trace/events/udp.h>
-
+
EXPORT_TRACEPOINT_SYMBOL_GPL(kfree_skb);
-
+
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index abca870..37aa9bf 100644
--- a/net/ipv4/udp.c
@@ -83,16 +83,15 @@ index abca870..37aa9bf 100644
#include <net/xfrm.h>
+#include <trace/events/udp.h>
#include "udp_impl.h"
-
+
struct udp_table udp_table __read_mostly;
@@ -1363,6 +1364,7 @@ static int __udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
- is_udplite);
- UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
- kfree_skb(skb);
+ is_udplite);
+ UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
+ kfree_skb(skb);
+ trace_udp_fail_queue_rcv_skb(rc, sk);
- return -1;
- }
-
---
-1.7.10.4
+ return -1;
+ }
+--
+1.7.10.4
diff --git a/recipes/lttng-2.0/linux-qoriq-sdk/commit-4ff16c2_backport.patch b/fsl/recipes-kernel/linux/linux-qoriq-sdk/commit-4ff16c2_backport.patch
similarity index 87%
rename from recipes/lttng-2.0/linux-qoriq-sdk/commit-4ff16c2_backport.patch
rename to fsl/recipes-kernel/linux/linux-qoriq-sdk/commit-4ff16c2_backport.patch
index 10d72cc..a33402d 100644
--- a/recipes/lttng-2.0/linux-qoriq-sdk/commit-4ff16c2_backport.patch
+++ b/fsl/recipes-kernel/linux/linux-qoriq-sdk/commit-4ff16c2_backport.patch
@@ -3,23 +3,23 @@ Author: David Smith <dsmith at redhat.com>
Date: Tue Feb 7 10:11:05 2012 -0600
tracepoint, vfs, sched: Add exec() tracepoint
-
+
Added a minimal exec tracepoint. Exec is an important major event
in the life of a task, like fork(), clone() or exit(), all of
which we already trace.
-
+
[ We also do scheduling re-balancing during exec() - so it's useful
from a scheduler instrumentation POV as well. ]
-
+
If you want to watch a task start up, when it gets exec'ed is a good place
to start. With the addition of this tracepoint, exec's can be monitored
and better picture of general system activity can be obtained. This
tracepoint will also enable better process life tracking, allowing you to
answer questions like "what process keeps starting up binary X?".
-
+
This tracepoint can also be useful in ftrace filtering and trigger
conditions: i.e. starting or stopping filtering when exec is called.
-
+
Signed-off-by: David Smith <dsmith at redhat.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
Cc: Steven Rostedt <rostedt at goodmis.org>
@@ -37,57 +37,57 @@ Index: git/fs/exec.c
@@ -61,6 +61,8 @@
#include <asm/tlb.h>
#include "internal.h"
-
+
+#include <trace/events/sched.h>
+
int core_uses_pid;
char core_pattern[CORENAME_MAX_SIZE] = "core";
unsigned int core_pipe_limit;
@@ -1353,6 +1355,7 @@
- unsigned int depth = bprm->recursion_depth;
- int try,retval;
- struct linux_binfmt *fmt;
+ unsigned int depth = bprm->recursion_depth;
+ int try,retval;
+ struct linux_binfmt *fmt;
+ pid_t old_pid;
-
- retval = security_bprm_check(bprm);
- if (retval)
+
+ retval = security_bprm_check(bprm);
+ if (retval)
@@ -1362,6 +1365,9 @@
- if (retval)
- return retval;
-
+ if (retval)
+ return retval;
+
+ /* Need to fetch pid before load_binary changes it */
+ old_pid = current->pid;
+
- retval = -ENOENT;
- for (try=0; try<2; try++) {
- read_lock(&binfmt_lock);
+ retval = -ENOENT;
+ for (try=0; try<2; try++) {
+ read_lock(&binfmt_lock);
@@ -1380,8 +1386,10 @@
- */
- bprm->recursion_depth = depth;
- if (retval >= 0) {
+ */
+ bprm->recursion_depth = depth;
+ if (retval >= 0) {
- if (depth == 0)
+ if (depth == 0) {
- tracehook_report_exec(fmt, bprm, regs);
+ tracehook_report_exec(fmt, bprm, regs);
+ trace_sched_process_exec(current, old_pid, bprm);
+ }
- put_binfmt(fmt);
- allow_write_access(bprm->file);
- if (bprm->file)
+ put_binfmt(fmt);
+ allow_write_access(bprm->file);
+ if (bprm->file)
Index: git/include/trace/events/sched.h
===================================================================
--- git.orig/include/trace/events/sched.h 2012-10-17 00:34:12.000000000 -0700
+++ git/include/trace/events/sched.h 2012-10-17 00:42:37.220894218 -0700
@@ -6,6 +6,7 @@
-
+
#include <linux/sched.h>
#include <linux/tracepoint.h>
+#include <linux/binfmts.h>
-
+
/*
* Tracepoint for calling kthread_stop, performed to end a kthread:
@@ -275,6 +276,32 @@
);
-
+
/*
+ * Tracepoint for exec:
+ */
diff --git a/recipes/boot-format/boot-format_git.bbappend b/fsl/recipes-tools/boot-format/boot-format_git.bbappend
similarity index 100%
rename from recipes/boot-format/boot-format_git.bbappend
rename to fsl/recipes-tools/boot-format/boot-format_git.bbappend
diff --git a/recipes/gnome-disk-utility/gnome-disk-utility_2.32.0.bbappend b/gnome-layer/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bbappend
similarity index 100%
rename from recipes/gnome-disk-utility/gnome-disk-utility_2.32.0.bbappend
rename to gnome-layer/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bbappend
diff --git a/recipes/lttng-2.0/linux-omap4_3.1.0.bbappend b/meta-ti/recipes-kernel/linux/linux-omap4_3.1.0.bbappend
similarity index 100%
rename from recipes/lttng-2.0/linux-omap4_3.1.0.bbappend
rename to meta-ti/recipes-kernel/linux/linux-omap4_3.1.0.bbappend
diff --git a/recipes/lttng-2.0/linux-imx_3.0.15/arm-tracehook/0001-ARM-add-support-for-the-generic-syscall.h-interface.patch b/meta-ti/recipes-kernel/linux/linux-omap4_3.1.0/arm-tracehook/0001-ARM-add-support-for-the-generic-syscall.h-interface.patch
similarity index 99%
rename from recipes/lttng-2.0/linux-imx_3.0.15/arm-tracehook/0001-ARM-add-support-for-the-generic-syscall.h-interface.patch
rename to meta-ti/recipes-kernel/linux/linux-omap4_3.1.0/arm-tracehook/0001-ARM-add-support-for-the-generic-syscall.h-interface.patch
index 96889af..f2361d3 100644
--- a/recipes/lttng-2.0/linux-imx_3.0.15/arm-tracehook/0001-ARM-add-support-for-the-generic-syscall.h-interface.patch
+++ b/meta-ti/recipes-kernel/linux/linux-omap4_3.1.0/arm-tracehook/0001-ARM-add-support-for-the-generic-syscall.h-interface.patch
@@ -113,6 +113,5 @@ index 0000000..c334a23
+}
+
+#endif /* _ASM_ARM_SYSCALL_H */
---
+--
1.7.0.4
-
diff --git a/recipes/lttng-2.0/linux-omap4_3.1.0/arm-tracehook/0002-ARM-add-TRACEHOOK-support.patch b/meta-ti/recipes-kernel/linux/linux-omap4_3.1.0/arm-tracehook/0002-ARM-add-TRACEHOOK-support.patch
similarity index 82%
rename from recipes/lttng-2.0/linux-omap4_3.1.0/arm-tracehook/0002-ARM-add-TRACEHOOK-support.patch
rename to meta-ti/recipes-kernel/linux/linux-omap4_3.1.0/arm-tracehook/0002-ARM-add-TRACEHOOK-support.patch
index 97819fe..c35bba1 100644
--- a/recipes/lttng-2.0/linux-omap4_3.1.0/arm-tracehook/0002-ARM-add-TRACEHOOK-support.patch
+++ b/meta-ti/recipes-kernel/linux/linux-omap4_3.1.0/arm-tracehook/0002-ARM-add-TRACEHOOK-support.patch
@@ -20,28 +20,28 @@ Index: git/arch/arm/Kconfig
--- git.orig/arch/arm/Kconfig 2012-09-25 15:11:44.000000000 -0500
+++ git/arch/arm/Kconfig 2012-09-25 15:20:23.214280650 -0500
@@ -12,6 +12,7 @@
- select GENERIC_ATOMIC64 if (CPU_V6 || !CPU_32v6K || !AEABI)
- select HAVE_OPROFILE if (HAVE_PERF_EVENTS)
- select HAVE_ARCH_KGDB
+ select GENERIC_ATOMIC64 if (CPU_V6 || !CPU_32v6K || !AEABI)
+ select HAVE_OPROFILE if (HAVE_PERF_EVENTS)
+ select HAVE_ARCH_KGDB
+ select HAVE_ARCH_TRACEHOOK
- select HAVE_KPROBES if !XIP_KERNEL
- select HAVE_KRETPROBES if (HAVE_KPROBES)
- select HAVE_FUNCTION_TRACER if (!XIP_KERNEL)
+ select HAVE_KPROBES if !XIP_KERNEL
+ select HAVE_KRETPROBES if (HAVE_KPROBES)
+ select HAVE_FUNCTION_TRACER if (!XIP_KERNEL)
Index: git/arch/arm/include/asm/ptrace.h
===================================================================
--- git.orig/arch/arm/include/asm/ptrace.h 2012-09-25 15:11:44.000000000 -0500
+++ git/arch/arm/include/asm/ptrace.h 2012-09-25 15:20:00.446256150 -0500
@@ -244,6 +244,11 @@
- return regs->ARM_sp;
+ return regs->ARM_sp;
}
-
+
+static inline unsigned long user_stack_pointer(struct pt_regs *regs)
+{
+ return regs->ARM_sp;
+}
+
#endif /* __KERNEL__ */
-
+
#endif /* __ASSEMBLY__ */
Index: git/arch/arm/kernel/ptrace.c
===================================================================
@@ -52,22 +52,22 @@ Index: git/arch/arm/kernel/ptrace.c
#include <linux/hw_breakpoint.h>
#include <linux/regset.h>
+#include <linux/tracehook.h>
-
+
#include <asm/pgtable.h>
#include <asm/system.h>
@@ -907,8 +908,6 @@
-
- if (!test_thread_flag(TIF_SYSCALL_TRACE))
- return scno;
+
+ if (!test_thread_flag(TIF_SYSCALL_TRACE))
+ return scno;
- if (!(current->ptrace & PT_PTRACED))
- return scno;
-
- /*
- * Save IP. IP is used to denote syscall entry/exit:
+
+ /*
+ * Save IP. IP is used to denote syscall entry/exit:
@@ -919,19 +918,11 @@
-
- current_thread_info()->syscall = scno;
-
+
+ current_thread_info()->syscall = scno;
+
- /* the 0x80 provides a way for the tracing parent to distinguish
- between a syscall stop and SIGTRAP delivery */
- ptrace_notify(SIGTRAP | ((current->ptrace & PT_TRACESYSGOOD)
@@ -86,19 +86,18 @@ Index: git/arch/arm/kernel/ptrace.c
+ else if (tracehook_report_syscall_entry(regs))
+ current_thread_info()->syscall = -1;
+
- regs->ARM_ip = ip;
-
- return current_thread_info()->syscall;
+ regs->ARM_ip = ip;
+
+ return current_thread_info()->syscall;
Index: git/arch/arm/kernel/signal.c
===================================================================
--- git.orig/arch/arm/kernel/signal.c 2012-09-25 15:11:44.000000000 -0500
+++ git/arch/arm/kernel/signal.c 2012-09-25 15:20:00.462378642 -0500
@@ -645,6 +645,8 @@
- recalc_sigpending();
- spin_unlock_irq(&tsk->sighand->siglock);
-
+ recalc_sigpending();
+ spin_unlock_irq(&tsk->sighand->siglock);
+
+ tracehook_signal_handler(sig, info, ka, regs, 0);
+
- return 0;
+ return 0;
}
-
diff --git a/recipes/lttng-2.0/linux-omap4_3.1.0/arm-tracehook/0003-ARM-support-syscall-tracing.patch b/meta-ti/recipes-kernel/linux/linux-omap4_3.1.0/arm-tracehook/0003-ARM-support-syscall-tracing.patch
similarity index 89%
rename from recipes/lttng-2.0/linux-omap4_3.1.0/arm-tracehook/0003-ARM-support-syscall-tracing.patch
rename to meta-ti/recipes-kernel/linux/linux-omap4_3.1.0/arm-tracehook/0003-ARM-support-syscall-tracing.patch
index 3ee459f..819b243 100644
--- a/recipes/lttng-2.0/linux-omap4_3.1.0/arm-tracehook/0003-ARM-support-syscall-tracing.patch
+++ b/meta-ti/recipes-kernel/linux/linux-omap4_3.1.0/arm-tracehook/0003-ARM-support-syscall-tracing.patch
@@ -27,27 +27,27 @@ Index: git/arch/arm/Kconfig
--- git.orig/arch/arm/Kconfig 2012-09-25 15:42:06.000000000 -0500
+++ git/arch/arm/Kconfig 2012-09-25 15:42:45.906283322 -0500
@@ -13,6 +13,7 @@
- select HAVE_OPROFILE if (HAVE_PERF_EVENTS)
- select HAVE_ARCH_KGDB
- select HAVE_ARCH_TRACEHOOK
+ select HAVE_OPROFILE if (HAVE_PERF_EVENTS)
+ select HAVE_ARCH_KGDB
+ select HAVE_ARCH_TRACEHOOK
+ select HAVE_SYSCALL_TRACEPOINTS
- select HAVE_KPROBES if !XIP_KERNEL
- select HAVE_KRETPROBES if (HAVE_KPROBES)
- select HAVE_FUNCTION_TRACER if (!XIP_KERNEL)
+ select HAVE_KPROBES if !XIP_KERNEL
+ select HAVE_KRETPROBES if (HAVE_KPROBES)
+ select HAVE_FUNCTION_TRACER if (!XIP_KERNEL)
Index: git/arch/arm/include/asm/syscall.h
===================================================================
--- git.orig/arch/arm/include/asm/syscall.h 2012-09-25 15:42:06.000000000 -0500
+++ git/arch/arm/include/asm/syscall.h 2012-09-25 15:42:31.918753200 -0500
@@ -9,6 +9,10 @@
-
+
#include <linux/err.h>
-
+
+#include <asm/unistd.h>
+
+#define NR_syscalls (__NR_syscalls)
+
extern const unsigned long sys_call_table[];
-
+
static inline int syscall_get_nr(struct task_struct *task,
Index: git/arch/arm/include/asm/thread_info.h
===================================================================
@@ -58,7 +58,7 @@ Index: git/arch/arm/include/asm/thread_info.h
#define TIF_RESTORE_SIGMASK 20
#define TIF_SECCOMP 21
+#define TIF_SYSCALL_TRACEPOINT 22
-
+
#define _TIF_SIGPENDING (1 << TIF_SIGPENDING)
#define _TIF_NEED_RESCHED (1 << TIF_NEED_RESCHED)
@@ -155,6 +156,7 @@
@@ -66,7 +66,7 @@ Index: git/arch/arm/include/asm/thread_info.h
#define _TIF_RESTORE_SIGMASK (1 << TIF_RESTORE_SIGMASK)
#define _TIF_SECCOMP (1 << TIF_SECCOMP)
+#define _TIF_SYSCALL_TRACEPOINT (1 << TIF_SYSCALL_TRACEPOINT)
-
+
/*
* Change these and you break ASM code in entry-common.S
Index: git/arch/arm/include/asm/unistd.h
@@ -75,7 +75,7 @@ Index: git/arch/arm/include/asm/unistd.h
+++ git/arch/arm/include/asm/unistd.h 2012-09-25 15:42:31.954774113 -0500
@@ -404,6 +404,14 @@
#define __NR_setns (__NR_SYSCALL_BASE+375)
-
+
/*
+ * This may need to be greater than __NR_last_syscall+1 in order to
+ * account for the padding in the syscall table
@@ -95,7 +95,7 @@ Index: git/arch/arm/kernel/entry-common.S
@@ -79,6 +79,11 @@
ENDPROC(ret_to_user_from_irq)
ENDPROC(ret_to_user)
-
+
+.macro test_syscall_tracing reg
+ tst \reg, #_TIF_SYSCALL_TRACE
+ tsteq \reg, #_TIF_SYSCALL_TRACEPOINT
@@ -105,16 +105,16 @@ Index: git/arch/arm/kernel/entry-common.S
* This is how we return from a fork.
*/
@@ -87,7 +92,7 @@
- get_thread_info tsk
- ldr r1, [tsk, #TI_FLAGS] @ check for syscall tracing
- mov why, #1
+ get_thread_info tsk
+ ldr r1, [tsk, #TI_FLAGS] @ check for syscall tracing
+ mov why, #1
- tst r1, #_TIF_SYSCALL_TRACE @ are we tracing syscalls?
+ test_syscall_tracing r1
- beq ret_slow_syscall
- mov r1, sp
- mov r0, #1 @ trace exit [IP = 1]
+ beq ret_slow_syscall
+ mov r1, sp
+ mov r0, #1 @ trace exit [IP = 1]
@@ -98,6 +103,13 @@
- .equ NR_syscalls,0
+ .equ NR_syscalls,0
#define CALL(x) .equ NR_syscalls,NR_syscalls+1
#include "calls.S"
+
@@ -126,16 +126,16 @@ Index: git/arch/arm/kernel/entry-common.S
+
#undef CALL
#define CALL(x) .long x
-
+
@@ -443,7 +455,7 @@
1:
#endif
-
+
- tst r10, #_TIF_SYSCALL_TRACE @ are we tracing syscalls?
+ test_syscall_tracing r10
- bne __sys_trace
-
- cmp scno, #NR_syscalls @ check upper syscall limit
+ bne __sys_trace
+
+ cmp scno, #NR_syscalls @ check upper syscall limit
Index: git/arch/arm/kernel/ptrace.c
===================================================================
--- git.orig/arch/arm/kernel/ptrace.c 2012-09-25 15:42:06.000000000 -0500
@@ -143,7 +143,7 @@ Index: git/arch/arm/kernel/ptrace.c
@@ -28,6 +28,9 @@
#include <asm/system.h>
#include <asm/traps.h>
-
+
+#define CREATE_TRACE_POINTS
+#include <trace/events/syscalls.h>
+
@@ -152,18 +152,18 @@ Index: git/arch/arm/kernel/ptrace.c
/*
@@ -906,7 +909,8 @@
{
- unsigned long ip;
-
+ unsigned long ip;
+
- if (!test_thread_flag(TIF_SYSCALL_TRACE))
+ if (!test_thread_flag(TIF_SYSCALL_TRACE) &&
+ !test_thread_flag(TIF_SYSCALL_TRACEPOINT))
- return scno;
-
- /*
+ return scno;
+
+ /*
@@ -918,10 +922,19 @@
-
- current_thread_info()->syscall = scno;
-
+
+ current_thread_info()->syscall = scno;
+
- if (why)
- tracehook_report_syscall_exit(regs, 0);
- else if (tracehook_report_syscall_entry(regs))
@@ -181,6 +181,5 @@ Index: git/arch/arm/kernel/ptrace.c
+ else
+ trace_sys_enter(regs, scno);
+ }
-
- regs->ARM_ip = ip;
-
+
+ regs->ARM_ip = ip;
diff --git a/recipes/lttng-2.0/linux-omap4_3.1.0/arm-tracehook/0004-syscall.h-include-linux-sched.h.patch b/meta-ti/recipes-kernel/linux/linux-omap4_3.1.0/arm-tracehook/0004-syscall.h-include-linux-sched.h.patch
similarity index 98%
rename from recipes/lttng-2.0/linux-omap4_3.1.0/arm-tracehook/0004-syscall.h-include-linux-sched.h.patch
rename to meta-ti/recipes-kernel/linux/linux-omap4_3.1.0/arm-tracehook/0004-syscall.h-include-linux-sched.h.patch
index bb46693..3b2794b 100644
--- a/recipes/lttng-2.0/linux-omap4_3.1.0/arm-tracehook/0004-syscall.h-include-linux-sched.h.patch
+++ b/meta-ti/recipes-kernel/linux/linux-omap4_3.1.0/arm-tracehook/0004-syscall.h-include-linux-sched.h.patch
@@ -17,12 +17,11 @@ index 47486a4..9fdded6 100644
+++ b/arch/arm/include/asm/syscall.h
@@ -8,6 +8,7 @@
#define _ASM_ARM_SYSCALL_H
-
+
#include <linux/err.h>
+#include <linux/sched.h>
-
+
#include <asm/unistd.h>
-
---
-1.7.0.4
+--
+1.7.0.4
diff --git a/recipes/lttng-2.0/linux-omap4_3.1.0/commit-4ff16c2.patch b/meta-ti/recipes-kernel/linux/linux-omap4_3.1.0/commit-4ff16c2.patch
similarity index 94%
rename from recipes/lttng-2.0/linux-omap4_3.1.0/commit-4ff16c2.patch
rename to meta-ti/recipes-kernel/linux/linux-omap4_3.1.0/commit-4ff16c2.patch
index bb425e1..860a17c 100644
--- a/recipes/lttng-2.0/linux-omap4_3.1.0/commit-4ff16c2.patch
+++ b/meta-ti/recipes-kernel/linux/linux-omap4_3.1.0/commit-4ff16c2.patch
@@ -3,23 +3,23 @@ Author: David Smith <dsmith at redhat.com>
Date: Tue Feb 7 10:11:05 2012 -0600
tracepoint, vfs, sched: Add exec() tracepoint
-
+
Added a minimal exec tracepoint. Exec is an important major event
in the life of a task, like fork(), clone() or exit(), all of
which we already trace.
-
+
[ We also do scheduling re-balancing during exec() - so it's useful
from a scheduler instrumentation POV as well. ]
-
+
If you want to watch a task start up, when it gets exec'ed is a good place
to start. With the addition of this tracepoint, exec's can be monitored
and better picture of general system activity can be obtained. This
tracepoint will also enable better process life tracking, allowing you to
answer questions like "what process keeps starting up binary X?".
-
+
This tracepoint can also be useful in ftrace filtering and trigger
conditions: i.e. starting or stopping filtering when exec is called.
-
+
Signed-off-by: David Smith <dsmith at redhat.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
Cc: Steven Rostedt <rostedt at goodmis.org>
@@ -37,16 +37,16 @@ index aeb135c..d0d2080 100644
@@ -63,6 +63,8 @@
#include <trace/events/task.h>
#include "internal.h"
-
+
+#include <trace/events/sched.h>
+
int core_uses_pid;
char core_pattern[CORENAME_MAX_SIZE] = "core";
unsigned int core_pipe_limit;
@@ -1401,9 +1403,10 @@ int search_binary_handler(struct linux_binprm *bprm,struct pt_regs *regs)
- */
- bprm->recursion_depth = depth;
- if (retval >= 0) {
+ */
+ bprm->recursion_depth = depth;
+ if (retval >= 0) {
- if (depth == 0)
- ptrace_event(PTRACE_EVENT_EXEC,
- old_pid);
@@ -54,24 +54,24 @@ index aeb135c..d0d2080 100644
+ trace_sched_process_exec(current, old_pid, bprm);
+ ptrace_event(PTRACE_EVENT_EXEC, old_pid);
+ }
- put_binfmt(fmt);
- allow_write_access(bprm->file);
- if (bprm->file)
+ put_binfmt(fmt);
+ allow_write_access(bprm->file);
+ if (bprm->file)
diff --git a/include/trace/events/sched.h b/include/trace/events/sched.h
index 6ba596b..e61ddfe 100644
--- a/include/trace/events/sched.h
+++ b/include/trace/events/sched.h
@@ -6,6 +6,7 @@
-
+
#include <linux/sched.h>
#include <linux/tracepoint.h>
+#include <linux/binfmts.h>
-
+
/*
* Tracepoint for calling kthread_stop, performed to end a kthread:
@@ -276,6 +277,32 @@ TRACE_EVENT(sched_process_fork,
);
-
+
/*
+ * Tracepoint for exec:
+ */
diff --git a/recipes/lttng-2.0/linux-omap4_3.1.0/stap-opts.cfg b/meta-ti/recipes-kernel/linux/linux-omap4_3.1.0/stap-opts.cfg
similarity index 100%
rename from recipes/lttng-2.0/linux-omap4_3.1.0/stap-opts.cfg
rename to meta-ti/recipes-kernel/linux/linux-omap4_3.1.0/stap-opts.cfg
diff --git a/recipes/systemd/systemd_git.bbappend b/systemd-layer/recipes-core/systemd/systemd_git.bbappend
similarity index 100%
rename from recipes/systemd/systemd_git.bbappend
rename to systemd-layer/recipes-core/systemd/systemd_git.bbappend
--
1.7.9.5
More information about the meta-mentor
mailing list