aboutsummaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorAbderrahmane Benbachir <abderrahmane.benbachir@polymtl.ca>2018-03-22 20:33:28 -0400
committerSteven Rostedt (VMware) <rostedt@goodmis.org>2018-04-06 08:56:55 -0400
commit58eacfffc41735c9155becc73cb7f4dcc60a46a9 (patch)
tree91c31d03ea18b827060687d4cc6d61600e6f4504 /security
parent4ee7c60de83ac01fa4c33c55937357601631e8ad (diff)
downloadlinux-stericsson-58eacfffc41735c9155becc73cb7f4dcc60a46a9.tar.gz
init, tracing: instrument security and console initcall trace events
Trace events have been added around the initcall functions defined in init/main.c. But console and security have their own initcalls. This adds the trace events associated for those initcall functions. Link: http://lkml.kernel.org/r/1521765208.19745.2.camel@polymtl.ca Cc: Ingo Molnar <mingo@redhat.com> Cc: Peter Zijlstra <peterz@infradead.org> Signed-off-by: Abderrahmane Benbachir <abderrahmane.benbachir@polymtl.ca> Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Diffstat (limited to 'security')
-rw-r--r--security/security.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/security/security.c b/security/security.c
index 1cd8526cb0b7..987afe3d464c 100644
--- a/security/security.c
+++ b/security/security.c
@@ -30,6 +30,8 @@
#include <linux/string.h>
#include <net/flow.h>
+#include <trace/events/initcall.h>
+
#define MAX_LSM_EVM_XATTR 2
/* Maximum number of letters for an LSM name string */
@@ -45,10 +47,14 @@ static __initdata char chosen_lsm[SECURITY_NAME_MAX + 1] =
static void __init do_security_initcalls(void)
{
+ int ret;
initcall_t *call;
call = __security_initcall_start;
+ trace_initcall_level("security");
while (call < __security_initcall_end) {
- (*call) ();
+ trace_initcall_start((*call));
+ ret = (*call) ();
+ trace_initcall_finish((*call), ret);
call++;
}
}