From patchwork Wed Apr 5 13:58:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 79688 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp354616vqo; Wed, 5 Apr 2023 07:34:49 -0700 (PDT) X-Google-Smtp-Source: AKy350ZSKxNwi4ohd1vO3BlzM+HzsKaC+h+DjTH5iNgztQA1kXOOy8rdwmktxfnWTKi8WemrbgEA X-Received: by 2002:a17:902:f68a:b0:1a2:8866:e8a4 with SMTP id l10-20020a170902f68a00b001a28866e8a4mr8176215plg.1.1680705289665; Wed, 05 Apr 2023 07:34:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680705289; cv=none; d=google.com; s=arc-20160816; b=Mo7DeoNw4NGhc7wGYcknJA98PaanyOXovBDoTPGLDlWSVLIf1AfVOwIGyIknQeAlAd g61/ltmh1JShfj6pxg9V6CxRVir38o7NReXG1R3UX+aLgJS9GZgVZ+3JegPIYMpXeqk5 MTQj+z8/aOkpIzdN2flOw9qWwIr4z96EYRksYwb/oMJeOWtrGliB26yZE0CkXNdauTjP z2SwziXnDblAGrhRDo2b3HTd/TuRVTOq83CxEAtGUJno29LT/FIAMsaMXZzDxOXaghJ1 QEyaKLyjYW1pJA3QLB0Gi+oVVJXnRKVOCeDtjWvoT+iV+xWBKlxeG8YtIqlNJWrhU1ha XtfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:subject:cc:to:from:date :user-agent:message-id; bh=dJQu5FWNzjA/ZKXLGpSHPdmCiPfLaMnY8MX1T+ZcJqA=; b=xVgdSCPgZ46SdxeYnxCW5ch6d5H1cYfogUcZSyHoqdtnv9UygA+ew5VN0NigUHuy+7 g/faZEDxiX0DI6oTYwdDHRd0DE4Hl6xlDoFlEHKSb0763jH5GlO7Av/C9iuVV5jNsqnF WBrJyCjM12Y418FHhlZ4NZF1RnZAZTn2ChT+fS0YRGUt/fpbr9eY3NU0E0AGTtXuXQ4J 4COS2CWEaxmQdxY4FYHtfWmvd/x9Ce4Oqq5CuOP7HC1Smz0cPb2mQWoAJ9isCTtm/Zeo /Im+YmWuMnGzoN8UXpnpshcdWeRn7AS9K6bb2oXPZr3CqQvDqv5jFnpi72HM4Y+3Ap5j 9W5Q== 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 jj12-20020a170903048c00b001a19f187e90si12255906plb.331.2023.04.05.07.34.35; Wed, 05 Apr 2023 07:34: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 S238526AbjDEO1P (ORCPT + 99 others); Wed, 5 Apr 2023 10:27:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56754 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238116AbjDEO1J (ORCPT ); Wed, 5 Apr 2023 10:27:09 -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 B07584C20; Wed, 5 Apr 2023 07:26:56 -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 414CA62304; Wed, 5 Apr 2023 14:26:56 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B52F6C433D2; Wed, 5 Apr 2023 14:26:55 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.96) (envelope-from ) id 1pk46A-000qjG-2Y; Wed, 05 Apr 2023 10:26:54 -0400 Message-ID: <20230405142654.612405137@goodmis.org> User-Agent: quilt/0.66 Date: Wed, 05 Apr 2023 09:58:14 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Andrew Morton , stable@vger.kernel.org, Ross Zwisler Subject: [for-linus][PATCH 1/3] tracing: Have tracing_snapshot_instance_cond() write errors to the appropriate instance References: <20230405135813.735507007@goodmis.org> 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?1762347229357688791?= X-GMAIL-MSGID: =?utf-8?q?1762347229357688791?= From: "Steven Rostedt (Google)" If a trace instance has a failure with its snapshot code, the error message is to be written to that instance's buffer. But currently, the message is written to the top level buffer. Worse yet, it may also disable the top level buffer and not the instance that had the issue. Link: https://lkml.kernel.org/r/20230405022341.688730321@goodmis.org Cc: stable@vger.kernel.org Cc: Masami Hiramatsu Cc: Mark Rutland Cc: Andrew Morton Cc: Ross Zwisler Fixes: 2824f50332486 ("tracing: Make the snapshot trigger work with instances") Signed-off-by: Steven Rostedt (Google) --- kernel/trace/trace.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 937e9676dfd4..ed1d1093f5e9 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -1149,22 +1149,22 @@ static void tracing_snapshot_instance_cond(struct trace_array *tr, unsigned long flags; if (in_nmi()) { - internal_trace_puts("*** SNAPSHOT CALLED FROM NMI CONTEXT ***\n"); - internal_trace_puts("*** snapshot is being ignored ***\n"); + trace_array_puts(tr, "*** SNAPSHOT CALLED FROM NMI CONTEXT ***\n"); + trace_array_puts(tr, "*** snapshot is being ignored ***\n"); return; } if (!tr->allocated_snapshot) { - internal_trace_puts("*** SNAPSHOT NOT ALLOCATED ***\n"); - internal_trace_puts("*** stopping trace here! ***\n"); - tracing_off(); + trace_array_puts(tr, "*** SNAPSHOT NOT ALLOCATED ***\n"); + trace_array_puts(tr, "*** stopping trace here! ***\n"); + tracer_tracing_off(tr); return; } /* Note, snapshot can not be used when the tracer uses it */ if (tracer->use_max_tr) { - internal_trace_puts("*** LATENCY TRACER ACTIVE ***\n"); - internal_trace_puts("*** Can not use snapshot (sorry) ***\n"); + trace_array_puts(tr, "*** LATENCY TRACER ACTIVE ***\n"); + trace_array_puts(tr, "*** Can not use snapshot (sorry) ***\n"); return; }