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 C8ECAA09E5 for ; Mon, 7 Dec 2020 13:25:21 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 96CD6C8E6; Mon, 7 Dec 2020 13:25:20 +0100 (CET) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by dpdk.org (Postfix) with ESMTP id C1482E07; Mon, 7 Dec 2020 13:25:16 +0100 (CET) IronPort-SDR: B/RrFpHI1WcrjYw9aHxSlRsIsDU2n93kzaomXXsWM3ft8eFH45jghUD9hCM5gwIRj7ktUv9Hja MxNBCiS8Kpsg== X-IronPort-AV: E=McAfee;i="6000,8403,9827"; a="161456220" X-IronPort-AV: E=Sophos;i="5.78,399,1599548400"; d="scan'208";a="161456220" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Dec 2020 04:25:13 -0800 IronPort-SDR: pvD8otYZeeuD5K2k5LslNR9MZugoVZIjS9jDKmnQ9JldfW0IufxViH9fQEFmiYJ0mfa9E4SeH0 RETiICDgx2MQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.78,399,1599548400"; d="scan'208";a="407125492" Received: from orsmsx603.amr.corp.intel.com ([10.22.229.16]) by orsmga001.jf.intel.com with ESMTP; 07 Dec 2020 04:25:13 -0800 Received: from orsmsx611.amr.corp.intel.com (10.22.229.24) by ORSMSX603.amr.corp.intel.com (10.22.229.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Mon, 7 Dec 2020 04:25:13 -0800 Received: from orsmsx608.amr.corp.intel.com (10.22.229.21) by ORSMSX611.amr.corp.intel.com (10.22.229.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Mon, 7 Dec 2020 04:25:12 -0800 Received: from ORSEDG602.ED.cps.intel.com (10.7.248.7) by orsmsx608.amr.corp.intel.com (10.22.229.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5 via Frontend Transport; Mon, 7 Dec 2020 04:25:12 -0800 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (104.47.58.104) by edgegateway.intel.com (134.134.137.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.1713.5; Mon, 7 Dec 2020 04:25:12 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KD+L/ek/nWhCsgQv2f3+MXHbMQf58+34OYjh7LEAbB1awEPOdSVnXWrnqV4+4VhIbFPPECTJPwn+hz48ea9NhxbtBFPDrn58Yun+rwXKZrWRvilhBjAfo+HmERv7TJOVpMEgFVK0B6SHBnwJkn36jUQIXdnQcvz4+jDQuD6cgFEflYaKAwOrdsKau73hd+2fKml5D5n6Efj/p1hWlS5H+h7DVOD/OH93mL5DhP+TXefGUhwNV5c9G0y9aJkSJZSdTyprHjZIhzQYciHReGJGcVDcRWb9iymJtU1RLn9DGdRUtKgwHr4seVMZrRw2Ut/SF7kGovo5oG9HhPJE9O+mTA== 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=wqtnLV3Ewk2HRsqZCCjZ/6qgYiqW6cPi+jhmxh11880=; b=dl/BGyJ+gbbS9/xdYCfbKU3S9ep9csFilE5T3aab2uQdiOcIgycR0+B83Hd8T7uruMyej+TpTQN7aJSIN6u10NALzbk1ovukt4M51DjccJiUkC49iOJ/gnoy5rjv6FUpwBjWs6w1HY6nQC/r42m7jMrBphlUZJReiHIJRjNzFmUGNSe4hrD6MwKQ47tv8aIQarsAHrpx+8wh3efyXITq+IPk3LwgTsp3+rPLhb89cxbXOQiCkxgu67pSBpxa5TUj8z0PPBsQr31mhRLT3iABhKmQcPIfXo8RFi3qtmIdcE/zGW1SbYmbIQt7MX4Fj9qRpDP//ZqXkz5jQNoldWyrig== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=wqtnLV3Ewk2HRsqZCCjZ/6qgYiqW6cPi+jhmxh11880=; b=XA/63pry6/sUlZMkA6DwRWIV8xpYgMdmwZyvr3kiwqtWsz2USS7HZLNj+Hiln6VaANTUPlPloJ9mCThivTfWcgBH5Ie2V0repIxYBlqi5RBjIqxfv8DsoEF+meLswGJd6OHH5VdLsvdb5ZVEG88pH9RShnxrW3UMAt2bHUpllus= Received: from BYAPR11MB3301.namprd11.prod.outlook.com (2603:10b6:a03:7f::26) by SJ0PR11MB4877.namprd11.prod.outlook.com (2603:10b6:a03:2d9::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3632.21; Mon, 7 Dec 2020 12:25:11 +0000 Received: from BYAPR11MB3301.namprd11.prod.outlook.com ([fe80::7101:335e:1c9b:cad8]) by BYAPR11MB3301.namprd11.prod.outlook.com ([fe80::7101:335e:1c9b:cad8%4]) with mapi id 15.20.3611.025; Mon, 7 Dec 2020 12:25:11 +0000 From: "Ananyev, Konstantin" To: Yicai Lu , "dev@dpdk.org" CC: "zhoujingbin@huawei.com" , "chenchanghu@huawei.com" , "jerry.lilijun@huawei.com" , "haifeng.lin@huawei.com" , "guohongzhi1@huawei.com" , "wangyunjian@huawei.com" , "stable@dpdk.org" Thread-Topic: [PATCH v3] ip_frag: recalculate data length of fragment Thread-Index: AQHWyXORQB5r6K/Yxk6tJy0tEl3BAKnrkr0g Date: Mon, 7 Dec 2020 12:25:11 +0000 Message-ID: References: <1607000077-30212-1-git-send-email-luyicai@huawei.com> In-Reply-To: <1607000077-30212-1-git-send-email-luyicai@huawei.com> Accept-Language: en-GB, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-reaction: no-action dlp-version: 11.5.1.3 authentication-results: huawei.com; dkim=none (message not signed) header.d=none;huawei.com; dmarc=none action=none header.from=intel.com; x-originating-ip: [46.7.39.127] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: c26dd084-52eb-41a5-e12a-08d89aab24a5 x-ms-traffictypediagnostic: SJ0PR11MB4877: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:4714; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: Eeo2fmC6KgAYc8K6CPigSZ8bGBLr8TrgEqAQf3nUA1si1orFcMfHO4/e+HNHwjD5iiwtXsjOOW8uZ/b6REyRbdOV8XFC5KGAbsJNYPEfmBoHVNqLMzKnlMbiiZzuLe3UZx7pipAUh1Yidhgkd2aUmhK+Dy4Zd2dW8HszsOt4iknL8FXvsOc80VwK7FVLgNbl5beRO2vk1OrIUQPL/payefewfTf4FystOo0rnkLL0TGm5x60Sg5ONCbi1dgwSDZ/sCk0+t9XsJLTZXhJtI07e89NkXYlXAmgORjU7sQUmghX4VVmey3byixKthk++vQdvm/lOhJM9XeszrOWv6yo2g== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BYAPR11MB3301.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(136003)(366004)(346002)(396003)(39860400002)(376002)(4326008)(110136005)(54906003)(71200400001)(8676002)(478600001)(86362001)(33656002)(316002)(6506007)(186003)(66556008)(7696005)(66446008)(5660300002)(52536014)(9686003)(55016002)(8936002)(83380400001)(76116006)(26005)(64756008)(66946007)(66476007)(2906002); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata: =?us-ascii?Q?2OavRaor67O0pYAtlzWFW2nBWzwuutEJb9PXCzJbWfdsQcT09NqBeVB6ywAx?= =?us-ascii?Q?nmDv4GidfFmEfeFhlcKkh2kaluuslcMBjyFfL3z7nL9hKex6APEbYc31WJn5?= =?us-ascii?Q?q8apHrKRP/wbcPIXsknFPCd5cV8vTSgkAwOy/Yn5Xtku2uoHr4rDIS/t3YZO?= =?us-ascii?Q?V2rKPrqppOhb8QrPzP/20Z9gHUzEXUZeKpejr+rqoHY8RJRvzLiYLUuyQaaq?= =?us-ascii?Q?75gPN7vPojk4s3B1v8hufvU1cnl+9a6wgJICRzGem4P/BdKQ78HtpyN45V5v?= =?us-ascii?Q?hYfTKTXelDRMZUFqeTNjdUN5siTgL9a3QjmSY7Ml2QAqSMqkqAyeryGfU+5c?= =?us-ascii?Q?hL59XPsLWwd0V+aOoGW/jBHqzicbBVYxyx4xcgrTXdbq1mkxazRk/sV3Imb0?= =?us-ascii?Q?qiop3MTpopW8LiwGDessbHpW301Z5q2FJrlP0ejNrlLzaTs+y1u2n4oyBmKt?= =?us-ascii?Q?p+kaBEkb8XqPW3+4UCtruOuaJ47kJsruEutchdOXYtQjAYALOPusFvRr5Mcn?= =?us-ascii?Q?l7DwEXqle2QY+dqxj1KtjphyS7ln54XJXz+5oUV4xSCyqjmOePKxD/bGq8QE?= =?us-ascii?Q?ljipiOyhnIl5Z+vNphfnfuAf2WT94seIJpBwb54NbSCgJv825OiwmgWoujoG?= =?us-ascii?Q?T7aNkkMdfGMJAPX1RMsb25nFwBUDptoSw27/boz+69rJiIuK7YXEll3b8K0g?= =?us-ascii?Q?Ws8nA9YY0W+umuHxcQhM6zL3M4drit41CSGNUDz5jMjgf0qDqbqs0hoWtu8H?= =?us-ascii?Q?14UYcFPFWQMX1QZSQJYpbhWbCpdTs5/7Z/4xFHEuHwBM5AfTjtGi06JTCjhA?= =?us-ascii?Q?8K92yQUFbI3wpq7TDVuq0h0O1xa2PeGjpdFQ9So7pkwE/gpLL6aw+zkKd9vw?= =?us-ascii?Q?00/ysXRQxu982c0CIM9BctU4w0VKBiMXBGencQxfjXh/5agtDBra3CUhfjWz?= =?us-ascii?Q?n4lC2u0OZDn+gTAh8Vc5dlgpENKgwgtLd7SKXg4bncI=3D?= x-ms-exchange-transport-forked: True Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BYAPR11MB3301.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c26dd084-52eb-41a5-e12a-08d89aab24a5 X-MS-Exchange-CrossTenant-originalarrivaltime: 07 Dec 2020 12:25:11.6801 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: NYF/cMg1ExIc2LuIzXvh3b/3VZh6+v+wWL6CcoPu4c/j2uCkyJEgvU802shwzjuuwLYJdD0l1vQTRGce+BM4ghmDUPqFrQB4HS9bdjIAWxA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR11MB4877 X-OriginatorOrg: intel.com Subject: Re: [dpdk-stable] [PATCH v3] ip_frag: recalculate data length of fragment 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, =20 > In some situations, we would get several ip fragments, which total > data length is less than minimum frame(64) and padding with zeros. > Examples: Second Fragment "a0a1 a2a3 a4a5 a6a7 0000 0000 ..." > and Third Fragment "a8a9 aaab acad aeaf b0b1 b2b3 ...". > Finally, we would reassemble Second and Third Fragment like this > "a0a1 a2a3 a4a5 a6a7 0000 0000 ... a8a9 aaab acad aeaf b0b1 ...", > which is not correct! > So, we need recalculate data length of fragment to remove padings! >=20 > Fixes: 7f0983ee331c ("ip_frag: check fragment length of incoming packet") > Cc: stable@dpdk.org >=20 > Signed-off-by: Yicai Lu > --- > v2 -> v3: Update the comments. > --- > lib/librte_ip_frag/rte_ipv4_reassembly.c | 1 + > 1 file changed, 1 insertion(+) >=20 > diff --git a/lib/librte_ip_frag/rte_ipv4_reassembly.c b/lib/librte_ip_fra= g/rte_ipv4_reassembly.c > index 1dda8aca0..9a9fe3703 100644 > --- a/lib/librte_ip_frag/rte_ipv4_reassembly.c > +++ b/lib/librte_ip_frag/rte_ipv4_reassembly.c > @@ -117,6 +117,7 @@ rte_ipv4_frag_reassemble_packet(struct rte_ip_frag_tb= l *tbl, >=20 > ip_ofs *=3D RTE_IPV4_HDR_OFFSET_UNITS; > ip_len =3D rte_be_to_cpu_16(ip_hdr->total_length) - mb->l3_len; > + mb->data_len =3D ip_len + mb->l3_len + mb->l2_len; That doesn't look correct. Even one fragment can consist of multiple segments. Plus you don't update mb->pkt_len. To do it properly, you'll need something like: trim =3D mb->pkt_len - ip_len + mb->l3_len + mb->l2_len; rte_pktmbuf_trim(mb, trim); Though my preference would be to leave it as responsibility of the caller (As it has to parse packet anyway to fill l2_len/l3_len and usually strips l2 headers, etc). =20 >=20 > IP_FRAG_LOG(DEBUG, "%s:%d:\n" > "mbuf: %p, tms: %" PRIu64 > -- > 2.28.0.windows.1