fix populate with small virtual chunks

Signed-off-by: LemmyHuang <huangliming5@huawei.com>

dpdk.spec

@@ -1,6 +1,6 @@
 Name: dpdk
 Version: 19.11
-Release: 9
+Release: 10
 Packager: packaging@6wind.com
 URL: http://dpdk.org
 %global source_version  19.11
@@ -19,6 +19,7 @@ Patch9: fix-pool-allocation.patch
 Patch10: CVE-2020-14374.patch
 Patch11: CVE-2020-14375.patch
 Patch12: fix-compilation-error-of-max-inline-insns-single-o2-.patch
+Patch13: fix-populate-with-small-virtual-chunks.patch
 
 Summary: Data Plane Development Kit core
 Group: System Environment/Libraries
@@ -88,6 +89,7 @@ This package contains the pdump tool for capture the dpdk network packets.
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
+%patch13 -p1
 
 %build
 namer=%{kern_devel_ver}
@@ -190,6 +192,9 @@ strip -g $RPM_BUILD_ROOT/lib/modules/${namer}/extra/dpdk/rte_kni.ko
 /usr/sbin/depmod
 
 %changelog
+* Thu Jan 28 2021 huangliming<huangliming5@huawei.com> - 19.11-10
+- fix populate with small virtual chunks
+
 * Thu Jan 28 2021 huangliming<huangliming5@huawei.com> - 19.11-9
 -fix yum update dpdk-tools conflict with dpdk-devel
 

fix-populate-with-small-virtual-chunks.patch

@@ -0,0 +1,112 @@
+From 43503c59adee6cae7069da23e105c24e044bf72c Mon Sep 17 00:00:00 2001
+From: Olivier Matz <olivier.matz@6wind.com>
+Date: Fri, 17 Jan 2020 15:57:52 +0100
+Subject: mempool: fix populate with small virtual chunks
+
+To populate a mempool with a virtual area, the mempool code calls
+rte_mempool_populate_iova() for each iova-contiguous area. It happens
+(rarely) that this area is too small to store one object. In this case,
+rte_mempool_populate_iova() returns an error, which is forwarded by
+rte_mempool_populate_virt().
+
+This case should not throw an error in rte_mempool_populate_virt().
+Instead, the area that is too small should just be ignored.
+
+To fix this issue, change the return value of
+rte_mempool_populate_iova() to 0 when no object can be populated,
+so it can be ignored by the caller. As this would be an API/ABI change,
+only do this modification internally for now.
+
+Fixes: 354788b60cfd ("mempool: allow populating with unaligned virtual area")
+Cc: stable@dpdk.org
+
+Signed-off-by: Olivier Matz <olivier.matz@6wind.com>
+Tested-by: Anatoly Burakov <anatoly.burakov@intel.com>
+Tested-by: Alvin Zhang <alvinx.zhang@intel.com>
+
+Conflict:NA
+Reference:http://git.dpdk.org/dpdk/patch/?id=43503c59adee6cae7069da23e105c24e044bf72c
+Signed-off-by:wuchangsheng <wuchangsheng2@huawei.com>
+---
+ lib/librte_mempool/rte_mempool.c | 30 +++++++++++++++++++++++++-----
+ 1 file changed, 25 insertions(+), 5 deletions(-)
+
+diff --git a/lib/librte_mempool/rte_mempool.c b/lib/librte_mempool/rte_mempool.c
+index aea5972..08906df 100644
+--- a/lib/librte_mempool/rte_mempool.c
++++ b/lib/librte_mempool/rte_mempool.c
+@@ -297,8 +297,8 @@ mempool_ops_alloc_once(struct rte_mempool *mp)
+  * zone. Return the number of objects added, or a negative value
+  * on error.
+  */
+-int
+-rte_mempool_populate_iova(struct rte_mempool *mp, char *vaddr,
++static int
++__rte_mempool_populate_iova(struct rte_mempool *mp, char *vaddr,
+ 	rte_iova_t iova, size_t len, rte_mempool_memchunk_free_cb_t *free_cb,
+ 	void *opaque)
+ {
+@@ -332,7 +332,7 @@ rte_mempool_populate_iova(struct rte_mempool *mp, char *vaddr,
+ 		off = RTE_PTR_ALIGN_CEIL(vaddr, RTE_MEMPOOL_ALIGN) - vaddr;
+ 
+ 	if (off > len) {
+-		ret = -EINVAL;
++		ret = 0;
+ 		goto fail;
+ 	}
+ 
+@@ -343,7 +343,7 @@ rte_mempool_populate_iova(struct rte_mempool *mp, char *vaddr,
+ 
+ 	/* not enough room to store one object */
+ 	if (i == 0) {
+-		ret = -EINVAL;
++		ret = 0;
+ 		goto fail;
+ 	}
+ 
+@@ -356,6 +356,21 @@ fail:
+ 	return ret;
+ }
+ 
++int
++rte_mempool_populate_iova(struct rte_mempool *mp, char *vaddr,
++	rte_iova_t iova, size_t len, rte_mempool_memchunk_free_cb_t *free_cb,
++	void *opaque)
++{
++	int ret;
++
++	ret = __rte_mempool_populate_iova(mp, vaddr, iova, len, free_cb,
++					opaque);
++	if (ret == 0)
++		ret = -EINVAL;
++
++	return ret;
++}
++
+ static rte_iova_t
+ get_iova(void *addr)
+ {
+@@ -406,8 +421,10 @@ rte_mempool_populate_virt(struct rte_mempool *mp, char *addr,
+ 				break;
+ 		}
+ 
+-		ret = rte_mempool_populate_iova(mp, addr + off, iova,
++		ret = __rte_mempool_populate_iova(mp, addr + off, iova,
+ 			phys_len, free_cb, opaque);
++		if (ret == 0)
++			continue;
+ 		if (ret < 0)
+ 			goto fail;
+ 		/* no need to call the free callback for next chunks */
+@@ -415,6 +432,9 @@ rte_mempool_populate_virt(struct rte_mempool *mp, char *addr,
+ 		cnt += ret;
+ 	}
+ 
++	if (cnt == 0)
++		return -EINVAL;
++
+ 	return cnt;
+ 
+  fail:
+-- 
+cgit v1.0