From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D44FFC43381 for ; Sun, 24 Feb 2019 06:47:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 99111204EC for ; Sun, 24 Feb 2019 06:47:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=Mellanox.com header.i=@Mellanox.com header.b="D7lf4WKB" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728200AbfBXGrF (ORCPT ); Sun, 24 Feb 2019 01:47:05 -0500 Received: from mail-eopbgr40071.outbound.protection.outlook.com ([40.107.4.71]:39872 "EHLO EUR03-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728157AbfBXGqz (ORCPT ); Sun, 24 Feb 2019 01:46:55 -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=SRb1quqiduC4mmtiADH6Y1I0DrcyZNHRXgvzhyajEUE=; b=D7lf4WKBJrYnHD04XfJ733cjgJ05636HvrWJn4fWKj7CEMtJLAa/+cHTUMkSZhtOaaeE9ue3WE/Dm3lsy9sFEgnHqhlfkmjL9nl7TTt+gD7cVDoWVp0PGowCkY5s9GO2mOGTF8DHqDLAPXMhD5rYHXAQs9Aid4LvamiJr4FX9Xk= Received: from AM6PR05MB5240.eurprd05.prod.outlook.com (20.177.196.214) by AM6PR05MB4343.eurprd05.prod.outlook.com (52.135.162.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1643.18; Sun, 24 Feb 2019 06:46:36 +0000 Received: from AM6PR05MB5240.eurprd05.prod.outlook.com ([fe80::3542:889c:3a85:3866]) by AM6PR05MB5240.eurprd05.prod.outlook.com ([fe80::3542:889c:3a85:3866%5]) with mapi id 15.20.1643.019; Sun, 24 Feb 2019 06:46:36 +0000 From: Ido Schimmel To: "netdev@vger.kernel.org" CC: "davem@davemloft.net" , Jiri Pirko , mlxsw , Ido Schimmel Subject: [PATCH net-next 13/15] mlxsw: spectrum_acl: Add vregion migration end tracepoint Thread-Topic: [PATCH net-next 13/15] mlxsw: spectrum_acl: Add vregion migration end tracepoint Thread-Index: AQHUzAytu1MY8zKSFUuGj3cLJuvSXg== Date: Sun, 24 Feb 2019 06:46:33 +0000 Message-ID: <20190224064525.14913-14-idosch@mellanox.com> References: <20190224064525.14913-1-idosch@mellanox.com> In-Reply-To: <20190224064525.14913-1-idosch@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM6P194CA0033.EURP194.PROD.OUTLOOK.COM (2603:10a6:209:90::46) To AM6PR05MB5240.eurprd05.prod.outlook.com (2603:10a6:20b:64::22) 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-ms-office365-filtering-correlation-id: 209c67b7-613e-40bb-6fd9-08d69a23d04b x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(5600110)(711020)(4605104)(4618075)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060)(7193020);SRVR:AM6PR05MB4343; x-ms-traffictypediagnostic: AM6PR05MB4343: x-microsoft-exchange-diagnostics: =?iso-8859-1?Q?1;AM6PR05MB4343;23:7NqDtAOYKiGBqeeESosorQaGwuNMfjnCDH82tAt?= =?iso-8859-1?Q?BCiNe77NeCZXpEDUbifUs49wLxsNjKZYHfoUOG0In9lHipjxlal3vAxjhg?= =?iso-8859-1?Q?YtXXKpz7Bu26OIo7OjvYgyUvuy547xW4cEgSNA8jEX4DscWnckst/ueFis?= =?iso-8859-1?Q?xH8TJ7xzx42uI+LMjj+5cEMQf+IkeD4vzhSJ86IECW3G10Ao59vU9gZfgP?= =?iso-8859-1?Q?VfOVtm5x6dhQR1X19OLCvqPFtqmp/oRoMln/+5O8ln57eLNHYTRV2uC0BI?= =?iso-8859-1?Q?U7xrNr0UQRTklWzl1x7tEyNjhVZgHTPhxwA3cODRFyNJCrwC41RYsIcWBM?= =?iso-8859-1?Q?+d+xumJJ9fbtWv684FQVPzx2qraUo+qHeeTdQYboyiT000jtj2JAO3f1ds?= =?iso-8859-1?Q?21U/vS7Cj6NCDP8a6HhGlZj7ijZGLScgINAIDmvlHeCbX/Fb39KnCwiWh1?= =?iso-8859-1?Q?eCLiuNqx7VYT1pUkDdGw/pQiMjnOuascR2rQ/89xl0OwqwKUnCIRnKg1lK?= =?iso-8859-1?Q?6+8zQk2wZxP4PD+pmikF5qvRqa83ceQ9U5ou9p3PX3PojdVZHAF0V18hHu?= =?iso-8859-1?Q?Epf6VKOYBPAiA/6/6beusPM2aNJmxwRbkEoP68gKyPtF+ZKKJjbcrfD8Bb?= =?iso-8859-1?Q?Ps92I/KNwBNX584rN1ap5Loc0NXgVNpCr7PS3uISHErDfjJtPlabexQyVg?= =?iso-8859-1?Q?jGcwrP3E+OcUtsK9+KM4u0vvR+9cwEeGyz4Dq4qE/ojblMuancWRPDCwaS?= =?iso-8859-1?Q?8bliHNd8t/Yx2ZLRxmXXh75jHzgRrCXfBPrMrl1gF0+hEmEJuvc+Vc4hqb?= =?iso-8859-1?Q?cyfAbhY+eQhdrHD4DL450SunZWwbf6dEZRKiXOYyEwzKy0YbF8tAOVpzBa?= =?iso-8859-1?Q?wJMyMWQU6eX1IGvydHu740daK3Wh9PkO2AaCoP8s41nrQZC0JrmNXdwDrA?= =?iso-8859-1?Q?pBqB7zNe01aDa9a4DEC0l4r1xuQV2i4mrbx3u/oBT+wycxyZoQnD00Owuh?= =?iso-8859-1?Q?E1mjbqbrqRwCW5v1auG+ZJ82FgE28enM7z4cvalitIGVedf/PIpoHwg3nN?= =?iso-8859-1?Q?0FfpfUg9VHkUsYOKqHTZZvefuDc9li94IVOIvhn0957x096kWIXrcaNJ3U?= =?iso-8859-1?Q?CKBtALocvpyBPNJsEiiZpEqgUZOnIX0fu9GVRoUczXtaxApNHRAx95lNps?= =?iso-8859-1?Q?d/R93lYBoClW5UxvqpR7NsgDL7Lf9ggIes2ywHXyPDOkvUkXtFkFk7dyOj?= =?iso-8859-1?Q?ql1hoxPAVGf/uWBCfbZpvbO1EqDujl86ZJmR7cah/H3CMCx7QzqLYH5MnJ?= =?iso-8859-1?Q?Me9VZpVI1E9jJo68ldiiRaJtsK+vPAOLTAnQhij0kJ6c67E7WpOFnTPlEh?= =?iso-8859-1?Q?Qy3pQBfx02SrU9+bjSgeNQCZfwMYUefUCzIT7S9ncojqjABEg5e1u5xmFt?= =?iso-8859-1?Q?VZ6dPOC1Gy+MTDnTArsyP3Tq7Bu4vKxwa59?= x-microsoft-antispam-prvs: x-forefront-prvs: 09583628E0 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(366004)(396003)(136003)(376002)(346002)(39850400004)(199004)(189003)(102836004)(5660300002)(3846002)(14444005)(8936002)(6116002)(5640700003)(256004)(6666004)(6506007)(386003)(1076003)(71200400001)(71190400001)(14454004)(6512007)(6436002)(81166006)(2351001)(81156014)(1730700003)(6346003)(50226002)(26005)(6916009)(5024004)(107886003)(2906002)(99286004)(86362001)(2501003)(486006)(2616005)(4326008)(11346002)(54906003)(66066001)(316002)(476003)(446003)(53936002)(68736007)(52116002)(7736002)(6486002)(8676002)(478600001)(106356001)(305945005)(105586002)(25786009)(186003)(36756003)(76176011)(97736004);DIR:OUT;SFP:1101;SCL:1;SRVR:AM6PR05MB4343;H:AM6PR05MB5240.eurprd05.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; received-spf: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) authentication-results: spf=none (sender IP is ) smtp.mailfrom=idosch@mellanox.com; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: nehSFThD+IPto5zyOzqjCRzdXaUSW+Vcliyaz67BCM8VW0iblXmzbiMG6azSSEGAgiLZ40TSF4NtAsPfWugO7j11ErSfIAW9efEo+yLoDLt0MudYOZ3hOnYeH5PNyM4IeISbBxjk2GD4gyyWY5XzlzDlCsy+cUMu9Ka3fIQHaEIAHg/2cuTqH2ffpnsoaWd/kxJMr9zKRQXg88fS9lyHAPKJlFmSrA4HOgNtyI/nI7Ms4ozn/lZkugfBmakrhFZJfAKqRIDuGfzINKU7Hda+tUeWtdaWQINhrJKEIVkqadgNac7EGB09Lmj/qqNackvjp9xh3uya58ajVe/6UKK0YlEDTmfwC0PnR+n0hGDI6vlRfu3FRPT3P7DYH1OEqPjVDZTegSh3GuvwTnivd2mKe3TI93kSmYWqxZVRZz/VcW4= Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 209c67b7-613e-40bb-6fd9-08d69a23d04b X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Feb 2019 06:46:32.4068 (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: AM6PR05MB4343 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jiri Pirko Hit the new tracepoint once the vregion migration ends. Signed-off-by: Jiri Pirko Signed-off-by: Ido Schimmel --- .../mellanox/mlxsw/spectrum_acl_tcam.c | 11 +++++++--- include/trace/events/mlxsw.h | 20 +++++++++++++++++++ 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c b/driv= ers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c index 822766f81236..c9d9cded1724 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c @@ -1274,8 +1274,10 @@ mlxsw_sp_acl_tcam_vregion_migrate(struct mlxsw_sp *m= lxsw_sp, =20 region2 =3D mlxsw_sp_acl_tcam_region_create(mlxsw_sp, vregion->tcam, vregion, hints_priv); - if (IS_ERR(region2)) - return PTR_ERR(region2); + if (IS_ERR(region2)) { + err =3D PTR_ERR(region2); + goto out; + } =20 vregion->region2 =3D region2; err =3D mlxsw_sp_acl_tcam_group_region_attach(mlxsw_sp, @@ -1309,11 +1311,14 @@ mlxsw_sp_acl_tcam_vregion_migrate(struct mlxsw_sp *= mlxsw_sp, mutex_unlock(&vregion->lock); } =20 - return err; + goto out; =20 err_group_region_attach: vregion->region2 =3D NULL; mlxsw_sp_acl_tcam_region_destroy(mlxsw_sp, region2); +out: + trace_mlxsw_sp_acl_tcam_vregion_migrate_end(mlxsw_sp, vregion); + return err; } =20 diff --git a/include/trace/events/mlxsw.h b/include/trace/events/mlxsw.h index a5ce6df9dc49..6a4cfaef33a2 100644 --- a/include/trace/events/mlxsw.h +++ b/include/trace/events/mlxsw.h @@ -73,6 +73,26 @@ TRACE_EVENT(mlxsw_sp_acl_tcam_vregion_migrate, __entry->mlxsw_sp, __entry->vregion) ); =20 +TRACE_EVENT(mlxsw_sp_acl_tcam_vregion_migrate_end, + TP_PROTO(const struct mlxsw_sp *mlxsw_sp, + const struct mlxsw_sp_acl_tcam_vregion *vregion), + + TP_ARGS(mlxsw_sp, vregion), + + TP_STRUCT__entry( + __field(const void *, mlxsw_sp) + __field(const void *, vregion) + ), + + TP_fast_assign( + __entry->mlxsw_sp =3D mlxsw_sp; + __entry->vregion =3D vregion; + ), + + TP_printk("mlxsw_sp %p, vregion %p", + __entry->mlxsw_sp, __entry->vregion) +); + TRACE_EVENT(mlxsw_sp_acl_tcam_vregion_rehash_dis, TP_PROTO(const struct mlxsw_sp *mlxsw_sp, const struct mlxsw_sp_acl_tcam_vregion *vregion), --=20 2.20.1