From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id E5783A0C47; Wed, 22 Sep 2021 23:02:13 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7F021411EC; Wed, 22 Sep 2021 23:02:13 +0200 (CEST) Received: from mail-lf1-f48.google.com (mail-lf1-f48.google.com [209.85.167.48]) by mails.dpdk.org (Postfix) with ESMTP id E8E2E411A8 for ; Wed, 22 Sep 2021 23:02:12 +0200 (CEST) Received: by mail-lf1-f48.google.com with SMTP id t10so17338629lfd.8 for ; Wed, 22 Sep 2021 14:02:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=JlbSsG7YuRU4Dv1rAWpyC+IiFthRAVWQBy5eZPgZzgc=; b=KEK0or5cT7wPj+dmRTaFg7iZRw8fJ1nwSZSIrYWghy2tNjo0zIWMVBCGeF+Wr1XzBn Icf+1kElv2q06EZN/xNnn+UPUhOXpZEhXrtsbiU3LM+4uHcRgbqRYWiYWZcryQAIQTix aPv7v+1cvMwXePwf4vhXvg2mdhI43MxlMR+kRHJp3hZJVsbI1gdighBNu43dzBRBjyxV x1AP5IaUGgn9OL5CqnBL8WZYmnyhdtxOjn0ZUmxNVshw8jYa43S8oRAqk0DdqWAFdCph va63+V01QoTtRksCgHeBbURoMplRGIuvZutscGPtzIfKCsp4UudcIlUNKOBhllG0ALr7 ObdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=JlbSsG7YuRU4Dv1rAWpyC+IiFthRAVWQBy5eZPgZzgc=; b=YOJ8215u4SQiklAH3JsJT9+nkKmMAWAPhFj/s9ELnDiE0RcjO06lNkZ46/9ioFhXlr hJerkQ/c7/Hhgj3DY9GCGLPxyqvhtDPmlGIznNsforip/N2Nu6ZaXP4Zul9bE8cDfqRD KS1WIJF8/J8xDU1nGcYZH1bEy8Ba1I7DiCrveUDYC1Da7rNnhQdABkz+Sl+hfgd2yo1l 1x5JpsmkOf2qyB3PrUiy5K/+DTshVcpnHlOTGLdJxw3Md0ZoaQpLCBfwIc7u2Mife4Ht HgurPvO25My/f773lDZV92EuZVmy+mbKWl22jcBiK44U3zRqf23nQDI00xF6IhKmAALu HGUA== X-Gm-Message-State: AOAM531/MOrtIaBMoYGKuGjJXVPVOIJBQqch2oWENi6ldhqp4Y3HpsC/ 2HsHP9HHHzVyQcKaDil+KW50SCk7p5hulFEVAd9cOWfM0iQ= X-Google-Smtp-Source: ABdhPJyur1cWm1KMdn7qv8nOohGNpNX4R9zXU1Z8BZP1TspTlrudhZi9dK9FMyBFcLjlZjy6XxhVK9Nx387vOdNJzUg= X-Received: by 2002:ac2:4d22:: with SMTP id h2mr887896lfk.429.1632344531925; Wed, 22 Sep 2021 14:02:11 -0700 (PDT) MIME-Version: 1.0 References: <20210915184448.92751-1-u9012063@gmail.com> <20210922205823.38073-1-u9012063@gmail.com> In-Reply-To: <20210922205823.38073-1-u9012063@gmail.com> From: William Tu Date: Wed, 22 Sep 2021 14:01:35 -0700 Message-ID: To: dpdk-dev Cc: Dmitry Kozliuk , Ranjit Menon , Pallavi Kadam Content-Type: text/plain; charset="UTF-8" Subject: Re: [dpdk-dev] [PATCH v2] net/ixgbe: Add support for Windows X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" I forgot to add the CC list. On Wed, Sep 22, 2021 at 1:58 PM William Tu wrote: > > This patch enables building the ixgbe driver for Windows. > It also enables its dependencies on security and cryptodev. > I tested on AWS using Intel Corporation 82599 Ethernet > Controller Virtual Function [8086:10ed], using dpdk-testpmd. > > Signed-off-by: William Tu > --- > Depends-on: series-18880 ("cryptodev: build on Windows") > Depends-on: series-18943 ("security: use the net library for IP structs") > > v2: > * add dependencies on cryptodev and security > * add #include , instead of doing > #ifndef RTE_EXEC_ENV_WINDOWS > #include > #else > #include > #endif > however, including rte_ip.h requires including another > set of dependent headers, see the > drivers/net/ixgbe/base/meson.build > --- > drivers/net/ixgbe/base/ixgbe_hv_vf.c | 1 + > drivers/net/ixgbe/base/ixgbe_osdep.h | 5 +++++ > drivers/net/ixgbe/base/meson.build | 7 +++++++ > 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 ------ > 7 files changed, 16 insertions(+), 9 deletions(-) > > diff --git a/drivers/net/ixgbe/base/ixgbe_hv_vf.c b/drivers/net/ixgbe/base/ixgbe_hv_vf.c > index b7ad44ab8c..4572411d39 100644 > --- a/drivers/net/ixgbe/base/ixgbe_hv_vf.c > +++ b/drivers/net/ixgbe/base/ixgbe_hv_vf.c > @@ -4,6 +4,7 @@ > > #include "ixgbe_vf.h" > #include "ixgbe_hv_vf.h" > +#include "ixgbe_osdep.h" > > /** > * Hyper-V variant - just a stub. > diff --git a/drivers/net/ixgbe/base/ixgbe_osdep.h b/drivers/net/ixgbe/base/ixgbe_osdep.h > index cacf724198..2c44e7bf35 100644 > --- a/drivers/net/ixgbe/base/ixgbe_osdep.h > +++ b/drivers/net/ixgbe/base/ixgbe_osdep.h > @@ -16,6 +16,7 @@ > #include > #include > #include > +#include > > #include "../ixgbe_logs.h" > #include "../ixgbe_bypass_defines.h" > @@ -43,12 +44,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) > diff --git a/drivers/net/ixgbe/base/meson.build b/drivers/net/ixgbe/base/meson.build > index 22972c6b56..51a58a3183 100644 > --- a/drivers/net/ixgbe/base/meson.build > +++ b/drivers/net/ixgbe/base/meson.build > @@ -28,7 +28,14 @@ foreach flag: error_cflags > endif > endforeach > > +inc = [] > +inc += include_directories('../../../../lib/net') > +inc += include_directories('../../../../lib/mbuf') > +inc += include_directories('../../../../lib/mempool') > +inc += include_directories('../../../../lib/ring') > + > base_lib = static_library('ixgbe_base', sources, > dependencies: static_rte_eal, > + include_directories: inc, > c_args: c_args) > base_objs = base_lib.extract_all_objects(recursive: true) > diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c > index 47693c0c47..8b33897ca1 100644 > --- a/drivers/net/ixgbe/ixgbe_ethdev.c > +++ b/drivers/net/ixgbe/ixgbe_ethdev.c > @@ -10,7 +10,6 @@ > #include > #include > #include > -#include > #include > #include > #include > @@ -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" > > /* > diff --git a/drivers/net/ixgbe/ixgbe_flow.c b/drivers/net/ixgbe/ixgbe_flow.c > index 511b612f7f..27322ab903 100644 > --- a/drivers/net/ixgbe/ixgbe_flow.c > +++ b/drivers/net/ixgbe/ixgbe_flow.c > @@ -10,7 +10,6 @@ > #include > #include > #include > -#include > #include > #include > #include > @@ -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" > diff --git a/drivers/net/ixgbe/ixgbe_tm.c b/drivers/net/ixgbe/ixgbe_tm.c > index a8407e742e..ae03ea6e9d 100644 > --- a/drivers/net/ixgbe/ixgbe_tm.c > +++ b/drivers/net/ixgbe/ixgbe_tm.c > @@ -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; > diff --git a/drivers/net/ixgbe/meson.build b/drivers/net/ixgbe/meson.build > index 55ac91fcd1..4b18e47273 100644 > --- a/drivers/net/ixgbe/meson.build > +++ b/drivers/net/ixgbe/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 > - > cflags += ['-DRTE_LIBRTE_IXGBE_BYPASS'] > > subdir('base') > -- > 2.30.2 >