From nobody Sun Sep 22 05:37:50 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E5923C433F5 for ; Wed, 23 Mar 2022 15:23:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245099AbiCWPYt (ORCPT ); Wed, 23 Mar 2022 11:24:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42618 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237920AbiCWPYp (ORCPT ); Wed, 23 Mar 2022 11:24:45 -0400 Received: from mailgw02.mediatek.com (unknown [210.61.82.184]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0976F6457 for ; Wed, 23 Mar 2022 08:23:10 -0700 (PDT) X-UUID: bc05cc2ac3a54ca6a036885f2073a2bb-20220323 X-UUID: bc05cc2ac3a54ca6a036885f2073a2bb-20220323 Received: from mtkexhb02.mediatek.inc [(172.21.101.103)] by mailgw02.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 1833512258; Wed, 23 Mar 2022 23:23:03 +0800 Received: from mtkcas10.mediatek.inc (172.21.101.39) by mtkmbs07n2.mediatek.inc (172.21.101.141) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Wed, 23 Mar 2022 23:23:01 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkcas10.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Wed, 23 Mar 2022 23:23:01 +0800 From: Mark-PK Tsai To: , CC: , , , , , Subject: [PATCH v3 1/2] tracing: Avoid adding tracer option before update_tracer_options Date: Wed, 23 Mar 2022 23:22:56 +0800 Message-ID: <20220323152257.7871-2-mark-pk.tsai@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20220323152257.7871-1-mark-pk.tsai@mediatek.com> References: <20220323152257.7871-1-mark-pk.tsai@mediatek.com> MIME-Version: 1.0 X-MTK: N Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" To prepare for support asynchronous tracer_init_tracefs initcall, avoid calling create_trace_option_files before __update_tracer_options. Otherwise, create_trace_option_files will show warning because some tracers in trace_types list are already in tr->topts. For example, hwlat_tracer call register_tracer in late_initcall, and global_trace.dir is already created in tracing_init_dentry, hwlat_tracer will be put into tr->topts. Then if the __update_tracer_options is executed after hwlat_tracer registered, create_trace_option_files find that hwlat_tracer is already in tr->topts. Link: https://lore.kernel.org/lkml/20220322133339.GA32582@xsang-OptiPlex-90= 20/ Reported-by: kernel test robot Signed-off-by: Mark-PK Tsai --- kernel/trace/trace.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index eb44418574f9..85ec758c4455 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -6317,12 +6317,18 @@ static void tracing_set_nop(struct trace_array *tr) tr->current_trace =3D &nop_trace; } =20 +static bool tracer_options_updated; + static void add_tracer_options(struct trace_array *tr, struct tracer *t) { /* Only enable if the directory has been created already. */ if (!tr->dir) return; =20 + /* Only create trace option files after update_tracer_options finish */ + if (!tracer_options_updated) + return; + create_trace_option_files(tr, t); } =20 @@ -9133,6 +9139,7 @@ static void update_tracer_options(struct trace_array = *tr) { mutex_lock(&trace_types_lock); __update_tracer_options(tr); + tracer_options_updated =3D true; mutex_unlock(&trace_types_lock); } =20 --=20 2.18.0 From nobody Sun Sep 22 05:37:50 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 93A13C433F5 for ; Wed, 23 Mar 2022 15:23:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245113AbiCWPYz (ORCPT ); Wed, 23 Mar 2022 11:24:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42744 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245096AbiCWPYs (ORCPT ); Wed, 23 Mar 2022 11:24:48 -0400 Received: from mailgw02.mediatek.com (unknown [210.61.82.184]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0AF35BC96 for ; Wed, 23 Mar 2022 08:23:12 -0700 (PDT) X-UUID: c3bd6049ef754fcdb4d69a74ef15eca9-20220323 X-UUID: c3bd6049ef754fcdb4d69a74ef15eca9-20220323 Received: from mtkcas10.mediatek.inc [(172.21.101.39)] by mailgw02.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 449557789; Wed, 23 Mar 2022 23:23:04 +0800 Received: from mtkcas10.mediatek.inc (172.21.101.39) by mtkmbs10n2.mediatek.inc (172.21.101.183) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.2.792.3; Wed, 23 Mar 2022 23:23:03 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkcas10.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Wed, 23 Mar 2022 23:23:02 +0800 From: Mark-PK Tsai To: , CC: , , , , , Subject: [PATCH v3 2/2] tracing: make tracer_init_tracefs initcall asynchronous Date: Wed, 23 Mar 2022 23:22:57 +0800 Message-ID: <20220323152257.7871-3-mark-pk.tsai@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20220323152257.7871-1-mark-pk.tsai@mediatek.com> References: <20220323152257.7871-1-mark-pk.tsai@mediatek.com> MIME-Version: 1.0 X-MTK: N Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Move trace_eval_init() to subsys_initcall to make it start earlier. And to avoid tracer_init_tracefs being blocked by trace_event_sem which trace_eval_init() hold [1], queue tracer_init_tracefs() to eval_map_wq to let the two works being executed sequentially. It can speed up the initialization of kernel as result of making tracer_init_tracefs asynchronous. On my arm64 platform, it reduce ~20ms of 125ms which total time do_initcalls spend. [1]: https://lore.kernel.org/r/68d7b3327052757d0cd6359a6c9015a85b437232.cam= el@pengutronix.de Signed-off-by: Mark-PK Tsai --- kernel/trace/trace.c | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 85ec758c4455..2974ae056068 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -9571,6 +9571,7 @@ extern struct trace_eval_map *__stop_ftrace_eval_maps= []; =20 static struct workqueue_struct *eval_map_wq __initdata; static struct work_struct eval_map_work __initdata; +static struct work_struct tracerfs_init_work __initdata; =20 static void __init eval_map_work_func(struct work_struct *work) { @@ -9596,6 +9597,8 @@ static int __init trace_eval_init(void) return 0; } =20 +subsys_initcall(trace_eval_init); + static int __init trace_eval_sync(void) { /* Make sure the eval map updates are finished */ @@ -9678,15 +9681,8 @@ static struct notifier_block trace_module_nb =3D { }; #endif /* CONFIG_MODULES */ =20 -static __init int tracer_init_tracefs(void) +static __init void tracer_init_tracefs_work_func(struct work_struct *work) { - int ret; - - trace_access_lock_init(); - - ret =3D tracing_init_dentry(); - if (ret) - return 0; =20 event_trace_init(); =20 @@ -9708,8 +9704,6 @@ static __init int tracer_init_tracefs(void) trace_create_file("saved_tgids", TRACE_MODE_READ, NULL, NULL, &tracing_saved_tgids_fops); =20 - trace_eval_init(); - trace_create_eval_file(NULL); =20 #ifdef CONFIG_MODULES @@ -9724,6 +9718,23 @@ static __init int tracer_init_tracefs(void) create_trace_instances(NULL); =20 update_tracer_options(&global_trace); +} + +static __init int tracer_init_tracefs(void) +{ + int ret; + + trace_access_lock_init(); + + ret =3D tracing_init_dentry(); + if (ret) + return 0; + + INIT_WORK(&tracerfs_init_work, tracer_init_tracefs_work_func); + if (!eval_map_wq) + tracer_init_tracefs_work_func(&tracerfs_init_work); + else + queue_work(eval_map_wq, &tracerfs_init_work); =20 return 0; } --=20 2.18.0