From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6BEB8A04C1 for ; Mon, 10 Aug 2020 09:27:39 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 36E512142; Mon, 10 Aug 2020 09:27:39 +0200 (CEST) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-eopbgr60051.outbound.protection.outlook.com [40.107.6.51]) by dpdk.org (Postfix) with ESMTP id C44D62142 for ; Mon, 10 Aug 2020 09:27:37 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Q+HfdcvcfnX97iocUiS0Og/rkf5gqSyHbeENvbVnfYrzxgkxBERzWVPsk7/Q0i1Sl4GmpXFYQrsYn2wkIj5V42dL72oMUn6Hzqk0U4FGV2pAVzXHSgeE4i0t2MnB84xF6bUyr/Nt7/AJY6OtYMKKKKnX0A2gPnG24Rtj6EKOhxjVtQDsmQnZLZwG0bekr3HXPJQwV8FW/LhjBzoYKMhGeGIJmDidsRreaYQ49ddNZcSZp7Wfnd9DO8H+WBVaWG7JsjtxqKGNsub2/eXBErVk6DAeafn3PbbRwggX8u8THsBpIs3XMM7Om6JuvCCjOjcdVHjPSFHq1i0x/1VfcPz2wQ== 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=bLJZvAng03SbPWOLmnnvMKoVhzHECvEIxEUF32A9ZBg=; b=fy0AQIoYvNitg1/GLMN9lr5Meg7GG+cIac6rl08s6cVcGYKTdKqWA2l8D95Bh6CdFHKVtEpnQQX1eGTThvsgTNub75ur6YkBAU5ddq+rSTuU1q2SqzpbJBqHIZrqofZnwmHiokqLxYLC6+J5lMRESL6Hf3pLerN5PTAs0tHeoRYdrZJI1OAiBzPvgF2/sasGbBVvz4XSq8/qv0Q2M3mUtfCL7jvdJ7y34i1u2HkK3q58Ag/dpM41PRj38RTufsFds+LuGX1owfNqr92VnJ0DONACtNto39yC1j6wQmKb773NRxJhOfz90dsN+Fg7N6rO0fx/hAGv14cPbZPZWz7SUA== 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=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=bLJZvAng03SbPWOLmnnvMKoVhzHECvEIxEUF32A9ZBg=; b=b6lNQLcUW5sxHGkVkr95V+l7aUur+fvAJgBmWJ3rwQeGNRMN3BXhn0ggPdS+4BvGGS7WgVxAXXvFzowRLaLAdX/RPW7ZJQ05LQu5tYg84G0FIhO5BwDlOGogBxYndKHsaTHBHW/R3ph0IyXByVLhAR8xJbifF0oN54g0/b3MNRk= Received: from AM0PR05MB6707.eurprd05.prod.outlook.com (2603:10a6:20b:15b::17) by AM4PR0501MB2660.eurprd05.prod.outlook.com (2603:10a6:200:66::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3261.19; Mon, 10 Aug 2020 07:27:35 +0000 Received: from AM0PR05MB6707.eurprd05.prod.outlook.com ([fe80::ecd3:6008:3784:4012]) by AM0PR05MB6707.eurprd05.prod.outlook.com ([fe80::ecd3:6008:3784:4012%5]) with mapi id 15.20.3261.024; Mon, 10 Aug 2020 07:27:35 +0000 From: Raslan Darawsheh To: "luca.boccassi@gmail.com" CC: Slava Ovsiienko , dpdk stable Thread-Topic: patch 'net/mlx5: fix flow items size calculation' has been queued to stable release 19.11.4 Thread-Index: AQHWa9gbqLJYxmtQY0SFtUD+yRLsDakw91ci Date: Mon, 10 Aug 2020 07:27:34 +0000 Message-ID: References: <20200724120030.1863487-1-luca.boccassi@gmail.com> <20200806095411.774624-1-luca.boccassi@gmail.com>, <20200806095411.774624-11-luca.boccassi@gmail.com> In-Reply-To: <20200806095411.774624-11-luca.boccassi@gmail.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: gmail.com; dkim=none (message not signed) header.d=none;gmail.com; dmarc=none action=none header.from=mellanox.com; x-originating-ip: [84.242.49.134] x-ms-publictraffictype: Email x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: fe405d89-111f-468e-116c-08d83cfeda10 x-ms-traffictypediagnostic: AM4PR0501MB2660: x-ld-processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtFwd x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:8273; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 5cxb5MsBPFLhJZsNWRC7XVFErADXP+9i3M/mgmQ5b90D9ami+3mzDhk/EjQoJihAnLHoaIUmc6AJ+SMzBf5lGla9A1wiHhOf9OvOjlx2SQroK5Kz0f/ADmh2k5d/wZ/03NT2Ga/S1K1LDU2GggwdR2Qi0i4EdHU/XcJiWB+MB3HWHcZ7JrQvXxBNtnytwUpAYFusbMhR+JeK+XQMvgST/MHBrCs1FQqttk2la1eIZRcjpeAGgRENenQ5dO0Bc8SyJhvNonXHcgDgAEWJhc2rp9/AC2AWrQFPRyxDapynDyjRZ0HS/CZKlfecoGcYghVyRyiNEd3hUacjQ+Iw8O/kiMHNTGvJnNEw4EGgCiEnaKbQmFlzi7uApxviV6IMF4XiPa9+87r9h5NIj1nnCKvz6A== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM0PR05MB6707.eurprd05.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(4636009)(366004)(396003)(136003)(376002)(346002)(39860400002)(66556008)(66476007)(53546011)(6506007)(26005)(186003)(7696005)(2906002)(19627405001)(45080400002)(8676002)(8936002)(55016002)(9686003)(4326008)(54906003)(478600001)(6916009)(316002)(966005)(66446008)(64756008)(76116006)(66946007)(52536014)(5660300002)(83380400001)(166002)(19627235002)(33656002)(71200400001)(86362001); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata: 03io9+MQgA0vjGRGFf4GzsHDwbbSa6C7DpvVK5/hRos5UohjsEMYjCxJbasxn88kZeTD4GVQnYfPuAEtgyPwexzdMM5r3/kNlNFo1oPKLZFvHQmWkHNlNILQqwzuwjgTlV3AWeJeLPbUqjhOp6NDRC3Z/MZMh9e8PK4dz1kTUKsm+EjxkX5x7W45w+pY893LbKCZOU+dfsu/CM0sD6HZuv5spbRgvTxt5F8mRNWPhMwAtKDiMopuxlicZYKLXqI4V0czYAY84WCJBhHvptiUtiMtL0rsms1AVHE2ygp4eUUHb/x2IVzqoNpPhHtKEPVZNfa9p1zAFV5i/TCr5iZJl+TJswIGXOieMCTlU+UEj0tgKvYqb3H0CX8bj9LviqJTJQ3s1fAidVa2zrjm9HLLx1w8a8DPYRj6IZiVBL6vFbM9eLlNq3gSjCS/wBRIq/amRptRMhkiFbZxRXcBFDLoke26eZO/JZHHfuFeKAFsL3HuKxGmpQxAO7kw9cba/AwFNsMbKDdpMTMe0cweCejt3SkRMV/7S8LCCyUXwtvf+mlkEah6th/aJ12gLXDD4d7OE8mgKs467UMhMQr872PxLeE5i0Awp4gLAJRi7yJ+UNstL+HzrAyn79lb0n99uBz1Kc8r7Qf4N2IoiHQi91d6Nw== MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: AM0PR05MB6707.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: fe405d89-111f-468e-116c-08d83cfeda10 X-MS-Exchange-CrossTenant-originalarrivaltime: 10 Aug 2020 07:27:34.9904 (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: VuGBMTU60dZhQE/4B3s46kiKM+guhn5zXxTalPOn0ax2APbaeHwFR2SCyP2CKnnIdfcsYnrWHIV12ifVMAvE4w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM4PR0501MB2660 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.15 Subject: Re: [dpdk-stable] patch 'net/mlx5: fix flow items size calculation' has been queued to stable release 19.11.4 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi Luca, please be noted that with this change you'll get a compilation failure when= debug is enabled for MLX5, if we don't have this patch backported before it http://patches.dpdk.org/patch/74534/ Kindest regards Raslan Darawsheh ________________________________ From: luca.boccassi@gmail.com Sent: Thursday, August 6, 2020 12:53 PM To: Raslan Darawsheh Cc: Slava Ovsiienko ; dpdk stable Subject: patch 'net/mlx5: fix flow items size calculation' has been queued = to stable release 19.11.4 Hi, FYI, your patch has been queued to stable release 19.11.4 Note it hasn't been pushed to https://eur03.safelinks.protection.outlook.co= m/?url=3Dhttp%3A%2F%2Fdpdk.org%2Fbrowse%2Fdpdk-stable&data=3D02%7C01%7C= rasland%40mellanox.com%7C1c9c6e447cb242871ce408d839ef3c65%7Ca652971c7d2e4d9= ba6a4d149256f461b%7C0%7C0%7C637323046965820421&sdata=3D%2Fxuhw7GFWJK3JM= Q5aLmI6Ml%2BXzpVNoJatg89ECB5XeM%3D&reserved=3D0 yet. It will be pushed if I get no objections before 08/08/20. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasi= ng (ie: not only metadata diffs), please double check that the rebase was correctly done. Thanks. Luca Boccassi --- >From e8df8d9adc133f10e896bd7d7ca62ca237222bbb Mon Sep 17 00:00:00 2001 From: Raslan Darawsheh Date: Thu, 16 Jul 2020 15:14:55 +0300 Subject: [PATCH] net/mlx5: fix flow items size calculation [ upstream commit d13f9760866884d81563624fbf160f3054b70f19 ] flow_dv_get_item_len returns the actual header size of an rte_flow item. Changing any of the structs for rte_flow items by adding or removing some extra fields will break this function. This fixes the behavior by returning the actual header size of each item. Fixes: 34d41b7aa3bf ("net/mlx5: add VXLAN encap action to Direct Verbs") Signed-off-by: Raslan Darawsheh Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_flow_dv.c | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_d= v.c index bfb27a602..e40cf3c2a 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -27,6 +27,7 @@ #include #include #include +#include #include "mlx5.h" #include "mlx5_defs.h" @@ -2661,7 +2662,7 @@ flow_dv_push_vlan_action_resource_register return 0; } /** - * Get the size of specific rte_flow_item_type + * Get the size of specific rte_flow_item_type hdr size * * @param[in] item_type * Tested rte_flow_item_type. @@ -2670,43 +2671,39 @@ flow_dv_push_vlan_action_resource_register * sizeof struct item_type, 0 if void or irrelevant. */ static size_t -flow_dv_get_item_len(const enum rte_flow_item_type item_type) +flow_dv_get_item_hdr_len(const enum rte_flow_item_type item_type) { size_t retval; switch (item_type) { case RTE_FLOW_ITEM_TYPE_ETH: - retval =3D sizeof(struct rte_flow_item_eth); + retval =3D sizeof(struct rte_ether_hdr); break; case RTE_FLOW_ITEM_TYPE_VLAN: - retval =3D sizeof(struct rte_flow_item_vlan); + retval =3D sizeof(struct rte_vlan_hdr); break; case RTE_FLOW_ITEM_TYPE_IPV4: - retval =3D sizeof(struct rte_flow_item_ipv4); + retval =3D sizeof(struct rte_ipv4_hdr); break; case RTE_FLOW_ITEM_TYPE_IPV6: - retval =3D sizeof(struct rte_flow_item_ipv6); + retval =3D sizeof(struct rte_ipv6_hdr); break; case RTE_FLOW_ITEM_TYPE_UDP: - retval =3D sizeof(struct rte_flow_item_udp); + retval =3D sizeof(struct rte_udp_hdr); break; case RTE_FLOW_ITEM_TYPE_TCP: - retval =3D sizeof(struct rte_flow_item_tcp); + retval =3D sizeof(struct rte_tcp_hdr); break; case RTE_FLOW_ITEM_TYPE_VXLAN: - retval =3D sizeof(struct rte_flow_item_vxlan); + case RTE_FLOW_ITEM_TYPE_VXLAN_GPE: + retval =3D sizeof(struct rte_vxlan_hdr); break; case RTE_FLOW_ITEM_TYPE_GRE: - retval =3D sizeof(struct rte_flow_item_gre); - break; case RTE_FLOW_ITEM_TYPE_NVGRE: - retval =3D sizeof(struct rte_flow_item_nvgre); - break; - case RTE_FLOW_ITEM_TYPE_VXLAN_GPE: - retval =3D sizeof(struct rte_flow_item_vxlan_gpe); + retval =3D sizeof(struct rte_gre_hdr); break; case RTE_FLOW_ITEM_TYPE_MPLS: - retval =3D sizeof(struct rte_flow_item_mpls); + retval =3D sizeof(struct rte_mpls_hdr); break; case RTE_FLOW_ITEM_TYPE_VOID: /* Fall through. */ default: @@ -2759,7 +2756,7 @@ flow_dv_convert_encap_data(const struct rte_flow_item= *items, uint8_t *buf, RTE_FLOW_ERROR_TYPE_ACTION, NULL, "invalid empty data"); for (; items->type !=3D RTE_FLOW_ITEM_TYPE_END; items++) { - len =3D flow_dv_get_item_len(items->type); + len =3D flow_dv_get_item_hdr_len(items->type); if (len + temp_size > MLX5_ENCAP_MAX_LEN) return rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ACTI= ON, -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- - 2020-08-06 10:53:16.212439477 +0100 +++ 0011-net-mlx5-fix-flow-items-size-calculation.patch 2020-08-06 10:53:15= .728595976 +0100 @@ -1,8 +1,10 @@ -From d13f9760866884d81563624fbf160f3054b70f19 Mon Sep 17 00:00:00 2001 +From e8df8d9adc133f10e896bd7d7ca62ca237222bbb Mon Sep 17 00:00:00 2001 From: Raslan Darawsheh Date: Thu, 16 Jul 2020 15:14:55 +0300 Subject: [PATCH] net/mlx5: fix flow items size calculation +[ upstream commit d13f9760866884d81563624fbf160f3054b70f19 ] + flow_dv_get_item_len returns the actual header size of an rte_flow item. @@ -13,7 +15,6 @@ of each item. Fixes: 34d41b7aa3bf ("net/mlx5: add VXLAN encap action to Direct Verbs") -Cc: stable@dpdk.org Signed-off-by: Raslan Darawsheh Acked-by: Viacheslav Ovsiienko @@ -22,18 +23,18 @@ 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_= dv.c -index f0cc7ad1a..e7f0a12ac 100644 +index bfb27a602..e40cf3c2a 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c -@@ -20,6 +20,7 @@ +@@ -27,6 +27,7 @@ + #include + #include #include - #include - #include +#include - #include - #include -@@ -2866,7 +2867,7 @@ flow_dv_push_vlan_action_resource_register + #include "mlx5.h" + #include "mlx5_defs.h" +@@ -2661,7 +2662,7 @@ flow_dv_push_vlan_action_resource_register return 0; } /** @@ -42,7 +43,7 @@ * * @param[in] item_type * Tested rte_flow_item_type. -@@ -2875,43 +2876,39 @@ flow_dv_push_vlan_action_resource_register +@@ -2670,43 +2671,39 @@ flow_dv_push_vlan_action_resource_register * sizeof struct item_type, 0 if void or irrelevant. */ static size_t @@ -97,7 +98,7 @@ break; case RTE_FLOW_ITEM_TYPE_VOID: /* Fall through. */ default: -@@ -2964,7 +2961,7 @@ flow_dv_convert_encap_data(const struct rte_flow_ite= m *items, uint8_t *buf, +@@ -2759,7 +2756,7 @@ flow_dv_convert_encap_data(const struct rte_flow_ite= m *items, uint8_t *buf, RTE_FLOW_ERROR_TYPE_ACTION, NULL, "invalid empty data"); for (; items->type !=3D RTE_FLOW_ITEM_TYPE_END; items++) {