From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6381AA0544; Tue, 11 Oct 2022 02:54:21 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C8BEE42C17; Tue, 11 Oct 2022 02:52:27 +0200 (CEST) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2089.outbound.protection.outlook.com [40.107.243.89]) by mails.dpdk.org (Postfix) with ESMTP id 42F1842C24 for ; Tue, 11 Oct 2022 02:52:21 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=O2OexlDuCkDrCCQSVRvVMGPMeS59FBM5yGBES8xGpTljibz6VKOZyFBHf/R8hpZzOzUG9JSjLPwP7NMHqrM6bd5iiga1s+1TVzqlFmVTzCanmdjM9R1gjsbjeLYN36iqcD8FBKrKh5Y5yPTymH32OpNwNRwxAglmf8CyvsrKqGWlvPOp8v8kiDU6f1YyJ4O6JaMwPo7ie7cHJvbuMBRB8hBXNElo/4NepiigraHNKKVVOT0OgM+FZeD2swxztypBAcfgxSghJtBFsTYMAe7dei2QVQQdzpr9gixhmzJDoJRK76kGX6qHFlRogGzCRbDqc5TCzM3AdzfS/LIvEfuclA== 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=uyKiizAlAuKHt75h1rAq4qKYa0RquoHsmzrSSa+9dds=; b=aJwTMsKfrVmswVG8+YFecfSeswVw5YuJnIedT1OSVPZsiFdTUIs2UPW1K/4KgHrlLvCvy3N6Ya599QTHBOR9hQd9HWNMfiGcY8vjGZgOD7JCy72ylg1nFzW0ghpg0wlKWTPaAoJN49gtelZbTwtX7yovK+me20VephX+iUvN8+CiehZRzynso5rSj94iZbcfMPNRPBXPPrukN++rQya1xnQkb33MP1cSdWb6cnb/vVaQ/W5Y0tmpFNIx33CKNMr9jfurIkEVKYet1gMxTW9yYpZaZte5kTstF52NGD0naDivy0CmWke1/IYyY7nIerqnowj3IdNu7SIoitFOZ8KeHw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=dpdk.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=uyKiizAlAuKHt75h1rAq4qKYa0RquoHsmzrSSa+9dds=; b=smwDyqZlJ/JVbY2VxP1m0YQvT0DYMxFsgvqoQUyq661wdfMJiPgE7wmU61sDq5sKEn+xUYwSrTne4xVU+XqxKRaMGJ5l1xx6dJWlTdNPMSP5ZGjg0LBLdKhux0lkGaZxsN4BpJWxhzDRqFw4sGd1VGPnx/91wq4CQJjwfZ9B+AA= Received: from BN9PR03CA0657.namprd03.prod.outlook.com (2603:10b6:408:13b::32) by BL1PR12MB5206.namprd12.prod.outlook.com (2603:10b6:208:31c::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5709.19; Tue, 11 Oct 2022 00:52:18 +0000 Received: from BN8NAM11FT032.eop-nam11.prod.protection.outlook.com (2603:10b6:408:13b:cafe::31) by BN9PR03CA0657.outlook.office365.com (2603:10b6:408:13b::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5709.16 via Frontend Transport; Tue, 11 Oct 2022 00:52:18 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by BN8NAM11FT032.mail.protection.outlook.com (10.13.177.88) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5709.10 via Frontend Transport; Tue, 11 Oct 2022 00:52:18 +0000 Received: from driver-dev1.pensando.io (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.28; Mon, 10 Oct 2022 19:52:17 -0500 From: Andrew Boyer To: CC: Andrew Boyer Subject: [PATCH v1 29/35] net/ionic: update array allocations to use calloc Date: Mon, 10 Oct 2022 17:50:26 -0700 Message-ID: <20221011005032.47584-30-andrew.boyer@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221007174336.54354-1-andrew.boyer@amd.com> References: <20221007174336.54354-1-andrew.boyer@amd.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN8NAM11FT032:EE_|BL1PR12MB5206:EE_ X-MS-Office365-Filtering-Correlation-Id: 4a08398a-f1d8-4b74-3953-08daab22d914 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5B8Spnvp3BOy7Aq5hFVPjjEIvHtZ7lnTv+YW5KlxsWyVn29Rs41Lp5fw3NcFd32ZnHRWn7m9Rc3jEfD06TOSE2en8YRN51izYd30p8UMWY7plyo3jC+LD7NhWIl2Xva1HC6gJumPjV0HEQ48UPwYrHqRB81ulj9i/oZhIUX3CG7ktB/r3zXqX27dvLAGVzWLwyIT/1Y1g2qbQHMYQgCPLB8wPegwk7iTLZUKn/X1chMB0CzehH9SAgr7xSpDy89gMtCRYwyuoWfrNlayvQycNbkJFvI5VDhabxgRwrrwugEnqPjCC6DdimC9V5iOif6yZVTIPzTQ+r0yuN3hJB6iNAC7v7xXCgDTMzZ8rzv3g3AL+tt4IglzwKeNNMNN1psToPGqz7XUUNwNs52LlEb/kyf7SFb2qjq60ugldGuUY9YNt6dFex9UFZbOxtdjQCYHDxQUS/HNXVZD3uYBMOQqdNTpOYCbJn8cV0gSKJt1/gPvlgwtSjZyPVJ8RBUsoKZ8cFFhY7tglJkEaih8VHw2i95q+KmSvzz2TCSM2I6yYK2LI3kJ+ixsHY4sJYCxm+rNSs2xoawGM1xgUZf5rKO3gPU/zAKNiIQ7PO4QIvmFFY3vhn5uMuH/GMgfRC7OT6nyB0wXHZFmA1u8No+beZwRHwcz8x7vAft8iK/yW2SDwNOumcOKtLEQX4npj2wqO+810G5Hrf+Nbarae/HX9lXCE4OwfqBg0Xgyjyc6Ly2Jme7ugMP3Y4skwyUnJroMGxxyUhDCG2jvzhyg6w72BdXbDMFCtqif2nnfZJgvIwkWhcFZ8ulZ8FqueCV+88SM8yXn3FL7QQrGftxGEXf+HVh0Wyq990wSB/UP7yeDy4eXWQA= X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB04.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230022)(4636009)(346002)(39860400002)(136003)(376002)(396003)(451199015)(40470700004)(46966006)(36840700001)(478600001)(6916009)(316002)(8676002)(4326008)(70206006)(6666004)(41300700001)(5660300002)(26005)(8936002)(36756003)(70586007)(44832011)(2906002)(2616005)(47076005)(40460700003)(186003)(16526019)(1076003)(336012)(426003)(83380400001)(40480700001)(86362001)(36860700001)(82310400005)(81166007)(82740400003)(356005)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Oct 2022 00:52:18.5096 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4a08398a-f1d8-4b74-3953-08daab22d914 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT032.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR12MB5206 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Use rte_calloc() where appropriate. This makes the code clearer. Signed-off-by: Andrew Boyer --- drivers/net/ionic/ionic_ethdev.c | 6 +++--- drivers/net/ionic/ionic_lif.c | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/net/ionic/ionic_ethdev.c b/drivers/net/ionic/ionic_ethdev.c index a6e7c7fa9f..43fa5f8bbf 100644 --- a/drivers/net/ionic/ionic_ethdev.c +++ b/drivers/net/ionic/ionic_ethdev.c @@ -1003,9 +1003,9 @@ eth_ionic_dev_init(struct rte_eth_dev *eth_dev, void *init_params) adapter->max_mac_addrs); /* Allocate memory for storing MAC addresses */ - eth_dev->data->mac_addrs = rte_zmalloc("ionic", - RTE_ETHER_ADDR_LEN * adapter->max_mac_addrs, 0); - + eth_dev->data->mac_addrs = rte_calloc("ionic", + adapter->max_mac_addrs, + RTE_ETHER_ADDR_LEN, 0); if (eth_dev->data->mac_addrs == NULL) { IONIC_PRINT(ERR, "Failed to allocate %u bytes needed to " "store MAC addresses", diff --git a/drivers/net/ionic/ionic_lif.c b/drivers/net/ionic/ionic_lif.c index bb107b30e9..fbeec8ef2e 100644 --- a/drivers/net/ionic/ionic_lif.c +++ b/drivers/net/ionic/ionic_lif.c @@ -1037,17 +1037,17 @@ ionic_lif_alloc(struct ionic_lif *lif) return -ENOMEM; } - lif->txqcqs = rte_zmalloc("ionic", sizeof(*lif->txqcqs) * - adapter->max_ntxqs_per_lif, 0); - + lif->txqcqs = rte_calloc("ionic", + adapter->max_ntxqs_per_lif, + sizeof(*lif->txqcqs), 0); if (!lif->txqcqs) { IONIC_PRINT(ERR, "Cannot allocate tx queues array"); return -ENOMEM; } - lif->rxqcqs = rte_zmalloc("ionic", sizeof(*lif->rxqcqs) * - adapter->max_nrxqs_per_lif, 0); - + lif->rxqcqs = rte_calloc("ionic", + adapter->max_nrxqs_per_lif, + sizeof(*lif->rxqcqs), 0); if (!lif->rxqcqs) { IONIC_PRINT(ERR, "Cannot allocate rx queues array"); return -ENOMEM; -- 2.17.1