From patchwork Fri Jan 15 11:10:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 86667 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 16C01A0A02; Fri, 15 Jan 2021 12:11:14 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 00D65140F45; Fri, 15 Jan 2021 12:11:14 +0100 (CET) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mails.dpdk.org (Postfix) with ESMTP id 4E13C140F43; Fri, 15 Jan 2021 12:11:12 +0100 (CET) IronPort-SDR: Zyrh/g/q5frZiY6r2VaxfzH7w0o3WZaI19YxsHJy2A0/2KTgLILj9cG4rYJhP08EpNwNnaJ6JK v/CKUVaVWV5w== X-IronPort-AV: E=McAfee;i="6000,8403,9864"; a="178683267" X-IronPort-AV: E=Sophos;i="5.79,349,1602572400"; d="scan'208";a="178683267" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jan 2021 03:11:10 -0800 IronPort-SDR: AruswU6mMdzb7jlsIh2x/vLYer3t5OqZpbfShslhPuTHGruU/ssi8gFZbdbdELZ1zakrIwv9oK TLHeg4NpCjaQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.79,349,1602572400"; d="scan'208";a="401252636" Received: from silpixa00399126.ir.intel.com ([10.237.222.4]) by fmsmga002.fm.intel.com with ESMTP; 15 Jan 2021 03:11:08 -0800 From: Bruce Richardson To: dev@dpdk.org Cc: david.marchand@redhat.com, Bruce Richardson , stable@dpdk.org, Pavan Nikhilesh , Tal Shnaiderman , Thomas Monjalon , Dmitry Kozlyuk Date: Fri, 15 Jan 2021 11:10:33 +0000 Message-Id: <20210115111052.16437-2-bruce.richardson@intel.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210115111052.16437-1-bruce.richardson@intel.com> References: <20210114110606.21142-1-bruce.richardson@intel.com> <20210115111052.16437-1-bruce.richardson@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v2 01/19] eal: fix missing header inclusion 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" The rte_reciprocal header file used standard __rte_always_inline from rte_common.h but does not include that header file, leading to compiler errors when the reciprocal header is included alone. Similarly, rte_thread.h was missing the compat header to get the __rte_experimental macro definition. Fixes: 6d45659eacb8 ("eal: add u64-bit variant for reciprocal divide") Fixes: b1fd151267e6 ("eal: add generic thread-local-storage functions") Cc: stable@dpdk.org Signed-off-by: Bruce Richardson --- lib/librte_eal/include/rte_reciprocal.h | 1 + lib/librte_eal/include/rte_thread.h | 1 + 2 files changed, 2 insertions(+) diff --git a/lib/librte_eal/include/rte_reciprocal.h b/lib/librte_eal/include/rte_reciprocal.h index 63e16fde0a..4a59be30a8 100644 --- a/lib/librte_eal/include/rte_reciprocal.h +++ b/lib/librte_eal/include/rte_reciprocal.h @@ -26,6 +26,7 @@ #define _RTE_RECIPROCAL_H_ #include +#include struct rte_reciprocal { uint32_t m; diff --git a/lib/librte_eal/include/rte_thread.h b/lib/librte_eal/include/rte_thread.h index f1ae2d32cc..e640ea1857 100644 --- a/lib/librte_eal/include/rte_thread.h +++ b/lib/librte_eal/include/rte_thread.h @@ -3,6 +3,7 @@ */ #include +#include #ifndef _RTE_THREAD_H_ #define _RTE_THREAD_H_ From patchwork Fri Jan 15 11:10:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 86668 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 9A720A0A02; Fri, 15 Jan 2021 12:11:20 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4C985140F4B; Fri, 15 Jan 2021 12:11:17 +0100 (CET) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mails.dpdk.org (Postfix) with ESMTP id AF0B3140F4E; Fri, 15 Jan 2021 12:11:15 +0100 (CET) IronPort-SDR: TVvhZynNGRFuXCf0evtq4LbD8c5g24bkdxNdqpuelhV5xGm6Uxe74d3W3SQzC6+IntY2kGWkMN aI6L6tYKwFoQ== X-IronPort-AV: E=McAfee;i="6000,8403,9864"; a="178683269" X-IronPort-AV: E=Sophos;i="5.79,349,1602572400"; d="scan'208";a="178683269" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jan 2021 03:11:15 -0800 IronPort-SDR: 0SBgV4f1e8geL7edlBcAiO9JxWdT9owL5sZr+FZNMiG9lSsgN5eLH+heW7nxkMgnukW+TIawXW KgXBQP1JMSwA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.79,349,1602572400"; d="scan'208";a="401252658" Received: from silpixa00399126.ir.intel.com ([10.237.222.4]) by fmsmga002.fm.intel.com with ESMTP; 15 Jan 2021 03:11:13 -0800 From: Bruce Richardson To: dev@dpdk.org Cc: david.marchand@redhat.com, Bruce Richardson , stable@dpdk.org, Kevin Laatz , Ciara Power Date: Fri, 15 Jan 2021 11:10:34 +0000 Message-Id: <20210115111052.16437-3-bruce.richardson@intel.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210115111052.16437-1-bruce.richardson@intel.com> References: <20210114110606.21142-1-bruce.richardson@intel.com> <20210115111052.16437-1-bruce.richardson@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v2 02/19] telemetry: fix missing header include 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" The telemetry header file uses the rte_cpuset_t type, but does not include any header providing that type. Include rte_os.h to provide the necessary type. Fixes: febbebf7f255 ("telemetry: keep threads separate from data plane") Cc: stable@dpdk.org Signed-off-by: Bruce Richardson --- lib/librte_telemetry/rte_telemetry.h | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/librte_telemetry/rte_telemetry.h b/lib/librte_telemetry/rte_telemetry.h index 4693275c24..561c6b1658 100644 --- a/lib/librte_telemetry/rte_telemetry.h +++ b/lib/librte_telemetry/rte_telemetry.h @@ -5,6 +5,7 @@ #include #include #include +#include #ifndef _RTE_TELEMETRY_H_ #define _RTE_TELEMETRY_H_ From patchwork Fri Jan 15 11:10:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 86669 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 60968A0A02; Fri, 15 Jan 2021 12:11:28 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9ED37140F58; Fri, 15 Jan 2021 12:11:20 +0100 (CET) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mails.dpdk.org (Postfix) with ESMTP id DD757140F56; Fri, 15 Jan 2021 12:11:18 +0100 (CET) IronPort-SDR: mQC3cM8Fq8m09tC61UiVFo4OaZGIASggY0YDHafBopaTxBiivRupmt7tKRJF5m9ViVJaL+zAHi VZFoie9beaXw== X-IronPort-AV: E=McAfee;i="6000,8403,9864"; a="178683274" X-IronPort-AV: E=Sophos;i="5.79,349,1602572400"; d="scan'208";a="178683274" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jan 2021 03:11:18 -0800 IronPort-SDR: 4J7ub08Bz7mGMJARdYbKqo/YJoiQuU0HHFzcN5mA7jO5LeWSFyzK5LCqjKqEm9zSxu/NOPeJb4 NHPK7XceqEIg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.79,349,1602572400"; d="scan'208";a="401252677" Received: from silpixa00399126.ir.intel.com ([10.237.222.4]) by fmsmga002.fm.intel.com with ESMTP; 15 Jan 2021 03:11:16 -0800 From: Bruce Richardson To: dev@dpdk.org Cc: david.marchand@redhat.com, Bruce Richardson , stable@dpdk.org, Thomas Monjalon , Ferruh Yigit , Andrew Rybchenko , Helin Zhang , Jingjing Wu Date: Fri, 15 Jan 2021 11:10:35 +0000 Message-Id: <20210115111052.16437-4-bruce.richardson@intel.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210115111052.16437-1-bruce.richardson@intel.com> References: <20210114110606.21142-1-bruce.richardson@intel.com> <20210115111052.16437-1-bruce.richardson@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v2 03/19] ethdev: fix missing header include 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" The define for RTE_ETH_FLOW_MAX is defined in rte_ethdev.h, so that header should be included in rte_eth_ctrl.h to allow it to be compiled independently. Fixes: 7fa96d696f2c ("ethdev: unification of flow types") Cc: stable@dpdk.org Signed-off-by: Bruce Richardson Acked-by: Andrew Rybchenko --- lib/librte_ethdev/rte_eth_ctrl.h | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/librte_ethdev/rte_eth_ctrl.h b/lib/librte_ethdev/rte_eth_ctrl.h index 1cca522fa3..8a50dbfef9 100644 --- a/lib/librte_ethdev/rte_eth_ctrl.h +++ b/lib/librte_ethdev/rte_eth_ctrl.h @@ -9,6 +9,7 @@ #include #include #include "rte_flow.h" +#include "rte_ethdev.h" /** * @deprecated Please use rte_flow API instead of this legacy one. From patchwork Fri Jan 15 11:10:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 86670 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 54A26A0A02; Fri, 15 Jan 2021 12:11:36 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F122C140F62; Fri, 15 Jan 2021 12:11:23 +0100 (CET) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mails.dpdk.org (Postfix) with ESMTP id 8C691140F5D; Fri, 15 Jan 2021 12:11:21 +0100 (CET) IronPort-SDR: 6WzvJJ5/2CnwX/hCFWgBfe/Nw/IKvPCiCs9nGvA3Aj4eCCCIF+Z0KU5mjpOX09DRdHtbavVj8W ZVdAYdcVQvzw== X-IronPort-AV: E=McAfee;i="6000,8403,9864"; a="178683280" X-IronPort-AV: E=Sophos;i="5.79,349,1602572400"; d="scan'208";a="178683280" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jan 2021 03:11:21 -0800 IronPort-SDR: 0ljG+KYroNKObmhjW0qNeZfgqXd+UGkReEqqxueBQXF4q0bup+aMrYhIro639e35kMx9ufqLSX DhXOtxeOVXsw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.79,349,1602572400"; d="scan'208";a="401252690" Received: from silpixa00399126.ir.intel.com ([10.237.222.4]) by fmsmga002.fm.intel.com with ESMTP; 15 Jan 2021 03:11:19 -0800 From: Bruce Richardson To: dev@dpdk.org Cc: david.marchand@redhat.com, Bruce Richardson , stable@dpdk.org, Olivier Matz , Ophir Munk , Ferruh Yigit Date: Fri, 15 Jan 2021 11:10:36 +0000 Message-Id: <20210115111052.16437-5-bruce.richardson@intel.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210115111052.16437-1-bruce.richardson@intel.com> References: <20210114110606.21142-1-bruce.richardson@intel.com> <20210115111052.16437-1-bruce.richardson@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v2 04/19] net: fix missing header include 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" The Geneve protocol header file is missing the rte_byteorder.h header. Fixes: ea0e711b8ae0 ("app/testpmd: add GENEVE parsing") Cc: stable@dpdk.org Signed-off-by: Bruce Richardson Acked-by: Ophir Munk --- lib/librte_net/rte_geneve.h | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/librte_net/rte_geneve.h b/lib/librte_net/rte_geneve.h index bb67724c31..7c3d477dcb 100644 --- a/lib/librte_net/rte_geneve.h +++ b/lib/librte_net/rte_geneve.h @@ -11,6 +11,7 @@ * GENEVE-related definitions */ #include +#include #ifdef __cplusplus extern "C" { From patchwork Fri Jan 15 11:10:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 86671 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id EF678A0A02; Fri, 15 Jan 2021 12:11:44 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7A50A140F55; Fri, 15 Jan 2021 12:11:26 +0100 (CET) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mails.dpdk.org (Postfix) with ESMTP id BE45D140F65; Fri, 15 Jan 2021 12:11:24 +0100 (CET) IronPort-SDR: 7iwaEtYqO98olJM/4JgEu5IGvWZrMN7RsmgAIlE697eVPWC50ok0BdPGuSBYNh0Xm7mI9bFk3R +eO8UPC/lm3A== X-IronPort-AV: E=McAfee;i="6000,8403,9864"; a="178683282" X-IronPort-AV: E=Sophos;i="5.79,349,1602572400"; d="scan'208";a="178683282" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jan 2021 03:11:24 -0800 IronPort-SDR: LMPEVRi33q6FX6BArsm+8kPDEyqaeXDVsnaaO0nKpNEZ+trlJcBL318J+KqwI2KPrwsWZPhrl7 3fFEkfaIbUeg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.79,349,1602572400"; d="scan'208";a="401252708" Received: from silpixa00399126.ir.intel.com ([10.237.222.4]) by fmsmga002.fm.intel.com with ESMTP; 15 Jan 2021 03:11:22 -0800 From: Bruce Richardson To: dev@dpdk.org Cc: david.marchand@redhat.com, Bruce Richardson , stable@dpdk.org, Olivier Matz , Thomas Monjalon , Konstantin Ananyev , Andrew Rybchenko , Michel Machado Date: Fri, 15 Jan 2021 11:10:37 +0000 Message-Id: <20210115111052.16437-6-bruce.richardson@intel.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210115111052.16437-1-bruce.richardson@intel.com> References: <20210114110606.21142-1-bruce.richardson@intel.com> <20210115111052.16437-1-bruce.richardson@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v2 05/19] mbuf: fix missing header include 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" The rte_mbuf_dyn.h header file uses a number of types and macros without including the required header files to get the definitions of those macros/types. Similarly, the rte_mbuf_core.h file was missing an include for rte_byteorder.h header. Fixes: 4958ca3a443a ("mbuf: support dynamic fields and flags") Fixes: 3eb860b08eb7 ("mbuf: move definitions into a separate file") Cc: stable@dpdk.org Signed-off-by: Bruce Richardson Acked-by: Andrew Rybchenko --- lib/librte_mbuf/rte_mbuf_core.h | 1 + lib/librte_mbuf/rte_mbuf_dyn.h | 3 +++ 2 files changed, 4 insertions(+) diff --git a/lib/librte_mbuf/rte_mbuf_core.h b/lib/librte_mbuf/rte_mbuf_core.h index 567551deab..34e892f21b 100644 --- a/lib/librte_mbuf/rte_mbuf_core.h +++ b/lib/librte_mbuf/rte_mbuf_core.h @@ -18,6 +18,7 @@ #include #include +#include #include #ifdef __cplusplus diff --git a/lib/librte_mbuf/rte_mbuf_dyn.h b/lib/librte_mbuf/rte_mbuf_dyn.h index fc4eee71d0..f42deed012 100644 --- a/lib/librte_mbuf/rte_mbuf_dyn.h +++ b/lib/librte_mbuf/rte_mbuf_dyn.h @@ -66,7 +66,10 @@ * - any name that does not start with "rte_" in an application */ +#include +#include #include +#include #ifdef __cplusplus extern "C" { From patchwork Fri Jan 15 11:10:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 86672 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id CE5F1A0A02; Fri, 15 Jan 2021 12:11:53 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DC001140F6C; Fri, 15 Jan 2021 12:11:29 +0100 (CET) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mails.dpdk.org (Postfix) with ESMTP id 753DB140F6C; Fri, 15 Jan 2021 12:11:27 +0100 (CET) IronPort-SDR: qBLLHFW8HQM+ZU+BTkYVnM1pHgz0UFCRbAbhE8D1yO4LkoruTbBbPK4iSY0a2vW/1blmd3jxmg /oXVUlzArxEw== X-IronPort-AV: E=McAfee;i="6000,8403,9864"; a="178683286" X-IronPort-AV: E=Sophos;i="5.79,349,1602572400"; d="scan'208";a="178683286" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jan 2021 03:11:27 -0800 IronPort-SDR: 1vGvoyqKxbtHmeupV09taQe3rqv2LHdUe957Ti5bK1/RQU4titDBLIuCxlZT4dtBQOCx53AkT6 biLHk3hF2jyw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.79,349,1602572400"; d="scan'208";a="401252722" Received: from silpixa00399126.ir.intel.com ([10.237.222.4]) by fmsmga002.fm.intel.com with ESMTP; 15 Jan 2021 03:11:25 -0800 From: Bruce Richardson To: dev@dpdk.org Cc: david.marchand@redhat.com, Bruce Richardson , stable@dpdk.org, Hemant Agrawal Date: Fri, 15 Jan 2021 11:10:38 +0000 Message-Id: <20210115111052.16437-7-bruce.richardson@intel.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210115111052.16437-1-bruce.richardson@intel.com> References: <20210114110606.21142-1-bruce.richardson@intel.com> <20210115111052.16437-1-bruce.richardson@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v2 06/19] bitratestats: fix missing header include 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" The rte_compat.h header file must be included to get the definition of __rte_experimental. Fixes: f030bff72f81 ("bitrate: add free function") Cc: stable@dpdk.org Signed-off-by: Bruce Richardson --- lib/librte_bitratestats/rte_bitrate.h | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/librte_bitratestats/rte_bitrate.h b/lib/librte_bitratestats/rte_bitrate.h index 4865929e8f..7e34529687 100644 --- a/lib/librte_bitratestats/rte_bitrate.h +++ b/lib/librte_bitratestats/rte_bitrate.h @@ -6,6 +6,7 @@ #define _RTE_BITRATE_H_ #include +#include #ifdef __cplusplus extern "C" { From patchwork Fri Jan 15 11:10:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 86673 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 92986A0A02; Fri, 15 Jan 2021 12:12:03 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4E121140F4C; Fri, 15 Jan 2021 12:11:33 +0100 (CET) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mails.dpdk.org (Postfix) with ESMTP id 4F396140F74; Fri, 15 Jan 2021 12:11:31 +0100 (CET) IronPort-SDR: 8EwGWnwef7017ISAORx4oVzWLXFCFrlbx+ZzRIpcwZ792jwlrmgw0B0Z+QQL02ZZCsHiei0nT7 p8wgqeOeYJrg== X-IronPort-AV: E=McAfee;i="6000,8403,9864"; a="178683295" X-IronPort-AV: E=Sophos;i="5.79,349,1602572400"; d="scan'208";a="178683295" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jan 2021 03:11:30 -0800 IronPort-SDR: D7egwW2aRDzDqU2duodGwTkXveonG82uvCL+BeCY2ipOB/2UNpH0zXLBQC1g4fvTNaQ9ILZvH7 KUdXPtwhY3zQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.79,349,1602572400"; d="scan'208";a="401252737" Received: from silpixa00399126.ir.intel.com ([10.237.222.4]) by fmsmga002.fm.intel.com with ESMTP; 15 Jan 2021 03:11:27 -0800 From: Bruce Richardson To: dev@dpdk.org Cc: david.marchand@redhat.com, Bruce Richardson , stable@dpdk.org, Vladimir Medvedkin Date: Fri, 15 Jan 2021 11:10:39 +0000 Message-Id: <20210115111052.16437-8-bruce.richardson@intel.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210115111052.16437-1-bruce.richardson@intel.com> References: <20210114110606.21142-1-bruce.richardson@intel.com> <20210115111052.16437-1-bruce.richardson@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v2 07/19] rib: fix missing header includes 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" The standard integer types, and the size_t types are missing their required header includes in the rib header file. Fixes: 5a5793a5ffa2 ("rib: add RIB library") Cc: stable@dpdk.org Signed-off-by: Bruce Richardson Acked-by: Vladimir Medvedkin --- lib/librte_rib/rte_rib.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/librte_rib/rte_rib.h b/lib/librte_rib/rte_rib.h index f80752e5bd..6253860523 100644 --- a/lib/librte_rib/rte_rib.h +++ b/lib/librte_rib/rte_rib.h @@ -18,6 +18,8 @@ * Level compressed tree implementation for IPv4 Longest Prefix Match */ +#include +#include #include #ifdef __cplusplus From patchwork Fri Jan 15 11:10:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 86676 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id EE403A0A02; Fri, 15 Jan 2021 12:12:33 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8DDEC140F8F; Fri, 15 Jan 2021 12:11:43 +0100 (CET) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mails.dpdk.org (Postfix) with ESMTP id B7A90140F73; Fri, 15 Jan 2021 12:11:39 +0100 (CET) IronPort-SDR: oVyAWREI678EM3Fmtb43FQGZkbxgd/UL2bLbjdqk3XFGpyR6gWBfQyiY4lUkXz2NE6Cr6/0/EL XhOQ8Z5zcNrg== X-IronPort-AV: E=McAfee;i="6000,8403,9864"; a="178683299" X-IronPort-AV: E=Sophos;i="5.79,349,1602572400"; d="scan'208";a="178683299" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jan 2021 03:11:38 -0800 IronPort-SDR: IURJpgpi0qLr0g6DwNr0JU6doNbJcreloa0EKZUQNXV2lXItW6fySwcecXZMRFVgV9SqFhqhAs 3EpYeoLFenJg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.79,349,1602572400"; d="scan'208";a="401252772" Received: from silpixa00399126.ir.intel.com ([10.237.222.4]) by fmsmga002.fm.intel.com with ESMTP; 15 Jan 2021 03:11:31 -0800 From: Bruce Richardson To: dev@dpdk.org Cc: david.marchand@redhat.com, Bruce Richardson , stable@dpdk.org, Maxime Coquelin , Chenbo Xia , Zhihong Wang , =?utf-8?q?Adri=C3=A1n_Moreno?= , Fan Zhang , Jay Zhou Date: Fri, 15 Jan 2021 11:10:40 +0000 Message-Id: <20210115111052.16437-9-bruce.richardson@intel.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210115111052.16437-1-bruce.richardson@intel.com> References: <20210114110606.21142-1-bruce.richardson@intel.com> <20210115111052.16437-1-bruce.richardson@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v2 08/19] vhost: fix missing header includes 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" The vhost header files were missing definitions from headers to allow them to be compiled up individually. Fixes: d7280c9fffcb ("vhost: support selective datapath") Fixes: a49f758d1170 ("vhost: split vDPA header file") Fixes: 939066d96563 ("vhost/crypto: add public function implementation") Cc: stable@dpdk.org Signed-off-by: Bruce Richardson Reviewed-by: Maxime Coquelin --- lib/librte_vhost/rte_vdpa.h | 2 ++ lib/librte_vhost/rte_vdpa_dev.h | 1 + lib/librte_vhost/rte_vhost_crypto.h | 7 +++++++ 3 files changed, 10 insertions(+) diff --git a/lib/librte_vhost/rte_vdpa.h b/lib/librte_vhost/rte_vdpa.h index f074ec0c4a..1437f400bf 100644 --- a/lib/librte_vhost/rte_vdpa.h +++ b/lib/librte_vhost/rte_vdpa.h @@ -11,6 +11,8 @@ * Device specific vhost lib */ +#include + /** Maximum name length for statistics counters */ #define RTE_VDPA_STATS_NAME_SIZE 64 diff --git a/lib/librte_vhost/rte_vdpa_dev.h b/lib/librte_vhost/rte_vdpa_dev.h index a60183f780..bfada387b0 100644 --- a/lib/librte_vhost/rte_vdpa_dev.h +++ b/lib/librte_vhost/rte_vdpa_dev.h @@ -8,6 +8,7 @@ #include #include "rte_vhost.h" +#include "rte_vdpa.h" #define RTE_VHOST_QUEUE_ALL UINT16_MAX diff --git a/lib/librte_vhost/rte_vhost_crypto.h b/lib/librte_vhost/rte_vhost_crypto.h index c809c46a21..2a27a35892 100644 --- a/lib/librte_vhost/rte_vhost_crypto.h +++ b/lib/librte_vhost/rte_vhost_crypto.h @@ -5,6 +5,13 @@ #ifndef _VHOST_CRYPTO_H_ #define _VHOST_CRYPTO_H_ +#include +#include + +/* pre-declare structs to avoid including full headers */ +struct rte_mempool; +struct rte_crypto_op; + #define VHOST_CRYPTO_MBUF_POOL_SIZE (8192) #define VHOST_CRYPTO_MAX_BURST_SIZE (64) #define VHOST_CRYPTO_MAX_DATA_SIZE (4096) From patchwork Fri Jan 15 11:10:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 86674 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 7E4A3A0A02; Fri, 15 Jan 2021 12:12:13 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9A7DE140F7C; Fri, 15 Jan 2021 12:11:38 +0100 (CET) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mails.dpdk.org (Postfix) with ESMTP id 598C7140F38; Fri, 15 Jan 2021 12:11:37 +0100 (CET) IronPort-SDR: QYjK401wMKfKSY6pknZBHarM5TfI5AZXX9sRWIT45ChxBM529qscwMf/Kt2NF4DuuQ3jdoX1gf FJJ1QM5yKDsw== X-IronPort-AV: E=McAfee;i="6000,8403,9864"; a="197198384" X-IronPort-AV: E=Sophos;i="5.79,349,1602572400"; d="scan'208";a="197198384" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jan 2021 03:11:36 -0800 IronPort-SDR: 3xORFrUzKoYDz8pGrPQmuFRdBtAQweBGFXIsF3Swwsz0ysMvRMI0O4LlvM4eyhEBCXWbyvTUby bjynN5T2KxSA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.79,349,1602572400"; d="scan'208";a="401252797" Received: from silpixa00399126.ir.intel.com ([10.237.222.4]) by fmsmga002.fm.intel.com with ESMTP; 15 Jan 2021 03:11:34 -0800 From: Bruce Richardson To: dev@dpdk.org Cc: david.marchand@redhat.com, Bruce Richardson , stable@dpdk.org, Konstantin Ananyev , Bernard Iremonger , Vladimir Medvedkin , Akhil Goyal Date: Fri, 15 Jan 2021 11:10:41 +0000 Message-Id: <20210115111052.16437-10-bruce.richardson@intel.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210115111052.16437-1-bruce.richardson@intel.com> References: <20210114110606.21142-1-bruce.richardson@intel.com> <20210115111052.16437-1-bruce.richardson@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v2 09/19] ipsec: fix missing header include 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" The rte_ipsec_sad.h header used the standard uintXX_t types, but did not include stdint.h header for them. Fixes: 401633d9c112 ("ipsec: add inbound SAD API") Cc: stable@dpdk.org Signed-off-by: Bruce Richardson Acked-by: Konstantin Ananyev Acked-by: Vladimir Medvedkin --- lib/librte_ipsec/rte_ipsec_sad.h | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/librte_ipsec/rte_ipsec_sad.h b/lib/librte_ipsec/rte_ipsec_sad.h index 3e67ab1e4b..66c703ff3a 100644 --- a/lib/librte_ipsec/rte_ipsec_sad.h +++ b/lib/librte_ipsec/rte_ipsec_sad.h @@ -7,6 +7,7 @@ #define _RTE_IPSEC_SAD_H_ #include +#include /** * @file rte_ipsec_sad.h From patchwork Fri Jan 15 11:10:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 86675 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id E0A15A0A02; Fri, 15 Jan 2021 12:12:23 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1EF50140F76; Fri, 15 Jan 2021 12:11:41 +0100 (CET) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mails.dpdk.org (Postfix) with ESMTP id 1E1C4140F4D; Fri, 15 Jan 2021 12:11:38 +0100 (CET) IronPort-SDR: xzAp6FbYGw8bvCrATgpqfN0OQyeSRsH7hzCaGKTk1UflNuVF9ubF78jhRUKxLhUANuarD76LRb eL33ckWzHq3w== X-IronPort-AV: E=McAfee;i="6000,8403,9864"; a="197198388" X-IronPort-AV: E=Sophos;i="5.79,349,1602572400"; d="scan'208";a="197198388" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jan 2021 03:11:38 -0800 IronPort-SDR: gZ01MMKWm74/iIo3f9B2vLL7h2S5u9Ud4esvqoVXqLHYWB4O3CqMVE63G1whRtkcDImIrrRkgd 3j1226Vg7b1Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.79,349,1602572400"; d="scan'208";a="401252812" Received: from silpixa00399126.ir.intel.com ([10.237.222.4]) by fmsmga002.fm.intel.com with ESMTP; 15 Jan 2021 03:11:37 -0800 From: Bruce Richardson To: dev@dpdk.org Cc: david.marchand@redhat.com, Bruce Richardson , stable@dpdk.org, Vladimir Medvedkin Date: Fri, 15 Jan 2021 11:10:42 +0000 Message-Id: <20210115111052.16437-11-bruce.richardson@intel.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210115111052.16437-1-bruce.richardson@intel.com> References: <20210114110606.21142-1-bruce.richardson@intel.com> <20210115111052.16437-1-bruce.richardson@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v2 10/19] fib: fix missing header includes 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" Add stdint.h to get definitions of standard integer types Fixes: 39e927248416 ("fib: add FIB library") Fixes: 40d41a8a7b34 ("fib: support IPv6") Cc: stable@dpdk.org Signed-off-by: Bruce Richardson Acked-by: Vladimir Medvedkin --- lib/librte_fib/rte_fib.h | 1 + lib/librte_fib/rte_fib6.h | 1 + 2 files changed, 2 insertions(+) diff --git a/lib/librte_fib/rte_fib.h b/lib/librte_fib/rte_fib.h index fef0749525..352c5e00ad 100644 --- a/lib/librte_fib/rte_fib.h +++ b/lib/librte_fib/rte_fib.h @@ -19,6 +19,7 @@ * for IPv4 Longest Prefix Match */ +#include #include #ifdef __cplusplus diff --git a/lib/librte_fib/rte_fib6.h b/lib/librte_fib/rte_fib6.h index 668bffb2ba..60213f3372 100644 --- a/lib/librte_fib/rte_fib6.h +++ b/lib/librte_fib/rte_fib6.h @@ -19,6 +19,7 @@ * for IPv6 Longest Prefix Match */ +#include #include #ifdef __cplusplus From patchwork Fri Jan 15 11:10:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 86677 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 95C57A0A02; Fri, 15 Jan 2021 12:12:42 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E0568140F93; Fri, 15 Jan 2021 12:11:46 +0100 (CET) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by mails.dpdk.org (Postfix) with ESMTP id 5B49F140F81; Fri, 15 Jan 2021 12:11:45 +0100 (CET) IronPort-SDR: +24Z2Fbs8dOH7/6nGMk5sDtV3BbO4bIvyJTZi8WY7D8TAgHIEsJGzGRZ7EqQRTlO0T8t1VbzEh 9+d4G2oT287Q== X-IronPort-AV: E=McAfee;i="6000,8403,9864"; a="157713520" X-IronPort-AV: E=Sophos;i="5.79,349,1602572400"; d="scan'208";a="157713520" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jan 2021 03:11:44 -0800 IronPort-SDR: +Vwnp+gx9Mo26UIfN6l47qnYijG7gJQkuDdEkPjiB2liLEHFbKatzsPZtip+Yw7jgoczG5+yyZ 0/9ZPGW1Lrrw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.79,349,1602572400"; d="scan'208";a="401252853" Received: from silpixa00399126.ir.intel.com ([10.237.222.4]) by fmsmga002.fm.intel.com with ESMTP; 15 Jan 2021 03:11:42 -0800 From: Bruce Richardson To: dev@dpdk.org Cc: david.marchand@redhat.com, Bruce Richardson , stable@dpdk.org, Cristian Dumitrescu , Thomas Monjalon , Dmitry Kozlyuk Date: Fri, 15 Jan 2021 11:10:43 +0000 Message-Id: <20210115111052.16437-12-bruce.richardson@intel.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210115111052.16437-1-bruce.richardson@intel.com> References: <20210114110606.21142-1-bruce.richardson@intel.com> <20210115111052.16437-1-bruce.richardson@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v2 11/19] table: fix missing header include 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" The rte_lru_x86.h header, included from the main rte_lru.h header, uses the RTE_CC_IS_GNU macro from rte_common.h but fails to include that header file. Fixes: 0c9a5735a947 ("eal: fix compiler detection in public headers") Cc: stable@dpdk.org Signed-off-by: Bruce Richardson --- lib/librte_table/rte_lru_x86.h | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/librte_table/rte_lru_x86.h b/lib/librte_table/rte_lru_x86.h index 0e24906c2c..38476d956e 100644 --- a/lib/librte_table/rte_lru_x86.h +++ b/lib/librte_table/rte_lru_x86.h @@ -12,6 +12,7 @@ extern "C" { #include #include +#include #ifndef RTE_TABLE_HASH_LRU_STRATEGY #define RTE_TABLE_HASH_LRU_STRATEGY 2 From patchwork Fri Jan 15 11:10:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 86678 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 94FF5A0A02; Fri, 15 Jan 2021 12:12:50 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1B8B2140F73; Fri, 15 Jan 2021 12:11:51 +0100 (CET) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by mails.dpdk.org (Postfix) with ESMTP id 7D88A140F82; Fri, 15 Jan 2021 12:11:49 +0100 (CET) IronPort-SDR: HH1k/X5DKHDnGfJGcGhrP/+zoV801rLFiUZ8U/R5CzKpcOLgDwm6Qej6hImshSssg5cojLYdDS K/d67WtKUfWQ== X-IronPort-AV: E=McAfee;i="6000,8403,9864"; a="157713527" X-IronPort-AV: E=Sophos;i="5.79,349,1602572400"; d="scan'208";a="157713527" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jan 2021 03:11:49 -0800 IronPort-SDR: gwmScruGRq2qs0v9eK65h9edifyePPIiq473lHK9tmK1BqsnYymCMNP5mwNhLjUdrV1XCRYttn rtpb/kPPqb5Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.79,349,1602572400"; d="scan'208";a="401252870" Received: from silpixa00399126.ir.intel.com ([10.237.222.4]) by fmsmga002.fm.intel.com with ESMTP; 15 Jan 2021 03:11:47 -0800 From: Bruce Richardson To: dev@dpdk.org Cc: david.marchand@redhat.com, Bruce Richardson , stable@dpdk.org, Cristian Dumitrescu Date: Fri, 15 Jan 2021 11:10:44 +0000 Message-Id: <20210115111052.16437-13-bruce.richardson@intel.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210115111052.16437-1-bruce.richardson@intel.com> References: <20210114110606.21142-1-bruce.richardson@intel.com> <20210115111052.16437-1-bruce.richardson@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v2 12/19] pipeline: fix missing header includes 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" The stdio.h header needs to be included to get the definition of the FILE type. Fixes: b32c0a2c5e4c ("pipeline: add SWX table update high level API") Fixes: 3ca60ceed79a ("pipeline: add SWX pipeline specification file") Cc: stable@dpdk.org Signed-off-by: Bruce Richardson --- lib/librte_pipeline/rte_swx_ctl.h | 1 + lib/librte_pipeline/rte_swx_pipeline.h | 1 + 2 files changed, 2 insertions(+) diff --git a/lib/librte_pipeline/rte_swx_ctl.h b/lib/librte_pipeline/rte_swx_ctl.h index bab1894944..32815b69e2 100644 --- a/lib/librte_pipeline/rte_swx_ctl.h +++ b/lib/librte_pipeline/rte_swx_ctl.h @@ -15,6 +15,7 @@ extern "C" { #include #include +#include #include diff --git a/lib/librte_pipeline/rte_swx_pipeline.h b/lib/librte_pipeline/rte_swx_pipeline.h index d0a3439edf..f0a2cef777 100644 --- a/lib/librte_pipeline/rte_swx_pipeline.h +++ b/lib/librte_pipeline/rte_swx_pipeline.h @@ -15,6 +15,7 @@ extern "C" { #include #include +#include #include From patchwork Fri Jan 15 11:10:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 86679 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 91B83A0A02; Fri, 15 Jan 2021 12:13:00 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8A038140FA0; Fri, 15 Jan 2021 12:11:58 +0100 (CET) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by mails.dpdk.org (Postfix) with ESMTP id 1E6BA140F89; Fri, 15 Jan 2021 12:11:55 +0100 (CET) IronPort-SDR: ohSHTnsl1TNaUr+oi8R6rz1c5f/JlPFcuB+Qa2usku9aW4ozv5DPP411cw36CUhkP/nhzCB8OW x6JANHc5Pq9w== X-IronPort-AV: E=McAfee;i="6000,8403,9864"; a="175954136" X-IronPort-AV: E=Sophos;i="5.79,349,1602572400"; d="scan'208";a="175954136" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jan 2021 03:11:55 -0800 IronPort-SDR: xQDIiupAcq30ejdAsUrM6BxNsbQmQVnxg+IJDM2qkURTzjABpak0MLubJA2cF/Iv2FidTLJucg p/B5mMGuRXqw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.79,349,1602572400"; d="scan'208";a="401252898" Received: from silpixa00399126.ir.intel.com ([10.237.222.4]) by fmsmga002.fm.intel.com with ESMTP; 15 Jan 2021 03:11:53 -0800 From: Bruce Richardson To: dev@dpdk.org Cc: david.marchand@redhat.com, Bruce Richardson , stable@dpdk.org, Ciara Power , Keith Wiles Date: Fri, 15 Jan 2021 11:10:45 +0000 Message-Id: <20210115111052.16437-14-bruce.richardson@intel.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210115111052.16437-1-bruce.richardson@intel.com> References: <20210114110606.21142-1-bruce.richardson@intel.com> <20210115111052.16437-1-bruce.richardson@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v2 13/19] metrics: fix variable declaration in header 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" The global variable "tel_met_data" was declared in a header file, rather than in a C file, leading to duplicate definitions if more than one C file included the header. Fixes: c5b7197f662e ("telemetry: move some functions to metrics library") Cc: stable@dpdk.org Signed-off-by: Bruce Richardson --- lib/librte_metrics/rte_metrics_telemetry.c | 2 ++ lib/librte_metrics/rte_metrics_telemetry.h | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/librte_metrics/rte_metrics_telemetry.c b/lib/librte_metrics/rte_metrics_telemetry.c index 901cbeb0a3..b8ee56ef01 100644 --- a/lib/librte_metrics/rte_metrics_telemetry.c +++ b/lib/librte_metrics/rte_metrics_telemetry.c @@ -13,6 +13,8 @@ #include "rte_metrics.h" #include "rte_metrics_telemetry.h" +struct telemetry_metrics_data tel_met_data; + int metrics_log_level; /* Logging Macros */ diff --git a/lib/librte_metrics/rte_metrics_telemetry.h b/lib/librte_metrics/rte_metrics_telemetry.h index 3435a55425..5dbb32ca0c 100644 --- a/lib/librte_metrics/rte_metrics_telemetry.h +++ b/lib/librte_metrics/rte_metrics_telemetry.h @@ -34,8 +34,6 @@ struct telemetry_metrics_data { int metrics_register_done; }; -struct telemetry_metrics_data tel_met_data; - __rte_experimental int32_t rte_metrics_tel_reg_all_ethdev(int *metrics_register_done, int *reg_index_list); From patchwork Fri Jan 15 11:10:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 86680 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 0F938A0A02; Fri, 15 Jan 2021 12:13:10 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E5DA5140FA6; Fri, 15 Jan 2021 12:12:03 +0100 (CET) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by mails.dpdk.org (Postfix) with ESMTP id E734C140F8E; Fri, 15 Jan 2021 12:12:01 +0100 (CET) IronPort-SDR: yybdQr/XR2QpgojXxsOukjaISy/2zDeIVqxVs0RjYqgS6B3L2TG4xrjIP9mBAUNWZ3UO6jttkH xaogv0Cf+3Tg== X-IronPort-AV: E=McAfee;i="6000,8403,9864"; a="165619238" X-IronPort-AV: E=Sophos;i="5.79,349,1602572400"; d="scan'208";a="165619238" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jan 2021 03:12:00 -0800 IronPort-SDR: AtsCL+GGAG/uBbBOqrKCvVBh50dJOqZqissl4LK4QGw6hX8MHSLuR33bEWDRHudfws9bg6rN38 BGKUhb3Cu/fw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.79,349,1602572400"; d="scan'208";a="401252924" Received: from silpixa00399126.ir.intel.com ([10.237.222.4]) by fmsmga002.fm.intel.com with ESMTP; 15 Jan 2021 03:11:59 -0800 From: Bruce Richardson To: dev@dpdk.org Cc: david.marchand@redhat.com, Bruce Richardson , stable@dpdk.org, Nithin Dabilpuram , Pavan Nikhilesh , Kiran Kumar K Date: Fri, 15 Jan 2021 11:10:46 +0000 Message-Id: <20210115111052.16437-15-bruce.richardson@intel.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210115111052.16437-1-bruce.richardson@intel.com> References: <20210114110606.21142-1-bruce.richardson@intel.com> <20210115111052.16437-1-bruce.richardson@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v2 14/19] node: fix missing header include 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" The rte_compat header file is needed for the '__rte_experimental' macro. Fixes: f00708c2aa53 ("node: add IPv4 rewrite and lookup control") Cc: stable@dpdk.org Signed-off-by: Bruce Richardson --- lib/librte_node/rte_node_ip4_api.h | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/librte_node/rte_node_ip4_api.h b/lib/librte_node/rte_node_ip4_api.h index eb9ebd5f89..46d0d8976b 100644 --- a/lib/librte_node/rte_node_ip4_api.h +++ b/lib/librte_node/rte_node_ip4_api.h @@ -21,6 +21,7 @@ extern "C" { #endif #include +#include /** * IP4 lookup next nodes. From patchwork Fri Jan 15 11:10:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 86681 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 87233A0A02; Fri, 15 Jan 2021 12:13:19 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3E184140FB0; Fri, 15 Jan 2021 12:12:10 +0100 (CET) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mails.dpdk.org (Postfix) with ESMTP id E6C52140FAC; Fri, 15 Jan 2021 12:12:08 +0100 (CET) IronPort-SDR: i4Lt+9QmlcButG/MvY/Qk/QUHAgnipxRLaroyIFfJUmqih87jPvomLD/qJLpmZEsLn03aZ8Ckm w8mcxT6UEB1w== X-IronPort-AV: E=McAfee;i="6000,8403,9864"; a="178620304" X-IronPort-AV: E=Sophos;i="5.79,349,1602572400"; d="scan'208";a="178620304" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jan 2021 03:12:07 -0800 IronPort-SDR: 7c+cmXgt4jU/v4GucEW+C/qSk5ePtsMrYe+tY1VYz9A5agoSEJNNe3XE4k+vHKgGfENJeFlwMT GZFY97IctAug== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.79,349,1602572400"; d="scan'208";a="401252968" Received: from silpixa00399126.ir.intel.com ([10.237.222.4]) by fmsmga002.fm.intel.com with ESMTP; 15 Jan 2021 03:12:06 -0800 From: Bruce Richardson To: dev@dpdk.org Cc: david.marchand@redhat.com, Bruce Richardson , stable@dpdk.org, Harry van Haaren Date: Fri, 15 Jan 2021 11:10:47 +0000 Message-Id: <20210115111052.16437-16-bruce.richardson@intel.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210115111052.16437-1-bruce.richardson@intel.com> References: <20210114110606.21142-1-bruce.richardson@intel.com> <20210115111052.16437-1-bruce.richardson@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v2 15/19] app: fix extra include paths for app builds 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" The "includes" variable in the app/meson.build file was ignored when building the executable, meaning that apps couldn't pass additional include paths directly back. Fix this to align with drivers and libs. Fixes: fa036e70d794 ("app: generalize meson build") Cc: stable@dpdk.org Signed-off-by: Bruce Richardson --- app/meson.build | 1 + 1 file changed, 1 insertion(+) diff --git a/app/meson.build b/app/meson.build index 903117b866..87fc195dbf 100644 --- a/app/meson.build +++ b/app/meson.build @@ -66,6 +66,7 @@ foreach app:apps link_args: ldflags, link_whole: link_libs, dependencies: dep_objs, + include_directories: includes, install_rpath: join_paths(get_option('prefix'), driver_install_path), install: true) From patchwork Fri Jan 15 11:10:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 86682 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 20C37A0A02; Fri, 15 Jan 2021 12:13:29 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6AC0E140F74; Fri, 15 Jan 2021 12:12:18 +0100 (CET) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by mails.dpdk.org (Postfix) with ESMTP id 742B1140F74 for ; Fri, 15 Jan 2021 12:12:16 +0100 (CET) IronPort-SDR: jjMSg1UlXEu29KkXq1E8S2YVXPmJXAZX3SwJNIhxcN3Y0po2djLpurnThHThRH0M6K24Ci4bLZ pRtzxyjIwE8g== X-IronPort-AV: E=McAfee;i="6000,8403,9864"; a="175954165" X-IronPort-AV: E=Sophos;i="5.79,349,1602572400"; d="scan'208";a="175954165" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jan 2021 03:12:15 -0800 IronPort-SDR: sOwLj9XBjlai4WERLNbRonDsSFZddBVN2cLVZBV1Id9f+YJ6x2tm3ybKfOq9Wsj23McRavP9Du 3kRoE5B3RPBA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.79,349,1602572400"; d="scan'208";a="401253011" Received: from silpixa00399126.ir.intel.com ([10.237.222.4]) by fmsmga002.fm.intel.com with ESMTP; 15 Jan 2021 03:12:12 -0800 From: Bruce Richardson To: dev@dpdk.org Cc: david.marchand@redhat.com, Bruce Richardson , Thomas Monjalon , Ferruh Yigit , Andrew Rybchenko , Yipeng Wang , Sameh Gobriel , Konstantin Ananyev , Bernard Iremonger , Vladimir Medvedkin , Ori Kam , Honnappa Nagarahalli , Olivier Matz , Cristian Dumitrescu Date: Fri, 15 Jan 2021 11:10:48 +0000 Message-Id: <20210115111052.16437-17-bruce.richardson@intel.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210115111052.16437-1-bruce.richardson@intel.com> References: <20210114110606.21142-1-bruce.richardson@intel.com> <20210115111052.16437-1-bruce.richardson@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v2 16/19] app/chkincs: add chkincs app to verify headers 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" To verify that all DPDK headers are ok for inclusion directly in a C file, and are not missing any other pre-requisite headers, we can auto-generate for each header an empty C file that includes that header. Compiling these files will throw errors if any header has unmet dependencies. The list of headers to check is based of the "headers" value returned from each library's meson.build file. However, since not all headers are for direct inclusion, add a build variable "headers_no_chkincs" to list those headers and skip checking them. Signed-off-by: Bruce Richardson --- v2: * add maintainers entry * distribute exception list among meson.build files. MAINTAINERS | 4 ++++ app/chkincs/gen_c_file_for_header.py | 12 ++++++++++ app/chkincs/main.c | 4 ++++ app/chkincs/meson.build | 28 ++++++++++++++++++++++++ app/meson.build | 1 + doc/guides/contributing/coding_style.rst | 12 ++++++++++ lib/librte_eal/include/meson.build | 2 +- lib/librte_ethdev/meson.build | 4 ++-- lib/librte_hash/meson.build | 4 ++-- lib/librte_ipsec/meson.build | 3 ++- lib/librte_lpm/meson.build | 2 +- lib/librte_regexdev/meson.build | 2 +- lib/librte_ring/meson.build | 4 +++- lib/librte_stack/meson.build | 4 +++- lib/librte_table/meson.build | 7 +++--- lib/meson.build | 3 +++ meson.build | 1 + meson_options.txt | 2 ++ 18 files changed, 85 insertions(+), 14 deletions(-) create mode 100755 app/chkincs/gen_c_file_for_header.py create mode 100644 app/chkincs/main.c create mode 100644 app/chkincs/meson.build -- 2.27.0 diff --git a/MAINTAINERS b/MAINTAINERS index 76ed473e44..49bb2aab2c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1561,6 +1561,10 @@ F: app/test/test_resource.c F: app/test/virtual_pmd.c F: app/test/virtual_pmd.h +Header build sanity checking +M: Bruce Richardson +F: app/chkincs/ + Sample packet helper functions for unit test M: Reshma Pattan F: app/test/sample_packet_forward.c diff --git a/app/chkincs/gen_c_file_for_header.py b/app/chkincs/gen_c_file_for_header.py new file mode 100755 index 0000000000..124cf96917 --- /dev/null +++ b/app/chkincs/gen_c_file_for_header.py @@ -0,0 +1,12 @@ +#! /usr/bin/env python3 +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2020-2021 Intel Corporation + +from sys import argv +from os.path import abspath + +(h_file, c_file) = argv[1:] + +contents = '#include "' + abspath(h_file) + '"' +with open(c_file, 'w') as cf: + cf.write(contents) diff --git a/app/chkincs/main.c b/app/chkincs/main.c new file mode 100644 index 0000000000..ecdf641954 --- /dev/null +++ b/app/chkincs/main.c @@ -0,0 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2020-2021 Intel Corporation + */ +int main(void) { return 0; } diff --git a/app/chkincs/meson.build b/app/chkincs/meson.build new file mode 100644 index 0000000000..7fea11c506 --- /dev/null +++ b/app/chkincs/meson.build @@ -0,0 +1,28 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2020-2021 Intel Corporation + +if not get_option('test_includes') + build = false + subdir_done() +endif + +if is_windows + # for windows, the shebang line in the script won't work. + error('option "test_includes" is not supported on windows') +endif + +gen_c_file_for_header = find_program('gen_c_file_for_header.py') +gen_c_files = generator(gen_c_file_for_header, + output: '@BASENAME@.c', + arguments: ['@INPUT@', '@OUTPUT@']) + +cflags += '-Wno-unused-function' # needed if we include generic headers + +# some ethdev headers depend on bus headers +includes += include_directories('../../drivers/bus/pci', + '../../drivers/bus/vdev') + +sources += files('main.c') +sources += gen_c_files.process(dpdk_chkinc_headers) + +deps = enabled_libs diff --git a/app/meson.build b/app/meson.build index 87fc195dbf..b8ee6d2e97 100644 --- a/app/meson.build +++ b/app/meson.build @@ -6,6 +6,7 @@ if is_windows endif apps = [ + 'chkincs', 'pdump', 'proc-info', 'test-acl', diff --git a/doc/guides/contributing/coding_style.rst b/doc/guides/contributing/coding_style.rst index bb3f3efcbc..041a3998ff 100644 --- a/doc/guides/contributing/coding_style.rst +++ b/doc/guides/contributing/coding_style.rst @@ -891,6 +891,18 @@ headers installed to $PREFIX/include when ``ninja install`` is run. As with source files, these should be specified using the meson ``files()`` function. + When ``test_headers`` build option is set to ``true``, each header file + has additional checks performed on it, for example to ensure that it is + not missing any include statements for dependent headers. These build + checks are done by the build of the ``dpdk-chkincs`` application, and + for header files which are public, but only included indirectly in + applications, these checks can be skipped by using the ``headers_no_chkincs`` + variable rather than ``headers``. + +headers_no_chkincs + **Default Value = []**. + As with ``headers`` option above, except that the files are not checked + as part of the build of the ``dpdk-chkincs`` binary. includes: **Default Value = []**. diff --git a/lib/librte_eal/include/meson.build b/lib/librte_eal/include/meson.build index 0dea342e1d..449740e510 100644 --- a/lib/librte_eal/include/meson.build +++ b/lib/librte_eal/include/meson.build @@ -16,7 +16,6 @@ headers += files( 'rte_dev.h', 'rte_devargs.h', 'rte_eal.h', - 'rte_eal_interrupts.h', 'rte_eal_memconfig.h', 'rte_eal_trace.h', 'rte_errno.h', @@ -49,6 +48,7 @@ headers += files( 'rte_version.h', 'rte_vfio.h', ) +headers_no_chkincs += files('rte_eal_interrupts.h') # special case install the generic headers, since they go in a subdir generic_headers = files( diff --git a/lib/librte_ethdev/meson.build b/lib/librte_ethdev/meson.build index e4b610246f..ab84869ea8 100644 --- a/lib/librte_ethdev/meson.build +++ b/lib/librte_ethdev/meson.build @@ -12,12 +12,10 @@ sources = files('ethdev_private.c', headers = files('rte_ethdev.h', 'rte_ethdev_driver.h', - 'rte_ethdev_core.h', 'rte_ethdev_pci.h', 'rte_ethdev_trace.h', 'rte_ethdev_trace_fp.h', 'rte_ethdev_vdev.h', - 'rte_eth_ctrl.h', 'rte_dev_info.h', 'rte_flow.h', 'rte_flow_driver.h', @@ -25,5 +23,7 @@ headers = files('rte_ethdev.h', 'rte_mtr_driver.h', 'rte_tm.h', 'rte_tm_driver.h') +headers_no_chkincs += files('rte_eth_ctrl.h', + 'rte_ethdev_core.h') deps += ['net', 'kvargs', 'meter', 'telemetry'] diff --git a/lib/librte_hash/meson.build b/lib/librte_hash/meson.build index 0977a63fd2..b3ebc8b078 100644 --- a/lib/librte_hash/meson.build +++ b/lib/librte_hash/meson.build @@ -1,12 +1,12 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation -headers = files('rte_crc_arm64.h', - 'rte_fbk_hash.h', +headers = files('rte_fbk_hash.h', 'rte_hash_crc.h', 'rte_hash.h', 'rte_jhash.h', 'rte_thash.h') +headers_no_chkincs += files('rte_crc_arm64.h') sources = files('rte_cuckoo_hash.c', 'rte_fbk_hash.c') deps += ['ring'] diff --git a/lib/librte_ipsec/meson.build b/lib/librte_ipsec/meson.build index fc69970ec5..e24e6ed22b 100644 --- a/lib/librte_ipsec/meson.build +++ b/lib/librte_ipsec/meson.build @@ -3,6 +3,7 @@ sources = files('esp_inb.c', 'esp_outb.c', 'sa.c', 'ses.c', 'ipsec_sad.c') -headers = files('rte_ipsec.h', 'rte_ipsec_group.h', 'rte_ipsec_sa.h', 'rte_ipsec_sad.h') +headers = files('rte_ipsec.h', 'rte_ipsec_sa.h', 'rte_ipsec_sad.h') +headers_no_chkincs += files('rte_ipsec_group.h') deps += ['mbuf', 'net', 'cryptodev', 'security', 'hash'] diff --git a/lib/librte_lpm/meson.build b/lib/librte_lpm/meson.build index f93c866409..3d3d515a4d 100644 --- a/lib/librte_lpm/meson.build +++ b/lib/librte_lpm/meson.build @@ -5,6 +5,6 @@ sources = files('rte_lpm.c', 'rte_lpm6.c') headers = files('rte_lpm.h', 'rte_lpm6.h') # since header files have different names, we can install all vector headers # without worrying about which architecture we actually need -headers += files('rte_lpm_altivec.h', 'rte_lpm_neon.h', 'rte_lpm_sse.h', 'rte_lpm_sve.h') +headers_no_chkincs += files('rte_lpm_altivec.h', 'rte_lpm_neon.h', 'rte_lpm_sse.h', 'rte_lpm_sve.h') deps += ['hash'] deps += ['rcu'] diff --git a/lib/librte_regexdev/meson.build b/lib/librte_regexdev/meson.build index c417b9caf0..1ab21bd4d8 100644 --- a/lib/librte_regexdev/meson.build +++ b/lib/librte_regexdev/meson.build @@ -3,6 +3,6 @@ sources = files('rte_regexdev.c') headers = files('rte_regexdev.h', - 'rte_regexdev_core.h', 'rte_regexdev_driver.h') +headers_no_chkincs += files('rte_regexdev_core.h') deps += ['mbuf'] diff --git a/lib/librte_ring/meson.build b/lib/librte_ring/meson.build index 36fdcb6a57..1a95dae9e5 100644 --- a/lib/librte_ring/meson.build +++ b/lib/librte_ring/meson.build @@ -2,7 +2,9 @@ # Copyright(c) 2017 Intel Corporation sources = files('rte_ring.c') -headers = files('rte_ring.h', +headers = files('rte_ring.h') +# most sub-headers are not for direct inclusion +headers_no_chkincs += files ( 'rte_ring_core.h', 'rte_ring_elem.h', 'rte_ring_c11_mem.h', diff --git a/lib/librte_stack/meson.build b/lib/librte_stack/meson.build index 8f82a40ec2..5d9b3601b3 100644 --- a/lib/librte_stack/meson.build +++ b/lib/librte_stack/meson.build @@ -2,7 +2,9 @@ # Copyright(c) 2019 Intel Corporation sources = files('rte_stack.c', 'rte_stack_std.c', 'rte_stack_lf.c') -headers = files('rte_stack.h', +headers = files('rte_stack.h') +# subheaders, not for direct inclusion by apps +headers_no_chkincs += files( 'rte_stack_std.h', 'rte_stack_lf.h', 'rte_stack_lf_generic.h', diff --git a/lib/librte_table/meson.build b/lib/librte_table/meson.build index d69678386e..a8b1c9a254 100644 --- a/lib/librte_table/meson.build +++ b/lib/librte_table/meson.build @@ -20,7 +20,6 @@ headers = files('rte_table.h', 'rte_table_hash.h', 'rte_table_hash_cuckoo.h', 'rte_table_hash_func.h', - 'rte_table_hash_func_arm64.h', 'rte_lru.h', 'rte_table_array.h', 'rte_table_stub.h', @@ -28,6 +27,6 @@ headers = files('rte_table.h', 'rte_swx_table_em.h',) deps += ['mbuf', 'port', 'lpm', 'hash', 'acl'] -if arch_subdir == 'x86' - headers += files('rte_lru_x86.h') -endif +headers_no_chkincs += files('rte_lru_x86.h', + 'rte_lru_arm64.h', + 'rte_table_hash_func_arm64.h') diff --git a/lib/meson.build b/lib/meson.build index ed00f89146..404809bd44 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -65,6 +65,7 @@ foreach l:libraries use_function_versioning = false sources = [] headers = [] + headers_no_chkincs = [] # public headers not directly included by apps includes = [] cflags = default_cflags objs = [] # other object files to link against, used e.g. for @@ -103,6 +104,8 @@ foreach l:libraries dpdk_conf.set('RTE_LIBRTE_' + name.to_upper(), 1) #old macro dpdk_conf.set('RTE_LIB_' + name.to_upper(), 1) # new macro install_headers(headers) + install_headers(headers_no_chkincs) + dpdk_chkinc_headers += headers libname = 'rte_' + name includes += include_directories(dir_name) diff --git a/meson.build b/meson.build index 45d974cd2c..7c9a8fce5f 100644 --- a/meson.build +++ b/meson.build @@ -16,6 +16,7 @@ cc = meson.get_compiler('c') dpdk_conf = configuration_data() dpdk_libraries = [] dpdk_static_libraries = [] +dpdk_chkinc_headers = [] dpdk_driver_classes = [] dpdk_drivers = [] dpdk_extra_ldflags = [] diff --git a/meson_options.txt b/meson_options.txt index 4604328224..37cd6e99ea 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -30,5 +30,7 @@ option('enable_trace_fp', type: 'boolean', value: false, description: 'enable fast path trace points.') option('tests', type: 'boolean', value: true, description: 'build unit tests') +option('test_includes', type: 'boolean', value: false, + description: 'build "chkincs" to verify each header file can compile alone') option('use_hpet', type: 'boolean', value: false, description: 'use HPET timer in EAL') From patchwork Fri Jan 15 11:10:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 86683 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 0A35BA0A02; Fri, 15 Jan 2021 12:13:43 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1C485140FC1; Fri, 15 Jan 2021 12:12:24 +0100 (CET) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by mails.dpdk.org (Postfix) with ESMTP id 552FE140FB9; Fri, 15 Jan 2021 12:12:22 +0100 (CET) IronPort-SDR: AGN9YrxVUNsVmRJOA3cKfi/C5Rzo46FsW6DmpwzeE6OVjuAFbC842GjC2UP9q5zyLQ7D+g8eg6 D+3R5zViJhFw== X-IronPort-AV: E=McAfee;i="6000,8403,9864"; a="158307608" X-IronPort-AV: E=Sophos;i="5.79,349,1602572400"; d="scan'208";a="158307608" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jan 2021 03:12:21 -0800 IronPort-SDR: ylJE25b+18xN84ikVQMBJOc9ENIJUtGLRam1VZmJYgDpiQFA9DVK2h0Fadv1armJV08+ijgUP8 W0/a/9AVA9Wg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.79,349,1602572400"; d="scan'208";a="401253053" Received: from silpixa00399126.ir.intel.com ([10.237.222.4]) by fmsmga002.fm.intel.com with ESMTP; 15 Jan 2021 03:12:19 -0800 From: Bruce Richardson To: dev@dpdk.org Cc: david.marchand@redhat.com, Bruce Richardson , stable@dpdk.org, Honnappa Nagarahalli , Phil Yang , Gavin Hu , Steve Capper Date: Fri, 15 Jan 2021 11:10:49 +0000 Message-Id: <20210115111052.16437-18-bruce.richardson@intel.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210115111052.16437-1-bruce.richardson@intel.com> References: <20210114110606.21142-1-bruce.richardson@intel.com> <20210115111052.16437-1-bruce.richardson@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v2 17/19] eal: add missing include to mcslock 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" Include 'rte_branch_prediction.h' to get the likely/unlikely macro definitions. Fixes: 2173f3333b61 ("mcslock: add MCS queued lock implementation") Cc: stable@dpdk.org Signed-off-by: Bruce Richardson Reviewed-by: Honnappa Nagarahalli --- lib/librte_eal/include/generic/rte_mcslock.h | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/librte_eal/include/generic/rte_mcslock.h b/lib/librte_eal/include/generic/rte_mcslock.h index d370bef17a..9f323bd2a2 100644 --- a/lib/librte_eal/include/generic/rte_mcslock.h +++ b/lib/librte_eal/include/generic/rte_mcslock.h @@ -22,6 +22,7 @@ #include #include #include +#include /** * The rte_mcslock_t type. From patchwork Fri Jan 15 11:10:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 86684 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 82859A0A02; Fri, 15 Jan 2021 12:13:51 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5B458140FB7; Fri, 15 Jan 2021 12:12:27 +0100 (CET) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by mails.dpdk.org (Postfix) with ESMTP id CDBBE140F38 for ; Fri, 15 Jan 2021 12:12:25 +0100 (CET) IronPort-SDR: 7nqmOcmBdlqhVHCGkx22N6J7FW2WYncoWSIMLSP4aqKJR2OHGPcpFvB5clOq76Mj7RnsRr4Xyx nQWTBgrsLRKw== X-IronPort-AV: E=McAfee;i="6000,8403,9864"; a="158307614" X-IronPort-AV: E=Sophos;i="5.79,349,1602572400"; d="scan'208";a="158307614" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jan 2021 03:12:25 -0800 IronPort-SDR: iwzGTGnZBrhMUA2bOWifqO8FHxCmGBDe7F0hGO4IAuEdXZYRKPqBx1WkI5A5PHcf0bdTtKcWkr pGn5jFivrU2g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.79,349,1602572400"; d="scan'208";a="401253076" Received: from silpixa00399126.ir.intel.com ([10.237.222.4]) by fmsmga002.fm.intel.com with ESMTP; 15 Jan 2021 03:12:24 -0800 From: Bruce Richardson To: dev@dpdk.org Cc: david.marchand@redhat.com, Bruce Richardson , Konstantin Ananyev Date: Fri, 15 Jan 2021 11:10:50 +0000 Message-Id: <20210115111052.16437-19-bruce.richardson@intel.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210115111052.16437-1-bruce.richardson@intel.com> References: <20210114110606.21142-1-bruce.richardson@intel.com> <20210115111052.16437-1-bruce.richardson@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v2 18/19] eal/x86: add architecture-specific headers to chkincs 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" Ensure the architecture-specific header files for x86 have all necessary includes in them. Signed-off-by: Bruce Richardson --- lib/librte_eal/x86/include/meson.build | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/lib/librte_eal/x86/include/meson.build b/lib/librte_eal/x86/include/meson.build index 549cc21a42..835ea22947 100644 --- a/lib/librte_eal/x86/include/meson.build +++ b/lib/librte_eal/x86/include/meson.build @@ -2,11 +2,7 @@ # Copyright(c) 2017 Intel Corporation arch_headers = files( - 'rte_atomic_32.h', - 'rte_atomic_64.h', 'rte_atomic.h', - 'rte_byteorder_32.h', - 'rte_byteorder_64.h', 'rte_byteorder.h', 'rte_cpuflags.h', 'rte_cycles.h', @@ -22,4 +18,12 @@ arch_headers = files( 'rte_ticketlock.h', 'rte_vect.h', ) -install_headers(arch_headers, subdir: get_option('include_subdir_arch')) +arch_headers_no_chkincs = files( + 'rte_atomic_32.h', + 'rte_atomic_64.h', + 'rte_byteorder_32.h', + 'rte_byteorder_64.h', +) +install_headers(arch_headers + arch_headers_no_chkincs, + subdir: get_option('include_subdir_arch')) +dpdk_chkinc_headers += arch_headers From patchwork Fri Jan 15 11:10:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 86685 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6129CA0A02; Fri, 15 Jan 2021 12:14:00 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 90BDD140FB9; Fri, 15 Jan 2021 12:12:36 +0100 (CET) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mails.dpdk.org (Postfix) with ESMTP id B898B140F83 for ; Fri, 15 Jan 2021 12:12:34 +0100 (CET) IronPort-SDR: QUJfMh2dK9iKkdh7pG19z2ziRS8mhkmI91LN/duhIdMNc6aBef4lo8M12SAN79+WgzTg6Jy7mu p7Mvajakmhkw== X-IronPort-AV: E=McAfee;i="6000,8403,9864"; a="178620331" X-IronPort-AV: E=Sophos;i="5.79,349,1602572400"; d="scan'208";a="178620331" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jan 2021 03:12:33 -0800 IronPort-SDR: 7M9yRvfZknXgFJPPcgm7N8fYUXCW0t7uCDsMf1CNqokWOLlLv8xjYD/8r78HDdk+ZKc58eo65B Xqg+mjQEMXtw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.79,349,1602572400"; d="scan'208";a="401253105" Received: from silpixa00399126.ir.intel.com ([10.237.222.4]) by fmsmga002.fm.intel.com with ESMTP; 15 Jan 2021 03:12:32 -0800 From: Bruce Richardson To: dev@dpdk.org Cc: david.marchand@redhat.com, Bruce Richardson Date: Fri, 15 Jan 2021 11:10:51 +0000 Message-Id: <20210115111052.16437-20-bruce.richardson@intel.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210115111052.16437-1-bruce.richardson@intel.com> References: <20210114110606.21142-1-bruce.richardson@intel.com> <20210115111052.16437-1-bruce.richardson@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v2 19/19] test-meson-builds: add includes check to default x86 build 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" Since the includes check is disabled by default, we need to explicitly enable it to have it run. To minimise any extra build time when running the test-meson-builds script, we just add it to the default x86 build. Signed-off-by: Bruce Richardson --- devtools/test-meson-builds.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh index 00e3d0b443..5dca9b3bce 100755 --- a/devtools/test-meson-builds.sh +++ b/devtools/test-meson-builds.sh @@ -220,7 +220,7 @@ default_machine='nehalem' if ! check_cc_flags "-march=$default_machine" ; then default_machine='corei7' fi -build build-x86-default cc -Dlibdir=lib -Dmachine=$default_machine $use_shared +build build-x86-default cc -Dlibdir=lib -Dmachine=$default_machine -Dtest_includes=true $use_shared # 32-bit with default compiler if check_cc_flags '-m32' ; then