From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id CBC08A034F for ; Wed, 10 Nov 2021 08:01:22 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C199140142; Wed, 10 Nov 2021 08:01:22 +0100 (CET) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2081.outbound.protection.outlook.com [40.107.220.81]) by mails.dpdk.org (Postfix) with ESMTP id 2847840142 for ; Wed, 10 Nov 2021 08:01:21 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=V4NZpYiNHIbDFRgVUzYeUCtTSjChS0sxv+g3PLoSoLomCSket1byZo3+nkxCL7Zq+Mg+IpBnbX4x8sUxO95ksbarnYI1AFDkW9axITwNtxLLUBablThtRPQm4OACMolGzqROZLh12Pav1J+Kk1GHL7E52b863XYmjPQMJsgy0iGWzaiN/QRRKJ/kqyfp2VVh0aRRAQDom4Q+1cRPOFQm8n3my6Bp4Qc6GqL0EUfjQ8yff2uxG8vTOfHahghlwowfhLLgdz34r4PviYmbk/TGvtvhbZQCt9JqEoSAKmFb3zNhiOUbsJaF3VN5MxPcGDf6K5/qj6LnrKt4UdUemdRGxg== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=lQSyjMvcDzMjOdvjn0h6xYT5F39M2cCwQGFQQzkEuC4=; b=jRSa3ydJWDerkApFXsOjzxS4Nh+1QQ22d6+VZmyIWiklFN+b0JB3ebSf6wi78s7MSukY277D5DBAVsuIa9ErNF1/zeShflM8Jm41+CjBFE0fDfMCxcOIXL1gPjprmVOxXdhmMdX+F4PByRQlIEWpwCF1lvvZMa0WB4CIVHeHam1z8yCXQwgdRgxRjqP0fEPdmUlJqZZxGV+QZl6/e2BZAJ/E7AoB99twVeJNLAp3h3pKay3D17JJGAcvMuruKCrTbG+kiqUtH56y3J14aYHsRnLwbVXFOmJHF2QYTizUjD+3cgzjOpCXYQ9Brp2V6djpj5eagK3kgV3rrSK8KGWQMw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=lQSyjMvcDzMjOdvjn0h6xYT5F39M2cCwQGFQQzkEuC4=; b=QMe+2iJ//UEPJ0Y6lsp78t/SuJ5shgwRaYWwLevpcELG19PIYGHVFR6oiaLbM/kTH6FjILTjxsms7fCkxVIOmmLK4nHEEKBUSKJlOKKBaVdId1/Zck+AraJEw6LJTAwGObO/48xi++0jygfRBaDCjOb+s748EEY5zLiK3+5nH02dyhLsJ8aaeJ605Qh+PT+tq+8ak2Ymj6WBJ3BilKLBZ5W62Algn5k/QuvCOY7+S6znkktLLwiOR2ZM2HHiVxeg/1sJ0DTQXI/lAixRlvTeYQv92pHSO5pP7N8mh4+IATeot48zVPa/k1fUfQDrrWtj1eImi2u+Krx77dHhVA+LYQ== Received: from DM6PR03CA0013.namprd03.prod.outlook.com (2603:10b6:5:40::26) by BL0PR12MB2532.namprd12.prod.outlook.com (2603:10b6:207:4a::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.11; Wed, 10 Nov 2021 07:01:15 +0000 Received: from DM6NAM11FT050.eop-nam11.prod.protection.outlook.com (2603:10b6:5:40:cafe::6) by DM6PR03CA0013.outlook.office365.com (2603:10b6:5:40::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.11 via Frontend Transport; Wed, 10 Nov 2021 07:01:15 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by DM6NAM11FT050.mail.protection.outlook.com (10.13.173.111) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4669.10 via Frontend Transport; Wed, 10 Nov 2021 07:01:14 +0000 Received: from nvidia.com (172.20.187.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Wed, 10 Nov 2021 07:00:09 +0000 From: Xueming Li To: Huichao Cai CC: Luca Boccassi , Konstantin Ananyev , dpdk stable Date: Wed, 10 Nov 2021 14:32:16 +0800 Message-ID: <20211110063216.2744012-253-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211110063216.2744012-1-xuemingl@nvidia.com> References: <20211110063216.2744012-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.5] X-ClientProxiedBy: HQMAIL101.nvidia.com (172.20.187.10) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 252c3655-e74b-46ae-ae3f-08d9a417e2d6 X-MS-TrafficTypeDiagnostic: BL0PR12MB2532: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: AsPZ0LyZCfiraiUzozej5k1a61c1aBkBQg8D3g6rVrvTvUZ53vu/pe6A793AkatArmZUdDh9Iy89agiFlnEIjVh5h27F8X32ordc7Kx+nyrvXTB/4+kiXuwTK979+UtvKgyND4wrTWe1LDOBuKDDGjF4AEk3IE4oglwbM3CH7fsroSRJdiZqNzYejTz5q6ly2KvheEanzOavsXi7mvfF9jSasOYRdauR/7lXPlNWRlbaN+veN/DQUhx+G3k8JneAwmGgfJjni8+u0HPxGtFJKyMGyaU7hb9gYcdAESKZPSTKLpj+WZ+K9w1yMsUNCwkveguSlOQJulJ21FS6SDxbs4oasN64NW8Aau8hjSD+d1aEfe6G+TCnFp55dZ4TdDqkhZy1hpRYCYcucOI3cyMv1DJQuKYDn+/ggjJ3+g+bkToU4iIuKZH3+U/xzIUtVCowRcBk920yvT9lSGM/bNACd4JfoCYGtBPZdLhSIjQP8OD6RBpYyZG7qwG/Skx4cT2AgCMFEqzc41M8xeHppdaFuUtragiUWV9cGutxI1jpMiDjB2DumyomPZDmsTRH1AI5DMo74obNGhClDvWGDe3LFiNaLltjg75HakDKESIBuPtYFQhCN1He6jyJEo7bCMXZxbzgNSloyNF+sXaV1+kfFcTO1fE8Wnmz2i+N6SIoTAdBNio3xrXdHnxUdf7+I55CyFcFSPGBG3vBPh5v1O2fD/4OxEKlYInz3FIbPWdELkk+jka8rg7pnfTbJUILET/+HiZ7Cz8ASA6aEo2DGR3m7hRmQsVhxice1oy4FSxrN6eMwhYBRvweXApkd3i7ULpkX9ZzZrkrWHOdFXnz1lWr2g== X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(46966006)(36840700001)(86362001)(54906003)(966005)(6286002)(16526019)(6666004)(186003)(55016002)(336012)(4326008)(36756003)(316002)(6916009)(1076003)(70206006)(2906002)(4001150100001)(70586007)(8936002)(36906005)(26005)(2616005)(5660300002)(7696005)(53546011)(36860700001)(83380400001)(356005)(8676002)(82310400003)(47076005)(426003)(508600001)(7636003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Nov 2021 07:01:14.5349 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 252c3655-e74b-46ae-ae3f-08d9a417e2d6 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT050.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR12MB2532 Subject: [dpdk-stable] patch 'ip_frag: revert fix fragmenting IPv4 fragment' has been queued to stable release 20.11.4 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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, FYI, your patch has been queued to stable release 20.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/12/21. 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 rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/1f01d7a0f29460da1f2f58a7fa465b746a7a8baf Thanks. Xueming Li --- >From 1f01d7a0f29460da1f2f58a7fa465b746a7a8baf Mon Sep 17 00:00:00 2001 From: Huichao Cai Date: Mon, 25 Oct 2021 15:55:53 +0800 Subject: [PATCH] ip_frag: revert fix fragmenting IPv4 fragment Cc: Xueming Li [ upstream commit 013bb504c81ed4efce61a8c5c1bd169f539797ef ] The patch ("ip_frag: fix fragmenting IPv4 fragment") introduces a bug and needs to be rolled back. This is because the patch and variables "flag_offset" conflict with each other. Bugzilla ID: 835 Fixes: 567473433b7e ("ip_frag: fix fragmenting IPv4 fragment") Signed-off-by: Huichao Cai Acked-by: Konstantin Ananyev --- lib/librte_ip_frag/rte_ipv4_fragmentation.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/lib/librte_ip_frag/rte_ipv4_fragmentation.c b/lib/librte_ip_frag/rte_ipv4_fragmentation.c index fead5a985a..2e7739d027 100644 --- a/lib/librte_ip_frag/rte_ipv4_fragmentation.c +++ b/lib/librte_ip_frag/rte_ipv4_fragmentation.c @@ -75,7 +75,7 @@ rte_ipv4_fragment_packet(struct rte_mbuf *pkt_in, uint32_t out_pkt_pos, in_seg_data_pos; uint32_t more_in_segs; uint16_t fragment_offset, flag_offset, frag_size, header_len; - uint16_t frag_bytes_remaining, not_last_frag; + uint16_t frag_bytes_remaining; /* * Formal parameter checking. @@ -116,9 +116,7 @@ rte_ipv4_fragment_packet(struct rte_mbuf *pkt_in, in_seg = pkt_in; in_seg_data_pos = header_len; out_pkt_pos = 0; - fragment_offset = (uint16_t)((flag_offset & - RTE_IPV4_HDR_OFFSET_MASK) << RTE_IPV4_HDR_FO_SHIFT); - not_last_frag = (uint16_t)(flag_offset & IPV4_HDR_MF_MASK); + fragment_offset = 0; more_in_segs = 1; while (likely(more_in_segs)) { @@ -188,8 +186,7 @@ rte_ipv4_fragment_packet(struct rte_mbuf *pkt_in, __fill_ipv4hdr_frag(out_hdr, in_hdr, header_len, (uint16_t)out_pkt->pkt_len, - flag_offset, fragment_offset, - not_last_frag || more_in_segs); + flag_offset, fragment_offset, more_in_segs); fragment_offset = (uint16_t)(fragment_offset + out_pkt->pkt_len - header_len); -- 2.33.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-10 14:17:12.962173283 +0800 +++ 0252-ip_frag-revert-fix-fragmenting-IPv4-fragment.patch 2021-11-10 14:17:02.094077597 +0800 @@ -1 +1 @@ -From 013bb504c81ed4efce61a8c5c1bd169f539797ef Mon Sep 17 00:00:00 2001 +From 1f01d7a0f29460da1f2f58a7fa465b746a7a8baf Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 013bb504c81ed4efce61a8c5c1bd169f539797ef ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org @@ -17 +19 @@ - lib/ip_frag/rte_ipv4_fragmentation.c | 9 +++------ + lib/librte_ip_frag/rte_ipv4_fragmentation.c | 9 +++------ @@ -20 +22 @@ -diff --git a/lib/ip_frag/rte_ipv4_fragmentation.c b/lib/ip_frag/rte_ipv4_fragmentation.c +diff --git a/lib/librte_ip_frag/rte_ipv4_fragmentation.c b/lib/librte_ip_frag/rte_ipv4_fragmentation.c @@ -22,2 +24,2 @@ ---- a/lib/ip_frag/rte_ipv4_fragmentation.c -+++ b/lib/ip_frag/rte_ipv4_fragmentation.c +--- a/lib/librte_ip_frag/rte_ipv4_fragmentation.c ++++ b/lib/librte_ip_frag/rte_ipv4_fragmentation.c