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,URIBL_BLOCKED,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 96C7EC43381 for ; Thu, 28 Feb 2019 06:59:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 591C321850 for ; Thu, 28 Feb 2019 06:59:29 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=Mellanox.com header.i=@Mellanox.com header.b="mVgONTIH" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731207AbfB1G7Z (ORCPT ); Thu, 28 Feb 2019 01:59:25 -0500 Received: from mail-eopbgr150075.outbound.protection.outlook.com ([40.107.15.75]:47522 "EHLO EUR01-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1730965AbfB1G7Y (ORCPT ); Thu, 28 Feb 2019 01:59:24 -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=ckJW8oUjyySfCbXgf6AtnGSKuFHV+gxLtpg53SNNXoA=; b=mVgONTIHNgN29Ywv4PrZZj3wRmpwdQaMhbOdz7jLa1do8qIWZDoGAnOCZ5T6rP/+GCx39iZgEXZFzZBavvFBr1/ISB7O/a2TldZqmRIB9nfHqmk/vxsi+2FdFXn5QB2Bi8UhEufAMk14PZKCoIkw1oLEDtsw+i5qHDAdX8eYecs= Received: from AM6PR05MB5240.eurprd05.prod.outlook.com (20.177.196.214) by AM6PR05MB4168.eurprd05.prod.outlook.com (52.135.160.138) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1665.15; Thu, 28 Feb 2019 06:59:16 +0000 Received: from AM6PR05MB5240.eurprd05.prod.outlook.com ([fe80::458c:8deb:ca54:1327]) by AM6PR05MB5240.eurprd05.prod.outlook.com ([fe80::458c:8deb:ca54:1327%2]) with mapi id 15.20.1665.015; Thu, 28 Feb 2019 06:59:16 +0000 From: Ido Schimmel To: "netdev@vger.kernel.org" CC: "davem@davemloft.net" , Jiri Pirko , mlxsw , Ido Schimmel Subject: [PATCH net-next 01/14] mlxsw: spectrum_acl: Push rehash dw struct into rehash sub-struct Thread-Topic: [PATCH net-next 01/14] mlxsw: spectrum_acl: Push rehash dw struct into rehash sub-struct Thread-Index: AQHUzzMes4u7VKPY5ES8gQqDHkGeFw== Date: Thu, 28 Feb 2019 06:59:16 +0000 Message-ID: <20190228065850.7471-2-idosch@mellanox.com> References: <20190228065850.7471-1-idosch@mellanox.com> In-Reply-To: <20190228065850.7471-1-idosch@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM6PR08CA0025.eurprd08.prod.outlook.com (2603:10a6:20b:c0::13) To AM6PR05MB5240.eurprd05.prod.outlook.com (2603:10a6:20b:64::22) 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-ms-office365-filtering-correlation-id: 2fbc9a5f-0538-4bd0-bf67-08d69d4a410f x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600127)(711020)(4605104)(4618075)(2017052603328)(7153060)(7193020);SRVR:AM6PR05MB4168; x-ms-traffictypediagnostic: AM6PR05MB4168: x-microsoft-exchange-diagnostics: =?iso-8859-1?Q?1;AM6PR05MB4168;23:8VPVnq6KfqD9hjjTOv4IIhtfS5+yP72QHOs2fez?= =?iso-8859-1?Q?JAAbnakwMhv9qLtkjklDG7qnnAR/deSbQfgsRfbxpKrNI84D3zSHVjPocN?= =?iso-8859-1?Q?uKlHC/GzqCpFtZ7dV1DEETugOCaT8iRgWfgB0B3/A221E/TCL2bTSW3Qpb?= =?iso-8859-1?Q?i8mr7W0ITfZ8M2ZoQ3cOR53cKSMecibmgkWQ+c7dqQnvydWk8BhKgPR36C?= =?iso-8859-1?Q?fkfxOJQopEBIt6zHWJxVO93oU4e7Jix9RToCwwDH0x6rKsPz3DsGSrPCOA?= =?iso-8859-1?Q?o/+za0EdZ/P7YkkqJmBm6H6p0dNqMUF581rzTNu4HujQjoAX1Q3mGuGejx?= =?iso-8859-1?Q?ad+cKXaSJnHOeCeCdsBG1YX7NsDGu737DA/b4XC5m2lbiGSpDGAYSP/U5D?= =?iso-8859-1?Q?94gKk+2wYxUpXPrCxJKA8agLY4Sz78BnaENThA/CKwXLQF6vmtcg8bNmIU?= =?iso-8859-1?Q?C2dENTyIUJN4YcYJs1OGF+1W2b8sUmEZnPtAJHOkm0vb0bsV99asACSPMq?= =?iso-8859-1?Q?hiM3YsMU3HtDNGefJaDcmQuu5Z8XLgI57cV3y93k6zValrJaoPM+b01vP8?= =?iso-8859-1?Q?Ub4HsCIrYeTzhPGNOUSnZrnzL/uH08FaU5/kUF9yWh9fa5arG5XsgCKmjL?= =?iso-8859-1?Q?8fWCRNYFi4fVgZ2TGFlWdMM6pMPqIcY7vZm58khtFlyY11gjHUmXCq3d+A?= =?iso-8859-1?Q?4nETvlTgoP9Br7LftGXr/TlXQZxSFHaUFEen21DiQ1eaWDQZ51Mjl6UlgX?= =?iso-8859-1?Q?qraFusflX2V/6V9AcvpHOWMhHTdDMjvSLljsUhw62xXL0mXzSqQKrypTKF?= =?iso-8859-1?Q?1BcfUVVDlNd4+T1dthwaGpfxmeLpt+h0okds+CNBPk/pTvpXQUY28chJSj?= =?iso-8859-1?Q?nk5Y8PKInCTmUUhR/rtDMfRzYrW1pFBLGrib/Tc3lRD3YIx27PysLIOT17?= =?iso-8859-1?Q?PVQrC+qhnKeJYP4Lp4YGmMwHRVw6m+qsAS8pgJShe3Ghn8cHFb9cyYPLw1?= =?iso-8859-1?Q?OjCz547yPS6XuhnHhYFA8Dfxj9fQRS6cJf+M5GpdOUUppT0gIukPc1kkz+?= =?iso-8859-1?Q?kOVjZkbP5bD6d2d9WDfG09HcCpfrtRX1TR42AiEvJ/akagO6lr/VBWJQao?= =?iso-8859-1?Q?WpfclP0hxpx6dWuGUD1DhZS3Rtd7yxCTiPqQoEZ21TyGOJl2Xa5wuOSpMt?= =?iso-8859-1?Q?KKu/g2PYIK7en3nn+8Lzob19984fTtTVK+sqPWey1O89a30LtLOnm0Hunt?= =?iso-8859-1?Q?DChJpbWGVwNTE6LDiTJFnruJzOW9NYqK/8sbUwXX6GetXESnQDgMsGS0Mn?= =?iso-8859-1?Q?5EzGGR0+wNrEmyNUr1UAEnRlqK9c4MjceCgAvq2qCxAx26bBtUrwFTaEja?= =?iso-8859-1?Q?SlURlG3VHsCKi4/2E6sn4SzUDn7uC?= x-microsoft-antispam-prvs: x-forefront-prvs: 0962D394D2 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(346002)(39860400002)(376002)(366004)(136003)(396003)(189003)(199004)(97736004)(86362001)(478600001)(99286004)(8676002)(2906002)(5660300002)(1730700003)(54906003)(81156014)(81166006)(2616005)(476003)(6512007)(1076003)(11346002)(4326008)(316002)(446003)(105586002)(50226002)(66066001)(8936002)(106356001)(25786009)(76176011)(107886003)(53936002)(6436002)(68736007)(2351001)(2501003)(486006)(5640700003)(6486002)(7736002)(6916009)(14454004)(305945005)(102836004)(26005)(36756003)(6116002)(3846002)(6506007)(386003)(14444005)(186003)(256004)(52116002)(71200400001)(71190400001);DIR:OUT;SFP:1101;SCL:1;SRVR:AM6PR05MB4168;H:AM6PR05MB5240.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: BxGcookSptMI4B14gCC8HGVdUJly+6yyHfKPeAzuLSk45FAQfnDHwUFTVxfYS1nOHmug6CeCnhghsLZngjNd68pVXJISejJulvcX9oUX/hat1g8GTbTtZW8tfpZixuBJFrfkzmFR3+BVgWs89zgHFzJFdt4tJ2q9gzFppZ4Z1rc/YzENBHYIIWI5u4Bz0LGVyK3bHrj78BwBLcxVrUCIHwvqYRXWRJQ1WG4xu2Ptel26IHDk/EuP7S5tJtQgVQg+/OL2wjOs0Vre/D5eLZkWAwn7rlG8VMONyEEPo5/WghWl2EREByoJ9kF7wmc5Bg6U3zH5PlQfiM1ZIoT2LRkr6RG8lBF6yLzqV0wUaNsPIe33tN5w4nhkZ8a3UIp7vGyH9BzJxSKLmM0210zBdWoXGlAfgumIOkgo3Rzm5DnFZqY= 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: 2fbc9a5f-0538-4bd0-bf67-08d69d4a410f X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Feb 2019 06:59:16.7327 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR05MB4168 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jiri Pirko More rehash related fields are going to come. Push "dw" into sub-struct that will accommodate the others as well. Signed-off-by: Jiri Pirko Signed-off-by: Ido Schimmel --- .../ethernet/mellanox/mlxsw/spectrum_acl_tcam.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 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 c9d9cded1724..e2699373dfa7 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c @@ -192,7 +192,9 @@ struct mlxsw_sp_acl_tcam_vregion { struct mlxsw_afk_key_info *key_info; struct mlxsw_sp_acl_tcam *tcam; struct mlxsw_sp_acl_tcam_vgroup *vgroup; - struct delayed_work rehash_dw; + struct { + struct delayed_work dw; + } rehash; struct mlxsw_sp *mlxsw_sp; bool failed_rollback; /* Indicates failed rollback during migration */ unsigned int ref_count; @@ -718,7 +720,7 @@ mlxsw_sp_acl_tcam_vregion_rehash_work_schedule(struct m= lxsw_sp_acl_tcam_vregion =20 if (!interval) return; - mlxsw_core_schedule_dw(&vregion->rehash_dw, + mlxsw_core_schedule_dw(&vregion->rehash.dw, msecs_to_jiffies(interval)); } =20 @@ -730,7 +732,7 @@ static void mlxsw_sp_acl_tcam_vregion_rehash_work(struc= t work_struct *work) { struct mlxsw_sp_acl_tcam_vregion *vregion =3D container_of(work, struct mlxsw_sp_acl_tcam_vregion, - rehash_dw.work); + rehash.dw.work); =20 mlxsw_sp_acl_tcam_vregion_rehash(vregion->mlxsw_sp, vregion); mlxsw_sp_acl_tcam_vregion_rehash_work_schedule(vregion); @@ -778,7 +780,7 @@ mlxsw_sp_acl_tcam_vregion_create(struct mlxsw_sp *mlxsw= _sp, =20 if (vgroup->vregion_rehash_enabled && ops->region_rehash_hints_get) { /* Create the delayed work for vregion periodic rehash */ - INIT_DELAYED_WORK(&vregion->rehash_dw, + INIT_DELAYED_WORK(&vregion->rehash.dw, mlxsw_sp_acl_tcam_vregion_rehash_work); mlxsw_sp_acl_tcam_vregion_rehash_work_schedule(vregion); mutex_lock(&tcam->lock); @@ -809,7 +811,7 @@ mlxsw_sp_acl_tcam_vregion_destroy(struct mlxsw_sp *mlxs= w_sp, mutex_lock(&tcam->lock); list_del(&vregion->tlist); mutex_unlock(&tcam->lock); - cancel_delayed_work_sync(&vregion->rehash_dw); + cancel_delayed_work_sync(&vregion->rehash.dw); } mlxsw_sp_acl_tcam_vgroup_vregion_detach(mlxsw_sp, vregion); if (vregion->region2) @@ -847,9 +849,9 @@ int mlxsw_sp_acl_tcam_vregion_rehash_intrvl_set(struct = mlxsw_sp *mlxsw_sp, mutex_lock(&tcam->lock); list_for_each_entry(vregion, &tcam->vregion_list, tlist) { if (val) - mlxsw_core_schedule_dw(&vregion->rehash_dw, 0); + mlxsw_core_schedule_dw(&vregion->rehash.dw, 0); else - cancel_delayed_work_sync(&vregion->rehash_dw); + cancel_delayed_work_sync(&vregion->rehash.dw); } mutex_unlock(&tcam->lock); return 0; --=20 2.20.1