From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80072.outbound.protection.outlook.com [40.107.8.72]) by dpdk.org (Postfix) with ESMTP id E8E6F1B5F4 for ; Tue, 9 Oct 2018 18:56:27 +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=inefP7QuDpjOdkM8iaJGERRoeCw3B9+EAAHuoJV3Ndw=; b=XUD6MRyG9E6AV3X4mMHOWxU6bONzBX6BAz2yF/dsbMGpZnQ8bzzwB2nrLNku6FUPFwOdjWkB91mqAtPXWIckRXzIm/gAIPnTlSeYjBL6N7bPKSwk+oBbYZPI5bMjxtxb04gHWZZCjWgzqKwio7hhyqNCTfxsUdZfBxNqzuqXiNM= Received: from VI1PR05MB4224.eurprd05.prod.outlook.com (52.133.12.13) by VI1PR05MB4784.eurprd05.prod.outlook.com (20.176.4.33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1207.27; Tue, 9 Oct 2018 16:56:26 +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 16:56:26 +0000 From: Dekel Peled To: Yongseok Koh CC: Shahaf Shuler , "dev@dpdk.org" , Ori Kam Thread-Topic: [PATCH v2 4/4] net/mlx5: add L2 and L3 decap to Direct Verbs flow Thread-Index: AQHUXknptmHj6B4tak2Lo6JqJMzAzaUV3HyAgAFH0WA= Date: Tue, 9 Oct 2018 16:56:26 +0000 Message-ID: References: <1538059845-35896-1-git-send-email-dekelp@mellanox.com> <1538922308-9516-5-git-send-email-dekelp@mellanox.com> <20181008211852.GA9031@mtidpdk.mti.labs.mlnx> In-Reply-To: <20181008211852.GA9031@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; VI1PR05MB4784; 6:wJ+87Da3qmAR2Cz+0/LLBY5ROEjkkr9SUo87LpVklhWpAWT1mvt1GAjZ+iXOTi/ykaUt3t0bVCyXotIh0Esgq0c3uztjlY0jmn3+LBa2xSHOpHzchjV+D6LqMPjtg5i1T/1jvlT5twX83ColdVXKyyImcDSFdhxBZzmY3C/c3lO8htFOl1G1f+mqzAFx5qA4DzXjwc3U7/kUNOHyC93TH9u3eFmVtg+PFhYMvFJBOddXPCsdvrKIEMEQqPZ/E4vOsSt/JghfYJS1NQH6/ou+d/MdlftybKH/W+v7RlI7X3mgEyr/nuJQgAxl077JTwXQgPOggoj7OG15h33cYv9Jrthj5J6NOAVr/13ljguWkggNaviKQuVUpVPYA/t8pv8Wax/jxZyOmQByNoR6gZbjDH/JCPmZtfGDm5KIF9tASRzqRyhxs6nLjQQqD/w5rJ+0Jj0OngBWVsM2oiG2lxBKnA==; 5:SUXmY0ZDaWuB/cCxy9+0Q+xnsL7mTVkzGcjXYVxrlViHsyK3QLp0jB5hPeOu/PG0RyIiG1Ic8KGGd0uGxkZc2Rd/z18SnAqvxSYDsZnG5DTRsommb1ku1XJqzrzWvZQzu0d9jfbLr+63SOB79fUYF5PemHggy4PYShgzIbMTG0o=; 7:hkaxTMb+MhC/M8s80UgfsTDSu64oxwA0WgfJnqowgu9RpfzAeMa4h70Ofo8CbGNPxPrQ5+M1o8RlmVTgAmDxp/DWl3Xd3X8Pi14dHTdDb7KUdMhYMkK6d7Z9UKAY111Scep4+CGlHOX9sfOmLx116XvUOHryoVjFwwqUl77vRe8NokmKVDS/OCGV7YMHCF1it784L1sGDbg2ZdNzTS936CBkT6PzMRjT3bZGEJfwf3cg6MyNAO/M79smGc3JTmfD x-ms-exchange-antispam-srfa-diagnostics: SOS; x-ms-office365-filtering-correlation-id: 8bf26c88-0614-4f19-a23d-08d62e0826b3 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:VI1PR05MB4784; x-ms-traffictypediagnostic: VI1PR05MB4784: 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)(8121501046)(5005006)(3002001)(3231355)(944501410)(52105095)(93006095)(93001095)(10201501046)(6055026)(149066)(150057)(6041310)(20161123560045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123558120)(201708071742011)(7699051)(76991055); SRVR:VI1PR05MB4784; BCL:0; PCL:0; RULEID:; SRVR:VI1PR05MB4784; x-forefront-prvs: 08200063E9 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(346002)(366004)(396003)(136003)(39860400002)(376002)(13464003)(199004)(189003)(99286004)(107886003)(5660300001)(316002)(6636002)(4326008)(7736002)(53546011)(6506007)(14454004)(105586002)(305945005)(25786009)(6436002)(106356001)(7696005)(53936002)(33656002)(74316002)(55016002)(102836004)(76176011)(97736004)(478600001)(9686003)(54906003)(229853002)(6862004)(71190400001)(26005)(476003)(446003)(11346002)(486006)(186003)(256004)(8936002)(5250100002)(6116002)(2900100001)(66066001)(68736007)(3846002)(14444005)(6246003)(2906002)(86362001)(81156014)(81166006)(8676002)(4744004)(71200400001); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR05MB4784; 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: Qz+32niuGJcLCuJ7mU/9bA63PWT9+AWGifMj4AGMl94AvqqHaOpi9j/yoAwHX3+eDNlKb5zYjVdCfU/CoXjdrm4pYZZTElle1FLvgoL374VUybHc8/sfP2rGI9qqmQQaZ5lamjZObg464j+jq7YWA8k1FJ1eo9Nk4KV800cpJk/TqDmujTeyu4L2MSVqVPwmk/dPbUg2RQnXXeILZujULKVNxNJo66oHDNTtjmX9vvr8hLSbY3Sf62A9jfgYL5jDc0/kFOOb/N+CwuZWFllaelMQEzsNdpnJLekG1BfRXDOoP7QidnX0KZQdiR89kDqa0ZRtUAlgzZYwiJjBicBXRuNR1yTuCTuZCpTW8dFfFL0= 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: 8bf26c88-0614-4f19-a23d-08d62e0826b3 X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Oct 2018 16:56:26.2035 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR05MB4784 Subject: Re: [dpdk-dev] [PATCH v2 4/4] net/mlx5: add L2 and L3 decap 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 16:56:28 -0000 Thanks, PSB. > -----Original Message----- > From: Yongseok Koh > Sent: Tuesday, October 9, 2018 12:19 AM > To: Dekel Peled > Cc: Shahaf Shuler ; dev@dpdk.org; Ori Kam > > Subject: Re: [PATCH v2 4/4] net/mlx5: add L2 and L3 decap to Direct Verbs > flow >=20 > On Sun, Oct 07, 2018 at 05:25:08PM +0300, Dekel Peled wrote: > > This patch adds support for Direct Verbs decap operations, L2 and L3. > > > > Signed-off-by: Dekel Peled >=20 > Same comment for the order of 'dev' arg. Done. >=20 > > Conflicts: > > drivers/net/mlx5/mlx5_flow_dv.c >=20 > What is this? Conflicts? My bad, fixed. >=20 > > --- > > drivers/net/mlx5/mlx5_flow_dv.c | 224 > > +++++++++++++++++++++++++++++++++++++++- > > 1 file changed, 219 insertions(+), 5 deletions(-) > > > > diff --git a/drivers/net/mlx5/mlx5_flow_dv.c > > b/drivers/net/mlx5/mlx5_flow_dv.c index 221c76a..5b44f5b 100644 > > --- a/drivers/net/mlx5/mlx5_flow_dv.c > > +++ b/drivers/net/mlx5/mlx5_flow_dv.c > > @@ -120,11 +120,18 @@ > > RTE_FLOW_ERROR_TYPE_ACTION, > NULL, > > "can't have 2 encap actions in same" > > " flow"); > > + if (action_flags & (MLX5_FLOW_ACTION_TUNNEL_DECAP | > > + MLX5_FLOW_ACTION_TUNNEL_DECAP_L3)) > > + return rte_flow_error_set(error, EINVAL, > > + RTE_FLOW_ERROR_TYPE_ACTION, > NULL, > > + "can't encap and decap 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"); > > + > RTE_FLOW_ERROR_TYPE_ATTR_INGRESS, > > + NULL, > > + "encap action not supported for " > > + "ingress"); >=20 > It seems to be mistakenly included in this patch when you rebase the > previous patch. Please fix it in [4/4] and [3/4]. Done. >=20 > > return 0; > > } > > > > @@ -166,6 +173,12 @@ > > RTE_FLOW_ERROR_TYPE_ACTION, > NULL, > > "can't have 2 encap actions in same" > > " flow"); > > + if (action_flags & (MLX5_FLOW_ACTION_TUNNEL_DECAP | > > + MLX5_FLOW_ACTION_TUNNEL_DECAP_L3)) > > + return rte_flow_error_set(error, EINVAL, > > + RTE_FLOW_ERROR_TYPE_ACTION, > NULL, > > + "can't encap and decap in same" > > + " flow"); > > if (attr->ingress) > > return rte_flow_error_set(error, ENOTSUP, > > > RTE_FLOW_ERROR_TYPE_ATTR_INGRESS, @@ -176,6 +189,100 @@ } > > > > /** > > + * Validate the tunnel decap action > > + * > > + * @param[in] action_flags > > + * holds the actions detected until now. > > + * @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_decap(uint64_t action_flags, > > + const struct rte_flow_attr *attr, > > + struct rte_flow_error *error) { > > + if (action_flags & MLX5_FLOW_ACTION_DROP) > > + return rte_flow_error_set(error, EINVAL, > > + RTE_FLOW_ERROR_TYPE_ACTION, > NULL, > > + "can't drop and decap in same > flow"); > > + if (action_flags & (MLX5_FLOW_ACTION_TUNNEL_DECAP | > > + MLX5_FLOW_ACTION_TUNNEL_DECAP_L3)) > > + return rte_flow_error_set(error, EINVAL, > > + RTE_FLOW_ERROR_TYPE_ACTION, > NULL, > > + "can't have 2 decap actions 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 encap and decap in same" > > + " flow"); > > + if (attr->egress) > > + return rte_flow_error_set(error, ENOTSUP, > > + > RTE_FLOW_ERROR_TYPE_ATTR_EGRESS, NULL, > > + "decap action not supported for " > > + "egress"); > > + return 0; > > +} > > + > > +/** > > + * Validate the tunnel decap L3 action > > + * > > + * @param[in] action_flags > > + * holds the actions detected until now. > > + * @param[in] action > > + * Pointer to the decap 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_decap_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_decap_l3 *tunnel_decap_l3 =3D > > + action->conf; > > + > > + if (!tunnel_decap_l3 || !(tunnel_decap_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 decap in same > flow"); > > + if (action_flags & (MLX5_FLOW_ACTION_TUNNEL_DECAP | > > + MLX5_FLOW_ACTION_TUNNEL_DECAP_L3)) > > + return rte_flow_error_set(error, EINVAL, > > + RTE_FLOW_ERROR_TYPE_ACTION, > NULL, > > + "can't have 2 decap actions 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 encap and decap in same" > > + " flow"); > > + if (attr->egress) > > + return rte_flow_error_set(error, ENOTSUP, > > + > RTE_FLOW_ERROR_TYPE_ATTR_EGRESS, NULL, > > + "decap action not supported for " > > + "egress"); > > + return 0; > > +} > > + > > +/** > > * Convert encap action to DV specification. > > * > > * @param[in] action > > @@ -245,6 +352,72 @@ > > } > > > > /** > > + * Convert decap 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_decap(const struct rte_flow_action *action > __rte_unused, > > + struct rte_eth_dev *dev, > > + struct rte_flow_error *error) > > +{ > > + struct ibv_flow_action *decap_verb =3D NULL; > > + struct priv *priv =3D dev->data->dev_private; > > + > > + decap_verb =3D mlx5_glue->dv_create_flow_action_packet_reformat > > + (priv->ctx, 0, NULL, > > + > MLX5DV_FLOW_ACTION_PACKET_REFORMAT_TYPE_L2_TUNNEL_TO_L2, > > + MLX5DV_FLOW_TABLE_TYPE_NIC_RX); > > + if (!decap_verb) > > + rte_flow_error_set(error, EINVAL, > RTE_FLOW_ERROR_TYPE_ACTION, > > + NULL, "cannot create decap action"); > > + return decap_verb; > > +} > > + > > +/** > > + * Convert decap 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_decap_l3(const struct rte_flow_action *action, > > + struct rte_eth_dev *dev, > > + struct rte_flow_error *error) > > +{ > > + struct ibv_flow_action *decap_l3_verb =3D NULL; > > + const struct rte_flow_action_tunnel_decap_l3 *decap_l3_data; > > + struct priv *priv =3D dev->data->dev_private; > > + > > + decap_l3_data =3D > > + (const struct rte_flow_action_tunnel_decap_l3 *)action- > >conf; > > + decap_l3_verb =3D mlx5_glue- > >dv_create_flow_action_packet_reformat > > + (priv->ctx, decap_l3_data->size, > > + decap_l3_data->size ? decap_l3_data->buf : NULL, > > + > MLX5DV_FLOW_ACTION_PACKET_REFORMAT_TYPE_L3_TUNNEL_TO_L2, > > + MLX5DV_FLOW_TABLE_TYPE_NIC_RX); > > + if (!decap_l3_verb) > > + rte_flow_error_set(error, EINVAL, > RTE_FLOW_ERROR_TYPE_ACTION, > > + NULL, "cannot create decap L3 action"); > > + return decap_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. > > * > > @@ -505,6 +678,20 @@ > > return ret; > > action_flags |=3D > MLX5_FLOW_ACTION_TUNNEL_ENCAP_L3; > > break; > > + case RTE_FLOW_ACTION_TYPE_TUNNEL_DECAP: > > + ret =3D flow_dv_validate_action_tunnel_decap > > + (action_flags, attr, error); > > + if (ret < 0) > > + return ret; > > + action_flags |=3D > MLX5_FLOW_ACTION_TUNNEL_DECAP; > > + break; > > + case RTE_FLOW_ACTION_TYPE_TUNNEL_DECAP_L3: > > + ret =3D flow_dv_validate_action_tunnel_decap_l3 > > + (action_flags, actions, attr, error); > > + if (ret < 0) > > + return ret; > > + action_flags |=3D > MLX5_FLOW_ACTION_TUNNEL_DECAP_L3; > > + break; > > default: > > return rte_flow_error_set(error, ENOTSUP, > > > RTE_FLOW_ERROR_TYPE_ACTION, > > @@ -1300,6 +1487,30 @@ > > flow->actions |=3D MLX5_FLOW_ACTION_TUNNEL_ENCAP_L3; > > actions_n++; > > break; > > + case RTE_FLOW_ACTION_TYPE_TUNNEL_DECAP: > > + 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_decap(action, dev, error); > > + if (!(dev_flow->dv.actions[actions_n].action)) > > + return -rte_errno; > > + dev_flow->dv.decap_verb =3D > > + dev_flow->dv.actions[actions_n].action; > > + flow->actions |=3D MLX5_FLOW_ACTION_TUNNEL_DECAP; > > + actions_n++; > > + break; > > + case RTE_FLOW_ACTION_TYPE_TUNNEL_DECAP_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_decap_l3(action, dev, error); > > + if (!(dev_flow->dv.actions[actions_n].action)) > > + return -rte_errno; > > + dev_flow->dv.decap_verb =3D > > + dev_flow->dv.actions[actions_n].action; > > + flow->actions |=3D MLX5_FLOW_ACTION_TUNNEL_DECAP_L3; > > + actions_n++; > > + break; > > default: > > break; > > } > > @@ -1655,13 +1866,16 @@ > > LIST_REMOVE(dev_flow, next); > > if (dev_flow->dv.matcher) > > flow_dv_matcher_release(dev, dev_flow- > >dv.matcher); > > - >=20 > It seems to be mistakenly included in this patch when you rebase the > previous patch. Please fix it in [4/4] and [3/4]. Done. >=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 > Same here. Done. >=20 > > + if (dev_flow->dv.decap_verb) { > > + claim_zero(mlx5_glue->destroy_flow_action > > + (dev_flow->dv.decap_verb)); > > + dev_flow->dv.decap_verb =3D NULL; > > + } > > rte_free(dev_flow); > > } > > } > > -- > > 1.8.3.1 > >