From patchwork Sat Sep 9 03:16:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 137842 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ab0a:0:b0:3f2:4152:657d with SMTP id m10csp1315641vqo; Sat, 9 Sep 2023 14:28:59 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH1yv6GEXHYrO3hlJIYjGeCzcDFUgoKRYU9RwZQ9SCAtf3VcaQnByHaooopzL5Xav6Yq0Ma X-Received: by 2002:a17:90b:1d03:b0:273:e142:f71f with SMTP id on3-20020a17090b1d0300b00273e142f71fmr4243517pjb.41.1694294938936; Sat, 09 Sep 2023 14:28:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694294938; cv=none; d=google.com; s=arc-20160816; b=gDuvjS/HtD9lHDvsCyIFaklrcj/DjwywUlPYVoXksRIGHApnasb2qFBkkakJ51Z6DX U07qlpOJ/7oa8u3CN0m202tbclB/1EzUaOa2+p3+uDC92jM3l1hhGT94vWPNASHn7dUY xFRzsU5bd71/1cK4iqt9XmUQJLSXXLvxCn07noOZSINtu9kx/qZfjQLzNIEf9xRLCPRW nxBb/cbh81LQHpChraALFsOEs1H99oZ5XTPE15wp+coZBfpq3wN6f7CwyAzzPt6W0dQP LYAYzotOKFp2G7PDe5Nz4lsGLih28n4MAy9Gzx3DmMAs1T1z5xlcwQN2mCLFoz2/0bBL EPTA== 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=mnaxNETOBRiS4BQ1wKVtOUj2L7jY767tkpDgQjPcIqU=; fh=YD2plINFzzQkeIFsZ95VaD7apA4QxoMdT5d/25lsi30=; b=hD4W5+qX4SCSq16OtRf3NjSVrKwI1feBEjUily9+v+IuwuMSGCqHk4Yn+NpIvaNZI9 PnzvrIj9tJh+XJklWk3tx/Rbu0x++uX6jwMAWfOCb5CAW6hcunHUik/oXKbHR0XFwA6j Y7QFAoJ59wjoodOl6yX18VXcj9LauVV2TGU2z+EPng5niv9/CJnjCoXiNemqPrracScW Yo9bfF3lQ/YqueS/fjtr2j1b1sh6UzGfftKdFV4jfEC/39S4/RBMlvayH0pJWo2A5oYJ sDV8pLq7NYK3uQneLh/2XREBHFqPN/MQZaoIYjT6tdLTI7NSytJQV9v/+pBtiDNEloz0 gxEw== 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 e1-20020a17090a728100b002691e035572si5567746pjg.17.2023.09.09.14.28.57; Sat, 09 Sep 2023 14:28:58 -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 S239308AbjIIDYK (ORCPT + 11 others); Fri, 8 Sep 2023 23:24:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59152 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229448AbjIIDXh (ORCPT ); Fri, 8 Sep 2023 23:23:37 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 941BB1FF2 for ; Fri, 8 Sep 2023 20:23:33 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id F17A5C433BB; Sat, 9 Sep 2023 03:23:31 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.96) (envelope-from ) id 1qeoZa-000YjQ-28; Fri, 08 Sep 2023 23:23:50 -0400 Message-ID: <20230909032350.474029750@goodmis.org> User-Agent: quilt/0.66 Date: Fri, 08 Sep 2023 23:16:27 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Andrew Morton , Ajay Kaher Subject: [for-linus][PATCH 12/15] tracing: Use the new eventfs descriptor for print trigger References: <20230909031615.047488015@goodmis.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.0 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,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 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776597010098251931 X-GMAIL-MSGID: 1776597010098251931 From: "Steven Rostedt (Google)" The check to create the print event "trigger" was using the obsolete "dir" value of the trace_event_file to determine if it should create the trigger or not. But that value will now be NULL because it uses the event file descriptor. Change it to test the "ef" field of the trace_event_file structure so that the trace_marker "trigger" file appears again. Link: https://lkml.kernel.org/r/20230908022001.371815239@goodmis.org Cc: Masami Hiramatsu Cc: Mark Rutland Cc: Andrew Morton Cc: Ajay Kaher Fixes: 27152bceea1df ("eventfs: Move tracing/events to eventfs") Signed-off-by: Steven Rostedt (Google) --- kernel/trace/trace.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 0608ad20cf30..122c23c9eb28 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -9792,8 +9792,8 @@ init_tracer_tracefs(struct trace_array *tr, struct dentry *d_tracer) tr, &tracing_mark_fops); file = __find_event_file(tr, "ftrace", "print"); - if (file && file->dir) - trace_create_file("trigger", TRACE_MODE_WRITE, file->dir, + if (file && file->ef) + eventfs_add_file("trigger", TRACE_MODE_WRITE, file->ef, file, &event_trigger_fops); tr->trace_marker_file = file;