From patchwork Thu Sep 10 23:50:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Monjalon X-Patchwork-Id: 77248 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 74DD1A04B5; Fri, 11 Sep 2020 01:50:48 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 593D01BFC3; Fri, 11 Sep 2020 01:50:48 +0200 (CEST) Received: from out3-smtp.messagingengine.com (out3-smtp.messagingengine.com [66.111.4.27]) by dpdk.org (Postfix) with ESMTP id 1FEDB1BFC3 for ; Fri, 11 Sep 2020 01:50:46 +0200 (CEST) Received: from compute7.internal (compute7.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id 6E8385C010D; Thu, 10 Sep 2020 19:50:45 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute7.internal (MEProxy); Thu, 10 Sep 2020 19:50:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm2; bh=P2b8BjwmN1OQz QdoaU+qnam5gkIkGQlwwPe4tkaDDxE=; b=M/lax9BDmzFYk5HWb6gFF5TY1H2wC 1aC8b15V2IA6VZh0443ArypfmocAOUZ3aaP+YxKb3t7rErzzE3gKs6K0DwAIYhtz tZwDjGZA0c5YvbEmcqwfEWDmECAyDS+P9JmwRnZiqcT/6Vzr8qLwrBj5DF1LrbUV jhfXG+p7+KsUPmtm3jJdRwOfENR35sts93wzdSEIBe4At6vo+unNVMrw6Z0G7OK0 m5BJra+2G7/t0IctgSSTg0crZDhoSzgwbT/+2R/la9vRLuZ72y6hWT8YoOXoV+Rn e2F31oNul7Ad8yHFeg/CjDX6RqSnV9pvzWetsLtHbAtZ5pMKvaE462Ncg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; bh=P2b8BjwmN1OQzQdoaU+qnam5gkIkGQlwwPe4tkaDDxE=; b=CEaZt099 HvSKqStbZvNPxn5IuaKG+P4Mt3LOldohfLg9RA0v0Zbyf3dP1suP7DpjLXhx7AWg rhkzZfsWsZwirhiXTqA06lAjRykgOPV7ZQPPV8MjbDmITnXaRXfKKu74A3EMj9cN 96F6C/zk6kaMVSx9f+8/gHBxcuTTovalqPRt9gmcyQgf8cugpR89AR1/LoWiptGi ++vp2rWv8pD2HWKI9oBjUP0LqDQLPDoqb99c2t19mjZP1autG/rEufNyG4630usD NQyslhsoXVy0zhDK7G0nyZFJJ1MmvtlLwecsInTLD+WY2zonqVgT7GWB1LXjVeaC uaHM2Z97+BAZjw== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduiedrudehkedgvdejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefvhhhomhgr shcuofhonhhjrghlohhnuceothhhohhmrghssehmohhnjhgrlhhonhdrnhgvtheqnecugg ftrfgrthhtvghrnhepvdehgfeivdejgedtveehfefhteelfefgieevgfffveefjeegtdfg uedthedtgeevnecukfhppeejjedrudefgedrvddtfedrudekgeenucevlhhushhtvghruf hiiigvpedunecurfgrrhgrmhepmhgrihhlfhhrohhmpehthhhomhgrshesmhhonhhjrghl ohhnrdhnvght X-ME-Proxy: Received: from xps.monjalon.net (184.203.134.77.rev.sfr.net [77.134.203.184]) by mail.messagingengine.com (Postfix) with ESMTPA id 0A1C03064683; Thu, 10 Sep 2020 19:50:43 -0400 (EDT) From: Thomas Monjalon To: dev@dpdk.org Cc: david.marchand@redhat.com, bruce.richardson@intel.com, Fady Bader , Narcisa Vasile , Dmitry Kozlyuk , Ranjit Menon , Dmitry Malloy , Pallavi Kadam , Harman Kalra Date: Fri, 11 Sep 2020 01:50:01 +0200 Message-Id: <20200910235005.2420342-2-thomas@monjalon.net> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200910235005.2420342-1-thomas@monjalon.net> References: <20200625133038.25180-1-fady@mellanox.com> <20200910235005.2420342-1-thomas@monjalon.net> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v6 1/5] eal/windows: add stub for Rx interrupt control 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" From: Fady Bader Interrupts are not implemented for Windows. In order to compile ethdev on Windows, an empty interrupt control function stub has to be added for Windows. Signed-off-by: Fady Bader Acked-by: Narcisa Vasile Acked-by: Dmitry Kozlyuk Acked-by: Ranjit Menon Signed-off-by: Thomas Monjalon --- lib/librte_eal/rte_eal_exports.def | 1 + lib/librte_eal/windows/eal_interrupts.c | 13 +++++++++++++ lib/librte_eal/windows/meson.build | 1 + 3 files changed, 15 insertions(+) create mode 100644 lib/librte_eal/windows/eal_interrupts.c diff --git a/lib/librte_eal/rte_eal_exports.def b/lib/librte_eal/rte_eal_exports.def index f54ed74a58..1d4d3fb365 100644 --- a/lib/librte_eal/rte_eal_exports.def +++ b/lib/librte_eal/rte_eal_exports.def @@ -30,6 +30,7 @@ EXPORTS rte_eal_using_phys_addrs rte_free rte_hexdump + rte_intr_rx_ctl rte_log_register rte_log_register_type_and_pick_level rte_log_set_level diff --git a/lib/librte_eal/windows/eal_interrupts.c b/lib/librte_eal/windows/eal_interrupts.c new file mode 100644 index 0000000000..d3ecdaccbc --- /dev/null +++ b/lib/librte_eal/windows/eal_interrupts.c @@ -0,0 +1,13 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright 2020 Mellanox Technologies, Ltd + */ + +#include + +int +rte_intr_rx_ctl(__rte_unused struct rte_intr_handle *intr_handle, + __rte_unused int epfd, __rte_unused int op, + __rte_unused unsigned int vec, __rte_unused void *data) +{ + return -ENOTSUP; +} diff --git a/lib/librte_eal/windows/meson.build b/lib/librte_eal/windows/meson.build index 08c888e018..b690bc6b0a 100644 --- a/lib/librte_eal/windows/meson.build +++ b/lib/librte_eal/windows/meson.build @@ -8,6 +8,7 @@ sources += files( 'eal_debug.c', 'eal_file.c', 'eal_hugepages.c', + 'eal_interrupts.c', 'eal_lcore.c', 'eal_log.c', 'eal_memalloc.c', From patchwork Thu Sep 10 23:50:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Monjalon X-Patchwork-Id: 77249 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 51ED6A04B5; Fri, 11 Sep 2020 01:50:55 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 9D4D01C0D1; Fri, 11 Sep 2020 01:50:51 +0200 (CEST) Received: from out3-smtp.messagingengine.com (out3-smtp.messagingengine.com [66.111.4.27]) by dpdk.org (Postfix) with ESMTP id DFF601C0CC for ; Fri, 11 Sep 2020 01:50:50 +0200 (CEST) Received: from compute7.internal (compute7.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id 84E875C00A1; Thu, 10 Sep 2020 19:50:50 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute7.internal (MEProxy); Thu, 10 Sep 2020 19:50:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm2; bh=uIL0uNHWnidG7 V/YBKmWba7p084TCT4R/3J/p2PGWe0=; b=mIx9br8P4Hw/P9Aujuh0QkR4E/0vn LS6q4VP9Ew7JbtUbTItEwPmNeT3iUyXSiUTHI0AgrqStr5WMgY4bwBRhoD0Q7+4j rw3Q6VLHUIB2WLqr82sYhzFUb4smmqNlCqQE6G4EKxLOeD2U0cyvUmZuxPKeTtyt zRyV1k63gcotZkjlCeMzlSXFWtX4gN9SIN1Jr6mFYbXHlXkN3FERiocfp/YU0HGe /nodceD0TXxRqUX5913MkIdl2v3rg/f1xBsZ6wsVPyxPlSqvdbsUjy90bRARmjv8 9RIV4gYAFjjBIj68tGsL3rt/VOoyP0/tUyzvESEza/JvAQtYB7oQm9/2A== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; bh=uIL0uNHWnidG7V/YBKmWba7p084TCT4R/3J/p2PGWe0=; b=m5EpM1DB pRS/eaYwI0hqDN1wwBQK/SznUr39aISaUTI1SQQtt+GdbKhDYNjN25MTfe9HcKa6 WHat6UKGEpKO1pKn+Vk8IJloQFxf/1bbHbUHlbgrIyIBJy7qkWhvPphMkIF+o5TQ frVVsVcQquvnmfPiuwZgR4N67Ez5YlgrsQJP/sjOjcQm1tT/hpFF5P7MyZwjUvG+ 5KtIdS09cZ9uagnyNYK5CDtR93GWDdCt2n/curB65H3RvJmxoyei05MWaDBy4Dsa v7hptf25QThHMeByvFAgwgRReOuSv8+eqTW3RxE02i9JNcHSVYcV+1MU3XeThpqY dKXorhrOKa9Rdg== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduiedrudehkedgvdejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefvhhhomhgr shcuofhonhhjrghlohhnuceothhhohhmrghssehmohhnjhgrlhhonhdrnhgvtheqnecugg ftrfgrthhtvghrnhepvdehgfeivdejgedtveehfefhteelfefgieevgfffveefjeegtdfg uedthedtgeevnecukfhppeejjedrudefgedrvddtfedrudekgeenucevlhhushhtvghruf hiiigvpedvnecurfgrrhgrmhepmhgrihhlfhhrohhmpehthhhomhgrshesmhhonhhjrghl ohhnrdhnvght X-ME-Proxy: Received: from xps.monjalon.net (184.203.134.77.rev.sfr.net [77.134.203.184]) by mail.messagingengine.com (Postfix) with ESMTPA id 5DB70306467D; Thu, 10 Sep 2020 19:50:49 -0400 (EDT) From: Thomas Monjalon To: dev@dpdk.org Cc: david.marchand@redhat.com, bruce.richardson@intel.com, Fady Bader , Narcisa Vasile , Dmitry Kozlyuk , Ranjit Menon , Dmitry Malloy , Pallavi Kadam Date: Fri, 11 Sep 2020 01:50:02 +0200 Message-Id: <20200910235005.2420342-3-thomas@monjalon.net> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200910235005.2420342-1-thomas@monjalon.net> References: <20200625133038.25180-1-fady@mellanox.com> <20200910235005.2420342-1-thomas@monjalon.net> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v6 2/5] eal/windows: update symbols export 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" From: Fady Bader The .def file is a reduced copy of the .map file. In order to ease comparison, some lines are moved in the .def file to be in the same order as in the .map file. rte_eal_get_configuration is removed because it has been removed from the .map file in DPDK 19.11. Note: it had been removed and re-added by mistake in 20.08 .def file. Few functions are added in the .def file to allow ethdev on Windows. Signed-off-by: Fady Bader Acked-by: Narcisa Vasile Acked-by: Dmitry Kozlyuk Acked-by: Ranjit Menon Signed-off-by: Thomas Monjalon --- lib/librte_eal/rte_eal_exports.def | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/lib/librte_eal/rte_eal_exports.def b/lib/librte_eal/rte_eal_exports.def index 1d4d3fb365..cda3e0c79f 100644 --- a/lib/librte_eal/rte_eal_exports.def +++ b/lib/librte_eal/rte_eal_exports.def @@ -1,20 +1,16 @@ EXPORTS __rte_panic - __rte_trace_mem_per_thread_alloc - __rte_trace_point_emit_field - __rte_trace_point_register per_lcore__lcore_id per_lcore__rte_errno - per_lcore_trace_mem - per_lcore_trace_point_sz + per_lcore__thread_id + rte_bus_register rte_calloc rte_calloc_socket - rte_bus_register rte_dev_is_probed rte_devargs_insert rte_devargs_next + rte_devargs_parse rte_devargs_remove - rte_eal_get_configuration rte_eal_has_hugepages rte_eal_has_pci rte_eal_init @@ -29,10 +25,10 @@ EXPORTS rte_eal_tailq_register rte_eal_using_phys_addrs rte_free + rte_get_tsc_hz rte_hexdump rte_intr_rx_ctl rte_log_register - rte_log_register_type_and_pick_level rte_log_set_level rte_malloc rte_malloc_dump_stats @@ -65,6 +61,7 @@ EXPORTS rte_memzone_reserve_aligned rte_memzone_reserve_bounded rte_memzone_walk + rte_socket_id rte_strerror rte_strsplit rte_sys_gettid @@ -97,6 +94,7 @@ EXPORTS rte_fbarray_is_used rte_fbarray_set_free rte_fbarray_set_used + rte_log_register_type_and_pick_level rte_malloc_dump_heaps rte_mem_alloc_validator_register rte_mem_alloc_validator_unregister @@ -112,6 +110,8 @@ EXPORTS rte_mp_request_async rte_mp_request_sync + rte_class_find_by_name + rte_class_register; rte_fbarray_find_prev_free rte_fbarray_find_prev_n_free rte_fbarray_find_prev_n_used @@ -146,6 +146,11 @@ EXPORTS rte_fbarray_find_biggest_used rte_fbarray_find_rev_biggest_free rte_fbarray_find_rev_biggest_used + __rte_trace_mem_per_thread_alloc + __rte_trace_point_emit_field + __rte_trace_point_register + per_lcore_trace_mem + per_lcore_trace_point_sz rte_mem_lock rte_mem_map From patchwork Thu Sep 10 23:50:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Monjalon X-Patchwork-Id: 77250 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 1DF81A04B5; Fri, 11 Sep 2020 01:51:03 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E45671C0D8; Fri, 11 Sep 2020 01:51:00 +0200 (CEST) Received: from out3-smtp.messagingengine.com (out3-smtp.messagingengine.com [66.111.4.27]) by dpdk.org (Postfix) with ESMTP id 2A2191C0D8 for ; Fri, 11 Sep 2020 01:51:00 +0200 (CEST) Received: from compute7.internal (compute7.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id D09A25C00E3; Thu, 10 Sep 2020 19:50:59 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute7.internal (MEProxy); Thu, 10 Sep 2020 19:50:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm2; bh=C7dp9Q/rg7pvV ikyJAlkoo4xGzB9DpeWT7c1DhiXl7Q=; b=CqBmSRRSkCgiV+pBLciPIIW0gV0Vf JzbdxDIQnp/9NoleJ8SCffAvTCNuLu/ijgC3PK9pBrJvEzrd9X8uJF2/HdnlODX0 hgw/jmbbDiEFC+37UwUUYDP+dWooZv94Df2xeiBNfoa4RwYeJbEScGmEd68/BJTN 9yoSFS0wUXGGWs/r3RfZKU9XA/ni6mcikFTTgG5iqBaTR6hxJ7H0UiwnrmCayf1/ iXfI2rZqcjTkxGYezWYyBKf5FqKte49VkV7RadqW+GI/6Eg2n1wJzur+xpwCKwLF hkTfUKWDVsq5Q4wfr0eojkJmMp7IdcY1yGrFPmU9eQKgvsIKnO6jXUd6Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; bh=C7dp9Q/rg7pvVikyJAlkoo4xGzB9DpeWT7c1DhiXl7Q=; b=bU9YJW4d qmB6U/w4Oh0KOpB3dFnIFTvrW6bSbW1GIzqtsWkvpj0HNaC0qmxUcRUu4T/tkzpz ITKdaxsEt+I7YNGst0ZBt072pB55YhqKV3+ejXj/ZlzD3D51QVuTv8ERT0GNDzHV wkkOZjxkJ7PEQ3l3dJt4d6dPo0mCJI/Q4PwZQL6PGzilXMpMS3TcfUU87dT/FnI7 B2jEQdDLFI4rYRzW4ACsYzPJYRBzjof59DTQTtxP5YNPVgeAcm1j5eBsRmgDayxx 5JLSs7Haaxj+GDe1LB8v82aNKsHOMHbN3Dbn4DC9Nn74HozRp13O4dWYSUFMdzyB IMuf1glPXINm4g== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduiedrudehkedgvdejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefvhhhomhgr shcuofhonhhjrghlohhnuceothhhohhmrghssehmohhnjhgrlhhonhdrnhgvtheqnecugg ftrfgrthhtvghrnhepvdehgfeivdejgedtveehfefhteelfefgieevgfffveefjeegtdfg uedthedtgeevnecukfhppeejjedrudefgedrvddtfedrudekgeenucevlhhushhtvghruf hiiigvpeefnecurfgrrhgrmhepmhgrihhlfhhrohhmpehthhhomhgrshesmhhonhhjrghl ohhnrdhnvght X-ME-Proxy: Received: from xps.monjalon.net (184.203.134.77.rev.sfr.net [77.134.203.184]) by mail.messagingengine.com (Postfix) with ESMTPA id AC090306467D; Thu, 10 Sep 2020 19:50:58 -0400 (EDT) From: Thomas Monjalon To: dev@dpdk.org Cc: david.marchand@redhat.com, bruce.richardson@intel.com, Fady Bader , Narcisa Vasile , Dmitry Kozlyuk , Ranjit Menon , Kevin Laatz Date: Fri, 11 Sep 2020 01:50:03 +0200 Message-Id: <20200910235005.2420342-4-thomas@monjalon.net> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200910235005.2420342-1-thomas@monjalon.net> References: <20200625133038.25180-1-fady@mellanox.com> <20200910235005.2420342-1-thomas@monjalon.net> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v6 3/5] telemetry: build stubs 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" From: Fady Bader Telemetry didn't compile under Windows. Empty stubs are arranged, waiting for a proper implementation. Signed-off-by: Fady Bader Acked-by: Narcisa Vasile Acked-by: Dmitry Kozlyuk Acked-by: Ranjit Menon Signed-off-by: Thomas Monjalon --- lib/librte_telemetry/rte_telemetry.h | 1 + lib/librte_telemetry/telemetry.c | 22 ++++++++++++++++++++++ lib/librte_telemetry/telemetry_legacy.c | 11 ++++++++++- lib/meson.build | 1 + 4 files changed, 34 insertions(+), 1 deletion(-) diff --git a/lib/librte_telemetry/rte_telemetry.h b/lib/librte_telemetry/rte_telemetry.h index d13010b8fb..deac2e71ca 100644 --- a/lib/librte_telemetry/rte_telemetry.h +++ b/lib/librte_telemetry/rte_telemetry.h @@ -3,6 +3,7 @@ */ #include +#include #include #ifndef _RTE_TELEMETRY_H_ diff --git a/lib/librte_telemetry/telemetry.c b/lib/librte_telemetry/telemetry.c index 0252282735..51e7ceeb1b 100644 --- a/lib/librte_telemetry/telemetry.c +++ b/lib/librte_telemetry/telemetry.c @@ -2,11 +2,13 @@ * Copyright(c) 2020 Intel Corporation */ +#ifndef RTE_EXEC_ENV_WINDOWS #include #include #include #include #include +#endif /* !RTE_EXEC_ENV_WINDOWS */ /* we won't link against libbsd, so just always use DPDKs-specific strlcpy */ #undef RTE_USE_LIBBSD @@ -25,8 +27,10 @@ #define MAX_OUTPUT_LEN (1024 * 16) #define MAX_CONNECTIONS 10 +#ifndef RTE_EXEC_ENV_WINDOWS static void * client_handler(void *socket); +#endif /* !RTE_EXEC_ENV_WINDOWS */ struct cmd_callback { char cmd[MAX_CMD_LEN]; @@ -34,6 +38,7 @@ struct cmd_callback { char help[MAX_HELP_LEN]; }; +#ifndef RTE_EXEC_ENV_WINDOWS struct socket { int sock; char path[sizeof(((struct sockaddr_un *)0)->sun_path)]; @@ -42,13 +47,16 @@ struct socket { }; static struct socket v2_socket; /* socket for v2 telemetry */ static struct socket v1_socket; /* socket for v1 telemetry */ +#endif /* !RTE_EXEC_ENV_WINDOWS */ static char telemetry_log_error[1024]; /* Will contain error on init failure */ /* list of command callbacks, with one command registered by default */ static struct cmd_callback callbacks[TELEMETRY_MAX_CALLBACKS]; static int num_callbacks; /* How many commands are registered */ /* Used when accessing or modifying list of command callbacks */ static rte_spinlock_t callback_sl = RTE_SPINLOCK_INITIALIZER; +#ifndef RTE_EXEC_ENV_WINDOWS static uint16_t v2_clients; +#endif /* !RTE_EXEC_ENV_WINDOWS */ int rte_telemetry_register_cmd(const char *cmd, telemetry_cb fn, const char *help) @@ -78,6 +86,8 @@ rte_telemetry_register_cmd(const char *cmd, telemetry_cb fn, const char *help) return 0; } +#ifndef RTE_EXEC_ENV_WINDOWS + static int list_commands(const char *cmd __rte_unused, const char *params __rte_unused, struct rte_tel_data *d) @@ -412,10 +422,13 @@ telemetry_v2_init(const char *runtime_dir, rte_cpuset_t *cpuset) return 0; } +#endif /* !RTE_EXEC_ENV_WINDOWS */ + int32_t rte_telemetry_init(const char *runtime_dir, rte_cpuset_t *cpuset, const char **err_str) { +#ifndef RTE_EXEC_ENV_WINDOWS if (telemetry_v2_init(runtime_dir, cpuset) != 0) { *err_str = telemetry_log_error; return -1; @@ -423,5 +436,14 @@ rte_telemetry_init(const char *runtime_dir, rte_cpuset_t *cpuset, if (telemetry_legacy_init(runtime_dir, cpuset) != 0) { *err_str = telemetry_log_error; } +#else /* RTE_EXEC_ENV_WINDOWS */ + RTE_SET_USED(runtime_dir); + RTE_SET_USED(cpuset); + RTE_SET_USED(err_str); + + snprintf(telemetry_log_error, sizeof(telemetry_log_error), + "DPDK Telemetry is not supported on Windows."); +#endif /* RTE_EXEC_ENV_WINDOWS */ + return 0; } diff --git a/lib/librte_telemetry/telemetry_legacy.c b/lib/librte_telemetry/telemetry_legacy.c index a341fe4ebd..b8e424041c 100644 --- a/lib/librte_telemetry/telemetry_legacy.c +++ b/lib/librte_telemetry/telemetry_legacy.c @@ -2,10 +2,12 @@ * Copyright(c) 2020 Intel Corporation */ +#ifndef RTE_EXEC_ENV_WINDOWS #include #include #include #include +#endif /* !RTE_EXEC_ENV_WINDOWS */ /* we won't link against libbsd, so just always use DPDKs-specific strlcpy */ #undef RTE_USE_LIBBSD @@ -24,7 +26,6 @@ #define DATA_REQ_LABEL "\"data\":" #define TELEMETRY_LEGACY_MAX_CALLBACKS 4 - static int register_client(const char *cmd __rte_unused, const char *params __rte_unused, @@ -77,15 +78,18 @@ static int register_client(const char *cmd __rte_unused, const char *params, char *buffer __rte_unused, int buf_len __rte_unused) { +#ifndef RTE_EXEC_ENV_WINDOWS pthread_t th; char data[BUF_SIZE]; int fd; struct sockaddr_un addrs; +#endif /* !RTE_EXEC_ENV_WINDOWS */ if (!strchr(params, ':')) { fprintf(stderr, "Invalid data\n"); return -1; } +#ifndef RTE_EXEC_ENV_WINDOWS strlcpy(data, strchr(params, ':'), sizeof(data)); memcpy(data, &data[strlen(":\"")], strlen(data)); if (!strchr(data, '\"')) { @@ -109,9 +113,12 @@ register_client(const char *cmd __rte_unused, const char *params, } pthread_create(&th, NULL, &legacy_client_handler, (void *)(uintptr_t)fd); +#endif /* !RTE_EXEC_ENV_WINDOWS */ return 0; } +#ifndef RTE_EXEC_ENV_WINDOWS + static int send_error_response(int s, int err) { @@ -239,3 +246,5 @@ legacy_client_handler(void *sock_id) close(s); return NULL; } + +#endif /* !RTE_EXEC_ENV_WINDOWS */ diff --git a/lib/meson.build b/lib/meson.build index 283ee6c505..eb0cd9090a 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -38,6 +38,7 @@ libraries = [ if is_windows libraries = [ 'kvargs', + 'telemetry', 'eal', 'ring', 'mempool', 'mbuf', 'net', 'pci', From patchwork Thu Sep 10 23:50:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Monjalon X-Patchwork-Id: 77251 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 B864BA04B5; Fri, 11 Sep 2020 01:51:11 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 542331C10E; Fri, 11 Sep 2020 01:51:05 +0200 (CEST) Received: from new2-smtp.messagingengine.com (new2-smtp.messagingengine.com [66.111.4.224]) by dpdk.org (Postfix) with ESMTP id CD0BB1C10B for ; Fri, 11 Sep 2020 01:51:03 +0200 (CEST) Received: from compute7.internal (compute7.nyi.internal [10.202.2.47]) by mailnew.nyi.internal (Postfix) with ESMTP id 571CF5804F8; Thu, 10 Sep 2020 19:51:03 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute7.internal (MEProxy); Thu, 10 Sep 2020 19:51:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm2; bh=R8OQxLQxu2YxO utqqfdMael43C3a5Jr1Nf/QSxSqHfQ=; b=rnV1Y4IGszDFYuko4SC0Y0ormXrtD SHUSksag+YEI6e6MCW/jmPMT4BqHdYq+AU1YN2mHbdrk156ENOhmzzcfW27pLMsR 3Goz2Tfnz1yT4N6wSByGzN86g71VVRLhoaTlJhQWnMcSvRWfhvsCgPdi7L2G3ncj czpwasQZXW/DYfPKdisio2bxudZWDDfqS2kcKhHH8a795mBtY7CF+IkAk/HEDe5U 0PBDuFPFDecHxTmhTbHZ5TjBjyqUBuMT4HpLH7mXSzY0BRUOs13D8zrA6wjNv26p Qn7woOz7D4a3RI7DF1MNlRb/22L2gNHlCBtyarRWcJKL12B7MeYRyrrPA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; bh=R8OQxLQxu2YxOutqqfdMael43C3a5Jr1Nf/QSxSqHfQ=; b=nTA1vl09 ToCU4E7C00NMgeKsz3EjG/zxTuevnpS9jOH6MHL91xI6/LUgv8Og3spVIMBgDZae /mX0xy1hI9VAYCLqiRhM9Od3WTFzL+z8g8u13AWI12lGHdUfTLXLnyuGxA1ieBFh d338PBYt2FsTypTicWdG03SaDuIOH8BTwxaNVmUvgWPdMP0gd1xZR+rFHtuKCcEi A2L36g2WN1yeglodn0CQlXYMZTFvl/+co9U2krD25lR9V8x6r6E9smJPE2CDjT7H YRCPlXdNClSrsqbO0TB4m4rjPDAkbgFH1GYmBP2cFif9PJeUBXsLbNe17eWBVfr2 yIGWm8ccQURpxQ== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduiedrudehkedgvdejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefvhhhomhgr shcuofhonhhjrghlohhnuceothhhohhmrghssehmohhnjhgrlhhonhdrnhgvtheqnecugg ftrfgrthhtvghrnhepvdehgfeivdejgedtveehfefhteelfefgieevgfffveefjeegtdfg uedthedtgeevnecukfhppeejjedrudefgedrvddtfedrudekgeenucevlhhushhtvghruf hiiigvpeegnecurfgrrhgrmhepmhgrihhlfhhrohhmpehthhhomhgrshesmhhonhhjrghl ohhnrdhnvght X-ME-Proxy: Received: from xps.monjalon.net (184.203.134.77.rev.sfr.net [77.134.203.184]) by mail.messagingengine.com (Postfix) with ESMTPA id 16CF8306467E; Thu, 10 Sep 2020 19:51:01 -0400 (EDT) From: Thomas Monjalon To: dev@dpdk.org Cc: david.marchand@redhat.com, bruce.richardson@intel.com, Fady Bader , Narcisa Vasile , Dmitry Kozlyuk , Ranjit Menon , Ray Kinsella , Neil Horman , Ferruh Yigit , Andrew Rybchenko Date: Fri, 11 Sep 2020 01:50:04 +0200 Message-Id: <20200910235005.2420342-5-thomas@monjalon.net> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200910235005.2420342-1-thomas@monjalon.net> References: <20200625133038.25180-1-fady@mellanox.com> <20200910235005.2420342-1-thomas@monjalon.net> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v6 4/5] ethdev: remove structs from export map 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" From: Fady Bader Some ethdev structs were present in .map export list. There structs are removed from the .map file. Signed-off-by: Fady Bader Acked-by: Narcisa Vasile Acked-by: Dmitry Kozlyuk Acked-by: Ranjit Menon Acked-by: Thomas Monjalon --- lib/librte_ethdev/rte_ethdev_version.map | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/librte_ethdev/rte_ethdev_version.map b/lib/librte_ethdev/rte_ethdev_version.map index 8d9d6b1c67..02081d9de9 100644 --- a/lib/librte_ethdev/rte_ethdev_version.map +++ b/lib/librte_ethdev/rte_ethdev_version.map @@ -89,7 +89,6 @@ DPDK_21 { rte_eth_iterator_next; rte_eth_led_off; rte_eth_led_on; - rte_eth_link; rte_eth_link_get; rte_eth_link_get_nowait; rte_eth_macaddr_get; @@ -104,7 +103,6 @@ DPDK_21 { rte_eth_rx_queue_setup; rte_eth_set_queue_rate_limit; rte_eth_speed_bitflag; - rte_eth_stats; rte_eth_stats_get; rte_eth_stats_reset; rte_eth_timesync_adjust_time; From patchwork Thu Sep 10 23:50:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Monjalon X-Patchwork-Id: 77252 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 D508EA04B6; Fri, 11 Sep 2020 01:51:19 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E49AC1C114; Fri, 11 Sep 2020 01:51:06 +0200 (CEST) Received: from out3-smtp.messagingengine.com (out3-smtp.messagingengine.com [66.111.4.27]) by dpdk.org (Postfix) with ESMTP id 36E561C10C for ; Fri, 11 Sep 2020 01:51:05 +0200 (CEST) Received: from compute7.internal (compute7.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id D31215C010C; Thu, 10 Sep 2020 19:51:04 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute7.internal (MEProxy); Thu, 10 Sep 2020 19:51:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm2; bh=UGdtrsfObkZ4D IdnF66nxg88vK486yjXSQXRHtNvXCs=; b=KpsXo7uXiLEWPX3lhYlS2ptHH6X7O OSwMc78Cwfg9UTJreDaYfhGcZwSo0aLHPJCY5QPZKyVsNXbrm3jP9Kxz+eLg9+GZ MZQbm7B0q//N4OTS30MeSdB+FUSerriphuZWPlrNFM1A5K6dMrvwQ+TH16RIiiom gDtHIaw+oZIE0vH5H5Cmwsr0ICnc6mY+FChkIhYXH2LO/iVA8R6HrFJ0etBKDRJF 7gbyfInABltKL8lbSSwNxSusf3N04+GVeWixDZadmU2oIQbOxnSaejCyDn/7Smbs b7Pq8Y9MQuH/QcwTkM43E3cpdCGrHMVevOat+Ylb5DGSU+92Xy7F5aOyQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; bh=UGdtrsfObkZ4DIdnF66nxg88vK486yjXSQXRHtNvXCs=; b=vgTCTHbh m56uW7stkHPhy6ABHSgKVPdmZWCyZun704lb5AHKTw+jmw4LhqUMAxBU3ZFn+OMf RpQuVYFg4Q4b2c4BKZY0MfhYlegBmv7SnvMDxhFhKkVzEDFxiXGFNSOofPvPZjOe /xSoaxBKTlimmhKFk1yMi273c/Ji8yr/3n/Uuh7IyAsOVL46niajhHBbxa+P/Elr 6M9YvU79CjoOuECLflM3qx4yGIgGcab5cPV4VE4KjRY2rHpJn4GV6+QYyk/+/Fid OVpyH6Jvn1giczIBCKzXp/nJExsKvyopB1Gtep5BO2SDQ63pbDOREOl2XcDwEAuO xQAWopr8l/qUfA== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduiedrudehkedgvdejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefvhhhomhgr shcuofhonhhjrghlohhnuceothhhohhmrghssehmohhnjhgrlhhonhdrnhgvtheqnecugg ftrfgrthhtvghrnhepvdehgfeivdejgedtveehfefhteelfefgieevgfffveefjeegtdfg uedthedtgeevnecukfhppeejjedrudefgedrvddtfedrudekgeenucevlhhushhtvghruf hiiigvpeegnecurfgrrhgrmhepmhgrihhlfhhrohhmpehthhhomhgrshesmhhonhhjrghl ohhnrdhnvght X-ME-Proxy: Received: from xps.monjalon.net (184.203.134.77.rev.sfr.net [77.134.203.184]) by mail.messagingengine.com (Postfix) with ESMTPA id CDDC7306467E; Thu, 10 Sep 2020 19:51:03 -0400 (EDT) From: Thomas Monjalon To: dev@dpdk.org Cc: david.marchand@redhat.com, bruce.richardson@intel.com, Fady Bader , Narcisa Vasile , Dmitry Kozlyuk , Ranjit Menon Date: Fri, 11 Sep 2020 01:50:05 +0200 Message-Id: <20200910235005.2420342-6-thomas@monjalon.net> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200910235005.2420342-1-thomas@monjalon.net> References: <20200625133038.25180-1-fady@mellanox.com> <20200910235005.2420342-1-thomas@monjalon.net> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v6 5/5] ethdev: 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" From: Fady Bader Add ethdev and a missing dependency (meter) to the list of libraries built on Windows. Signed-off-by: Fady Bader Acked-by: Narcisa Vasile Acked-by: Dmitry Kozlyuk Acked-by: Ranjit Menon --- lib/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/meson.build b/lib/meson.build index eb0cd9090a..d8b358e5f4 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -41,7 +41,7 @@ if is_windows 'telemetry', 'eal', 'ring', - 'mempool', 'mbuf', 'net', 'pci', + 'mempool', 'mbuf', 'net', 'meter', 'ethdev', 'pci', ] # only supported libraries for windows endif