patch 'eal/windows: fix error code for not supported API' has been queued to stable release 20.11.5
luca.boccassi at gmail.com
luca.boccassi at gmail.com
Fri Feb 18 13:38:45 CET 2022
Hi,
FYI, your patch has been queued to stable release 20.11.5
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/22. 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/bluca/dpdk-stable
This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/2da6c3024762d5b8ef308aaac5ae11a50fe03969
Thanks.
Luca Boccassi
---
>From 2da6c3024762d5b8ef308aaac5ae11a50fe03969 Mon Sep 17 00:00:00 2001
From: Jie Zhou <jizh at linux.microsoft.com>
Date: Tue, 25 Jan 2022 21:10:34 -0800
Subject: [PATCH] eal/windows: fix error code for not supported API
[ upstream commit 7e71c4dce375b8aa575dbdcda97936199a4136f3 ]
UT memory_autotest on Windows has 2 failed cases on EAL APIs
eal_memalloc_get_seg_fd and eal_memalloc_get_seg_fd_offset. These 2
APIs are not supported on Windows yet. Should return ENOTSUP such that
in test_memory.c these 2 ENOTSUP cases will not be marked as failures,
same as other ENOTSUP cases.
Fixes: 2a5d547a4a9b ("eal/windows: implement basic memory management")
Signed-off-by: Jie Zhou <jizh at linux.microsoft.com>
Acked-by: Dmitry Kozlyuk <dmitry.kozliuk at gmail.com>
---
lib/librte_eal/windows/eal_memalloc.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/librte_eal/windows/eal_memalloc.c b/lib/librte_eal/windows/eal_memalloc.c
index d1e49f0be8..690a8d8243 100644
--- a/lib/librte_eal/windows/eal_memalloc.c
+++ b/lib/librte_eal/windows/eal_memalloc.c
@@ -18,7 +18,7 @@ eal_memalloc_get_seg_fd(int list_idx, int seg_idx)
RTE_SET_USED(list_idx);
RTE_SET_USED(seg_idx);
EAL_LOG_NOT_IMPLEMENTED();
- return -1;
+ return -ENOTSUP;
}
int
@@ -29,7 +29,7 @@ eal_memalloc_get_seg_fd_offset(int list_idx, int seg_idx, size_t *offset)
RTE_SET_USED(seg_idx);
RTE_SET_USED(offset);
EAL_LOG_NOT_IMPLEMENTED();
- return -1;
+ return -ENOTSUP;
}
static int
@@ -429,7 +429,7 @@ eal_memalloc_sync_with_primary(void)
{
/* No multi-process support. */
EAL_LOG_NOT_IMPLEMENTED();
- return -1;
+ return -ENOTSUP;
}
int
--
2.30.2
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2022-02-18 12:37:40.859533442 +0000
+++ 0076-eal-windows-fix-error-code-for-not-supported-API.patch 2022-02-18 12:37:37.754793350 +0000
@@ -1 +1 @@
-From 7e71c4dce375b8aa575dbdcda97936199a4136f3 Mon Sep 17 00:00:00 2001
+From 2da6c3024762d5b8ef308aaac5ae11a50fe03969 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 7e71c4dce375b8aa575dbdcda97936199a4136f3 ]
+
@@ -13 +14,0 @@
-Cc: stable at dpdk.org
@@ -18 +19 @@
- lib/eal/windows/eal_memalloc.c | 6 +++---
+ lib/librte_eal/windows/eal_memalloc.c | 6 +++---
@@ -21,5 +22,5 @@
-diff --git a/lib/eal/windows/eal_memalloc.c b/lib/eal/windows/eal_memalloc.c
-index 55d6dcc71c..aa7589b81d 100644
---- a/lib/eal/windows/eal_memalloc.c
-+++ b/lib/eal/windows/eal_memalloc.c
-@@ -17,7 +17,7 @@ eal_memalloc_get_seg_fd(int list_idx, int seg_idx)
+diff --git a/lib/librte_eal/windows/eal_memalloc.c b/lib/librte_eal/windows/eal_memalloc.c
+index d1e49f0be8..690a8d8243 100644
+--- a/lib/librte_eal/windows/eal_memalloc.c
++++ b/lib/librte_eal/windows/eal_memalloc.c
+@@ -18,7 +18,7 @@ eal_memalloc_get_seg_fd(int list_idx, int seg_idx)
@@ -34 +35 @@
-@@ -28,7 +28,7 @@ eal_memalloc_get_seg_fd_offset(int list_idx, int seg_idx, size_t *offset)
+@@ -29,7 +29,7 @@ eal_memalloc_get_seg_fd_offset(int list_idx, int seg_idx, size_t *offset)
@@ -43 +44 @@
-@@ -428,7 +428,7 @@ eal_memalloc_sync_with_primary(void)
+@@ -429,7 +429,7 @@ eal_memalloc_sync_with_primary(void)
More information about the stable
mailing list