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 6970241D8D for ; Mon, 27 Feb 2023 08:17:52 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 61E69410D3; Mon, 27 Feb 2023 08:17:52 +0100 (CET) Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam02on2084.outbound.protection.outlook.com [40.107.212.84]) by mails.dpdk.org (Postfix) with ESMTP id 92CA040ED6 for ; Mon, 27 Feb 2023 08:17:50 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jLWXmQ82k9kkhf1Wn33LsV9ueZfe7f721TYvHaLZXBN0f3UG1JdLvHz6S506QE2eB+lQUhpNvJEqHZoSYF6s4BYiL0uhWCDkLhlyD8ckSG5spN4vCkojabg271+uyYqmjNvhEUBSxZ2nvsSrwSRUHQzSchWmltJi8rJU5a9XWr9jbr9eHVzzAvElgLfPETD36/UFLFFARPUreQuKRf8oCtkEAhPpRIrxJpeBRIIiw9AMaHO+oZOyR57PWSKaptb1wsozDv3CPQQzHZP/karCA1m27UjEpAxMY/9NvO5L6seUFe9WAITIwEaQ0lGRRAT3cQZ8HsxgW2TkEZyXHrCUeg== 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=+de7BnFY1DCYSWKjPeu41/Ksbc89yhRKxF4hk8YvmGU=; b=DiIBOSwm0vrNjpjaG4jo+ZlNz/3s3WcF12KG+AFecIp91O23fN2+V3J1NeRMA5L74OmBx0nckCCpw4YWQiulNDtURYBxBRcfLuC7CJmHcYslp6BVP7XDmM2wO58tFAhVJrvyHdSRog0uKpeRHkoHcqhsAvpoZ+IHXARQ9ja0eGt1bQfQRpN2WvSLKFsbbRmFibEVZTeOBHZtHL0CnCBWqqDFUW+t5/Lb0YhSJ0V5doOOONLdftD2GhlhdtmNXl3qZdZWEkHzplUGp0p3fssTjKkgzB+h7WSDmTPKka9J1L57NDJEAHKodBJ8sRZis1Dzr50hqIZrH/Ek0c75ZsHf1w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=marvell.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject 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=+de7BnFY1DCYSWKjPeu41/Ksbc89yhRKxF4hk8YvmGU=; b=R8iRWG6ViTVSwTpjO5Rfth8nSzoiTixT71RGdR4tFgvkAdUvlpqfg2obxiHcDKlJxbS6zA36B0+I/W5AMBTgTiTYQWNTAi9CIUDty1aqEcS0D07Xf2447goupXp4rfo42cmfADNV/u9dySL/4QiuTd12ddgM2eRqI3aQQLBPNJ58cgF1ISDtfZrouZ/OVcaXGVOr9OldIXKaOl8k1kCU+tgC6MOYhB5oc10oenzD+fXEHE4EbbIzOJBZdcwAbgTFanUgOkyHRQ7dPaN3GrtiFgXSD2fdLomCLrzhph/j+FE/sCdcFrLMa4jndi5duxCsR4c/J/JD7B983GF8A8ErkA== Received: from DM6PR07CA0132.namprd07.prod.outlook.com (2603:10b6:5:330::25) by IA1PR12MB6020.namprd12.prod.outlook.com (2603:10b6:208:3d4::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.25; Mon, 27 Feb 2023 07:17:49 +0000 Received: from DM6NAM11FT011.eop-nam11.prod.protection.outlook.com (2603:10b6:5:330:cafe::69) by DM6PR07CA0132.outlook.office365.com (2603:10b6:5:330::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.29 via Frontend Transport; Mon, 27 Feb 2023 07:17:48 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by DM6NAM11FT011.mail.protection.outlook.com (10.13.172.108) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6156.16 via Frontend Transport; Mon, 27 Feb 2023 07:17:48 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Sun, 26 Feb 2023 23:17:38 -0800 Received: from nvidia.com (10.126.231.37) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.37; Sun, 26 Feb 2023 23:17:36 -0800 From: Xueming Li To: Volodymyr Fialko CC: Stephen Hemminger , dpdk stable Subject: patch 'reorder: invalidate buffer from ready queue in drain' has been queued to stable release 22.11.2 Date: Mon, 27 Feb 2023 15:01:02 +0800 Message-ID: <20230227070107.15664-154-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230227070107.15664-1-xuemingl@nvidia.com> References: <20230227062349.13764-1-xuemingl@nvidia.com> <20230227070107.15664-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.37] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6NAM11FT011:EE_|IA1PR12MB6020:EE_ X-MS-Office365-Filtering-Correlation-Id: 4a999ae2-7714-4ddc-2a62-08db1892bb3e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: CRpV4SNvAEVoWHBQks49s7AzDtayFWTlQCsha741RTJ/jHIkcVxyNbCs69oKDYS16SF1K8PTfDkAPY2k1D476kl2lHIoyGzF8HJdtxjYZX2o4WFKV8oTq2akVBvwIxlGlJgjiuBYLJBWltEKRJktOXeAXobbbPL+Ie75VwCL5ORR81ie+5vAzsmZatggdwwmFctxb6MBAQjNHHxod/s35Qq06iVF7Y7h5X+l0nbjMtMtLUbZsZxFTd7Kdq3FlkMkAut6+fcy54xpxJoXexKLcxJljTNhjnD0I4uDBjurSLjr5IVA4UGrSlGU7VV2XUbFz+Gorstb3x5DHU3SkcJPuVTL+lJX/OfAtIGZIWkrip2R/sqP9IdPQ5g5eSTJ69j0csqCzEumP5SShPXTLQzQwq9n5L7HvbdYeAy/IAfRsK5qsMf2QWZYP6GeHFyd/BaQQhRsisl8BUhDMA0RQEmEtOxjG3mGgKjZeqDNwpevhLU3lko1gRBYBGMM4MT+oT0QtmeNUgTGjw+jSulP0VU1LckDfUJXJ5sU547K3Z4bCjbieARLLgpC4allSuHe+h7IVnAGJemuPm3Xv99k23rOxewjzkUNNNtSArh8L7qJN7Dab9taneY2jCLMO7c05t7x/QUlA5IpNT2HyfK3cu1TJHD8hGP0QgfsbqAV4uv3o0CfvNllc5WO8ZxI4TFmAaS4JdfRXGF3okkIH69fw3AVPEG0XUiyJ+SHEfaffPxyeHpZb3ku+qHGggsaVWS//YyFiPHRPW4gHTOMGYYUwzGynLXxJUEpBBb8ZAPrrWgDLp+7Da6OoEUjqAfPtX0RTCJY X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230025)(4636009)(136003)(396003)(39860400002)(376002)(346002)(451199018)(36840700001)(46966006)(40470700004)(40460700003)(16526019)(6286002)(478600001)(82740400003)(7636003)(356005)(70206006)(6916009)(8676002)(4326008)(70586007)(2906002)(34020700004)(41300700001)(5660300002)(40480700001)(186003)(26005)(7696005)(336012)(55016003)(2616005)(426003)(1076003)(6666004)(53546011)(47076005)(8936002)(36860700001)(966005)(83380400001)(36756003)(82310400005)(86362001)(316002)(54906003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Feb 2023 07:17:48.7200 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4a999ae2-7714-4ddc-2a62-08db1892bb3e X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT011.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB6020 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 Hi, FYI, your patch has been queued to stable release 22.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/01/23. 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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=b515c436e649c7bdd60481abbacc1d853d2c94fa Thanks. Xueming Li --- >From b515c436e649c7bdd60481abbacc1d853d2c94fa Mon Sep 17 00:00:00 2001 From: Volodymyr Fialko Date: Sat, 7 Jan 2023 16:19:38 +0100 Subject: [PATCH] reorder: invalidate buffer from ready queue in drain Cc: Xueming Li [ upstream commit af12092f927d0d230b4dc051529dae88902fba1c ] Set drained buffers from ready queue to NULL, since their ownership returned to user. Otherwise it's possible that both user and library will attempt to free the packet. Fixes: b70b56032bff ("reorder: new library") Signed-off-by: Volodymyr Fialko Acked-by: Stephen Hemminger --- lib/reorder/rte_reorder.c | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/reorder/rte_reorder.c b/lib/reorder/rte_reorder.c index 385ee479da..b38e71f460 100644 --- a/lib/reorder/rte_reorder.c +++ b/lib/reorder/rte_reorder.c @@ -389,6 +389,7 @@ rte_reorder_drain(struct rte_reorder_buffer *b, struct rte_mbuf **mbufs, /* Try to fetch requested number of mbufs from ready buffer */ while ((drain_cnt < max_mbufs) && (ready_buf->tail != ready_buf->head)) { mbufs[drain_cnt++] = ready_buf->entries[ready_buf->tail]; + ready_buf->entries[ready_buf->tail] = NULL; ready_buf->tail = (ready_buf->tail + 1) & ready_buf->mask; } -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-02-27 14:08:45.790561600 +0800 +++ 0155-reorder-invalidate-buffer-from-ready-queue-in-drain.patch 2023-02-27 14:08:40.959237000 +0800 @@ -1 +1 @@ -From af12092f927d0d230b4dc051529dae88902fba1c Mon Sep 17 00:00:00 2001 +From b515c436e649c7bdd60481abbacc1d853d2c94fa Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit af12092f927d0d230b4dc051529dae88902fba1c ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org