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 47A5D41D8D for ; Mon, 27 Feb 2023 08:03:53 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 43BEE410D3; Mon, 27 Feb 2023 08:03:53 +0100 (CET) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2073.outbound.protection.outlook.com [40.107.94.73]) by mails.dpdk.org (Postfix) with ESMTP id 6E75540A7D for ; Mon, 27 Feb 2023 08:03:52 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CuBXQ7f+y5K9xvGV4dFa3iIEDS0g8+NS5t6X0p0p2E3apiEW87cfwex3svzrRWRXWnd3U6Vp7aPMeINmJBYCpNPts8/oIUr9N1+x09iNEa+qYvoR7GY81mf6oSDxcbEmnWe8KChzXe+BUZHKaWs1NuofI9UoC+ngs+CGV3AYzRUTcHF/vlhSwiwmb33ASHRontvva2FXk5wO66BrHatiogyuooFYjwvCino6gdaBktmvxcu35v8kPSsesbumTgpef0/ptCkpQNinx5Nay5DKBZZORpl+wVqT1orakW1zQGgWEjguwQfxAg0KCz5xWhSWZdwDLyTMV7Bos8gGRHIIDw== 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=0NB1iNpAAWlQPL8et+uNAJVYIb8kas0IsYiXGIuwog4=; b=IZiBS4d+ozfJzSiS2+f5Ch8X1MMTwVCbcXxBEqVNA+jfgfUap75LQ0Hieil3591ezi5JHTd1kfaaDPpm0ZMXdxKdKrbXFo9T4/YocTH1CO/D21OQrYhFnRySoWNChj+KuT55W8VOvp6otQYwDbI8mwrwodpbVmfMfhFsFrnxVi9bnVXQ5WnHc/PnBCQY+GCC3DZ8V1jz5p/mOspzBPHVUwgpETZRYizKSkjUZqrl2ai896vCvnddILQkEqF8ZYijBY3A4V2ru4Tf4cKJMbRt7enCZVnjJajBl30eJ9p6PBdLQAbu1/QM3lkun9N7gvW1HVy9duC0amHSmD7geMxryA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=redhat.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=0NB1iNpAAWlQPL8et+uNAJVYIb8kas0IsYiXGIuwog4=; b=qKSnOoQvbzoie1FTTZttlFtJbGMzQxcMi7FZDeesmzxqsXWuJH5bi1ipOW5XZwyWheLJSK/RlnWC/69waaMVssaYNuXyg2AcociTND0GHC9x+dNn2iHe3hLBJrH73bIT+ZoUGBHB0Qu6rf2KxSzhzk2vPIx+tl/S0MNiYXdwT+G05pVPZjoGxLUoDLxryb7ul7vo3PJp27HKee78+6pfvUZ62A4GMpIYNFMk9DzOBs9taQRpoUMDKVlBply9wFkrVcHJVTeZXvSitWbKmLXDMw23IJiuP0DR0Yk1OncPiZz7E4WoEkF9OquzyBNvC+gfMlY8H+WlL/Hz3BQw5cFDcg== Received: from BN9PR03CA0262.namprd03.prod.outlook.com (2603:10b6:408:ff::27) by SA1PR12MB6800.namprd12.prod.outlook.com (2603:10b6:806:25c::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.26; Mon, 27 Feb 2023 07:03:50 +0000 Received: from BL02EPF000108EA.namprd05.prod.outlook.com (2603:10b6:408:ff:cafe::13) by BN9PR03CA0262.outlook.office365.com (2603:10b6:408:ff::27) 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:03:50 +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 BL02EPF000108EA.mail.protection.outlook.com (10.167.241.203) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6156.12 via Frontend Transport; Mon, 27 Feb 2023 07:03:49 +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:03:38 -0800 Received: from nvidia.com (10.126.230.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:03:35 -0800 From: Xueming Li To: David Marchand CC: dpdk stable Subject: patch 'fbarray: fix metadata dump' has been queued to stable release 22.11.2 Date: Mon, 27 Feb 2023 14:58:50 +0800 Message-ID: <20230227070107.15664-22-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.230.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: BL02EPF000108EA:EE_|SA1PR12MB6800:EE_ X-MS-Office365-Filtering-Correlation-Id: 62288d9c-ea16-40d3-b12e-08db1890c75a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jdiph+dZFc9UKzttHusZasZCZo6WY7lcS5wlyxObuwdNLHQ4KR92GpXokKPfwLntSX3CPZtYXCIZFl5j092l74EnItS3/rLq6IGY8D79FQ8WHHyJVwn5cibmG6LYYZAH7AP6s/eQUTKZdluEJYsl8srXYdnEMd61XZGbsLs7X8MFHT7itO3Xv2R/Taq4n/Q9/7zpWtSrvptebt5PpWlcC4WVWvSP3bqFWbzjIS8sIkCtxrV6K5AIJIUx9fhu2N8ijQMIfKYrtrgucfTWeYn7WOQKsZ2NrKroFM3ePVReGl2hcAhE5iPv3f+5ipk1qOhJ7Vy5J0kneqGiOjA61oEpIGiktfThfEkrzcbiXH5ZlZhzPRtc+gmQUWKuP2Ph4XtkqklNpLBWynUZAe5VU6PBmvtARMfU0kTBo4XHbwlFRc/JqQu3LXGjLt5lSN8cKY0FxwncoPf4+2CzUDGppAmY+WlyKnln6kJaYwz9vA8jSpXfKywKwAUWC6sFC7SONp2msnUJi9BfFalyaLDXnr3wySiWHYUFxmKY5is1WZ7XNxlpMuV9ss+bWqav+5zBq11BySIZM1WidSYvnIUBC44as+cwjVuz6KYlPSjb+ZfPPjslyEe6ysVRjyTUVECTqsB7Zc2t0Ki7BKmPHMxIa/Zf/9mLOG3o70Av6/fxTX0jF++oIbEOoYVTH+XPNG0jWavkouwnrTrmVVCov3x0u2dTRzCLM6ndd2BBBCHLl8TK6EnxQEQgy+8W3Yt2bs6J/sgY3FvFZNbfAMkY/IaHBpe5eOv7WxUVHQ30Rzq7nJQ7/54= 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)(376002)(39860400002)(136003)(396003)(346002)(451199018)(46966006)(40470700004)(36840700001)(36860700001)(82310400005)(426003)(8936002)(5660300002)(47076005)(82740400003)(7636003)(2906002)(336012)(2616005)(41300700001)(966005)(70586007)(70206006)(8676002)(356005)(53546011)(6286002)(186003)(16526019)(4326008)(1076003)(6666004)(26005)(83380400001)(36756003)(478600001)(7696005)(40480700001)(55016003)(86362001)(316002)(6916009)(40460700003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Feb 2023 07:03:49.9992 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 62288d9c-ea16-40d3-b12e-08db1890c75a 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: BL02EPF000108EA.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB6800 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=1586e3b7bcf2bd502a67d6b45e51df8ec96c09d8 Thanks. Xueming Li --- >From 1586e3b7bcf2bd502a67d6b45e51df8ec96c09d8 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Tue, 3 Jan 2023 11:48:48 +0100 Subject: [PATCH] fbarray: fix metadata dump Cc: Xueming Li [ upstream commit 70eb4069b05c82494155a89eb8d08d8d2f57b059 ] If the passed fbarray is invalid, its lock was not taken before releasing. Fixes: c44d09811b40 ("eal: add shared indexed file-backed array") Signed-off-by: David Marchand --- lib/eal/common/eal_common_fbarray.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/eal/common/eal_common_fbarray.c b/lib/eal/common/eal_common_fbarray.c index f11f87979f..169e66e04b 100644 --- a/lib/eal/common/eal_common_fbarray.c +++ b/lib/eal/common/eal_common_fbarray.c @@ -1482,7 +1482,7 @@ rte_fbarray_dump_metadata(struct rte_fbarray *arr, FILE *f) if (fully_validate(arr->name, arr->elt_sz, arr->len)) { fprintf(f, "Invalid file-backed array\n"); - goto out; + return; } /* prevent array from changing under us */ @@ -1496,6 +1496,5 @@ rte_fbarray_dump_metadata(struct rte_fbarray *arr, FILE *f) for (i = 0; i < msk->n_masks; i++) fprintf(f, "msk idx %i: 0x%016" PRIx64 "\n", i, msk->data[i]); -out: rte_rwlock_read_unlock(&arr->rwlock); } -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-02-27 14:08:41.700249900 +0800 +++ 0023-fbarray-fix-metadata-dump.patch 2023-02-27 14:08:40.739237000 +0800 @@ -1 +1 @@ -From 70eb4069b05c82494155a89eb8d08d8d2f57b059 Mon Sep 17 00:00:00 2001 +From 1586e3b7bcf2bd502a67d6b45e51df8ec96c09d8 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 70eb4069b05c82494155a89eb8d08d8d2f57b059 ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org