From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C4B8B3BF694 for ; Fri, 29 May 2026 23:30:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780097433; cv=none; b=COHr3sMeEKmmnijIQ3aJYFG0yQ6tn274BsaeZ9wxFAI55CRenEBoVONpsdDWTF51iwYkKBK091Cj2pYOEr3bfjOouoqgemCGWy78f3RVPrpdJ7LtD4g7yBUH5DTDLpPn445NTjZgBCTbQVJpT5IOi/4bQond7iNf62SRopDyvIM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780097433; c=relaxed/simple; bh=hh1CJasr/ZYyKr8GBfXzE060fBNOaPs6kJgo2w1oZ1Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jkh44LGan0cpzCTi9oZSk3doFmJDgbtNEaaIzUMCOoJArnCFb6we3CX7hPW+zFslT22zuD1Bg6JDAu/sInSa81+ofZoOp5XeLnUo3O+TQJYeDfpUk0RFQP36qAqtjcJr4UD7GYhDlkVtuFd/Kdomm8+ecq2VJA+vK+BO0QLx1JU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=kMjsArHc; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="kMjsArHc" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2F3641F00893; Fri, 29 May 2026 23:30:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1780097431; bh=Cjc4GbDR7KBjdNx1Wr1zAOqI9vueyi3Dfgknvx0Qh6E=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=kMjsArHczZdNsKOZCznHJocDGQsGdD6pDl1mzUoo2nO4icWOjdwmz52VhBZPMz+oB VRIPUU/8X7ZySwHKqtTCkG6lO6A4HKR/NZhn4n1VgFoiKZObzbeZBcNg8cqHgVCys+ SiZtnqHemUbIh8ZklrvSPAJchOFPcMRcxCnqeEeGPTE7HkfIn5Q9ETXXDnAQEE6D5p 0mFnCasErbTa/TZrLHcDVLCzNdi2JZQZ+Ml9oY8/kjWi4RWkxJGM7J9RPVV2v71nxS uGlfBpG5iA3fIYtSYkltLtoDshXLQZSdJNNdN3RWB7Tk1I2ZqpRPjjec5UFDlVPp7Z ULzgr23VLYPTw== From: Sasha Levin To: stable@vger.kernel.org Cc: Christophe JAILLET , "David S. Miller" , Sasha Levin Subject: [PATCH 5.15.y 1/2] qed: Use the bitmap API to simplify some functions Date: Fri, 29 May 2026 19:30:28 -0400 Message-ID: <20260529233029.1896294-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026052808-multitask-shelf-9b39@gregkh> References: <2026052808-multitask-shelf-9b39@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Christophe JAILLET [ Upstream commit 5e6c7ccd3ea4b25dd6b4b0363859913f315deacb ] 'cid_map' is a bitmap. So use 'bitmap_zalloc()' to simplify code, improve the semantic and avoid some open-coded arithmetic in allocator arguments. Also change the corresponding 'kfree()' into 'bitmap_free()' to keep consistency. Also change some 'memset()' into 'bitmap_zero()' to keep consistency. This is also much less verbose. Signed-off-by: Christophe JAILLET Signed-off-by: David S. Miller Stable-dep-of: 2bccfb8476ca ("qed: fix double free in qed_cxt_tables_alloc()") Signed-off-by: Sasha Levin --- drivers/net/ethernet/qlogic/qed/qed_cxt.c | 24 +++++------------------ 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/drivers/net/ethernet/qlogic/qed/qed_cxt.c b/drivers/net/ethernet/qlogic/qed/qed_cxt.c index 7d8401da6f226..d5a31119e3f3e 100644 --- a/drivers/net/ethernet/qlogic/qed/qed_cxt.c +++ b/drivers/net/ethernet/qlogic/qed/qed_cxt.c @@ -1037,12 +1037,12 @@ static void qed_cid_map_free(struct qed_hwfn *p_hwfn) u32 type, vf; for (type = 0; type < MAX_CONN_TYPES; type++) { - kfree(p_mngr->acquired[type].cid_map); + bitmap_free(p_mngr->acquired[type].cid_map); p_mngr->acquired[type].max_count = 0; p_mngr->acquired[type].start_cid = 0; for (vf = 0; vf < MAX_NUM_VFS; vf++) { - kfree(p_mngr->acquired_vf[type][vf].cid_map); + bitmap_free(p_mngr->acquired_vf[type][vf].cid_map); p_mngr->acquired_vf[type][vf].max_count = 0; p_mngr->acquired_vf[type][vf].start_cid = 0; } @@ -1055,15 +1055,10 @@ qed_cid_map_alloc_single(struct qed_hwfn *p_hwfn, u32 cid_start, u32 cid_count, struct qed_cid_acquired_map *p_map) { - u32 size; - if (!cid_count) return 0; - size = DIV_ROUND_UP(cid_count, - sizeof(unsigned long) * BITS_PER_BYTE) * - sizeof(unsigned long); - p_map->cid_map = kzalloc(size, GFP_KERNEL); + p_map->cid_map = bitmap_zalloc(cid_count, GFP_KERNEL); if (!p_map->cid_map) return -ENOMEM; @@ -1217,7 +1212,6 @@ void qed_cxt_mngr_setup(struct qed_hwfn *p_hwfn) struct qed_cid_acquired_map *p_map; struct qed_conn_type_cfg *p_cfg; int type; - u32 len; /* Reset acquired cids */ for (type = 0; type < MAX_CONN_TYPES; type++) { @@ -1226,11 +1220,7 @@ void qed_cxt_mngr_setup(struct qed_hwfn *p_hwfn) p_cfg = &p_mngr->conn_cfg[type]; if (p_cfg->cid_count) { p_map = &p_mngr->acquired[type]; - len = DIV_ROUND_UP(p_map->max_count, - sizeof(unsigned long) * - BITS_PER_BYTE) * - sizeof(unsigned long); - memset(p_map->cid_map, 0, len); + bitmap_zero(p_map->cid_map, p_map->max_count); } if (!p_cfg->cids_per_vf) @@ -1238,11 +1228,7 @@ void qed_cxt_mngr_setup(struct qed_hwfn *p_hwfn) for (vf = 0; vf < MAX_NUM_VFS; vf++) { p_map = &p_mngr->acquired_vf[type][vf]; - len = DIV_ROUND_UP(p_map->max_count, - sizeof(unsigned long) * - BITS_PER_BYTE) * - sizeof(unsigned long); - memset(p_map->cid_map, 0, len); + bitmap_zero(p_map->cid_map, p_map->max_count); } } } -- 2.53.0