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 F37A4A0093 for ; Thu, 28 May 2020 18:25:57 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id EA78E1DC10; Thu, 28 May 2020 18:25:57 +0200 (CEST) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by dpdk.org (Postfix) with ESMTP id BAB401DC10 for ; Thu, 28 May 2020 18:25:56 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590683156; 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=OirnHrw7zOtRYBaC1VwT6ot8cpMTrtnyzCnRagEWtek=; b=BvbFVD9ophLdaSNZsOatRmo8wTz0VfAOvRGNcIhkadXlEevUqCaN2cYOtUqEsazdUR5taX zd2/TtWHKymZT7ISefmEqX8QoQNI1KbcttMX5yUiZqGvTPZSFb2cNPgC5anEm9+rxJm+fZ /vLrzkMJo5E1ivILbsU5RewynuvCq5I= 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-296-QyVO_iV5PbWL_0dyOT40FQ-1; Thu, 28 May 2020 12:25:53 -0400 X-MC-Unique: QyVO_iV5PbWL_0dyOT40FQ-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 6CA2B107ACCA; Thu, 28 May 2020 16:25:52 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.235]) by smtp.corp.redhat.com (Postfix) with ESMTP id BBE6D60C05; Thu, 28 May 2020 16:25:48 +0000 (UTC) From: Kevin Traynor To: Fan Zhang Cc: Maxime Coquelin , dpdk stable Date: Thu, 28 May 2020 17:22:59 +0100 Message-Id: <20200528162322.7863-72-ktraynor@redhat.com> In-Reply-To: <20200528162322.7863-1-ktraynor@redhat.com> References: <20200528162322.7863-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/crypto: add missing user protocol flag' 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/03/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/7ca9dd0fe5dfbbe32293f75f745e4d4cd8132949 Thanks. Kevin. --- >From 7ca9dd0fe5dfbbe32293f75f745e4d4cd8132949 Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Wed, 29 Jan 2020 10:19:37 +0000 Subject: [PATCH] vhost/crypto: add missing user protocol flag [ upstream commit 699a225b3861bd1a02872ed389a317f2d18c8f3a ] This patch fixes the vhost crypto missed "VHOST_USER_PROTOCOL_F_CONFIG" flag problem during initialization. Newer Qemu version requires this feature enabled. Fixes: 939066d96563 ("vhost/crypto: add public function implementation") Signed-off-by: Fan Zhang Reviewed-by: Maxime Coquelin --- lib/librte_vhost/rte_vhost.h | 5 +++++ lib/librte_vhost/vhost_crypto.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/librte_vhost/rte_vhost.h b/lib/librte_vhost/rte_vhost.h index ce1f12e1d5..6f1b4eabeb 100644 --- a/lib/librte_vhost/rte_vhost.h +++ b/lib/librte_vhost/rte_vhost.h @@ -65,4 +65,8 @@ extern "C" { #endif +#ifndef VHOST_USER_PROTOCOL_F_CONFIG +#define VHOST_USER_PROTOCOL_F_CONFIG 9 +#endif + #ifndef VHOST_USER_PROTOCOL_F_SLAVE_SEND_FD #define VHOST_USER_PROTOCOL_F_SLAVE_SEND_FD 10 @@ -78,4 +82,5 @@ extern "C" { #endif + /** * Information relating to memory regions including offsets to diff --git a/lib/librte_vhost/vhost_crypto.c b/lib/librte_vhost/vhost_crypto.c index 8934365f2f..dfbac66f05 100644 --- a/lib/librte_vhost/vhost_crypto.c +++ b/lib/librte_vhost/vhost_crypto.c @@ -41,5 +41,6 @@ (1 << VIRTIO_CRYPTO_SERVICE_CIPHER) | \ (1 << VIRTIO_CRYPTO_SERVICE_MAC) | \ - (1 << VIRTIO_NET_F_CTRL_VQ)) + (1 << VIRTIO_NET_F_CTRL_VQ) | \ + (1 << VHOST_USER_PROTOCOL_F_CONFIG)) #define IOVA_TO_VVA(t, r, a, l, p) \ -- 2.21.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-28 17:13:02.835854193 +0100 +++ 0072-vhost-crypto-add-missing-user-protocol-flag.patch 2020-05-28 17:12:59.154555201 +0100 @@ -1 +1 @@ -From 699a225b3861bd1a02872ed389a317f2d18c8f3a Mon Sep 17 00:00:00 2001 +From 7ca9dd0fe5dfbbe32293f75f745e4d4cd8132949 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 699a225b3861bd1a02872ed389a317f2d18c8f3a ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index c7b619ae0d..5c72fba797 100644 +index ce1f12e1d5..6f1b4eabeb 100644 @@ -24 +25 @@ -@@ -70,4 +70,8 @@ extern "C" { +@@ -65,4 +65,8 @@ extern "C" { @@ -33 +34 @@ -@@ -87,4 +91,5 @@ extern "C" { +@@ -78,4 +82,5 @@ extern "C" { @@ -40 +41 @@ -index 68911972b6..2e52ecae87 100644 +index 8934365f2f..dfbac66f05 100644