From patchwork Tue Aug 15 19:40:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnaldo Carvalho de Melo X-Patchwork-Id: 136034 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b82d:0:b0:3f2:4152:657d with SMTP id z13csp1513230vqi; Fri, 18 Aug 2023 09:11:36 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFS9MZpPeT3gmAhdJZ4NGvWHesnSSuZSxnO3vbCJ4Rz5/pr1FTtKQ9dWP+LKWzYkL4m/fqZ X-Received: by 2002:a05:6830:1353:b0:6b9:5734:135f with SMTP id r19-20020a056830135300b006b95734135fmr2908367otq.28.1692375095814; Fri, 18 Aug 2023 09:11:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692375095; cv=none; d=google.com; s=arc-20160816; b=hFQVLPV6rz5/btkRdEQeTThUGI9ZuDb6y8+hagocSv4vPq8OzPcU8lXgrf5t7px69H i6laKANh12T0Gh/PDw4GsFwqS62HM27LH30kiQ7sb12uqstDPV7DeEHPMSWIZFdsXqvQ TvOnYiycjFEnLQKgr/oERp7V8bGHaNECy+Ti/rbDf3qtx2bdPbS0E3uOwGkgEpXc0oPf R/h2C+k5cVh9mTaJUPYiCXrdZSuQfOsB06f86kzgFdzEkFYqALa8fZLzYZVkQ7s+rxaG VJSsGzrLNBqBKZt20IDxP85OTYgt9xJSHidH3gZEQ8nIT6aUifB+sTJKuge5qeVCi/fz RMHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-disposition:mime-version:message-id :subject:cc:to:from:date:dkim-signature; bh=APx2fCJWRXMr2l0L2amnwWbCVBoZVhuTtBBDCi6bUiw=; fh=cMzfCi/fdV7VF10d5epYQjsgP/HnGYh1tMYzjbZVrcw=; b=mPx6N6x5uBm018YsWRYxll2NNrz+dh7NXvhq2IjzsaBRU30qPUKWxuPWuMs0YFG8nS +eYC/Y/Kh8B+XJPFj9kU/LLbP8/09nk0RafMkfFxwoqbiMJ3RBjRFzD+LPHBAt9NJvYg o4X/cigCh7JPJy0DMmlesphWkyatBeCsYCBId6nSE2lkQ32I5pt4TqZznNHkbfUUq7Wx urvcEwEMfpKcX4C/JkqWX1xm49rEzNC4BVUaoU6WVc9Ly43vh7EVJvhNl3fGhEAbgVsG rSt5c97YZKp+viCjzH7ZJxQg31+7aX3edaQborxusXgnhg7pSijC9QelWv/XQ2dcBKCH Fmmw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=MuisWKOa; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id bv126-20020a632e84000000b0056387def1cfsi1489341pgb.48.2023.08.18.09.11.20; Fri, 18 Aug 2023 09:11:35 -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; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=MuisWKOa; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239893AbjHOTlK (ORCPT + 99 others); Tue, 15 Aug 2023 15:41:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58280 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239974AbjHOTk6 (ORCPT ); Tue, 15 Aug 2023 15:40:58 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CEF4E13D for ; Tue, 15 Aug 2023 12:40:57 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 6B0C761512 for ; Tue, 15 Aug 2023 19:40:57 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 97903C433C7; Tue, 15 Aug 2023 19:40:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1692128456; bh=8g1V2U9DDvVe36zEqjZJlW1qpXsMRK71ka/aX21h/m8=; h=Date:From:To:Cc:Subject:From; b=MuisWKOaWFRxlG7VFHq9OX1Q3LtUMePSeiX33n/kQ66QuhOUqg5klYouPr7zLkyDU hs5ogdAQoXdlF9LfDSoz39uxb/nqPBcHEyvsm6Ypd4u6HetGjMDvsnyXMtAVbOJOH1 pPRbLOIC5IfmHjdlGl7X0UYoRsHgBrQx8dpNZ3sYiwkyuAOSA4rt5dgVhpKEfHVBWz Xu2O13gCpqWFtjyq7r5rXSVQURxh5s7ySF30mC9NG4IWwhiu3JrOPYJyse9+EzVcmF si4ja2GytsnF81jxSb460IUzSMJw0uLsHTp02kyfN9hqJcsIOBlJ6wrjgN0FAmFf3m v/cLH1Amuo8QA== Received: by quaco.ghostprotocols.net (Postfix, from userid 1000) id D1972404DF; Tue, 15 Aug 2023 16:40:53 -0300 (-03) Date: Tue, 15 Aug 2023 16:40:53 -0300 From: Arnaldo Carvalho de Melo To: Ian Rogers Cc: Adrian Hunter , Jiri Olsa , Namhyung Kim , Linux Kernel Mailing List Subject: [PATCH 1/1] perf tests trace+probe_vfs_getname.sh: Accept quotes surrounding the filename Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, 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: 1774583908310768757 X-GMAIL-MSGID: 1774583908310768757 With augmented_raw_syscalls transformed into a BPF skel made the output have a " around the filenames, which is not what the old perf probe vfs_getname method of obtaining filenames did, so accept the augmented way, with the quotes. At this point probably removing all the logic for the vfs_getname method is in order, will do it at some point. For now lets accept with/without quotes and make that test pass. Cc: Adrian Hunter Cc: Ian Rogers Cc: Jiri Olsa Cc: Namhyung Kim Link: https://lore.kernel.org/lkml/ Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/tests/shell/trace+probe_vfs_getname.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/tests/shell/trace+probe_vfs_getname.sh b/tools/perf/tests/shell/trace+probe_vfs_getname.sh index 3697f054ce1903ac..4014487cf4d933da 100755 --- a/tools/perf/tests/shell/trace+probe_vfs_getname.sh +++ b/tools/perf/tests/shell/trace+probe_vfs_getname.sh @@ -20,7 +20,7 @@ skip_if_no_perf_trace || exit 2 trace_open_vfs_getname() { evts="$(echo "$(perf list syscalls:sys_enter_open* 2>/dev/null | grep -E 'open(at)? ' | sed -r 's/.*sys_enter_([a-z]+) +\[.*$/\1/')" | sed ':a;N;s:\n:,:g')" perf trace -e $evts touch $file 2>&1 | \ - grep -E " +[0-9]+\.[0-9]+ +\( +[0-9]+\.[0-9]+ ms\): +touch/[0-9]+ open(at)?\((dfd: +CWD, +)?filename: +${file}, +flags: CREAT\|NOCTTY\|NONBLOCK\|WRONLY, +mode: +IRUGO\|IWUGO\) += +[0-9]+$" + grep -E " +[0-9]+\.[0-9]+ +\( +[0-9]+\.[0-9]+ ms\): +touch/[0-9]+ open(at)?\((dfd: +CWD, +)?filename: +\"?${file}\"?, +flags: CREAT\|NOCTTY\|NONBLOCK\|WRONLY, +mode: +IRUGO\|IWUGO\) += +[0-9]+$" }