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 F3F91A2EEB for ; Tue, 10 Sep 2019 10:13:45 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D1EF41ECC1; Tue, 10 Sep 2019 10:13:45 +0200 (CEST) Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-eopbgr50084.outbound.protection.outlook.com [40.107.5.84]) by dpdk.org (Postfix) with ESMTP id 9EFD11EC96 for ; Tue, 10 Sep 2019 10:13:44 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aOfYirFyWTty7gMxCpBp1DSXOOsMxjBJmrcYobK7NCUg374WG1iaRe4Fvc7Ui+hw1cvFaGKurXECgO4mQIObBZqnetc4VZR89WHGei3ElgcBVKRpddfc2nsOH+AVvW0zV/dnhQW75my395XIfwRHhN8DRAOmsX1/AHUnuqPwoxDrAzdXanotmtaTBolsQICeYpXr7mIA8bFjI1T0iKJkdnb0drNO+nrvwi0rQsYkxS5g2FHKuEzpcEcX3I/bFLSTF+xksH5RfSveZpte+CpXslbDAs5E3PzF+2rKVWaH89FWNMhwcLmOGDkVQFl0mAWpi9gMm6HFd/slp0RPR1kdUg== 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=EWBwJhCVQGr/GjygOPdtNT3w6Q7S8L948cr4mMhJEtg=; b=OtIHkav4CAB++YKDP4z8fQY0z2AfVYJqLjhu5317A9ufI7K+kdP51ohZZwJzxCLDRwKzXbfmA/EfDdAJV04IDQAyfq9oDNy4+Psaoys6qo8LiEPKF9X6eZH7ZMI/aOVGzgd38pFQJbCPgCwxNJ4ngGDu61Bs+t/Rgjbq33BvVqC4H6EfJoeuNY7kZxBr5zQ+3yUn6OPr+gJRE+4afhGFyQZ1dExUzEaS5fQJGVkFk0jtjRcbshmvOG+cf8aHfR4cFFwAJnJ+6UqI4Qs6WwQdOGJRII2eE70I5Euki6E+9VGcLGdB7SXiZGgUNoeIi9qzJB2qoeUTUWbGjQVfcwtczA== 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=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=EWBwJhCVQGr/GjygOPdtNT3w6Q7S8L948cr4mMhJEtg=; b=F8iorPtZ+O+AdFDiSWPBE70pR3b9TdvvdfbrtU2DV69yY0uBJrw4GV5mqAQr2xBmg1eOK54T5I+HQcMqLzzkDHFkBIE4SXkD/WBp7zhy2zDL41eR0egMtRw7ZWsX0evdGeGEF+nnA1JcakgKS3k/XAf0O2tMs/87VXigXSRS8Zo= Received: from VI1PR05MB3278.eurprd05.prod.outlook.com (10.170.238.23) by VI1PR05MB4189.eurprd05.prod.outlook.com (10.171.183.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2241.20; Tue, 10 Sep 2019 08:13:43 +0000 Received: from VI1PR05MB3278.eurprd05.prod.outlook.com ([fe80::d4c:75b4:c928:3890]) by VI1PR05MB3278.eurprd05.prod.outlook.com ([fe80::d4c:75b4:c928:3890%7]) with mapi id 15.20.2241.018; Tue, 10 Sep 2019 08:13:43 +0000 From: Slava Ovsiienko To: Moti Haimovsky , Raslan Darawsheh CC: "dev@dpdk.org" Thread-Topic: [PATCH v5 5/7] net/mlx5: support modify VLAN priority on VLAN hdr Thread-Index: AQHVZyc1wUwz6RErEEGRgZM9wYUZxqckkPsw Date: Tue, 10 Sep 2019 08:13:43 +0000 Message-ID: References: <672cb17b8fd1c7171bb2714840124de51c004fd0.1567951423.git.motih@mellanox.com> In-Reply-To: <672cb17b8fd1c7171bb2714840124de51c004fd0.1567951423.git.motih@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=viacheslavo@mellanox.com; x-originating-ip: [95.67.35.250] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 2008d837-f0e9-49ee-d899-08d735c6cb9b x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600166)(711020)(4605104)(1401327)(4618075)(2017052603328)(7193020); SRVR:VI1PR05MB4189; x-ms-traffictypediagnostic: VI1PR05MB4189:|VI1PR05MB4189: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:628; x-forefront-prvs: 01565FED4C x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(4636009)(1496009)(366004)(376002)(39860400002)(396003)(136003)(346002)(13464003)(199004)(189003)(14444005)(64756008)(66066001)(33656002)(256004)(4326008)(25786009)(53546011)(52536014)(6436002)(86362001)(229853002)(74316002)(305945005)(8676002)(9686003)(6506007)(55016002)(7736002)(7696005)(81166006)(316002)(8936002)(76176011)(110136005)(6246003)(3846002)(476003)(186003)(2906002)(486006)(66946007)(81156014)(66476007)(66556008)(14454004)(66446008)(6636002)(102836004)(6116002)(99286004)(76116006)(71190400001)(71200400001)(5660300002)(26005)(446003)(11346002)(478600001)(53936002); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR05MB4189; H:VI1PR05MB3278.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: 7tOZSZpXdJgxpjV0jR7T690BmUz6YKCj7jmnvMFc9LxFRNuGXs1VND7AHV2bnEyCOQLegcT7dDbAWlljfcUqFMKmhXpJ8+3BLeEtKcfC2SQ2ujJwO8D/R8B2KDBxDKxMEmQD1gNYOPDAERQgg4sshjL6Ps5HqcaLX5w1rTkIFsMuZdvW4hGS3zq84hBb8ZCBAZuQy7eTHCXSJ+jIxNixhwRQ89he2Pfh2V5CTCq7j3Z9ApYZYSzvbPacQHltopjg9zZ39wkGOH4qI1jdxYURV1QwriXftviSzNJ55Id9NR7wZa/j8D+0fjE+P9g9w5IDKzWeioIHP0ElHBDOP9fpICMZsmgUqtLyhQiYmV2W8w9MDvlY8OZjeiVXC+SbQ9jBDuMNgLbMKlK3Po2tkt3kcDS2l78hAYKKA9fNsvKRB3c= 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: 2008d837-f0e9-49ee-d899-08d735c6cb9b X-MS-Exchange-CrossTenant-originalarrivaltime: 10 Sep 2019 08:13:43.0730 (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: j+9UbHBWeaCn+cxhEsy7k7miNcdzMrs+jTLvp/Kp9uMZeEh3yQgClRz2cZdleOK6wzmQZMJZQCHsAp0zdoSsCUre3ZOSrJHTwNfRSNwBr1U= X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR05MB4189 Subject: Re: [dpdk-dev] [PATCH v5 5/7] net/mlx5: support modify VLAN priority on VLAN hdr 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" > -----Original Message----- > From: Moti Haimovsky > Sent: Monday, September 9, 2019 18:57 > To: Slava Ovsiienko ; Raslan Darawsheh > > Cc: dev@dpdk.org > Subject: [PATCH v5 5/7] net/mlx5: support modify VLAN priority on VLAN hd= r >=20 > This commit adds support for modifying the VLAN priority (PCP) field in > about-to-be-pushed VLAN header. > This feature can only modify the PCP field of a new VLAN header yet to be > pushed. It does not support modifying an existing or already pushed VLAN > headers. >=20 > Signed-off-by: Moti Haimovsky Acked-by: Viacheslav Ovsiienko > --- > v4: > - Fixed typo in an error message. > --- > doc/guides/nics/mlx5.rst | 5 ++- > doc/guides/rel_notes/release_19_11.rst | 1 + > drivers/net/mlx5/mlx5_flow_dv.c | 62 > ++++++++++++++++++++++++++++++++++ > 3 files changed, 67 insertions(+), 1 deletion(-) >=20 > diff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst index > 875a87f..01215f4 100644 > --- a/doc/guides/nics/mlx5.rst > +++ b/doc/guides/nics/mlx5.rst > @@ -132,6 +132,8 @@ Limitations >=20 > - VLAN push offload is not supported on ingress traffic. >=20 > +- VLAN set PCP offload is not supported on existing headers. > + > - A multi segment packet must have not more segments than reported by > dev_infos_get() > in tx_desc_lim.nb_seg_max field. This value depends on maximal support= ed > Tx descriptor > size and ``txq_inline_min`` settings and may be from 2 (worst case for= ced > by maximal @@ -1042,7 +1044,8 @@ Supported hardware offloads > +-----------------------+-----------------+-----------------+ > | | VLAN | | DPDK 19.11 | | DPDK 19.11 | > | | (of_pop_vlan / | | OFED 4.6-4 | | OFED 4.6-4 | > - | | of_push_vlan) | | ConnectX-5 | | ConnectX-5 | > + | | of_push_vlan / | | ConnectX-5 | | ConnectX-5 | > + | | of_set_vlan_pcp) | | | > +-----------------------+-----------------+-----------------+ >=20 > Notes for testpmd > diff --git a/doc/guides/rel_notes/release_19_11.rst > b/doc/guides/rel_notes/release_19_11.rst > index afe92ab..5067a1c 100644 > --- a/doc/guides/rel_notes/release_19_11.rst > +++ b/doc/guides/rel_notes/release_19_11.rst > @@ -229,4 +229,5 @@ Tested Platforms >=20 > * Added support for VLAN pop flow offload command. > * Added support for VLAN push flow offload command. > + * Added support for VLAN set PCP offload command. >=20 > diff --git a/drivers/net/mlx5/mlx5_flow_dv.c > b/drivers/net/mlx5/mlx5_flow_dv.c index 2780735..73459a0 100644 > --- a/drivers/net/mlx5/mlx5_flow_dv.c > +++ b/drivers/net/mlx5/mlx5_flow_dv.c > @@ -974,6 +974,47 @@ struct field_modify_info modify_tcp[] =3D { } >=20 > /** > + * Validate the set VLAN PCP. > + * > + * @param[in] action_flags > + * Holds the actions detected until now. > + * @param[in] actions > + * Pointer to the list of actions remaining in the flow rule. > + * @param[in] attr > + * Pointer to flow attributes > + * @param[out] error > + * Pointer to error structure. > + * > + * @return > + * 0 on success, a negative errno value otherwise and rte_errno is set= . > + */ > +static int > +flow_dv_validate_action_set_vlan_pcp(uint64_t action_flags, > + const struct rte_flow_action actions[], > + struct rte_flow_error *error) > +{ > + const struct rte_flow_action *action =3D actions; > + const struct rte_flow_action_of_set_vlan_pcp *conf =3D action->conf; > + > + if (conf->vlan_pcp > 7) > + return rte_flow_error_set(error, EINVAL, > + RTE_FLOW_ERROR_TYPE_ACTION, > action, > + "VLAN PCP value is too big"); > + if (mlx5_flow_find_action(actions, > + > RTE_FLOW_ACTION_TYPE_OF_PUSH_VLAN) =3D=3D NULL) > + return rte_flow_error_set(error, ENOTSUP, > + RTE_FLOW_ERROR_TYPE_ACTION, > action, > + "set VLAN PCP can only be used " > + "with push VLAN action"); > + if (action_flags & MLX5_FLOW_ACTION_OF_PUSH_VLAN) > + return rte_flow_error_set(error, ENOTSUP, > + RTE_FLOW_ERROR_TYPE_ACTION, > action, > + "set VLAN PCP action must precede > " > + "the push VLAN action"); > + return 0; > +} > + > +/** > * Validate count action. > * > * @param[in] dev > @@ -3396,6 +3437,13 @@ struct field_modify_info modify_tcp[] =3D { > action_flags |=3D > MLX5_FLOW_ACTION_OF_PUSH_VLAN; > ++actions_n; > break; > + case RTE_FLOW_ACTION_TYPE_OF_SET_VLAN_PCP: > + ret =3D flow_dv_validate_action_set_vlan_pcp > + (action_flags, actions, error); > + if (ret < 0) > + return ret; > + /* Count PCP with push_vlan command. */ > + break; > case RTE_FLOW_ACTION_TYPE_VXLAN_ENCAP: > case RTE_FLOW_ACTION_TYPE_NVGRE_ENCAP: > ret =3D > flow_dv_validate_action_l2_encap(action_flags, > @@ -4989,6 +5037,7 @@ struct field_modify_info modify_tcp[] =3D { > uint8_t next_protocol =3D 0xff; > struct rte_vlan_hdr vlan =3D { 0 }; > bool vlan_inherited =3D false; > + uint16_t vlan_tci; >=20 > flow->group =3D attr->group; > if (attr->transfer) > @@ -5118,6 +5167,19 @@ struct field_modify_info modify_tcp[] =3D { > dev_flow->dv.push_vlan_res- > >action; > action_flags |=3D > MLX5_FLOW_ACTION_OF_PUSH_VLAN; > break; > + case RTE_FLOW_ACTION_TYPE_OF_SET_VLAN_PCP: > + if (!vlan_inherited) { > + flow_dev_get_vlan_info_from_items(items, > &vlan); > + vlan_inherited =3D true; > + } > + vlan_tci =3D > + ((const struct rte_flow_action_of_set_vlan_pcp *) > + actions->conf)- > >vlan_pcp; > + vlan_tci =3D vlan_tci << > MLX5DV_FLOW_VLAN_PCP_SHIFT; > + vlan.vlan_tci &=3D ~MLX5DV_FLOW_VLAN_PCP_MASK; > + vlan.vlan_tci |=3D vlan_tci; > + /* Push VLAN command will use this value */ > + break; > case RTE_FLOW_ACTION_TYPE_VXLAN_ENCAP: > case RTE_FLOW_ACTION_TYPE_NVGRE_ENCAP: > if (flow_dv_create_action_l2_encap(dev, actions, > -- > 1.8.3.1