From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-eopbgr10085.outbound.protection.outlook.com [40.107.1.85]) by dpdk.org (Postfix) with ESMTP id 5460C1B39F for ; Thu, 3 Jan 2019 16:06:38 +0100 (CET) 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=J5nwu2z8lKc1auUloHwqqUIfSbiHGIWACTL7IqDJkFY=; b=XoJ0zKxTjFPZ5v4LxBQr9CzZT0k8qY9RfjmzQhWuDF+fGK7abtx+OqucHbimF4gvIRVpSHF6/xQ3jlQ+URDOWmXJZYdW4/ONzHuXewzr7nFSBxDAGu5QPuTLE1avsclTq5axFzowtdIcrJC3yudIKQ7eoHCep5RLbiBHVisF63c= Received: from AM0PR05MB4435.eurprd05.prod.outlook.com (52.134.92.20) by AM0PR05MB4194.eurprd05.prod.outlook.com (52.134.90.159) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1495.7; Thu, 3 Jan 2019 15:06:36 +0000 Received: from AM0PR05MB4435.eurprd05.prod.outlook.com ([fe80::c860:9e3d:3158:8ea]) by AM0PR05MB4435.eurprd05.prod.outlook.com ([fe80::c860:9e3d:3158:8ea%4]) with mapi id 15.20.1495.005; Thu, 3 Jan 2019 15:06:36 +0000 From: Mordechay Haimovsky To: "dev@dpdk.org" CC: Mordechay Haimovsky Thread-Topic: [PATCH v4 2/3] net/mlx5: add devx functions to glue Thread-Index: AQHUo3XsKZg9YaaUwE2SfiHuIUSCmw== Date: Thu, 3 Jan 2019 15:06:36 +0000 Message-ID: <1546527981-23028-3-git-send-email-motih@mellanox.com> References: <1546422185-30813-4-git-send-email-motih@mellanox.com> In-Reply-To: <1546422185-30813-4-git-send-email-motih@mellanox.com> Accept-Language: he-IL, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: LO2P265CA0219.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:b::15) To AM0PR05MB4435.eurprd05.prod.outlook.com (2603:10a6:208:5a::20) authentication-results: spf=none (sender IP is ) smtp.mailfrom=motih@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 1.7.1 x-originating-ip: [37.142.13.130] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; AM0PR05MB4194; 6:GCtHa+5n635yZmWbFtUyrdMJcLhJp33FRs1x8qtigchZz857EaiDYO6dSY+IFu+wydcib8yGQSwTQTazKvMIvkKjoq+djYnbbqi1xgVycSlUWE1fJqdwiM4Np47/ItBe6/MCZvBZ3l3fcpnX6EKDM/hKxjSJ2m76hEt6GEeJ144F2AfiMINmHt0iv7u1/TMNN5L/K5AJbasYov2hkQdKOCwgnrPuPN+6COXKOe7aP58raywBQupVwrgoB9h8L60/3AYwGkK/K8Nd33/gYzhdy9eqT7euq4jJpDnt4XCfTRyu1Q9mMnaMATyF3BxzBSarnhm33ftpuVg9xLqYFZa/c2nq097IinrD2nOBm2fVx+nTzJtPRydzxlmU9MMFycddOXWenmAchz/BC53Ae3xuk8abWOW1YEHTo6rPSOYrMpcdYt9KEkEqkZVAWX8mOHEzC3gnjZZnlD9zorjC77Fw8A==; 5:NE3sfe3fIBxMAx+Wbu/9ALIlTb4hLra+V2UfWzSwIyRVwtuHxK4w8EFgAOE7TL4gb8hDCBoen3BNSj0THhBuwyFNwT2nOHFNDNudppB+4YSUI6IyIahnD+Lqzmqzj5r3boLEoVgGYpzhmu9JYi7bky+FbYSepDZZuvUzy+f+GrTBjQ0ZIA8/KwOoqsJoDEvpcQuMNOsRc8xLg01QCoeDJQ==; 7:Tik5aEyQH4lDjYY4xOo3TBTKbGUXgfyMEc+gGpbJx8BON0PWpU4fwflLaBI9vvfdrVHexQRL6ov/U+pY/loxYs7m8M602vBgfxsAYIqol0E/mfeMbHJL17/pg5QmVRn7kOco/hNHXDqDUt1i+d1uYg== x-ms-office365-filtering-correlation-id: dc03159a-a547-4b0b-171b-08d6718d0e67 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600109)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM0PR05MB4194; x-ms-traffictypediagnostic: AM0PR05MB4194: x-microsoft-antispam-prvs: x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(3230021)(908002)(999002)(5005026)(6040522)(8220060)(2401047)(8121501046)(3231475)(944501520)(52105112)(3002001)(10201501046)(93006095)(93001095)(6055026)(6041310)(20161123560045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123562045)(201708071742011)(7699051)(76991095); SRVR:AM0PR05MB4194; BCL:0; PCL:0; RULEID:; SRVR:AM0PR05MB4194; x-forefront-prvs: 0906E83A25 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(376002)(396003)(366004)(136003)(346002)(39860400002)(189003)(199004)(6916009)(446003)(2616005)(316002)(186003)(5660300001)(6116002)(3846002)(71190400001)(71200400001)(2351001)(36756003)(478600001)(11346002)(476003)(68736007)(99286004)(25786009)(66066001)(6506007)(2501003)(102836004)(2906002)(26005)(386003)(97736004)(4326008)(8676002)(53936002)(52116002)(6512007)(81156014)(486006)(106356001)(305945005)(105586002)(7736002)(256004)(19627235002)(6436002)(107886003)(5640700003)(76176011)(86362001)(50226002)(6486002)(8936002)(81166006)(1730700003)(14454004); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR05MB4194; H:AM0PR05MB4435.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: EmeG6XegiNi+qHhi2gBjgyezjLM3s8J4Htr7vuOCTGLQpIT0xNKgMxsCqcnR4Ncxp8X/IuCLgfJMptZI99W2FPr9/V5vIFRAzvGTEaOeCCb2m8/6PZaw5CP26CePImJpjrph9sPAhdbgPfTO5fzUxzI5X4vgwpiN81A5Za26beboyKKhJXL8BzvsGiMCdC+8uOs/5qgfrjVPPIFlnBPvnSrU8tiAEkOk+uwk+FU3snneOV6/ScJB7FqaEuAR6i6zlD8siLDggNHa8ot8+WNF6lZCAtUUvQtGHdUzbcc8HXYX/3a9qilLe/w32GA5MOsU spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: dc03159a-a547-4b0b-171b-08d6718d0e67 X-MS-Exchange-CrossTenant-originalarrivaltime: 03 Jan 2019 15:06:36.2456 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR05MB4194 Subject: [dpdk-dev] [PATCH v4 2/3] net/mlx5: add devx functions to glue 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: , X-List-Received-Date: Thu, 03 Jan 2019 15:06:38 -0000 This patch adds glue functions for operations: - dv_open_device. - devx object create, destroy, query and modify. - devx general command The new operations depend on HAVE_IBV_DEVX_OBJ. Signed-off-by: Moti Haimovsky --- v2: * Modifications according to review inputs. see message Id: 1545748697-3385-3-git-send-email-motih@mellanox.com --- drivers/net/mlx5/Makefile | 5 +++ drivers/net/mlx5/meson.build | 2 + drivers/net/mlx5/mlx5_glue.c | 98 ++++++++++++++++++++++++++++++++++++++++= ++++ drivers/net/mlx5/mlx5_glue.h | 19 +++++++++ 4 files changed, 124 insertions(+) diff --git a/drivers/net/mlx5/Makefile b/drivers/net/mlx5/Makefile index 1353c18..8ddad1a 100644 --- a/drivers/net/mlx5/Makefile +++ b/drivers/net/mlx5/Makefile @@ -148,6 +148,11 @@ mlx5_autoconf.h.new: $(RTE_SDK)/buildtools/auto-config= -h.sh func mlx5dv_create_flow_action_packet_reformat \ $(AUTOCONF_OUTPUT) $Q sh -- '$<' '$@' \ + HAVE_IBV_DEVX_OBJ \ + infiniband/mlx5dv.h \ + func mlx5dv_devx_obj_create \ + $(AUTOCONF_OUTPUT) + $Q sh -- '$<' '$@' \ HAVE_ETHTOOL_LINK_MODE_25G \ /usr/include/linux/ethtool.h \ enum ETHTOOL_LINK_MODE_25000baseCR_Full_BIT \ diff --git a/drivers/net/mlx5/meson.build b/drivers/net/mlx5/meson.build index 8ba19e8..e2fc4ea 100644 --- a/drivers/net/mlx5/meson.build +++ b/drivers/net/mlx5/meson.build @@ -104,6 +104,8 @@ if build 'IBV_FLOW_SPEC_MPLS' ], [ 'HAVE_IBV_WQ_FLAG_RX_END_PADDING', 'infiniband/verbs.h', 'IBV_WQ_FLAG_RX_END_PADDING' ], + [ 'HAVE_IBV_DEVX_OBJ', 'infiniband/mlx5dv.h', + 'mlx5dv_devx_obj_create' ], [ 'HAVE_SUPPORTED_40000baseKR4_Full', 'linux/ethtool.h', 'SUPPORTED_40000baseKR4_Full' ], [ 'HAVE_SUPPORTED_40000baseCR4_Full', 'linux/ethtool.h', diff --git a/drivers/net/mlx5/mlx5_glue.c b/drivers/net/mlx5/mlx5_glue.c index a806d92..c817d86 100644 --- a/drivers/net/mlx5/mlx5_glue.c +++ b/drivers/net/mlx5/mlx5_glue.c @@ -498,6 +498,98 @@ #endif } =20 +static struct ibv_context * +mlx5_glue_dv_open_device(struct ibv_device *device) +{ +#ifdef HAVE_IBV_DEVX_OBJ + return mlx5dv_open_device(device, + &(struct mlx5dv_context_attr){ + .flags =3D MLX5DV_CONTEXT_FLAGS_DEVX, + }); +#else + (void)device; + return NULL; +#endif +} + +static struct mlx5dv_devx_obj * +mlx5_glue_devx_obj_create(struct ibv_context *ctx, + const void *in, size_t inlen, + void *out, size_t outlen) +{ +#ifdef HAVE_IBV_DEVX_OBJ + return mlx5dv_devx_obj_create(ctx, in, inlen, out, outlen); +#else + (void)ctx; + (void)in; + (void)inlen; + (void)out; + (void)outlen; + return NULL; +#endif +} + +static int +mlx5_glue_devx_obj_destroy(struct mlx5dv_devx_obj *obj) +{ +#ifdef HAVE_IBV_DEVX_OBJ + return mlx5dv_devx_obj_destroy(obj); +#else + (void)obj; + return -ENOTSUP; +#endif +} + +static int +mlx5_glue_devx_obj_query(struct mlx5dv_devx_obj *obj, + const void *in, size_t inlen, + void *out, size_t outlen) +{ +#ifdef HAVE_IBV_DEVX_OBJ + return mlx5dv_devx_obj_query(obj, in, inlen, out, outlen); +#else + (void)obj; + (void)in; + (void)inlen; + (void)out; + (void)outlen; + return -ENOTSUP; +#endif +} + +static int +mlx5_glue_devx_obj_modify(struct mlx5dv_devx_obj *obj, + const void *in, size_t inlen, + void *out, size_t outlen) +{ +#ifdef HAVE_IBV_DEVX_OBJ + return mlx5dv_devx_obj_modify(obj, in, inlen, out, outlen); +#else + (void)obj; + (void)in; + (void)inlen; + (void)out; + (void)outlen; + return -ENOTSUP; +#endif +} + +static int +mlx5_glue_devx_general_cmd(struct ibv_context *ctx, + const void *in, size_t inlen, + void *out, size_t outlen) +{ +#ifdef HAVE_IBV_DEVX_OBJ + return mlx5dv_devx_general_cmd(ctx, in, inlen, out, outlen); +#else + (void)ctx; + (void)in; + (void)inlen; + (void)out; + (void)outlen; + return -ENOTSUP; +#endif +} =20 alignas(RTE_CACHE_LINE_SIZE) const struct mlx5_glue *mlx5_glue =3D &(const struct mlx5_glue){ @@ -557,4 +649,10 @@ mlx5_glue_dv_create_flow_action_packet_reformat, .dv_create_flow_action_modify_header =3D mlx5_glue_dv_create_flow_action_modify_header, + .dv_open_device =3D mlx5_glue_dv_open_device, + .devx_obj_create =3D mlx5_glue_devx_obj_create, + .devx_obj_destroy =3D mlx5_glue_devx_obj_destroy, + .devx_obj_query =3D mlx5_glue_devx_obj_query, + .devx_obj_modify =3D mlx5_glue_devx_obj_modify, + .devx_general_cmd =3D mlx5_glue_devx_general_cmd, }; diff --git a/drivers/net/mlx5/mlx5_glue.h b/drivers/net/mlx5/mlx5_glue.h index 9cfe836..b118960 100644 --- a/drivers/net/mlx5/mlx5_glue.h +++ b/drivers/net/mlx5/mlx5_glue.h @@ -55,6 +55,10 @@ enum mlx5dv_flow_table_type { flow_table_type =3D 0, }; #endif =20 +#ifndef HAVE_IBV_DEVX_OBJ +struct mlx5dv_devx_obj; +#endif + /* LIB_GLUE_VERSION must be updated every time this structure is modified.= */ struct mlx5_glue { const char *version; @@ -169,6 +173,21 @@ struct mlx5_glue { size_t actions_sz, uint64_t actions[], enum mlx5dv_flow_table_type ft_type); + struct ibv_context *(*dv_open_device)(struct ibv_device *device); + struct mlx5dv_devx_obj *(*devx_obj_create) + (struct ibv_context *ctx, + const void *in, size_t inlen, + void *out, size_t outlen); + int (*devx_obj_destroy)(struct mlx5dv_devx_obj *obj); + int (*devx_obj_query)(struct mlx5dv_devx_obj *obj, + const void *in, size_t inlen, + void *out, size_t outlen); + int (*devx_obj_modify)(struct mlx5dv_devx_obj *obj, + const void *in, size_t inlen, + void *out, size_t outlen); + int (*devx_general_cmd)(struct ibv_context *context, + const void *in, size_t inlen, + void *out, size_t outlen); }; =20 const struct mlx5_glue *mlx5_glue; --=20 1.8.3.1