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 95BCEC43381 for ; Sun, 24 Feb 2019 06:47:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5A1FA204EC for ; Sun, 24 Feb 2019 06:47:13 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=Mellanox.com header.i=@Mellanox.com header.b="FPYkpXMh" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728077AbfBXGqr (ORCPT ); Sun, 24 Feb 2019 01:46:47 -0500 Received: from mail-eopbgr80082.outbound.protection.outlook.com ([40.107.8.82]:37246 "EHLO EUR04-VI1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726459AbfBXGqo (ORCPT ); Sun, 24 Feb 2019 01:46:44 -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=iel9MNKOmYabLfLlUOk/XXAfQ93YXC6TCo0un9+q6P4=; b=FPYkpXMhaiyE5z4oennSUJ2Z2MaSB0YHlDxbx9LS/KNTM7bUSzpFUhFXJPToxgalq/scmRAbfbl7vTtohhl3Coedm3FWXbK2qpB6hlGP+gbbNuTl4kDhEOMZb+8Suf9S3aJ3FrCGzYD2SrfHHWlLTLhlk6x4fUVvy2+aASCTvrI= 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:27 +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:27 +0000 From: Ido Schimmel To: "netdev@vger.kernel.org" CC: "davem@davemloft.net" , Jiri Pirko , mlxsw , Ido Schimmel Subject: [PATCH net-next 06/15] mlxsw: spectrum_acl: Introduce mutex to guard Bloom Filter updates Thread-Topic: [PATCH net-next 06/15] mlxsw: spectrum_acl: Introduce mutex to guard Bloom Filter updates Thread-Index: AQHUzAyqbkXPYHzI4UmlzNiEiDzRHA== Date: Sun, 24 Feb 2019 06:46:27 +0000 Message-ID: <20190224064525.14913-7-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: 239df57b-9c23-490c-8226-08d69a23ccbf 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:A0G8clgXu19WTLUJyLnGtD4VPt/O31vUZ0nusGu?= =?iso-8859-1?Q?dMXQ/QlEfX4TO9WH/1ENm7AJ+QG9mIdkZ+tpDIX+itKJjCDTkHwSkYpO1b?= =?iso-8859-1?Q?8H1NsiFUPa0A4TrmK0OSbf6tdkinuAwda5hjBtYAst9NvNLxPXeIVv0pa7?= =?iso-8859-1?Q?2Rek74YrUYFYAvPTaE/xT/I/6+HhkFG82UkclUNQrfrLw3BPhq1rOI5Vfi?= =?iso-8859-1?Q?/ZzwUMWXzGKkKOQdtbD+QZqNodPPK+MWZVmxO9rqT8+CiLhwHF1BeGeqfi?= =?iso-8859-1?Q?Wio+aw8ku9DtMkdxFf2SaPD87DN1qkMInoVt+1bMmsDGl8rqKrzeqmp77K?= =?iso-8859-1?Q?7ysq8TtqYtY2347z4ssHQBHLvMH6HEFNEOCdFygAFZbc1p84Yg5I6ksWRw?= =?iso-8859-1?Q?3+RJLdy5xffsveVo77J3Uo8XVaXceCumGVwE2NgDKbkBrF5tqUz7qZri8V?= =?iso-8859-1?Q?tq03NIRcv/eUerCvm/u7rGrxS0BOxSRwstoii94zpGItpOtwFHWaRHwpt/?= =?iso-8859-1?Q?e3aA6+evMtEl9K69KczVhisvyiG1kcsIodkUW4diyb38f51zztizfyoF9D?= =?iso-8859-1?Q?kn6FmN0uI2zRM3PgwPrjtwMh3P9gAuafvfPSzZ8tXjDz+CGlgYRp4eQk1M?= =?iso-8859-1?Q?heFHhlo/OI6HmETy9MuJLR1eDwhs8mRgTiq+35eKpBG0LzLCY8M82j355M?= =?iso-8859-1?Q?nF967drhwzqOEx/ULb38NWrdmiR+Of/csuxPhOy6XybfhKVFX724WDCYqJ?= =?iso-8859-1?Q?sqpJ5YA+2gXu0vE82C7FnH2/k4EZiERPVMTBSc395ZC0Bm74KGoTpCe3vJ?= =?iso-8859-1?Q?OVX2XLXmKHNMQCVYLqWFZsw1BzuNDsJr80Qg7y5Cf8hOsnxhJPxR/I4o0s?= =?iso-8859-1?Q?l5uc26ASlVVDu8cl7KEQ2sGDK58aGZLJOrS2fyNwKZa4oIXXPT9Fkn0IuP?= =?iso-8859-1?Q?zQoFp/F4hemeeCrV9yu3fTMXytikbGNUbUnrOM6jFb/meMIfPLU6jqR9wj?= =?iso-8859-1?Q?ufivajvrVoZABA4TP+LMcLwbTGT0nDkx59B2j3oKbtKdA++fbt76zd1ZQu?= =?iso-8859-1?Q?ZwfZThq/sC4aiI4gKcYl1eiQ16f8uM0W48t1vTpq+/i/8iuL7OIXyoYycp?= =?iso-8859-1?Q?uRnCEn82XOu3wbxPOXbxrKh9GQgK1ekK6bWyD9piZbGyOaaV7f/r433f8z?= =?iso-8859-1?Q?MIxqRsTyuwibgoay/X4lh4kSI9wVap8aSTU2cGclcKDt9y8niNjL78Xzv7?= =?iso-8859-1?Q?tltW96LCfg24PiK7kBt1mhN/iSq/Pubt0p4Md1UGKx/l7eAV6Q5kiD1NuK?= =?iso-8859-1?Q?BIQfGNBaGxu0J09kelhTck3Mo5RjCinE4/bA4P+fpqvNQAYS5047iluev3?= =?iso-8859-1?Q?5TLKREorzLrmFEYlTUC3fQrw4rQfvOfbFRIuXFnvt7Qjt2KnPpnHBatFL3?= =?iso-8859-1?Q?0YnhXS3cYjlv0s=3D?= 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)(6506007)(386003)(1076003)(71200400001)(71190400001)(14454004)(6512007)(15650500001)(6436002)(81166006)(2351001)(81156014)(1730700003)(6346003)(50226002)(26005)(6916009)(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: QWcTd2MkHGIJpU8kxiTLMQqlT97TOBdh25FXyzxFxn2ilJk5vPePFTOLlFKYq3cvACel2RTYLmujiYOIBhoQMIhR9bUJh7xBmRE2U+uA+y7pdkp060INPcW5upQnJ4/Yd3gicboKvu+pucfpTbpLawkpOSNmEL+CuI46fV2YE0E3AM0TeT7PxaPOWHiJE5nc4109sdD0FVwc2K2YMmUfa0CRIiAO0CX2bX5kbpuIIyEIFXpZ7etjPotvdEFVM45eMnt6049vtlOPra7oUgfrGWx2EXgRKLUJND5WDVhW0e/1huYwAmQs/OuWenPW5USpATvWDPW1ht1zwn5Mx2gioLVRIb7Awdo+IJsK96Hd1kAcBg75XIvwKv5Z0tVlhtx4jwHCcl7K3KsVl2bhO8h3WADASf0+AlkS2nD1ajxHGAg= 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: 239df57b-9c23-490c-8226-08d69a23ccbf X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Feb 2019 06:46:26.4576 (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 Bloom filter is shared within multiple regions. For updates, it needs to be guarded by a separate mutex. Do that in order to not rely on RTNL mutex. Signed-off-by: Jiri Pirko Signed-off-by: Ido Schimmel --- .../mlxsw/spectrum_acl_bloom_filter.c | 34 +++++++++++++++---- 1 file changed, 27 insertions(+), 7 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_bloom_filter.= c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_bloom_filter.c index 9545b572747e..3a2de13fcb68 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_bloom_filter.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_bloom_filter.c @@ -5,11 +5,13 @@ #include #include #include +#include =20 #include "spectrum.h" #include "spectrum_acl_tcam.h" =20 struct mlxsw_sp_acl_bf { + struct mutex lock; /* Protects Bloom Filter updates. */ unsigned int bank_size; refcount_t refcnt[0]; }; @@ -172,26 +174,36 @@ mlxsw_sp_acl_bf_entry_add(struct mlxsw_sp *mlxsw_sp, u16 bf_index; int err; =20 + mutex_lock(&bf->lock); + bf_index =3D mlxsw_sp_acl_bf_index_get(bf, aregion, aentry); rule_index =3D mlxsw_sp_acl_bf_rule_count_index_get(bf, erp_bank, bf_index); =20 - if (refcount_inc_not_zero(&bf->refcnt[rule_index])) - return 0; + if (refcount_inc_not_zero(&bf->refcnt[rule_index])) { + err =3D 0; + goto unlock; + } =20 peabfe_pl =3D kmalloc(MLXSW_REG_PEABFE_LEN, GFP_KERNEL); - if (!peabfe_pl) - return -ENOMEM; + if (!peabfe_pl) { + err =3D -ENOMEM; + goto unlock; + } =20 mlxsw_reg_peabfe_pack(peabfe_pl); mlxsw_reg_peabfe_rec_pack(peabfe_pl, 0, 1, erp_bank, bf_index); err =3D mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(peabfe), peabfe_pl); kfree(peabfe_pl); if (err) - return err; + goto unlock; =20 refcount_set(&bf->refcnt[rule_index], 1); - return 0; + err =3D 0; + +unlock: + mutex_unlock(&bf->lock); + return err; } =20 void @@ -205,6 +217,8 @@ mlxsw_sp_acl_bf_entry_del(struct mlxsw_sp *mlxsw_sp, char *peabfe_pl; u16 bf_index; =20 + mutex_lock(&bf->lock); + bf_index =3D mlxsw_sp_acl_bf_index_get(bf, aregion, aentry); rule_index =3D mlxsw_sp_acl_bf_rule_count_index_get(bf, erp_bank, bf_index); @@ -212,13 +226,16 @@ mlxsw_sp_acl_bf_entry_del(struct mlxsw_sp *mlxsw_sp, if (refcount_dec_and_test(&bf->refcnt[rule_index])) { peabfe_pl =3D kmalloc(MLXSW_REG_PEABFE_LEN, GFP_KERNEL); if (!peabfe_pl) - return; + goto unlock; =20 mlxsw_reg_peabfe_pack(peabfe_pl); mlxsw_reg_peabfe_rec_pack(peabfe_pl, 0, 0, erp_bank, bf_index); mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(peabfe), peabfe_pl); kfree(peabfe_pl); } + +unlock: + mutex_unlock(&bf->lock); } =20 struct mlxsw_sp_acl_bf * @@ -240,10 +257,13 @@ mlxsw_sp_acl_bf_init(struct mlxsw_sp *mlxsw_sp, unsig= ned int num_erp_banks) return ERR_PTR(-ENOMEM); =20 bf->bank_size =3D bf_bank_size; + mutex_init(&bf->lock); + return bf; } =20 void mlxsw_sp_acl_bf_fini(struct mlxsw_sp_acl_bf *bf) { + mutex_destroy(&bf->lock); kfree(bf); } --=20 2.20.1