[dpdk-stable] patch 'vhost/crypto: add missing user protocol flag' has been queued to stable release 19.11.3

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.3

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/21/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.

Thanks.

Luca Boccassi

---
>From e6247616042c0e01bcff7ee8f95a60c1f3dd4743 Mon Sep 17 00:00:00 2001
From: Fan Zhang <roy.fan.zhang at intel.com>
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 <roy.fan.zhang at intel.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin at redhat.com>
---
 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 7b5dc87c2e..ad6e717026 100644
--- a/lib/librte_vhost/rte_vhost.h
+++ b/lib/librte_vhost/rte_vhost.h
@@ -68,6 +68,10 @@ extern "C" {
 #define VHOST_USER_PROTOCOL_F_PAGEFAULT 8
 #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
 #endif
@@ -85,6 +89,7 @@ extern "C" {
 #define VHOST_USER_F_PROTOCOL_FEATURES	30
 #endif
 
+
 /**
  * Information relating to memory regions including offsets to
  * addresses in QEMUs memory file.
diff --git a/lib/librte_vhost/vhost_crypto.c b/lib/librte_vhost/vhost_crypto.c
index 07a4115482..0f9df4059d 100644
--- a/lib/librte_vhost/vhost_crypto.c
+++ b/lib/librte_vhost/vhost_crypto.c
@@ -40,7 +40,8 @@
 		(1 << VIRTIO_RING_F_EVENT_IDX) |			\
 		(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)					\
 	((t)(uintptr_t)vhost_iova_to_vva(r->dev, r->vq, a, l, p))
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-19 14:04:47.255549334 +0100
+++ 0068-vhost-crypto-add-missing-user-protocol-flag.patch	2020-05-19 14:04:44.228648590 +0100
@@ -1,14 +1,15 @@
-From 699a225b3861bd1a02872ed389a317f2d18c8f3a Mon Sep 17 00:00:00 2001
+From e6247616042c0e01bcff7ee8f95a60c1f3dd4743 Mon Sep 17 00:00:00 2001
 From: Fan Zhang <roy.fan.zhang at intel.com>
 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")
-Cc: stable at dpdk.org
 
 Signed-off-by: Fan Zhang <roy.fan.zhang at intel.com>
 Reviewed-by: Maxime Coquelin <maxime.coquelin at redhat.com>
@@ -18,10 +19,10 @@
  2 files changed, 7 insertions(+), 1 deletion(-)
 
 diff --git a/lib/librte_vhost/rte_vhost.h b/lib/librte_vhost/rte_vhost.h
-index c7b619ae0d..5c72fba797 100644
+index 7b5dc87c2e..ad6e717026 100644
 --- a/lib/librte_vhost/rte_vhost.h
 +++ b/lib/librte_vhost/rte_vhost.h
-@@ -69,6 +69,10 @@ extern "C" {
+@@ -68,6 +68,10 @@ extern "C" {
  #define VHOST_USER_PROTOCOL_F_PAGEFAULT 8
  #endif
  
@@ -32,7 +33,7 @@
  #ifndef VHOST_USER_PROTOCOL_F_SLAVE_SEND_FD
  #define VHOST_USER_PROTOCOL_F_SLAVE_SEND_FD 10
  #endif
-@@ -86,6 +90,7 @@ extern "C" {
+@@ -85,6 +89,7 @@ extern "C" {
  #define VHOST_USER_F_PROTOCOL_FEATURES	30
  #endif
  
@@ -41,7 +42,7 @@
   * Information relating to memory regions including offsets to
   * addresses in QEMUs memory file.
 diff --git a/lib/librte_vhost/vhost_crypto.c b/lib/librte_vhost/vhost_crypto.c
-index 68911972b6..2e52ecae87 100644
+index 07a4115482..0f9df4059d 100644
 --- a/lib/librte_vhost/vhost_crypto.c
 +++ b/lib/librte_vhost/vhost_crypto.c
 @@ -40,7 +40,8 @@