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 AFB8A1B55A for ; Fri, 30 Nov 2018 10:48:36 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C20D83C2CDF; Fri, 30 Nov 2018 09:48:35 +0000 (UTC) Received: from ktraynor.remote.csb (ovpn-117-230.ams2.redhat.com [10.36.117.230]) by smtp.corp.redhat.com (Postfix) with ESMTP id E14E519743; Fri, 30 Nov 2018 09:48:31 +0000 (UTC) From: Kevin Traynor To: Maxime Coquelin Cc: Ilya Maximets , dpdk stable Date: Fri, 30 Nov 2018 09:48:24 +0000 Message-Id: <20181130094824.3666-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Fri, 30 Nov 2018 09:48:35 +0000 (UTC) Subject: [dpdk-stable] patch 'vhost: fix payload size of reply' 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: Fri, 30 Nov 2018 09:48:37 -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 12/09/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 aaeb441d0623d9d8f59885e1bc75165a779e2355 Mon Sep 17 00:00:00 2001 From: Maxime Coquelin Date: Fri, 12 Oct 2018 14:40:32 +0200 Subject: [PATCH] vhost: fix payload size of reply [ upstream commit 57b4d90b5893db2678ca3e28c50e1fcd37bb9b91 ] QEMU doesn't expect any payload for the reply of VHOST_USER_SET_LOG_BASE request, so don't send any. Note that the Vhost-user specification isn't clear about it and would need to be fixed. Fixes: 54f9e32305d4 ("vhost: handle dirty pages logging request") Reported-by: Ilya Maximets Signed-off-by: Maxime Coquelin Acked-by: Ilya Maximets --- lib/librte_vhost/vhost_user.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c index 3738ae055..ba92d1650 100644 --- a/lib/librte_vhost/vhost_user.c +++ b/lib/librte_vhost/vhost_user.c @@ -1247,4 +1247,10 @@ vhost_user_set_log_base(struct virtio_net *dev, struct VhostUserMsg *msg) dev->log_size = size; + /* + * The spec is not clear about it (yet), but QEMU doesn't expect + * any payload in the reply. + */ + msg->size = 0; + return 0; } -- 2.19.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-11-30 09:46:47.466358499 +0000 +++ 0001-vhost-fix-payload-size-of-reply.patch 2018-11-30 09:46:47.000000000 +0000 @@ -1,38 +1,39 @@ -From 57b4d90b5893db2678ca3e28c50e1fcd37bb9b91 Mon Sep 17 00:00:00 2001 +From aaeb441d0623d9d8f59885e1bc75165a779e2355 Mon Sep 17 00:00:00 2001 From: Maxime Coquelin Date: Fri, 12 Oct 2018 14:40:32 +0200 Subject: [PATCH] vhost: fix payload size of reply +[ upstream commit 57b4d90b5893db2678ca3e28c50e1fcd37bb9b91 ] + QEMU doesn't expect any payload for the reply of VHOST_USER_SET_LOG_BASE request, so don't send any. Note that the Vhost-user specification isn't clear about it and would need to be fixed. Fixes: 54f9e32305d4 ("vhost: handle dirty pages logging request") -Cc: stable@dpdk.org Reported-by: Ilya Maximets Signed-off-by: Maxime Coquelin Acked-by: Ilya Maximets --- - lib/librte_vhost/vhost_user.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) + lib/librte_vhost/vhost_user.c | 6 ++++++ + 1 file changed, 6 insertions(+) diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c -index a7729990d..1ef02c943 100644 +index 3738ae055..ba92d1650 100644 --- a/lib/librte_vhost/vhost_user.c +++ b/lib/librte_vhost/vhost_user.c -@@ -1287,5 +1287,9 @@ vhost_user_set_log_base(struct virtio_net **pdev, struct VhostUserMsg *msg) +@@ -1247,4 +1247,10 @@ vhost_user_set_log_base(struct virtio_net *dev, struct VhostUserMsg *msg) dev->log_size = size; -- msg->size = sizeof(msg->payload.u64); + /* + * The spec is not clear about it (yet), but QEMU doesn't expect + * any payload in the reply. + */ + msg->size = 0; - - return VH_RESULT_REPLY; ++ + return 0; + } -- 2.19.0