From patchwork Wed Sep 13 02:58:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 138571 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp820691vqx; Tue, 12 Sep 2023 20:03:45 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEB2WD9iskKw7BfBdRiQk13hYXf73BpZQQhM7k8LBfDPzibf85fOzlOTkxjGQEGdxamDd4l X-Received: by 2002:a05:6870:c59d:b0:1bf:b00:acc5 with SMTP id ba29-20020a056870c59d00b001bf0b00acc5mr1406183oab.28.1694574225307; Tue, 12 Sep 2023 20:03:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694574225; cv=none; d=google.com; s=arc-20160816; b=l08kQ5J19+45n0dBFv/3hnNSEMRMG+Ywrl3yBnKTE/3jlMfHeK/L9QUEsFOJfFZLCB FUPXDmuPIjjIc+r0WQXVEG0Jsy5UavPfvHTIOXIJSH9BIPuoQm1fyZCsGMDpwY/5QyR1 pXrXjjyML+m0Eo/0QR5OAUjH+duIuSZYhxb63XQAWz8ON9RGjtOyeogOQ7xTxvcBsE57 PudgZFiutsu7JifyF5Z0i8u8HFuT2UmyoMCyeq4xulaUlurn1Ab7Fw/HRp4JJ2dif8s6 PTJhIDfOHIUyuwYyNjUEnMqul4lQhccmSbo8aT3BTe+NxUlKbQ8d9Y8SmTY0RKWTTEQq 8mcw== 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=qPTSovnyWSpHjQv815byz7wJp68mbyY13lrRfEBGZHA=; fh=rjFf2Qs0A83L06RBhuRXHLiK/k7VWIWgHuoJoNWJMnQ=; b=E9dpZfPK8d0nDK3rEVJh6rCCt0WXukwRaHVL7LcKKdkg3NZTfrmgCBf6WyDMrAKWmn 0Fh7fxzdkZlg3mc0wgCVpCTiBG2150UxdQsohHb9jOogUvVM9pNxcPU+bjqkSyrHzgFi YaqxwqK/nY8hTd82dUIyEkYTwWLehlrDyzQBb4YHkwIWRqk5Pbc+KBjc8KRHUpCJ49Zm BxFof408B6f4OZXomXv32NrmnrW3vJfuXQ6Hei81vr8rJZqv7LikUAhrXNOfhDvoTj23 iDFhyijE+agPFVRHUtuW71aK+fClusbtoc1ofVGEga+RIhHye3sp349sj8KbAS5HnYzo 0daQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id az1-20020a056a02004100b005776a454f3csi5052703pgb.379.2023.09.12.20.03.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Sep 2023 20:03:45 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 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 groat.vger.email (Postfix) with ESMTP id 621AA807830B; Tue, 12 Sep 2023 20:00:42 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238189AbjIMDAM (ORCPT + 36 others); Tue, 12 Sep 2023 23:00:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48774 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232447AbjIMDAH (ORCPT ); Tue, 12 Sep 2023 23:00:07 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 55F321719; Tue, 12 Sep 2023 20:00:03 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B6331C433C9; Wed, 13 Sep 2023 03:00:02 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.96) (envelope-from ) id 1qgG74-000QQc-0U; Tue, 12 Sep 2023 23:00:22 -0400 Message-ID: <20230913030021.967983629@goodmis.org> User-Agent: quilt/0.66 Date: Tue, 12 Sep 2023 22:58:58 -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 3/3] tracing/selftests: Update kprobe args char/string to match new functions References: <20230913025855.615399273@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 (groat.vger.email [0.0.0.0]); Tue, 12 Sep 2023 20:00:42 -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 groat.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776889862955006329 X-GMAIL-MSGID: 1776889862955006329 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()! Signed-off-by: Steven Rostedt (Google) Acked-by: Masami Hiramatsu (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"