From patchwork Wed Sep 16 16:44:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 77914 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 27E43A04B5; Wed, 16 Sep 2020 18:45:21 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 3CF001D172; Wed, 16 Sep 2020 18:44:47 +0200 (CEST) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by dpdk.org (Postfix) with ESMTP id 01E231D172; Wed, 16 Sep 2020 18:44:43 +0200 (CEST) IronPort-SDR: 7FUMubcHR+lXS+6okKLNiMgJo/8jj97E46uJ5LrfERQyhqASXT3uKRDBw0odneTc1gcWmm9cgF 9Vc4HX686KHQ== X-IronPort-AV: E=McAfee;i="6000,8403,9746"; a="160441958" X-IronPort-AV: E=Sophos;i="5.76,433,1592895600"; d="scan'208";a="160441958" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Sep 2020 09:44:43 -0700 IronPort-SDR: ndEA7sMyC4QxQKYIo/kqkVwXFHJAzGM2wTAOYSzgixgO3MsvkHcBtgKoplCgSPfGKX3gsfclUd I3UiojR8Jb5Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,433,1592895600"; d="scan'208";a="483381432" Received: from silpixa00399126.ir.intel.com ([10.237.222.27]) by orsmga005.jf.intel.com with ESMTP; 16 Sep 2020 09:44:42 -0700 From: Bruce Richardson To: david.marchand@redhat.com Cc: dev@dpdk.org, Bruce Richardson , stable@dpdk.org Date: Wed, 16 Sep 2020 17:44:28 +0100 Message-Id: <20200916164429.244847-5-bruce.richardson@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200916164429.244847-1-bruce.richardson@intel.com> References: <20200916164429.244847-1-bruce.richardson@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [RFC PATCH 4/5] build: add defines for compatibility with make build 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" While meson has standardized the names and macros used for the libraries and drivers in DPDK, the old macros used from the make system were not previously announced as deprecated. Therefore to ensure compatibility of apps being rebuilt, we add these defines back in when appropriate. Fixes: 5b9656b157d3 ("lib: build with meson") Fixes: 9314afb68a53 ("drivers: add infrastructure for meson build") Cc: stable@dpdk.org Signed-off-by: Bruce Richardson --- config/meson.build | 3 +- config/rte_compatibility_defines.h | 129 +++++++++++++++++++++++++++ config/rte_config.h | 1 + doc/guides/rel_notes/deprecation.rst | 9 ++ 4 files changed, 141 insertions(+), 1 deletion(-) create mode 100644 config/rte_compatibility_defines.h diff --git a/config/meson.build b/config/meson.build index 6996e5cbea..ef74cebaaa 100644 --- a/config/meson.build +++ b/config/meson.build @@ -245,7 +245,8 @@ dpdk_conf.set('RTE_COMPILE_TIME_CPUFLAGS', ','.join(compile_time_cpuflags)) # set the install path for the drivers dpdk_conf.set_quoted('RTE_EAL_PMD_PATH', eal_pmd_path) -install_headers('rte_config.h', subdir: get_option('include_subdir_arch')) +install_headers(['rte_config.h', 'rte_compatibility_defines.h'], + subdir: get_option('include_subdir_arch')) # enable VFIO only if it is linux OS dpdk_conf.set('RTE_EAL_VFIO', is_linux) diff --git a/config/rte_compatibility_defines.h b/config/rte_compatibility_defines.h new file mode 100644 index 0000000000..47600052b6 --- /dev/null +++ b/config/rte_compatibility_defines.h @@ -0,0 +1,129 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2017 Intel Corporation + */ + +#ifndef _RTE_CONFIG_H_ +#error "This file should only be included via rte_config.h" +#endif + +/* + * NOTE: these defines are for compatibility only and will be removed in a + * future DPDK release. + */ + +#ifdef RTE_LIBRTE_BITRATESTATS +#define RTE_LIBRTE_BITRATE +#endif + +#ifdef RTE_LIBRTE_LATENCYSTATS +#define RTE_LIBRTE_LATENCY_STATS +#endif + +#ifdef RTE_LIBRTE_DPAAX_COMMON +#define RTE_LIBRTE_COMMON_DPAAX +#endif + +#ifdef RTE_LIBRTE_VMBUS_BUS +#define RTE_LIBRTE_VMBUS +#endif + +#ifdef RTE_LIBRTE_BUCKET_MEMPOOL +#define RTE_DRIVER_MEMPOOL_BUCKET +#endif + +#ifdef RTE_LIBRTE_RING_MEMPOOL +#define RTE_DRIVER_MEMPOOL_RING +#endif + +#ifdef RTE_LIBRTE_STACK_MEMPOOL +#define RTE_DRIVER_MEMPOOL_STACK +#endif + +#ifdef RTE_LIBRTE_AF_PACKET_PMD +#define RTE_LIBRTE_PMD_AF_PACKET +#endif + +#ifdef RTE_LIBRTE_AF_XDP_PMD +#define RTE_LIBRTE_PMD_AF_XDP +#endif + +#ifdef RTE_LIBRTE_BOND_PMD +#define RTE_LIBRTE_PMD_BOND +#endif + +#ifdef RTE_LIBRTE_E1000_PMD +#define RTE_LIBRTE_EM_PMD +#endif + +#ifdef RTE_LIBRTE_E1000_PMD +#define RTE_LIBRTE_IGB_PMD +#endif + +#ifdef RTE_LIBRTE_FAILSAFE_PMD +#define RTE_LIBRTE_PMD_FAILSAFE +#endif + +#ifdef RTE_LIBRTE_KNI_PMD +#define RTE_LIBRTE_PMD_KNI +#endif + +#ifdef RTE_LIBRTE_LIQUIDIO_PMD +#define RTE_LIBRTE_LIO_PMD +#endif + +#ifdef RTE_LIBRTE_MEMIF_PMD +#define RTE_LIBRTE_PMD_MEMIF +#endif + +#ifdef RTE_LIBRTE_NULL_PMD +#define RTE_LIBRTE_PMD_NULL +#endif + +#ifdef RTE_LIBRTE_PCAP_PMD +#define RTE_LIBRTE_PMD_PCAP +#endif + +#ifdef RTE_LIBRTE_RING_PMD +#define RTE_LIBRTE_PMD_RING +#endif + +#ifdef RTE_LIBRTE_SFC_PMD +#define RTE_LIBRTE_SFC_EFX_PMD +#endif + +#ifdef RTE_LIBRTE_SOFTNIC_PMD +#define RTE_LIBRTE_PMD_SOFTNIC +#endif + +#ifdef RTE_LIBRTE_SZEDATA2_PMD +#define RTE_LIBRTE_PMD_SZEDATA2 +#endif + +#ifdef RTE_LIBRTE_TAP_PMD +#define RTE_LIBRTE_PMD_TAP +#endif + +#ifdef RTE_LIBRTE_THUNDERX_PMD +#define RTE_LIBRTE_THUNDERX_NICVF_PMD +#endif + +#ifdef RTE_LIBRTE_VHOST_PMD +#define RTE_LIBRTE_PMD_VHOST +#endif + +#ifdef RTE_LIBRTE_PMD_ARMV8 +#define RTE_LIBRTE_PMD_ARMV8_CRYPTO +#endif + +#ifdef RTE_LIBRTE_PMD_MVSAM +#define RTE_LIBRTE_PMD_MVSAM_CRYPTO +#endif + +#ifdef RTE_LIBRTE_PMD_OCTEONTX_COMPRESS +#define RTE_LIBRTE_PMD_OCTEONTX_ZIPVF +#endif + +#ifdef RTE_LIBRTE_PMD_OCTEONTX_EVENTDEV +#define RTE_LIBRTE_PMD_OCTEONTX_SSOVF +#endif + diff --git a/config/rte_config.h b/config/rte_config.h index 0bae630fd9..cacc1837cf 100644 --- a/config/rte_config.h +++ b/config/rte_config.h @@ -13,6 +13,7 @@ #define _RTE_CONFIG_H_ #include +#include /* legacy defines */ #ifdef RTE_EXEC_ENV_LINUX diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst index 5b5a52fa65..fe1b988bb8 100644 --- a/doc/guides/rel_notes/deprecation.rst +++ b/doc/guides/rel_notes/deprecation.rst @@ -19,6 +19,15 @@ Deprecation Notices are present in this release, but those ending in ``_PMD`` will be removed in a future release, and should not be used. +* build: A number of macros, which defined what DPDK components were being + built, are deprecated due to them not conforming to the standard naming + scheme for the relevant library template or driver class template. These + deprecated macros can be found in the file + ``config/rte_compatibility_defines.h``, listed in the format ``#ifdef + \ #define \ #endif``. When updating code, + ``OLD_DEFINE`` should be replaced with the relevant ``NEW_DEFINE`` from + that file. + * meson: The minimum supported version of meson for configuring and building DPDK will be increased to v0.47.1 (from 0.41) from DPDK 19.05 onwards. For those users with a version earlier than 0.47.1, an updated copy of meson