From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01on0049.outbound.protection.outlook.com [104.47.1.49]) by dpdk.org (Postfix) with ESMTP id 7A8355B2C for ; Mon, 8 Oct 2018 23:19:05 +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=izV7Rfu7g3HhJWrusWmQxuF3sOjwv+edSWl6xq5sZJw=; b=tdCafYKHtPedJFtegTSInrIoyNLBJALUi3H5Om11+E0a1zAPGyGxldtIpAmf00kWm7uV8mypi/WN/x7M6b6jkfMsn5Sb+GtISrfKtACu+s9siSNVyO5FEGgWi7ITbiUnzeuwp8PlVcvjpiBq+MzeMbcPdEE3s2F6WjL4aByldBs= Received: from DB3PR0502MB3980.eurprd05.prod.outlook.com (52.134.72.27) by DB3PR0502MB4074.eurprd05.prod.outlook.com (52.134.72.155) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1207.22; Mon, 8 Oct 2018 21:19:01 +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.024; Mon, 8 Oct 2018 21:19:01 +0000 From: Yongseok Koh To: Dekel Peled 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: AQHUXknrVc8lwLbM4E6TCeXxoDI8TqUV3HIA Date: Mon, 8 Oct 2018 21:19:01 +0000 Message-ID: <20181008211852.GA9031@mtidpdk.mti.labs.mlnx> References: <1538059845-35896-1-git-send-email-dekelp@mellanox.com> <1538922308-9516-5-git-send-email-dekelp@mellanox.com> In-Reply-To: <1538922308-9516-5-git-send-email-dekelp@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: BN6PR10CA0027.namprd10.prod.outlook.com (2603:10b6:404:109::13) 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; DB3PR0502MB4074; 6:SR5QvtA5As/AfjDI7OvSM1HO5RT5qbKhKpe3mcP9wpJFVNOp0i8FCNtN93GPWPfs8QXhdaVg0mXy0MTfcP7ZXTdEfxdHmIphiFbjiHCSVTBS/BE6W17humpwx1ylllvx/ihF5NNMdNCtWFQeGn04UsKV2jQeTZgtXtOS0aWmXnEt5gJ6HdrHziH1qa7C8yTjXLZ4hGGs/3cYN79T3e/8Q7dv2p4Z3FaBT6+XTQH1JWVpJ1UYYtgsng2dYi6Ri0X3GWdT/83wrWBGASgHKraaMRu9LB0C/QGwbQTx8vhbbUbc80ysIPTGE0S2m/IsPo+4szi76C33q7U3gCx6qbQ2pBa2Gdj870ckVYDdHtIUq7NwpopxTODW7/5g2wuukxNwIn9nbkjXfahBULVtWQ43VzQeX85TiWZKpTCQhW5ERvRhlx9D0Or6Tf+EyRUbjXPVhR39IsQEIyeX9im7urjZOw==; 5:aXICDRwCn6342ZBVdnUopcCo9ZOkf2JQaBsch9B6587mQj94yLlQ82KysSwTRUHtXt0K01n43HSI1TZ773YzTgV7vJXD4ROr9pAVpYkitSAhC55kJ42Lp55mo37xtF5u6AWX1RIZqSz0oaEaWlHyGx13YlFaEDppnGpMWAWspSA=; 7:/VV9vHyuQY5/pRR9TnkWBgs7UYq/yTlLreaVf+vmiWq5F+qgKBdkjsHQYOvlBCqYiusQzrNoNqcKOAteX7JEIZC2EMAZ1zqVSpzVBT8legkSQXv9Lph+qvx0luKYTuURNt9ICgSSmH69GKPYtd7hhX0iRITE0rt7qs4rjHFWAW3padrmM7b6YCL1OrVn6kq/uOpak6w4fwP7zlCA/6wcuFL6lNNay/z8GWfJ1yLR3e6DhvQUQa88YTkiNyzPoq54 x-ms-office365-filtering-correlation-id: 56f0f966-e181-40d9-378e-08d62d63aaaa 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:DB3PR0502MB4074; x-ms-traffictypediagnostic: DB3PR0502MB4074: 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)(3231355)(944501410)(52105095)(3002001)(10201501046)(93006095)(93001095)(6055026)(149066)(150057)(6041310)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123564045)(20161123562045)(201708071742011)(7699051); SRVR:DB3PR0502MB4074; BCL:0; PCL:0; RULEID:; SRVR:DB3PR0502MB4074; x-forefront-prvs: 081904387B x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(979002)(136003)(366004)(396003)(346002)(39860400002)(376002)(189003)(199004)(2906002)(14444005)(256004)(486006)(6486002)(105586002)(2900100001)(11346002)(229853002)(476003)(8936002)(305945005)(8676002)(81156014)(81166006)(6246003)(6862004)(106356001)(7736002)(33896004)(76176011)(3846002)(52116002)(68736007)(6636002)(99286004)(107886003)(386003)(5250100002)(6116002)(1076002)(6506007)(71200400001)(5660300001)(66066001)(54906003)(14454004)(71190400001)(53936002)(86362001)(97736004)(4326008)(26005)(478600001)(33656002)(102836004)(25786009)(186003)(6512007)(6436002)(446003)(316002)(9686003)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1101; SCL:1; SRVR:DB3PR0502MB4074; 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: K05gqS2gTzl2aya6UaOiz54urcOA12Ca7t05khnkaT1lozgxOO/jW6uyt11VFTBURthbylyRiaLpQdP77/4UpSHmdua0jjst4sOyV2+wnWoIywnNwpOlmmUBhlAMSE2uYMQzjf9at9zB/2PZoXCEBm9t0j085BLznEQX7XWlEy7+dktfPiHZ2V4DrcGP3+T+anLonyhGnj0ajp7nfppGDIKDErWV+v4K0GPL7iEEUuqocxrw0ayVIRUXmqQa78icm2UY+m0e7sW/YuP2IWXYM3ShCQ5c9O+9LNzFq9h1b57TiF6q8pE9zm1iYs9KNyftMLlkkmQDldOVbovBFpq65A91kcVXtyawDlTdNO2B3Mc= 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: 56f0f966-e181-40d9-378e-08d62d63aaaa X-MS-Exchange-CrossTenant-originalarrivaltime: 08 Oct 2018 21:19:01.0540 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB3PR0502MB4074 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: Mon, 08 Oct 2018 21:19:05 -0000 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. >=20 > Signed-off-by: Dekel Peled Same comment for the order of 'dev' arg. > Conflicts: > drivers/net/mlx5/mlx5_flow_dv.c What is this? Conflicts? > --- > drivers/net/mlx5/mlx5_flow_dv.c | 224 ++++++++++++++++++++++++++++++++++= +++++- > 1 file changed, 219 insertions(+), 5 deletions(-) >=20 > 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"); It seems to be mistakenly included in this patch when you rebase the previo= us patch. Please fix it in [4/4] and [3/4]. > return 0; > } > =20 > @@ -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 @@ > } > =20 > /** > + * 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 set= . > + */ > +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 set= . > + */ > +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 @@ > } > =20 > /** > + * 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 and = 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); > - It seems to be mistakenly included in this patch when you rebase the previo= us patch. Please fix it in [4/4] and [3/4]. > 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; > } > - Same here. > + 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); > } > } > --=20 > 1.8.3.1 >=20