From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 2CEE8A046B for ; Tue, 23 Jul 2019 03:04:12 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E5BEE1BFF7; Tue, 23 Jul 2019 03:04:11 +0200 (CEST) Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id 596CB1BFE6 for ; Tue, 23 Jul 2019 03:04:10 +0200 (CEST) Received: from Internal Mail-Server by MTLPINE2 (envelope-from yskoh@mellanox.com) with ESMTPS (AES256-SHA encrypted); 23 Jul 2019 04:04:07 +0300 Received: from scfae-sc-2.mti.labs.mlnx (scfae-sc-2.mti.labs.mlnx [10.101.0.96]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id x6N11HgM026580; Tue, 23 Jul 2019 04:04:06 +0300 From: Yongseok Koh To: Stephen Hemminger Cc: Ferruh Yigit , dpdk stable Date: Mon, 22 Jul 2019 18:01:03 -0700 Message-Id: <20190723010115.6446-96-yskoh@mellanox.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190723010115.6446-1-yskoh@mellanox.com> References: <20190723010115.6446-1-yskoh@mellanox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/ring: use calloc style where appropriate' has been queued to LTS release 17.11.7 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 17.11.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objection by 07/27/19. So please shout if anyone has objection. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Thanks. Yongseok --- >From 08bc9acf89091907dea4b263069cb5d60428ae7c Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Tue, 23 Apr 2019 09:53:34 -0700 Subject: [PATCH] net/ring: use calloc style where appropriate [ upstream commit 42a665a3227462c97222f623779a82c8d4f8c54e ] Use rte_calloc_socket instead of computing size. Fixes: 651c505af862 ("ring: enhance device setup from rings") Signed-off-by: Stephen Hemminger Reviewed-by: Ferruh Yigit --- drivers/net/ring/rte_eth_ring.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/ring/rte_eth_ring.c b/drivers/net/ring/rte_eth_ring.c index 6617e0d778..781ca3cca8 100644 --- a/drivers/net/ring/rte_eth_ring.c +++ b/drivers/net/ring/rte_eth_ring.c @@ -288,15 +288,15 @@ do_eth_dev_ring_create(const char *name, RTE_LOG(INFO, PMD, "Creating rings-backed ethdev on numa socket %u\n", numa_node); - rx_queues_local = rte_zmalloc_socket(name, - sizeof(void *) * nb_rx_queues, 0, numa_node); + rx_queues_local = rte_calloc_socket(name, nb_rx_queues, + sizeof(void *), 0, numa_node); if (rx_queues_local == NULL) { rte_errno = ENOMEM; goto error; } - tx_queues_local = rte_zmalloc_socket(name, - sizeof(void *) * nb_tx_queues, 0, numa_node); + tx_queues_local = rte_calloc_socket(name, nb_tx_queues, + sizeof(void *), 0, numa_node); if (tx_queues_local == NULL) { rte_errno = ENOMEM; goto error; -- 2.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-07-22 17:55:11.654346806 -0700 +++ 0096-net-ring-use-calloc-style-where-appropriate.patch 2019-07-22 17:55:06.466475000 -0700 @@ -1,12 +1,13 @@ -From 42a665a3227462c97222f623779a82c8d4f8c54e Mon Sep 17 00:00:00 2001 +From 08bc9acf89091907dea4b263069cb5d60428ae7c Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Tue, 23 Apr 2019 09:53:34 -0700 Subject: [PATCH] net/ring: use calloc style where appropriate +[ upstream commit 42a665a3227462c97222f623779a82c8d4f8c54e ] + Use rte_calloc_socket instead of computing size. Fixes: 651c505af862 ("ring: enhance device setup from rings") -Cc: stable@dpdk.org Signed-off-by: Stephen Hemminger Reviewed-by: Ferruh Yigit @@ -15,11 +16,11 @@ 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/ring/rte_eth_ring.c b/drivers/net/ring/rte_eth_ring.c -index 2e4ca3b16a..0355f2b7c4 100644 +index 6617e0d778..781ca3cca8 100644 --- a/drivers/net/ring/rte_eth_ring.c +++ b/drivers/net/ring/rte_eth_ring.c -@@ -270,15 +270,15 @@ do_eth_dev_ring_create(const char *name, - PMD_LOG(INFO, "Creating rings-backed ethdev on numa socket %u", +@@ -288,15 +288,15 @@ do_eth_dev_ring_create(const char *name, + RTE_LOG(INFO, PMD, "Creating rings-backed ethdev on numa socket %u\n", numa_node); - rx_queues_local = rte_zmalloc_socket(name,