From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 36851A0561 for ; Tue, 21 Apr 2020 09:43:37 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 2D9711D8DD; Tue, 21 Apr 2020 09:43:37 +0200 (CEST) Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-eopbgr20041.outbound.protection.outlook.com [40.107.2.41]) by dpdk.org (Postfix) with ESMTP id 02A701D8DD; Tue, 21 Apr 2020 09:43:35 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bRJwF8bYgjS/SSJqUQT3P6kSiQLWuCwXKwcqDwVrK05PxB0cPShp3wawR4W9pB1rrRNA0BZquxGVGDE1wGE+X1HI8PI8YVwEZV8gISJCwtaN3q10hliZsuFacNNKG1dFMIIK1z7vFcOZ5K/gAUrOxaxTSsiSXen4x1/XTM+NvPamMmLaGaRIatm5iJo4ls2djxt2IzhRPYtGTXsmdZmjosByHm5xFkTyvFtqYvRZZlIgTcJ1IFRAlapcnZMcLLeonWqBgTS5FyIeWSwwRoM7mj13IAM1/Rh85VpThE45amFzkIgZ64KnvI3pdp+oIW3/q2m+SB2fnFIAlK+lwH+mdg== 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-SenderADCheck; bh=sfwP4TRYhzjldnyjwTDfXqKLbQWxYqEfMRsWOYBzrCc=; b=DyenA14qlB9KUupeiWaHmiqtOxo6CKk7XJOAMROVylrcCv1QYkM9SXba3O4WChN1/q8hpLbvou2gth78lBkPzBe9ZFm6N0dy1/1NfoQgvYOvwMfacjM6uOkaXGsvnKupjQ3u0FvP8BxtFVSb/wq6N2op2Y8WU9A/Pt+E11pd4nN72OnA0gjJteodsJAkHI7a+scg9gmJ4cG3xR8F1u4YI8sObofW3rRd4DcE5J5RRiV0hnx7fM4fEgYnDLSvwdTAaDiLVOn+tiqujlt2iZiSPXg0ZS+wlor2S7mxME+a72hIwXHEwkwSXLdseiA/6Pqrew39TmOBP4OlbytmNRRwQQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=mellanox.com; dmarc=pass action=none header.from=mellanox.com; dkim=pass header.d=mellanox.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=sfwP4TRYhzjldnyjwTDfXqKLbQWxYqEfMRsWOYBzrCc=; b=H0evfXYQ7SIZLrnHOFRxJJCBk4oKnxw5/U1uMLawA+oKegJByt0CIAgLskag1wuiz+Gs0sU0TISa0Gy3yt7nrvOdLNR+wzueFV9BlmlC5a9w4oWGw9riw+A7YOjnxOhc+7jGnQ87cwn83rQJ1AsN/GoEiUg6rOKBowczk67arxM= Received: from AM4PR05MB3265.eurprd05.prod.outlook.com (2603:10a6:205:8::26) by AM4PR05MB3217.eurprd05.prod.outlook.com (2603:10a6:205:4::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2921.27; Tue, 21 Apr 2020 07:43:35 +0000 Received: from AM4PR05MB3265.eurprd05.prod.outlook.com ([fe80::bdf0:88a3:3a39:4be4]) by AM4PR05MB3265.eurprd05.prod.outlook.com ([fe80::bdf0:88a3:3a39:4be4%7]) with mapi id 15.20.2921.030; Tue, 21 Apr 2020 07:43:35 +0000 From: Slava Ovsiienko To: Thomas Monjalon , "dev@dpdk.org" CC: "stable@dpdk.org" , Matan Azrad , Shahaf Shuler , Dekel Peled Thread-Topic: [PATCH] common/mlx5: fix build with rdma-core 21 Thread-Index: AQHWFAf/olbjX6X/BUeO/zAfK8L1pqiDOQSA Date: Tue, 21 Apr 2020 07:43:35 +0000 Message-ID: References: <20200416155904.2723690-1-thomas@monjalon.net> In-Reply-To: <20200416155904.2723690-1-thomas@monjalon.net> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: spf=none (sender IP is ) smtp.mailfrom=viacheslavo@mellanox.com; x-originating-ip: [95.164.10.10] x-ms-publictraffictype: Email x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: c0bd6490-aa3e-4eca-a917-08d7e5c7b288 x-ms-traffictypediagnostic: AM4PR05MB3217:|AM4PR05MB3217: x-ld-processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:5516; x-forefront-prvs: 038002787A x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM4PR05MB3265.eurprd05.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(10009020)(4636009)(39860400002)(376002)(136003)(366004)(346002)(396003)(76116006)(66446008)(64756008)(66556008)(66476007)(66946007)(71200400001)(86362001)(110136005)(54906003)(186003)(316002)(26005)(53546011)(6506007)(7696005)(5660300002)(81156014)(8676002)(8936002)(52536014)(9686003)(55016002)(4326008)(107886003)(33656002)(478600001)(2906002); DIR:OUT; SFP:1101; received-spf: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: sl59kARfxfdCLAwKKJsyzI0yKys/V6DVP/VsHE0zuU4oJq8mVYwL/Q522RfnDFEL9RQHvenS47EIJOBDlV2aQ6AU6qyv1BkpERALU67twDVtGDbB4YvVJ+Y7Pw4jgbKdHA861iqQsOEt9fjhzbGsaMdh2bQbVCxLfQDX7dSfIZc8wkGrXtGbeLrt3lh5L+K5sLgSixcv3W3SxWxCMIDzP9WXDtxwrdUvSSSAsQ31ab1nWAi1Twu2yWZdlvguyHxslvtwr/kN91Cc5yg0iEFNdSA/f01WoeHlgdOVBH3puYZc8Trgb8031A73eIJEGobuxmoQCHlrTuUItehCfHD4O4Mo87jC3qgNIc+D09ZxVwzIiUXCS5ufEJM4tVc89Zy0ncdaRWxtlFcwRfDB4zFJiKq0pDwmURNn6gYDvo1tzMe6nljKxDYsgv6aTSNaKZn/ x-ms-exchange-antispam-messagedata: CcOO68g+NAAZYU8TkZO3AueUi12CzrzmyBRLqNdmwOXp8lSAxFehmrNzxTji1ChQGa65PCOlMzAEmCsvagM+pxZ28deIdAYEv82ByM4mJfe5nxAEUsvfi8Aa56eNLtRjG7rdF6HOHr1YgY9zS98fFg== Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: c0bd6490-aa3e-4eca-a917-08d7e5c7b288 X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Apr 2020 07:43:35.2078 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 4A5BwCukbLa6jp8lWDbRT7qLekqix4XzF6A6NLiktzQmDW84mycels5bCCTjN+zIUiGSklWbP9QoPtSwqsCABqeeAr6yxVH2FHxP9xmoFvg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM4PR05MB3217 Subject: Re: [dpdk-stable] [PATCH] common/mlx5: fix build with rdma-core 21 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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: Thomas Monjalon > Sent: Thursday, April 16, 2020 18:59 > To: dev@dpdk.org > Cc: stable@dpdk.org; Matan Azrad ; Shahaf Shuler > ; Slava Ovsiienko ; > Dekel Peled > Subject: [PATCH] common/mlx5: fix build with rdma-core 21 >=20 > drivers/common/mlx5/mlx5_glue.c: In function 'mlx5_glue_devx_qp_query': > drivers/common/mlx5/mlx5_glue.c:1010:9: error: > implicit declaration of function 'mlx5dv_devx_qp_query' >=20 > The function mlx5dv_devx_qp_query() was added in rdma-core 22. > This function is compiled only if HAVE_IBV_DEVX_OBJ, which is true if the > function mlx5dv_devx_obj_create is found. > Unfortunately mlx5dv_devx_obj_create() was introduced in rdma-core 21, > when mlx5dv_devx_qp_query() did not exist yet. >=20 > A new flag HAVE_IBV_DEVX_QP is added when mlx5dv_devx_qp_query() is > found. >=20 > Fixes: 62d6f70f30f4 ("net/mlx5: add glue for queue query via DevX") > Cc: stable@dpdk.org >=20 > Signed-off-by: Thomas Monjalon Acked-by: Viacheslav Ovsiienko > --- > drivers/common/mlx5/Makefile | 5 +++++ > drivers/common/mlx5/meson.build | 2 ++ > drivers/common/mlx5/mlx5_glue.c | 2 +- > 3 files changed, 8 insertions(+), 1 deletion(-) >=20 > diff --git a/drivers/common/mlx5/Makefile > b/drivers/common/mlx5/Makefile index f32933d592..22dc4b2eb4 100644 > --- a/drivers/common/mlx5/Makefile > +++ b/drivers/common/mlx5/Makefile > @@ -150,6 +150,11 @@ mlx5_autoconf.h.new: > $(RTE_SDK)/buildtools/auto-config-h.sh > infiniband/mlx5dv.h \ > func mlx5dv_devx_obj_query_async \ > $(AUTOCONF_OUTPUT) > + $Q sh -- '$<' '$@' \ > + HAVE_IBV_DEVX_QP \ > + infiniband/mlx5dv.h \ > + func mlx5dv_devx_qp_query \ > + $(AUTOCONF_OUTPUT) > $Q sh -- '$<' '$@' \ > HAVE_MLX5DV_DR_ACTION_DEST_DEVX_TIR \ > infiniband/mlx5dv.h \ > diff --git a/drivers/common/mlx5/meson.build > b/drivers/common/mlx5/meson.build index ac2cfa6236..6f007eea1b 100644 > --- a/drivers/common/mlx5/meson.build > +++ b/drivers/common/mlx5/meson.build > @@ -118,6 +118,8 @@ has_sym_args =3D [ > 'MLX5DV_FLOW_ACTION_COUNTERS_DEVX' ], > [ 'HAVE_IBV_DEVX_ASYNC', 'infiniband/mlx5dv.h', > 'mlx5dv_devx_obj_query_async' ], > + [ 'HAVE_IBV_DEVX_QP', 'infiniband/mlx5dv.h', > + 'mlx5dv_devx_qp_query' ], > [ 'HAVE_MLX5DV_DR_ACTION_DEST_DEVX_TIR', > 'infiniband/mlx5dv.h', > 'mlx5dv_dr_action_create_dest_devx_tir' ], > [ 'HAVE_IBV_DEVX_EVENT', 'infiniband/mlx5dv.h', diff --git > a/drivers/common/mlx5/mlx5_glue.c b/drivers/common/mlx5/mlx5_glue.c > index 0af0b86677..e2d3beb9cc 100644 > --- a/drivers/common/mlx5/mlx5_glue.c > +++ b/drivers/common/mlx5/mlx5_glue.c > @@ -1006,7 +1006,7 @@ mlx5_glue_devx_qp_query(struct ibv_qp *qp, > const void *in, size_t inlen, > void *out, size_t outlen) > { > -#ifdef HAVE_IBV_DEVX_OBJ > +#ifdef HAVE_IBV_DEVX_QP > return mlx5dv_devx_qp_query(qp, in, inlen, out, outlen); #else > (void)qp; > -- > 2.26.0