From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by dpdk.org (Postfix) with ESMTP id E77142965 for ; Mon, 29 Oct 2018 13:53:48 +0100 (CET) Received: by mail-wm1-f65.google.com with SMTP id y144-v6so7812556wmd.4 for ; Mon, 29 Oct 2018 05:53:48 -0700 (PDT) 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=qP0wHdb6q7tgomYLEUpSG7+4kWMEW2Qkw05rl7pgZhw=; b=R1QZQ9zd/sJtiUYuD5GMCSaDFDFtuMbGPL1PyM+LzfCFyLvX0lqDAWQXMvJgbvdFRf jNqQfrhS5THPibrXWoDRY34rtjD5dPM3YPdwj0Zi80QdAo9cULQTc6s2+WWh5MED0tcf ByxF7FI34YREv5gIibgZpT2Ll8zJOFNgKoUF2e4aWR+OOFHEQgWhuC+OrU59M5mhJ/e7 0we7qCkBGgVtx1I+ZJztaKquT4mamZPViNn88jCpPteApEZGkrJu50/qqQimbfsla0Vj v7vrDMPKz8nVDUHiE89F5YUKicg2SV1YnyztusAuVYbs4Cs7UJXJbxn8ILru3TzV2+58 EdpA== X-Gm-Message-State: AGRZ1gKS1PWLVFCDSxgrPDVWxQo56w2dr11Bnm5fBVZaNVfRwqNMTQ/w jJ5b3Hhe04CYFDSmvixS6UWkaXRb X-Google-Smtp-Source: AJdET5d27bk7dNEucJiU2eGB4aj8Y16aCoarUY+ktl7SNUBhS1xC/Iol2yJyvmOTnk33GDxB1+Dvjw== X-Received: by 2002:a1c:1812:: with SMTP id 18-v6mr14118449wmy.34.1540817628598; Mon, 29 Oct 2018 05:53:48 -0700 (PDT) Received: from localhost ([2a01:4b00:f419:6f00:8361:8946:ba2b:d556]) by smtp.gmail.com with ESMTPSA id k66-v6sm6961121wmd.47.2018.10.29.05.53.47 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 29 Oct 2018 05:53:47 -0700 (PDT) From: Luca Boccassi To: Maxime Coquelin Cc: Ilya Maximets , dpdk stable Date: Mon, 29 Oct 2018 12:53:12 +0000 Message-Id: <20181029125329.17729-3-bluca@debian.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181029125329.17729-1-bluca@debian.org> References: <20181015115144.27626-1-bluca@debian.org> <20181029125329.17729-1-bluca@debian.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'vhost: fix payload size of reply' has been queued to LTS release 16.11.9 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: Mon, 29 Oct 2018 12:53:49 -0000 Hi, FYI, your patch has been queued to LTS release 16.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 10/31/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. Luca Boccassi --- >>From 2fb95d184bf2b7715c9e2696059d41fd044a2d88 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 f3b286e72..a88f19aae 100644 --- a/lib/librte_vhost/vhost_user.c +++ b/lib/librte_vhost/vhost_user.c @@ -911,6 +911,12 @@ vhost_user_set_log_base(struct virtio_net *dev, struct VhostUserMsg *msg) dev->log_base = dev->log_addr + off; 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.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-10-29 12:48:14.532685254 +0000 +++ 0003-vhost-fix-payload-size-of-reply.patch 2018-10-29 12:48:14.430417982 +0000 @@ -1,40 +1,41 @@ -From 57b4d90b5893db2678ca3e28c50e1fcd37bb9b91 Mon Sep 17 00:00:00 2001 +From 2fb95d184bf2b7715c9e2696059d41fd044a2d88 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 f3b286e72..a88f19aae 100644 --- a/lib/librte_vhost/vhost_user.c +++ b/lib/librte_vhost/vhost_user.c -@@ -1286,7 +1286,11 @@ vhost_user_set_log_base(struct virtio_net **pdev, struct VhostUserMsg *msg) +@@ -911,6 +911,12 @@ vhost_user_set_log_base(struct virtio_net *dev, struct VhostUserMsg *msg) dev->log_base = dev->log_addr + off; 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.1