From nobody Mon Apr 6 01:42:03 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 16AB5ECAAD5 for ; Mon, 12 Sep 2022 08:34:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230213AbiILIen (ORCPT ); Mon, 12 Sep 2022 04:34:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55100 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229583AbiILIeb (ORCPT ); Mon, 12 Sep 2022 04:34:31 -0400 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 77360385; Mon, 12 Sep 2022 01:34:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1662971668; x=1694507668; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=gwqpOrlpoM7QQaHMT4fCz5cXWh0yb5xUU36OguseAi4=; b=e3FcTrSQyyz3PpJMvGBsUlT5o+d6lGgWYSu6UsPfzvsAVZ2tMhUjc5MF pFhGOQJuHkFfArJow44kyGZiiuCGbpQj56+fVaayW/kJO2NKjwjYigZwx oX8nfY7Arrz5i8x5S3daOP13phBsXCFmVo9n7897Uhd13voPn+sj9xsAR eH+Ij4SzumYxEJ5thVi+NCGiJfXkcJj4r5hPBenFstFikEw1FtWLF/6q2 Ben/jxPz8TL/VO88kdc6aJx+dp9q2elQSxM45mjgxfkk8K0gwxeyLJw+e CX3rXvoGZvPulhIDZbexp+W8Eyl6oy5IYZV8EfeuHLfs02U+wUnUaEfxI g==; X-IronPort-AV: E=McAfee;i="6500,9779,10467"; a="299153607" X-IronPort-AV: E=Sophos;i="5.93,308,1654585200"; d="scan'208";a="299153607" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Sep 2022 01:34:28 -0700 X-IronPort-AV: E=Sophos;i="5.93,308,1654585200"; d="scan'208";a="611688245" Received: from ahunter6-mobl1.ger.corp.intel.com (HELO ahunter-VirtualBox.home\044ger.corp.intel.com) ([10.252.46.215]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Sep 2022 01:34:26 -0700 From: Adrian Hunter To: Arnaldo Carvalho de Melo Cc: Jiri Olsa , Namhyung Kim , Ian Rogers , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org Subject: [PATCH 01/11] perf test: test_intel_pt.sh: Add cleanup function Date: Mon, 12 Sep 2022 11:34:02 +0300 Message-Id: <20220912083412.7058-2-adrian.hunter@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220912083412.7058-1-adrian.hunter@intel.com> References: <20220912083412.7058-1-adrian.hunter@intel.com> MIME-Version: 1.0 Organization: Intel Finland Oy, Registered Address: PL 281, 00181 Helsinki, Business Identity Code: 0357606 - 4, Domiciled in Helsinki Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Add a cleanup function that will still clean up if the script is terminated prematurely. Signed-off-by: Adrian Hunter Acked-by: Namhyung Kim --- tools/perf/tests/shell/test_intel_pt.sh | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/tools/perf/tests/shell/test_intel_pt.sh b/tools/perf/tests/she= ll/test_intel_pt.sh index a3298643884d..17338e6a6f99 100755 --- a/tools/perf/tests/shell/test_intel_pt.sh +++ b/tools/perf/tests/shell/test_intel_pt.sh @@ -14,6 +14,21 @@ err_cnt=3D0 tmpfile=3D`mktemp` perfdatafile=3D`mktemp` =20 +cleanup() +{ + trap - EXIT TERM INT + rm -f ${tmpfile} + rm -f ${perfdatafile} +} + +trap_cleanup() +{ + cleanup + exit 1 +} + +trap trap_cleanup EXIT TERM INT + can_cpu_wide() { perf record -o ${tmpfile} -B -N --no-bpf-event -e dummy:u -C $1 true 2>&1= >/dev/null || return 2 @@ -57,8 +72,7 @@ test_system_wide_side_band =20 count_result $? =20 -rm -f ${tmpfile} -rm -f ${perfdatafile} +cleanup =20 if [ ${err_cnt} -gt 0 ] ; then exit 1 --=20 2.25.1 From nobody Mon Apr 6 01:42:03 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id ED819ECAAA1 for ; Mon, 12 Sep 2022 08:34:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230241AbiILIet (ORCPT ); Mon, 12 Sep 2022 04:34:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55212 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230135AbiILIec (ORCPT ); Mon, 12 Sep 2022 04:34:32 -0400 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4B50DB2A; Mon, 12 Sep 2022 01:34:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1662971671; x=1694507671; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=NJc/hTioHCdfuSYNEzedGGrqLQLSzj9kvnpmuTm90lA=; b=kOynKcwDRBJDoD6tlICTLnbAySnvizvx9Htd+3aBVTAhi2hyNdw7vWx5 2XsA0iOLlS7QVXYEzZ/l8XWTkgM2d4x3wkuRuRJVcycaNSG1sa6pUgzVG WFfg2beHv9TbWKXAiaVSjOF7S7WzKRRec0JZ0srTC7nG7/re1aTisD+7B fbcrEYqYVZHj7hCvqNpwqe45w8clAWKLOrfudejLgqGyISWtqvB4qKEfN +7fzh1H6I2m1ZJgSmjkLK1p2q++S5itZK524UWAuxcFg9cxu873abVrcR sWkSaL70FyVcgg4Ic54J1vNFoIUzQZXrimHm9ZTnTMt0X58MFzM3dtTkm Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10467"; a="299153614" X-IronPort-AV: E=Sophos;i="5.93,308,1654585200"; d="scan'208";a="299153614" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Sep 2022 01:34:30 -0700 X-IronPort-AV: E=Sophos;i="5.93,308,1654585200"; d="scan'208";a="611688251" Received: from ahunter6-mobl1.ger.corp.intel.com (HELO ahunter-VirtualBox.home\044ger.corp.intel.com) ([10.252.46.215]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Sep 2022 01:34:28 -0700 From: Adrian Hunter To: Arnaldo Carvalho de Melo Cc: Jiri Olsa , Namhyung Kim , Ian Rogers , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org Subject: [PATCH 02/11] perf test: test_intel_pt.sh: Use a temp directory Date: Mon, 12 Sep 2022 11:34:03 +0300 Message-Id: <20220912083412.7058-3-adrian.hunter@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220912083412.7058-1-adrian.hunter@intel.com> References: <20220912083412.7058-1-adrian.hunter@intel.com> MIME-Version: 1.0 Organization: Intel Finland Oy, Registered Address: PL 281, 00181 Helsinki, Business Identity Code: 0357606 - 4, Domiciled in Helsinki Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Create a directory for temporary files so that mktemp needs to be used only once. It also enables more temp files to be added without having to add them also to the cleanup. Signed-off-by: Adrian Hunter Acked-by: Namhyung Kim --- tools/perf/tests/shell/test_intel_pt.sh | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/tools/perf/tests/shell/test_intel_pt.sh b/tools/perf/tests/she= ll/test_intel_pt.sh index 17338e6a6f99..872ee0d89d38 100755 --- a/tools/perf/tests/shell/test_intel_pt.sh +++ b/tools/perf/tests/shell/test_intel_pt.sh @@ -11,14 +11,20 @@ skip_cnt=3D0 ok_cnt=3D0 err_cnt=3D0 =20 -tmpfile=3D`mktemp` -perfdatafile=3D`mktemp` +temp_dir=3D$(mktemp -d /tmp/perf-test-intel-pt-sh.XXXXXXXXXX) + +tmpfile=3D"${temp_dir}/tmp-perf.data" +perfdatafile=3D"${temp_dir}/test-perf.data" =20 cleanup() { trap - EXIT TERM INT - rm -f ${tmpfile} - rm -f ${perfdatafile} + sane=3D$(echo "${temp_dir}" | cut -b 1-26) + if [ "${sane}" =3D "/tmp/perf-test-intel-pt-sh" ] ; then + echo "--- Cleaning up ---" + rm -f "${temp_dir}/"* + rmdir "${temp_dir}" + fi } =20 trap_cleanup() --=20 2.25.1 From nobody Mon Apr 6 01:42:03 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BFF02C6FA86 for ; Mon, 12 Sep 2022 08:34:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230282AbiILIex (ORCPT ); Mon, 12 Sep 2022 04:34:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55338 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230156AbiILIee (ORCPT ); Mon, 12 Sep 2022 04:34:34 -0400 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DA0AFB7C; Mon, 12 Sep 2022 01:34:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1662971672; x=1694507672; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=tZEa1eoxjDCoaNkJxgfIz6L4kLSOzW7GCTNGo0jOpP8=; b=EwUjSZBTnkHJW24NqnUcs7nyw9Je3sBwuJHoFvXML4nUpErMhuzITt1R EdqfJMjWIZlkB9CREuDLZ9YyCemr3XmQD2SMKcxkONvBtQPVwKrPEzAKd 4NuHMUbciQi5zlnu3MTYwNupm4h0FXwXvmaDFUW8uEGshP3SnSYbhq+T8 462xpZaIjY21ieFwqp13qamBjvxQvJMytfzkkJjrgQfMA5BeqmKpUdYN8 Oe3NeOf2i+SEJpZxMe44JG958W3rkjHbxx5kMXD9yfm+MtHnfkWXasGoa m8K9GfPA+WgNjm+4+pcGX6TneIwMf4RxP2kd5TuVG3U2AIs7H04/uqiz3 w==; X-IronPort-AV: E=McAfee;i="6500,9779,10467"; a="299153620" X-IronPort-AV: E=Sophos;i="5.93,308,1654585200"; d="scan'208";a="299153620" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Sep 2022 01:34:32 -0700 X-IronPort-AV: E=Sophos;i="5.93,308,1654585200"; d="scan'208";a="611688262" Received: from ahunter6-mobl1.ger.corp.intel.com (HELO ahunter-VirtualBox.home\044ger.corp.intel.com) ([10.252.46.215]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Sep 2022 01:34:30 -0700 From: Adrian Hunter To: Arnaldo Carvalho de Melo Cc: Jiri Olsa , Namhyung Kim , Ian Rogers , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org Subject: [PATCH 03/11] perf test: test_intel_pt.sh: Fix redirection Date: Mon, 12 Sep 2022 11:34:04 +0300 Message-Id: <20220912083412.7058-4-adrian.hunter@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220912083412.7058-1-adrian.hunter@intel.com> References: <20220912083412.7058-1-adrian.hunter@intel.com> MIME-Version: 1.0 Organization: Intel Finland Oy, Registered Address: PL 281, 00181 Helsinki, Business Identity Code: 0357606 - 4, Domiciled in Helsinki Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" As reported by shellcheck, 2>&1 must come after >/dev/null Signed-off-by: Adrian Hunter Acked-by: Namhyung Kim --- tools/perf/tests/shell/test_intel_pt.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/tests/shell/test_intel_pt.sh b/tools/perf/tests/she= ll/test_intel_pt.sh index 872ee0d89d38..6e40ee7261da 100755 --- a/tools/perf/tests/shell/test_intel_pt.sh +++ b/tools/perf/tests/shell/test_intel_pt.sh @@ -37,7 +37,7 @@ trap trap_cleanup EXIT TERM INT =20 can_cpu_wide() { - perf record -o ${tmpfile} -B -N --no-bpf-event -e dummy:u -C $1 true 2>&1= >/dev/null || return 2 + perf record -o ${tmpfile} -B -N --no-bpf-event -e dummy:u -C $1 true >/de= v/null 2>&1 || return 2 return 0 } =20 --=20 2.25.1 From nobody Mon Apr 6 01:42:03 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8EFE2ECAAA1 for ; Mon, 12 Sep 2022 08:35:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230376AbiILIe6 (ORCPT ); Mon, 12 Sep 2022 04:34:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55454 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230175AbiILIeg (ORCPT ); Mon, 12 Sep 2022 04:34:36 -0400 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6FF8B2DCE; Mon, 12 Sep 2022 01:34:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1662971675; x=1694507675; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=c7TgFGL2ToMu95xImGg5FhbMxBsKP7FJqIbGsSEeMTo=; b=aQUyBIPbK3SGTt2Uu3zOTBgDIspZgKYOph9Bke82in9fQC2OLBABwP+l NiVMoZgcvSOuMbqW3hiTib+EaftrIEaPh2joPLHXRoh7lMUEqWeDMSp5C 63wmvXKJAiefzbrN/5Q5Cd4UIRuEyoWknWnwE/ilrvOBH93D9LFLaHP/u PFXZQsolrSbBxuPzui8A4Vxy+aDTvwa8HiQQBPO5cSLUng1MSjfq5xsv+ YpCJuoW6th/D1RgKzu5EEkfE49yFSTSWwk6sHS5VXwGJohHmjhWTLArVh KcwEk8PoZR3JqCHkRsjcZmwOwexbnt01cqFHgUJY8x9N2+jEfCZ9qnSXC Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10467"; a="299153628" X-IronPort-AV: E=Sophos;i="5.93,308,1654585200"; d="scan'208";a="299153628" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Sep 2022 01:34:35 -0700 X-IronPort-AV: E=Sophos;i="5.93,308,1654585200"; d="scan'208";a="611688269" Received: from ahunter6-mobl1.ger.corp.intel.com (HELO ahunter-VirtualBox.home\044ger.corp.intel.com) ([10.252.46.215]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Sep 2022 01:34:32 -0700 From: Adrian Hunter To: Arnaldo Carvalho de Melo Cc: Jiri Olsa , Namhyung Kim , Ian Rogers , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org Subject: [PATCH 04/11] perf test: test_intel_pt.sh: Stop using expr Date: Mon, 12 Sep 2022 11:34:05 +0300 Message-Id: <20220912083412.7058-5-adrian.hunter@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220912083412.7058-1-adrian.hunter@intel.com> References: <20220912083412.7058-1-adrian.hunter@intel.com> MIME-Version: 1.0 Organization: Intel Finland Oy, Registered Address: PL 281, 00181 Helsinki, Business Identity Code: 0357606 - 4, Domiciled in Helsinki Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" As suggested by shellcheck, stop using expr. Signed-off-by: Adrian Hunter Acked-by: Namhyung Kim --- tools/perf/tests/shell/test_intel_pt.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/perf/tests/shell/test_intel_pt.sh b/tools/perf/tests/she= ll/test_intel_pt.sh index 6e40ee7261da..2be8cb03a620 100755 --- a/tools/perf/tests/shell/test_intel_pt.sh +++ b/tools/perf/tests/shell/test_intel_pt.sh @@ -64,14 +64,14 @@ test_system_wide_side_band() count_result() { if [ $1 -eq 2 ] ; then - skip_cnt=3D`expr ${skip_cnt} \+ 1` + skip_cnt=3D$((skip_cnt + 1)) return fi if [ $1 -eq 0 ] ; then - ok_cnt=3D`expr ${ok_cnt} \+ 1` + ok_cnt=3D$((ok_cnt + 1)) return fi - err_cnt=3D`expr ${err_cnt} \+ 1` + err_cnt=3D$((err_cnt + 1)) } =20 test_system_wide_side_band --=20 2.25.1 From nobody Mon Apr 6 01:42:03 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1E9F1C6FA83 for ; Mon, 12 Sep 2022 08:35:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230404AbiILIfB (ORCPT ); Mon, 12 Sep 2022 04:35:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55732 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230208AbiILIek (ORCPT ); Mon, 12 Sep 2022 04:34:40 -0400 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 809E52DF6; Mon, 12 Sep 2022 01:34:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1662971677; x=1694507677; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=sG0EKmdS1Nv+reiqvP3unM1JN2nbO7x3UkOs1kKBZEk=; b=VQc+Bggim8empXWIBhUIQE/NYQYr5UeEdVcgyH6+IqJ/gRyv9PRhKa7b lFUtKgOJnNCQLGciRz+9uIRin2mDOx2oCqOExFvO4Qms2Ko/0RO4nPGMz pMTHn7KZkXSXWWL4lQBUDD+2CH6pxtizhLcY3yeGsrF4d68GmBDhqYLL3 dJh5zB6F9Z7ZDN9bWp4KNY+Upr2bPs94UQ3sMAiTi1Zt86wPNpMnsSevC lY+H0SZmYmzE6uvHA+jEIuf6SviNBWURTybKKmrjfBlsbdjEG5MNNHJBq DERcQInWeU8RvE7D377VhViqW4DTYuF3lryKWa2GT+EJBrp8fql+PoD0Y w==; X-IronPort-AV: E=McAfee;i="6500,9779,10467"; a="299153633" X-IronPort-AV: E=Sophos;i="5.93,308,1654585200"; d="scan'208";a="299153633" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Sep 2022 01:34:37 -0700 X-IronPort-AV: E=Sophos;i="5.93,308,1654585200"; d="scan'208";a="611688282" Received: from ahunter6-mobl1.ger.corp.intel.com (HELO ahunter-VirtualBox.home\044ger.corp.intel.com) ([10.252.46.215]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Sep 2022 01:34:35 -0700 From: Adrian Hunter To: Arnaldo Carvalho de Melo Cc: Jiri Olsa , Namhyung Kim , Ian Rogers , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org Subject: [PATCH 05/11] perf test: test_intel_pt.sh: Stop using backticks Date: Mon, 12 Sep 2022 11:34:06 +0300 Message-Id: <20220912083412.7058-6-adrian.hunter@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220912083412.7058-1-adrian.hunter@intel.com> References: <20220912083412.7058-1-adrian.hunter@intel.com> MIME-Version: 1.0 Organization: Intel Finland Oy, Registered Address: PL 281, 00181 Helsinki, Business Identity Code: 0357606 - 4, Domiciled in Helsinki Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" As suggested by shellcheck, stop using backticks. Signed-off-by: Adrian Hunter Acked-by: Namhyung Kim --- tools/perf/tests/shell/test_intel_pt.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/tests/shell/test_intel_pt.sh b/tools/perf/tests/she= ll/test_intel_pt.sh index 2be8cb03a620..0273332b99e9 100755 --- a/tools/perf/tests/shell/test_intel_pt.sh +++ b/tools/perf/tests/shell/test_intel_pt.sh @@ -51,7 +51,7 @@ test_system_wide_side_band() perf record -B -N --no-bpf-event -o ${perfdatafile} -e intel_pt//u -C 0 -= - taskset --cpu-list 1 uname =20 # Should get MMAP events from CPU 1 because they can be needed to decode - mmap_cnt=3D`perf script -i ${perfdatafile} --no-itrace --show-mmap-events= -C 1 2>/dev/null | grep MMAP | wc -l` + mmap_cnt=3D$(perf script -i ${perfdatafile} --no-itrace --show-mmap-event= s -C 1 2>/dev/null | grep MMAP | wc -l) =20 if [ ${mmap_cnt} -gt 0 ] ; then return 0 --=20 2.25.1 From nobody Mon Apr 6 01:42:03 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 73F92C6FA83 for ; Mon, 12 Sep 2022 08:35:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230256AbiILIfJ (ORCPT ); Mon, 12 Sep 2022 04:35:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56024 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230245AbiILIen (ORCPT ); Mon, 12 Sep 2022 04:34:43 -0400 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AFC5BB2A; Mon, 12 Sep 2022 01:34:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1662971679; x=1694507679; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=4KlI0KDEEGhk1SDI4x5OgwdGwmvvkMee9wpp+mZcelI=; b=BgLJc9yGuWtu+nX3/JV/PimUo0xqCnJpSBaSxRSm4jlsmEEvA6zhfGx2 R8MZvRol68vltzPTu1RCH7lTHi0SGb+CsLPe1K/5NwgkexR2WHOChsMq3 N0pX0ZftENQ/w8jYW5svsq8EHAZjP9pDviyFBKdtqqqyDARDaD+YqptfO s5C449fJMICG0lcB/auAIY3y3JcXbJPlAJLtXiOj87m2EmL9feWz2U3ju CFhl6r+yLtnGYPFD+7OMaT9PZTzX9mfTZQZUfZBN7uWWVkzrZ34lfrXKi w7Kwm3N8n3t9MFx0b+cPXWEQyjXjSfE+GMIDB8WWM0+dafsFKE4HTJVkt w==; X-IronPort-AV: E=McAfee;i="6500,9779,10467"; a="299153635" X-IronPort-AV: E=Sophos;i="5.93,308,1654585200"; d="scan'208";a="299153635" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Sep 2022 01:34:39 -0700 X-IronPort-AV: E=Sophos;i="5.93,308,1654585200"; d="scan'208";a="611688288" Received: from ahunter6-mobl1.ger.corp.intel.com (HELO ahunter-VirtualBox.home\044ger.corp.intel.com) ([10.252.46.215]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Sep 2022 01:34:37 -0700 From: Adrian Hunter To: Arnaldo Carvalho de Melo Cc: Jiri Olsa , Namhyung Kim , Ian Rogers , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org Subject: [PATCH 06/11] perf test: test_intel_pt.sh: Use grep -c instead of grep plus wc -l Date: Mon, 12 Sep 2022 11:34:07 +0300 Message-Id: <20220912083412.7058-7-adrian.hunter@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220912083412.7058-1-adrian.hunter@intel.com> References: <20220912083412.7058-1-adrian.hunter@intel.com> MIME-Version: 1.0 Organization: Intel Finland Oy, Registered Address: PL 281, 00181 Helsinki, Business Identity Code: 0357606 - 4, Domiciled in Helsinki Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" As suggested by shellcheck, use grep -c instead of grep plus wc -l Signed-off-by: Adrian Hunter Acked-by: Namhyung Kim --- tools/perf/tests/shell/test_intel_pt.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/tests/shell/test_intel_pt.sh b/tools/perf/tests/she= ll/test_intel_pt.sh index 0273332b99e9..3dfdef4fa6f4 100755 --- a/tools/perf/tests/shell/test_intel_pt.sh +++ b/tools/perf/tests/shell/test_intel_pt.sh @@ -51,7 +51,7 @@ test_system_wide_side_band() perf record -B -N --no-bpf-event -o ${perfdatafile} -e intel_pt//u -C 0 -= - taskset --cpu-list 1 uname =20 # Should get MMAP events from CPU 1 because they can be needed to decode - mmap_cnt=3D$(perf script -i ${perfdatafile} --no-itrace --show-mmap-event= s -C 1 2>/dev/null | grep MMAP | wc -l) + mmap_cnt=3D$(perf script -i ${perfdatafile} --no-itrace --show-mmap-event= s -C 1 2>/dev/null | grep -c MMAP) =20 if [ ${mmap_cnt} -gt 0 ] ; then return 0 --=20 2.25.1 From nobody Mon Apr 6 01:42:03 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EA180ECAAD5 for ; Mon, 12 Sep 2022 08:35:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229447AbiILIfN (ORCPT ); Mon, 12 Sep 2022 04:35:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56020 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230257AbiILIer (ORCPT ); Mon, 12 Sep 2022 04:34:47 -0400 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6ED8E655A; Mon, 12 Sep 2022 01:34:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1662971682; x=1694507682; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ZF4Uom56OPBctkfid8EbPdt+2zuP7cmlHZQN8PMrF5A=; b=Jag13JwRKks3VrL/+SFd7+NKDMF8rKJCmfBJ1AdJU/jz7oTw32u58isT dHyM59hobEN7YT2uC3AZy4a1lleweUq8keo1LwX2yf/wSytQPTE84JCeS LbzpjcGUDDSQLuBVmZxO/shbZ4T/dSI8AgCzbQgpWwBHfNI5dyGEhZG0C fwjWNQszFTUyvmew4Fm2tqYbOf//SiE/zlThkFnscCFMK3Mx079yPg/7Y ZmJNQjtE2raZWHEzm9T2XB+LfVCKvMDCRg/9aCJtWUpVcFr3GOuYODre/ 6CRdT3iV+GtXMJIaiB933uKi6QpUPf80g1mAMKPQrOAc/8we6UgDAMXqp A==; X-IronPort-AV: E=McAfee;i="6500,9779,10467"; a="299153640" X-IronPort-AV: E=Sophos;i="5.93,308,1654585200"; d="scan'208";a="299153640" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Sep 2022 01:34:41 -0700 X-IronPort-AV: E=Sophos;i="5.93,308,1654585200"; d="scan'208";a="611688295" Received: from ahunter6-mobl1.ger.corp.intel.com (HELO ahunter-VirtualBox.home\044ger.corp.intel.com) ([10.252.46.215]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Sep 2022 01:34:39 -0700 From: Adrian Hunter To: Arnaldo Carvalho de Melo Cc: Jiri Olsa , Namhyung Kim , Ian Rogers , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org Subject: [PATCH 07/11] perf test: test_intel_pt.sh: Use quotes around variable expansion Date: Mon, 12 Sep 2022 11:34:08 +0300 Message-Id: <20220912083412.7058-8-adrian.hunter@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220912083412.7058-1-adrian.hunter@intel.com> References: <20220912083412.7058-1-adrian.hunter@intel.com> MIME-Version: 1.0 Organization: Intel Finland Oy, Registered Address: PL 281, 00181 Helsinki, Business Identity Code: 0357606 - 4, Domiciled in Helsinki Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" As suggested by shellcheck, use quotes around variable expansion. Signed-off-by: Adrian Hunter Acked-by: Namhyung Kim --- tools/perf/tests/shell/test_intel_pt.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/perf/tests/shell/test_intel_pt.sh b/tools/perf/tests/she= ll/test_intel_pt.sh index 3dfdef4fa6f4..075b780fe9ed 100755 --- a/tools/perf/tests/shell/test_intel_pt.sh +++ b/tools/perf/tests/shell/test_intel_pt.sh @@ -37,7 +37,7 @@ trap trap_cleanup EXIT TERM INT =20 can_cpu_wide() { - perf record -o ${tmpfile} -B -N --no-bpf-event -e dummy:u -C $1 true >/de= v/null 2>&1 || return 2 + perf record -o "${tmpfile}" -B -N --no-bpf-event -e dummy:u -C "$1" true = >/dev/null 2>&1 || return 2 return 0 } =20 @@ -48,12 +48,12 @@ test_system_wide_side_band() can_cpu_wide 1 || return $? =20 # Record on CPU 0 a task running on CPU 1 - perf record -B -N --no-bpf-event -o ${perfdatafile} -e intel_pt//u -C 0 -= - taskset --cpu-list 1 uname + perf record -B -N --no-bpf-event -o "${perfdatafile}" -e intel_pt//u -C 0= -- taskset --cpu-list 1 uname =20 # Should get MMAP events from CPU 1 because they can be needed to decode - mmap_cnt=3D$(perf script -i ${perfdatafile} --no-itrace --show-mmap-event= s -C 1 2>/dev/null | grep -c MMAP) + mmap_cnt=3D$(perf script -i "${perfdatafile}" --no-itrace --show-mmap-eve= nts -C 1 2>/dev/null | grep -c MMAP) =20 - if [ ${mmap_cnt} -gt 0 ] ; then + if [ "${mmap_cnt}" -gt 0 ] ; then return 0 fi =20 @@ -63,11 +63,11 @@ test_system_wide_side_band() =20 count_result() { - if [ $1 -eq 2 ] ; then + if [ "$1" -eq 2 ] ; then skip_cnt=3D$((skip_cnt + 1)) return fi - if [ $1 -eq 0 ] ; then + if [ "$1" -eq 0 ] ; then ok_cnt=3D$((ok_cnt + 1)) return fi --=20 2.25.1 From nobody Mon Apr 6 01:42:03 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 698BAECAAA1 for ; Mon, 12 Sep 2022 08:35:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230317AbiILIfS (ORCPT ); Mon, 12 Sep 2022 04:35:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56024 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230222AbiILIet (ORCPT ); Mon, 12 Sep 2022 04:34:49 -0400 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9392F767F; Mon, 12 Sep 2022 01:34:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1662971684; x=1694507684; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=murEwCFkCD0pF4LQRqPXhNOKMoRN9erLVSHjV8QLSns=; b=aCdnuSpCxRD+lVIyvS2cVqMfb9OQzjhhEBctTa4/i5afEWaf1fGnKJBX B7yPbjsSspdfAYZRHLQbdqn9sYNU9gVDFny+TB4zElayBwOkUhUvpv/Na wvvHo39nawE/YDbklrVbb+FpwfZS4KzlSD7ExpmgAAh26oIkTmVhxsUXu l+MXID37kZCCnltUwdGlISkHAbZJwmA7af03PC62M7MLEivDa7Xx7d+qG iJDn7oaXfMIEFQUQ4koH/SzrfkQH8Ex7g63HoSuUQcLeHZg4G0llVtGCr hpJ9LkRvTJU7HyXCjQ8xioR38PYrolaKrimChMqOR/KwCEBlceEvQTVfm A==; X-IronPort-AV: E=McAfee;i="6500,9779,10467"; a="299153645" X-IronPort-AV: E=Sophos;i="5.93,308,1654585200"; d="scan'208";a="299153645" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Sep 2022 01:34:43 -0700 X-IronPort-AV: E=Sophos;i="5.93,308,1654585200"; d="scan'208";a="611688306" Received: from ahunter6-mobl1.ger.corp.intel.com (HELO ahunter-VirtualBox.home\044ger.corp.intel.com) ([10.252.46.215]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Sep 2022 01:34:41 -0700 From: Adrian Hunter To: Arnaldo Carvalho de Melo Cc: Jiri Olsa , Namhyung Kim , Ian Rogers , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org Subject: [PATCH 08/11] perf test: test_intel_pt.sh: Fix return checking Date: Mon, 12 Sep 2022 11:34:09 +0300 Message-Id: <20220912083412.7058-9-adrian.hunter@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220912083412.7058-1-adrian.hunter@intel.com> References: <20220912083412.7058-1-adrian.hunter@intel.com> MIME-Version: 1.0 Organization: Intel Finland Oy, Registered Address: PL 281, 00181 Helsinki, Business Identity Code: 0357606 - 4, Domiciled in Helsinki Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The use of set -e will cause a function that returns non-zero to terminate the script unless the result is consumed by || for example. That is OK if there is only 1 test function, but not if there are more. Prepare for more by using ||. Signed-off-by: Adrian Hunter Acked-by: Namhyung Kim --- tools/perf/tests/shell/test_intel_pt.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/perf/tests/shell/test_intel_pt.sh b/tools/perf/tests/she= ll/test_intel_pt.sh index 075b780fe9ed..7d2f3136ce19 100755 --- a/tools/perf/tests/shell/test_intel_pt.sh +++ b/tools/perf/tests/shell/test_intel_pt.sh @@ -72,11 +72,11 @@ count_result() return fi err_cnt=3D$((err_cnt + 1)) + ret=3D0 } =20 -test_system_wide_side_band - -count_result $? +ret=3D0 +test_system_wide_side_band || ret=3D$? ; count_result $ret =20 cleanup =20 --=20 2.25.1 From nobody Mon Apr 6 01:42:03 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BC273ECAAD5 for ; Mon, 12 Sep 2022 08:35:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229766AbiILIfV (ORCPT ); Mon, 12 Sep 2022 04:35:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56572 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230331AbiILIeu (ORCPT ); Mon, 12 Sep 2022 04:34:50 -0400 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CAFD1B1D3; Mon, 12 Sep 2022 01:34:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1662971686; x=1694507686; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=3ZoypAMshl4L1jQUb8bi0mrZjthI3V+83K+zBezDpJw=; b=KKrWyjI8sdza6TAJXo0vLIHjoX48nqd/5wJbatVfuhCcQSPRAyzZSOQL rWWYYAU7QKrH4UcmpaujU+CtlDv30hem4ZeqdOe8Q2qCQk6zhoYDQQWIk y2Q81PJOmNncf24r5kGWE0X00tqspBslsq80Yoz++MFu42bokWZe0NYcp c7pqFBxZzwkVXz9xQTneMyVyjIYN9NEEKcpyBbYY8pLlKR5vl7Jgqt4iy BgalEGs2RvPHAntypTni1qLISHk8/lFSDPGRskTAZArX8wr46UqjDCewl Ccdw3u3Yb25AAWWXkOYi7ic2qVKcxDKSGGuZgLtgmYCctnmj359w7+HXj A==; X-IronPort-AV: E=McAfee;i="6500,9779,10467"; a="299153654" X-IronPort-AV: E=Sophos;i="5.93,308,1654585200"; d="scan'208";a="299153654" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Sep 2022 01:34:46 -0700 X-IronPort-AV: E=Sophos;i="5.93,308,1654585200"; d="scan'208";a="611688312" Received: from ahunter6-mobl1.ger.corp.intel.com (HELO ahunter-VirtualBox.home\044ger.corp.intel.com) ([10.252.46.215]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Sep 2022 01:34:44 -0700 From: Adrian Hunter To: Arnaldo Carvalho de Melo Cc: Jiri Olsa , Namhyung Kim , Ian Rogers , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org Subject: [PATCH 09/11] perf test: test_intel_pt.sh: Add more output in preparation for more tests Date: Mon, 12 Sep 2022 11:34:10 +0300 Message-Id: <20220912083412.7058-10-adrian.hunter@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220912083412.7058-1-adrian.hunter@intel.com> References: <20220912083412.7058-1-adrian.hunter@intel.com> MIME-Version: 1.0 Organization: Intel Finland Oy, Registered Address: PL 281, 00181 Helsinki, Business Identity Code: 0357606 - 4, Domiciled in Helsinki Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" When there are more tests it won't be obvious which test failed. Add more output so that it is. Signed-off-by: Adrian Hunter Acked-by: Namhyung Kim --- tools/perf/tests/shell/test_intel_pt.sh | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/tools/perf/tests/shell/test_intel_pt.sh b/tools/perf/tests/she= ll/test_intel_pt.sh index 7d2f3136ce19..2d489de9097b 100755 --- a/tools/perf/tests/shell/test_intel_pt.sh +++ b/tools/perf/tests/shell/test_intel_pt.sh @@ -37,12 +37,19 @@ trap trap_cleanup EXIT TERM INT =20 can_cpu_wide() { - perf record -o "${tmpfile}" -B -N --no-bpf-event -e dummy:u -C "$1" true = >/dev/null 2>&1 || return 2 + echo "Checking for CPU-wide recording on CPU $1" + if ! perf record -o "${tmpfile}" -B -N --no-bpf-event -e dummy:u -C "$1" = true >/dev/null 2>&1 ; then + echo "No so skipping" + return 2 + fi + echo OK return 0 } =20 test_system_wide_side_band() { + echo "--- Test system-wide sideband ---" + # Need CPU 0 and CPU 1 can_cpu_wide 0 || return $? can_cpu_wide 1 || return $? @@ -54,6 +61,7 @@ test_system_wide_side_band() mmap_cnt=3D$(perf script -i "${perfdatafile}" --no-itrace --show-mmap-eve= nts -C 1 2>/dev/null | grep -c MMAP) =20 if [ "${mmap_cnt}" -gt 0 ] ; then + echo OK return 0 fi =20 @@ -80,6 +88,8 @@ test_system_wide_side_band || ret=3D$? ; count_result $ret =20 cleanup =20 +echo "--- Done ---" + if [ ${err_cnt} -gt 0 ] ; then exit 1 fi --=20 2.25.1 From nobody Mon Apr 6 01:42:03 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C8916ECAAA1 for ; Mon, 12 Sep 2022 08:35:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230481AbiILIfY (ORCPT ); Mon, 12 Sep 2022 04:35:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56342 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230251AbiILIew (ORCPT ); Mon, 12 Sep 2022 04:34:52 -0400 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AA20FB7F8; Mon, 12 Sep 2022 01:34:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1662971688; x=1694507688; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=SOQpKwgqrECdZMc2wnf3LEtxKsGqWRaf6i9weGpa8Hw=; b=BSPPsDbsqqfEkWIkWvr6V3TlCSCqtK1LJjp1W6b2S4MsuRdN/B5c20fE LuxdFSPadqMLJb/JE0NmnXeuQnJQVQVHnNmJlQ5Re5S/J8tOhS94Rg0Qd XrpaNKyKW9+qmlJQmQX57AyPLXuUUOIgeVzzhPQK8EnyxtQocFSkUggKN PMCt5rwJrXUwexsSXnb36ADgp/FEmGTSY0FZo+gkyR6VGrGSaY+ZoUp6p AuqrY/zsBnEoqE3R7mRSHzzyaRWsYeMGP/Yd9nNwUM9fum8W+mVAQBsIL XzN/okVEjJ6NnXZtihM0bSLRIyScdRLUYOy7p+0Kp1rL+FaP4Z3esV5Ng g==; X-IronPort-AV: E=McAfee;i="6500,9779,10467"; a="299153662" X-IronPort-AV: E=Sophos;i="5.93,308,1654585200"; d="scan'208";a="299153662" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Sep 2022 01:34:48 -0700 X-IronPort-AV: E=Sophos;i="5.93,308,1654585200"; d="scan'208";a="611688334" Received: from ahunter6-mobl1.ger.corp.intel.com (HELO ahunter-VirtualBox.home\044ger.corp.intel.com) ([10.252.46.215]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Sep 2022 01:34:46 -0700 From: Adrian Hunter To: Arnaldo Carvalho de Melo Cc: Jiri Olsa , Namhyung Kim , Ian Rogers , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org Subject: [PATCH 10/11] perf tools: Add debug messages and comments for testing Date: Mon, 12 Sep 2022 11:34:11 +0300 Message-Id: <20220912083412.7058-11-adrian.hunter@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220912083412.7058-1-adrian.hunter@intel.com> References: <20220912083412.7058-1-adrian.hunter@intel.com> MIME-Version: 1.0 Organization: Intel Finland Oy, Registered Address: PL 281, 00181 Helsinki, Business Identity Code: 0357606 - 4, Domiciled in Helsinki Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Add debug messages to enable scripts to track aspects of perf record behaviour. The messages will be consumed after perf record has run, with the exception of "perf record has started" which is consequently flushed. Put comments so developers know which messages are also being used by test scripts. Signed-off-by: Adrian Hunter Acked-by: Namhyung Kim --- tools/lib/perf/evlist.c | 2 ++ tools/perf/builtin-record.c | 8 ++++++++ tools/perf/util/evsel.c | 2 ++ 3 files changed, 12 insertions(+) diff --git a/tools/lib/perf/evlist.c b/tools/lib/perf/evlist.c index 6b1bafe267a4..80cc810c5097 100644 --- a/tools/lib/perf/evlist.c +++ b/tools/lib/perf/evlist.c @@ -486,6 +486,7 @@ mmap_per_evsel(struct perf_evlist *evlist, struct perf_= evlist_mmap_ops *ops, if (ops->idx) ops->idx(evlist, evsel, mp, idx); =20 + /* Debug message used by test scripts */ pr_debug("idx %d: mmapping fd %d\n", idx, *output); if (ops->mmap(map, mp, *output, evlist_cpu) < 0) return -1; @@ -495,6 +496,7 @@ mmap_per_evsel(struct perf_evlist *evlist, struct perf_= evlist_mmap_ops *ops, if (!idx) perf_evlist__set_mmap_first(evlist, map, overwrite); } else { + /* Debug message used by test scripts */ pr_debug("idx %d: set output fd %d -> %d\n", idx, fd, *output); if (ioctl(fd, PERF_EVENT_IOC_SET_OUTPUT, *output) !=3D 0) return -1; diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index 02e38f50a138..5b808ac7a281 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c @@ -2428,10 +2428,14 @@ static int __cmd_record(struct record *rec, int arg= c, const char **argv) =20 record__uniquify_name(rec); =20 + /* Debug message used by test scripts */ + pr_debug3("perf record opening and mmapping events\n"); if (record__open(rec) !=3D 0) { err =3D -1; goto out_free_threads; } + /* Debug message used by test scripts */ + pr_debug3("perf record done opening and mmapping events\n"); session->header.env.comp_mmap_len =3D session->evlist->core.mmap_len; =20 if (rec->opts.kcore) { @@ -2574,6 +2578,10 @@ static int __cmd_record(struct record *rec, int argc= , const char **argv) if (err) goto out_child; =20 + /* Debug message used by test scripts */ + pr_debug3("perf record has started\n"); + fflush(stderr); + trigger_ready(&auxtrace_snapshot_trigger); trigger_ready(&switch_output_trigger); perf_hooks__invoke_record_start(); diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c index 5776bfa70f11..a27092339b81 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c @@ -2089,6 +2089,7 @@ static int evsel__open_cpu(struct evsel *evsel, struc= t perf_cpu_map *cpus, =20 test_attr__ready(); =20 + /* Debug message used by test scripts */ pr_debug2_peo("sys_perf_event_open: pid %d cpu %d group_fd %d flags = %#lx", pid, perf_cpu_map__cpu(cpus, idx).cpu, group_fd, evsel->open_flags); =20 @@ -2114,6 +2115,7 @@ static int evsel__open_cpu(struct evsel *evsel, struc= t perf_cpu_map *cpus, fd, group_fd, evsel->open_flags); } =20 + /* Debug message used by test scripts */ pr_debug2_peo(" =3D %d\n", fd); =20 if (evsel->bpf_fd >=3D 0) { --=20 2.25.1 From nobody Mon Apr 6 01:42:03 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A399AECAAA1 for ; Mon, 12 Sep 2022 08:35:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230484AbiILIfb (ORCPT ); Mon, 12 Sep 2022 04:35:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56578 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230348AbiILIe7 (ORCPT ); Mon, 12 Sep 2022 04:34:59 -0400 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D3EA3DFC9; Mon, 12 Sep 2022 01:34:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1662971691; x=1694507691; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=X3m/ZScAWiEGrz3LUQkYhRaOYpQnCZS+U6PEHDFvP78=; b=YvqlVJSWnpG26Mn/XumJ6HsbUQr+7ne3tGlJkgeeglNnLxBHD1cazgWe nJAxmG0jTHn61NBNP8jUJsOpxnrCkXn13BM765hkyQK5H9BxYAz1GJfCJ WMR2II9tYAX+Z3ZHuFQ2hF0CeMIChk9/8oFYI1+lb8TigJQIXzs4/JI4Q epEByjsgAx+/QWY371T1qv4vu4y72beAhxc7uic2X1SaN5ZCphwm/OPZ+ KY83UbCo9kxyCb5F787ePqIUr6FTSHd8vbHBN2YN7eYCGOlu5MksKx4ea vOHXUmDjU1BoXaYZ8MQ3zw9vDwDME6hq72Xsf/MnHER5jPWQtEuAN3Bvy Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10467"; a="299153669" X-IronPort-AV: E=Sophos;i="5.93,308,1654585200"; d="scan'208";a="299153669" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Sep 2022 01:34:50 -0700 X-IronPort-AV: E=Sophos;i="5.93,308,1654585200"; d="scan'208";a="611688351" Received: from ahunter6-mobl1.ger.corp.intel.com (HELO ahunter-VirtualBox.home\044ger.corp.intel.com) ([10.252.46.215]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Sep 2022 01:34:48 -0700 From: Adrian Hunter To: Arnaldo Carvalho de Melo Cc: Jiri Olsa , Namhyung Kim , Ian Rogers , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org Subject: [PATCH 11/11] perf test: test_intel_pt.sh: Add per-thread test Date: Mon, 12 Sep 2022 11:34:12 +0300 Message-Id: <20220912083412.7058-12-adrian.hunter@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220912083412.7058-1-adrian.hunter@intel.com> References: <20220912083412.7058-1-adrian.hunter@intel.com> MIME-Version: 1.0 Organization: Intel Finland Oy, Registered Address: PL 281, 00181 Helsinki, Business Identity Code: 0357606 - 4, Domiciled in Helsinki Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" When tracing the kernel with Intel PT, text_poke events are recorded per-cpu. In per-thread mode that results in a mixture of per-thread and per-cpu events and mmaps. Check that happens correctly. The debug output from perf record -vvv is recorded and then awk used to process the debug messages that indicate what file descriptors were opened and whether they were mmapped or set-output. Signed-off-by: Adrian Hunter Acked-by: Namhyung Kim --- tools/perf/tests/shell/test_intel_pt.sh | 247 ++++++++++++++++++++++++ 1 file changed, 247 insertions(+) diff --git a/tools/perf/tests/shell/test_intel_pt.sh b/tools/perf/tests/she= ll/test_intel_pt.sh index 2d489de9097b..051d088c1b74 100755 --- a/tools/perf/tests/shell/test_intel_pt.sh +++ b/tools/perf/tests/shell/test_intel_pt.sh @@ -4,6 +4,8 @@ =20 set -e =20 +tenths=3Ddate\ +%s%1N + # Skip if no Intel PT perf list | grep -q 'intel_pt//' || exit 2 =20 @@ -15,6 +17,10 @@ temp_dir=3D$(mktemp -d /tmp/perf-test-intel-pt-sh.XXXXXX= XXXX) =20 tmpfile=3D"${temp_dir}/tmp-perf.data" perfdatafile=3D"${temp_dir}/test-perf.data" +outfile=3D"${temp_dir}/test-out.txt" +errfile=3D"${temp_dir}/test-err.txt" +workload=3D"${temp_dir}/workload" +awkscript=3D"${temp_dir}/awkscript" =20 cleanup() { @@ -35,6 +41,37 @@ trap_cleanup() =20 trap trap_cleanup EXIT TERM INT =20 +have_workload=3Dfalse +cat << _end_of_file_ | /usr/bin/cc -o "${workload}" -xc - -pthread && have= _workload=3Dtrue +#include +#include + +void work(void) { + struct timespec tm =3D { + .tv_nsec =3D 1000000, + }; + int i; + + /* Run for about 30 seconds */ + for (i =3D 0; i < 30000; i++) + nanosleep(&tm, NULL); +} + +void *threadfunc(void *arg) { + work(); + return NULL; +} + +int main(void) { + pthread_t th; + + pthread_create(&th, NULL, threadfunc, NULL); + work(); + pthread_join(th, NULL); + return 0; +} +_end_of_file_ + can_cpu_wide() { echo "Checking for CPU-wide recording on CPU $1" @@ -69,6 +106,214 @@ test_system_wide_side_band() return 1 } =20 +can_kernel() +{ + perf record -o "${tmpfile}" -B -N --no-bpf-event -e dummy:k true >/dev/nu= ll 2>&1 || return 2 + return 0 +} + +wait_for_threads() +{ + start_time=3D$($tenths) + while [ -e "/proc/$1/task" ] ; do + th_cnt=3D$(find "/proc/$1/task" -mindepth 1 -maxdepth 1 -printf x | wc -= c) + if [ "${th_cnt}" -ge "$2" ] ; then + return 0 + fi + # Wait at most 5 seconds + if [ $(($($tenths) - start_time)) -ge 50 ] ; then + echo "PID $1 does not have $2 threads" + return 1 + fi + done + return 1 +} + +wait_for_perf_to_start() +{ + echo "Waiting for \"perf record has started\" message" + start_time=3D$($tenths) + while [ -e "/proc/$1" ] ; do + if grep -q "perf record has started" "${errfile}" ; then + echo OK + break + fi + # Wait at most 5 seconds + if [ $(($($tenths) - start_time)) -ge 50 ] ; then + echo "perf recording did not start" + return 1 + fi + done + return 0 +} + +wait_for_process_to_exit() +{ + start_time=3D$($tenths) + while [ -e "/proc/$1" ] ; do + # Wait at most 5 seconds + if [ $(($($tenths) - start_time)) -ge 50 ] ; then + echo "PID $1 did not exit as expected" + return 1 + fi + done + return 0 +} + +is_running() +{ + start_time=3D$($tenths) + while [ -e "/proc/$1" ] ; do + # Check for at least 0.3s + if [ $(($($tenths) - start_time)) -gt 3 ] ; then + return 0 + fi + done + echo "PID $1 exited prematurely" + return 1 +} + +test_per_thread() +{ + k=3D"$1" + desc=3D"$2" + + echo "--- Test per-thread ${desc}recording ---" + + if ! $have_workload ; then + echo "No workload, so skipping" + return 2 + fi + + if [ "${k}" =3D "k" ] ; then + can_kernel || return 2 + fi + + cat <<- "_end_of_file_" > "${awkscript}" + BEGIN { + s =3D "[ ]*" + u =3D s"[0-9]+"s + d =3D s"[0-9-]+"s + x =3D s"[0-9a-fA-FxX]+"s + mmapping =3D "idx"u": mmapping fd"u + set_output =3D "idx"u": set output fd"u"->"u + perf_event_open =3D "sys_perf_event_open: pid"d"cpu"d"group_fd"d"flags"x= "=3D"u + } + + /perf record opening and mmapping events/ { + if (!done) + active =3D 1 + } + + /perf record done opening and mmapping events/ { + active =3D 0 + done =3D 1 + } + + $0 ~ perf_event_open && active { + match($0, perf_event_open) + $0 =3D substr($0, RSTART, RLENGTH) + pid =3D $3 + cpu =3D $5 + fd =3D $11 + print "pid " pid " cpu " cpu " fd " fd " : " $0 + fd_array[fd] =3D fd + pid_array[fd] =3D pid + cpu_array[fd] =3D cpu + } + + $0 ~ mmapping && active { + match($0, mmapping) + $0 =3D substr($0, RSTART, RLENGTH) + fd =3D $5 + print "fd " fd " : " $0 + if (fd in fd_array) { + mmap_array[fd] =3D 1 + } else { + print "Unknown fd " fd + exit 1 + } + } + + $0 ~ set_output && active { + match($0, set_output) + $0 =3D substr($0, RSTART, RLENGTH) + fd =3D $6 + fd_to =3D $8 + print "fd " fd " fd_to " fd_to " : " $0 + if (fd in fd_array) { + if (fd_to in fd_array) { + set_output_array[fd] =3D fd_to + } else { + print "Unknown fd " fd_to + exit 1 + } + } else { + print "Unknown fd " fd + exit 1 + } + } + + END { + print "Checking " length(fd_array) " fds" + for (fd in fd_array) { + if (fd in mmap_array) { + pid =3D pid_array[fd] + if (pid !=3D -1) { + if (pid in pids) { + print "More than 1 mmap for PID " pid + exit 1 + } + pids[pid] =3D 1 + } + cpu =3D cpu_array[fd] + if (cpu !=3D -1) { + if (cpu in cpus) { + print "More than 1 mmap for CPU " cpu + exit 1 + } + cpus[cpu] =3D 1 + } + } else if (!(fd in set_output_array)) { + print "No mmap for fd " fd + exit 1 + } + } + n =3D length(pids) + if (n !=3D thread_cnt) { + print "Expected " thread_cnt " per-thread mmaps - found " n + exit 1 + } + } + _end_of_file_ + + $workload & + w1=3D$! + $workload & + w2=3D$! + echo "Workload PIDs are $w1 and $w2" + wait_for_threads ${w1} 2 + wait_for_threads ${w2} 2 + + perf record -B -N --no-bpf-event -o "${perfdatafile}" -e intel_pt//u"${k}= " -vvv --per-thread -p "${w1},${w2}" 2>"${errfile}" >"${outfile}" & + ppid=3D$! + echo "perf PID is $ppid" + wait_for_perf_to_start ${ppid} || return 1 + + kill ${w1} + wait_for_process_to_exit ${w1} || return 1 + is_running ${ppid} || return 1 + + kill ${w2} + wait_for_process_to_exit ${w2} || return 1 + wait_for_process_to_exit ${ppid} || return 1 + + awk -v thread_cnt=3D4 -f "${awkscript}" "${errfile}" || return 1 + + echo OK + return 0 +} + count_result() { if [ "$1" -eq 2 ] ; then @@ -85,6 +330,8 @@ count_result() =20 ret=3D0 test_system_wide_side_band || ret=3D$? ; count_result $ret +test_per_thread "" "" || ret=3D$? ; count_result $ret +test_per_thread "k" "(incl. kernel) " || ret=3D$? ; count_result $ret =20 cleanup =20 --=20 2.25.1