From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-eopbgr130041.outbound.protection.outlook.com [40.107.13.41]) by dpdk.org (Postfix) with ESMTP id 2065C2B99 for ; Tue, 2 Apr 2019 07:24:56 +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=vWyHS1z3uQucJitWbHGS304C8oSSfiIc9eBx879ID/0=; b=AuasS37X5DzA3afZmQSSZjDr8VnU0HXNpHmotzWs7egfiOgKrf6cKFREuHPh2ITWbx/rP/Pq+rS5ZDy1wIg0kifqS3GZ3hCfHeGlJmi9nbAyK++Ou04rGjup5K9M6uIJ69mr9YC3mWw1gKcjhJob6qFItM6XLsifYMu0vUkPX4U= Received: from AM4PR05MB3425.eurprd05.prod.outlook.com (10.171.190.15) by AM4PR05MB3300.eurprd05.prod.outlook.com (10.171.186.161) 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 05:24:54 +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 05:24:54 +0000 From: Ori Kam To: Shahaf Shuler , Matan Azrad , Yongseok Koh CC: "dev@dpdk.org" Thread-Topic: [PATCH] net/mlx5: update counter API for upstream Thread-Index: AQHU6J92Rwis6tZNpUik7rG7SD6M+qYoT2LQgAAHt0A= Date: Tue, 2 Apr 2019 05:24:54 +0000 Message-ID: References: <1554132458-176151-1-git-send-email-orika@mellanox.com> In-Reply-To: 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=orika@mellanox.com; x-originating-ip: [193.47.165.251] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 3183856b-d10a-46c3-b045-08d6b72b89e9 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:AM4PR05MB3300; x-ms-traffictypediagnostic: AM4PR05MB3300: x-microsoft-antispam-prvs: x-forefront-prvs: 0995196AA2 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(346002)(366004)(136003)(396003)(39860400002)(376002)(13464003)(189003)(199004)(55016002)(446003)(81156014)(11346002)(71200400001)(26005)(256004)(4326008)(2906002)(478600001)(110136005)(6436002)(74316002)(3846002)(305945005)(15650500001)(8676002)(14444005)(99286004)(105586002)(6116002)(106356001)(71190400001)(86362001)(6246003)(25786009)(316002)(52536014)(186003)(53936002)(81166006)(486006)(9686003)(229853002)(7696005)(14454004)(6506007)(53546011)(68736007)(102836004)(76176011)(8936002)(6636002)(5660300002)(33656002)(476003)(66066001)(97736004)(7736002); DIR:OUT; SFP:1101; SCL:1; SRVR:AM4PR05MB3300; 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: Jr/szUt4JN1zxuQAdcFZpwiIkqaOUrbRDMvrBZN7+QI1nd4sDFYSm906TKsA2QM3MckfDNi2vqRegwYmugkHrOntksiyv1240u1QOv3YF5nEsqyCIf+zueW14+9hTjoViPq7O7kMzMiflUQlk4BU3aJ5tuJ12FJA9r5dcykw6vvYuQ+DeYPjsT89YkLazJ3dCu5KxXlyWNP3I6DXuH0t4wR/eVAVHg7Kjb7cHGzpYeNedKzrigu9JJNduUICQB8Bnq/Lk0ILKGf+OQQuQVeTfNj92JgHnZaubA18VbXNa3FlP6GybGXUIvcJkcO99qGTkwIa2mHqn6fSNT+NJFLcV/iD4skO9fhEa/UKk0JROO9+IjG0pf/jeaOdMZUGT5zYT05gPF2UMOef6yx/xw9CrUCwKxteFv7BZV/1/4Ffki8= 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: 3183856b-d10a-46c3-b045-08d6b72b89e9 X-MS-Exchange-CrossTenant-originalarrivaltime: 02 Apr 2019 05:24:54.3433 (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: AM4PR05MB3300 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 05:24:56 -0000 Hi PSB > -----Original Message----- > From: Shahaf Shuler > Sent: Tuesday, April 2, 2019 7:57 AM > To: Ori Kam ; Matan Azrad ; > Yongseok Koh > Cc: dev@dpdk.org > Subject: RE: [PATCH] net/mlx5: update counter API for upstream >=20 > Hi Ori, >=20 > Monday, April 1, 2019 6:28 PM, Ori Kam: > > Subject: [PATCH] net/mlx5: update counter API for upstream >=20 > This is not an update, this is a fix. The reason that I don't think this is a fix since in the original commit it= was stated that it is only for OFED 4.5 and in this case it is correct OFED changed the API. It is not an issue wit= h the original commit. >=20 > > > > 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. >=20 > Need to add Cc stable + the offending commit which caused the issue. >=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(-) > > > > diff --git a/drivers/net/mlx5/Makefile b/drivers/net/mlx5/Makefile inde= x > > 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 > > > > #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[] =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 C1E01A0679 for ; Tue, 2 Apr 2019 07:24:59 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 3C8422C36; Tue, 2 Apr 2019 07:24:58 +0200 (CEST) Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-eopbgr130041.outbound.protection.outlook.com [40.107.13.41]) by dpdk.org (Postfix) with ESMTP id 2065C2B99 for ; Tue, 2 Apr 2019 07:24:56 +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=vWyHS1z3uQucJitWbHGS304C8oSSfiIc9eBx879ID/0=; b=AuasS37X5DzA3afZmQSSZjDr8VnU0HXNpHmotzWs7egfiOgKrf6cKFREuHPh2ITWbx/rP/Pq+rS5ZDy1wIg0kifqS3GZ3hCfHeGlJmi9nbAyK++Ou04rGjup5K9M6uIJ69mr9YC3mWw1gKcjhJob6qFItM6XLsifYMu0vUkPX4U= Received: from AM4PR05MB3425.eurprd05.prod.outlook.com (10.171.190.15) by AM4PR05MB3300.eurprd05.prod.outlook.com (10.171.186.161) 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 05:24:54 +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 05:24:54 +0000 From: Ori Kam To: Shahaf Shuler , Matan Azrad , Yongseok Koh CC: "dev@dpdk.org" Thread-Topic: [PATCH] net/mlx5: update counter API for upstream Thread-Index: AQHU6J92Rwis6tZNpUik7rG7SD6M+qYoT2LQgAAHt0A= Date: Tue, 2 Apr 2019 05:24:54 +0000 Message-ID: References: <1554132458-176151-1-git-send-email-orika@mellanox.com> In-Reply-To: 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=orika@mellanox.com; x-originating-ip: [193.47.165.251] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 3183856b-d10a-46c3-b045-08d6b72b89e9 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:AM4PR05MB3300; x-ms-traffictypediagnostic: AM4PR05MB3300: x-microsoft-antispam-prvs: x-forefront-prvs: 0995196AA2 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(346002)(366004)(136003)(396003)(39860400002)(376002)(13464003)(189003)(199004)(55016002)(446003)(81156014)(11346002)(71200400001)(26005)(256004)(4326008)(2906002)(478600001)(110136005)(6436002)(74316002)(3846002)(305945005)(15650500001)(8676002)(14444005)(99286004)(105586002)(6116002)(106356001)(71190400001)(86362001)(6246003)(25786009)(316002)(52536014)(186003)(53936002)(81166006)(486006)(9686003)(229853002)(7696005)(14454004)(6506007)(53546011)(68736007)(102836004)(76176011)(8936002)(6636002)(5660300002)(33656002)(476003)(66066001)(97736004)(7736002); DIR:OUT; SFP:1101; SCL:1; SRVR:AM4PR05MB3300; 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: Jr/szUt4JN1zxuQAdcFZpwiIkqaOUrbRDMvrBZN7+QI1nd4sDFYSm906TKsA2QM3MckfDNi2vqRegwYmugkHrOntksiyv1240u1QOv3YF5nEsqyCIf+zueW14+9hTjoViPq7O7kMzMiflUQlk4BU3aJ5tuJ12FJA9r5dcykw6vvYuQ+DeYPjsT89YkLazJ3dCu5KxXlyWNP3I6DXuH0t4wR/eVAVHg7Kjb7cHGzpYeNedKzrigu9JJNduUICQB8Bnq/Lk0ILKGf+OQQuQVeTfNj92JgHnZaubA18VbXNa3FlP6GybGXUIvcJkcO99qGTkwIa2mHqn6fSNT+NJFLcV/iD4skO9fhEa/UKk0JROO9+IjG0pf/jeaOdMZUGT5zYT05gPF2UMOef6yx/xw9CrUCwKxteFv7BZV/1/4Ffki8= 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: 3183856b-d10a-46c3-b045-08d6b72b89e9 X-MS-Exchange-CrossTenant-originalarrivaltime: 02 Apr 2019 05:24:54.3433 (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: AM4PR05MB3300 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: <20190402052454.wKL-uoGP61VMOJ4g5AUtMkBpSJmPQB5HXl7DhpdEnSA@z> Hi PSB > -----Original Message----- > From: Shahaf Shuler > Sent: Tuesday, April 2, 2019 7:57 AM > To: Ori Kam ; Matan Azrad ; > Yongseok Koh > Cc: dev@dpdk.org > Subject: RE: [PATCH] net/mlx5: update counter API for upstream >=20 > Hi Ori, >=20 > Monday, April 1, 2019 6:28 PM, Ori Kam: > > Subject: [PATCH] net/mlx5: update counter API for upstream >=20 > This is not an update, this is a fix. The reason that I don't think this is a fix since in the original commit it= was stated that it is only for OFED 4.5 and in this case it is correct OFED changed the API. It is not an issue wit= h the original commit. >=20 > > > > 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. >=20 > Need to add Cc stable + the offending commit which caused the issue. >=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(-) > > > > diff --git a/drivers/net/mlx5/Makefile b/drivers/net/mlx5/Makefile inde= x > > 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 > > > > #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[] =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