From patchwork Tue Apr 2 07:04:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ori Kam X-Patchwork-Id: 52055 X-Patchwork-Delegate: shahafs@mellanox.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E13463576; Tue, 2 Apr 2019 09:04:09 +0200 (CEST) Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-eopbgr130052.outbound.protection.outlook.com [40.107.13.52]) by dpdk.org (Postfix) with ESMTP id 5FBEF2B99; Tue, 2 Apr 2019 09:04:08 +0200 (CEST) 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=gAa30w6vy7koFgTzTXoG889f0LYoqmVlXM3uMpAHHhE=; b=kocL36bGsup+0cmQqTHLqtnOBv0U5ofkOFwUaGknOaf9mBOm3OQI9o1OENoYTftBKAYNe9Q8/04cA8TITkcpwpWqw0lm5XP9o0kaz5kTuX++RdZRaXe9opCr5Gmw+S9zi6kknqFnebozIthybt/mFm46rr1lQIgL2SdXCVPldhI= Received: from AM4PR05MB3425.eurprd05.prod.outlook.com (10.171.190.15) by AM4PR05MB3281.eurprd05.prod.outlook.com (10.171.188.158) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1750.16; Tue, 2 Apr 2019 07:04:06 +0000 Received: from AM4PR05MB3425.eurprd05.prod.outlook.com ([fe80::5df0:22de:97f0:3827]) by AM4PR05MB3425.eurprd05.prod.outlook.com ([fe80::5df0:22de:97f0:3827%4]) with mapi id 15.20.1750.014; Tue, 2 Apr 2019 07:04:06 +0000 From: Ori Kam To: Matan Azrad , Yongseok Koh , Shahaf Shuler CC: "dev@dpdk.org" , Ori Kam , Moti Haimovsky , "stable@dpdk.org" Thread-Topic: [PATCH v2] net/mlx5: fix flow counters using devx Thread-Index: AQHU6SJDNSINI3Oul0yIl2Ufc45hoA== Date: Tue, 2 Apr 2019 07:04:06 +0000 Message-ID: <1554188625-144294-1-git-send-email-orika@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: LO2P265CA0315.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:a4::15) To AM4PR05MB3425.eurprd05.prod.outlook.com (2603:10a6:205:b::15) authentication-results: spf=none (sender IP is ) smtp.mailfrom=orika@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 1.8.3.1 x-originating-ip: [37.142.13.130] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: b7c3e969-9ad2-4573-6ce4-08d6b7396557 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(5600139)(711020)(4605104)(4618075)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7193020); SRVR:AM4PR05MB3281; x-ms-traffictypediagnostic: AM4PR05MB3281: x-microsoft-antispam-prvs: x-forefront-prvs: 0995196AA2 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(346002)(396003)(39860400002)(376002)(136003)(366004)(189003)(199004)(2906002)(54906003)(6436002)(450100002)(2616005)(316002)(3846002)(5660300002)(97736004)(6512007)(476003)(6636002)(102836004)(186003)(4326008)(6116002)(106356001)(4720700003)(6486002)(110136005)(53936002)(486006)(25786009)(386003)(6506007)(26005)(105586002)(36756003)(478600001)(99286004)(305945005)(7736002)(14454004)(66066001)(52116002)(81156014)(81166006)(71200400001)(71190400001)(256004)(86362001)(50226002)(8936002)(68736007)(8676002); DIR:OUT; SFP:1101; SCL:1; SRVR:AM4PR05MB3281; H:AM4PR05MB3425.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: bjkQ3W00Kgw4uKj5z48AnlZ2wJm9JWeMrR48QeCqjYObU0xI8aqGrwpoRrp3SZKOdRsXOUfIDv6JnVN0ZZygL6TVWzuhlKSyg+Iss8I7VOGISI2OI/jpRenBs5HQFX6Tfljc/0305cF0CdiN5EuYTzQU0FywWvJ9/U7miOsCeBegf7qW3tmsxQ6oBjy0B/WOuZ939kVhs0lIVluj1OH9UUbX/26fCG/99Su4mi50jwWxigt6EAaMpsxJJImes24J6IbaoGAy58qBUdZZOyaRjPi+FDntlBPyFJnh8NjSWafO2xnLNGpaFF8u6KupfAMyB94o8vH41tkFIHup/zx0chK99HgAJwbuUrerzGgegWEgFcYX9R5JbW9UEiHwZ0VytGYsxZRIXXM5Lcuk4mHN8IuXiJsdiwLqK0LCJ4zqrA0= MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: b7c3e969-9ad2-4573-6ce4-08d6b7396557 X-MS-Exchange-CrossTenant-originalarrivaltime: 02 Apr 2019 07:04:06.4443 (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-Transport-CrossTenantHeadersStamped: AM4PR05MB3281 Subject: [dpdk-dev] [PATCH v2] net/mlx5: fix flow counters using devx 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" The API that was defined in OFED 4.5 was replaced both in OFED 4.6 and in upstream. This commit updates the API to match the upstream one. Fixes: f5bf91de738a ("net/mlx5: support flow counters using devx") Cc: motih@mellanox.com Cc: stable@dpdk.org Signed-off-by: Ori Kam --- v2: * change fix line. --- drivers/net/mlx5/Makefile | 2 +- drivers/net/mlx5/meson.build | 2 +- drivers/net/mlx5/mlx5_flow_dv.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/mlx5/Makefile b/drivers/net/mlx5/Makefile index c326494..671fdb8 100644 --- a/drivers/net/mlx5/Makefile +++ b/drivers/net/mlx5/Makefile @@ -163,7 +163,7 @@ mlx5_autoconf.h.new: $(RTE_SDK)/buildtools/auto-config-h.sh $Q sh -- '$<' '$@' \ HAVE_IBV_FLOW_DEVX_COUNTERS \ infiniband/mlx5dv.h \ - enum MLX5DV_FLOW_ACTION_COUNTER_DEVX \ + enum MLX5DV_FLOW_ACTION_COUNTERS_DEVX \ $(AUTOCONF_OUTPUT) $Q sh -- '$<' '$@' \ HAVE_ETHTOOL_LINK_MODE_25G \ diff --git a/drivers/net/mlx5/meson.build b/drivers/net/mlx5/meson.build index e3cb9bc..eba249a 100644 --- a/drivers/net/mlx5/meson.build +++ b/drivers/net/mlx5/meson.build @@ -110,7 +110,7 @@ if build [ 'HAVE_IBV_DEVX_OBJ', 'infiniband/mlx5dv.h', 'mlx5dv_devx_obj_create' ], [ 'HAVE_IBV_FLOW_DEVX_COUNTERS', 'infiniband/mlx5dv.h', - 'MLX5DV_FLOW_ACTION_COUNTER_DEVX' ], + 'MLX5DV_FLOW_ACTION_COUNTERS_DEVX' ], [ 'HAVE_SUPPORTED_40000baseKR4_Full', 'linux/ethtool.h', 'SUPPORTED_40000baseKR4_Full' ], [ 'HAVE_SUPPORTED_40000baseCR4_Full', 'linux/ethtool.h', diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 966dad9..ad84dea 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -36,7 +36,7 @@ #ifdef HAVE_IBV_FLOW_DV_SUPPORT #ifndef HAVE_IBV_FLOW_DEVX_COUNTERS -#define MLX5DV_FLOW_ACTION_COUNTER_DEVX 0 +#define MLX5DV_FLOW_ACTION_COUNTERS_DEVX 0 #endif union flow_dv_attr { @@ -2939,7 +2939,7 @@ struct field_modify_info modify_tcp[] = { if (flow->counter == NULL) goto cnt_err; dev_flow->dv.actions[actions_n].type = - MLX5DV_FLOW_ACTION_COUNTER_DEVX; + MLX5DV_FLOW_ACTION_COUNTERS_DEVX; dev_flow->dv.actions[actions_n].obj = flow->counter->dcs->obj; action_flags |= MLX5_FLOW_ACTION_COUNT;