From patchwork Thu Jul 23 07:08:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fady Bader X-Patchwork-Id: 74635 X-Patchwork-Delegate: thomas@monjalon.net 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 2B8CBA0527; Thu, 23 Jul 2020 09:09:01 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 4E6581BFFB; Thu, 23 Jul 2020 09:08:48 +0200 (CEST) Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id C7B9E1BFD9 for ; Thu, 23 Jul 2020 09:08:43 +0200 (CEST) Received: from Internal Mail-Server by MTLPINE1 (envelope-from fady@mellanox.com) with SMTP; 23 Jul 2020 10:08: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 06N78eGi027335; Thu, 23 Jul 2020 10:08:40 +0300 From: Fady Bader To: dev@dpdk.org Cc: thomas@monjalon.net, tbashar@mellanox.com, talshn@mellanox.com, yohadt@mellanox.com, dmitry.kozliuk@gmail.com, harini.ramakrishnan@microsoft.com, ocardona@microsoft.com, pallavi.kadam@intel.com, ranjit.menon@intel.com, olivier.matz@6wind.com Date: Thu, 23 Jul 2020 10:08:23 +0300 Message-Id: <20200723070825.6448-2-fady@mellanox.com> X-Mailer: git-send-email 2.16.1.windows.4 In-Reply-To: <20200723070825.6448-1-fady@mellanox.com> References: <20200610120040.17968-1-fady@mellanox.com> <20200723070825.6448-1-fady@mellanox.com> Subject: [dpdk-dev] [PATCH v4 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 defined winsock2.h which is included by 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 a358e88763..6690690b13 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 winsock2.h which is included by 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 Thu Jul 23 07:08: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: 74636 X-Patchwork-Delegate: thomas@monjalon.net 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 BCFA6A0527; Thu, 23 Jul 2020 09:09:09 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id C45C31C002; Thu, 23 Jul 2020 09:08:49 +0200 (CEST) Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id BF6451BF94 for ; Thu, 23 Jul 2020 09:08:43 +0200 (CEST) Received: from Internal Mail-Server by MTLPINE1 (envelope-from fady@mellanox.com) with SMTP; 23 Jul 2020 10:08: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 06N78eGj027335; Thu, 23 Jul 2020 10:08:41 +0300 From: Fady Bader To: dev@dpdk.org Cc: thomas@monjalon.net, tbashar@mellanox.com, talshn@mellanox.com, yohadt@mellanox.com, dmitry.kozliuk@gmail.com, harini.ramakrishnan@microsoft.com, ocardona@microsoft.com, pallavi.kadam@intel.com, ranjit.menon@intel.com, olivier.matz@6wind.com Date: Thu, 23 Jul 2020 10:08:24 +0300 Message-Id: <20200723070825.6448-3-fady@mellanox.com> X-Mailer: git-send-email 2.16.1.windows.4 In-Reply-To: <20200723070825.6448-1-fady@mellanox.com> References: <20200610120040.17968-1-fady@mellanox.com> <20200723070825.6448-1-fady@mellanox.com> Subject: [dpdk-dev] [PATCH v4 2/3] net: replace htons with RTE_BE16 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 wasn't defined in Windows for the minGW compiler. htons was replaced with RTE_BE16 in order to compile under Windows. Signed-off-by: Fady Bader --- lib/librte_net/rte_arp.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/lib/librte_net/rte_arp.c b/lib/librte_net/rte_arp.c index 784b7f48fa..5c1e27b8c0 100644 --- a/lib/librte_net/rte_arp.c +++ b/lib/librte_net/rte_arp.c @@ -2,9 +2,8 @@ * Copyright(c) 2018 Intel Corporation */ -#include - #include +#include #define RARP_PKT_SIZE 64 struct rte_mbuf * @@ -32,15 +31,15 @@ rte_net_make_rarp_packet(struct rte_mempool *mpool, /* Ethernet header. */ memset(eth_hdr->d_addr.addr_bytes, 0xff, RTE_ETHER_ADDR_LEN); rte_ether_addr_copy(mac, ð_hdr->s_addr); - eth_hdr->ether_type = htons(RTE_ETHER_TYPE_RARP); + eth_hdr->ether_type = RTE_BE16(RTE_ETHER_TYPE_RARP); /* RARP header. */ rarp = (struct rte_arp_hdr *)(eth_hdr + 1); - rarp->arp_hardware = htons(RTE_ARP_HRD_ETHER); - rarp->arp_protocol = htons(RTE_ETHER_TYPE_IPV4); + rarp->arp_hardware = RTE_BE16(RTE_ARP_HRD_ETHER); + rarp->arp_protocol = RTE_BE16(RTE_ETHER_TYPE_IPV4); rarp->arp_hlen = RTE_ETHER_ADDR_LEN; rarp->arp_plen = 4; - rarp->arp_opcode = htons(RTE_ARP_OP_REVREQUEST); + rarp->arp_opcode = RTE_BE16(RTE_ARP_OP_REVREQUEST); rte_ether_addr_copy(mac, &rarp->arp_data.arp_sha); rte_ether_addr_copy(mac, &rarp->arp_data.arp_tha); From patchwork Thu Jul 23 07:08: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: 74633 X-Patchwork-Delegate: thomas@monjalon.net 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 3B154A0527; Thu, 23 Jul 2020 09:08:46 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 77C3E1BF94; Thu, 23 Jul 2020 09:08:45 +0200 (CEST) Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id C362D1BFD7 for ; Thu, 23 Jul 2020 09:08:43 +0200 (CEST) Received: from Internal Mail-Server by MTLPINE1 (envelope-from fady@mellanox.com) with SMTP; 23 Jul 2020 10:08: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 06N78eGk027335; Thu, 23 Jul 2020 10:08:41 +0300 From: Fady Bader To: dev@dpdk.org Cc: thomas@monjalon.net, tbashar@mellanox.com, talshn@mellanox.com, yohadt@mellanox.com, dmitry.kozliuk@gmail.com, harini.ramakrishnan@microsoft.com, ocardona@microsoft.com, pallavi.kadam@intel.com, ranjit.menon@intel.com, olivier.matz@6wind.com Date: Thu, 23 Jul 2020 10:08:25 +0300 Message-Id: <20200723070825.6448-4-fady@mellanox.com> X-Mailer: git-send-email 2.16.1.windows.4 In-Reply-To: <20200723070825.6448-1-fady@mellanox.com> References: <20200610120040.17968-1-fady@mellanox.com> <20200723070825.6448-1-fady@mellanox.com> Subject: [dpdk-dev] [PATCH v4 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 header files were added. Signed-off-by: Fady Bader --- lib/librte_eal/windows/include/netinet/in.h | 23 +++++++++++++++++++++++ lib/librte_eal/windows/include/netinet/ip.h | 10 ++++++++++ lib/librte_net/rte_ether.c | 4 ++++ lib/meson.build | 2 +- 4 files changed, 38 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/windows/include/netinet/in.h b/lib/librte_eal/windows/include/netinet/in.h new file mode 100644 index 0000000000..2be25c8bea --- /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 /* Dummy for IP */ +#define IPPROTO_HOPOPTS 0 /* IPv6 Hop-by-Hop options */ +#define IPPROTO_IPIP 4 /* IPIP tunnels (for compatibility) */ +#define IPPROTO_TCP 6 /* Transmission Control Protocol */ +#define IPPROTO_UDP 17 /* User Datagram Protocol */ +#define IPPROTO_IPV6 41 /* IPv6 header */ +#define IPPROTO_ROUTING 43 /* IPv6 routing header */ +#define IPPROTO_FRAGMENT 44 /* IPv6 fragmentation header */ +#define IPPROTO_GRE 47 /* General Routing Encap */ +#define IPPROTO_ESP 50 /* IPsec Encap Sec. Payload */ +#define IPPROTO_AH 51 /* IPsec Auth Header */ +#define IPPROTO_NONE 59 /* IPv6 no next header */ +#define IPPROTO_DSTOPTS 60 /* IPv6 destination option */ +#define IPPROTO_SCTP 132 /* Stream Control Transmission Protocol */ + +#endif 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 0000000000..2126498797 --- /dev/null +++ b/lib/librte_eal/windows/include/netinet/ip.h @@ -0,0 +1,10 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright 2020 Mellanox Technologies, Ltd + */ + +#ifndef _IP_H_ +#define _IP_H_ + +#define IPVERSION 4 + +#endif diff --git a/lib/librte_net/rte_ether.c b/lib/librte_net/rte_ether.c index ced65ed9f3..6055ae1463 100644 --- a/lib/librte_net/rte_ether.c +++ b/lib/librte_net/rte_ether.c @@ -10,12 +10,16 @@ void rte_eth_random_addr(uint8_t *addr) { +#ifdef RTE_EXEC_ENV_WINDOWS + RTE_SET_USED(addr); /* random is not supported yet */ +#else uint64_t rand = rte_rand(); uint8_t *p = (uint8_t *)&rand; rte_memcpy(addr, p, RTE_ETHER_ADDR_LEN); addr[0] &= (uint8_t)~RTE_ETHER_GROUP_ADDR; /* clear multicast bit */ addr[0] |= RTE_ETHER_LOCAL_ADMIN_ADDR; /* set local assignment bit */ +#endif } void diff --git a/lib/meson.build b/lib/meson.build index 3852c01564..6bbaf242a9 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -40,7 +40,7 @@ if is_windows 'kvargs', 'eal', 'ring', - 'mempool', 'mbuf', 'pci', + 'mempool', 'mbuf', 'pci', 'net', ] # only supported libraries for windows endif