From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754653AbbLYHD7 (ORCPT ); Fri, 25 Dec 2015 02:03:59 -0500 Received: from mga11.intel.com ([192.55.52.93]:63756 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754424AbbLYHDP (ORCPT ); Fri, 25 Dec 2015 02:03:15 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,477,1444719600"; d="scan'208";a="623513247" Subject: [PATCH 2/2] module: deal with the failure of complete_formation To: Steven Rostedt , Ingo Molnar , Rusty Russell References: <567CE0A7.80605@intel.com> Cc: linux-kernel@vger.kernel.org, yanmin_zhang@linux.intel.com From: "Qiu, PeiyangX" Message-ID: <567CEA31.1070507@intel.com> Date: Fri, 25 Dec 2015 15:03:13 +0800 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:38.0) Gecko/20100101 Thunderbird/38.4.0 MIME-Version: 1.0 In-Reply-To: <567CE0A7.80605@intel.com> Content-Type: text/plain; charset=gbk Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Qiu Peiyang complete_formation might fail. kernel need clean up ftrace records of the module. The patch fixes it by tuning the operation sequence in complete_formation. After complete_formation checks verify_export_symbols, call ftrace_module_init to init ftrace records. Signed-off-by: Qiu Peiyang Signed-off-by: Zhang Yanmin --- kernel/module.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/kernel/module.c b/kernel/module.c index 8f051a1..0a67c4e 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -3373,6 +3373,11 @@ static int complete_formation(struct module *mod, struct load_info *info) /* This relies on module_mutex for list integrity. */ module_bug_finalize(info->hdr, info->sechdrs, mod); + mutex_unlock(&module_mutex); + + /* Ftrace init must be called in the MODULE_STATE_UNFORMED state */ + ftrace_module_init(mod); + /* Set RO and NX regions for core */ set_section_ro_nx(mod->module_core, mod->core_text_size, @@ -3388,7 +3393,6 @@ static int complete_formation(struct module *mod, struct load_info *info) /* Mark state as coming so strong_try_module_get() ignores us, * but kallsyms etc. can see us. */ mod->state = MODULE_STATE_COMING; - mutex_unlock(&module_mutex); blocking_notifier_call_chain(&module_notify_list, MODULE_STATE_COMING, mod); @@ -3505,9 +3509,6 @@ static int load_module(struct load_info *info, const char __user *uargs, dynamic_debug_setup(info->debug, info->num_debug); - /* Ftrace init must be called in the MODULE_STATE_UNFORMED state */ - ftrace_module_init(mod); - /* Finally it's fully formed, ready to start executing. */ err = complete_formation(mod, info); if (err) -- 1.9.1