From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C7024C76188 for ; Tue, 23 Jul 2019 07:33:55 +0000 (UTC) Received: from dpdk.org (dpdk.org [92.243.14.124]) by mail.kernel.org (Postfix) with ESMTP id 302602251A for ; Tue, 23 Jul 2019 07:33:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=Mellanox.com header.i=@Mellanox.com header.b="kdKV9NKN" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 302602251A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mellanox.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=dev-bounces@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id ED3CA1BFAC; Tue, 23 Jul 2019 09:33:53 +0200 (CEST) Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-eopbgr10083.outbound.protection.outlook.com [40.107.1.83]) by dpdk.org (Postfix) with ESMTP id 740821BFAA; Tue, 23 Jul 2019 09:33:52 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZImeXlsIB0HscvIRKORhu6r0GpBUHLYqcrlVX8AB/6IVA/EnTY7/7Zy3HTJqS0MqfrQQ51/UHPv79JXz3kgnH275GPkkt5E7xVvM3JPcCmGjk/gPGtSfhgktdZ+PfVs15j9uOLt4LXKijbg255VHu5vL6yJ7zQNsMZNfNAcI4B8Mej+XAR0F87buO4mhfpRE+IbDEZR4UnjIhP5jPbFRWaYm80mMelH2/AFsxpy265aRad+QO5zTXAjWkIdApEZEUxm1Bd9qCejj9M54IhNPe80RiYOYW+8DsvyhKn9U/9OXwDYFJwVBr60nVCtqes8ppZZARZnAzPzCmSAuJR7o9w== 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=WWYME7pzPKezEgnndfr6duOPg5oHUnMPNusdv7llpyE=; b=eRO7k0lygyp7sW4jfoLHjYM8Z5t6NfY7hGKcgEDOpELT7Z4HCcK3XZ4DW4YJOPDVvM6NmjzGQq4fSZkUaAdpnX8+w+iafnxnH9ugLKGmXjTH6NbGLMoEzwbjPtJfAawrJcQpHpNgfLarxicu1++JKxBGENJnNgAu9Xa+Aefvytj1CoZW6TE6lj2PycUWx3ueuqYkAxZrJw9jAxNexodiHEo1fDXMDYbv/K7XVHDz1wTlTfVExPi/CqtnPcPJ0MATBQIeXyb5GENEtekNapywXrQEjJYoNoYUFlF1HZQMpszgxMXuTa3hkhhgBe6We9KS0VNVhBxY/pHoUD+m6N4p5g== 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=WWYME7pzPKezEgnndfr6duOPg5oHUnMPNusdv7llpyE=; b=kdKV9NKNw3MX86MOCVhTIYSXQ+DP0+ZNBnCj/iO6JKULs0hov3J2dDHEUcqS+f+dYhvSguWm8c1ZHXza3PZfJVJBIuBOZffMW2+grLXpcCvJLc9B2gF02KmytyJ/J6YYB8pcry3XfJaE6njYAVygdsnpK6mIb1A2bOmkT6cb9pA= Received: from DB3PR0502MB3964.eurprd05.prod.outlook.com (52.134.65.161) by DB3PR0502MB4059.eurprd05.prod.outlook.com (52.134.66.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2094.17; Tue, 23 Jul 2019 07:33:51 +0000 Received: from DB3PR0502MB3964.eurprd05.prod.outlook.com ([fe80::bcc1:5331:1dca:7360]) by DB3PR0502MB3964.eurprd05.prod.outlook.com ([fe80::bcc1:5331:1dca:7360%7]) with mapi id 15.20.2094.013; Tue, 23 Jul 2019 07:33:51 +0000 From: Raslan Darawsheh To: Dekel Peled , Yongseok Koh , Slava Ovsiienko , Shahaf Shuler CC: Jack Min , Ori Kam , "dev@dpdk.org" , "stable@dpdk.org" Thread-Topic: [dpdk-dev] [PATCH v2] net/mlx5: fix NVGRE matching Thread-Index: AQHVQKNjbBq5Z+XVC0aa/mcQdmVNV6bXzwBQ Date: Tue, 23 Jul 2019 07:33:51 +0000 Message-ID: References: <3cd91c82dfa7f0feb325c0ed866659c07230c9fb.1563478228.git.dekelp@mellanox.com> <313676cd6e86314bcf2c187529a697827b78698e.1563808985.git.dekelp@mellanox.com> In-Reply-To: <313676cd6e86314bcf2c187529a697827b78698e.1563808985.git.dekelp@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=rasland@mellanox.com; x-originating-ip: [212.29.221.74] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 0dbc15ae-e491-4bf1-2bad-08d70f401b9e x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(1401327)(4618075)(2017052603328)(7193020); SRVR:DB3PR0502MB4059; x-ms-traffictypediagnostic: DB3PR0502MB4059: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:7219; x-forefront-prvs: 0107098B6C x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(4636009)(39860400002)(396003)(366004)(136003)(346002)(376002)(13464003)(199004)(189003)(6436002)(478600001)(55016002)(6636002)(450100002)(53936002)(9686003)(76116006)(52536014)(66066001)(76176011)(229853002)(14454004)(66476007)(5660300002)(186003)(86362001)(25786009)(66556008)(66446008)(64756008)(6246003)(66946007)(53546011)(7736002)(8936002)(305945005)(33656002)(81166006)(81156014)(316002)(4326008)(8676002)(71190400001)(71200400001)(110136005)(6506007)(6116002)(14444005)(256004)(3846002)(68736007)(2906002)(54906003)(7696005)(99286004)(486006)(446003)(11346002)(26005)(102836004)(476003)(74316002); DIR:OUT; SFP:1101; SCL:1; SRVR:DB3PR0502MB4059; H:DB3PR0502MB3964.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: jWk6qsbK0XvDQ3dV8Ss79ShiqwKyFT4c1Du+05io4DlQ2IOtakRAMInb13CqvpEaLqojCbhSgJbSBduxkXjl/7DwQ/cZrr6YvpJTmAHXXKa70kaAeANrEe8HNTTcdNNvCInS+3gYwFt0oZYI+d90RDmr//APpCFGU/bM6bR2h+4ii8SW8OE1mSFrVvpiIzxM2H1u1UBhK+Dt/SZMFe1dfiljgAY4YqoYUAovECVE2yzKdg9Hj/zmFOc4wdJzjEvExFZ2BYFp38QNpCLW5FJSQWtD39BWelItrWrWqbEanFxrPz/2MFK2EI9x1QS1ziHBcpNBRe6+vLb+s8rDtJq+N7orJYhouWIVQ0ijZ9sW2kQu1Iok7b2k5M5V+HVxIIgkcidWq0QYtyMiWgPv456BdByYU/vqu30YXYmr2xPZ460= 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: 0dbc15ae-e491-4bf1-2bad-08d70f401b9e X-MS-Exchange-CrossTenant-originalarrivaltime: 23 Jul 2019 07:33:51.0729 (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: rasland@mellanox.com X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB3PR0502MB4059 Subject: Re: [dpdk-dev] [PATCH v2] net/mlx5: fix NVGRE matching 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" Hi, > -----Original Message----- > From: dev On Behalf Of Dekel Peled > Sent: Monday, July 22, 2019 6:37 PM > To: Yongseok Koh ; Slava Ovsiienko > ; Shahaf Shuler > Cc: Jack Min ; Ori Kam ; > dev@dpdk.org; stable@dpdk.org > Subject: [dpdk-dev] [PATCH v2] net/mlx5: fix NVGRE matching >=20 > NVGRE has a GRE header with c_rsvd0_ver value 0x2000 and protocol value > 0x6558. > These should be matched when item_nvgre is provided. >=20 > This patch adds validation function of NVGRE item. > It also updates the translate function of NVGRE item, to add the required > values, if they were not specified. >=20 > Original work by Xiaoyu Min >=20 > Fixes: fc2c498ccb94 ("net/mlx5: add Direct Verbs translate items") > Cc: stable@dpdk.org >=20 > Signed-off-by: Dekel Peled > --- > drivers/net/mlx5/mlx5_flow.c | 63 > +++++++++++++++++++++++++++++++++++++++++ > drivers/net/mlx5/mlx5_flow.h | 10 +++++-- > drivers/net/mlx5/mlx5_flow_dv.c | 25 ++++++++++++++-- > drivers/net/mlx5/mlx5_rxtx.h | 2 +- > 4 files changed, 95 insertions(+), 5 deletions(-) >=20 > diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c > index e082cbb..3d2d5fc 100644 > --- a/drivers/net/mlx5/mlx5_flow.c > +++ b/drivers/net/mlx5/mlx5_flow.c > @@ -298,6 +298,10 @@ struct mlx5_flow_tunnel_info { > .tunnel =3D MLX5_FLOW_LAYER_MPLS, > .ptype =3D RTE_PTYPE_TUNNEL_MPLS_IN_GRE, > }, > + { > + .tunnel =3D MLX5_FLOW_LAYER_NVGRE, > + .ptype =3D RTE_PTYPE_TUNNEL_NVGRE, > + }, > }; >=20 > /** > @@ -1323,6 +1327,11 @@ uint32_t mlx5_flow_adjust_priority(struct > rte_eth_dev *dev, int32_t priority, > return rte_flow_error_set(error, EINVAL, > RTE_FLOW_ERROR_TYPE_ITEM, > item, > "L3 cannot follow an L4 layer."); > + else if ((item_flags & MLX5_FLOW_LAYER_NVGRE) && > + !(item_flags & MLX5_FLOW_LAYER_INNER_L2)) > + return rte_flow_error_set(error, EINVAL, > + RTE_FLOW_ERROR_TYPE_ITEM, > item, > + "L3 cannot follow an NVGRE layer."); > if (!mask) > mask =3D &rte_flow_item_ipv4_mask; > else if (mask->hdr.next_proto_id !=3D 0 && @@ -1409,6 +1418,11 @@ > uint32_t mlx5_flow_adjust_priority(struct rte_eth_dev *dev, int32_t > priority, > return rte_flow_error_set(error, EINVAL, > RTE_FLOW_ERROR_TYPE_ITEM, > item, > "L3 cannot follow an L4 layer."); > + else if ((item_flags & MLX5_FLOW_LAYER_NVGRE) && > + !(item_flags & MLX5_FLOW_LAYER_INNER_L2)) > + return rte_flow_error_set(error, EINVAL, > + RTE_FLOW_ERROR_TYPE_ITEM, > item, > + "L3 cannot follow an NVGRE layer."); > if (!mask) > mask =3D &rte_flow_item_ipv6_mask; > ret =3D mlx5_flow_item_acceptable(item, (const uint8_t *)mask, @@ - > 1887,6 +1901,55 @@ uint32_t mlx5_flow_adjust_priority(struct rte_eth_dev > *dev, int32_t priority, > " update."); > } >=20 > +/** > + * Validate NVGRE item. > + * > + * @param[in] item > + * Item specification. > + * @param[in] item_flags > + * Bit flags to mark detected items. > + * @param[in] target_protocol > + * The next protocol in the previous item. > + * @param[out] error > + * Pointer to error structure. > + * > + * @return > + * 0 on success, a negative errno value otherwise and rte_errno is set= . > + */ > +int > +mlx5_flow_validate_item_nvgre(const struct rte_flow_item *item, > + uint64_t item_flags, > + uint8_t target_protocol, > + struct rte_flow_error *error) > +{ > + const struct rte_flow_item_nvgre *mask =3D item->mask; > + int ret; > + > + if (target_protocol !=3D 0xff && target_protocol !=3D IPPROTO_GRE) > + return rte_flow_error_set(error, EINVAL, > + RTE_FLOW_ERROR_TYPE_ITEM, > item, > + "protocol filtering not compatible" > + " with this GRE layer"); > + if (item_flags & MLX5_FLOW_LAYER_TUNNEL) > + return rte_flow_error_set(error, ENOTSUP, > + RTE_FLOW_ERROR_TYPE_ITEM, > item, > + "multiple tunnel layers not" > + " supported"); > + if (!(item_flags & MLX5_FLOW_LAYER_OUTER_L3)) > + return rte_flow_error_set(error, ENOTSUP, > + RTE_FLOW_ERROR_TYPE_ITEM, > item, > + "L3 Layer is missing"); > + if (!mask) > + mask =3D &rte_flow_item_nvgre_mask; > + ret =3D mlx5_flow_item_acceptable > + (item, (const uint8_t *)mask, > + (const uint8_t *)&rte_flow_item_nvgre_mask, > + sizeof(struct rte_flow_item_nvgre), error); > + if (ret < 0) > + return ret; > + return 0; > +} > + > static int > flow_null_validate(struct rte_eth_dev *dev __rte_unused, > const struct rte_flow_attr *attr __rte_unused, diff --git > a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h index > 3f96bec..24da74b 100644 > --- a/drivers/net/mlx5/mlx5_flow.h > +++ b/drivers/net/mlx5/mlx5_flow.h > @@ -48,6 +48,7 @@ > #define MLX5_FLOW_LAYER_VXLAN_GPE (1u << 13) #define > MLX5_FLOW_LAYER_GRE (1u << 14) #define MLX5_FLOW_LAYER_MPLS (1u > << 15) > +/* List of tunnel Layer bits continued below. */ >=20 > /* General pattern items bits. */ > #define MLX5_FLOW_ITEM_METADATA (1u << 16) @@ -58,8 +59,10 @@ > #define MLX5_FLOW_LAYER_ICMP6 (1u << 19) #define > MLX5_FLOW_LAYER_GRE_KEY (1u << 20) >=20 > +/* Pattern tunnel Layer bits (continued). */ > #define MLX5_FLOW_LAYER_IPIP (1u << 21) #define > MLX5_FLOW_LAYER_IPV6_ENCAP (1u << 22) > +#define MLX5_FLOW_LAYER_NVGRE (1u << 23) >=20 > /* Outer Masks. */ > #define MLX5_FLOW_LAYER_OUTER_L3 \ > @@ -79,7 +82,7 @@ > /* Tunnel Masks. */ > #define MLX5_FLOW_LAYER_TUNNEL \ > (MLX5_FLOW_LAYER_VXLAN | MLX5_FLOW_LAYER_VXLAN_GPE | \ > - MLX5_FLOW_LAYER_GRE | MLX5_FLOW_LAYER_MPLS | \ > + MLX5_FLOW_LAYER_GRE | MLX5_FLOW_LAYER_NVGRE | > MLX5_FLOW_LAYER_MPLS | > +\ > MLX5_FLOW_LAYER_IPIP | MLX5_FLOW_LAYER_IPV6_ENCAP) >=20 > /* Inner Masks. */ > @@ -518,5 +521,8 @@ int mlx5_flow_validate_item_icmp6(const struct > rte_flow_item *item, > uint64_t item_flags, > uint8_t target_protocol, > struct rte_flow_error *error); > - > +int mlx5_flow_validate_item_nvgre(const struct rte_flow_item *item, > + uint64_t item_flags, > + uint8_t target_protocol, > + struct rte_flow_error *error); > #endif /* RTE_PMD_MLX5_FLOW_H_ */ > diff --git a/drivers/net/mlx5/mlx5_flow_dv.c > b/drivers/net/mlx5/mlx5_flow_dv.c index 7240d3b..f1d32bd 100644 > --- a/drivers/net/mlx5/mlx5_flow_dv.c > +++ b/drivers/net/mlx5/mlx5_flow_dv.c > @@ -2966,7 +2966,6 @@ struct field_modify_info modify_tcp[] =3D { >=20 > MLX5_FLOW_LAYER_OUTER_L4_UDP; > break; > case RTE_FLOW_ITEM_TYPE_GRE: > - case RTE_FLOW_ITEM_TYPE_NVGRE: > ret =3D mlx5_flow_validate_item_gre(items, > item_flags, > next_protocol, > error); > if (ret < 0) > @@ -2974,6 +2973,14 @@ struct field_modify_info modify_tcp[] =3D { > gre_item =3D items; > last_item =3D MLX5_FLOW_LAYER_GRE; > break; > + case RTE_FLOW_ITEM_TYPE_NVGRE: > + ret =3D mlx5_flow_validate_item_nvgre(items, > item_flags, > + next_protocol, > + error); > + if (ret < 0) > + return ret; > + last_item =3D MLX5_FLOW_LAYER_NVGRE; > + break; > case RTE_FLOW_ITEM_TYPE_GRE_KEY: > ret =3D mlx5_flow_validate_item_gre_key > (items, item_flags, gre_item, error); @@ - > 3919,7 +3926,21 @@ struct field_modify_info modify_tcp[] =3D { > int size; > int i; >=20 > - flow_dv_translate_item_gre(matcher, key, item, inner); > + /* For NVGRE, GRE header fields must be set with defined values. */ > + const struct rte_flow_item_gre gre_spec =3D { > + .c_rsvd0_ver =3D RTE_BE16(0x2000), > + .protocol =3D RTE_BE16(RTE_ETHER_TYPE_TEB) > + }; > + const struct rte_flow_item_gre gre_mask =3D { > + .c_rsvd0_ver =3D RTE_BE16(0xB000), > + .protocol =3D RTE_BE16(UINT16_MAX), > + }; > + const struct rte_flow_item gre_item =3D { > + .spec =3D &gre_spec, > + .mask =3D &gre_mask, > + .last =3D NULL, > + }; > + flow_dv_translate_item_gre(matcher, key, &gre_item, inner); > if (!nvgre_v) > return; > if (!nvgre_m) > diff --git a/drivers/net/mlx5/mlx5_rxtx.h b/drivers/net/mlx5/mlx5_rxtx.h > index 4252832..928d6c3 100644 > --- a/drivers/net/mlx5/mlx5_rxtx.h > +++ b/drivers/net/mlx5/mlx5_rxtx.h > @@ -40,7 +40,7 @@ > #include "mlx5_glue.h" >=20 > /* Support tunnel matching. */ > -#define MLX5_FLOW_TUNNEL 5 > +#define MLX5_FLOW_TUNNEL 6 >=20 > struct mlx5_rxq_stats { > #ifdef MLX5_PMD_SOFT_COUNTERS > -- > 1.8.3.1 Patch applied to next-net-mlx, Kindest regards, Raslan Darawsheh