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 B1488A0567 for ; Wed, 10 Mar 2021 12:04:04 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A28BC40687; Wed, 10 Mar 2021 12:04:04 +0100 (CET) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mails.dpdk.org (Postfix) with ESMTP id 91B8540687 for ; Wed, 10 Mar 2021 12:04:02 +0100 (CET) IronPort-SDR: LN5AG4lDAlJMbpA/2TQvaPxCyAmgJ2/KQuTIrVrLWMCL2son9AxfsnnKsvWsvnHLZnEsA517Js znycmFUNDnxg== X-IronPort-AV: E=McAfee;i="6000,8403,9917"; a="188480617" X-IronPort-AV: E=Sophos;i="5.81,237,1610438400"; d="scan'208";a="188480617" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Mar 2021 03:04:01 -0800 IronPort-SDR: 8/hw1AeORKcS+ySkIsVujBNMOJKfAO4/c3zayHDdmA7biMC8nBuQ2KFT78DYDCV6xmWTyKRpzV cQUX7hugq13Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,237,1610438400"; d="scan'208";a="603042430" Received: from irsmsx601.ger.corp.intel.com ([163.33.146.7]) by fmsmga005.fm.intel.com with ESMTP; 10 Mar 2021 03:04:00 -0800 Received: from irsmsx601.ger.corp.intel.com (163.33.146.7) by irsmsx601.ger.corp.intel.com (163.33.146.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2106.2; Wed, 10 Mar 2021 11:03:59 +0000 Received: from irsmsx601.ger.corp.intel.com ([163.33.146.7]) by irsmsx601.ger.corp.intel.com ([163.33.146.7]) with mapi id 15.01.2106.013; Wed, 10 Mar 2021 11:03:59 +0000 From: "Richardson, Bruce" To: "Power, Ciara" , "stable@dpdk.org" CC: "christian.ehrhardt@canonical.com" , "Doherty, Declan" , Thomas Monjalon Thread-Topic: [PATCH 19.11.7] build: fix scheduler macro definition for meson Thread-Index: AQHXFZum8dRn/4GjI0yRht+YXx7njap9DUag Date: Wed, 10 Mar 2021 11:03:59 +0000 Message-ID: <80fe3045224c4cf488e1df2197640fa7@intel.com> References: <20210310105342.3214855-1-ciara.power@intel.com> In-Reply-To: <20210310105342.3214855-1-ciara.power@intel.com> Accept-Language: en-GB, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-version: 11.5.1.3 dlp-product: dlpe-windows dlp-reaction: no-action x-originating-ip: [163.33.253.164] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [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" > -----Original Message----- > From: Power, Ciara > Sent: Wednesday, March 10, 2021 10:54 AM > To: stable@dpdk.org > Cc: christian.ehrhardt@canonical.com; Power, Ciara > ; Richardson, Bruce ; > Doherty, Declan ; Thomas Monjalon > > Subject: [PATCH 19.11.7] build: fix scheduler macro definition for meson >=20 > 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. >=20 I think that this paragraph needs clarifying a bit, in particular to make i= t clear that meson build files are checking the "make" macro.=20 It might also be useful to actually give the "make" and "meson" definitions= for clarity. > 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. >=20 > 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. >=20 > 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 >=20 > Signed-off-by: Ciara Power >=20 For this simple approach: Acked-by: Bruce Richardson One further comment below. > --- > [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(-) >=20 > 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 =3D files('cperf_ops.c', > 'cperf_test_verify.c', > 'main.c') > deps +=3D ['cryptodev', 'security'] > -if dpdk_conf.has('RTE_LIBRTE_PMD_CRYPTO_SCHEDULER') > +if dpdk_conf.has('RTE_LIBRTE_CRYPTO_SCHEDULER_PMD') > deps +=3D '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 >=20 > -if dpdk_conf.has('RTE_LIBRTE_PMD_CRYPTO_SCHEDULER') > +if dpdk_conf.has('RTE_LIBRTE_CRYPTO_SCHEDULER_PMD') > driver_test_names +=3D 'cryptodev_scheduler_autotest' > test_deps +=3D '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 >=20 > +#ifdef RTE_LIBRTE_CRYPTO_SCHEDULER_PMD I think you should add a comment here explaining that this is the macro def= ined by make, and added here for compatibility. > +#define RTE_LIBRTE_PMD_CRYPTO_SCHEDULER 1 > +#endif > + > /* KNI defines */ > #define RTE_KNI_PREEMPT_DEFAULT 1 >=20 > 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' >=20 > deps +=3D 'cryptodev' > -if dpdk_conf.has('RTE_LIBRTE_PMD_CRYPTO_SCHEDULER') > +if dpdk_conf.has('RTE_LIBRTE_CRYPTO_SCHEDULER_PMD') > deps +=3D 'pmd_crypto_scheduler' > endif > allow_experimental_apis =3D true > -- > 2.25.1