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 18F14A0A02 for ; Mon, 17 May 2021 18:17:14 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 11CA8410E0; Mon, 17 May 2021 18:17:14 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id F304C410E0 for ; Mon, 17 May 2021 18:17:11 +0200 (CEST) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=Keschdeichel.fritz.box) by youngberry.canonical.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lifva-0008UY-0O; Mon, 17 May 2021 16:17:10 +0000 From: Christian Ehrhardt To: Jiayu Hu Cc: Maxime Coquelin , Yinan Wang , dpdk stable Date: Mon, 17 May 2021 18:09:59 +0200 Message-Id: <20210517161039.3132619-170-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> References: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'vhost: fix queue initialization' has been queued to stable release 19.11.9 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 stable release 19.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/19/21. So please shout if anyone has objections. 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. Queued patches are on a temporary branch at: https://github.com/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/3165834050d9c02b087c0fa0f0658c2a29f6e6d7 Thanks. Christian Ehrhardt --- >From 3165834050d9c02b087c0fa0f0658c2a29f6e6d7 Mon Sep 17 00:00:00 2001 From: Jiayu Hu Date: Tue, 20 Apr 2021 04:57:43 -0400 Subject: [PATCH] vhost: fix queue initialization [ upstream commit 678a91efa23a50a16cd3c5a2b18a117daef3c840 ] This patch allocates vhost queue by rte_zmalloc() to avoid undefined values. Fixes: a277c7159876 ("vhost: refactor code structure") Signed-off-by: Jiayu Hu Reviewed-by: Maxime Coquelin Tested-by: Yinan Wang --- lib/librte_vhost/vhost.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/librte_vhost/vhost.c b/lib/librte_vhost/vhost.c index 2d5bb2cfde..b876e81dbd 100644 --- a/lib/librte_vhost/vhost.c +++ b/lib/librte_vhost/vhost.c @@ -568,7 +568,7 @@ alloc_vring_queue(struct virtio_net *dev, uint32_t vring_idx) if (dev->virtqueue[i]) continue; - vq = rte_malloc(NULL, sizeof(struct vhost_virtqueue), 0); + vq = rte_zmalloc(NULL, sizeof(struct vhost_virtqueue), 0); if (vq == NULL) { RTE_LOG(ERR, VHOST_CONFIG, "Failed to allocate memory for vring:%u.\n", i); -- 2.31.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-17 17:40:36.060209253 +0200 +++ 0170-vhost-fix-queue-initialization.patch 2021-05-17 17:40:29.495812029 +0200 @@ -1 +1 @@ -From 678a91efa23a50a16cd3c5a2b18a117daef3c840 Mon Sep 17 00:00:00 2001 +From 3165834050d9c02b087c0fa0f0658c2a29f6e6d7 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 678a91efa23a50a16cd3c5a2b18a117daef3c840 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -16 +17 @@ - lib/vhost/vhost.c | 2 +- + lib/librte_vhost/vhost.c | 2 +- @@ -19,5 +20,5 @@ -diff --git a/lib/vhost/vhost.c b/lib/vhost/vhost.c -index a70fe01d8f..ea38cf2b75 100644 ---- a/lib/vhost/vhost.c -+++ b/lib/vhost/vhost.c -@@ -608,7 +608,7 @@ alloc_vring_queue(struct virtio_net *dev, uint32_t vring_idx) +diff --git a/lib/librte_vhost/vhost.c b/lib/librte_vhost/vhost.c +index 2d5bb2cfde..b876e81dbd 100644 +--- a/lib/librte_vhost/vhost.c ++++ b/lib/librte_vhost/vhost.c +@@ -568,7 +568,7 @@ alloc_vring_queue(struct virtio_net *dev, uint32_t vring_idx) @@ -30 +31 @@ - VHOST_LOG_CONFIG(ERR, + RTE_LOG(ERR, VHOST_CONFIG,