From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-eopbgr60055.outbound.protection.outlook.com [40.107.6.55]) by dpdk.org (Postfix) with ESMTP id 981A7A3 for ; Tue, 2 Apr 2019 06:56:35 +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=RNTRrK8mGYgJgze3zDtbDCXwFfWtV8PFP0K9qvQLdfY=; b=tj1T9pnQPhHXc9dV7fUYKW8vtC6OzZWMH5SnMTio2AOOxyRude8SUOnUGzCxdy/Gl3fxqHvMzmFYcxPA4IvZ9ujnb7eM8Vr1F0qNgla5q6xXppzquwfV9iR0Z03xZsxidAvb/HEANQdSaom1Pay1Q5qztqV74xpcu6FBCp1Dr9k= Received: from AM0PR0502MB3795.eurprd05.prod.outlook.com (52.133.45.150) by AM0PR0502MB3747.eurprd05.prod.outlook.com (52.133.47.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1750.17; Tue, 2 Apr 2019 04:56:33 +0000 Received: from AM0PR0502MB3795.eurprd05.prod.outlook.com ([fe80::84f3:7e92:7a51:1003]) by AM0PR0502MB3795.eurprd05.prod.outlook.com ([fe80::84f3:7e92:7a51:1003%2]) with mapi id 15.20.1750.014; Tue, 2 Apr 2019 04:56:33 +0000 From: Shahaf Shuler To: Ori Kam , Matan Azrad , Yongseok Koh CC: "dev@dpdk.org" Thread-Topic: [PATCH] net/mlx5: update counter API for upstream Thread-Index: AQHU6J92Rwis6tZNpUik7rG7SD6M+qYoT2LQ Date: Tue, 2 Apr 2019 04:56:33 +0000 Message-ID: References: <1554132458-176151-1-git-send-email-orika@mellanox.com> In-Reply-To: <1554132458-176151-1-git-send-email-orika@mellanox.com> 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=shahafs@mellanox.com; x-originating-ip: [31.154.10.105] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 25bbc5a2-cb23-4268-56ff-08d6b72793f9 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:AM0PR0502MB3747; x-ms-traffictypediagnostic: AM0PR0502MB3747: x-microsoft-antispam-prvs: x-forefront-prvs: 0995196AA2 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(136003)(346002)(396003)(39860400002)(366004)(376002)(199004)(189003)(99286004)(25786009)(106356001)(71200400001)(71190400001)(105586002)(2906002)(6246003)(5660300002)(102836004)(55016002)(26005)(316002)(86362001)(9686003)(256004)(110136005)(74316002)(305945005)(8676002)(81166006)(14444005)(97736004)(7736002)(81156014)(478600001)(33656002)(6636002)(53936002)(4326008)(186003)(476003)(486006)(7696005)(76176011)(68736007)(15650500001)(446003)(11346002)(229853002)(52536014)(6436002)(3846002)(14454004)(66066001)(6116002)(6506007)(8936002); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR0502MB3747; H:AM0PR0502MB3795.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX: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: rYonkIXkHn/L4kBuyfl84pBRTWjoYZl6Sleobvt2PyMx8oyig8E1shFanNcco+YVznCoLAstO/7OpsPrtxG8fm36+onjNNh4BqireXPEXOdWGHyjw2B8LVbGAsbUm3v4/mZc8rr6BJzM9u7PMXHCkXtSJMjPI2IITmIAYwPjsG2ViKTK5NR6tYkrc7iFJ4GePWQuJAhXweYrlI7hVawSjM6OtCbYraJZudJemDXyXOqLe5Q95sQoeWdklG0pQ8SqavSO/7GjEs6gZLHpy2KdfSwqzPUCL2QTyK8VxBCCrfbbpykG+IDTJnHKHhtgtI7VUwTrATlfkVlQsAKiCggE8cXwKlLtAxj1hLCB6JoiwrLCEOr9ARwXxUCAyVbYCTvbOQPUkXNEnB1/kFWKhF1ZXrysu52PHs9hOaT3rQ3auCk= 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: 25bbc5a2-cb23-4268-56ff-08d6b72793f9 X-MS-Exchange-CrossTenant-originalarrivaltime: 02 Apr 2019 04:56:33.2191 (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: AM0PR0502MB3747 Subject: Re: [dpdk-dev] [PATCH] net/mlx5: update counter API for upstream 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: Tue, 02 Apr 2019 04:56:35 -0000 Hi Ori, Monday, April 1, 2019 6:28 PM, Ori Kam: > Subject: [PATCH] net/mlx5: update counter API for upstream This is not an update, this is a fix.=20 >=20 > The API that was defined in OFED 4.5 was replaced both in OFED 4.6 and in > upstream. >=20 > This commit updates the API to match the upstream one. Need to add Cc stable + the offending commit which caused the issue.=20 >=20 > Signed-off-by: Ori Kam > --- > drivers/net/mlx5/Makefile | 2 +- > drivers/net/mlx5/mlx5_flow_dv.c | 4 ++-- > 2 files changed, 3 insertions(+), 3 deletions(-) >=20 > 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/mlx5_flow_dv.c > b/drivers/net/mlx5/mlx5_flow_dv.c index 57847fb..2fe2836 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 >=20 > #ifndef HAVE_IBV_FLOW_DEVX_COUNTERS > -#define MLX5DV_FLOW_ACTION_COUNTER_DEVX 0 > +#define MLX5DV_FLOW_ACTION_COUNTERS_DEVX 0 > #endif >=20 > union flow_dv_attr { > @@ -2939,7 +2939,7 @@ struct field_modify_info modify_tcp[] =3D { > if (flow->counter =3D=3D NULL) > goto cnt_err; > dev_flow->dv.actions[actions_n].type =3D > - > MLX5DV_FLOW_ACTION_COUNTER_DEVX; > + > MLX5DV_FLOW_ACTION_COUNTERS_DEVX; > dev_flow->dv.actions[actions_n].obj =3D > flow->counter->dcs->obj; > action_flags |=3D MLX5_FLOW_ACTION_COUNT; > -- > 1.8.3.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 82CDDA0679 for ; Tue, 2 Apr 2019 06:56:37 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 9BAB32C36; Tue, 2 Apr 2019 06:56:36 +0200 (CEST) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-eopbgr60055.outbound.protection.outlook.com [40.107.6.55]) by dpdk.org (Postfix) with ESMTP id 981A7A3 for ; Tue, 2 Apr 2019 06:56:35 +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=RNTRrK8mGYgJgze3zDtbDCXwFfWtV8PFP0K9qvQLdfY=; b=tj1T9pnQPhHXc9dV7fUYKW8vtC6OzZWMH5SnMTio2AOOxyRude8SUOnUGzCxdy/Gl3fxqHvMzmFYcxPA4IvZ9ujnb7eM8Vr1F0qNgla5q6xXppzquwfV9iR0Z03xZsxidAvb/HEANQdSaom1Pay1Q5qztqV74xpcu6FBCp1Dr9k= Received: from AM0PR0502MB3795.eurprd05.prod.outlook.com (52.133.45.150) by AM0PR0502MB3747.eurprd05.prod.outlook.com (52.133.47.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1750.17; Tue, 2 Apr 2019 04:56:33 +0000 Received: from AM0PR0502MB3795.eurprd05.prod.outlook.com ([fe80::84f3:7e92:7a51:1003]) by AM0PR0502MB3795.eurprd05.prod.outlook.com ([fe80::84f3:7e92:7a51:1003%2]) with mapi id 15.20.1750.014; Tue, 2 Apr 2019 04:56:33 +0000 From: Shahaf Shuler To: Ori Kam , Matan Azrad , Yongseok Koh CC: "dev@dpdk.org" Thread-Topic: [PATCH] net/mlx5: update counter API for upstream Thread-Index: AQHU6J92Rwis6tZNpUik7rG7SD6M+qYoT2LQ Date: Tue, 2 Apr 2019 04:56:33 +0000 Message-ID: References: <1554132458-176151-1-git-send-email-orika@mellanox.com> In-Reply-To: <1554132458-176151-1-git-send-email-orika@mellanox.com> 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=shahafs@mellanox.com; x-originating-ip: [31.154.10.105] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 25bbc5a2-cb23-4268-56ff-08d6b72793f9 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:AM0PR0502MB3747; x-ms-traffictypediagnostic: AM0PR0502MB3747: x-microsoft-antispam-prvs: x-forefront-prvs: 0995196AA2 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(136003)(346002)(396003)(39860400002)(366004)(376002)(199004)(189003)(99286004)(25786009)(106356001)(71200400001)(71190400001)(105586002)(2906002)(6246003)(5660300002)(102836004)(55016002)(26005)(316002)(86362001)(9686003)(256004)(110136005)(74316002)(305945005)(8676002)(81166006)(14444005)(97736004)(7736002)(81156014)(478600001)(33656002)(6636002)(53936002)(4326008)(186003)(476003)(486006)(7696005)(76176011)(68736007)(15650500001)(446003)(11346002)(229853002)(52536014)(6436002)(3846002)(14454004)(66066001)(6116002)(6506007)(8936002); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR0502MB3747; H:AM0PR0502MB3795.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX: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: rYonkIXkHn/L4kBuyfl84pBRTWjoYZl6Sleobvt2PyMx8oyig8E1shFanNcco+YVznCoLAstO/7OpsPrtxG8fm36+onjNNh4BqireXPEXOdWGHyjw2B8LVbGAsbUm3v4/mZc8rr6BJzM9u7PMXHCkXtSJMjPI2IITmIAYwPjsG2ViKTK5NR6tYkrc7iFJ4GePWQuJAhXweYrlI7hVawSjM6OtCbYraJZudJemDXyXOqLe5Q95sQoeWdklG0pQ8SqavSO/7GjEs6gZLHpy2KdfSwqzPUCL2QTyK8VxBCCrfbbpykG+IDTJnHKHhtgtI7VUwTrATlfkVlQsAKiCggE8cXwKlLtAxj1hLCB6JoiwrLCEOr9ARwXxUCAyVbYCTvbOQPUkXNEnB1/kFWKhF1ZXrysu52PHs9hOaT3rQ3auCk= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 25bbc5a2-cb23-4268-56ff-08d6b72793f9 X-MS-Exchange-CrossTenant-originalarrivaltime: 02 Apr 2019 04:56:33.2191 (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: AM0PR0502MB3747 Subject: Re: [dpdk-dev] [PATCH] net/mlx5: update counter API for upstream 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" Message-ID: <20190402045633.b79leaUa1m_JVSQftRES80jpJgyXIw0JOIqTDYTRep4@z> Hi Ori, Monday, April 1, 2019 6:28 PM, Ori Kam: > Subject: [PATCH] net/mlx5: update counter API for upstream This is not an update, this is a fix.=20 >=20 > The API that was defined in OFED 4.5 was replaced both in OFED 4.6 and in > upstream. >=20 > This commit updates the API to match the upstream one. Need to add Cc stable + the offending commit which caused the issue.=20 >=20 > Signed-off-by: Ori Kam > --- > drivers/net/mlx5/Makefile | 2 +- > drivers/net/mlx5/mlx5_flow_dv.c | 4 ++-- > 2 files changed, 3 insertions(+), 3 deletions(-) >=20 > 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/mlx5_flow_dv.c > b/drivers/net/mlx5/mlx5_flow_dv.c index 57847fb..2fe2836 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 >=20 > #ifndef HAVE_IBV_FLOW_DEVX_COUNTERS > -#define MLX5DV_FLOW_ACTION_COUNTER_DEVX 0 > +#define MLX5DV_FLOW_ACTION_COUNTERS_DEVX 0 > #endif >=20 > union flow_dv_attr { > @@ -2939,7 +2939,7 @@ struct field_modify_info modify_tcp[] =3D { > if (flow->counter =3D=3D NULL) > goto cnt_err; > dev_flow->dv.actions[actions_n].type =3D > - > MLX5DV_FLOW_ACTION_COUNTER_DEVX; > + > MLX5DV_FLOW_ACTION_COUNTERS_DEVX; > dev_flow->dv.actions[actions_n].obj =3D > flow->counter->dcs->obj; > action_flags |=3D MLX5_FLOW_ACTION_COUNT; > -- > 1.8.3.1