From patchwork Thu Oct 5 01:53:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 148669 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2016:b0:403:3b70:6f57 with SMTP id fe22csp14511vqb; Wed, 4 Oct 2023 18:53:36 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHNoboESxglq4SB+kqwlFNUJtXsDDBo0QPrk3FcOINvKL7YNHAFA2oHqbh2EmWsPUr4775m X-Received: by 2002:a05:6a20:841b:b0:137:2f8c:fab0 with SMTP id c27-20020a056a20841b00b001372f8cfab0mr4794467pzd.49.1696470816347; Wed, 04 Oct 2023 18:53:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696470816; cv=none; d=google.com; s=arc-20160816; b=u63hpGxjvU212L3VHKb18iOt2R97uobdnzilnndhHUrmUeaBgNViuSeP5wjSJlJ4NN bvpHRo5XRc9kFIEDgg8Cn9cbl5SKZfZYsQSizxie33qFC0I0wLc4K7skAXSEBOInORTk 35mrRdh+NUdZjjGHns0JwgEeLNxEB7UOXpbRYZQwVmF6opyLC4V0aO1pocfQfoelujIO wkA8OwfaqJyLhv1lvQHwV7Ry7l9xWEbFSttuTTmQ/1RHuzRN2TzrZDN3FTC5Kg7+eeGl D+Rw2uWMyak/6kqeIpEZ2AV5KqQqk3wdFySRN0cvZlMnr0cZtI53NCNwGk7CvaFTvmH8 Fq3w== 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=jbedNfD4i94J7Q/arXIqv5h+pA6Ce5beyK7B+hyKWHw=; fh=YD2plINFzzQkeIFsZ95VaD7apA4QxoMdT5d/25lsi30=; b=TZp/pWA8o7Vz1XQQif+ZL6op/uv79qWuvAXqSfuYBZl6ZC5FMntt5wMIrDvjGtCjgY 6ZNELigCTB5S61A5OMZ/6P76VQGQ6vofskbChNTz4NuQ2vd5hLLuXcGEO5att5g95huj WPTe09vGwGqR1UmFyHExvUT91RXG2rP72nL8fPWMSG1Dnv9DZGvB3apXR/3g566WKGSy GS2ZZhIDTTpUa5BOfFKtNQ8KDLaqd8/UvuLrEPcg1HKcT8UbXmMy3ka+X03W4OLEGZ5/ PbbNK89aYW9nqZ3B5r+nPafJmIcQdU0T/cseMHpl/Xg6aUuIx6/mcCyckIrhzaOZm48I A31A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id t13-20020a1709027fcd00b001c62139b16esi434929plb.4.2023.10.04.18.53.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Oct 2023 18:53:36 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 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 agentk.vger.email (Postfix) with ESMTP id 4F55D81E3E11; Wed, 4 Oct 2023 18:53:32 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244439AbjJEBwu (ORCPT + 19 others); Wed, 4 Oct 2023 21:52:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32982 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244372AbjJEBwq (ORCPT ); Wed, 4 Oct 2023 21:52:46 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6B1D4DC for ; Wed, 4 Oct 2023 18:52:43 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1AB73C433CA; Thu, 5 Oct 2023 01:52:43 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.96) (envelope-from ) id 1qoDYm-005FLk-07; Wed, 04 Oct 2023 21:53:52 -0400 Message-ID: <20231005015351.846757196@goodmis.org> User-Agent: quilt/0.66 Date: Wed, 04 Oct 2023 21:53:17 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Andrew Morton , Ajay Kaher Subject: [for-next][PATCH 7/7] tracing/selftests: Update kprobe args char/string to match new functions References: <20231005015310.859143353@goodmis.org> MIME-Version: 1.0 X-Spam-Status: No, score=2.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email 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 (agentk.vger.email [0.0.0.0]); Wed, 04 Oct 2023 18:53:32 -0700 (PDT) X-Spam-Level: ** X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778878583038595860 X-GMAIL-MSGID: 1778878583038595860 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()! Link: https://lore.kernel.org/linux-trace-kernel/20230914163535.487267410@goodmis.org Cc: Mark Rutland Cc: Andrew Morton Cc: Ajay Kaher 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"