Received: by 2002:a05:6359:c8b:b0:c7:702f:21d4 with SMTP id go11csp768914rwb; Tue, 27 Sep 2022 04:33:45 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4ljg0rL0B6ZvmCtTwYLt17QRnak7Ty/+2ypB9WSfp/EsCON/PLV1saXU915m6QOVY1CB0o X-Received: by 2002:a17:907:9483:b0:782:242:a364 with SMTP id dm3-20020a170907948300b007820242a364mr22137314ejc.595.1664278424712; Tue, 27 Sep 2022 04:33:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664278424; cv=none; d=google.com; s=arc-20160816; b=QbZBoiIFpc8dbm+yc0z2UGtrfum84esEf645ZirBqlJTnO7P05ugD0mdOKny5gXTTj kAsn+yoT93++l6K7jLVAuOLrik/66FRTu4JREjTIkbdZanBkl8r/VThrEmgdXKsJVouU nY3AmNwfKP6FlpIgn9mTbyM+sfbHZnOnQCUIMj7u7+0hP5tUWdsdPoCBE7OoftMcPc10 iXheEMzlcNCbrtybjFk54GYCiSu1Mq3DHrQsa1hLLhIhZPwtAwGWqdubXrwI8gPnpRYJ d/hBA/wWb7CbgImNlXn0key6t9wX/zdVcbhkwive8fsiJ0b0gWabZg/WOweS+e0DzOij ECxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:in-reply-to:from :references:cc:to:subject:user-agent:mime-version:date:message-id; bh=Q8BDx++NQPdIVIy93fm63el/MrjHd43D3RUGzKI+oHo=; b=XkT5nB87Sg2ZgTDgLEstvpkHR3aHLtlhyW0PZO8026xm7H9fGeN2pm538p5HMgtkJ9 zCsiej03ww+WRu5NGRzigDfsUVCJCNRi5UuixP7M3VMIf+39Z+hjRyZzam8L4u0umEqv LEAHF/qGQ6kZ/rDRBQuBynch1BZ5JdhSFf5nogoHtRo9FO1bBhug1hb6GZnXonPBrX+t RoUw6UoydC++j7/FDqQFiNOGLPD747WFWs/NcIHS3NbFtx0nH1pUHP1+XLArI1mg3BC3 mer1rCNqE/oHSWJ2AtgWC3k1QYif+0JR2HWZZ0kalJ5WmZeuN6uYBhQeyudKUNVOaHFQ 4Anw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id dr10-20020a170907720a00b00783cf05c210si1113300ejc.833.2022.09.27.04.33.11; Tue, 27 Sep 2022 04:33:44 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231863AbiI0LLt (ORCPT + 99 others); Tue, 27 Sep 2022 07:11:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40970 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231448AbiI0LLZ (ORCPT ); Tue, 27 Sep 2022 07:11:25 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9924824951 for ; Tue, 27 Sep 2022 04:10:19 -0700 (PDT) Received: from kwepemi500012.china.huawei.com (unknown [172.30.72.56]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4McGzt4SFnzpV40; Tue, 27 Sep 2022 19:07:22 +0800 (CST) Received: from [10.67.110.108] (10.67.110.108) by kwepemi500012.china.huawei.com (7.221.188.12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Tue, 27 Sep 2022 19:10:17 +0800 Message-ID: Date: Tue, 27 Sep 2022 19:10:16 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.4.0 Subject: Re: [PATCH] kprobes: Mark ftrace mcount handler functions nokprobe To: Steven Rostedt CC: , , , , , , Masami Hiramatsu References: <20220919084533.42318-1-liaochang1@huawei.com> <20220926143723.73032f8c@gandalf.local.home> From: "liaochang (A)" In-Reply-To: <20220926143723.73032f8c@gandalf.local.home> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-Originating-IP: [10.67.110.108] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To kwepemi500012.china.huawei.com (7.221.188.12) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-6.5 required=5.0 tests=BAYES_00,NICE_REPLY_A, RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 在 2022/9/27 2:37, Steven Rostedt 写道: > On Mon, 19 Sep 2022 16:45:33 +0800 > Liao Chang wrote: > >> Mark ftrace mcount handler functions nokprobe since probing on these >> functions probably reaches mcount recursivly during kprobe breakpoint >> handler for some architecture(tested for riscv, arm64), and reenter >> kprobe is treated as a fatal error, causes kernel panic. > > This looks to me that the affected archs should be made more robust for this > case than to add this to the generic code. OK, i will fix this problem in arch related code, thanks for feedback. > > -- Steve > > >> >> Pesudo code below demonstrate this problem: >> >> mcount >> function_trace_call (probed) >> arch_breakpoint_handler >> arch_setup_singlestep [mcount] >> function_trace_call (probed) >> arch_breakpoint_handler >> reenter_kprobe >> BUG >> >> Signed-off-by: Liao Chang >> --- >> kernel/trace/trace_functions.c | 5 +++++ >> 1 file changed, 5 insertions(+) >> >> diff --git a/kernel/trace/trace_functions.c b/kernel/trace/trace_functions.c >> index 9f1bfbe105e8..440a678a8c7c 100644 >> --- a/kernel/trace/trace_functions.c >> +++ b/kernel/trace/trace_functions.c >> @@ -16,6 +16,7 @@ >> #include >> #include >> #include >> +#include >> >> #include "trace.h" >> >> @@ -194,6 +195,7 @@ function_trace_call(unsigned long ip, unsigned long parent_ip, >> >> ftrace_test_recursion_unlock(bit); >> } >> +NOKPROBE_SYMBOL(function_trace_call); >> >> #ifdef CONFIG_UNWINDER_ORC >> /* >> @@ -245,6 +247,7 @@ function_stack_trace_call(unsigned long ip, unsigned long parent_ip, >> atomic_dec(&data->disabled); >> local_irq_restore(flags); >> } >> +NOKPROBE_SYMBOL(function_stack_trace_call); >> >> static inline bool is_repeat_check(struct trace_array *tr, >> struct trace_func_repeats *last_info, >> @@ -321,6 +324,7 @@ function_no_repeats_trace_call(unsigned long ip, unsigned long parent_ip, >> out: >> ftrace_test_recursion_unlock(bit); >> } >> +NOKPROBE_SYMBOL(function_no_repeats_trace_call); >> >> static void >> function_stack_no_repeats_trace_call(unsigned long ip, unsigned long parent_ip, >> @@ -363,6 +367,7 @@ function_stack_no_repeats_trace_call(unsigned long ip, unsigned long parent_ip, >> atomic_dec(&data->disabled); >> local_irq_restore(flags); >> } >> +NOKPROBE_SYMBOL(function_stack_no_repeats_trace_call); >> >> static struct tracer_opt func_opts[] = { >> #ifdef CONFIG_STACKTRACE > > > . -- BR, Liao, Chang