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 D4EEEA04B1 for ; Mon, 23 Nov 2020 18:13:09 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id CABFEC902; Mon, 23 Nov 2020 18:13:08 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by dpdk.org (Postfix) with ESMTP id 75D4EC8E4 for ; Mon, 23 Nov 2020 18:13:05 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606151583; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=lxY8FvU9v8XF31aIELsNtDwTtxMnIaYbgofWhQLXdso=; b=MUxOT37xt6YfBx7uEoOpk7FHXZaq2CpCl5Tj3jBXyv2DBouCuIkeSETR7B9JTNlyk76AzD gkjOMbQi3gnc582UUH3Y3LrJH5+iL1agwbCAVGfqYRNuXtIknxsDYQjmcJNVUTbX54EzzJ l42/NppWfuc47Ku7L4yEW6xvnX9zlQc= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-61-_QVBksLFMGydmm6xyN7B4A-1; Mon, 23 Nov 2020 12:12:57 -0500 X-MC-Unique: _QVBksLFMGydmm6xyN7B4A-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 82ED79A220; Mon, 23 Nov 2020 17:12:55 +0000 (UTC) Received: from rh.redhat.com (ovpn-112-19.ams2.redhat.com [10.36.112.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id 690B760C43; Mon, 23 Nov 2020 17:12:54 +0000 (UTC) From: Kevin Traynor To: Maxime Coquelin Cc: Yu Jiang , David Marchand , dpdk stable Date: Mon, 23 Nov 2020 17:12:00 +0000 Message-Id: <20201123171222.79398-8-ktraynor@redhat.com> In-Reply-To: <20201123171222.79398-1-ktraynor@redhat.com> References: <20201123171222.79398-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Subject: [dpdk-stable] patch 'vhost: fix virtqueue initialization' has been queued to LTS release 18.11.11 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 18.11.11 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/27/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/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/cd0bd99f0105a4a63780645b36ecb722db020f51 Thanks. Kevin. --- >From cd0bd99f0105a4a63780645b36ecb722db020f51 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 61754833c2..394def1f85 100644 --- a/lib/librte_vhost/vhost.c +++ b/lib/librte_vhost/vhost.c @@ -549,5 +549,5 @@ 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; -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-23 17:10:14.186351373 +0000 +++ 0008-vhost-fix-virtqueue-initialization.patch 2020-11-23 17:10:13.974061563 +0000 @@ -1 +1 @@ -From 7804bbd13aa583e3a28b08557f7a98fcbe7fc8a8 Mon Sep 17 00:00:00 2001 +From cd0bd99f0105a4a63780645b36ecb722db020f51 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 61754833c2..394def1f85 100644 @@ -28 +29 @@ -@@ -606,5 +606,5 @@ alloc_vring_queue(struct virtio_net *dev, uint32_t vring_idx) +@@ -549,5 +549,5 @@ alloc_vring_queue(struct virtio_net *dev, uint32_t vring_idx)