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 CA9E9A04A3 for ; Fri, 5 Jun 2020 20:27:51 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B2E471D547; Fri, 5 Jun 2020 20:27:51 +0200 (CEST) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by dpdk.org (Postfix) with ESMTP id 0A9401D55E for ; Fri, 5 Jun 2020 20:27:49 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591381669; 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=XA0RLwoNrpmqwL/AsHRfdZjaOGCIV5+5bjwGFptLLqc=; b=AN/W3IIIiZYqyEC4gyEhUAZuw28D3IqHaPXWJc37MRcYduPhb8ngZPwea+sj6WOTPOCagH n3b0HUHMCPQVQoVNM+8ReYq5Eldj4MMPRARIaL6vFqjhS9gpZtEttBnbks7wy+JilKeTKu Wgso6nRYePk48k59SF/KjX/xX0/4dlU= 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-239-bWK6yDaQOHSougX6f9MTMA-1; Fri, 05 Jun 2020 14:27:46 -0400 X-MC-Unique: bWK6yDaQOHSougX6f9MTMA-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 7CC98835B8B; Fri, 5 Jun 2020 18:27:45 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.130]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6F98660C47; Fri, 5 Jun 2020 18:27:44 +0000 (UTC) From: Kevin Traynor To: Xuan Ding Cc: Xiaolong Ye , Yinan Wang , dpdk stable Date: Fri, 5 Jun 2020 19:25:11 +0100 Message-Id: <20200605182525.22483-74-ktraynor@redhat.com> In-Reply-To: <20200605182525.22483-1-ktraynor@redhat.com> References: <20200605182525.22483-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'vhost: fix zero-copy server mode' has been queued to LTS release 18.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: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.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 06/10/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/304c6b09f4ec37f9552d5a1083483251893a5c45 Thanks. Kevin. --- >From 304c6b09f4ec37f9552d5a1083483251893a5c45 Mon Sep 17 00:00:00 2001 From: Xuan Ding Date: Tue, 19 May 2020 10:15:46 +0000 Subject: [PATCH] vhost: fix zero-copy server mode [ upstream commit 22fa1bcbcbc7489304a711c39aea9a1593a873a5 ] This patch fixes the situation where vhost-user cannot start as server with dequeue_zero_copy enabled. Using flag instead of vsocket->is_server to determine whether vhost-user is in client mode. Because vsocket->is_server is not ready at this time. Fixes: 715070ea10e6 ("vhost: prevent zero-copy with incompatible client mode") Signed-off-by: Xuan Ding Acked-by: Xiaolong Ye Tested-by: Yinan Wang --- lib/librte_vhost/socket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/librte_vhost/socket.c b/lib/librte_vhost/socket.c index fb946e8c54..4819d31737 100644 --- a/lib/librte_vhost/socket.c +++ b/lib/librte_vhost/socket.c @@ -891,5 +891,5 @@ rte_vhost_driver_register(const char *path, uint64_t flags) */ if (vsocket->dequeue_zero_copy) { - if (!vsocket->is_server) { + if ((flags & RTE_VHOST_USER_CLIENT) != 0) { RTE_LOG(ERR, VHOST_CONFIG, "error: zero copy is incompatible with vhost client mode\n"); -- 2.21.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-06-05 19:20:54.894176540 +0100 +++ 0074-vhost-fix-zero-copy-server-mode.patch 2020-06-05 19:20:50.977037019 +0100 @@ -1 +1 @@ -From 22fa1bcbcbc7489304a711c39aea9a1593a873a5 Mon Sep 17 00:00:00 2001 +From 304c6b09f4ec37f9552d5a1083483251893a5c45 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 22fa1bcbcbc7489304a711c39aea9a1593a873a5 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index bb8d0d7801..0a66ef9767 100644 +index fb946e8c54..4819d31737 100644 @@ -26,3 +27,3 @@ -@@ -927,5 +927,5 @@ rte_vhost_driver_register(const char *path, uint64_t flags) - goto out_mutex; - } +@@ -891,5 +891,5 @@ rte_vhost_driver_register(const char *path, uint64_t flags) + */ + if (vsocket->dequeue_zero_copy) { @@ -31 +32 @@ - VHOST_LOG_CONFIG(ERR, + RTE_LOG(ERR, VHOST_CONFIG,