From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id E447A4F9C for ; Tue, 20 Nov 2018 20:15:08 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 52FDE356F1; Tue, 20 Nov 2018 19:15:08 +0000 (UTC) Received: from ktraynor.remote.csb (unknown [10.36.118.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3FCCC600C3; Tue, 20 Nov 2018 19:15:07 +0000 (UTC) From: Kevin Traynor To: Tiwei Bie Cc: Maxime Coquelin , dpdk stable Date: Tue, 20 Nov 2018 19:12:21 +0000 Message-Id: <20181120191252.30277-31-ktraynor@redhat.com> In-Reply-To: <20181120191252.30277-1-ktraynor@redhat.com> References: <20181120191252.30277-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Tue, 20 Nov 2018 19:15:08 +0000 (UTC) Subject: [dpdk-stable] patch 'vhost: fix return value on enqueue path' has been queued to stable release 18.08.1 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: , X-List-Received-Date: Tue, 20 Nov 2018 19:15:09 -0000 Hi, FYI, your patch has been queued to stable release 18.08.1 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/23/18. 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. If the code is different (ie: not only metadata diffs), due for example to a change in context or macro names, please double check it. Thanks. Kevin Traynor --- >>From 941643d6570f64439349fb208c00e8068b36bea0 Mon Sep 17 00:00:00 2001 From: Tiwei Bie Date: Thu, 6 Sep 2018 12:59:27 +0800 Subject: [PATCH] vhost: fix return value on enqueue path [ upstream commit 58e90a91138d2ed491b37b2173fe39ae44c9ca06 ] Fixes: 62250c1d0978 ("vhost: extract split ring handling from Rx and Tx functions") Fixes: a922401f35cc ("vhost: add Rx support for packed ring") Signed-off-by: Tiwei Bie Reviewed-by: Maxime Coquelin --- lib/librte_vhost/virtio_net.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/librte_vhost/virtio_net.c b/lib/librte_vhost/virtio_net.c index 99c7afc88..4bfae76a6 100644 --- a/lib/librte_vhost/virtio_net.c +++ b/lib/librte_vhost/virtio_net.c @@ -889,4 +889,5 @@ virtio_dev_rx(struct virtio_net *dev, uint16_t queue_id, { struct vhost_virtqueue *vq; + uint32_t nb_tx = 0; VHOST_LOG_DEBUG(VHOST_DATA, "(%d) %s\n", dev->vid, __func__); @@ -916,7 +917,7 @@ virtio_dev_rx(struct virtio_net *dev, uint16_t queue_id, if (vq_is_packed(dev)) - count = virtio_dev_rx_packed(dev, vq, pkts, count); + nb_tx = virtio_dev_rx_packed(dev, vq, pkts, count); else - count = virtio_dev_rx_split(dev, vq, pkts, count); + nb_tx = virtio_dev_rx_split(dev, vq, pkts, count); out: @@ -927,5 +928,5 @@ out_access_unlock: rte_spinlock_unlock(&vq->access_lock); - return count; + return nb_tx; } -- 2.19.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-11-20 17:53:08.213456658 +0000 +++ 0031-vhost-fix-return-value-on-enqueue-path.patch 2018-11-20 17:53:07.000000000 +0000 @@ -1,11 +1,12 @@ -From 58e90a91138d2ed491b37b2173fe39ae44c9ca06 Mon Sep 17 00:00:00 2001 +From 941643d6570f64439349fb208c00e8068b36bea0 Mon Sep 17 00:00:00 2001 From: Tiwei Bie Date: Thu, 6 Sep 2018 12:59:27 +0800 Subject: [PATCH] vhost: fix return value on enqueue path +[ upstream commit 58e90a91138d2ed491b37b2173fe39ae44c9ca06 ] + Fixes: 62250c1d0978 ("vhost: extract split ring handling from Rx and Tx functions") Fixes: a922401f35cc ("vhost: add Rx support for packed ring") -Cc: stable@dpdk.org Signed-off-by: Tiwei Bie Reviewed-by: Maxime Coquelin