[dpdk-stable] patch 'common/cpt: fix component for empty IOV buffer' has been queued to stable release 19.11.1

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.1

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/13/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 edf1e8adad106816b35f23dc2abc0968401f72ff Mon Sep 17 00:00:00 2001
From: Archana Muniganti <marchana at marvell.com>
Date: Wed, 5 Feb 2020 18:46:17 +0530
Subject: [PATCH] common/cpt: fix component for empty IOV buffer

[ upstream commit 0022ae1eb8fc4fb6c0115d6516003f3a9442ff00 ]

fill_sg_comp_from_iov() prepares gather components for i/p IOV
buffers and extra buf. This API is failing to create a gather component
for extra_buf when IOV buf len is zero. Though there is enough space
to accommodate extra_buf, because of pre-decrementing of extra_buf
length from aggregate size, this issue is seen.

Fixes: b74652f3a91f ("common/cpt: add microcode interface for encryption")

Signed-off-by: Archana Muniganti <marchana at marvell.com>
Signed-off-by: Anoob Joseph <anoobj at marvell.com>
---
 drivers/common/cpt/cpt_ucode.h | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/drivers/common/cpt/cpt_ucode.h b/drivers/common/cpt/cpt_ucode.h
index 979870c754..9dc0fc652a 100644
--- a/drivers/common/cpt/cpt_ucode.h
+++ b/drivers/common/cpt/cpt_ucode.h
@@ -377,7 +377,7 @@ fill_sg_comp_from_iov(sg_comp_t *list,
 {
 	int32_t j;
 	uint32_t extra_len = extra_buf ? extra_buf->size : 0;
-	uint32_t size = *psize - extra_len;
+	uint32_t size = *psize;
 	buf_ptr_t *bufs;
 
 	bufs = from->bufs;
@@ -386,9 +386,6 @@ fill_sg_comp_from_iov(sg_comp_t *list,
 		uint32_t e_len;
 		sg_comp_t *to = &list[i >> 2];
 
-		if (!bufs[j].size)
-			continue;
-
 		if (unlikely(from_offset)) {
 			if (from_offset >= bufs[j].size) {
 				from_offset -= bufs[j].size;
@@ -420,18 +417,19 @@ fill_sg_comp_from_iov(sg_comp_t *list,
 				to->u.s.len[i % 4] = rte_cpu_to_be_16(e_len);
 			}
 
+			extra_len = RTE_MIN(extra_len, size);
 			/* Insert extra data ptr */
 			if (extra_len) {
 				i++;
 				to = &list[i >> 2];
 				to->u.s.len[i % 4] =
-					rte_cpu_to_be_16(extra_buf->size);
+					rte_cpu_to_be_16(extra_len);
 				to->ptr[i % 4] =
 					rte_cpu_to_be_64(extra_buf->dma_addr);
-
-				/* size already decremented by extra len */
+				size -= extra_len;
 			}
 
+			next_len = RTE_MIN(next_len, size);
 			/* insert the rest of the data */
 			if (next_len) {
 				i++;
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-02-11 11:17:44.975712420 +0000
+++ 0186-common-cpt-fix-component-for-empty-IOV-buffer.patch	2020-02-11 11:17:38.840009574 +0000
@@ -1,8 +1,10 @@
-From 0022ae1eb8fc4fb6c0115d6516003f3a9442ff00 Mon Sep 17 00:00:00 2001
+From edf1e8adad106816b35f23dc2abc0968401f72ff Mon Sep 17 00:00:00 2001
 From: Archana Muniganti <marchana at marvell.com>
 Date: Wed, 5 Feb 2020 18:46:17 +0530
 Subject: [PATCH] common/cpt: fix component for empty IOV buffer
 
+[ upstream commit 0022ae1eb8fc4fb6c0115d6516003f3a9442ff00 ]
+
 fill_sg_comp_from_iov() prepares gather components for i/p IOV
 buffers and extra buf. This API is failing to create a gather component
 for extra_buf when IOV buf len is zero. Though there is enough space
@@ -10,7 +12,6 @@
 length from aggregate size, this issue is seen.
 
 Fixes: b74652f3a91f ("common/cpt: add microcode interface for encryption")
-Cc: stable at dpdk.org
 
 Signed-off-by: Archana Muniganti <marchana at marvell.com>
 Signed-off-by: Anoob Joseph <anoobj at marvell.com>
@@ -19,10 +20,10 @@
  1 file changed, 5 insertions(+), 7 deletions(-)
 
 diff --git a/drivers/common/cpt/cpt_ucode.h b/drivers/common/cpt/cpt_ucode.h
-index 081249cd7b..c310ea7cb4 100644
+index 979870c754..9dc0fc652a 100644
 --- a/drivers/common/cpt/cpt_ucode.h
 +++ b/drivers/common/cpt/cpt_ucode.h
-@@ -373,7 +373,7 @@ fill_sg_comp_from_iov(sg_comp_t *list,
+@@ -377,7 +377,7 @@ fill_sg_comp_from_iov(sg_comp_t *list,
  {
  	int32_t j;
  	uint32_t extra_len = extra_buf ? extra_buf->size : 0;
@@ -31,7 +32,7 @@
  	buf_ptr_t *bufs;
  
  	bufs = from->bufs;
-@@ -382,9 +382,6 @@ fill_sg_comp_from_iov(sg_comp_t *list,
+@@ -386,9 +386,6 @@ fill_sg_comp_from_iov(sg_comp_t *list,
  		uint32_t e_len;
  		sg_comp_t *to = &list[i >> 2];
  
@@ -41,7 +42,7 @@
  		if (unlikely(from_offset)) {
  			if (from_offset >= bufs[j].size) {
  				from_offset -= bufs[j].size;
-@@ -416,18 +413,19 @@ fill_sg_comp_from_iov(sg_comp_t *list,
+@@ -420,18 +417,19 @@ fill_sg_comp_from_iov(sg_comp_t *list,
  				to->u.s.len[i % 4] = rte_cpu_to_be_16(e_len);
  			}