[dpdk-stable] patch 'vhost/crypto: fix fetch size' has been queued to LTS release 18.11.7

Kevin Traynor ktraynor at redhat.com
Fri Feb 14 18:03:27 CET 2020


Hi,

FYI, your patch has been queued to LTS release 18.11.7

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

Thanks.

Kevin.

---
>From c81fe7e2d8a8f45256018dad3d8d5ae11e19de9d Mon Sep 17 00:00:00 2001
From: Fan Zhang <roy.fan.zhang at intel.com>
Date: Wed, 29 Jan 2020 10:24:22 +0000
Subject: [PATCH] vhost/crypto: fix fetch size

[ upstream commit 03df3c7473dfd8f2efafe525b61ef980d0a68aa1 ]

This patch fixes the incorrect rte_vhost_crypto_fetch_requests
return value.

Coverity issue: 343401
Fixes: 3bb595ecd682 ("vhost/crypto: add request handler")

Signed-off-by: Fan Zhang <roy.fan.zhang at intel.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin at redhat.com>
---
 lib/librte_vhost/vhost_crypto.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/librte_vhost/vhost_crypto.c b/lib/librte_vhost/vhost_crypto.c
index d8a0f954b2..cf01c7ebe3 100644
--- a/lib/librte_vhost/vhost_crypto.c
+++ b/lib/librte_vhost/vhost_crypto.c
@@ -1530,10 +1530,10 @@ rte_vhost_crypto_fetch_requests(int vid, uint32_t qid,
 	if (unlikely(dev == NULL)) {
 		VC_LOG_ERR("Invalid vid %i", vid);
-		return -EINVAL;
+		return 0;
 	}
 
 	if (unlikely(qid >= VHOST_MAX_QUEUE_PAIRS)) {
 		VC_LOG_ERR("Invalid qid %u", qid);
-		return -EINVAL;
+		return 0;
 	}
 
@@ -1541,5 +1541,5 @@ rte_vhost_crypto_fetch_requests(int vid, uint32_t qid,
 	if (unlikely(vcrypto == NULL)) {
 		VC_LOG_ERR("Cannot find required data, is it initialized?");
-		return -ENOENT;
+		return 0;
 	}
 
@@ -1563,5 +1563,5 @@ rte_vhost_crypto_fetch_requests(int vid, uint32_t qid,
 				(void **)mbufs, count * 2) < 0)) {
 			VC_LOG_ERR("Insufficient memory");
-			return -ENOMEM;
+			return 0;
 		}
 
@@ -1593,5 +1593,5 @@ rte_vhost_crypto_fetch_requests(int vid, uint32_t qid,
 				(void **)mbufs, count) < 0)) {
 			VC_LOG_ERR("Insufficient memory");
-			return -ENOMEM;
+			return 0;
 		}
 
-- 
2.21.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-02-14 17:02:38.904271196 +0000
+++ 0033-vhost-crypto-fix-fetch-size.patch	2020-02-14 17:02:37.043406018 +0000
@@ -1 +1 @@
-From 03df3c7473dfd8f2efafe525b61ef980d0a68aa1 Mon Sep 17 00:00:00 2001
+From c81fe7e2d8a8f45256018dad3d8d5ae11e19de9d Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 03df3c7473dfd8f2efafe525b61ef980d0a68aa1 ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org
@@ -20 +21 @@
-index 684fddc30b..68911972b6 100644
+index d8a0f954b2..cf01c7ebe3 100644
@@ -23 +24 @@
-@@ -1540,10 +1540,10 @@ rte_vhost_crypto_fetch_requests(int vid, uint32_t qid,
+@@ -1530,10 +1530,10 @@ rte_vhost_crypto_fetch_requests(int vid, uint32_t qid,
@@ -36 +37 @@
-@@ -1551,5 +1551,5 @@ rte_vhost_crypto_fetch_requests(int vid, uint32_t qid,
+@@ -1541,5 +1541,5 @@ rte_vhost_crypto_fetch_requests(int vid, uint32_t qid,
@@ -43 +44 @@
-@@ -1573,5 +1573,5 @@ rte_vhost_crypto_fetch_requests(int vid, uint32_t qid,
+@@ -1563,5 +1563,5 @@ rte_vhost_crypto_fetch_requests(int vid, uint32_t qid,
@@ -50 +51 @@
-@@ -1603,5 +1603,5 @@ rte_vhost_crypto_fetch_requests(int vid, uint32_t qid,
+@@ -1593,5 +1593,5 @@ rte_vhost_crypto_fetch_requests(int vid, uint32_t qid,



More information about the stable mailing list