From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 320F5A0567 for ; Wed, 10 Mar 2021 11:53:51 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0C59940687; Wed, 10 Mar 2021 11:53:51 +0100 (CET) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by mails.dpdk.org (Postfix) with ESMTP id 33E3640687 for ; Wed, 10 Mar 2021 11:53:49 +0100 (CET) IronPort-SDR: tyFKIIgeSItd1HA/Imt/X09dAP+GUyYpFVFZAorIPqkm3wBrdM2jh1Xo6mSnusLAedR8U8VMMm Uqfvhk94ITdA== X-IronPort-AV: E=McAfee;i="6000,8403,9917"; a="185084638" X-IronPort-AV: E=Sophos;i="5.81,237,1610438400"; d="scan'208";a="185084638" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Mar 2021 02:53:48 -0800 IronPort-SDR: Ir7UDNW/k0q7CgkIMjL71lZdg4Y2GEQMVI+t+jmPQK7il+s6fnzv8bdNkpyhghkMdpCHs/f/WT RzBp+OQN53IQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,237,1610438400"; d="scan'208";a="588796049" Received: from silpixa00400355.ir.intel.com (HELO silpixa00400355.ger.corp.intel.com) ([10.237.223.148]) by orsmga005.jf.intel.com with ESMTP; 10 Mar 2021 02:53:46 -0800 From: Ciara Power To: stable@dpdk.org Cc: christian.ehrhardt@canonical.com, Ciara Power , bruce.richardson@intel.com, Declan Doherty , Thomas Monjalon Date: Wed, 10 Mar 2021 10:53:42 +0000 Message-Id: <20210310105342.3214855-1-ciara.power@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] [PATCH 19.11.7] build: fix scheduler macro definition for meson X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" The make and meson macro formats differ slightly, the make format is checked when registering the scheduler_autotest command, and when including dependency on the scheduler pmd for the test, l2fwd-crypto and test-crypto-perf apps. When building with meson, these things were not done, and the scheduler autotest was unavailable. To fix this, the scheduler macro in make format is also defined when using meson, and the meson build files for the apps use the meson format when adding the scheduler dependency. A generalised fix patch [1] for this issue didn't make it into 19.11.6, but given that does not apply cleanly and introduces other unwanted changes, this patch is an alternative fix for the scheduler test issue only. Fixes: 4dfc61fe367c ("app: fix missing dependencies") Fixes: dcadbbde8e61 ("crypto/null: build with meson") Fixes: 52e2991eab28 ("examples/l2fwd-crypto: fix missing dependency") Cc: bruce.richardson@intel.com Cc: stable@dpdk.org Signed-off-by: Ciara Power --- [1] inbox.dpdk.org/dev/20201015150554.950838-4-bruce.richardson@intel.com/ --- app/test-crypto-perf/meson.build | 2 +- app/test/meson.build | 2 +- config/rte_config.h | 4 ++++ examples/l2fwd-crypto/meson.build | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/test-crypto-perf/meson.build b/app/test-crypto-perf/meson.build index c416091fdd..dcc4bf9cbc 100644 --- a/app/test-crypto-perf/meson.build +++ b/app/test-crypto-perf/meson.build @@ -13,6 +13,6 @@ sources = files('cperf_ops.c', 'cperf_test_verify.c', 'main.c') deps += ['cryptodev', 'security'] -if dpdk_conf.has('RTE_LIBRTE_PMD_CRYPTO_SCHEDULER') +if dpdk_conf.has('RTE_LIBRTE_CRYPTO_SCHEDULER_PMD') deps += 'pmd_crypto_scheduler' endif diff --git a/app/test/meson.build b/app/test/meson.build index df94b4d48f..24fb59f74f 100644 --- a/app/test/meson.build +++ b/app/test/meson.build @@ -378,7 +378,7 @@ if dpdk_conf.has('RTE_LIBRTE_COMPRESSDEV') endif endif -if dpdk_conf.has('RTE_LIBRTE_PMD_CRYPTO_SCHEDULER') +if dpdk_conf.has('RTE_LIBRTE_CRYPTO_SCHEDULER_PMD') driver_test_names += 'cryptodev_scheduler_autotest' test_deps += 'pmd_crypto_scheduler' endif diff --git a/config/rte_config.h b/config/rte_config.h index 0f9dae3ba2..8ec0a58f19 100644 --- a/config/rte_config.h +++ b/config/rte_config.h @@ -94,6 +94,10 @@ #define RTE_SCHED_PORT_N_GRINDERS 8 #undef RTE_SCHED_VECTOR +#ifdef RTE_LIBRTE_CRYPTO_SCHEDULER_PMD +#define RTE_LIBRTE_PMD_CRYPTO_SCHEDULER 1 +#endif + /* KNI defines */ #define RTE_KNI_PREEMPT_DEFAULT 1 diff --git a/examples/l2fwd-crypto/meson.build b/examples/l2fwd-crypto/meson.build index 39e1604fac..c08d8469b4 100644 --- a/examples/l2fwd-crypto/meson.build +++ b/examples/l2fwd-crypto/meson.build @@ -7,7 +7,7 @@ # DPDK instance, use 'make' deps += 'cryptodev' -if dpdk_conf.has('RTE_LIBRTE_PMD_CRYPTO_SCHEDULER') +if dpdk_conf.has('RTE_LIBRTE_CRYPTO_SCHEDULER_PMD') deps += 'pmd_crypto_scheduler' endif allow_experimental_apis = true -- 2.25.1