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 B6589A00C2; Sun, 30 Oct 2022 14:34:13 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A796242B72; Sun, 30 Oct 2022 14:34:13 +0100 (CET) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2044.outbound.protection.outlook.com [40.107.244.44]) by mails.dpdk.org (Postfix) with ESMTP id 48AE642B70 for ; Sun, 30 Oct 2022 14:34:11 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ew8V991c7V+oj59ImviEsMQKugWXJiuxh/PEBnKV9QnzwtTeO9MAv+1i+ZB+mHwLNLybZKIB4v04ZHbxpp2NDHkEs/WMYJe87QOisX/MjYu5HC+weP4kbB0MkxD2eCFSpaOg5+Dkoj0lkVAPob/WlDSrHpvFOzULPH1mm5fBurH69BxU+ChO2vvBzYs+9P2fP+k/NMRJB75IFFz00wwUZfOxyz0jKyS5/6ylRRjOXhfNDkKSZeJSZCnPJ2nG17SUg15GOfelZRzRH4+9I2n+lDpKeOlOfuoXJpDvmGRO974rHL/1SpBWw/KhlvkE56ohNlqxqCT+WCVPjTkupA3thw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=hAm724J0HbJGN24KjSLzX/HVRJs7HUO+vKsO9rNVUqs=; b=KPQtsElmAFRWB4Y9bUha7IFe3zMqzTLveLKAFa2cjfmvHNGa3uPnr2MBAEfmaairFQ6nwzBY1Pb7mfFtIYqjNc4jhgrdrs5Lj860ZpR6hlS6xHg+gVyNXNRM+koBr/msizhiCrN3TBkHMEGIEQBkD7Sf60qvw33E7IcLNfcMaz+Mfmyr2wMyzZ5mXnV9evIcekzR7cdlgjZd5jwL//YX1QwiHXE264R+UyAAORWy5KEUEXByWGfZgrvqL2IXSwdoyBS7nR3S/YGG393GFopJwVf8uir0SuuLWSx18ZRLAL12YOSXxMsGdipj/dQkYMvzxREsQg0UdvE7NEvY9+g4QA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nvidia.com; dmarc=pass action=none header.from=nvidia.com; dkim=pass header.d=nvidia.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=hAm724J0HbJGN24KjSLzX/HVRJs7HUO+vKsO9rNVUqs=; b=MPtHWV5/eZTtpNLi/BQiYdQGCWwueY5xMSbtrzUOP+Oh2YpHAC84advu5j/5KBcZiFKEoDKivgRcQL6+O9APN1jBHu4kfMLGTu4AkYI8KjZFBxjY7EFw53Rb9htzP2SekrILgEkStbHUa8EYs2+Jdnz99Hqo7iNSvWZ2L/dJjbw13FmYBQAVzmKpUV0zR+8rCCbgEW0gYnwTXaLpB2DfyXkbZaEiLQCOzViRENkx9iTZGL0ZOk2ycd9wooCg+SIdBY7X6mstG0NXuJkpj+hFdoNNfv+wvkGMklKAiCJOcBrn5UfCwDHO3LuvPuoPBhC8kV7isKl4pR/TWSn+blzZNQ== Received: from DM4PR12MB5150.namprd12.prod.outlook.com (2603:10b6:5:391::23) by CY8PR12MB7561.namprd12.prod.outlook.com (2603:10b6:930:94::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5746.28; Sun, 30 Oct 2022 13:34:09 +0000 Received: from DM4PR12MB5150.namprd12.prod.outlook.com ([fe80::67b0:c86d:6345:c883]) by DM4PR12MB5150.namprd12.prod.outlook.com ([fe80::67b0:c86d:6345:c883%9]) with mapi id 15.20.5769.019; Sun, 30 Oct 2022 13:34:09 +0000 From: Alex Vesker To: "NBU-Contact-Thomas Monjalon (EXTERNAL)" , "dev@dpdk.org" CC: "ferruh.yigit@amd.com" , "andrew.rybchenko@oktetlabs.ru" , Raslan Darawsheh , "david.marchand@redhat.com" , Matan Azrad , Slava Ovsiienko Subject: RE: [PATCH v3 2/2] common/mlx5: move build config initialization and check Thread-Topic: [PATCH v3 2/2] common/mlx5: move build config initialization and check Thread-Index: AQHY7FAPungzXko1wEmL+W/YC590BK4m7+cw Date: Sun, 30 Oct 2022 13:34:09 +0000 Message-ID: References: <20221030110827.1994953-1-thomas@monjalon.net> <20221030110827.1994953-3-thomas@monjalon.net> In-Reply-To: <20221030110827.1994953-3-thomas@monjalon.net> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: DM4PR12MB5150:EE_|CY8PR12MB7561:EE_ x-ms-office365-filtering-correlation-id: 0275dc57-179a-4a06-cc1b-08daba7b6cb9 x-ld-processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 3+03YGcY/yjFLAR49sLBEpyRkvBpLGGKfmPBUNL8qQxUJeYU/caM0kSyh4l1nG6pfXsNVUOG8oN9r8zFUW/MlGqA6J8NAsxOVnhxE47GztbStusmpd7OfCOVL20erNIbmaGnKR6on4FfTXCA9F+IhP3ShRXvBpYeM7uTDvFU21d1zgD8aGySXHnG3Zb/464/XSJ0e5pnnG0zfnPBwzNVUPikuTnkVaAL499CVczhw6AIgZtmeH65ufyXPAoEFPxmuZA6yp1F9RH5qck2z9Ty1e829wHPWCH6nvZDFFPAM3OlxAVdKMZFfejU7fXp6ZUv5CWO14Myxs5V6bglWIjJU3E9GUikTTYzKhmh58sDjuwe4UELVWdP/aVWzzvjE5iPMjpjBG38k7Dkt7mDHRVc7FQNyE0BQqVtwWHCvtNw1mV29HvUcVDMD1QtnYOc4rf2xIga0CXoi9m1JRelHM9VY/WB94VMviDKdEWOo35UZ5pIm1ldO1n12GX0lKqejwzpC9HwkfXTSQdi40rmJYVKVTOE8/+oXUmVQRR0SST1VRTEGJZexDswdyY7JEtsdVTd9/qj6HKIuNN4VsJdsVnA3em5IJgfFLIMINTmlylzg7HoDJnSfWX2KKwTZrR/L466PijHvFzy2TmVB+yHb7m8UNiekd2UBv+QXCJXvPxh0eI/lfHjRaJ7F/YRueQe1qgOlQGBc6mp0t/sywNzmsAfi2vumPe+Wd3k6JuUHaNazpftiXKxamboWCGBw59XMdmqkJrGeybvXUvk5BlbTmM/+A== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM4PR12MB5150.namprd12.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(4636009)(366004)(396003)(39860400002)(376002)(136003)(346002)(451199015)(83380400001)(55016003)(2906002)(54906003)(86362001)(38070700005)(5660300002)(38100700002)(52536014)(122000001)(186003)(8936002)(8676002)(66946007)(478600001)(9686003)(7696005)(6506007)(64756008)(41300700001)(66476007)(66556008)(33656002)(71200400001)(110136005)(107886003)(53546011)(76116006)(316002)(4326008)(66446008); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?YPrc7jK4zz7TRycM0/bIDUib/D00xb5XHxRH+Mo2Qb+M7FQXftCLw2oZ3p8V?= =?us-ascii?Q?BKl7eyIuTRj5ERXzqlL80rgzWr8bFZ6tIA2D+QViIHYDlqpPibcB8ULBV1MA?= =?us-ascii?Q?KzYqLp71QbTvxP7QZIKjEs1laanPo2ayfzlQwLZ8u0+IPuK4kztI3uvoIg9e?= =?us-ascii?Q?MhwEH84b7YPv5S0yJefgy1KPmJHekI6u2KOp3VPPUcw7Blmrzdu4oUysU7an?= =?us-ascii?Q?+GlEiJgJStTLBj1HQVT0PuB9Eg3UiaTlTQu/IamybVL9ZU2Y1fSVwruQ1FIV?= =?us-ascii?Q?uiTTQDpkzhUtsFEHNmZi+7jTUm8E5gyrpZYeXCkmLRKLHy9AzsAZoQ33+NzG?= =?us-ascii?Q?/gWLl5kP1XtZxZl5tn4gtNr96Iy5A9o/fx4FZhE7rrNQP1quwc7W7BHW8+HA?= =?us-ascii?Q?/M8o/eN7tCucmplYBcNcIMNublXVlC/XVCm/WN2hHkNKTERLXt15TKsLXdTA?= =?us-ascii?Q?O5IHtSQBOVrr+YWMPFoEjEeFD8UJ8bgoSi+QLISEQ6ksf86e0ntpOx/FXKvQ?= =?us-ascii?Q?ppCWY9ZOlqt639/ogkCq0TmbAPzFkPlMVBg704f454+eZVvwc+l5a+QSRrJP?= =?us-ascii?Q?+3PlPYBtjfX4eQzJccSP2knrBdqDkRgcgFi9zaFcVx0DigUBlxacrLH4RlfF?= =?us-ascii?Q?XsqUzaWnKDF+9GxIy1M9swCaEuJY/VDrU8uEOFOiOgpJSuhpiJeUUYPjRtjt?= =?us-ascii?Q?7uEzYQF8tfu+41LxKX9YoGHzroVW4Sy+gmsgH9AOmaJSGO5OZ8lgKRMEGNP9?= =?us-ascii?Q?ZwtDK22eOed+kQuNNVOf1/ysy+eDLxDvkp5SJnRsAKxVEBZY/K4wk7Y23ASa?= =?us-ascii?Q?SlrtRzduBhupmEt07DvXMIy2rPsYQ+TRzCKpJ2leg5FIuCo0gtvDtGv/Duyd?= =?us-ascii?Q?pubBBPOcx8VA5AqYnzaG7yn5sBLHDYsu1JS96jSsRA5pvGm8k7g0QWEKfyYn?= =?us-ascii?Q?8RJBiEamfZOwMlPRnuwieMEzbKnr8KI+EW7/OGmpIg1bDwXwAIgttsF8heph?= =?us-ascii?Q?GmdWgvkilj357axF3XTRT7/H4goQcfavthVpZ6VOXDt5HWznkri7VAqEoMWt?= =?us-ascii?Q?gziBOdhD4deFP7hhHRLzF9dUTy+dKCnuafg/Bd5bsts9BXNo9TNVmlyM6Q6i?= =?us-ascii?Q?QyH+AFvhuiw4vOvmwEfp3vm8w8auGXsuIW2Y+yXcMv9U2AOxx3SAoZ0mGq03?= =?us-ascii?Q?YsIfJ/Xc4k/pM8lcyW+y/LShsvL+MDsr2LoWwX0zvdBXv1PqmVDeK5alvvPI?= =?us-ascii?Q?BJMKBdqALefYw8KU6bUnSBScDOkzvarHSRM6ql7RQkPc/FM3SE6jjoRsE3iy?= =?us-ascii?Q?xVYao2lOjcFxaHNkQTkRzDTQ5hUdGKfoX6f/jC9AADje6pOQo/D7+A1CbLl7?= =?us-ascii?Q?nMYXeAhgK5YcXKqXMWM6m0bi72Kgvh4K5Fuuc7O2hS3tjzMIjV0hZ9tZwiM9?= =?us-ascii?Q?sggIDvfbFPiTPBK8+dd3G5ZpomtzyXH4KxiubR+qNehV07xfzgWr6maXftzF?= =?us-ascii?Q?FGDE+OeansNQiAeCh5sorbEUxi95R+6PXpPyyt2upO9NpnSaNpevda9zH7DP?= =?us-ascii?Q?A3D5hezZdukBYBU0d7ltOiR9OZ/RknAlNO9ww3dfcqMzNKrIYY+YwSin781D?= =?us-ascii?Q?jonCmP0jansj+ZWaolEr5unXufaolb13WhB3MoovXkJx?= Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM4PR12MB5150.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0275dc57-179a-4a06-cc1b-08daba7b6cb9 X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Oct 2022 13:34:09.3893 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: IzQb8P5LbvdakfMJNU/TijZ2nVsIwllof8dfrmL53KdKS+MBh7Hbv23rtphJaeh/Bk4MzGKBKaTsxIBvTHFbkA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR12MB7561 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 > -----Original Message----- > From: Thomas Monjalon > Sent: Sunday, October 30, 2022 1:08 PM > To: dev@dpdk.org > Cc: Alex Vesker ; ferruh.yigit@amd.com; > andrew.rybchenko@oktetlabs.ru; Raslan Darawsheh ; > david.marchand@redhat.com; Matan Azrad ; Slava > Ovsiienko > Subject: [PATCH v3 2/2] common/mlx5: move build config initialization and > check >=20 > The variable mlx5_config may be used by other mlx5 drivers and should be > always initialized. > By moving its initialization (with configuration file generation), it is = made > consistent for Linux and Windows builds. >=20 > And the check of mlx5_config in net/mlx5 is moved at the top of > net/mlx5/hws/meson.build so HWS requirements are in the right context. >=20 > Signed-off-by: Thomas Monjalon > Tested-by: Andrew Rybchenko > Reviewed-by: David Marchand > Acked-by: Matan Azrad > --- > drivers/common/mlx5/linux/meson.build | 3 +-- > drivers/common/mlx5/meson.build | 2 ++ > drivers/common/mlx5/windows/meson.build | 4 ---- > drivers/net/mlx5/hws/meson.build | 4 ++++ > drivers/net/mlx5/meson.build | 4 +--- > 5 files changed, 8 insertions(+), 9 deletions(-) >=20 > diff --git a/drivers/common/mlx5/linux/meson.build > b/drivers/common/mlx5/linux/meson.build > index 84e2a1ad8c..7e1575efc8 100644 > --- a/drivers/common/mlx5/linux/meson.build > +++ b/drivers/common/mlx5/linux/meson.build > @@ -8,7 +8,6 @@ dlopen_ibverbs =3D (get_option('ibverbs_link') =3D=3D 'dl= open') > LIB_GLUE_BASE =3D 'librte_common_mlx5_glue.so' > LIB_GLUE_VERSION =3D abi_version > LIB_GLUE =3D LIB_GLUE_BASE + '.' + LIB_GLUE_VERSION -mlx5_config =3D > configuration_data() if dlopen_ibverbs > dpdk_conf.set('RTE_IBVERBS_LINK_DLOPEN', 1) > cflags +=3D [ > @@ -232,7 +231,6 @@ foreach arg:has_member_args > file_prefix =3D '#include <' + arg[1] + '>' > mlx5_config.set(arg[0], cc.has_member(arg[2], arg[3], prefix : file_= prefix, > dependencies: libs)) endforeach -configure_file(output : 'mlx5_autoconf.= h', > configuration : mlx5_config) >=20 > # Build Glue Library > if dlopen_ibverbs > @@ -243,6 +241,7 @@ if dlopen_ibverbs > dlopen_install_dir =3D [ eal_pmd_path + '-glue' ] > dlopen_includes =3D [global_inc] > dlopen_includes +=3D include_directories('../../../../lib/eal/includ= e/generic') > + dlopen_includes +=3D include_directories('..') > shared_lib =3D shared_library( > dlopen_lib_name, > dlopen_sources, > diff --git a/drivers/common/mlx5/meson.build > b/drivers/common/mlx5/meson.build index 6ddbde7e8f..60ccd95cbc > 100644 > --- a/drivers/common/mlx5/meson.build > +++ b/drivers/common/mlx5/meson.build > @@ -37,4 +37,6 @@ else > cflags +=3D [ '-UPEDANTIC' ] > endif >=20 > +mlx5_config =3D configuration_data() > subdir(exec_env) > +configure_file(output: 'mlx5_autoconf.h', configuration: mlx5_config) > diff --git a/drivers/common/mlx5/windows/meson.build > b/drivers/common/mlx5/windows/meson.build > index edbbaa9ae1..cc486014a8 100644 > --- a/drivers/common/mlx5/windows/meson.build > +++ b/drivers/common/mlx5/windows/meson.build > @@ -39,7 +39,3 @@ if get_option('buildtype').contains('debug') > else > cflags +=3D [ '-UPEDANTIC' ] > endif > - > -# Generate an empty mlx5_autoconf.h file for compatibility with Linux - > config =3D configuration_data() -configure_file(output : 'mlx5_autoconf.h= ', > configuration : config) diff --git a/drivers/net/mlx5/hws/meson.build > b/drivers/net/mlx5/hws/meson.build > index d2bb864fd2..38776d5163 100644 > --- a/drivers/net/mlx5/hws/meson.build > +++ b/drivers/net/mlx5/hws/meson.build > @@ -1,6 +1,10 @@ > # SPDX-License-Identifier: BSD-3-Clause # Copyright (c) 2022 NVIDIA > Corporation & Affiliates >=20 > +if not (is_linux and mlx5_config.get('HAVE_IBV_FLOW_DV_SUPPORT', false)) > + subdir_done() > +endif > + > includes +=3D include_directories('.') > sources +=3D files( > 'mlx5dr_context.c', > diff --git a/drivers/net/mlx5/meson.build b/drivers/net/mlx5/meson.build > index fa15158039..f1aab18f82 100644 > --- a/drivers/net/mlx5/meson.build > +++ b/drivers/net/mlx5/meson.build > @@ -78,6 +78,4 @@ testpmd_sources +=3D files('mlx5_testpmd.c') >=20 > subdir(exec_env) >=20 > -if (is_linux and mlx5_config.get('HAVE_IBV_FLOW_DV_SUPPORT', false)) > - subdir('hws') > -endif > +subdir('hws') > -- > 2.36.1 Acked-by: Alex Vesker