[RESEND] crypto: bcm - set memory to zero only once

Commit Message

Thorsten Blum Feb. 19, 2025, 11:12 a.m. UTC

Use kmalloc_array() instead of kcalloc() because sg_init_table() already
sets the memory to zero. This avoids zeroing the memory twice.

Signed-off-by: Thorsten Blum <[e-mail]>
---
 drivers/crypto/bcm/cipher.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

Comments

Herbert Xu March 2, 2025, 6:13 a.m. UTC | #1

On Wed, Feb 19, 2025 at 12:12:53PM +0100, Thorsten Blum wrote:
> Use kmalloc_array() instead of kcalloc() because sg_init_table() already
> sets the memory to zero. This avoids zeroing the memory twice.
> 
> Signed-off-by: Thorsten Blum <[e-mail]>
> ---
>  drivers/crypto/bcm/cipher.c | 24 ++++++++++++------------
>  1 file changed, 12 insertions(+), 12 deletions(-)

This patch has already been applied.  Please check whether there
is any discrepancy between the applied version and this resend.

Thanks,

Thorsten Blum March 2, 2025, 11:40 a.m. UTC | #2

On 2. Mar 2025, at 07:13, Herbert Xu wrote:
> On Wed, Feb 19, 2025 at 12:12:53PM +0100, Thorsten Blum wrote:
>> Use kmalloc_array() instead of kcalloc() because sg_init_table() already
>> sets the memory to zero. This avoids zeroing the memory twice.
>> 
>> Signed-off-by: Thorsten Blum <[e-mail]>
>> ---
>> drivers/crypto/bcm/cipher.c | 24 ++++++++++++------------
>> 1 file changed, 12 insertions(+), 12 deletions(-)
> 
> This patch has already been applied.  Please check whether there
> is any discrepancy between the applied version and this resend.

My bad, I must have missed it in -next. The patches are identical.

Thanks,
Thorsten

Patch

diff --git a/drivers/crypto/bcm/cipher.c b/drivers/crypto/bcm/cipher.c
index 9e6798efbfb7..d4da2b5b595f 100644
--- a/drivers/crypto/bcm/cipher.c
+++ b/drivers/crypto/bcm/cipher.c
@@ -140,8 +140,8 @@  spu_skcipher_rx_sg_create(struct brcm_message *mssg,
 	struct iproc_ctx_s *ctx = rctx->ctx;
 	u32 datalen;		/* Number of bytes of response data expected */
 
-	mssg->spu.dst = kcalloc(rx_frag_num, sizeof(struct scatterlist),
-				rctx->gfp);
+	mssg->spu.dst = kmalloc_array(rx_frag_num, sizeof(struct scatterlist),
+				      rctx->gfp);
 	if (!mssg->spu.dst)
 		return -ENOMEM;
 
@@ -204,8 +204,8 @@  spu_skcipher_tx_sg_create(struct brcm_message *mssg,
 	u32 datalen;		/* Number of bytes of response data expected */
 	u32 stat_len;
 
-	mssg->spu.src = kcalloc(tx_frag_num, sizeof(struct scatterlist),
-				rctx->gfp);
+	mssg->spu.src = kmalloc_array(tx_frag_num, sizeof(struct scatterlist),
+				      rctx->gfp);
 	if (unlikely(!mssg->spu.src))
 		return -ENOMEM;
 
@@ -531,8 +531,8 @@  spu_ahash_rx_sg_create(struct brcm_message *mssg,
 	struct scatterlist *sg;	/* used to build sgs in mbox message */
 	struct iproc_ctx_s *ctx = rctx->ctx;
 
-	mssg->spu.dst = kcalloc(rx_frag_num, sizeof(struct scatterlist),
-				rctx->gfp);
+	mssg->spu.dst = kmalloc_array(rx_frag_num, sizeof(struct scatterlist),
+				      rctx->gfp);
 	if (!mssg->spu.dst)
 		return -ENOMEM;
 
@@ -586,8 +586,8 @@  spu_ahash_tx_sg_create(struct brcm_message *mssg,
 	u32 datalen;		/* Number of bytes of response data expected */
 	u32 stat_len;
 
-	mssg->spu.src = kcalloc(tx_frag_num, sizeof(struct scatterlist),
-				rctx->gfp);
+	mssg->spu.src = kmalloc_array(tx_frag_num, sizeof(struct scatterlist),
+				      rctx->gfp);
 	if (!mssg->spu.src)
 		return -ENOMEM;
 
@@ -1076,8 +1076,8 @@  static int spu_aead_rx_sg_create(struct brcm_message *mssg,
 		/* have to catch gcm pad in separate buffer */
 		rx_frag_num++;
 
-	mssg->spu.dst = kcalloc(rx_frag_num, sizeof(struct scatterlist),
-				rctx->gfp);
+	mssg->spu.dst = kmalloc_array(rx_frag_num, sizeof(struct scatterlist),
+				      rctx->gfp);
 	if (!mssg->spu.dst)
 		return -ENOMEM;
 
@@ -1178,8 +1178,8 @@  static int spu_aead_tx_sg_create(struct brcm_message *mssg,
 	u32 assoc_offset = 0;
 	u32 stat_len;
 
-	mssg->spu.src = kcalloc(tx_frag_num, sizeof(struct scatterlist),
-				rctx->gfp);
+	mssg->spu.src = kmalloc_array(tx_frag_num, sizeof(struct scatterlist),
+				      rctx->gfp);
 	if (!mssg->spu.src)
 		return -ENOMEM;