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 2A32FC433EF for ; Mon, 27 Jun 2022 07:08:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232678AbiF0HIE (ORCPT ); Mon, 27 Jun 2022 03:08:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54382 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232690AbiF0HIB (ORCPT ); Mon, 27 Jun 2022 03:08:01 -0400 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2083.outbound.protection.outlook.com [40.107.94.83]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B2E555F89 for ; Mon, 27 Jun 2022 00:07:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XiJCcWDZXvQkNuOBrlCoUMZQketaogl0Csvsf5tQXw0bkCfKkJ1G9EAtkX9kQHrNguHpx3OypwZTzjiGa1o9ngnY8TmF9kCRVcoWs+4WQ45c7x6fNK2zdbOHbuvGZR3v0ot2ZzaYEHxUwDHahGNprD5IJAb9ycJWYbddC7FYxr3t6r0FXjMjuSvWvJx9FIYK8PQ4fqLKDr+5vwKcWIBOeiFbnhQ71f9Ym9m4rL2gFHgHaVMgxdz74UjhvzRWh7S2Fvfvu4PN//DtK+eTevwHa0spUaCcyhq2UxzqFm8ET2exF0b6HYeZfYiw22xGRFJJhVRpO4hL0TjaeyhQlIPMYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=x8uzpKB5opCfZjPpcVLAz9BMPqvEVecbCRE3UKzLV00=; b=hgcf3YOcLFRpTolXqHdLAjQx0KY09y8mRvz9JdJszimnhi6w+004Sn3pEv4TWdJw1vFTCsepxbGbfsTbxIeXI9sRvemLv8Y/BS1ChMHS3AFRTE5mKWHVgFbGaNk4ITxWWlpvO3b/pbTBGRUyKVNhKdbogspO4WSS2X+fRn4WlMrVSUrdjaM9/TOidV4JVPHRhSrEhQFQ9A7cVaefI/udmpYW+PYefeHTjvmp/2XQk3otMvOMBH9XvF72hNGGvMVUSKqNAoNhdYwLHgkT7gWQxrnK7L/qfgCfRvXnNvK/59QEmslx364h4RritmBWZmgzXwvileu10otJSIDA9B0O+Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nvidia.com; dmarc=pass action=none header.from=nvidia.com; dkim=pass header.d=nvidia.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=x8uzpKB5opCfZjPpcVLAz9BMPqvEVecbCRE3UKzLV00=; b=NXsryycguC0g4MZGYodVP0X4dtpHIZxvAR93tW4kz+xMmDiH7I3Pc4OgROrSLhJLKgTkcgn1qay9+Ek2mpon6NGrQx/mNVpn3T1K3vcviakIT9Z0KjwMVbo4UsAe2cZpQH1p6PpMBeUbGWMNZtPLoZnAgQ2uWMn1jIIiJLqXs5s9OuedSOsklmqC1cnAgAO+Zk60fjp/haR8zapzI4cRhJ3enapBQB2d16ReTxPDUkalOq8L437RfLfauLp7t6IH9Uv5ISsavnXHYIKvHnBB69vYxKQK2vw9JO+lxFWQvW95f+Tg90rA+FPHj/JGVjxFsVphPRrg7d4U4EqVPMR/Mg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; Received: from CY5PR12MB6179.namprd12.prod.outlook.com (2603:10b6:930:24::22) by SJ0PR12MB5439.namprd12.prod.outlook.com (2603:10b6:a03:3ae::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5373.15; Mon, 27 Jun 2022 07:07:51 +0000 Received: from CY5PR12MB6179.namprd12.prod.outlook.com ([fe80::611c:e609:d343:aa34]) by CY5PR12MB6179.namprd12.prod.outlook.com ([fe80::611c:e609:d343:aa34%5]) with mapi id 15.20.5373.018; Mon, 27 Jun 2022 07:07:51 +0000 From: Ido Schimmel To: netdev@vger.kernel.org Cc: davem@davemloft.net, kuba@kernel.org, pabeni@redhat.com, edumazet@google.com, petrm@nvidia.com, amcohen@nvidia.com, mlxsw@nvidia.com, Ido Schimmel Subject: [PATCH net-next 09/13] mlxsw: Add a dedicated structure for bitmap of ports Date: Mon, 27 Jun 2022 10:06:17 +0300 Message-Id: <20220627070621.648499-10-idosch@nvidia.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220627070621.648499-1-idosch@nvidia.com> References: <20220627070621.648499-1-idosch@nvidia.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: LO2P265CA0134.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:9f::26) To CY5PR12MB6179.namprd12.prod.outlook.com (2603:10b6:930:24::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 676610d9-ef5e-4a48-9522-08da580bc019 X-MS-TrafficTypeDiagnostic: SJ0PR12MB5439:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +lqFmTseJT2+CekOv/4Av6v2hffXDzaIxWHtQ4ToZNJiNRFhI+eNKxk0MhQTlOGnZlCBknkTwnD8nsdMUqs4/Zz0r8oEZZMyOTTxMuefxeNAGqIhqPQujaaK+a4V8UxnyWQnsQM/ZGY7bfCzRP8D6+tGRxqua2rJiJnJ5VAAPiSG3j9rGxs7+ZZb3an6edNUvljb8luojGWJ/KmEpobFwPV0qiVvjLISF1qSKQP2qu94oVz7VyCZPy523ChxbWe40j4/B160loITq5u4w491sr1E9O3+HzxK2MSyy3dWxR8/OqvVJan7Rza5j+w3B4X26GUtjyJtDwQ7vW2+Xw3GB5IM1VugjPYZ22L6DUjs2dDsOS/ArLNOiJEL9F9Y/iybXIrNbwUx2+z0WW1VHpuNlIBIsZT5+tETWB+1X+t7D2C/mO8y3u1u0FTUD7FG06C3DGsLzAvnEI9qDXpnz7Yn5JWfQjqrDiSGOPgGlEg9wrlfRGs1Fck+IDcub47oTvrV2ZIJcUFXyhz+yzY/adUIpsC60fCl5/lYrPaMc0cVqMhNdfutWNi/4jIUR2+MnBzCVblZCBHD2ME67eaLVQ7usDVGJamsoBJ6uSNeV3rDUsDiTFX6eIgS81+cUvcYuQvvP4CXCfSLkHfrghYHoTqoQ85Lp8rVwPnKtk2PfLHSx11fULp8nhqGWCK2DOVp3kSNIFUmYc8iZvjE5TSXc5nqaxbe4LmStdIWMDt8ca1gcY4m4TZSgYJIHkD5YD2j/zx3 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CY5PR12MB6179.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(4636009)(396003)(376002)(346002)(136003)(39860400002)(366004)(66574015)(6512007)(2616005)(36756003)(6666004)(6916009)(66556008)(316002)(107886003)(1076003)(186003)(66946007)(41300700001)(6506007)(2906002)(38100700002)(66476007)(6486002)(8936002)(478600001)(4326008)(86362001)(8676002)(83380400001)(26005)(5660300002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?be2g2cpr9cGLtM9bax2JS7ETB5DD4Ky5V4+Gxjqe2TyVhA1Ioy0I3+qD3JUg?= =?us-ascii?Q?uRvhdX8donen+kgmUXRBybY4CF5bNHWsMMhZ6mrdykcA1LI02ZHg1GLftz7i?= =?us-ascii?Q?XB1X2sOJ8LWXleVJEy4PKHa26ytxC/pneXLHibIK5Z4zGZQMOF02jc5Cr30t?= =?us-ascii?Q?p2bJCJpUW24gmG7Y2PFYh3EVMTBHKMELCX2DkBeZ+vSxodK1WFITMm7cG4EB?= =?us-ascii?Q?JGRWIEJavJnQJkiZQXuvsUa/R7RER8TBx9KE+7FuyLyFjwOpfnWe9abQFgdG?= =?us-ascii?Q?dlyBvlyQrqG8YBL4TsJioJvuLqgKRh8QAvpk7s41McB8qCzY52IYPfrZozS4?= =?us-ascii?Q?qqhgxhM3TuGR7tkESv9GP6y8TWbKeQ0nVfk/7eKz6UCKljFBPMxQWzzqI6iF?= =?us-ascii?Q?0jgwguNQV506v0ghM0+jQbKZvsv0dkljP77cnfRDp0AWVM/LYSv2YjteDL77?= =?us-ascii?Q?SRHVaYjq36PK24HQCNE7rPHuoipb4CLaORFCIaR5erqzH16GAOaJ5ACoJr/v?= =?us-ascii?Q?wCKcE8H1shAma8ia7BW2rKfmcQwXM4vk07B8+1k2ztlLFbGUwGza5aNtJ0hI?= =?us-ascii?Q?3/jY5Zm13yyLowTjVyeu0R1wlO+Y4axm6hPDztgMRARijLLHlidA1EodsPk/?= =?us-ascii?Q?yS1VNVpPfax0AscNCWptS5TDSC4VtV1isN8X7IS25VHdhqSkTO8jNze5nivM?= =?us-ascii?Q?BVnBorXHcMm6enwczkkQtbRLQCM8nT3zEZnyWMgJJy9oHKyGZo98IV7SnLkv?= =?us-ascii?Q?satSNV1sCfS/YMPIMcyWILI3qFSsqmnK5K2LN5xnCjTtNCoOVJ4ytd8x9AmD?= =?us-ascii?Q?LxeQY3s3zW4vjgNN64cRXf3CQwmYJt5V4VC/HzRk3soKl/x3VuDapW9jzyxK?= =?us-ascii?Q?tlFWOJyNbVnomD6HL742po2jSi4mXxvVuNiv60jcyjPV+5BbKDyNSOS2phwd?= =?us-ascii?Q?Jse7WOFHocB3b7LOOLPrlyBOh7kSEJlzLKt9WDAMYvBDQCVLe/as8r0R+ER5?= =?us-ascii?Q?3ip0m7kNguvLAc++3ivSVsrb2dBPvMt9bDecXDh4AmdXN9U2MzKuxXq8i85T?= =?us-ascii?Q?z8Y8VJ9kHoWmFMGltqL+l/muX6FDYWO/VkfmVY+i3mV1COW5i/m3CJSlz2HI?= =?us-ascii?Q?U1iNzeXOY5nU2ORS3J+s4tyPpyNEu13LmGW+zrmYG/fBxlCwP2ZYeus56ODa?= =?us-ascii?Q?Fa6Y8SGg4If7Mqh3qCmiAEJbP37PkCmqox3N3U9Kq0uCjMhqw96dhkhzenTC?= =?us-ascii?Q?zRY9wusjsdMY8X+1b7ibVe6YkmbiAVVu3IX/3cjfdh4GqxMCfSE9S6IPQ04G?= =?us-ascii?Q?Sd1LvFLW05boBWbhltC14+GJhY2TJbIGXbZ/e9BuoB8M4QyXnwdLBo75GKvI?= =?us-ascii?Q?vWPJd5/cKvuWBWqM8ukuDcL/DmZ4aUPXWnb7DgKXveECVaHLjxvaaSJtD3xL?= =?us-ascii?Q?I3SVLa0Vjr9HFWxnSE/iq75na/qJ0F1R0PK3gL9mncdMC1DoXqoYlYylUB5E?= =?us-ascii?Q?tnzKNuCnkiveaiifaJ13Rpx2EwOR4YAM6i2Cwm5UnTwSZUPe0RAcvX4tQPFT?= =?us-ascii?Q?rjdVdKQVn4mXA5IGtQDjv8YkXXnE5oIvodE21wdT?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 676610d9-ef5e-4a48-9522-08da580bc019 X-MS-Exchange-CrossTenant-AuthSource: CY5PR12MB6179.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jun 2022 07:07:51.8226 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: di1Cf7nRPmxiWiNxtnmwzDCgH7o639v6RCThrjfM8qyNJUQchJluaBOiNGJGdEbTDS1DtY6HC2J7p9XDn8bAtQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR12MB5439 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Amit Cohen Currently when bitmap of ports is needed, 'unsigned long *' type is used. The functions which use the bitmap assume its length according to its name, i.e., each function which gets a bitmap of ports queries the maximum number of ports and uses it as the size. As preparation for the next patch which will use bitmap of ports, add a dedicated structure for it. Refactor the existing code to use the new structure. Signed-off-by: Amit Cohen Signed-off-by: Ido Schimmel --- .../net/ethernet/mellanox/mlxsw/spectrum.h | 25 +++++++++++++ .../mellanox/mlxsw/spectrum_switchdev.c | 37 +++++++++---------- 2 files changed, 43 insertions(+), 19 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.h b/drivers/net/ethernet/mellanox/mlxsw/spectrum.h index 600089364575..645244ac5dfc 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.h +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.h @@ -395,6 +395,31 @@ struct mlxsw_sp_port_type_speed_ops { u32 (*ptys_proto_cap_masked_get)(u32 eth_proto_cap); }; +struct mlxsw_sp_ports_bitmap { + unsigned long *bitmap; + unsigned int nbits; +}; + +static inline int +mlxsw_sp_port_bitmap_init(struct mlxsw_sp *mlxsw_sp, + struct mlxsw_sp_ports_bitmap *ports_bm) +{ + unsigned int nbits = mlxsw_core_max_ports(mlxsw_sp->core); + + ports_bm->nbits = nbits; + ports_bm->bitmap = bitmap_zalloc(nbits, GFP_KERNEL); + if (!ports_bm->bitmap) + return -ENOMEM; + + return 0; +} + +static inline void +mlxsw_sp_port_bitmap_fini(struct mlxsw_sp_ports_bitmap *ports_bm) +{ + bitmap_free(ports_bm->bitmap); +} + static inline u8 mlxsw_sp_tunnel_ecn_decap(u8 outer_ecn, u8 inner_ecn, bool *trap_en) { diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c index 863c8055746b..e153b6f2783a 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c @@ -1646,9 +1646,10 @@ static int mlxsw_sp_port_mdb_op(struct mlxsw_sp *mlxsw_sp, const char *addr, return err; } -static int mlxsw_sp_port_smid_full_entry(struct mlxsw_sp *mlxsw_sp, u16 mid_idx, - long *ports_bitmap, - bool set_router_port) +static int +mlxsw_sp_port_smid_full_entry(struct mlxsw_sp *mlxsw_sp, u16 mid_idx, + const struct mlxsw_sp_ports_bitmap *ports_bm, + bool set_router_port) { char *smid2_pl; int err, i; @@ -1666,7 +1667,7 @@ static int mlxsw_sp_port_smid_full_entry(struct mlxsw_sp *mlxsw_sp, u16 mid_idx, mlxsw_reg_smid2_port_mask_set(smid2_pl, mlxsw_sp_router_port(mlxsw_sp), 1); - for_each_set_bit(i, ports_bitmap, mlxsw_core_max_ports(mlxsw_sp->core)) + for_each_set_bit(i, ports_bm->bitmap, ports_bm->nbits) mlxsw_reg_smid2_port_set(smid2_pl, i, 1); mlxsw_reg_smid2_port_set(smid2_pl, mlxsw_sp_router_port(mlxsw_sp), @@ -1712,14 +1713,14 @@ mlxsw_sp_mid *__mlxsw_sp_mc_get(struct mlxsw_sp_bridge_device *bridge_device, static void mlxsw_sp_bridge_port_get_ports_bitmap(struct mlxsw_sp *mlxsw_sp, struct mlxsw_sp_bridge_port *bridge_port, - unsigned long *ports_bitmap) + struct mlxsw_sp_ports_bitmap *ports_bm) { struct mlxsw_sp_port *mlxsw_sp_port; u64 max_lag_members, i; int lag_id; if (!bridge_port->lagged) { - set_bit(bridge_port->system_port, ports_bitmap); + set_bit(bridge_port->system_port, ports_bm->bitmap); } else { max_lag_members = MLXSW_CORE_RES_GET(mlxsw_sp->core, MAX_LAG_MEMBERS); @@ -1729,13 +1730,13 @@ mlxsw_sp_bridge_port_get_ports_bitmap(struct mlxsw_sp *mlxsw_sp, lag_id, i); if (mlxsw_sp_port) set_bit(mlxsw_sp_port->local_port, - ports_bitmap); + ports_bm->bitmap); } } } static void -mlxsw_sp_mc_get_mrouters_bitmap(unsigned long *flood_bitmap, +mlxsw_sp_mc_get_mrouters_bitmap(struct mlxsw_sp_ports_bitmap *flood_bm, struct mlxsw_sp_bridge_device *bridge_device, struct mlxsw_sp *mlxsw_sp) { @@ -1745,7 +1746,7 @@ mlxsw_sp_mc_get_mrouters_bitmap(unsigned long *flood_bitmap, if (bridge_port->mrouter) { mlxsw_sp_bridge_port_get_ports_bitmap(mlxsw_sp, bridge_port, - flood_bitmap); + flood_bm); } } } @@ -1755,8 +1756,7 @@ mlxsw_sp_mc_write_mdb_entry(struct mlxsw_sp *mlxsw_sp, struct mlxsw_sp_mid *mid, struct mlxsw_sp_bridge_device *bridge_device) { - long *flood_bitmap; - int num_of_ports; + struct mlxsw_sp_ports_bitmap flood_bitmap; u16 mid_idx; int err; @@ -1765,18 +1765,17 @@ mlxsw_sp_mc_write_mdb_entry(struct mlxsw_sp *mlxsw_sp, if (mid_idx == MLXSW_SP_MID_MAX) return -ENOBUFS; - num_of_ports = mlxsw_core_max_ports(mlxsw_sp->core); - flood_bitmap = bitmap_alloc(num_of_ports, GFP_KERNEL); - if (!flood_bitmap) - return -ENOMEM; + err = mlxsw_sp_port_bitmap_init(mlxsw_sp, &flood_bitmap); + if (err) + return err; - bitmap_copy(flood_bitmap, mid->ports_in_mid, num_of_ports); - mlxsw_sp_mc_get_mrouters_bitmap(flood_bitmap, bridge_device, mlxsw_sp); + bitmap_copy(flood_bitmap.bitmap, mid->ports_in_mid, flood_bitmap.nbits); + mlxsw_sp_mc_get_mrouters_bitmap(&flood_bitmap, bridge_device, mlxsw_sp); mid->mid = mid_idx; - err = mlxsw_sp_port_smid_full_entry(mlxsw_sp, mid_idx, flood_bitmap, + err = mlxsw_sp_port_smid_full_entry(mlxsw_sp, mid_idx, &flood_bitmap, bridge_device->mrouter); - bitmap_free(flood_bitmap); + mlxsw_sp_port_bitmap_fini(&flood_bitmap); if (err) return err; -- 2.36.1