From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80058.outbound.protection.outlook.com [40.107.8.58]) by dpdk.org (Postfix) with ESMTP id 140D01B5A9 for ; Tue, 9 Oct 2018 17:56:00 +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=KQb63Tn/pzY3szBTDwUEjioHWo+TI7j3ymhYBwnSn00=; b=nFf6iAOnWz2cd2G1vz8w0D6TExSLFTDY2yjNcOFZqMfe4x1FxURuRyLhlFebwaILDVKUNvRNwHsUzqt0mZDXHIkih2xYA3QAI37iA4dmxmU3sDY95FAaVu/i4yGL6ZgxVKo1vg4n/mJPadevbPOMcuLAH2b0P5m4kTCf/5k0MjU= Received: from VI1PR05MB4224.eurprd05.prod.outlook.com (52.133.12.13) by VI1PR05MB5087.eurprd05.prod.outlook.com (20.177.52.88) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1207.21; Tue, 9 Oct 2018 15:55:58 +0000 Received: from VI1PR05MB4224.eurprd05.prod.outlook.com ([fe80::f911:fe8:927d:400b]) by VI1PR05MB4224.eurprd05.prod.outlook.com ([fe80::f911:fe8:927d:400b%4]) with mapi id 15.20.1228.020; Tue, 9 Oct 2018 15:55:58 +0000 From: Dekel Peled To: Yongseok Koh CC: Shahaf Shuler , "dev@dpdk.org" , Ori Kam Thread-Topic: [PATCH v2 3/4] net/mlx5: add L2 and L3 encap to Direct Verbs flow Thread-Index: AQHUXknbbcTYenRHwUuD31QVQ9ilmaUV2IEAgAE2iWA= Date: Tue, 9 Oct 2018 15:55:58 +0000 Message-ID: References: <1538059845-35896-1-git-send-email-dekelp@mellanox.com> <1538922308-9516-4-git-send-email-dekelp@mellanox.com> <20181008210436.GD7844@mtidpdk.mti.labs.mlnx> In-Reply-To: <20181008210436.GD7844@mtidpdk.mti.labs.mlnx> 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=dekelp@mellanox.com; x-originating-ip: [193.47.165.251] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; VI1PR05MB5087; 6:yaO+qXJCqp66uKgMO+0eXeN6r7XJAzBEsakzDEe7yAAmQ5+h6Jizn2hNcLDUM7dFDHk0A2PsQdcq5IPTNDY5xQjAb3Ci8C3TyGCLeEXv0XTa9jNW/pwFvtyL9gKvJWkJmTb6uUa0wUvPK/y1hCOX3xfTrtn1GRx1Eu4KR3l6X7JiNX33raKJ+HArdMEY5F6JaFa8h42jodMQGndBSPK82zhdWeJrBH9vueWVaV4lxFar69miARFgB6Q1R4j1Gvf+FcmLyLGT2s9QAsFAnzKen/o2XHwrAgUmj46ydjQ472AoZYemajlqJmCBW8lbcXnedchfChlv6egqEVW1AgatO5IitvltP+BvwlrIXIeA7ZePbmppB+ICa/JgenThqfy/d7ENXS3UKY2e8AcGoSXS1CqEnNmFYAWZKRXg/fHFNfsktves+FyQx1U8IT8u71Ug/jQtvAVYDjC+0jAsDuxd7g==; 5:RPez6FNVr4KGJLg9oe1oPs5Ix1TqRRR7S9yzelFB+Qo65n04BIzr5s21pvClxZouUwkpLJCKontIQsjQzEt7rhKZAWbWvS1sj5A0umy85QeDTkgrCWiGJoSAAI1d6Cgl3mzu2X+NdffmTtNUNCr6PEBh/ow8TEV79sV3pyT/qZg=; 7:V0S53dEs3txWqplpLDjTxlYeJVmCv3Aqsb648wRwSCrAh43k/wxXv3QXgckCGy+K7mrNB+lZ76O7haSEdtMVgu2gzJrOQ/pmMf9OmioJgsoFgnqgRbfmuWdPCoX3fHtBI5n4ZHw8xOQmTnTOvq4BWdPU3SM9jpPFbFVCuSIZgUsCY5tp0PzkFNl69ZCGUnzoH0/9WSoO4PTFh5kAy7DhYD3fs757tJcyxZp+6VLuUfMGI7czuZuvddFiT6dc2ZC/ x-ms-exchange-antispam-srfa-diagnostics: SOS; x-ms-office365-filtering-correlation-id: b8ca201b-01f0-4c4c-d77a-08d62dffb428 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:VI1PR05MB5087; x-ms-traffictypediagnostic: VI1PR05MB5087: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:; x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(93006095)(93001095)(3231355)(944501410)(52105095)(10201501046)(6055026)(149066)(150057)(6041310)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123564045)(20161123558120)(201708071742011)(7699051); SRVR:VI1PR05MB5087; BCL:0; PCL:0; RULEID:; SRVR:VI1PR05MB5087; x-forefront-prvs: 08200063E9 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(136003)(366004)(396003)(39860400002)(376002)(346002)(199004)(189003)(13464003)(86362001)(316002)(6436002)(33656002)(102836004)(14454004)(305945005)(7736002)(74316002)(7696005)(71190400001)(6246003)(9686003)(71200400001)(55016002)(2906002)(54906003)(53936002)(4744004)(99286004)(66066001)(76176011)(26005)(97736004)(8936002)(68736007)(5250100002)(486006)(476003)(3846002)(81156014)(81166006)(6116002)(6506007)(53546011)(186003)(14444005)(256004)(8676002)(229853002)(106356001)(105586002)(25786009)(6862004)(5660300001)(446003)(107886003)(2900100001)(6636002)(11346002)(4326008)(478600001); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR05MB5087; H:VI1PR05MB4224.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-microsoft-antispam-message-info: U7ZRdGYcnt5zVKggR+fVCGvPh5/by5hs5pWWXzNPbzVQGXsTRjI57Jm/tDPakUzAUp3zhhA/4fq4a4hRPcolBMSVovTqKRiUmArYhv2+jcraaX2c5+WlnQ7H0kscxa+dvkvNAjYRW7/ZYn9pdejMgsuvfQAMehZ6Qpcbvv67jGh/b95V2SpdkiDjD5b2N7pChgGQziat5P/50126UwcUJbbDQyBm85wDoDoXQO58DKQPQMQiMvP2dxuVmUkhCylQiek9w32m42DYFjPrsrkwlm3Rdh4ZB8AaPMLUnrW6fDXhBiNxckDORYz/VGvCkYUr2A4IEFKC68gOw70UYoizRAc0B8Jg4W2Ex+9y/CRhX9o= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM 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: b8ca201b-01f0-4c4c-d77a-08d62dffb428 X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Oct 2018 15:55:58.0778 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR05MB5087 Subject: Re: [dpdk-dev] [PATCH v2 3/4] net/mlx5: add L2 and L3 encap to Direct Verbs flow 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, 09 Oct 2018 15:56:00 -0000 Thanks, PSB. > -----Original Message----- > From: Yongseok Koh > Sent: Tuesday, October 9, 2018 12:05 AM > To: Dekel Peled > Cc: Shahaf Shuler ; dev@dpdk.org; Ori Kam > > Subject: Re: [PATCH v2 3/4] net/mlx5: add L2 and L3 encap to Direct Verbs > flow >=20 > On Sun, Oct 07, 2018 at 05:25:07PM +0300, Dekel Peled wrote: > > This patch adds support for Direct Verbs encap operations, L2 and L3. > > > > Signed-off-by: Dekel Peled > > --- >=20 > For flow_dv_create_encap(), flow_dv_create_encap_l3() and > flow_dv_create_action(), please make the 'dev' come first in the args lis= t like > other functions. Done. >=20 > And there are still two blank lines like I pointed out below. Fixed. >=20 > With these changes, please put my acked-by tag when you submit the next > version. >=20 > Thanks, > Yongseok >=20 > > drivers/net/mlx5/mlx5_flow_dv.c | 226 > > +++++++++++++++++++++++++++++++++++++++- > > 1 file changed, 222 insertions(+), 4 deletions(-) > > > > diff --git a/drivers/net/mlx5/mlx5_flow_dv.c > > b/drivers/net/mlx5/mlx5_flow_dv.c index 80e7b24..221c76a 100644 > > --- a/drivers/net/mlx5/mlx5_flow_dv.c > > +++ b/drivers/net/mlx5/mlx5_flow_dv.c > > @@ -84,6 +84,167 @@ > > } > > > > /** > > + * Validate the tunnel encap action. > > + * > > + * @param[in] action_flags > > + * holds the actions detected until now. > > + * @param[in] action > > + * Pointer to the encap action. > > + * @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_ernno is s= et. > > + */ > > +static int > > +flow_dv_validate_action_tunnel_encap(uint64_t action_flags, > > + const struct rte_flow_action *action, > > + const struct rte_flow_attr *attr, > > + struct rte_flow_error *error) { > > + const struct rte_flow_action_tunnel_encap *tunnel_encap =3D > > +action->conf; > > + > > + if (!tunnel_encap || !(tunnel_encap->buf)) > > + return rte_flow_error_set(error, EINVAL, > > + RTE_FLOW_ERROR_TYPE_ACTION, > action, > > + "configuration cannot be null"); > > + if (action_flags & MLX5_FLOW_ACTION_DROP) > > + return rte_flow_error_set(error, EINVAL, > > + RTE_FLOW_ERROR_TYPE_ACTION, > NULL, > > + "can't drop and encap in same > flow"); > > + if (action_flags & (MLX5_FLOW_ACTION_TUNNEL_ENCAP | > > + MLX5_FLOW_ACTION_TUNNEL_ENCAP_L3)) > > + return rte_flow_error_set(error, EINVAL, > > + RTE_FLOW_ERROR_TYPE_ACTION, > NULL, > > + "can't have 2 encap actions in same" > > + " flow"); > > + if (attr->ingress) > > + return rte_flow_error_set(error, ENOTSUP, > > + > RTE_FLOW_ERROR_TYPE_ATTR_INGRESS, NULL, > > + "encap action not supported for " > > + "ingress"); > > + return 0; > > +} > > + > > +/** > > + * Validate the tunnel encap L3 action > > + * > > + * @param[in] action_flags > > + * holds the actions detected until now. > > + * @param[in] action > > + * Pointer to the encap action. > > + * @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_ernno is s= et. > > + */ > > +static int > > +flow_dv_validate_action_tunnel_encap_l3(uint64_t action_flags, > > + const struct rte_flow_action *action, > > + const struct rte_flow_attr *attr, > > + struct rte_flow_error *error) > > +{ > > + const struct rte_flow_action_tunnel_encap_l3 *tunnel_encap_l3 =3D > > + action->conf; > > + > > + if (!tunnel_encap_l3 || !(tunnel_encap_l3->buf)) > > + return rte_flow_error_set(error, EINVAL, > > + RTE_FLOW_ERROR_TYPE_ACTION, > action, > > + "configuration cannot be null"); > > + if (action_flags & MLX5_FLOW_ACTION_DROP) > > + return rte_flow_error_set(error, EINVAL, > > + RTE_FLOW_ERROR_TYPE_ACTION, > NULL, > > + "can't drop and encap in same > flow"); > > + if (action_flags & (MLX5_FLOW_ACTION_TUNNEL_ENCAP | > > + MLX5_FLOW_ACTION_TUNNEL_ENCAP_L3)) > > + return rte_flow_error_set(error, EINVAL, > > + RTE_FLOW_ERROR_TYPE_ACTION, > NULL, > > + "can't have 2 encap actions in same" > > + " flow"); > > + if (attr->ingress) > > + return rte_flow_error_set(error, ENOTSUP, > > + > RTE_FLOW_ERROR_TYPE_ATTR_INGRESS, > > + NULL, > > + "encap action not supported for " > > + "ingress"); > > + return 0; > > +} > > + > > +/** > > + * Convert encap action to DV specification. > > + * > > + * @param[in] action > > + * Pointer to action structure. > > + * @param[in] dev > > + * Pointer to rte_eth_dev structure. > > + * @param[out] error > > + * Pointer to the error structure. > > + * > > + * @return > > + * Pointer to action on success, NULL otherwise and rte_errno is set= . > > + */ > > +static struct ibv_flow_action * > > +flow_dv_create_encap(const struct rte_flow_action *action, > > + struct rte_eth_dev *dev, > > + struct rte_flow_error *error) > > +{ > > + struct ibv_flow_action *encap_verb =3D NULL; > > + const struct rte_flow_action_tunnel_encap *encap_data; > > + struct priv *priv =3D dev->data->dev_private; > > + > > + encap_data =3D (const struct rte_flow_action_tunnel_encap *)action- > >conf; > > + encap_verb =3D mlx5_glue->dv_create_flow_action_packet_reformat > > + (priv->ctx, encap_data->size, > > + encap_data->size ? encap_data->buf : NULL, > > + > MLX5DV_FLOW_ACTION_PACKET_REFORMAT_TYPE_L2_TO_L2_TUNNEL, > > + MLX5DV_FLOW_TABLE_TYPE_NIC_TX); > > + if (!encap_verb) > > + rte_flow_error_set(error, EINVAL, > RTE_FLOW_ERROR_TYPE_ACTION, > > + NULL, "cannot create encap action"); > > + return encap_verb; > > +} > > + > > +/** > > + * Convert encap L3 action to DV specification. > > + * > > + * @param[in] action > > + * Pointer to action structure. > > + * @param[in] dev > > + * Pointer to rte_eth_dev structure. > > + * @param[out] error > > + * Pointer to the error structure. > > + * > > + * @return > > + * Pointer to action on success, NULL otherwise and rte_errno is set= . > > + */ > > +static struct ibv_flow_action * > > +flow_dv_create_encap_l3(const struct rte_flow_action *action, > > + struct rte_eth_dev *dev, > > + struct rte_flow_error *error) > > +{ > > + struct ibv_flow_action *encap_l3_verb =3D NULL; > > + const struct rte_flow_action_tunnel_encap_l3 *encap_l3_data; > > + struct priv *priv =3D dev->data->dev_private; > > + > > + encap_l3_data =3D > > + (const struct rte_flow_action_tunnel_encap_l3 *)action- > >conf; > > + encap_l3_verb =3D mlx5_glue- > >dv_create_flow_action_packet_reformat > > + (priv->ctx, encap_l3_data->size, > > + encap_l3_data->size ? encap_l3_data->buf : NULL, > > + > MLX5DV_FLOW_ACTION_PACKET_REFORMAT_TYPE_L2_TO_L3_TUNNEL, > > + MLX5DV_FLOW_TABLE_TYPE_NIC_TX); > > + if (!encap_l3_verb) > > + rte_flow_error_set(error, EINVAL, > RTE_FLOW_ERROR_TYPE_ACTION, > > + NULL, "cannot create encap L3 action"); > > + return encap_l3_verb; > > +} > > + > > +/** > > * Verify the @p attributes will be correctly understood by the NIC an= d > store > > * them in the @p flow if everything is correct. > > * > > @@ -330,6 +491,20 @@ > > action_flags |=3D MLX5_FLOW_ACTION_COUNT; > > ++actions_n; > > break; > > + case RTE_FLOW_ACTION_TYPE_TUNNEL_ENCAP: > > + ret =3D flow_dv_validate_action_tunnel_encap > > + (action_flags, actions, attr, error); > > + if (ret < 0) > > + return ret; > > + action_flags |=3D > MLX5_FLOW_ACTION_TUNNEL_ENCAP; > > + break; > > + case RTE_FLOW_ACTION_TYPE_TUNNEL_ENCAP_L3: > > + ret =3D flow_dv_validate_action_tunnel_encap_l3 > > + (action_flags, actions, attr, error); > > + if (ret < 0) > > + return ret; > > + action_flags |=3D > MLX5_FLOW_ACTION_TUNNEL_ENCAP_L3; > > + break; > > default: > > return rte_flow_error_set(error, ENOTSUP, > > > RTE_FLOW_ERROR_TYPE_ACTION, > > @@ -1042,10 +1217,19 @@ > > * Flow action to translate. > > * @param[in, out] dev_flow > > * Pointer to the mlx5_flow. > > + * @param[in] dev > > + * Pointer to rte_eth_dev structure. > > + * @param[out] error > > + * Pointer to the error structure. > > + * > > + * @return > > + * 0 on success, a negative errno value otherwise and rte_ernno is s= et. > > */ > > -static void > > +static int > > flow_dv_create_action(const struct rte_flow_action *action, > > - struct mlx5_flow *dev_flow) > > + struct mlx5_flow *dev_flow, > > + struct rte_eth_dev *dev, > > + struct rte_flow_error *error) > > { > > const struct rte_flow_action_queue *queue; > > const struct rte_flow_action_rss *rss; @@ -1092,10 +1276,35 @@ > > /* Added to array only in apply since we need the QP */ > > flow->actions |=3D MLX5_FLOW_ACTION_RSS; > > break; > > + case RTE_FLOW_ACTION_TYPE_TUNNEL_ENCAP: > > + dev_flow->dv.actions[actions_n].type =3D > > + MLX5DV_FLOW_ACTION_IBV_FLOW_ACTION; > > + dev_flow->dv.actions[actions_n].action =3D > > + flow_dv_create_encap(action, dev, error); > > + if (!(dev_flow->dv.actions[actions_n].action)) > > + return -rte_errno; > > + dev_flow->dv.encap_verb =3D > > + dev_flow->dv.actions[actions_n].action; > > + flow->actions |=3D MLX5_FLOW_ACTION_TUNNEL_ENCAP; > > + actions_n++; > > + break; > > + case RTE_FLOW_ACTION_TYPE_TUNNEL_ENCAP_L3: > > + dev_flow->dv.actions[actions_n].type =3D > > + MLX5DV_FLOW_ACTION_IBV_FLOW_ACTION; > > + dev_flow->dv.actions[actions_n].action =3D > > + flow_dv_create_encap_l3(action, dev, error); > > + if (!(dev_flow->dv.actions[actions_n].action)) > > + return -rte_errno; > > + dev_flow->dv.encap_verb =3D > > + dev_flow->dv.actions[actions_n].action; > > + flow->actions |=3D MLX5_FLOW_ACTION_TUNNEL_ENCAP_L3; > > + actions_n++; > > + break; > > default: > > break; > > } > > dev_flow->dv.actions_n =3D actions_n; > > + return 0; > > } > > > > static uint32_t matcher_zero[MLX5_ST_SZ_DW(fte_match_param)] =3D { 0 }= ; > > @@ -1259,8 +1468,10 @@ > > matcher.egress =3D attr->egress; > > if (flow_dv_matcher_register(dev, &matcher, dev_flow, error)) > > return -rte_errno; > > - for (; actions->type !=3D RTE_FLOW_ACTION_TYPE_END; actions++) > > - flow_dv_create_action(actions, dev_flow); > > + for (; actions->type !=3D RTE_FLOW_ACTION_TYPE_END; actions++) { > > + if (flow_dv_create_action(actions, dev_flow, dev, error)) > > + return -rte_errno; > > + } > > return 0; > > } > > > > @@ -1444,6 +1655,13 @@ > > LIST_REMOVE(dev_flow, next); > > if (dev_flow->dv.matcher) > > flow_dv_matcher_release(dev, dev_flow- > >dv.matcher); > > + >=20 > No blank line. >=20 > > + if (dev_flow->dv.encap_verb) { > > + claim_zero(mlx5_glue->destroy_flow_action > > + (dev_flow->dv.encap_verb)); > > + dev_flow->dv.encap_verb =3D NULL; > > + } > > + >=20 > No blank line. >=20 > > rte_free(dev_flow); > > } > > } > > -- > > 1.8.3.1 > >