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 7A10EA04DB for ; Tue, 17 Nov 2020 12:15:20 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 704C75928; Tue, 17 Nov 2020 12:15:19 +0100 (CET) Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by dpdk.org (Postfix) with ESMTP id E8B44567C for ; Tue, 17 Nov 2020 12:15:17 +0100 (CET) Received: by mail-wr1-f49.google.com with SMTP id d12so22723787wrr.13 for ; Tue, 17 Nov 2020 03:15:17 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=0F8LHShxU17pLz5n43FytKaNyVwfcIFQDzPgjz/C/Zk=; b=jKVMNyL7FpwfnhNgSBUFUj+ZFhGAd5swkPRMInS5tP5be+7X6nNOvU9pCFwCFJCMiC OPnGcxmavlWSLfJUM7J2aRqsJGOixQhiHkZhHur4gC+qx3kec/PxzG9YMhfSeFvVOSvF P8SsZdXqu3qhe5EuFVbi8PGlo05bKs8zqZovEg6bfBiGkANdIh8ODoGOt9oa7piaU5hb YcurNQfBF7sSMh1kdKl3IRMbGtnL7ffuvIyQK+uo9b0856u2b0y+t43yi8oSGCeWtcom x/CNKLCpcSqOEE28ATpLIfYxgnUhDBshCrhj+yeV4diVh/+8S0bf92+BlXZwuB6yfMRw pYAQ== 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:mime-version:content-transfer-encoding; bh=0F8LHShxU17pLz5n43FytKaNyVwfcIFQDzPgjz/C/Zk=; b=ngEUp4VTQNeuXoCfvc+EKkzbfN5POKFb3lOEpeEbp6T+qlYTbPW79zXVgKZo+a1o6J duPWXeY4SSyPXp6t5L7s+GcGNMLDzF8ciBWZFZS7dSss95d7Ts0xGXEsiojptkJ56CVa je8qntA+UXRZvgu3WNy5iZakSk9bedfHVNvu7/11O3U5gYL8bsgLJBDnrYkrchk4r00I 4QAFfOiBTgW+RMwk3M0b+b3kM7Rlnba/GlvgXmIapsTEHkiqgVdbaNowOTKAyJBl12zr yRoQvcfIKkrcdunHvdovETi7DM3/YZin4p+paqiP3jzC9uCrtOzCxvi992BFOLb5ViWR NmBQ== X-Gm-Message-State: AOAM5302rE60tBrLP8p4fpAOazVqPZOyyaLo0mZpHzhsSa19xl7Gf+B/ 9m/v7scrdiY0Ijl3SgWuArw= X-Google-Smtp-Source: ABdhPJzzSjlQPiH4XKBOIZ+27xhhef4xX1UOwUz+eICAr/NbyXImhr/4KCLCHJvK8mUhqF15pFndvg== X-Received: by 2002:a5d:5482:: with SMTP id h2mr13658001wrv.18.1605611716738; Tue, 17 Nov 2020 03:15:16 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id s202sm3094346wme.39.2020.11.17.03.15.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Nov 2020 03:15:15 -0800 (PST) From: luca.boccassi@gmail.com To: Maxime Coquelin Cc: Yu Jiang , David Marchand , dpdk stable Date: Tue, 17 Nov 2020 11:13:52 +0000 Message-Id: <20201117111416.1961049-18-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201117111416.1961049-1-luca.boccassi@gmail.com> References: <20201109185030.3478760-2-luca.boccassi@gmail.com> <20201117111416.1961049-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'vhost: fix virtqueue initialization' has been queued to stable release 19.11.6 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 stable release 19.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/19/20. 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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/18b6f15777b951d359a04d4470e81b99fd44af20 Thanks. Luca Boccassi --- >From 18b6f15777b951d359a04d4470e81b99fd44af20 Mon Sep 17 00:00:00 2001 From: Maxime Coquelin Date: Fri, 6 Nov 2020 15:47:44 +0100 Subject: [PATCH] vhost: fix virtqueue initialization [ upstream commit 7804bbd13aa583e3a28b08557f7a98fcbe7fc8a8 ] This patches fixes virtqueue initialization issue causing segfault or file descriptor being closed unexpectedly. The wrong index was passed to init_vring_queue() by alloc_vring_queue() when a hole in the virtqueue array was met. Fixes: 8acd7c213353 ("vhost: fix virtqueues metadata allocation") Reported-by: Yu Jiang Signed-off-by: Maxime Coquelin Reviewed-by: David Marchand Tested-by: Yu Jiang --- 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 9f3eadeba6..3dd278f8f8 100644 --- a/lib/librte_vhost/vhost.c +++ b/lib/librte_vhost/vhost.c @@ -575,7 +575,7 @@ alloc_vring_queue(struct virtio_net *dev, uint32_t vring_idx) } dev->virtqueue[i] = vq; - init_vring_queue(dev, vring_idx); + init_vring_queue(dev, i); rte_spinlock_init(&vq->access_lock); vq->avail_wrap_counter = 1; vq->used_wrap_counter = 1; -- 2.27.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-17 11:13:13.738213425 +0000 +++ 0018-vhost-fix-virtqueue-initialization.patch 2020-11-17 11:13:12.897116126 +0000 @@ -1 +1 @@ -From 7804bbd13aa583e3a28b08557f7a98fcbe7fc8a8 Mon Sep 17 00:00:00 2001 +From 18b6f15777b951d359a04d4470e81b99fd44af20 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 7804bbd13aa583e3a28b08557f7a98fcbe7fc8a8 ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -25 +26 @@ -index 8a151a9c1d..b83cf639eb 100644 +index 9f3eadeba6..3dd278f8f8 100644 @@ -28 +29 @@ -@@ -605,7 +605,7 @@ alloc_vring_queue(struct virtio_net *dev, uint32_t vring_idx) +@@ -575,7 +575,7 @@ alloc_vring_queue(struct virtio_net *dev, uint32_t vring_idx)