From patchwork Fri Apr 7 20:33:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 81040 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp515677vqo; Fri, 7 Apr 2023 13:36:49 -0700 (PDT) X-Google-Smtp-Source: AKy350YJe+U8FMIdaXhVx9Sw4khjZg1QQTv3ekBObDw51rvli4A6/aLsEgCWHV7HTH2dahNjJhjt X-Received: by 2002:a17:906:82d2:b0:930:9cec:2fb9 with SMTP id a18-20020a17090682d200b009309cec2fb9mr578828ejy.77.1680899809677; Fri, 07 Apr 2023 13:36:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680899809; cv=none; d=google.com; s=arc-20160816; b=iPcZwrU4DyUQCeb5XItFFsT1IgDhGgHiGsURNc51rJ1UzZf6KR7AbGz0N7kWk8V9Gd A1Ezrf/Gi5m80+N/gtCTWr/Zktb1i3sfrIB5+MdBYgwN88WvFCFuhRLoIm32A/qAtmBU pa4dw+LuL+IOaQWeSa4NX77+BH7s9EmpErV9Q9IJ/4GqjL76lzASS0Ebu517YBBqAs/R 8HZJIYziOozGdGFUttY6EjO48wCOdQ0OusuRmtoJy3tVeKpr7PX4des2l1KWZ8TikHtY t0AUXjwg3ExcVEiJIF0jcIedC/HI97/lqjx/SwYET3tXM24VDmXdeAOgHh5Q9uh59h76 cE+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:subject:cc:to:from:date; bh=3iShmIfzWc2xoYqRaQfg7d3H0Ikht6Dx3LPq+GcSMaU=; b=l+P2beBjrPIC11frUzvTBHEqWiuAVcZZt44Ks5oddnwQlgexUCVzKR9hD55ElQkWEr hdhzoidOAbFdKQMMkM5+2zbRtbj8Pym879e8RpzkX4wLhiteWiOkjTWaEv96uyFEThsH PbFht4mNsoqsxPo3dkD4jTkQluk1pc+Sqc29rJYZOTth50dJkdgnn8Vfi8SiBlJ390dQ rndE0scKOXO+1jdP8iKrbhnuL+osG+9rwqHERUrK6atNG79uPOAd13KD6K50VImMy9EC QpxowgjY1YvkDmr6gHoC0vroe1m31TaS5QzQHE72VbOxoD//ZyKXnxeYTwwJfFSiZRCZ gnXA== 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i1-20020a1709064ec100b0093161749da7si3424882ejv.369.2023.04.07.13.36.24; Fri, 07 Apr 2023 13:36:49 -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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229766AbjDGUfS (ORCPT + 99 others); Fri, 7 Apr 2023 16:35:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32782 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231715AbjDGUfP (ORCPT ); Fri, 7 Apr 2023 16:35:15 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2451ACA20 for ; Fri, 7 Apr 2023 13:34:42 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 422D4612CE for ; Fri, 7 Apr 2023 20:33:49 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E1B78C433D2; Fri, 7 Apr 2023 20:33:47 +0000 (UTC) Date: Fri, 7 Apr 2023 16:33:43 -0400 From: Steven Rostedt To: Linus Torvalds Cc: LKML , Masami Hiramatsu , Andrew Morton , Zheng Yejian Subject: [GIT PULL] tracing: A couple more minor fixes Message-ID: <20230407163343.2a8b780d@gandalf.local.home> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.33; x86_64-pc-linux-gnu) MIME-Version: 1.0 X-Spam-Status: No, score=-2.0 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1762551198629650835?= X-GMAIL-MSGID: =?utf-8?q?1762551198629650835?= Linus, Some more tracing fixes for 6.3: - Reset direct->addr back to its original value on error in updating the direct trampoline code. - Make lastcmd_mutex static. Please pull the latest trace-v6.3-rc5-2 tree, which can be found at: git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git trace-v6.3-rc5-2 Tag SHA1: 6eaf0925d5343e35303a4e3dc0082f889c9d8d78 Head SHA1: 31c683967174b487939efaf65e41f5ff1404e141 Steven Rostedt (Google) (1): tracing/synthetic: Make lastcmd_mutex static Zheng Yejian (1): ftrace: Fix issue that 'direct->addr' not restored in modify_ftrace_direct() ---- kernel/trace/ftrace.c | 15 +++++++++------ kernel/trace/trace_events_synth.c | 2 +- 2 files changed, 10 insertions(+), 7 deletions(-) --------------------------- diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index 0feea145bb29..c67bcc89a771 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c @@ -5667,12 +5667,15 @@ int modify_ftrace_direct(unsigned long ip, ret = 0; } - if (unlikely(ret && new_direct)) { - direct->count++; - list_del_rcu(&new_direct->next); - synchronize_rcu_tasks(); - kfree(new_direct); - ftrace_direct_func_count--; + if (ret) { + direct->addr = old_addr; + if (unlikely(new_direct)) { + direct->count++; + list_del_rcu(&new_direct->next); + synchronize_rcu_tasks(); + kfree(new_direct); + ftrace_direct_func_count--; + } } out_unlock: diff --git a/kernel/trace/trace_events_synth.c b/kernel/trace/trace_events_synth.c index f0ff730125bf..d6a70aff2410 100644 --- a/kernel/trace/trace_events_synth.c +++ b/kernel/trace/trace_events_synth.c @@ -44,7 +44,7 @@ enum { ERRORS }; static const char *err_text[] = { ERRORS }; -DEFINE_MUTEX(lastcmd_mutex); +static DEFINE_MUTEX(lastcmd_mutex); static char *last_cmd; static int errpos(const char *str)