From patchwork Wed Jun 10 11:23:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fady Bader X-Patchwork-Id: 71132 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id BAD10A051A; Wed, 10 Jun 2020 13:23:46 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 751CA2E8F; Wed, 10 Jun 2020 13:23:40 +0200 (CEST) Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id 651382BF7 for ; Wed, 10 Jun 2020 13:23:37 +0200 (CEST) Received: from Internal Mail-Server by MTLPINE1 (envelope-from fady@mellanox.com) with SMTP; 10 Jun 2020 14:23:36 +0300 Received: from l-wincomp04-vm.labs.mlnx (l-wincomp04-vm.mtl.labs.mlnx [10.237.1.5]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id 05ABNXCA022477; Wed, 10 Jun 2020 14:23:36 +0300 From: Fady Bader To: dev@dpdk.org Cc: fady@mellanox.com, thomasm@mellanox.com, tbashar@mellanox.com, talshn@mellanox.com, yohadt@mellanox.com, dmitry.kozliuk@gmail.com, harini.ramakrishnan@microsoft.com, ocardona@microsoft.com, anand.rawat@intel.com, ranjit.menon@intel.com, olivier.matz@6wind.com Date: Wed, 10 Jun 2020 14:23:24 +0300 Message-Id: <20200610112326.18576-2-fady@mellanox.com> X-Mailer: git-send-email 2.16.1.windows.4 In-Reply-To: <20200610112326.18576-1-fady@mellanox.com> References: <20200610112326.18576-1-fady@mellanox.com> Subject: [dpdk-dev] [PATCH 1/3] net: fix s_addr redefinition in Windows X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 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" s_addr in Windows is defined in windows.h so its undefined in order to be defined as part of rte_ether_hdr. Signed-off-by: Fady Bader --- lib/librte_net/rte_ether.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/lib/librte_net/rte_ether.h b/lib/librte_net/rte_ether.h index 0ae4e75b6..f6e37d9e5 100644 --- a/lib/librte_net/rte_ether.h +++ b/lib/librte_net/rte_ether.h @@ -23,6 +23,15 @@ extern "C" { #include #include +/* + * s_addr in windows is defined in windows.h + * it is undefined here to be defined as part of rte_ether_hdr + */ +#ifdef RTE_EXEC_ENV_WINDOWS +#undef s_addr +#endif + + #define RTE_ETHER_ADDR_LEN 6 /**< Length of Ethernet address. */ #define RTE_ETHER_TYPE_LEN 2 /**< Length of Ethernet type field. */ #define RTE_ETHER_CRC_LEN 4 /**< Length of Ethernet CRC. */ From patchwork Wed Jun 10 11:23:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fady Bader X-Patchwork-Id: 71133 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id A2D60A051A; Wed, 10 Jun 2020 13:23:53 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id C1433375B; Wed, 10 Jun 2020 13:23:43 +0200 (CEST) Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id 26D95374C for ; Wed, 10 Jun 2020 13:23:42 +0200 (CEST) Received: from Internal Mail-Server by MTLPINE1 (envelope-from fady@mellanox.com) with SMTP; 10 Jun 2020 14:23:38 +0300 Received: from l-wincomp04-vm.labs.mlnx (l-wincomp04-vm.mtl.labs.mlnx [10.237.1.5]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id 05ABNXCB022477; Wed, 10 Jun 2020 14:23:38 +0300 From: Fady Bader To: dev@dpdk.org Cc: fady@mellanox.com, thomasm@mellanox.com, tbashar@mellanox.com, talshn@mellanox.com, yohadt@mellanox.com, dmitry.kozliuk@gmail.com, harini.ramakrishnan@microsoft.com, ocardona@microsoft.com, anand.rawat@intel.com, ranjit.menon@intel.com, olivier.matz@6wind.com Date: Wed, 10 Jun 2020 14:23:25 +0300 Message-Id: <20200610112326.18576-3-fady@mellanox.com> X-Mailer: git-send-email 2.16.1.windows.4 In-Reply-To: <20200610112326.18576-1-fady@mellanox.com> References: <20200610112326.18576-1-fady@mellanox.com> Subject: [dpdk-dev] [PATCH 2/3] net: add htons to minGW for Windows X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 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" htons wasnt defined in Windows for the minGW compiler. Definition of htons was added in order to use htons. Signed-off-by: Fady Bader --- lib/librte_eal/windows/include/rte_os.h | 4 ++++ lib/librte_net/rte_arp.c | 2 ++ 2 files changed, 6 insertions(+) diff --git a/lib/librte_eal/windows/include/rte_os.h b/lib/librte_eal/windows/include/rte_os.h index bab011a5c..95525123f 100644 --- a/lib/librte_eal/windows/include/rte_os.h +++ b/lib/librte_eal/windows/include/rte_os.h @@ -28,6 +28,10 @@ extern "C" { #define strerror_r(a, b, c) strerror_s(b, c, a) +#ifdef RTE_TOOLCHAIN_GCC +#define htons(x) (rte_cpu_to_be_16(x)) +#endif + /* strdup is deprecated in Microsoft libc and _strdup is preferred */ #define strdup(str) _strdup(str) diff --git a/lib/librte_net/rte_arp.c b/lib/librte_net/rte_arp.c index 784b7f48f..8fd431c54 100644 --- a/lib/librte_net/rte_arp.c +++ b/lib/librte_net/rte_arp.c @@ -2,7 +2,9 @@ * Copyright(c) 2018 Intel Corporation */ +#ifndef RTE_EXEC_ENV_WINDOWS #include +#endif #include From patchwork Wed Jun 10 11:23:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fady Bader X-Patchwork-Id: 71134 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 69E4DA051A; Wed, 10 Jun 2020 13:24:00 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id F13CF2E81; Wed, 10 Jun 2020 13:23:47 +0200 (CEST) Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id 2D54B2BE2 for ; Wed, 10 Jun 2020 13:23:47 +0200 (CEST) Received: from Internal Mail-Server by MTLPINE1 (envelope-from fady@mellanox.com) with SMTP; 10 Jun 2020 14:23:41 +0300 Received: from l-wincomp04-vm.labs.mlnx (l-wincomp04-vm.mtl.labs.mlnx [10.237.1.5]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id 05ABNXCC022477; Wed, 10 Jun 2020 14:23:41 +0300 From: Fady Bader To: dev@dpdk.org Cc: fady@mellanox.com, thomasm@mellanox.com, tbashar@mellanox.com, talshn@mellanox.com, yohadt@mellanox.com, dmitry.kozliuk@gmail.com, harini.ramakrishnan@microsoft.com, ocardona@microsoft.com, anand.rawat@intel.com, ranjit.menon@intel.com, olivier.matz@6wind.com Date: Wed, 10 Jun 2020 14:23:26 +0300 Message-Id: <20200610112326.18576-4-fady@mellanox.com> X-Mailer: git-send-email 2.16.1.windows.4 In-Reply-To: <20200610112326.18576-1-fady@mellanox.com> References: <20200610112326.18576-1-fady@mellanox.com> Subject: [dpdk-dev] [PATCH 3/3] eal/windows: librte_net build on Windows X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 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" librte_net wasn't compiling under Windows. To solve this, needed exports and files were added for Windows. Signed-off-by: Fady Bader --- lib/librte_eal/common/meson.build | 1 + lib/librte_eal/rte_eal_exports.def | 1 + lib/librte_eal/windows/include/netinet/in.h | 23 +++++++++++++++++++++++ lib/librte_eal/windows/include/netinet/ip.h | 9 +++++++++ lib/meson.build | 2 +- 5 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 lib/librte_eal/windows/include/netinet/in.h create mode 100644 lib/librte_eal/windows/include/netinet/ip.h diff --git a/lib/librte_eal/common/meson.build b/lib/librte_eal/common/meson.build index e1bdaf024..05e40a26b 100644 --- a/lib/librte_eal/common/meson.build +++ b/lib/librte_eal/common/meson.build @@ -28,6 +28,7 @@ if is_windows 'malloc_elem.c', 'malloc_heap.c', 'rte_malloc.c', + 'rte_random.c', ) subdir_done() endif diff --git a/lib/librte_eal/rte_eal_exports.def b/lib/librte_eal/rte_eal_exports.def index 1cbd00344..c04bfb01b 100644 --- a/lib/librte_eal/rte_eal_exports.def +++ b/lib/librte_eal/rte_eal_exports.def @@ -137,3 +137,4 @@ EXPORTS rte_mem_map rte_mem_page_size rte_mem_unmap + rte_rand diff --git a/lib/librte_eal/windows/include/netinet/in.h b/lib/librte_eal/windows/include/netinet/in.h new file mode 100644 index 000000000..6b38d9d73 --- /dev/null +++ b/lib/librte_eal/windows/include/netinet/in.h @@ -0,0 +1,23 @@ +/* SPDX-License-Identifier: BSD-3-Clause ++* Copyright 2020 Mellanox Technologies, Ltd */ + +#ifndef _IN_H_ +#define _IN_H_ + + +#define IPPROTO_IP 0 +#define IPPROTO_HOPOPTS 0 +#define IPPROTO_IPV4 4 /* IPv4 encapsulation */ +#define IPPROTO_IPIP IPPROTO_IPV4 /* for compatibility */ +#define IPPROTO_TCP 6 +#define IPPROTO_UDP 17 +#define IPPROTO_IPV6 41 /* IP6 header */ +#define IPPROTO_ROUTING 43 /* IP6 routing header */ +#define IPPROTO_FRAGMENT 44 /* IP6 fragmentation header */ +#define IPPROTO_GRE 47 /* General Routing Encap. */ +#define IPPROTO_ESP 50 /* IP6 Encap Sec. Payload */ +#define IPPROTO_AH 51 /* IP6 Auth Header */ +#define IPPROTO_NONE 59 /* IPv6 no next header */ +#define IPPROTO_DSTOPTS 60 /* IP6 destination option */ +#define IPPROTO_SCTP 132 /* Stream Control Transmission Protocol */ +#endif \ No newline at end of file diff --git a/lib/librte_eal/windows/include/netinet/ip.h b/lib/librte_eal/windows/include/netinet/ip.h new file mode 100644 index 000000000..d0c14d8c7 --- /dev/null +++ b/lib/librte_eal/windows/include/netinet/ip.h @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright 2020 Mellanox Technologies, Ltd */ + +#ifndef _IP_H_ +#define _IP_H_ + +#define IPVERSION 4 + +#endif \ No newline at end of file diff --git a/lib/meson.build b/lib/meson.build index 6d31641ba..22c9ab1fe 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -40,7 +40,7 @@ if is_windows 'kvargs', 'eal', 'ring', - 'mempool', 'pci', 'mbuf', + 'mempool', 'pci', 'mbuf', 'net', ] # only supported libraries for windows endif