[v1] net/ixgbe: Add support for Windows
Checks
Commit Message
This patch enables building the ixgbe driver for Windows.
It also enables its dependencies on security and cryptodev.
I tested on AWS using ixgbe VF device, using dpdk-testpmd.
Signed-off-by: William Tu <u9012063@gmail.com>
---
drivers/net/ixgbe/base/ixgbe_hv_vf.c | 1 +
drivers/net/ixgbe/base/ixgbe_osdep.h | 10 ++++++++++
drivers/net/ixgbe/ixgbe_ethdev.c | 2 +-
drivers/net/ixgbe/ixgbe_flow.c | 2 +-
drivers/net/ixgbe/ixgbe_tm.c | 2 +-
drivers/net/ixgbe/meson.build | 6 ------
lib/cryptodev/rte_cryptodev.c | 4 ++++
lib/cryptodev/version.map | 2 --
lib/meson.build | 2 ++
lib/security/rte_security.h | 4 ++++
lib/security/version.map | 1 -
11 files changed, 24 insertions(+), 12 deletions(-)
Comments
2021-09-15 18:44 (UTC+0000), William Tu:
> This patch enables building the ixgbe driver for Windows.
> It also enables its dependencies on security and cryptodev.
Tal Shnaiderman posted patches for cryptodev and security today,
so I won't comment on that part. IMO your patch should depend on them
(https://doc.dpdk.org/guides/contributing/patches.html#patch-dependencies).
[...]
> diff --git a/drivers/net/ixgbe/base/ixgbe_osdep.h b/drivers/net/ixgbe/base/ixgbe_osdep.h
> index cacf724198..fe28029ef7 100644
> --- a/drivers/net/ixgbe/base/ixgbe_osdep.h
> +++ b/drivers/net/ixgbe/base/ixgbe_osdep.h
> @@ -17,6 +17,12 @@
> #include <rte_byteorder.h>
> #include <rte_io.h>
>
> +#ifndef RTE_EXEC_ENV_WINDOWS
> +#include <netinet/in.h>
> +#else
> +#include <Ws2tcpip.h>
> +#endif
> +
#include <rte_ip.h> instead.
On Wed, Sep 15, 2021 at 12:05 PM Dmitry Kozlyuk
<dmitry.kozliuk@gmail.com> wrote:
>
> 2021-09-15 18:44 (UTC+0000), William Tu:
> > This patch enables building the ixgbe driver for Windows.
> > It also enables its dependencies on security and cryptodev.
>
> Tal Shnaiderman posted patches for cryptodev and security today,
> so I won't comment on that part. IMO your patch should depend on them
> (https://doc.dpdk.org/guides/contributing/patches.html#patch-dependencies).
>
> [...]
> > diff --git a/drivers/net/ixgbe/base/ixgbe_osdep.h b/drivers/net/ixgbe/base/ixgbe_osdep.h
> > index cacf724198..fe28029ef7 100644
> > --- a/drivers/net/ixgbe/base/ixgbe_osdep.h
> > +++ b/drivers/net/ixgbe/base/ixgbe_osdep.h
> > @@ -17,6 +17,12 @@
> > #include <rte_byteorder.h>
> > #include <rte_io.h>
> >
> > +#ifndef RTE_EXEC_ENV_WINDOWS
> > +#include <netinet/in.h>
> > +#else
> > +#include <Ws2tcpip.h>
> > +#endif
> > +
>
> #include <rte_ip.h> instead.
Hi Dmitry,
Thanks for your feedback.
I will send v2.
William
On Wed, Sep 15, 2021 at 12:05 PM Dmitry Kozlyuk
<dmitry.kozliuk@gmail.com> wrote:
>
> 2021-09-15 18:44 (UTC+0000), William Tu:
> > This patch enables building the ixgbe driver for Windows.
> > It also enables its dependencies on security and cryptodev.
>
> Tal Shnaiderman posted patches for cryptodev and security today,
> so I won't comment on that part. IMO your patch should depend on them
> (https://doc.dpdk.org/guides/contributing/patches.html#patch-dependencies).
>
Hi Dmitry,
I checked Tal's patch and actually there is no dependency.
Tal's patch is at driver/crypto,
https://inbox.dpdk.org/dev/20210914053833.7760-8-talshn@nvidia.com/T/
and this patch is enabling lib/cryptodev and lib/security
I will send v2 by breaking the ixgbe part and lib/security and cryptodev part.
Thanks,
William
2021-09-18 07:24 (UTC-0700), William Tu:
> On Wed, Sep 15, 2021 at 12:05 PM Dmitry Kozlyuk
> <dmitry.kozliuk@gmail.com> wrote:
> >
> > 2021-09-15 18:44 (UTC+0000), William Tu:
> > > This patch enables building the ixgbe driver for Windows.
> > > It also enables its dependencies on security and cryptodev.
> >
> > Tal Shnaiderman posted patches for cryptodev and security today,
> > so I won't comment on that part. IMO your patch should depend on them
> > (https://doc.dpdk.org/guides/contributing/patches.html#patch-dependencies).
> >
>
> Hi Dmitry,
>
> I checked Tal's patch and actually there is no dependency.
> Tal's patch is at driver/crypto,
> https://inbox.dpdk.org/dev/20210914053833.7760-8-talshn@nvidia.com/T/
> and this patch is enabling lib/cryptodev and lib/security
>
> I will send v2 by breaking the ixgbe part and lib/security and cryptodev part.
> Thanks,
> William
Hi William,
I meant these patches, not the patchset you linked:
1. Security: http://patchwork.dpdk.org/project/dpdk/list/?series=18943
2. Cryptodev: http://patchwork.dpdk.org/project/dpdk/list/?series=18880
On Sat, Sep 18, 2021 at 7:55 AM Dmitry Kozlyuk <dmitry.kozliuk@gmail.com> wrote:
>
> 2021-09-18 07:24 (UTC-0700), William Tu:
> > On Wed, Sep 15, 2021 at 12:05 PM Dmitry Kozlyuk
> > <dmitry.kozliuk@gmail.com> wrote:
> > >
> > > 2021-09-15 18:44 (UTC+0000), William Tu:
> > > > This patch enables building the ixgbe driver for Windows.
> > > > It also enables its dependencies on security and cryptodev.
> > >
> > > Tal Shnaiderman posted patches for cryptodev and security today,
> > > so I won't comment on that part. IMO your patch should depend on them
> > > (https://doc.dpdk.org/guides/contributing/patches.html#patch-dependencies).
> > >
> >
> > Hi Dmitry,
> >
> > I checked Tal's patch and actually there is no dependency.
> > Tal's patch is at driver/crypto,
> > https://inbox.dpdk.org/dev/20210914053833.7760-8-talshn@nvidia.com/T/
> > and this patch is enabling lib/cryptodev and lib/security
> >
> > I will send v2 by breaking the ixgbe part and lib/security and cryptodev part.
> > Thanks,
> > William
>
> Hi William,
>
> I meant these patches, not the patchset you linked:
>
> 1. Security: http://patchwork.dpdk.org/project/dpdk/list/?series=18943
> 2. Cryptodev: http://patchwork.dpdk.org/project/dpdk/list/?series=18880
You're right! Thank you
William
@@ -4,6 +4,7 @@
#include "ixgbe_vf.h"
#include "ixgbe_hv_vf.h"
+#include "ixgbe_osdep.h"
/**
* Hyper-V variant - just a stub.
@@ -17,6 +17,12 @@
#include <rte_byteorder.h>
#include <rte_io.h>
+#ifndef RTE_EXEC_ENV_WINDOWS
+#include <netinet/in.h>
+#else
+#include <Ws2tcpip.h>
+#endif
+
#include "../ixgbe_logs.h"
#include "../ixgbe_bypass_defines.h"
@@ -43,12 +49,16 @@
#define false 0
#define true 1
+#ifndef RTE_EXEC_ENV_WINDOWS
#define min(a,b) RTE_MIN(a,b)
+#endif
#define EWARN(hw, S, args...) DEBUGOUT1(S, ##args)
/* Bunch of defines for shared code bogosity */
+#ifndef UNREFERENCED_PARAMETER
#define UNREFERENCED_PARAMETER(_p)
+#endif
#define UNREFERENCED_1PARAMETER(_p)
#define UNREFERENCED_2PARAMETER(_p, _q)
#define UNREFERENCED_3PARAMETER(_p, _q, _r)
@@ -10,7 +10,6 @@
#include <unistd.h>
#include <stdarg.h>
#include <inttypes.h>
-#include <netinet/in.h>
#include <rte_string_fns.h>
#include <rte_byteorder.h>
#include <rte_common.h>
@@ -46,6 +45,7 @@
#include "ixgbe_rxtx.h"
#include "base/ixgbe_type.h"
#include "base/ixgbe_phy.h"
+#include "base/ixgbe_osdep.h"
#include "ixgbe_regs.h"
/*
@@ -10,7 +10,6 @@
#include <unistd.h>
#include <stdarg.h>
#include <inttypes.h>
-#include <netinet/in.h>
#include <rte_byteorder.h>
#include <rte_common.h>
#include <rte_cycles.h>
@@ -37,6 +36,7 @@
#include "base/ixgbe_api.h"
#include "base/ixgbe_vf.h"
#include "base/ixgbe_common.h"
+#include "base/ixgbe_osdep.h"
#include "ixgbe_ethdev.h"
#include "ixgbe_bypass.h"
#include "ixgbe_rxtx.h"
@@ -665,7 +665,7 @@ ixgbe_node_add(struct rte_eth_dev *dev, uint32_t node_id,
}
/* check level */
if (level_id != RTE_TM_NODE_LEVEL_ID_ANY &&
- level_id != parent_node_type + 1) {
+ level_id != (uint32_t)parent_node_type + 1) {
error->type = RTE_TM_ERROR_TYPE_NODE_PARAMS;
error->message = "Wrong level";
return -EINVAL;
@@ -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
-
cflags += ['-DRTE_LIBRTE_IXGBE_BYPASS']
subdir('base')
@@ -12,7 +12,11 @@
#include <errno.h>
#include <stdint.h>
#include <inttypes.h>
+#ifndef RTE_EXEC_ENV_WINDOWS
#include <netinet/in.h>
+#else
+#include <Ws2tcpip.h>
+#endif
#include <rte_byteorder.h>
#include <rte_log.h>
@@ -93,10 +93,8 @@ EXPERIMENTAL {
# added in 20.11
rte_cryptodev_configure_raw_dp_ctx;
rte_cryptodev_get_raw_dp_ctx_size;
- rte_cryptodev_raw_dequeue;
rte_cryptodev_raw_dequeue_burst;
rte_cryptodev_raw_dequeue_done;
- rte_cryptodev_raw_enqueue;
rte_cryptodev_raw_enqueue_burst;
rte_cryptodev_raw_enqueue_done;
@@ -85,6 +85,8 @@ if is_windows
'gso',
'latencystats',
'pdump',
+ 'cryptodev',
+ 'security',
] # only supported libraries for windows
endif
@@ -19,9 +19,13 @@ extern "C" {
#include <sys/types.h>
+#ifndef RTE_EXEC_ENV_WINDOWS
#include <netinet/in.h>
#include <netinet/ip.h>
#include <netinet/ip6.h>
+#else
+#include <Ws2tcpip.h>
+#endif
#include <rte_compat.h>
#include <rte_common.h>
@@ -1,7 +1,6 @@
DPDK_22 {
global:
- rte_security_attach_session;
rte_security_capabilities_get;
rte_security_capability_get;
rte_security_session_create;