From nobody Mon May 11 02:56:32 2026 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 456BFC433EF for ; Mon, 18 Apr 2022 07:41:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236983AbiDRHnq (ORCPT ); Mon, 18 Apr 2022 03:43:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47248 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231948AbiDRHnn (ORCPT ); Mon, 18 Apr 2022 03:43:43 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 29E0517E38 for ; Mon, 18 Apr 2022 00:41:01 -0700 (PDT) Received: from kwepemi100019.china.huawei.com (unknown [172.30.72.53]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4Khf4R05hyzhXY1; Mon, 18 Apr 2022 15:40:54 +0800 (CST) Received: from kwepemm600010.china.huawei.com (7.193.23.86) by kwepemi100019.china.huawei.com (7.221.188.189) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Mon, 18 Apr 2022 15:40:59 +0800 Received: from ubuntu1804.huawei.com (10.67.174.174) by kwepemm600010.china.huawei.com (7.193.23.86) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Mon, 18 Apr 2022 15:40:59 +0800 From: Li Huafei To: CC: , , Subject: [PATCH] tracing: Reset the function filter after completing trampoline/graph selftest Date: Mon, 18 Apr 2022 15:39:58 +0800 Message-ID: <20220418073958.104029-1-lihuafei1@huawei.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 X-Originating-IP: [10.67.174.174] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To kwepemm600010.china.huawei.com (7.193.23.86) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The direct trampoline and graph coexistence test sets global_ops to trace only 'trace_selftest_dynamic_test_func', but does not reset it after the test is completed, resulting in the function filter being set already after the system starts. Although it can be reset through the tracefs interface, it is more or less confusing to the user, and we should reset it to trace all functions after the trampoline/graph test completes. Fixes: 130c08065848 ("tracing: Add trampoline/graph selftest") Signed-off-by: Li Huafei --- kernel/trace/trace_selftest.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/kernel/trace/trace_selftest.c b/kernel/trace/trace_selftest.c index abcadbe933bb..e89f72571f8e 100644 --- a/kernel/trace/trace_selftest.c +++ b/kernel/trace/trace_selftest.c @@ -866,12 +866,12 @@ trace_selftest_startup_function_graph(struct tracer *= trace, ret =3D register_ftrace_direct((unsigned long) DYN_FTRACE_TEST_NAME, (unsigned long) trace_direct_tramp); if (ret) - goto out; + goto reset_filter; =20 ret =3D register_ftrace_graph(&fgraph_ops); if (ret) { warn_failed_init_tracer(trace, ret); - goto out; + goto reset_filter; } =20 DYN_FTRACE_TEST_NAME(); @@ -887,14 +887,18 @@ trace_selftest_startup_function_graph(struct tracer *= trace, ret =3D unregister_ftrace_direct((unsigned long) DYN_FTRACE_TEST_NAME, (unsigned long) trace_direct_tramp); if (ret) - goto out; + goto reset_filter; =20 tracing_start(); =20 if (!ret && !count) { ret =3D -1; - goto out; + goto reset_filter; } + +reset_filter: + /* Enable tracing on all functions again */ + ftrace_set_global_filter(NULL, 0, 1); #endif =20 /* Don't test dynamic tracing, the function tracer already did */ --=20 2.17.1