[security-next,v2,04/26] LSM: Remove initcall tracing

Message ID	20180920162338.21060-5-keescook@chromium.org (mailing list archive)
State	New, archived
Headers	show Return-Path: <linux-security-module-owner@kernel.org> From: Kees Cook <keescook@chromium.org> To: James Morris <jmorris@namei.org> Cc: Kees Cook <keescook@chromium.org>, Casey Schaufler <casey@schaufler-ca.com>, John Johansen <john.johansen@canonical.com>, Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp>, Paul Moore <paul@paul-moore.com>, Stephen Smalley <sds@tycho.nsa.gov>, "Schaufler, Casey" <casey.schaufler@intel.com>, LSM <linux-security-module@vger.kernel.org>, Jonathan Corbet <corbet@lwn.net>, linux-doc@vger.kernel.org, linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH security-next v2 04/26] LSM: Remove initcall tracing Date: Thu, 20 Sep 2018 09:23:16 -0700 Message-Id: <20180920162338.21060-5-keescook@chromium.org> In-Reply-To: <20180920162338.21060-1-keescook@chromium.org> References: <20180920162338.21060-1-keescook@chromium.org> Sender: owner-linux-security-module@vger.kernel.org Precedence: bulk
Series	LSM: Explict LSM ordering \| expand [security-next,v2,00/26] LSM: Explict LSM ordering [security-next,v2,01/26] LSM: Correctly announce start of LSM initialization [security-next,v2,02/26] vmlinux.lds.h: Avoid copy/paste of security_init section [security-next,v2,03/26] LSM: Rename .security_initcall section to .lsm_info [security-next,v2,04/26] LSM: Remove initcall tracing [security-next,v2,05/26] LSM: Convert from initcall to struct lsm_info [security-next,v2,06/26] vmlinux.lds.h: Move LSM_TABLE into INIT_DATA [security-next,v2,07/26] LSM: Convert security_initcall() into DEFINE_LSM() [security-next,v2,08/26] LSM: Record LSM name in struct lsm_info [security-next,v2,09/26] LSM: Provide init debugging infrastructure [security-next,v2,10/26] LSM: Don't ignore initialization failures [security-next,v2,11/26] LSM: Introduce LSM_FLAG_LEGACY_MAJOR [security-next,v2,12/26] LSM: Provide separate ordered initialization [security-next,v2,13/26] LSM: Plumb visibility into optional "enabled" state [security-next,v2,14/26] LSM: Lift LSM selection out of individual LSMs [security-next,v2,15/26] LSM: Introduce lsm.enable= and lsm.disable= [security-next,v2,16/26] LSM: Prepare for reorganizing "security=" logic [security-next,v2,17/26] LSM: Refactor "security=" in terms of enable/disable [security-next,v2,18/26] LSM: Build ordered list of ordered LSMs for init [security-next,v2,19/26] LSM: Introduce CONFIG_LSM_ORDER [security-next,v2,20/26] LSM: Introduce "lsm.order=" for boottime ordering [security-next,v2,21/26] LoadPin: Initialize as ordered LSM [security-next,v2,22/26] Yama: Initialize as ordered LSM [security-next,v2,23/26] LSM: Introduce enum lsm_order [security-next,v2,24/26] capability: Mark as LSM_ORDER_FIRST [security-next,v2,25/26] LSM: Separate idea of "major" LSM from "exclusive" LSM [security-next,v2,26/26] LSM: Add all exclusive LSMs to ordered initialization

Message ID

20180920162338.21060-5-keescook@chromium.org (mailing list archive)

State

New, archived

Headers

From: Kees Cook <keescook@chromium.org>
To: James Morris <jmorris@namei.org>
Cc: Kees Cook <keescook@chromium.org>,
        Casey Schaufler <casey@schaufler-ca.com>,
        John Johansen <john.johansen@canonical.com>,
        Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp>,
        Paul Moore <paul@paul-moore.com>,
        Stephen Smalley <sds@tycho.nsa.gov>,
        "Schaufler, Casey" <casey.schaufler@intel.com>,
        LSM <linux-security-module@vger.kernel.org>,
        Jonathan Corbet <corbet@lwn.net>, linux-doc@vger.kernel.org,
        linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH security-next v2 04/26] LSM: Remove initcall tracing
Date: Thu, 20 Sep 2018 09:23:16 -0700
Message-Id: <20180920162338.21060-5-keescook@chromium.org>
In-Reply-To: <20180920162338.21060-1-keescook@chromium.org>
References: <20180920162338.21060-1-keescook@chromium.org>
Sender: owner-linux-security-module@vger.kernel.org
Precedence: bulk

Series

LSM: Explict LSM ordering | expand

Commit Message

Kees Cook Sept. 20, 2018, 4:23 p.m. UTC

This partially reverts commit 58eacfffc417 ("init, tracing: instrument
security and console initcall trace events") since security init calls
are about to no longer resemble regular init calls.

Signed-off-by: Kees Cook <keescook@chromium.org>
---
 security/security.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/security/security.c b/security/security.c
index 892fe6b691cf..41a5da2c7faf 100644
--- a/security/security.c
+++ b/security/security.c
@@ -30,8 +30,6 @@ 
 #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 */
@@ -47,17 +45,13 @@  static __initdata char chosen_lsm[SECURITY_NAME_MAX + 1] =
 
 static void __init do_security_initcalls(void)
 {
-	int ret;
 	initcall_t call;
 	initcall_entry_t *ce;
 
 	ce = __start_lsm_info;
-	trace_initcall_level("security");
 	while (ce < __end_lsm_info) {
 		call = initcall_from_entry(ce);
-		trace_initcall_start(call);
-		ret = call();
-		trace_initcall_finish(call, ret);
+		call();
 		ce++;
 	}
 }

[security-next,v2,04/26] LSM: Remove initcall tracing

Commit Message

Patch