From patchwork Thu Sep 14 16:35:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 139693 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp477792vqi; Thu, 14 Sep 2023 09:39:08 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFFqfIycj2ByqTNx06ZiW3SqT2HCUmqvmu1ojuWRo20RIl7Gg2h6iEApT9dy0HzbXx/Gupu X-Received: by 2002:a17:90a:aa88:b0:273:441a:dae6 with SMTP id l8-20020a17090aaa8800b00273441adae6mr5810411pjq.19.1694709548119; Thu, 14 Sep 2023 09:39:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694709548; cv=none; d=google.com; s=arc-20160816; b=HOCVtUE7E5PiwVBQv/MbNRV1Cl6WX0n9xKBXVE0bBaf/YX0ETxFfVd/wlOUY9JVjnb g+a6D7BtTkvBvzOVoa4/apL6I/c6PBvBGqp/r1eKmtGcAOQ7SFsWnzZwtkP5W1fZlAhl a3OMsp/HcGD+sv8pX/lgA+jGNQXHc8GFeEKNTze3qOx+GrU9lWLIU+jAqwHlcvGZjLlV bzBmBBjrWwHE7TgySDvL/4EMUk8egAcIdJlKyg9H76CGqF6+3+QB66f7cs42nFLVSczD RV0EXc/MeVEqlRb0HtKX5P/xW/ulK+IgBSgCb0YBF6lTemD9thUD/mRVwve+GU3NkySl QoIg== 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=GldJrIzB/olXDbFvnElNV/XJVdrOtKeUJ9Kqru+LYaM=; fh=rjFf2Qs0A83L06RBhuRXHLiK/k7VWIWgHuoJoNWJMnQ=; b=DfP3Mb3vRL1UWpSpnYh167x4Wba6U0oru1+MXEN5bP4FfnnVCvFeNomWxaMjh7Zu6T gAC3OtVCZnSEYbn9x27Eu144Lzp40NIO81RfqtuHABemtqgxrl3+KMjS45cZrV8FgUTb /Hz9Xyd3dlyD409qeOsi7rd12t5uJqwH0Ut1BgTXjpFSP1Z+zzrJVsX2gvUGhXSlyeFw bfojXU60QnRYESZnhFPXjCAMUuCOLVDAL0k18MUqZfCOpTpSUVJ77LVVrCjCMpmRQKtu +qpgYeYowVXqAOiO50pS+Ypuj+3ZGtRcA9l62Lqnd0ntxzJBr9TJi6/vOpSixBaoxTAY e1xg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from pete.vger.email (pete.vger.email. [23.128.96.36]) by mx.google.com with ESMTPS id i10-20020a17090acf8a00b0026d4e16c957si4090114pju.77.2023.09.14.09.39.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Sep 2023 09:39:08 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by pete.vger.email (Postfix) with ESMTP id DBE01818FBD9; Thu, 14 Sep 2023 09:35:30 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238393AbjINQfT (ORCPT + 33 others); Thu, 14 Sep 2023 12:35:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56040 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229568AbjINQfR (ORCPT ); Thu, 14 Sep 2023 12:35:17 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4FB6C1FDC; Thu, 14 Sep 2023 09:35:13 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id F039BC433C9; Thu, 14 Sep 2023 16:35:12 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.96) (envelope-from ) id 1qgpJX-000tWE-2A; Thu, 14 Sep 2023 12:35:35 -0400 Message-ID: <20230914163535.487267410@goodmis.org> User-Agent: quilt/0.66 Date: Thu, 14 Sep 2023 12:35:06 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Andrew Morton , Ajay Kaher , chinglinyu@google.com, lkp@intel.com, namit@vmware.com, oe-lkp@lists.linux.dev, amakhalov@vmware.com, er.ajay.kaher@gmail.com, srivatsa@csail.mit.edu, tkundu@vmware.com, vsirnapalli@vmware.com Subject: [PATCH 2/2 v3] tracing/selftests: Update kprobe args char/string to match new functions References: <20230914163504.884804272@goodmis.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (pete.vger.email [0.0.0.0]); Thu, 14 Sep 2023 09:35:30 -0700 (PDT) X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,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 pete.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777031759291138412 X-GMAIL-MSGID: 1777031759291138412 From: "Steven Rostedt (Google)" The function that the kprobe_args_char and kprobes_arg_string attaches to for its test has changed its name once again. Now we need to check for eventfs_create_dir(), and if it exists, use that, otherwise check for eventfs_add_dir() and if that exists use that, otherwise use the original tracefs_create_dir()! Acked-by: Masami Hiramatsu (Google) Signed-off-by: Steven Rostedt (Google) --- .../selftests/ftrace/test.d/kprobe/kprobe_args_char.tc | 4 +++- .../selftests/ftrace/test.d/kprobe/kprobe_args_string.tc | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_char.tc b/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_char.tc index ff7499eb98d6..c639c6c8ca03 100644 --- a/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_char.tc +++ b/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_char.tc @@ -34,7 +34,9 @@ mips*) esac : "Test get argument (1)" -if grep -q eventfs_add_dir available_filter_functions; then +if grep -q eventfs_create_dir available_filter_functions; then + DIR_NAME="eventfs_create_dir" +elif grep -q eventfs_add_dir available_filter_functions; then DIR_NAME="eventfs_add_dir" else DIR_NAME="tracefs_create_dir" diff --git a/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_string.tc b/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_string.tc index a202b2ea4baf..a5ab4d5c74ac 100644 --- a/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_string.tc +++ b/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_string.tc @@ -37,7 +37,9 @@ loongarch*) esac : "Test get argument (1)" -if grep -q eventfs_add_dir available_filter_functions; then +if grep -q eventfs_create_dir available_filter_functions; then + DIR_NAME="eventfs_create_dir" +elif grep -q eventfs_add_dir available_filter_functions; then DIR_NAME="eventfs_add_dir" else DIR_NAME="tracefs_create_dir"