From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-eopbgr30058.outbound.protection.outlook.com [40.107.3.58]) by dpdk.org (Postfix) with ESMTP id 706DF3977 for ; Wed, 10 Oct 2018 02:43:19 +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=f6D1/4tX6p3KaAphNH773mdYcBZg8zKcr4ZKmkazzkk=; b=n6D9afyJU/JjLFDJ+ZvMaf0xX02M4InTNy2On7/QBmX3ZIxQbSX8tK1wBFPvIE7ZxhbDR28fxb5LD+Tr0Z0nBRHodqDlu4NaRgyxqNWTAFPZF9eFa95QMKk+MiT2SfPVnndKO0y1JiMhcDqI71Nbpo2/An9pIuujDFxz586J41k= Received: from DB3PR0502MB3980.eurprd05.prod.outlook.com (52.134.72.27) by DB3PR0502MB4076.eurprd05.prod.outlook.com (52.134.66.11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1207.27; Wed, 10 Oct 2018 00:43:18 +0000 Received: from DB3PR0502MB3980.eurprd05.prod.outlook.com ([fe80::1cb0:661b:ecab:6045]) by DB3PR0502MB3980.eurprd05.prod.outlook.com ([fe80::1cb0:661b:ecab:6045%2]) with mapi id 15.20.1207.029; Wed, 10 Oct 2018 00:43:18 +0000 From: Yongseok Koh To: Dekel Peled CC: Shahaf Shuler , "dev@dpdk.org" , Ori Kam Thread-Topic: [PATCH v3 3/4] net/mlx5: add L2 and L3 encap to Direct Verbs flow Thread-Index: AQHUYAvkrwCcBVwLlEe4dEuRKhoozaUXpFaA Date: Wed, 10 Oct 2018 00:43:18 +0000 Message-ID: <20181010004308.GG9031@mtidpdk.mti.labs.mlnx> References: <1538922308-9516-1-git-send-email-dekelp@mellanox.com> <1539113137-4914-4-git-send-email-dekelp@mellanox.com> In-Reply-To: <1539113137-4914-4-git-send-email-dekelp@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: CY4PR1101CA0006.namprd11.prod.outlook.com (2603:10b6:910:15::16) To DB3PR0502MB3980.eurprd05.prod.outlook.com (2603:10a6:8:10::27) authentication-results: spf=none (sender IP is ) smtp.mailfrom=yskoh@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [209.116.155.178] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DB3PR0502MB4076; 6:qwMMfmYnU9xXNc8Iy9Wdrv/rkpnwop8bJrrOvJ93Oj5pC7K5bINmKAw6Nokl3BUo52VSSGGORXqjnNwtRjIpwMMR759vO5Yzya3OdQzbERduhUdmwPEWJPklMC0QaLmP3WIuWKrLyX9sjZ2KtTPmFN5vs6rUNmu1kTq0yKhlKcmI0IBWi//TJvy9UV1u6wMXWJuj96xYhfXwF8N1R41E5Uizm5jYhpkgrpu26PbOAqc4FNMoVu75RJpHknhyZ6HqC4V3zckxeRTBRo567ZzcqizujpcKrR7w5PbNDidYZZmCNCuftbzXtYwxgzlMNITX1j4sLZqaCsVD3ty7XVhlS1gdmLd9KTexOHbfIZ4fAF70FblnJ0Y7aV0viim2twZ/NhZb+Y/eIcbO8m6x4MGet3t5u99GNj4Cfe02Ojxn3Cm9siVtCruho/uCr1MtuT3NfJiCdaP552592kp2BIhenA==; 5:h00GQhjNCYQzmkhyFJB/fMVPd3iBqoes2JPVaK6HBGvYXZKEkye6JsvZopz1K048qvgWchSUCih4zhZqFym+wgA1aYUF2bfqk4rXV8VHjsLB5MUafrnvFzjtgNSMvV2J9F4t9iZUQiVZEljlkLXSVVt+GSThOkBlIXoo/e5OTek=; 7:Rxb0IyGvbZ/YQaRu1yCoNj9ZdoxbF9zSSdVgbHS84S7um1+0eT4btvyXmA8e94WKEJo/jGW/dL4w976r1ZFgH47EO6rlvRw8g7AAQ4GaSJhuXXS31b/6I/6WTYnDd2ebLEvBS5ZD3foB4F49NTlKyC9MyqPZboGY5oD2wYXLGh/C9bYPLVs9OlPf0Gr9gNTj0veO1X/NQ7N+Ph68UzBmgkH8sskxz9pTDwZ/8JDE9Rg32nkKyA2pKkkQdZgxSeap x-ms-office365-filtering-correlation-id: 025289b1-4447-4626-0223-08d62e495ed9 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:DB3PR0502MB4076; x-ms-traffictypediagnostic: DB3PR0502MB4076: 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)(10201501046)(93006095)(93001095)(3002001)(3231355)(944501410)(52105095)(6055026)(149066)(150057)(6041310)(20161123558120)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123560045)(201708071742011)(7699051)(76991055); SRVR:DB3PR0502MB4076; BCL:0; PCL:0; RULEID:; SRVR:DB3PR0502MB4076; x-forefront-prvs: 08213D42D3 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(376002)(346002)(136003)(396003)(39860400002)(366004)(189003)(199004)(105586002)(5250100002)(76176011)(52116002)(26005)(33896004)(71190400001)(6116002)(6436002)(97736004)(305945005)(6506007)(14454004)(2906002)(3846002)(446003)(25786009)(4326008)(476003)(6486002)(478600001)(2900100001)(107886003)(11346002)(6862004)(386003)(102836004)(7736002)(486006)(71200400001)(229853002)(1076002)(9686003)(68736007)(53936002)(86362001)(106356001)(5660300001)(6512007)(54906003)(186003)(6636002)(33656002)(14444005)(256004)(6246003)(81166006)(8676002)(316002)(8936002)(66066001)(99286004)(81156014); DIR:OUT; SFP:1101; SCL:1; SRVR:DB3PR0502MB4076; H:DB3PR0502MB3980.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-microsoft-antispam-message-info: 7ic1sUj3vS620cZs3lwlhNxfsGu066/wZJSPg1Npy2UkFAid+mNLIHnkHK1ZD7DriRbc9gvu9V9tKxS+pakHzkDoHedced+Vvi/P4a5aW3zbZQLDxI8jQGtp89uCz0IbTzylP1EyU0RS/tT9Vsfh9c5zFZEek/xQzrSACuUZQs33YSag84X/s4uGp62dQ8W7lA2bmQoNYXhcXRfHim5i7qzgoJFvCcr8a1HIL+w7oXoGP8blLjQnyu/CjBhhM6fgdu+1ij0J3qtP96jO/Xug6o/WQhcyIkwkhve++113IClDVKcgngoSIBT9uIlMnRFBP6eDtS2rH91KvqOlugmjQIbGiYtw2kdH/E23LyBevnc= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="us-ascii" Content-ID: Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 025289b1-4447-4626-0223-08d62e495ed9 X-MS-Exchange-CrossTenant-originalarrivaltime: 10 Oct 2018 00:43:18.1906 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB3PR0502MB4076 Subject: Re: [dpdk-dev] [PATCH v3 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: Wed, 10 Oct 2018 00:43:19 -0000 On Tue, Oct 09, 2018 at 10:25:36PM +0300, Dekel Peled wrote: > This patch adds support for Direct Verbs encap operations, L2 and L3. >=20 > Signed-off-by: Dekel Peled > --- Acked-by: Yongseok Koh Thanks > drivers/net/mlx5/mlx5_flow_dv.c | 227 ++++++++++++++++++++++++++++++++++= +++++- > 1 file changed, 222 insertions(+), 5 deletions(-) >=20 > diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow= _dv.c > index 80e7b24..73a22ba 100644 > --- a/drivers/net/mlx5/mlx5_flow_dv.c > +++ b/drivers/net/mlx5/mlx5_flow_dv.c > @@ -84,6 +84,168 @@ > } > =20 > /** > + * 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 set= . > + */ > +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->con= f; > + > + 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 set= . > + */ > +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] dev > + * Pointer to rte_eth_dev structure. > + * @param[in] action > + * Pointer to action 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(struct rte_eth_dev *dev, > + const struct rte_flow_action *action, > + 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->con= f; > + 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] dev > + * Pointer to rte_eth_dev structure. > + * @param[in] action > + * Pointer to action 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(struct rte_eth_dev *dev, > + const struct rte_flow_action *action, > + 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 and = store > * them in the @p flow if everything is correct. > * > @@ -330,6 +492,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, > @@ -1038,14 +1214,23 @@ > /** > * Store the requested actions in an array. > * > + * @param[in] dev > + * Pointer to rte_eth_dev structure. > * @param[in] action > * Flow action to translate. > * @param[in, out] dev_flow > * Pointer to the mlx5_flow. > + * @param[out] error > + * Pointer to the error structure. > + * > + * @return > + * 0 on success, a negative errno value otherwise and rte_ernno is set= . > */ > -static void > -flow_dv_create_action(const struct rte_flow_action *action, > - struct mlx5_flow *dev_flow) > +static int > +flow_dv_create_action(struct rte_eth_dev *dev, > + const struct rte_flow_action *action, > + struct mlx5_flow *dev_flow, > + struct rte_flow_error *error) > { > const struct rte_flow_action_queue *queue; > const struct rte_flow_action_rss *rss; > @@ -1092,10 +1277,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(dev, action, 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(dev, action, 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; > } > =20 > static uint32_t matcher_zero[MLX5_ST_SZ_DW(fte_match_param)] =3D { 0 }; > @@ -1259,8 +1469,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(dev, actions, dev_flow, error)) > + return -rte_errno; > + } > return 0; > } > =20 > @@ -1444,6 +1656,11 @@ > LIST_REMOVE(dev_flow, next); > if (dev_flow->dv.matcher) > flow_dv_matcher_release(dev, dev_flow->dv.matcher); > + 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; > + } > rte_free(dev_flow); > } > } > --=20 > 1.8.3.1 >=20