[Bug 896] [20.11.4-rc1] net/af_xdp build failure with gcc 11 on Fedora 35
https://bugs.dpdk.org/show_bug.cgi?id=896 Bug ID: 896 Summary: [20.11.4-rc1] net/af_xdp build failure with gcc 11 on Fedora 35 Product: DPDK Version: 20.11 Hardware: All OS: All Status: UNCONFIRMED Severity: normal Priority: Normal Component: ethdev Assignee: dev@dpdk.org Reporter: alia...@nvidia.com Target Milestone: --- I can reproduce the following build error on 20.11.4-rc1: """ $ meson --werror --buildtype=debugoptimized build && ninja-build -C build [..] drivers/net/af_xdp/rte_eth_af_xdp.c: In function 'load_custom_xdp_prog': drivers/net/af_xdp/rte_eth_af_xdp.c:1065:15: error: implicit declaration of function 'bpf_prog_load'; did you mean 'bpf_program__load'? [-Werror=implicit-function-declaration] 1065 | ret = bpf_prog_load(prog_path, BPF_PROG_TYPE_XDP, &obj, &prog_fd); | ^ | bpf_program__load drivers/net/af_xdp/rte_eth_af_xdp.c:1065:15: error: nested extern declaration of 'bpf_prog_load' [-Werror=nested-externs] cc1: all warnings being treated as errors """ OS: Fedora Linux 35 (Container Image) gcc: 11.2.1 20210728 (Red Hat 11.2.1-1) -- You are receiving this mail because: You are the assignee for the bug.
Re: [PATCH v4 0/4] regex/cn9k: use cnxk infrastructure
On Wed, Dec 8, 2021 at 12:02 AM wrote:
>
> From: Liron Himi
>
> 3 patches add support for REE into cnkx infrastructure.
> the last patch change the octeontx2 driver to use
> the new cnxk code. in addition all references to
> octeontx2/otx2 were replaced with cn9k.
Series Acked-by: Jerin Jacob
There still an issue with check-abi.sh[1]
[1]
http://mails.dpdk.org/archives/test-report/2021-December/247701.html
I will send v5 with this fix and remove octeontx2 drivers patches as one series.
>
> v4:
> - squashed the 4th patch
>
> v3:
> - fix documentation issues
>
> v2:
> - fix review comments.
> - split original patch.
> - add the driver patch.
>
> Liron Himi (4):
> common/cnxk: add REE HW definitions
> common/cnxk: add REE mbox definitions
> common/cnxk: add REE support
> regex/cn9k: use cnxk infrastructure
>
> MAINTAINERS | 8 +-
> doc/guides/platform/cnxk.rst | 3 +
> doc/guides/platform/octeontx2.rst | 3 -
> .../regexdevs/{octeontx2.rst => cn9k.rst} | 20 +-
> .../features/{octeontx2.ini => cn9k.ini} | 2 +-
> doc/guides/regexdevs/index.rst| 2 +-
> doc/guides/rel_notes/release_20_11.rst| 2 +-
> drivers/common/cnxk/hw/ree.h | 126
> drivers/common/cnxk/hw/rvu.h | 5 +
> drivers/common/cnxk/meson.build | 1 +
> drivers/common/cnxk/roc_api.h | 4 +
> drivers/common/cnxk/roc_constants.h | 2 +
> drivers/common/cnxk/roc_mbox.h| 100 +++
> drivers/common/cnxk/roc_platform.c| 1 +
> drivers/common/cnxk/roc_platform.h| 2 +
> drivers/common/cnxk/roc_priv.h| 3 +
> drivers/common/cnxk/roc_ree.c | 647 ++
> drivers/common/cnxk/roc_ree.h | 137
> drivers/common/cnxk/roc_ree_priv.h| 18 +
> drivers/common/cnxk/version.map | 18 +-
> .../otx2_regexdev.c => cn9k/cn9k_regexdev.c} | 405 +--
> drivers/regex/cn9k/cn9k_regexdev.h| 44 ++
> .../cn9k_regexdev_compiler.c} | 34 +-
> drivers/regex/cn9k/cn9k_regexdev_compiler.h | 11 +
> drivers/regex/{octeontx2 => cn9k}/meson.build | 10 +-
> drivers/regex/{octeontx2 => cn9k}/version.map | 0
> drivers/regex/meson.build | 2 +-
> drivers/regex/octeontx2/otx2_regexdev.h | 109 ---
> .../regex/octeontx2/otx2_regexdev_compiler.h | 11 -
> .../regex/octeontx2/otx2_regexdev_hw_access.c | 167 -
> .../regex/octeontx2/otx2_regexdev_hw_access.h | 202 --
> drivers/regex/octeontx2/otx2_regexdev_mbox.c | 401 ---
> drivers/regex/octeontx2/otx2_regexdev_mbox.h | 38 -
> 33 files changed, 1332 insertions(+), 1206 deletions(-)
> rename doc/guides/regexdevs/{octeontx2.rst => cn9k.rst} (69%)
> rename doc/guides/regexdevs/features/{octeontx2.ini => cn9k.ini} (80%)
> create mode 100644 drivers/common/cnxk/hw/ree.h
> create mode 100644 drivers/common/cnxk/roc_ree.c
> create mode 100644 drivers/common/cnxk/roc_ree.h
> create mode 100644 drivers/common/cnxk/roc_ree_priv.h
> rename drivers/regex/{octeontx2/otx2_regexdev.c => cn9k/cn9k_regexdev.c}
> (61%)
> create mode 100644 drivers/regex/cn9k/cn9k_regexdev.h
> rename drivers/regex/{octeontx2/otx2_regexdev_compiler.c =>
> cn9k/cn9k_regexdev_compiler.c} (86%)
> create mode 100644 drivers/regex/cn9k/cn9k_regexdev_compiler.h
> rename drivers/regex/{octeontx2 => cn9k}/meson.build (65%)
> rename drivers/regex/{octeontx2 => cn9k}/version.map (100%)
> delete mode 100644 drivers/regex/octeontx2/otx2_regexdev.h
> delete mode 100644 drivers/regex/octeontx2/otx2_regexdev_compiler.h
> delete mode 100644 drivers/regex/octeontx2/otx2_regexdev_hw_access.c
> delete mode 100644 drivers/regex/octeontx2/otx2_regexdev_hw_access.h
> delete mode 100644 drivers/regex/octeontx2/otx2_regexdev_mbox.c
> delete mode 100644 drivers/regex/octeontx2/otx2_regexdev_mbox.h
>
> --
> 2.28.0
>
[PATCH] devtools/cocci: update cocci for ethdev namespace
Added two specific execptions for ETH_SPEED_10G and ETH_SPEED_25G to avoid there name change. Signed-off-by: Aman Singh --- devtools/cocci/namespace_ethdev.cocci | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/devtools/cocci/namespace_ethdev.cocci b/devtools/cocci/namespace_ethdev.cocci index d5de41e117..3afa1fb386 100644 --- a/devtools/cocci/namespace_ethdev.cocci +++ b/devtools/cocci/namespace_ethdev.cocci @@ -16,7 +16,8 @@ exception_matches = ["ETH_VLAN_FILTER_CLASSIFY","ETH_VLAN_FILTER_ANY", "RTE_FDIR_NO","RTE_FDIR_REPORT","ETH_MAX_RX_CLIENTS_E1H", "ETH_MAX_AGGREGATION_QUEUES_E1","ETH_RSS_ENGINE_NUM","ETH_NUM_MAC_FILTERS", "ETH_MAX_NUM_RX_QUEUES_PER_VF_QUAD","ETH_RSS_IND_TABLE_ENTRIES_NUM", -"ETH_RSS_KEY_SIZE_REGS","ETH_NUM_STATISTIC_COUNTERS","ETH_SPEED_"] +"ETH_RSS_KEY_SIZE_REGS","ETH_NUM_STATISTIC_COUNTERS","ETH_SPEED_10G", +"ETH_SPEED_25G"] if any(x in I for x in exception_matches): coccinelle .J= I; -- 2.25.1
RE: [PATCH 1/3] common/mlx5: add min WQE size for striding RQ
On 12/07/2021 3:32 PM, ferruh.yi...@intel.com wrote: > > On 11/23/2021 6:38 PM, michae...@nvidia.com wrote: > > From: Michael Baum > > > > Some devices have a WQE size limit for striding RQ. On some newer > > devices, this limitation is smaller and information on its size is > > provided by the firmware. > > > > This patch adds the attribute query from firmware: the minimum > > required size of WQE in a strided RQ in granularity of Bytes. > > ? s/strided/strode/ Thanks for the comment. Let's replace it to "the minimum required size of WQE buffer for striding RQ in granularity of Bytes". > > > > > Cc:sta...@dpdk.org > > > > This is not a fix, why requesting to backport it? > Patch is to use FW provided capability value, which is not used before. It is requesting for fix coming after (net/mlx5: fix missing adjustment MPRQ stride devargs). The fix use this capability. > > > Signed-off-by: Michael Baum > > Acked-by: Matan Azrad
RE: [PATCH 2/3] net/mlx5: improve stride parameter names
On 12/07/2021 3:34 PM, ferruh.yi...@intel.com wrote:
>
> On 11/23/2021 6:38 PM, michae...@nvidia.com wrote:
> > From: Michael Baum
> >
> > In the striding RQ management there are two important parameters, the
> > size of the single stride in bytes and the number of strides.
> >
> > Both the data-path structure and config structure keep the log of the
> > above parameters. However, in their names there is no mention that the
> > value is a log which may be misleading as if the fields represent the
> > values themselves.
> >
> > This patch updates their names describing the values more accurately.
> >
> > Cc:sta...@dpdk.org
> >
>
> Can you please provide fixes tag for it?
I think this is the relevant fixes tag:
Fixes: ecb160456aed ("net/mlx5: add device parameter for MPRQ stride size")
> In this case commit(s) adding the parameters with bad name.
I added Cc:stable here just to make next commit easy for the backport, because
following patch is based on it.
For this commit itself there is no reason backporting it ,because it does not
solve something that affects the user but prevents confusion from future
programmers.
>
> > Signed-off-by: Michael Baum
> > Acked-by: Matan Azrad
RE: [PATCH 3/3] net/mlx5: fix missing adjustment MPRQ stride devargs
On 12/07/2021 3:41 PM, ferruh.yi...@intel.com wrote:
>
> On 11/23/2021 6:38 PM, michae...@nvidia.com wrote:
> > From: Michael Baum
> >
> > In Multy-Packet RQ creation, the user can choose the number of strides
>
> Multi-Packet ?
Yes, you're right. It should have been Multi-Packet, thank you for that.
>
> > and their size in bytes. The user updates it using specific devargs
> > for both of these parameters.
> > The above two parameters determine the size of the WQE which is
> > actually their product of multiplication.
> >
> > If the user selects values that are not in the supported range, the
> > PMD changes them to default values. However, apart from the range
> > limitations for each parameter individually there is also a minimum
> > value on their multiplication. When the user selects values that their
> > multiplication are lower than minimum value, no adjustment is made and
> > the creation of the WQE fails.
> > > This patch adds an adjustment in these cases as well. When the user
> > selects values whose multiplication is lower than the minimum, they
> > are replaced with the default values.
> >
> > Fixes: ecb160456aed ("net/mlx5: add device parameter for MPRQ stride
> > size") Cc:sta...@dpdk.org
> >
>
> Again, not sure if we can backport this patch, this looks a behavior change
> more than a fix.
>
> Previously if the user provided values ends up being invalid, PMD seems
> returning error.
> With this patch, instead of returning error PMD prefers to use default values
> and doesn't return error.
It isn't behavior change.
It existed before, except that it is concentrated into one function.
>
> I am not sure if it is correct thing to ignore (adjust) user provided values,
> but
> that can be up to the PMD as long as the behavior is documented.
Adjustment is the likely thing to do because the range depends on the device
and the user does not necessarily know it.
This behavior is documented here
https://doc.dpdk.org/guides/nics/mlx5.html#run-time-configuration (Run-time
configuration -> Driver options -> mprq_log_stride_num/size)
>
> But I think it is wrong to backport the behavior change.
>
> > Signed-off-by: Michael Baum
> > Acked-by: Matan Azrad
> > ---
Re: [PATCH 3/3] net/mlx5: fix missing adjustment MPRQ stride devargs
On 12/8/2021 12:52 PM, Michael Baum wrote:
On 12/07/2021 3:41 PM, ferruh.yi...@intel.com wrote:
On 11/23/2021 6:38 PM, michae...@nvidia.com wrote:
From: Michael Baum
In Multy-Packet RQ creation, the user can choose the number of strides
Multi-Packet ?
Yes, you're right. It should have been Multi-Packet, thank you for that.
and their size in bytes. The user updates it using specific devargs
for both of these parameters.
The above two parameters determine the size of the WQE which is
actually their product of multiplication.
If the user selects values that are not in the supported range, the
PMD changes them to default values. However, apart from the range
limitations for each parameter individually there is also a minimum
value on their multiplication. When the user selects values that their
multiplication are lower than minimum value, no adjustment is made and
the creation of the WQE fails.
This patch adds an adjustment in these cases as well. When the user
selects values whose multiplication is lower than the minimum, they
are replaced with the default values.
Fixes: ecb160456aed ("net/mlx5: add device parameter for MPRQ stride
size") Cc:sta...@dpdk.org
Again, not sure if we can backport this patch, this looks a behavior change
more than a fix.
Previously if the user provided values ends up being invalid, PMD seems
returning error.
With this patch, instead of returning error PMD prefers to use default values
and doesn't return error.
It isn't behavior change.
It existed before, except that it is concentrated into one function.
I am not sure if it is correct thing to ignore (adjust) user provided values,
but
that can be up to the PMD as long as the behavior is documented.
Adjustment is the likely thing to do because the range depends on the device
and the user does not necessarily know it.
This behavior is documented here
https://doc.dpdk.org/guides/nics/mlx5.html#run-time-configuration (Run-time
configuration -> Driver options -> mprq_log_stride_num/size)
It is documented that adjustments will be done if any specific argument
is not in the range of the device capability.
It is not clear what will happen if the calculated value from both variables
are not valid.
If it is not documented before, and previously it was returning error,
now adjusting values to make it work looks like behavior change to me.
This is more of a process question, than technical detail in the driver,
so @Luca, @Kevin, @Christian, can you please comment? I will follow your
suggestion.
But I think it is wrong to backport the behavior change.
Signed-off-by: Michael Baum
Acked-by: Matan Azrad
---
[PATCH] net/mlx5: fix the memory socket selection in ASO management
From: Michael Baum
In ASO objects creation (WQE, CQE and MR), socket number is given as
a parameter.
The selection was wrongly socket 0 hardcoded even if the user didn't
configure memory for this socket.
This patch replaces the selection to default socket (SOCKET_ID_ANY).
Fixes: f935ed4b645a ("net/mlx5: support flow hit action for aging")
Cc: sta...@dpdk.org
Signed-off-by: Michael Baum
Acked-by: Matan Azrad
---
drivers/net/mlx5/mlx5_flow_aso.c | 117 +--
1 file changed, 32 insertions(+), 85 deletions(-)
diff --git a/drivers/net/mlx5/mlx5_flow_aso.c b/drivers/net/mlx5/mlx5_flow_aso.c
index ddf4328dec..eb7fc43da3 100644
--- a/drivers/net/mlx5/mlx5_flow_aso.c
+++ b/drivers/net/mlx5/mlx5_flow_aso.c
@@ -13,50 +13,6 @@
#include "mlx5.h"
#include "mlx5_flow.h"
-/**
- * Destroy Completion Queue used for ASO access.
- *
- * @param[in] cq
- * ASO CQ to destroy.
- */
-static void
-mlx5_aso_cq_destroy(struct mlx5_aso_cq *cq)
-{
- if (cq->cq_obj.cq)
- mlx5_devx_cq_destroy(&cq->cq_obj);
- memset(cq, 0, sizeof(*cq));
-}
-
-/**
- * Create Completion Queue used for ASO access.
- *
- * @param[in] ctx
- * Context returned from mlx5 open_device() glue function.
- * @param[in/out] cq
- * Pointer to CQ to create.
- * @param[in] log_desc_n
- * Log of number of descriptors in queue.
- * @param[in] socket
- * Socket to use for allocation.
- * @param[in] uar_page_id
- * UAR page ID to use.
- *
- * @return
- * 0 on success, a negative errno value otherwise and rte_errno is set.
- */
-static int
-mlx5_aso_cq_create(void *ctx, struct mlx5_aso_cq *cq, uint16_t log_desc_n,
- int socket, int uar_page_id)
-{
- struct mlx5_devx_cq_attr attr = {
- .uar_page_id = uar_page_id,
- };
-
- cq->log_desc_n = log_desc_n;
- cq->cq_ci = 0;
- return mlx5_devx_cq_create(ctx, &cq->cq_obj, log_desc_n, &attr, socket);
-}
-
/**
* Free MR resources.
*
@@ -84,21 +40,18 @@ mlx5_aso_dereg_mr(struct mlx5_common_device *cdev, struct
mlx5_pmd_mr *mr)
* Size of MR buffer.
* @param[in/out] mr
* Pointer to MR to create.
- * @param[in] socket
- * Socket to use for allocation.
*
* @return
* 0 on success, a negative errno value otherwise and rte_errno is set.
*/
static int
mlx5_aso_reg_mr(struct mlx5_common_device *cdev, size_t length,
- struct mlx5_pmd_mr *mr, int socket)
+ struct mlx5_pmd_mr *mr)
{
-
int ret;
mr->addr = mlx5_malloc(MLX5_MEM_RTE | MLX5_MEM_ZERO, length, 4096,
- socket);
+ SOCKET_ID_ANY);
if (!mr->addr) {
DRV_LOG(ERR, "Failed to create ASO bits mem for MR.");
return -1;
@@ -122,7 +75,7 @@ static void
mlx5_aso_destroy_sq(struct mlx5_aso_sq *sq)
{
mlx5_devx_sq_destroy(&sq->sq_obj);
- mlx5_aso_cq_destroy(&sq->cq);
+ mlx5_devx_cq_destroy(&sq->cq.cq_obj);
memset(sq, 0, sizeof(*sq));
}
@@ -226,35 +179,31 @@ mlx5_aso_ct_init_sq(struct mlx5_aso_sq *sq)
/**
* Create Send Queue used for ASO access.
*
- * @param[in] ctx
- * Context returned from mlx5 open_device() glue function.
+ * @param[in] cdev
+ * Pointer to the mlx5 common device.
* @param[in/out] sq
* Pointer to SQ to create.
- * @param[in] socket
- * Socket to use for allocation.
* @param[in] uar
* User Access Region object.
- * @param[in] pdn
- * Protection Domain number to use.
- * @param[in] log_desc_n
- * Log of number of descriptors in queue.
- * @param[in] ts_format
- * timestamp format supported by the queue.
*
* @return
* 0 on success, a negative errno value otherwise and rte_errno is set.
*/
static int
-mlx5_aso_sq_create(void *ctx, struct mlx5_aso_sq *sq, int socket, void *uar,
- uint32_t pdn, uint16_t log_desc_n, uint32_t ts_format)
+mlx5_aso_sq_create(struct mlx5_common_device *cdev, struct mlx5_aso_sq *sq,
+ void *uar)
{
- struct mlx5_devx_create_sq_attr attr = {
+ struct mlx5_devx_cq_attr cq_attr = {
+ .uar_page_id = mlx5_os_get_devx_uar_page_id(uar),
+ };
+ struct mlx5_devx_create_sq_attr sq_attr = {
.user_index = 0x,
.wq_attr = (struct mlx5_devx_wq_attr){
- .pd = pdn,
+ .pd = cdev->pdn,
.uar_page = mlx5_os_get_devx_uar_page_id(uar),
},
- .ts_format = mlx5_ts_format_conv(ts_format),
+ .ts_format =
+ mlx5_ts_format_conv(cdev->config.hca_attr.sq_ts_format),
};
struct mlx5_devx_modify_sq_attr modify_attr = {
.state = MLX5_SQC_STATE_RDY,
@@ -262,14 +211,18 @@ mlx5_aso_sq_create(void *ctx, struct mlx5_aso_sq *sq, int
socket, void *uar,
uint16_t log_wqbb_n;
int ret;
- if (mlx5_aso_cq_create(ctx, &sq->cq, log_desc_n, soc
RE: [PATCH 3/3] net/mlx5: fix missing adjustment MPRQ stride devargs
Hi Ferruh
Thanks for the review.
Please see inside some clarifications.
From: Ferruh Yigit
> On 12/8/2021 12:52 PM, Michael Baum wrote:
> >
> > On 12/07/2021 3:41 PM, ferruh.yi...@intel.com wrote:
> >>
> >> On 11/23/2021 6:38 PM, michae...@nvidia.com wrote:
> >>> From: Michael Baum
> >>>
> >>> In Multy-Packet RQ creation, the user can choose the number of
> >>> strides
> >>
> >> Multi-Packet ?
> >
> > Yes, you're right. It should have been Multi-Packet, thank you for that.
> >
> >>
> >>> and their size in bytes. The user updates it using specific devargs
> >>> for both of these parameters.
> >>> The above two parameters determine the size of the WQE which is
> >>> actually their product of multiplication.
> >>>
> >>> If the user selects values that are not in the supported range, the
> >>> PMD changes them to default values. However, apart from the range
> >>> limitations for each parameter individually there is also a minimum
> >>> value on their multiplication. When the user selects values that
> >>> their multiplication are lower than minimum value, no adjustment is
> >>> made and the creation of the WQE fails.
> This patch adds an adjustment in these cases as well. When the user
> >>> selects values whose multiplication is lower than the minimum, they
> >>> are replaced with the default values.
> >>>
> >>> Fixes: ecb160456aed ("net/mlx5: add device parameter for MPRQ stride
> >>> size") Cc:sta...@dpdk.org
> >>>
> >>
> >> Again, not sure if we can backport this patch, this looks a behavior
> >> change more than a fix.
> >>
> >> Previously if the user provided values ends up being invalid, PMD
> >> seems returning error.
> >> With this patch, instead of returning error PMD prefers to use
> >> default values and doesn't return error.
> >
> > It isn't behavior change.
> > It existed before, except that it is concentrated into one function.
> >
> >>
> >> I am not sure if it is correct thing to ignore (adjust) user provided
> >> values, but that can be up to the PMD as long as the behavior is
> documented.
> >
> > Adjustment is the likely thing to do because the range depends on the
> device and the user does not necessarily know it.
> > This behavior is documented here
> > https://doc.dpdk.org/guides/nics/mlx5.html#run-time-configuration
> > (Run-time configuration -> Driver options -> mprq_log_stride_num/size)
> >
>
> It is documented that adjustments will be done if any specific argument is
> not in the range of the device capability.
>
> It is not clear what will happen if the calculated value from both variables
> are
> not valid.
The driver should adjust it to a legal value.
> If it is not documented before, and previously it was returning error, now
> adjusting values to make it work looks like behavior change to me.
The driver should not return an error - the driver should adjust to a legal
value in case of illegal values by the user.
It is documented in the devargs description.
Not behavior change but a bug fix; previously, the adjustment may return an
error(which is a bug) or cause unexpected behavior in the HW(which is an old FW
bug).
Now, no error, no unexpected behavior - bug should be fixed for any FW version.
> This is more of a process question, than technical detail in the driver, so
> @Luca, @Kevin, @Christian, can you please comment? I will follow your
> suggestion.
>
>
> >>
> >> But I think it is wrong to backport the behavior change.
> >>
> >>> Signed-off-by: Michael Baum
> >>> Acked-by: Matan Azrad
> >>> ---
> >
[Bug 897] [20.11.4-rc1] librte_eal/windows cross build failure with gcc 11 on Fedora 35
https://bugs.dpdk.org/show_bug.cgi?id=897 Bug ID: 897 Summary: [20.11.4-rc1] librte_eal/windows cross build failure with gcc 11 on Fedora 35 Product: DPDK Version: 20.11 Hardware: All OS: Linux Status: UNCONFIRMED Severity: normal Priority: Normal Component: other Assignee: dev@dpdk.org Reporter: alia...@nvidia.com Target Milestone: --- """ $ meson --werror --buildtype=debugoptimized --cross-file config/x86/cross-mingw -Dexamples=helloworld /tmp/build [..] /usr/lib/gcc/x86_64-w64-mingw32/11.2.1/../../../../x86_64-w64-mingw32/bin/ld: lib/librte_eal.a.p/librte_eal_windows_eal_mp.c.obj: in function `eal_dev_hotplug_request_to_primary': /tmp/build/../../root/dpdk/lib/librte_eal/windows/eal_mp.c:111: multiple definition of `eal_dev_hotplug_request_to_primary'; lib/librte_eal.a.p/librte_eal_common_hotplug_mp.c.obj:/tmp/build/../../root/dpdk/lib/librte_eal/common/hotplug_mp.c:366: first defined here /usr/lib/gcc/x86_64-w64-mingw32/11.2.1/../../../../x86_64-w64-mingw32/bin/ld: lib/librte_eal.a.p/librte_eal_windows_eal_mp.c.obj:/tmp/build/../../root/dpdk/lib/librte_eal/windows/eal_mp.c:111: multiple definition of `eal_dev_hotplug_request_to_secondary'; lib/librte_eal.a.p/librte_eal_common_hotplug_mp.c.obj:/tmp/build/../../root/dpdk/lib/librte_eal/common/hotplug_mp.c:394: first defined here collect2: error: ld returned 1 exit status """ C compiler for the host machine: x86_64-w64-mingw32-gcc (gcc 11.2.1 "x86_64-w64-mingw32-gcc (GCC) 11.2.1 20210728 (Fedora MinGW 11.2.1-3.fc35)") -- You are receiving this mail because: You are the assignee for the bug.
Re: [PATCH v13 11/11] app/test: enable unit test on Windows
On Tue, Dec 07, 2021 at 05:51:02PM -0800, Jie Zhou wrote:
> Enable a subset of unit tests for Windows CI
>
> - For driver tests, driver owners should enable corresponding tests when
> enabling driver for Windows. For example, the cryptodev tests will be
> enabled by "patch-18949: app/test: enable crypto unit tests on Windows"
> (which depends on this patchset to be merged).
> - For dump tests, currently the tests hang on Windows which require
> further investigation.
>
> Signed-off-by: Jie Zhou
>
Mostly these changes look ok to me. One small query below.
/Bruce
> ---
> app/test/meson.build | 111 ++-
> 1 file changed, 58 insertions(+), 53 deletions(-)
>
> diff --git a/app/test/meson.build b/app/test/meson.build
> index 97ee83029e..fcf38729e7 100644
> --- a/app/test/meson.build
> +++ b/app/test/meson.build
> @@ -1,12 +1,6 @@
> # SPDX-License-Identifier: BSD-3-Clause
> # Copyright(c) 2017 Intel Corporation
>
> -if is_windows
> -build = false
> # The following linkages are an exception to allow running the
> # unit tests without requiring that the developer install the
> # DPDK libraries. Explicit linkage of drivers (plugin libraries)
> @@ -385,7 +390,7 @@ if dpdk_conf.has('RTE_LIB_METRICS')
> test_sources += ['test_metrics.c']
> fast_tests += [['metrics_autotest', true]]
> endif
> -if dpdk_conf.has('RTE_LIB_TELEMETRY')
> +if not is_windows and dpdk_conf.has('RTE_LIB_TELEMETRY')
> test_sources += ['test_telemetry_json.c', 'test_telemetry_data.c']
> fast_tests += [['telemetry_json_autotest', true],
> ['telemetry_data_autotest', true]]
If telemetry is enabled, is there a reason these won't run on Windows?
Re: [PATCH v1] gpudev: return EINVAL if invalid input pointer for free and unregister
On Thu, Dec 02, 2021 at 01:01:26PM +, Ananyev, Konstantin wrote:
>
>
> > > From: Thomas Monjalon [mailto:tho...@monjalon.net]
> > > Sent: Thursday, 2 December 2021 08.19
> > >
> > > 01/12/2021 22:37, Tyler Retzlaff:
> > > > On Wed, Nov 24, 2021 at 06:04:56PM +, Bruce Richardson wrote:
> > > > > if (ret < 0 && rte_errno == EAGAIN)
> > > >
> > > > i only urge that this be explicit as opposed to a range i.e. ret == -
> > > 1
> > > > preferred over ret < 0
> > >
> > > I don't understand why you think it is important to limit return value
> > > to -1.
> > > Why "if (ret == -1)" is better than "if (ret < 0)" ?
> >
> > Speaking for myself:
> >
> > For clarity. It leaves no doubt that "it failed" is represented by the
> > return value -1, and that the function does not return errno values such as
> > -EINVAL.
> >
>
> But why '< 0' gives you less clarity?
> Negative value means failure - seems perfectly clear to me.
>
it's ambiguous and the contract allows it to be. being explicit prevents
it. don't mix your signaling with your info. you simply can't have the
following ever happen if you are explicit.
int somefunc(void)
{
rte_errno = EPERM;
return -EINVAL;
}
sure this example you can see is obviously wrong but when you start
dealing with callstacks that are propagating errors N levels down it
gets a lot harder to catch the fact that rte_errno wasn't set to -ret.
also there are many apis right now that do return -1 do you propose it
is suddenly valid to start return -rte_errno? when you do expect this
application code to break.
int somefunc3(void)
{
rte_errno = EPERM;
return -1;
}
int somefunc2(void *param)
{
// some work
return somefunc3();
}
int rv = somefunc2(param)
if (rv == -1)
// handle rte_errno
else
// no error
then we get the foolishness that was recently integrated en masse.
--- before.c2021-12-08 09:22:10.491248400 -0800
+++ after.c 2021-12-08 09:22:45.859431300 -0800
@@ -1,5 +1,8 @@
int somefunc2(void *param)
{
+if (param == NULL)
+return -EINVAL;
+
// some work
return somefunc3();
}
compatibility breaks happen when some application writes code in a way
you wouldn't expect. everytime this sort of stuff is done you create an
opportunity for compatibility break.
now you can spend your life writing unit tests that somehow exercise
every error path to make sure someone didn't introduce an inconsistent /
unmatching rte_errno to -ret or you can just stop inter-mixing
signalling with info and get rid of the ambiguity.
Re: [PATCH v1] gpudev: return EINVAL if invalid input pointer for free and unregister
On Fri, Dec 03, 2021 at 11:37:10AM +0100, Morten Brørup wrote: > > From: Morten Brørup [mailto:m...@smartsharesystems.com] > > Sent: Thursday, 2 December 2021 14.56 > > > > > > I disagree: Negative value does not mean failure. Only -1 means > > failure. > > > > There is no -2 return value. There is no -EINVAL return value. > > > > Testing for (ret < 0) might confuse someone to think that other values > > than -1 could be returned as indication of failure, which is not the > > case when following the convention where the functions set errno and > > return -1 in case of failure. > > > > It would be different if following a convention where the functions > > return -errno in case of failure. In this case, testing (ret < 0) would > > be appropriate. > > > > So explicitly testing (ret == -1) clarifies which of the two > > conventions are relevant. > > > > I tested it on Godbolt, and (ret < 0) produces slightly smaller code than > (ret == -1) on x86-64: > > https://godbolt.org/z/3xME3jxq8 > > A binary test (Error or Data) uses 1 byte less, and a tristate test (Error, > Zero or Data) uses 3 byte less. > > Although there is no measurable performance difference for a single instance > of this kind of test, we should consider that this kind of test appears many > times in the code, so the saved bytes might add up to something slightly > significant in the instruction cache. > > My opinion is not so strong anymore... perhaps we should prefer performance > over code readability, also in this case? > i would not expect many calls that return rte_errno to be made on the hot path. most of the use of errno / rte_errno is control but it's good to have considered it. if i start seeing a lot of error handling in hot paths i ordinarily find a way to get rid of it through various techniques.
Re: [PATCH v13 11/11] app/test: enable unit test on Windows
On Wed, Dec 08, 2021 at 04:57:52PM +, Bruce Richardson wrote:
> On Tue, Dec 07, 2021 at 05:51:02PM -0800, Jie Zhou wrote:
> > Enable a subset of unit tests for Windows CI
> >
> > - For driver tests, driver owners should enable corresponding tests when
> > enabling driver for Windows. For example, the cryptodev tests will be
> > enabled by "patch-18949: app/test: enable crypto unit tests on Windows"
> > (which depends on this patchset to be merged).
> > - For dump tests, currently the tests hang on Windows which require
> > further investigation.
> >
> > Signed-off-by: Jie Zhou
> >
>
> Mostly these changes look ok to me. One small query below.
>
> /Bruce
> > ---
> > app/test/meson.build | 111 ++-
> > 1 file changed, 58 insertions(+), 53 deletions(-)
> >
> > diff --git a/app/test/meson.build b/app/test/meson.build
> > index 97ee83029e..fcf38729e7 100644
> > --- a/app/test/meson.build
> > +++ b/app/test/meson.build
> > @@ -1,12 +1,6 @@
> > # SPDX-License-Identifier: BSD-3-Clause
> > # Copyright(c) 2017 Intel Corporation
> >
> > -if is_windows
> > -build = false
>
>
>
> > # The following linkages are an exception to allow running the
> > # unit tests without requiring that the developer install the
> > # DPDK libraries. Explicit linkage of drivers (plugin libraries)
> > @@ -385,7 +390,7 @@ if dpdk_conf.has('RTE_LIB_METRICS')
> > test_sources += ['test_metrics.c']
> > fast_tests += [['metrics_autotest', true]]
> > endif
> > -if dpdk_conf.has('RTE_LIB_TELEMETRY')
> > +if not is_windows and dpdk_conf.has('RTE_LIB_TELEMETRY')
> > test_sources += ['test_telemetry_json.c', 'test_telemetry_data.c']
> > fast_tests += [['telemetry_json_autotest', true],
> > ['telemetry_data_autotest', true]]
>
> If telemetry is enabled, is there a reason these won't run on Windows?
Hi Bruce, the telemetry test has many POSIX socket specific codes which
requires replacement for Windows. We will work on investigation of enabling
more tests (including the telemetry tests) after this patchset. Sorry I forgot
to mention that in the commit message, but it is on my list. The current goal
is to get this patchset merged asap before another upstream churn to rebase,
rework, etc. If you prefer me to send out a V14 to add this info into commit
message or remove this change from meson.build but add test stub into the
specific test files, please just let me know. Thanks for your understanding. --
Jie
Re: [PATCH v13 11/11] app/test: enable unit test on Windows
On Wed, Dec 08, 2021 at 10:19:27AM -0800, Jie Zhou wrote:
> On Wed, Dec 08, 2021 at 04:57:52PM +, Bruce Richardson wrote:
> > On Tue, Dec 07, 2021 at 05:51:02PM -0800, Jie Zhou wrote:
> > > Enable a subset of unit tests for Windows CI
> > >
> > > - For driver tests, driver owners should enable corresponding tests when
> > > enabling driver for Windows. For example, the cryptodev tests will be
> > > enabled by "patch-18949: app/test: enable crypto unit tests on Windows"
> > > (which depends on this patchset to be merged).
> > > - For dump tests, currently the tests hang on Windows which require
> > > further investigation.
> > >
> > > Signed-off-by: Jie Zhou
> > >
> >
> > Mostly these changes look ok to me. One small query below.
> >
> > /Bruce
> > > ---
> > > app/test/meson.build | 111 ++-
> > > 1 file changed, 58 insertions(+), 53 deletions(-)
> > >
> > > diff --git a/app/test/meson.build b/app/test/meson.build
> > > index 97ee83029e..fcf38729e7 100644
> > > --- a/app/test/meson.build
> > > +++ b/app/test/meson.build
> > > @@ -1,12 +1,6 @@
> > > # SPDX-License-Identifier: BSD-3-Clause
> > > # Copyright(c) 2017 Intel Corporation
> > >
> > > -if is_windows
> > > -build = false
> >
> >
> >
> > > # The following linkages are an exception to allow running the
> > > # unit tests without requiring that the developer install the
> > > # DPDK libraries. Explicit linkage of drivers (plugin libraries)
> > > @@ -385,7 +390,7 @@ if dpdk_conf.has('RTE_LIB_METRICS')
> > > test_sources += ['test_metrics.c']
> > > fast_tests += [['metrics_autotest', true]]
> > > endif
> > > -if dpdk_conf.has('RTE_LIB_TELEMETRY')
> > > +if not is_windows and dpdk_conf.has('RTE_LIB_TELEMETRY')
> > > test_sources += ['test_telemetry_json.c', 'test_telemetry_data.c']
> > > fast_tests += [['telemetry_json_autotest', true],
> > > ['telemetry_data_autotest', true]]
> >
> > If telemetry is enabled, is there a reason these won't run on Windows?
>
> Hi Bruce, the telemetry test has many POSIX socket specific codes which
> requires replacement for Windows. We will work on investigation of enabling
> more tests (including the telemetry tests) after this patchset. Sorry I
> forgot to mention that in the commit message, but it is on my list. The
> current goal is to get this patchset merged asap before another upstream
> churn to rebase, rework, etc. If you prefer me to send out a V14 to add this
> info into commit message or remove this change from meson.build but add test
> stub into the specific test files, please just let me know. Thanks for your
> understanding. -- Jie
A line to two added to the commit log is probably sufficient.
Acked-by: Bruce Richardson
Re: [PATCH v13 11/11] app/test: enable unit test on Windows
On Wed, Dec 08, 2021 at 06:23:30PM +, Bruce Richardson wrote:
> On Wed, Dec 08, 2021 at 10:19:27AM -0800, Jie Zhou wrote:
> > On Wed, Dec 08, 2021 at 04:57:52PM +, Bruce Richardson wrote:
> > > On Tue, Dec 07, 2021 at 05:51:02PM -0800, Jie Zhou wrote:
> > > > Enable a subset of unit tests for Windows CI
> > > >
> > > > - For driver tests, driver owners should enable corresponding tests when
> > > > enabling driver for Windows. For example, the cryptodev tests will be
> > > > enabled by "patch-18949: app/test: enable crypto unit tests on
> > > > Windows"
> > > > (which depends on this patchset to be merged).
> > > > - For dump tests, currently the tests hang on Windows which require
> > > > further investigation.
> > > >
> > > > Signed-off-by: Jie Zhou
> > > >
> > >
> > > Mostly these changes look ok to me. One small query below.
> > >
> > > /Bruce
> > > > ---
> > > > app/test/meson.build | 111 ++-
> > > > 1 file changed, 58 insertions(+), 53 deletions(-)
> > > >
> > > > diff --git a/app/test/meson.build b/app/test/meson.build
> > > > index 97ee83029e..fcf38729e7 100644
> > > > --- a/app/test/meson.build
> > > > +++ b/app/test/meson.build
> > > > @@ -1,12 +1,6 @@
> > > > # SPDX-License-Identifier: BSD-3-Clause
> > > > # Copyright(c) 2017 Intel Corporation
> > > >
> > > > -if is_windows
> > > > -build = false
> > >
> > >
> > >
> > > > # The following linkages are an exception to allow running the
> > > > # unit tests without requiring that the developer install the
> > > > # DPDK libraries. Explicit linkage of drivers (plugin libraries)
> > > > @@ -385,7 +390,7 @@ if dpdk_conf.has('RTE_LIB_METRICS')
> > > > test_sources += ['test_metrics.c']
> > > > fast_tests += [['metrics_autotest', true]]
> > > > endif
> > > > -if dpdk_conf.has('RTE_LIB_TELEMETRY')
> > > > +if not is_windows and dpdk_conf.has('RTE_LIB_TELEMETRY')
> > > > test_sources += ['test_telemetry_json.c', 'test_telemetry_data.c']
> > > > fast_tests += [['telemetry_json_autotest', true],
> > > > ['telemetry_data_autotest', true]]
> > >
> > > If telemetry is enabled, is there a reason these won't run on Windows?
> >
> > Hi Bruce, the telemetry test has many POSIX socket specific codes which
> > requires replacement for Windows. We will work on investigation of enabling
> > more tests (including the telemetry tests) after this patchset. Sorry I
> > forgot to mention that in the commit message, but it is on my list. The
> > current goal is to get this patchset merged asap before another upstream
> > churn to rebase, rework, etc. If you prefer me to send out a V14 to add
> > this info into commit message or remove this change from meson.build but
> > add test stub into the specific test files, please just let me know. Thanks
> > for your understanding. -- Jie
>
> A line to two added to the commit log is probably sufficient.
>
> Acked-by: Bruce Richardson
Thanks Bruce. Will add the info into commit message in V14.
RE: [PATCH v1] gpudev: return EINVAL if invalid input pointer for free and unregister
> From: Tyler Retzlaff [mailto:roret...@linux.microsoft.com] > Sent: Wednesday, 8 December 2021 18.35 > > On Fri, Dec 03, 2021 at 11:37:10AM +0100, Morten Brørup wrote: > > > From: Morten Brørup [mailto:m...@smartsharesystems.com] > > > Sent: Thursday, 2 December 2021 14.56 > > > > > > > > > I disagree: Negative value does not mean failure. Only -1 means > > > failure. > > > > > > There is no -2 return value. There is no -EINVAL return value. > > > > > > Testing for (ret < 0) might confuse someone to think that other > values > > > than -1 could be returned as indication of failure, which is not > the > > > case when following the convention where the functions set errno > and > > > return -1 in case of failure. > > > > > > It would be different if following a convention where the functions > > > return -errno in case of failure. In this case, testing (ret < 0) > would > > > be appropriate. > > > > > > So explicitly testing (ret == -1) clarifies which of the two > > > conventions are relevant. > > > > > > > I tested it on Godbolt, and (ret < 0) produces slightly smaller code > than (ret == -1) on x86-64: > > > > https://godbolt.org/z/3xME3jxq8 > > > > A binary test (Error or Data) uses 1 byte less, and a tristate test > (Error, Zero or Data) uses 3 byte less. > > > > Although there is no measurable performance difference for a single > instance of this kind of test, we should consider that this kind of > test appears many times in the code, so the saved bytes might add up to > something slightly significant in the instruction cache. > > > > My opinion is not so strong anymore... perhaps we should prefer > performance over code readability, also in this case? > > > > i would not expect many calls that return rte_errno to be made on the > hot path. most of the use of errno / rte_errno is control but it's good > to have considered it. if i start seeing a lot of error handling in hot > paths i ordinarily find a way to get rid of it through various > techniques. Tyler, I think you and I agree perfectly on this topic. -1 should be returned as error, and rte_errno should provide details. I'm only saying that comparing the return value with < 0 provides marginally less instruction bytes than comparing it with == -1, so even though -1 is the canonical indication of error, the comparison could be < 0 instead of == -1 (if weighing performance higher than code clarity).
[PATCH v14 03/11] app/test: fix incorrect errno variable
Fix incorrect errno variable used in memory autotest.
Use rte_errno instead.
Fixes: 086d426406bd ("app/test: fix memory autotests on FreeBSD")
Cc: bruce.richard...@intel.com
Signed-off-by: Jie Zhou
Acked-by: Dmitry Kozlyuk
---
app/test/test_memory.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/test/test_memory.c b/app/test/test_memory.c
index dbf6871e71..140ac3f3cf 100644
--- a/app/test/test_memory.c
+++ b/app/test/test_memory.c
@@ -63,7 +63,7 @@ check_seg_fds(const struct rte_memseg_list *msl, const struct
rte_memseg *ms,
/* we're able to get memseg fd - try getting its offset */
ret = rte_memseg_get_fd_offset_thread_unsafe(ms, &offset);
if (ret < 0) {
- if (errno == ENOTSUP)
+ if (rte_errno == ENOTSUP)
return 1;
return -1;
}
--
2.31.0.vfs.0.1
[PATCH v14 00/11] app/test: enable subset of tests on Windows
The goal of this patchset is to enable unit tests in CI for Windows.
It mainly contains:
- Replace POSIX specific codes
- Fix some lib and tests per failures investigation
- Add test stubs for not yet supported ones on Windows
- Replace .sh script with .py script for meson.build
- Enable build and run subset of unit tests on Windows
Future work:
- Work with CI lab to onboard unit tests for Windows to catch regression
- Investigate issues hit at CI onboarding
- Enable more tests
---
V2 changes:
- Fix compilation error on FreeBSD
- Fix email mismatch issue
- Add a missing space around "*"
---
V3 changes:
- Fix a misc c coding style issue
- Revise some commit title and message body
- Fix violations of PEP8 in new added Python scripts
- Add error handling in get_coremask.py
- Fix has_hugepage.py to check system support of hugepages
instead of checking privileges
- Fix test meson.build to run Python scripts using py3
- Consolidate lists of source files, test dep, etc. across all
platforms, with conditional extending on some platform(s)
---
V4 changes:
- Remove building of ip_frag, rib, and reorder libraries on Windows.
These three libs usually can be built on Windows without change.
However, in between the time of V3 and V4, there is regression in
upstream caused build failures of these three libs. Will separately
investigate and enable these libraries.
- Remove previous patch#2 (Enable mempool/stack on Windows) from this
patchset as it was separated out and merged as patch-19314.
- Consolidate the source files, deps, tests lists across platforms as
much as possible.
---
V5 changes:
- Remove a space between function name and open parenthesis '('
- Add back a header mistakenly deleted
---
V6 changes:
- Fix inconsistent static vs. non-static declarations
---
V7 changes:
- Remove get_coremask.py as it is not needed any more in meson.build
- Remove enablement of efd and lpm and their corresponding unit tests.
The enablement of these two libs and their UTs will be in separate
patches after this patch set.
V8 changes:
- Fix coding style issue of using C99 // comments
---
V9 changes:
- Fix has_hugepage.py with adding failure handling on Linux, using
proper variable name to follow Python convention, and removing
unnecessary comment.
- Enable previously skipped test_cmdline_socket_fns test cases
- Revise title and message, and add Fixes info for current Patch#3
- Combine 2 patches (previous #2 and #3 in V8) into one and with
more detailed message
---
V10 changes:
- Fix indentation
---
V11 changes:
- Remove mandatory dependency on bitratestats, latencystats,
and metrics libs in test meson.build, which was reintroduced
at rebase in V9.
---
V12 changes:
- Remove unnecessary print of a null string
- Enable several previous disabled tests
- Split Patch#9 in V11 into two patches for better structure
- Reorder some of the patches for better structure
- Document more details in commit message for issue tracking
---
V13 changes:
- Fix misc coding style issue
- Fix build issue on Ubuntu 18.04
---
V14 changes:
- Explain the reason of skipping telemetry tests in commit log
Tested-by: Pallavi Kadam
Jie Zhou (11):
eal/windows: return ENOTSUP for not supported API
app/test: remove POSIX-specific code
app/test: fix incorrect errno variable
app/test: skip interrupt tests on Windows
app/test: skip two logs_autotest cases on Windows
app/test: differentiate a strerror on different OS
app/test: remove two alarm_autotest cases
app/test: resolve name collision
app/test: add test stubs for not supported ones
app/test: replace .sh script with .py script
app/test: enable unit test on Windows
app/test/commands.c | 2 -
app/test/has-hugepage.sh | 11 ---
app/test/has_hugepage.py | 26 ++
app/test/meson.build | 113 ---
app/test/packet_burst_generator.c| 1 +
app/test/process.h | 4 +-
app/test/test.c | 5 +-
app/test/test_acl.c | 12 +++
app/test/test_alarm.c| 4 +
app/test/test_bpf.c | 15 ++-
app/test/test_byteorder.c| 2 +-
app/test/test_cmdline_ipaddr.c | 13 ++-
app/test/test_cmdline_lib.c | 13 ++-
app/test/test_crc.c | 1 -
app/test/test_cryptodev.c| 4 +
app/test/test_cryptodev_asym.c | 4 +
app/test/test_cryptodev_blockcipher.c| 4 +
app/test/test_cryptodev_security_ipsec.c | 4 +
app/test/test_cryptodev_security_pdcp.c | 4 +
app/test/test_debug.c| 17 +++-
app/test/test_distributor.c | 13 +++
app/test/test_distributor_perf.c |
[PATCH v14 01/11] eal/windows: return ENOTSUP for not supported API
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.
Signed-off-by: Jie Zhou
Acked-by: Dmitry Kozlyuk
---
lib/eal/windows/eal_memalloc.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
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)
RTE_SET_USED(list_idx);
RTE_SET_USED(seg_idx);
EAL_LOG_NOT_IMPLEMENTED();
- return -1;
+ return -ENOTSUP;
}
int
@@ -28,7 +28,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
@@ -428,7 +428,7 @@ eal_memalloc_sync_with_primary(void)
{
/* No multi-process support. */
EAL_LOG_NOT_IMPLEMENTED();
- return -1;
+ return -ENOTSUP;
}
int
--
2.31.0.vfs.0.1
[PATCH v14 04/11] app/test: skip interrupt tests on Windows
Even though test_interrupts.c can compile on Windows, skip interrupt
tests for now since majority of eal_interrupt on Windows are stubs.
Will remove the skip after interrupt being fully enabled on Windows.
Signed-off-by: Jie Zhou
Acked-by: Dmitry Kozlyuk
---
app/test/test_interrupts.c | 10 ++
1 file changed, 10 insertions(+)
diff --git a/app/test/test_interrupts.c b/app/test/test_interrupts.c
index 2a05399f96..eec9b2805b 100644
--- a/app/test/test_interrupts.c
+++ b/app/test/test_interrupts.c
@@ -12,6 +12,15 @@
#include "test.h"
+#ifdef RTE_EXEC_ENV_WINDOWS
+static int
+test_interrupt(void)
+{
+ printf("Interrupt on Windows is not fully supported yet, skipping
test\n");
+ return TEST_SKIPPED;
+}
+#else
+
#define TEST_INTERRUPT_CHECK_INTERVAL 100 /* ms */
/* predefined interrupt handle types */
@@ -590,5 +599,6 @@ test_interrupt(void)
return ret;
}
+#endif /*ifdef RTE_EXEC_ENV_WINDOWS*/
REGISTER_TEST_COMMAND(interrupt_autotest, test_interrupt);
--
2.31.0.vfs.0.1
[PATCH v14 02/11] app/test: remove POSIX-specific code
- Replace POSIX-specific code with DPDK equivalents or
conditionally disable it on Windows
- Use NUL on Windows as /dev/null for Unix
- Exclude tests not supported on Windows yet
* multi-process
* PMD performance statistics display on signal
Signed-off-by: Jie Zhou
Signed-off-by: Dmitry Kozlyuk
---
app/test/commands.c | 2 --
app/test/packet_burst_generator.c | 1 +
app/test/process.h| 4 +++-
app/test/test.c | 5 -
app/test/test_byteorder.c | 2 +-
app/test/test_cmdline_ipaddr.c| 13 ++---
app/test/test_cmdline_lib.c | 13 +
app/test/test_crc.c | 1 -
app/test/test_memcpy_perf.c | 29 +++--
app/test/test_pmd_perf.c | 6 +-
app/test/test_ring_stress_impl.h | 2 +-
app/test/test_telemetry_data.c| 2 ++
12 files changed, 47 insertions(+), 33 deletions(-)
diff --git a/app/test/commands.c b/app/test/commands.c
index 2dced3bc44..887cabad64 100644
--- a/app/test/commands.c
+++ b/app/test/commands.c
@@ -8,8 +8,6 @@
#include
#include
#include
-#include
-#include
#include
#include
#include
diff --git a/app/test/packet_burst_generator.c
b/app/test/packet_burst_generator.c
index 8ac24577ba..6b42b9b83b 100644
--- a/app/test/packet_burst_generator.c
+++ b/app/test/packet_burst_generator.c
@@ -5,6 +5,7 @@
#include
#include
#include
+#include
#include "packet_burst_generator.h"
diff --git a/app/test/process.h b/app/test/process.h
index 5b10cf64df..1f073b9c5c 100644
--- a/app/test/process.h
+++ b/app/test/process.h
@@ -7,12 +7,14 @@
#include /* errno */
#include /* PATH_MAX */
+#ifndef RTE_EXEC_ENV_WINDOWS
#include /* basename et al */
+#include
+#endif
#include /* NULL */
#include /* strerror */
#include /* readlink */
#include
-#include
#include /* strlcpy */
diff --git a/app/test/test.c b/app/test/test.c
index 5194131026..e69cae3eea 100644
--- a/app/test/test.c
+++ b/app/test/test.c
@@ -8,7 +8,6 @@
#include
#include
#include
-#include
#include
#include
@@ -63,7 +62,9 @@ do_recursive_call(void)
const char *env_var;
int (*action_fn)(void);
} actions[] = {
+#ifndef RTE_EXEC_ENV_WINDOWS
{ "run_secondary_instances", test_mp_secondary },
+#endif
#ifdef RTE_LIB_PDUMP
#ifdef RTE_NET_RING
{ "run_pdump_server_tests", test_pdump },
@@ -82,7 +83,9 @@ do_recursive_call(void)
{ "test_file_prefix", no_action },
{ "test_no_huge_flag", no_action },
#ifdef RTE_LIB_TIMER
+#ifndef RTE_EXEC_ENV_WINDOWS
{ "timer_secondary_spawn_wait", test_timer_secondary },
+#endif
#endif
};
diff --git a/app/test/test_byteorder.c b/app/test/test_byteorder.c
index 03c08d9abf..de14ed539e 100644
--- a/app/test/test_byteorder.c
+++ b/app/test/test_byteorder.c
@@ -46,7 +46,7 @@ test_byteorder(void)
return -1;
res_u16 = rte_bswap16(0x1337);
- printf("const %"PRIx16" -> %"PRIx16"\n", 0x1337, res_u16);
+ printf("const %"PRIx16" -> %"PRIx16"\n", (uint16_t)0x1337, res_u16);
if (res_u16 != 0x3713)
return -1;
diff --git a/app/test/test_cmdline_ipaddr.c b/app/test/test_cmdline_ipaddr.c
index 2a1ee120fc..f540063508 100644
--- a/app/test/test_cmdline_ipaddr.c
+++ b/app/test/test_cmdline_ipaddr.c
@@ -1,12 +1,9 @@
/* SPDX-License-Identifier: BSD-3-Clause
* Copyright(c) 2010-2014 Intel Corporation
*/
-
#include
#include
#include
-#include
-#include
#include
@@ -15,7 +12,7 @@
#include "test_cmdline.h"
-#define IP4(a,b,c,d) {((uint32_t)(((a) & 0xff)) | \
+#define IP4(a,b,c,d) {.s_addr = (uint32_t)(((a) & 0xff) | \
(((b) & 0xff) << 8) | \
(((c) & 0xff) << 16) | \
((d) & 0xff) << 24)}
@@ -25,7 +22,11 @@
/* create IPv6 address, swapping bytes where needed */
#ifndef s6_addr16
-# define s6_addr16 __u6_addr.__u6_addr16
+#ifdef RTE_EXEC_ENV_WINDOWS
+#define s6_addr16 u.Word
+#else
+#define s6_addr16 __u6_addr.__u6_addr16
+#endif
#endif
#define IP6(a,b,c,d,e,f,g,h) .ipv6 = \
{.s6_addr16 = \
@@ -166,8 +167,6 @@ const char * ipaddr_garbage_network6_strs[] = {
};
#define IPv6_GARBAGE_PREFIX 64
-
-
const char * ipaddr_invalid_strs[] = {
/** IPv4 **/
diff --git a/app/test/test_cmdline_lib.c b/app/test/test_cmdline_lib.c
index f50ccdb599..fcd58cb76a 100644
--- a/app/test/test_cmdline_lib.c
+++ b/app/test/test_cmdline_lib.c
@@ -8,7 +8,6 @@
#include
#include
#include
-#include
#include
#include
@@ -22,6 +21,12 @@
#include "test_cmdline.h"
+#ifndef RTE_EXEC_ENV_WINDOWS
+#define NULL_INPUT "/dev/null"
+#else
+#define NULL_INPUT "NUL"
+#endif
+
/*
[PATCH v14 05/11] app/test: skip two logs_autotest cases on Windows
DPDK logs_autotest on Windows failed at "dynamic log types" tests.
The failures are on 2 test cases for rte_log_set_level_regexp API,
due to regular expression is not supported on Windows in DPDK yet
and regcomp/regexec are just stubs on Windows (in regex.h).
In app\test\test_logs.c, ifndef these two test cases, and for the
rte_log_set_level_pattern validation case following these two cases,
differentiate the expected log level passed into macro CHECK_LEVELS
Now logs_autotest completes for all dynamic log types and static log types.
Signed-off-by: Jie Zhou
Acked-by: Dmitry Kozlyuk
---
app/test/test_logs.c | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/app/test/test_logs.c b/app/test/test_logs.c
index 7abb6eeca2..7c001c1ab3 100644
--- a/app/test/test_logs.c
+++ b/app/test/test_logs.c
@@ -113,6 +113,7 @@ test_logs(void)
rte_log_set_level(logtype1, RTE_LOG_ERR);
CHECK_LEVELS(RTE_LOG_ERR, RTE_LOG_INFO, RTE_LOG_ERR);
+#ifndef RTE_EXEC_ENV_WINDOWS
rte_log_set_level_regexp("type$", RTE_LOG_EMERG);
CHECK_LEVELS(RTE_LOG_ERR, RTE_LOG_INFO, RTE_LOG_ERR);
@@ -121,7 +122,10 @@ test_logs(void)
rte_log_set_level_pattern("logtype", RTE_LOG_DEBUG);
CHECK_LEVELS(RTE_LOG_ERR, RTE_LOG_EMERG, RTE_LOG_EMERG);
-
+#else
+ ret = rte_log_set_level_pattern("logtype", RTE_LOG_DEBUG);
+ CHECK_LEVELS(RTE_LOG_ERR, RTE_LOG_INFO, RTE_LOG_ERR);
+#endif
/* set logtype level low to so we can test global level */
rte_log_set_level_pattern("logtype*", RTE_LOG_DEBUG);
CHECK_LEVELS(RTE_LOG_DEBUG, RTE_LOG_DEBUG, RTE_LOG_DEBUG);
--
2.31.0.vfs.0.1
[PATCH v14 10/11] app/test: replace .sh script with .py script
- Add python script to check if system supports hugepages
- Remove corresponding .sh script
- Replace calling of .sh with corresponding .py in meson.build
Signed-off-by: Jie Zhou
Acked-by: Dmitry Kozlyuk
---
app/test/has-hugepage.sh | 11 ---
app/test/has_hugepage.py | 26 ++
app/test/meson.build | 2 +-
3 files changed, 27 insertions(+), 12 deletions(-)
delete mode 100755 app/test/has-hugepage.sh
create mode 100644 app/test/has_hugepage.py
diff --git a/app/test/has-hugepage.sh b/app/test/has-hugepage.sh
deleted file mode 100755
index d600fad319..00
--- a/app/test/has-hugepage.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#! /bin/sh
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2020 Mellanox Technologies, Ltd
-
-if [ "$(uname)" = "Linux" ] ; then
- cat /proc/sys/vm/nr_hugepages || echo 0
-elif [ "$(uname)" = "FreeBSD" ] ; then
- echo 1 # assume FreeBSD always has hugepages
-else
- echo 0
-fi
diff --git a/app/test/has_hugepage.py b/app/test/has_hugepage.py
new file mode 100644
index 00..f8e7087d1c
--- /dev/null
+++ b/app/test/has_hugepage.py
@@ -0,0 +1,26 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright (c) 2021 Microsoft Corporation
+"""This script checks if the system supports huge pages"""
+
+import platform
+import ctypes
+
+os_name = platform.system()
+if os_name == "Linux":
+try:
+with open("/proc/sys/vm/nr_hugepages") as file_o:
+content = file_o.read()
+print(content)
+except:
+print("0")
+
+elif os_name == "FreeBSD":
+# Assume FreeBSD always has hugepages enabled
+print("1")
+elif os_name == "Windows":
+if ctypes.windll.kernel32.GetLargePageMinimum() > 0:
+print("1")
+else:
+print("0")
+else:
+print("0")
diff --git a/app/test/meson.build b/app/test/meson.build
index 2b480adfba..97ee83029e 100644
--- a/app/test/meson.build
+++ b/app/test/meson.build
@@ -492,7 +492,7 @@ dpdk_test = executable('dpdk-test',
driver_install_path),
install: true)
-has_hugepage = run_command('has-hugepage.sh').stdout().strip() != '0'
+has_hugepage = run_command(py3, 'has_hugepage.py').stdout().strip() != '0'
message('hugepage availability: @0@'.format(has_hugepage))
# some perf tests (eg: memcpy perf autotest)take very long
--
2.31.0.vfs.0.1
[PATCH v14 08/11] app/test: resolve name collision
Add OP_ prefix to resolve name collision to enable hash_perf test
Signed-off-by: Jie Zhou
---
app/test/test_hash_perf.c | 16
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/app/test/test_hash_perf.c b/app/test/test_hash_perf.c
index 76cdac5d53..7e98ec3964 100644
--- a/app/test/test_hash_perf.c
+++ b/app/test/test_hash_perf.c
@@ -30,10 +30,10 @@
#define BURST_SIZE 16
enum operations {
- ADD = 0,
- LOOKUP,
- LOOKUP_MULTI,
- DELETE,
+ OP_ADD = 0,
+ OP_LOOKUP,
+ OP_LOOKUP_MULTI,
+ OP_DELETE,
NUM_OPERATIONS
};
@@ -308,7 +308,7 @@ timed_adds(unsigned int with_hash, unsigned int with_data,
const uint64_t end_tsc = rte_rdtsc();
const uint64_t time_taken = end_tsc - start_tsc;
- cycles[table_index][ADD][with_hash][with_data] = time_taken/keys_to_add;
+ cycles[table_index][OP_ADD][with_hash][with_data] =
time_taken/keys_to_add;
return 0;
}
@@ -385,7 +385,7 @@ timed_lookups(unsigned int with_hash, unsigned int
with_data,
const uint64_t end_tsc = rte_rdtsc();
const uint64_t time_taken = end_tsc - start_tsc;
- cycles[table_index][LOOKUP][with_hash][with_data] =
time_taken/num_lookups;
+ cycles[table_index][OP_LOOKUP][with_hash][with_data] =
time_taken/num_lookups;
return 0;
}
@@ -511,7 +511,7 @@ timed_lookups_multi(unsigned int with_hash, unsigned int
with_data,
const uint64_t end_tsc = rte_rdtsc();
const uint64_t time_taken = end_tsc - start_tsc;
- cycles[table_index][LOOKUP_MULTI][with_hash][with_data] =
+ cycles[table_index][OP_LOOKUP_MULTI][with_hash][with_data] =
time_taken/num_lookups;
return 0;
@@ -550,7 +550,7 @@ timed_deletes(unsigned int with_hash, unsigned int
with_data,
const uint64_t end_tsc = rte_rdtsc();
const uint64_t time_taken = end_tsc - start_tsc;
- cycles[table_index][DELETE][with_hash][with_data] =
time_taken/keys_to_add;
+ cycles[table_index][OP_DELETE][with_hash][with_data] =
time_taken/keys_to_add;
return 0;
}
--
2.31.0.vfs.0.1
[PATCH v14 06/11] app/test: differentiate a strerror on different OS
On Windows, strerror returns just "Unknown error" for errnum greater
than MAX_ERRNO, while linux and freebsd returns "Unknown error ",
which is the current expectation for errno_autotest. Differentiate
the error string on Windows to remove a "duplicate error code" failure.
Signed-off-by: Jie Zhou
---
app/test/test_errno.c | 12 +++-
lib/eal/common/eal_common_errno.c | 4
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/app/test/test_errno.c b/app/test/test_errno.c
index 3ff0456a58..0db4fbc8b3 100644
--- a/app/test/test_errno.c
+++ b/app/test/test_errno.c
@@ -18,13 +18,19 @@ test_errno(void)
{
const char *rte_retval;
const char *libc_retval;
+
+#ifndef RTE_EXEC_ENV_WINDOWS
#ifdef RTE_EXEC_ENV_FREEBSD
/* BSD has a colon in the string, unlike linux */
const char unknown_code_result[] = "Unknown error: %d";
#else
const char unknown_code_result[] = "Unknown error %d";
#endif
- char expected_libc_retval[sizeof(unknown_code_result)+3];
+ char expected_libc_retval[sizeof(unknown_code_result) + 3];
+#else
+ /* Windows doesn't return error number for error greater than
MAX_errno*/
+ static const char expected_libc_retval[] = "Unknown error";
+#endif
/* use a small selection of standard errors for testing */
int std_errs[] = {EAGAIN, EBADF, EACCES, EINTR, EINVAL};
@@ -54,11 +60,13 @@ test_errno(void)
rte_retval, libc_retval);
if (strcmp(rte_retval, libc_retval) == 0)
return -1;
+#ifndef RTE_EXEC_ENV_WINDOWS
/* generate appropriate error string for unknown error number
* and then check that this is what we got back. If not, we have
* a duplicate error number that conflicts with errno.h */
snprintf(expected_libc_retval, sizeof(expected_libc_retval),
unknown_code_result, rte_errs[i]);
+#endif
if ((strcmp(expected_libc_retval, libc_retval) != 0) &&
(strcmp("", libc_retval) != 0)){
printf("Error, duplicate error code %d\n", rte_errs[i]);
@@ -69,8 +77,10 @@ test_errno(void)
/* ensure that beyond RTE_MAX_ERRNO, we always get an unknown code */
rte_retval = rte_strerror(RTE_MAX_ERRNO + 1);
libc_retval = strerror(RTE_MAX_ERRNO + 1);
+#ifndef RTE_EXEC_ENV_WINDOWS
snprintf(expected_libc_retval, sizeof(expected_libc_retval),
unknown_code_result, RTE_MAX_ERRNO + 1);
+#endif
printf("rte_strerror: '%s', strerror: '%s'\n",
rte_retval, libc_retval);
if ((strcmp(rte_retval, libc_retval) != 0) ||
diff --git a/lib/eal/common/eal_common_errno.c
b/lib/eal/common/eal_common_errno.c
index f86802705a..7507c746ec 100644
--- a/lib/eal/common/eal_common_errno.c
+++ b/lib/eal/common/eal_common_errno.c
@@ -37,7 +37,11 @@ rte_strerror(int errnum)
/* since some implementations of strerror_r throw an error
* themselves if errnum is too big, we handle that case here */
if (errnum >= RTE_MAX_ERRNO)
+#ifdef RTE_EXEC_ENV_WINDOWS
+ snprintf(ret, RETVAL_SZ, "Unknown error");
+#else
snprintf(ret, RETVAL_SZ, "Unknown error%s %d", sep, errnum);
+#endif
else
switch (errnum){
case E_RTE_SECONDARY:
--
2.31.0.vfs.0.1
[PATCH v14 07/11] app/test: remove two alarm_autotest cases
Remove two alarm_autotest test cases which do bogus range check
on Windows.
Signed-off-by: Jie Zhou
Acked-by: Dmitry Kozlyuk
---
app/test/test_alarm.c | 4
1 file changed, 4 insertions(+)
diff --git a/app/test/test_alarm.c b/app/test/test_alarm.c
index b4034339b8..70e97a3109 100644
--- a/app/test/test_alarm.c
+++ b/app/test/test_alarm.c
@@ -10,6 +10,7 @@
#include "test.h"
+#ifndef RTE_EXEC_ENV_WINDOWS
static volatile int flag;
static void
@@ -18,6 +19,7 @@ test_alarm_callback(void *cb_arg)
flag = 1;
printf("Callback setting flag - OK. [cb_arg = %p]\n", cb_arg);
}
+#endif
static int
test_alarm(void)
@@ -27,6 +29,7 @@ test_alarm(void)
return 0;
#endif
+#ifndef RTE_EXEC_ENV_WINDOWS
/* check if it will fail to set alarm with wrong us value */
printf("check if it will fail to set alarm with wrong ms values\n");
if (rte_eal_alarm_set(0, test_alarm_callback,
@@ -39,6 +42,7 @@ test_alarm(void)
printf("should not be successful with (UINT64_MAX-1) us
value\n");
return -1;
}
+#endif
/* check if it will fail to set alarm with null callback parameter */
printf("check if it will fail to set alarm with null callback
parameter\n");
--
2.31.0.vfs.0.1
[PATCH v14 11/11] app/test: enable unit test on Windows
Enable a subset of unit tests for Windows CI
- For driver tests, driver owners should enable corresponding tests when
enabling driver for Windows. For example, the cryptodev tests will be
enabled by "patch-18949: app/test: enable crypto unit tests on Windows"
(which depends on this patchset to be merged).
- For dump tests, currently the tests hang on Windows which require
further investigation.
- For telemetry tests, it has POSIX socket specific codes which require
replacement for Windows. Will investigate and work on a separate patch.
Signed-off-by: Jie Zhou
Acked-by: Bruce Richardson
---
app/test/meson.build | 111 ++-
1 file changed, 58 insertions(+), 53 deletions(-)
diff --git a/app/test/meson.build b/app/test/meson.build
index 97ee83029e..fcf38729e7 100644
--- a/app/test/meson.build
+++ b/app/test/meson.build
@@ -1,12 +1,6 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2017 Intel Corporation
-if is_windows
-build = false
-reason = 'not supported on Windows'
-subdir_done()
-endif
-
if not get_option('tests')
subdir_done()
endif
@@ -158,32 +152,14 @@ test_sources = files(
)
test_deps = [
-'acl',
'bus_pci',
'bus_vdev',
-'bpf',
'cfgfile',
'cmdline',
-'cryptodev',
-'distributor',
'dmadev',
-'efd',
'ethdev',
-'eventdev',
-'fib',
-'flow_classify',
-'graph',
'hash',
-'ipsec',
-'lpm',
-'member',
-'node',
-'pipeline',
-'port',
-'rawdev',
'rcu',
-'reorder',
-'rib',
'ring',
'security',
'stack',
@@ -334,39 +310,68 @@ perf_test_names = [
]
driver_test_names = [
-'cryptodev_aesni_mb_autotest',
-'cryptodev_aesni_gcm_autotest',
-'cryptodev_cn9k_autotest',
-'cryptodev_cn10k_autotest',
-'cryptodev_dpaa_sec_autotest',
-'cryptodev_dpaa2_sec_autotest',
-'cryptodev_null_autotest',
-'cryptodev_octeontx2_autotest',
-'cryptodev_openssl_autotest',
-'cryptodev_openssl_asym_autotest',
-'cryptodev_qat_autotest',
-'cryptodev_sw_armv8_autotest',
-'cryptodev_sw_kasumi_autotest',
-'cryptodev_sw_mvsam_autotest',
-'cryptodev_sw_snow3g_autotest',
-'cryptodev_sw_zuc_autotest',
-'dmadev_autotest',
-'eventdev_selftest_octeontx',
-'eventdev_selftest_sw',
-'rawdev_autotest',
]
dump_test_names = [
-'dump_struct_sizes',
-'dump_mempool',
-'dump_malloc_stats',
-'dump_devargs',
-'dump_log_types',
-'dump_ring',
-'dump_physmem',
-'dump_memzone',
]
+if not is_windows
+test_deps += [
+'acl',
+'bpf',
+'cryptodev',
+'distributor',
+'efd',
+'eventdev',
+'fib',
+'flow_classify',
+'graph',
+'ipsec',
+'lpm',
+'member',
+'node',
+'pipeline',
+'port',
+'rawdev',
+'reorder',
+'rib',
+]
+
+driver_test_names += [
+'cryptodev_aesni_mb_autotest',
+'cryptodev_aesni_gcm_autotest',
+'cryptodev_cn9k_autotest',
+'cryptodev_cn10k_autotest',
+'cryptodev_dpaa_sec_autotest',
+'cryptodev_dpaa2_sec_autotest',
+'cryptodev_null_autotest',
+'cryptodev_octeontx2_autotest',
+'cryptodev_openssl_autotest',
+'cryptodev_openssl_asym_autotest',
+'cryptodev_qat_autotest',
+'cryptodev_sw_armv8_autotest',
+'cryptodev_sw_kasumi_autotest',
+'cryptodev_sw_mvsam_autotest',
+'cryptodev_sw_snow3g_autotest',
+'cryptodev_sw_zuc_autotest',
+'dmadev_autotest',
+'eventdev_selftest_octeontx',
+'eventdev_selftest_sw',
+'rawdev_autotest',
+]
+
+dump_test_names += [
+'dump_struct_sizes',
+'dump_mempool',
+'dump_malloc_stats',
+'dump_devargs',
+'dump_log_types',
+'dump_ring',
+'dump_physmem',
+'dump_memzone',
+]
+endif
+
# The following linkages are an exception to allow running the
# unit tests without requiring that the developer install the
# DPDK libraries. Explicit linkage of drivers (plugin libraries)
@@ -385,7 +390,7 @@ if dpdk_conf.has('RTE_LIB_METRICS')
test_sources += ['test_metrics.c']
fast_tests += [['metrics_autotest', true]]
endif
-if dpdk_conf.has('RTE_LIB_TELEMETRY')
+if not is_windows and dpdk_conf.has('RTE_LIB_TELEMETRY')
test_sources += ['test_telemetry_json.c', 'test_telemetry_data.c']
fast_tests += [['telemetry_json_autotest', true
[PATCH v14 09/11] app/test: add test stubs for not supported ones
Add test stubs for tests which are not yet supported for Windows:
- The libraries that tests depend on are not enabled on Windows yet
- The tests can compile but with issue still under investigation
* test_func_reentrancy:
Windows EAL has no protection against repeated calls.
* test_lcores:
Execution enters an infinite loops, requires investigation.
* test_rcu_qsbr_perf:
Execution hangs on Windows, requires investigation.
Signed-off-by: Jie Zhou
Signed-off-by: Dmitry Kozlyuk
---
app/test/test_acl.c | 12
app/test/test_bpf.c | 15 +++-
app/test/test_cryptodev.c| 4 ++
app/test/test_cryptodev_asym.c | 4 ++
app/test/test_cryptodev_blockcipher.c| 4 ++
app/test/test_cryptodev_security_ipsec.c | 4 ++
app/test/test_cryptodev_security_pdcp.c | 4 ++
app/test/test_debug.c| 17 -
app/test/test_distributor.c | 13
app/test/test_distributor_perf.c | 13
app/test/test_eal_flags.c| 90
app/test/test_eal_fs.c | 12
app/test/test_efd.c | 15 +++-
app/test/test_efd_perf.c | 16 -
app/test/test_event_crypto_adapter.c | 15 +++-
app/test/test_event_eth_rx_adapter.c | 25 ++-
app/test/test_event_eth_tx_adapter.c | 12
app/test/test_event_ring.c | 16 -
app/test/test_event_timer_adapter.c | 16 -
app/test/test_eventdev.c | 20 +-
app/test/test_external_mem.c | 18 -
app/test/test_fib.c | 22 +-
app/test/test_fib6.c | 24 ++-
app/test/test_fib6_perf.c| 16 -
app/test/test_fib_perf.c | 15 +++-
app/test/test_flow_classify.c| 13
app/test/test_func_reentrancy.c | 12
app/test/test_graph.c| 18 -
app/test/test_graph_perf.c | 16 -
app/test/test_hash_perf.c| 12
app/test/test_ipfrag.c | 16 -
app/test/test_ipsec.c| 15 +++-
app/test/test_ipsec_perf.c | 15 +++-
app/test/test_ipsec_sad.c| 14 +++-
app/test/test_kni.c | 10 +--
app/test/test_lcores.c | 12
app/test/test_lpm.c | 14 +++-
app/test/test_lpm6.c | 14 +++-
app/test/test_lpm6_perf.c| 14 +++-
app/test/test_lpm_perf.c | 13 +++-
app/test/test_malloc.c | 20 --
app/test/test_mbuf.c | 15 +++-
app/test/test_member.c | 16 -
app/test/test_member_perf.c | 16 -
app/test/test_memcpy_perf.c | 1 -
app/test/test_mp_secondary.c | 12
app/test/test_pie.c | 30 +++-
app/test/test_rawdev.c | 17 -
app/test/test_rcu_qsbr_perf.c| 12
app/test/test_red.c | 29 +++-
app/test/test_reorder.c | 15 +++-
app/test/test_rib.c | 22 +-
app/test/test_rib6.c | 22 +-
app/test/test_sched.c| 14 +++-
app/test/test_security.c | 4 +-
app/test/test_table.c| 13
app/test/test_table_acl.c| 3 +
app/test/test_table_combined.c | 4 ++
app/test/test_table_pipeline.c | 4 ++
app/test/test_table_ports.c | 4 ++
app/test/test_table_tables.c | 4 ++
app/test/test_timer_secondary.c | 13
app/test/test_trace.c| 32 +++--
63 files changed, 880 insertions(+), 72 deletions(-)
diff --git a/app/test/test_acl.c b/app/test/test_acl.c
index 5b32347954..7814e25a53 100644
--- a/app/test/test_acl.c
+++ b/app/test/test_acl.c
@@ -11,6 +11,16 @@
#include
#include
#include
+
+#ifdef RTE_EXEC_ENV_WINDOWS
+static int
+test_acl(void)
+{
+ printf("acl not supported on Windows, skipping test\n");
+ return TEST_SKIPPED;
+}
+
+#else
#include
#include
@@ -1741,4 +1751,6 @@ test_acl(void)
return 0;
}
+#endif /*ifdef RTE_EXEC_ENV_WINDOWS*/
+
REGISTER_TEST_COMMAND(acl_autotest, test_acl);
diff --git a/app/test/test_bpf.c b/app/test/test_bpf.c
index 46bcb51f86..055df252ba 100644
--- a/app/test/test_bpf.c
+++ b/app/test/test_bpf.c
@@ -14,11 +14,22 @@
#include
#include
#include
+#include "test.h"
+
+#if !defined(RTE_LIB_BPF)
+
+static int
+test_bpf(void)
+{
+ printf("BPF not supported, skipping test\n");
+ return TEST_SKIPPED;
+}
+
+#else
#include
#include
#include
-#include "test.h"
/*
* Basic functional tests for librte_bpf.
@@ -3248,6 +3259,8 @@ test_bpf(void)
return rc;
}
+#endif
+
REGISTER_TEST_COMMAND(bpf_autotes
Re: [PATCH v14 06/11] app/test: differentiate a strerror on different OS
2021-12-08 10:59 (UTC-0800), Jie Zhou: > On Windows, strerror returns just "Unknown error" for errnum greater > than MAX_ERRNO, while linux and freebsd returns "Unknown error ", > which is the current expectation for errno_autotest. Differentiate > the error string on Windows to remove a "duplicate error code" failure. > > Signed-off-by: Jie Zhou Acked-by: Dmitry Kozlyuk
Re: [PATCH v14 08/11] app/test: resolve name collision
2021-12-08 10:59 (UTC-0800), Jie Zhou: > Add OP_ prefix to resolve name collision to enable hash_perf test "name collision with Windows system headers" > > Signed-off-by: Jie Zhou Acked-by: Dmitry Kozlyuk
[PATCH] net/ice: fix error forwarding IPv6 VXLAN packet
In ice_txd_enable_offload(), when set tunnel packet Tx checksum
offload enable, td_offset should be set with outer l2/l3 len instead
of inner l2/l3 len.
This patch fix the bug that the checksum engine can forward tunnle
packets.
Fixes: 28f9002ab67f ("net/ice: add Tx AVX512 offload path")
Cc: sta...@dpdk.org
Signed-off-by: Kevin Liu
---
drivers/net/ice/ice_rxtx_vec_common.h | 52 +++
1 file changed, 37 insertions(+), 15 deletions(-)
diff --git a/drivers/net/ice/ice_rxtx_vec_common.h
b/drivers/net/ice/ice_rxtx_vec_common.h
index dfe60c81d9..8ff01046e1 100644
--- a/drivers/net/ice/ice_rxtx_vec_common.h
+++ b/drivers/net/ice/ice_rxtx_vec_common.h
@@ -364,23 +364,45 @@ ice_txd_enable_offload(struct rte_mbuf *tx_pkt,
uint32_t td_offset = 0;
/* Tx Checksum Offload */
- /* SET MACLEN */
- td_offset |= (tx_pkt->l2_len >> 1) <<
+ /*Tunnel package usage outer len enable L2/L3 checksum offload*/
+ if (ol_flags & RTE_MBUF_F_TX_TUNNEL_MASK) {
+ /* SET MACLEN */
+ td_offset |= (tx_pkt->outer_l2_len >> 1) <<
ICE_TX_DESC_LEN_MACLEN_S;
- /* Enable L3 checksum offload */
- if (ol_flags & RTE_MBUF_F_TX_IP_CKSUM) {
- td_cmd |= ICE_TX_DESC_CMD_IIPT_IPV4_CSUM;
- td_offset |= (tx_pkt->l3_len >> 2) <<
- ICE_TX_DESC_LEN_IPLEN_S;
- } else if (ol_flags & RTE_MBUF_F_TX_IPV4) {
- td_cmd |= ICE_TX_DESC_CMD_IIPT_IPV4;
- td_offset |= (tx_pkt->l3_len >> 2) <<
- ICE_TX_DESC_LEN_IPLEN_S;
- } else if (ol_flags & RTE_MBUF_F_TX_IPV6) {
- td_cmd |= ICE_TX_DESC_CMD_IIPT_IPV6;
- td_offset |= (tx_pkt->l3_len >> 2) <<
- ICE_TX_DESC_LEN_IPLEN_S;
+ /* Enable L3 checksum offload */
+ if (ol_flags & RTE_MBUF_F_TX_IP_CKSUM) {
+ td_cmd |= ICE_TX_DESC_CMD_IIPT_IPV4_CSUM;
+ td_offset |= (tx_pkt->outer_l3_len >> 2) <<
+ ICE_TX_DESC_LEN_IPLEN_S;
+ } else if (ol_flags & RTE_MBUF_F_TX_IPV4) {
+ td_cmd |= ICE_TX_DESC_CMD_IIPT_IPV4;
+ td_offset |= (tx_pkt->outer_l3_len >> 2) <<
+ ICE_TX_DESC_LEN_IPLEN_S;
+ } else if (ol_flags & RTE_MBUF_F_TX_IPV6) {
+ td_cmd |= ICE_TX_DESC_CMD_IIPT_IPV6;
+ td_offset |= (tx_pkt->outer_l3_len >> 2) <<
+ ICE_TX_DESC_LEN_IPLEN_S;
+ }
+ } else {
+ /* SET MACLEN */
+ td_offset |= (tx_pkt->l2_len >> 1) <<
+ ICE_TX_DESC_LEN_MACLEN_S;
+
+ /* Enable L3 checksum offload */
+ if (ol_flags & RTE_MBUF_F_TX_IP_CKSUM) {
+ td_cmd |= ICE_TX_DESC_CMD_IIPT_IPV4_CSUM;
+ td_offset |= (tx_pkt->l3_len >> 2) <<
+ ICE_TX_DESC_LEN_IPLEN_S;
+ } else if (ol_flags & RTE_MBUF_F_TX_IPV4) {
+ td_cmd |= ICE_TX_DESC_CMD_IIPT_IPV4;
+ td_offset |= (tx_pkt->l3_len >> 2) <<
+ ICE_TX_DESC_LEN_IPLEN_S;
+ } else if (ol_flags & RTE_MBUF_F_TX_IPV6) {
+ td_cmd |= ICE_TX_DESC_CMD_IIPT_IPV6;
+ td_offset |= (tx_pkt->l3_len >> 2) <<
+ ICE_TX_DESC_LEN_IPLEN_S;
+ }
}
/* Enable L4 checksum offloads */
--
2.25.1
Re: [PATCH v14 04/11] app/test: skip interrupt tests on Windows
On Thu, Dec 9, 2021 at 12:30 AM Jie Zhou wrote:
>
> Even though test_interrupts.c can compile on Windows, skip interrupt
> tests for now since majority of eal_interrupt on Windows are stubs.
> Will remove the skip after interrupt being fully enabled on Windows.
>
> Signed-off-by: Jie Zhou
> Acked-by: Dmitry Kozlyuk
>
> ---
> app/test/test_interrupts.c | 10 ++
> 1 file changed, 10 insertions(+)
>
> diff --git a/app/test/test_interrupts.c b/app/test/test_interrupts.c
> index 2a05399f96..eec9b2805b 100644
> --- a/app/test/test_interrupts.c
> +++ b/app/test/test_interrupts.c
> @@ -12,6 +12,15 @@
>
> #include "test.h"
>
> +#ifdef RTE_EXEC_ENV_WINDOWS
Across the series,
Instead of adding conditional compilation everywhere, Why not disable
specific file
for compilation for windows?
Purpose of EAL to abstract the differences in execution environment
and application
should not know that.
> +static int
> +test_interrupt(void)
> +{
> + printf("Interrupt on Windows is not fully supported yet, skipping
> test\n");
> + return TEST_SKIPPED;
> +}
> +#else
> +
> #define TEST_INTERRUPT_CHECK_INTERVAL 100 /* ms */
>
> /* predefined interrupt handle types */
> @@ -590,5 +599,6 @@ test_interrupt(void)
>
> return ret;
> }
> +#endif /*ifdef RTE_EXEC_ENV_WINDOWS*/
>
> REGISTER_TEST_COMMAND(interrupt_autotest, test_interrupt);
> --
> 2.31.0.vfs.0.1
>
