From patchwork Tue Mar 28 13:57:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 744286 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3vsstS1N72z9s7K for ; Wed, 29 Mar 2017 00:58:24 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="hcz1vWb/"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755760AbdC1N6O (ORCPT ); Tue, 28 Mar 2017 09:58:14 -0400 Received: from mail-wr0-f195.google.com ([209.85.128.195]:33778 "EHLO mail-wr0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755671AbdC1N6I (ORCPT ); Tue, 28 Mar 2017 09:58:08 -0400 Received: by mail-wr0-f195.google.com with SMTP id u18so3521044wrc.0 for ; Tue, 28 Mar 2017 06:57:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=aEJHYCcyAwAy0GcPPHjP1bLizToKHRIWTarhb6bzrSU=; b=hcz1vWb//Zjot8Ler7299W6dkijeDPGxF4UhmHNnLdfPCZfK8TyBLoITZjkJvNBQYF xEx8e5suzHqXpXY/zH7GwdW2IpbWPb0l03ZjEwNgZ7++KvAFebNLpIwBK1geg9dEEdmZ O5rZKDKb4OQtkcnRQ6z1o63rN/s2So6cvLfKkk4FeUs5IA5SdIyNXpa0dIKYlKBWsz0F xThwy24mDYproscAGxtMetCnBAlwV2RIWOgfqEGfqZmpGBvYMtwzo1W1p0nGQW5DyKK9 0pRj8SqPgO9DuKNaWj4gabsp4egPvbmFtVyg6MBySD7+LnkwPegCxLFm/ojBmWyEa3X/ Pnzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=aEJHYCcyAwAy0GcPPHjP1bLizToKHRIWTarhb6bzrSU=; b=rH35WkggrN3tuxCh0dr2ASQB9bPS64qbJsN2EPVm1W8/p2/b7KF5/RgRBjUG/Dwv+p jv+j1y5v0PKTdDyUQotYcRWoFe/7uj12ls/Y6pUxG3si8zzfPQiQdRJB5rCabSG5dKfe 8Yvk+GbA/8zPD0szevzXADCIZ0D18f/48zToR/pIRojl4C5Gsi3D5zb/RB8nsjJq1GeP FW97PhiYlN/JAr4m8KVCO0htvKpHjctXnChWCeSrM19RfZ6MuFHYxI7X1vaIsWpVRZV9 3YvvLsTWst6BPYO3sPgGWrZamL020/zTP5A2bGGVg6lxbBYIqEBOQ5JQ3TrG5r8AY7qR ScBA== X-Gm-Message-State: AFeK/H1+wamgRB9q+lImwLDo1y4J7tpVb8IcnDMm7EXxgqsIQvp6opoiERHNrjpjBaPnIQ== X-Received: by 10.28.88.2 with SMTP id m2mr14928187wmb.12.1490709430052; Tue, 28 Mar 2017 06:57:10 -0700 (PDT) Received: from localhost (port-17979.pppoe.wtnet.de. [46.59.131.215]) by smtp.gmail.com with ESMTPSA id u63sm3726060wmu.22.2017.03.28.06.57.09 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 28 Mar 2017 06:57:09 -0700 (PDT) From: Thierry Reding To: Niklas Cassel Cc: Joao Pinto , David Miller , clabbe.montjoie@gmail.com, peppe.cavallaro@st.com, alexandre.torgue@st.com, sergei.shtylyov@cogentembedded.com, f.fainelli@gmail.com, netdev@vger.kernel.org Subject: [PATCH 3/3] net: stmmac: Prefer kcalloc() over kmalloc_array() Date: Tue, 28 Mar 2017 15:57:06 +0200 Message-Id: <20170328135706.7605-3-thierry.reding@gmail.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170328135706.7605-1-thierry.reding@gmail.com> References: <71d841cd-b07b-2635-c2cf-f7af5f5ed2c9@axis.com> <20170328135706.7605-1-thierry.reding@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Thierry Reding Some of the data in the new queue structures seems to not be properly initialized, causing undefined behaviour (networking will work about 2 out of 10 tries). kcalloc() will zero the allocated memory and results in 10 out of 10 successful boots. Signed-off-by: Thierry Reding Tested-by: Niklas Cassel --- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 37 +++++++++++------------ 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index ec5bba85c529..845320bc3333 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -1412,13 +1412,12 @@ static void free_dma_desc_resources(struct stmmac_priv *priv) static int alloc_rx_dma_desc_resources(struct stmmac_priv *priv) { u32 rx_count = priv->plat->rx_queues_to_use; + struct stmmac_rx_queue *rx_q; int ret = -ENOMEM; u32 queue = 0; /* Allocate RX queues array */ - priv->rx_queue = kmalloc_array(rx_count, - sizeof(struct stmmac_rx_queue), - GFP_KERNEL); + priv->rx_queue = kcalloc(rx_count, sizeof(*rx_q), GFP_KERNEL); if (!priv->rx_queue) { kfree(priv->rx_queue); return -ENOMEM; @@ -1426,20 +1425,19 @@ static int alloc_rx_dma_desc_resources(struct stmmac_priv *priv) /* RX queues buffers and DMA */ for (queue = 0; queue < rx_count; queue++) { - struct stmmac_rx_queue *rx_q = &priv->rx_queue[queue]; + rx_q = &priv->rx_queue[queue]; rx_q->queue_index = queue; rx_q->priv_data = priv; - rx_q->rx_skbuff_dma = kmalloc_array(DMA_RX_SIZE, - sizeof(dma_addr_t), - GFP_KERNEL); + rx_q->rx_skbuff_dma = kcalloc(DMA_RX_SIZE, sizeof(dma_addr_t), + GFP_KERNEL); if (!rx_q->rx_skbuff_dma) goto err_dma_buffers; - rx_q->rx_skbuff = kmalloc_array(DMA_RX_SIZE, - sizeof(struct sk_buff *), - GFP_KERNEL); + rx_q->rx_skbuff = kcalloc(DMA_RX_SIZE, + sizeof(struct sk_buff *), + GFP_KERNEL); if (!rx_q->rx_skbuff) goto err_dma_buffers; @@ -1477,33 +1475,32 @@ static int alloc_rx_dma_desc_resources(struct stmmac_priv *priv) static int alloc_tx_dma_desc_resources(struct stmmac_priv *priv) { u32 tx_count = priv->plat->tx_queues_to_use; + struct stmmac_tx_queue *tx_q; int ret = -ENOMEM; u32 queue = 0; /* Allocate TX queues array */ - priv->tx_queue = kmalloc_array(tx_count, - sizeof(struct stmmac_tx_queue), - GFP_KERNEL); + priv->tx_queue = kcalloc(tx_count, sizeof(*tx_q), GFP_KERNEL); if (!priv->tx_queue) return -ENOMEM; /* TX queues buffers and DMA */ for (queue = 0; queue < tx_count; queue++) { - struct stmmac_tx_queue *tx_q = &priv->tx_queue[queue]; + tx_q = &priv->tx_queue[queue]; tx_q->queue_index = queue; tx_q->priv_data = priv; - tx_q->tx_skbuff_dma = kmalloc_array(DMA_TX_SIZE, - sizeof(struct stmmac_tx_info), - GFP_KERNEL); + tx_q->tx_skbuff_dma = kcalloc(DMA_TX_SIZE, + sizeof(struct stmmac_tx_info), + GFP_KERNEL); if (!tx_q->tx_skbuff_dma) goto err_dma_buffers; - tx_q->tx_skbuff = kmalloc_array(DMA_TX_SIZE, - sizeof(struct sk_buff *), - GFP_KERNEL); + tx_q->tx_skbuff = kcalloc(DMA_TX_SIZE, + sizeof(struct sk_buff *), + GFP_KERNEL); if (!tx_q->tx_skbuff) goto err_dma_buffers;