From patchwork Wed Jan 30 08:58:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ido Schimmel X-Patchwork-Id: 1033343 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=mellanox.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.b="HaTQfUGq"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43qHN90qfXz9sBb for ; Wed, 30 Jan 2019 19:58:49 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730380AbfA3I6s (ORCPT ); Wed, 30 Jan 2019 03:58:48 -0500 Received: from mail-eopbgr60061.outbound.protection.outlook.com ([40.107.6.61]:27472 "EHLO EUR04-DB3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725850AbfA3I6r (ORCPT ); Wed, 30 Jan 2019 03:58:47 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=DsvbjxaWufOpVpEh5+RjSt6lRjP2sRN2KbdIC93vuu4=; b=HaTQfUGqcpjdtZnKcqZRKY3K80AfuTvhUFY+oeX9d8YuWgL34ncU7NyUQ6nHkdizJUHoXJ+Fop5Kz9ds8ELTi9pbfFCcyGMmJI3xZfpTF8Ybz5/Ifv8AKF6BS0y75PE7l5yWd+qB3fsKxQ93o1xvsu+S0KyauoeRdi3xR2Oe6qs= Received: from DB7PR05MB4940.eurprd05.prod.outlook.com (20.176.235.152) by DB7PR05MB5771.eurprd05.prod.outlook.com (20.178.105.208) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1580.16; Wed, 30 Jan 2019 08:58:36 +0000 Received: from DB7PR05MB4940.eurprd05.prod.outlook.com ([fe80::6161:97fd:d315:7b07]) by DB7PR05MB4940.eurprd05.prod.outlook.com ([fe80::6161:97fd:d315:7b07%6]) with mapi id 15.20.1558.023; Wed, 30 Jan 2019 08:58:36 +0000 From: Ido Schimmel To: "netdev@vger.kernel.org" CC: "davem@davemloft.net" , Jiri Pirko , mlxsw , Ido Schimmel Subject: [PATCH net-next 3/5] selftests: spectrum-2: Extend and move trace helpers Thread-Topic: [PATCH net-next 3/5] selftests: spectrum-2: Extend and move trace helpers Thread-Index: AQHUuHn7stX02Pwj1Em6o0Kst+Z+gg== Date: Wed, 30 Jan 2019 08:58:35 +0000 Message-ID: <20190130085813.32161-4-idosch@mellanox.com> References: <20190130085813.32161-1-idosch@mellanox.com> In-Reply-To: <20190130085813.32161-1-idosch@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM6P193CA0024.EURP193.PROD.OUTLOOK.COM (2603:10a6:209:3e::37) To DB7PR05MB4940.eurprd05.prod.outlook.com (2603:10a6:10:1e::24) authentication-results: spf=none (sender IP is ) smtp.mailfrom=idosch@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.20.1 x-originating-ip: [193.47.165.251] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DB7PR05MB5771; 6:HY6LpjBLaHV0DHN5jRDxGTxHzzq8NdUjrD7gBX0uBs2X37Snu+cyayo+H2Q1jeNtlQVQHOdmhe3l5nLNIcLPc+/xJhTSRLSAyA2hEX0xfFif7hpgMbTdNKlW0F7VIgpPyrcjH9flsGQ7O/Uvoab0dKZTreDP4Tn8mVHI9uwsvL4smvh2AzZlDUBgjTV9SLqc0+6QJksZjknMEIFDnVPGSeNPh1IKQol0QYXBlx/UGmVK8+wm+HcmV4Ne57vC3ah126t+L2Le8KwTu/qta9PZbpAN4D7pMwF7T/x4j6R5MtfguzEt02Awqu8JqFExXOyyy/+331HxpIgIj3akly+IzvN4b6IUev27f5FcQLxzCJ4ZH6dCvMnTmklK8PM+4ptLITOiIDXqCf1DGG1XhI9Z8GXmNWDxTGkR1yzyF8pMIfk4a1GY7003ZFxc0WQ1zsOGYcuynoZkgLIi+/b/bvlapw==; 5:lqycCRDNOL3ueODAQpwyZpV34L8h1A8a6VctjzdjSaI1r0Lflqp809KGpJ9scJM5S7+qU4my40pUcHPDuQbdwUnM1lM7U9u7cqgkTk+8wKHXqvOaJY4jKMsbJ/2IZANcm+HtDwQ1bhOsOu4dlFUD4gmCQeSQYs24XKYvTh9JmaUdBoua8MC2UE3KR/38YUGY3S6O4LsdO0D2QHA474bSEw==; 7:7xwdhpMAYP7qPcgWMoJwSZ54Uu7XCo2vCCKT+XRnXOPSxuTbk2sRACU73IW975v9znQ7aloE+5uHIFguWow5uwQXGUZWyhOrTY0/DXMHRNpyAipiLm+Oqb84Aco8javJdDD5gF1eOh0fEgfXbYqnCg== x-ms-office365-filtering-correlation-id: 6b9b3d37-c02d-4e90-2333-08d686911dff x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(4618075)(2017052603328)(7153060)(7193020); SRVR:DB7PR05MB5771; x-ms-traffictypediagnostic: DB7PR05MB5771: x-microsoft-antispam-prvs: x-forefront-prvs: 0933E9FD8D x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(396003)(39860400002)(376002)(346002)(366004)(136003)(189003)(199004)(6916009)(6116002)(71190400001)(68736007)(50226002)(6512007)(86362001)(316002)(5640700003)(66066001)(52116002)(3846002)(99286004)(1076003)(2906002)(105586002)(6506007)(186003)(102836004)(386003)(53936002)(106356001)(107886003)(476003)(81156014)(76176011)(256004)(446003)(2501003)(2351001)(97736004)(8676002)(81166006)(1730700003)(4326008)(8936002)(54906003)(11346002)(2616005)(26005)(305945005)(486006)(7736002)(6486002)(14454004)(6436002)(71200400001)(25786009)(36756003)(478600001); DIR:OUT; SFP:1101; SCL:1; SRVR:DB7PR05MB5771; H:DB7PR05MB4940.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: g6yw0ek0NeCxQy2c6Nc6g1p6ZU9sceH3VFQJbAuoYr21MKFcIIdS0vQcOyeOx90zjz28kiK1DpRsKHiOCyY8IH5oQULEOUIH5O15YcN8MHe/BGg9U9F3XrOQSX1B/FsabsKfTDRuRkFP2LwJgWIfKRYDBjtHPdrNL6OjrY5td3RYluoN7eXgGgUvVykyol/L9oxAQok+LenO/d8+sOXaA2VyCc/9G5Zzrl4nYG0XeXnlu6Ga9yN2DOxLH1WfTyCrgQNjSOf5ULExI3vsPk717ioU1UvtuvjmHqSo5JIdQYhZGx2uBCB2Q9FBYz+qmOuHWEYFfODdLqD8nDDLWAszFVWSn+XyZRdHZMyPRaX5MyHE3hJ1SXfSlJwd8QKhhglMGGbzsgxaG7sLyryCoCYjsLJZYRe+r+wyeqFLTrXkvCM= MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6b9b3d37-c02d-4e90-2333-08d686911dff X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Jan 2019 08:58:34.5579 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR05MB5771 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jiri Pirko Allow to specify number of trace hits and move helpers to the beginning of the file. Signed-off-by: Jiri Pirko Signed-off-by: Ido Schimmel --- .../drivers/net/mlxsw/spectrum-2/tc_flower.sh | 71 +++++++++++++------ 1 file changed, 49 insertions(+), 22 deletions(-) diff --git a/tools/testing/selftests/drivers/net/mlxsw/spectrum-2/tc_flower.sh b/tools/testing/selftests/drivers/net/mlxsw/spectrum-2/tc_flower.sh index b41d6256b2d0..ed1ae902f2af 100755 --- a/tools/testing/selftests/drivers/net/mlxsw/spectrum-2/tc_flower.sh +++ b/tools/testing/selftests/drivers/net/mlxsw/spectrum-2/tc_flower.sh @@ -38,6 +38,55 @@ h2_destroy() simple_if_fini $h2 192.0.2.2/24 198.51.100.2/24 } +tp_record() +{ + local tracepoint=$1 + local cmd=$2 + + perf record -q -e $tracepoint $cmd + return $? +} + +tp_record_all() +{ + local tracepoint=$1 + local seconds=$2 + + perf record -a -q -e $tracepoint sleep $seconds + return $? +} + +__tp_hit_count() +{ + local tracepoint=$1 + + local perf_output=`perf script -F trace:event,trace` + return `echo $perf_output | grep "$tracepoint:" | wc -l` +} + +tp_check_hits() +{ + local tracepoint=$1 + local count=$2 + + __tp_hit_count $tracepoint + if [[ "$?" -ne "$count" ]]; then + return 1 + fi + return 0 +} + +tp_check_hits_any() +{ + local tracepoint=$1 + + __tp_hit_count $tracepoint + if [[ "$?" -eq "0" ]]; then + return 1 + fi + return 0 +} + single_mask_test() { # When only a single mask is required, the device uses the master @@ -325,28 +374,6 @@ ctcam_edge_cases_test() ctcam_no_atcam_masks_test } -tp_record() -{ - local tracepoint=$1 - local cmd=$2 - - perf record -q -e $tracepoint $cmd - return $? -} - -tp_check_hits() -{ - local tracepoint=$1 - local count=$2 - - perf_output=`perf script -F trace:event,trace` - hits=`echo $perf_output | grep "$tracepoint:" | wc -l` - if [[ "$count" -ne "$hits" ]]; then - return 1 - fi - return 0 -} - delta_simple_test() { # The first filter will create eRP, the second filter will fit into