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 1DE19457A1 for ; Mon, 12 Aug 2024 15:04:28 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 15BE24065A; Mon, 12 Aug 2024 15:04:28 +0200 (CEST) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2066.outbound.protection.outlook.com [40.107.243.66]) by mails.dpdk.org (Postfix) with ESMTP id 5CAD9402C3 for ; Mon, 12 Aug 2024 15:04:25 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=m+w44IsFQFkPj5XVZF6SitYK1/ncmYUBHw0osZu4+NYe4/kXKf7wAZQqvFFHezm0eVIPP3hHTAe4TwbUiM9yjMAk5nIZEiNC981GFnzD4bxtHLdb+uSN4MNTsSZYQUIZFOCO9BKtTD3mcVtSfjvXwyxvufmv6/1jWPfCqmv/Ujao9r7o8hLNLROYWH8vmhH8xz+yOFiY5zC0rMyuhaNgqb0T9cUqBz4qYZ+OnddBBmMbxlHbm5TywrGD3XuB1L/1KDNx5CbBVpMgi1MP8JUA4LbeoNWpzkS0tCKWA6SbezmushFudY2OU23DVHc0OhHjTEeOmgXmrop51d2N4LoUzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=uaumN2Y+1Jl7N/6dblVCk22Phh0KfUjM45jS3zYM1Mk=; b=UDvpQ+4S8uPnBfIETW4FrkXxuu7UAIPGLQ9VoSB97mhdT4z8+pwalBkJsUvOreHGuvohJWvnHWOTlvSXOeaa+BoGBQvBSAo0fnW5JEGKS5Y7P7BDy9ps+AwuyoRKTxT13Nhd7XvNPRU5oXfuVXWswEoIpd4yoqewFPTQ4bDoJRT2d8BJMi4ytFEhgJc67A3wDbACiN/n0smdS+hAxrd2MrquHmVIXx8Bir4WlKHw6yTxPGHxbROUt37xJTLMzCR6cSkO5zXnAXKUSVs2Ds0wPgQvVos6gAy6EIsSc2fmw4TCiC7yrh/2hqKaKEurJBUdr4IgBS0GQ3YZRTugUIAT8w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=intel.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 (0) 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=uaumN2Y+1Jl7N/6dblVCk22Phh0KfUjM45jS3zYM1Mk=; b=TWlJ9j2K8iIMbOXf0vF7mZjkeblRR7jpvIl0l4SahTmT1Kn+AUpN9WUPvLsVHKdCjV0LsWR6IugnomWGMWRRxN+2i48RZBNsKT8xTzwGRknmJPMwPYhNkPLHXN3NmL3iwVPCYL765ZTov13uXSnUWi6VY3eFjTaAZdAXyif+2gph8pKIbNV9nXhhJuBCJCKqDn0NMg+vxGi3V3m3mjRyL6dq+XkCjCPEsR1ICabyFpiTwVa+ZwV/Bv+XazlZFr3NNDBiYALAQIiR+IX8xV1RHnDGplw2Kg+RJ57Lr05+qss9x9z8n2LQrQnAjQiw7dAxRKHbgoW5AatN/LlUu6hmMQ== Received: from BY5PR13CA0002.namprd13.prod.outlook.com (2603:10b6:a03:180::15) by SN7PR12MB7836.namprd12.prod.outlook.com (2603:10b6:806:34e::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.22; Mon, 12 Aug 2024 13:04:22 +0000 Received: from SJ5PEPF0000020A.namprd05.prod.outlook.com (2603:10b6:a03:180:cafe::5f) by BY5PR13CA0002.outlook.office365.com (2603:10b6:a03:180::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.22 via Frontend Transport; Mon, 12 Aug 2024 13:04:22 +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 SJ5PEPF0000020A.mail.protection.outlook.com (10.167.244.43) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.8 via Frontend Transport; Mon, 12 Aug 2024 13:04:22 +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.1544.4; Mon, 12 Aug 2024 06:04:09 -0700 Received: from nvidia.com (10.126.230.35) 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.1544.4; Mon, 12 Aug 2024 06:04:07 -0700 From: Xueming Li To: Anatoly Burakov CC: , dpdk stable Subject: patch 'malloc: fix multi-process wait condition handling' has been queued to stable release 23.11.2 Date: Mon, 12 Aug 2024 20:50:20 +0800 Message-ID: <20240812125035.389667-144-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240812125035.389667-1-xuemingl@nvidia.com> References: <20240712110153.309690-23-xuemingl@nvidia.com> <20240812125035.389667-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ5PEPF0000020A:EE_|SN7PR12MB7836:EE_ X-MS-Office365-Filtering-Correlation-Id: f03625b0-a2f0-4d66-b643-08dcbacf48c8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|82310400026|36860700013|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?9TFdsaRRMpSL5zsvLxWFvXlj6V+tb1siQLrsUqgbinKEklllckt7vzRw1C8M?= =?us-ascii?Q?psNTkXf7jXxWuKPFyhq8JTXSPSTjxcoI+PXSt9kTr7f7+gmgOVjYIq4bLkgl?= =?us-ascii?Q?RhnHX4BUAY/V93ISDWvvR1mH47QQgIxqayJrX6/AH/tfr/LVjs098c9YFXeg?= =?us-ascii?Q?Qyei/PrS5agTBRsU7szplKnrEHgVXvncNpcEA8phjggLMR4ZoTpWnuDopRNH?= =?us-ascii?Q?7NJFeFIHc52UzgBnL0CQpvPgklVcS1FqvD6UKQbMDI3BZA97BQfMHuZ1hUV/?= =?us-ascii?Q?7RRw737w1MKPbFxRZDL75L0YtJ9GmBCFOr9wq/gJ5XQ/RKh7XWoYWQwQbxa8?= =?us-ascii?Q?KED0jLZc5Vy1wOmq/oJCygvqc0c4GutLCPnDlhM6R74e7VXXmGQQkBavJywa?= =?us-ascii?Q?WM/zC6TwnDhsqzdDGB8ffB1zDI9l5LHWHRqp4LhxEt4xSX8QBFy0OFCcygs5?= =?us-ascii?Q?6oFxkbHakkCB8I1ZaXdZ4hGSJ0EnjOLTU3Wo99/A/Y43C/44BbqvfoQ/U4iw?= =?us-ascii?Q?qXBJaOnQrIplwRVRPXJgcSNVC7CKjiGqfuO/PyeA+8qT/OnzMhh9QobMPP6v?= =?us-ascii?Q?uLW87tTTN7P8UiGmLk9tNFc47vmNtMgepJbsWbNNM3DS8gpaUGTv0Y+0y8VV?= =?us-ascii?Q?A4ooBO+T8mAqLzgJ+nWLOa0cvN2n8Sp3u5P/sQLvhbab/zO4n7J1oGgPCG3w?= =?us-ascii?Q?eowo+TwAzD8U/hPAh6n2QeJuuOyUfcbUVT8w+VDq10k8GLKUmP9fWyZ+uIjS?= =?us-ascii?Q?Jgx4b7AER+aHEOmIShvffRER/BQYS99n39jPTwRfP0znMOwowDDUw5b3Tqzu?= =?us-ascii?Q?3jEmyNiQJmtGx2dlZ0Sg9lap7Q95BqL+vdBZ2t+nUjTIngaKwgsQgxO/6l0U?= =?us-ascii?Q?ee1uDGUGozMLzCqWQPKtJiGETOUbD9jZZPCLNGsYV+uumbJ8+9PdMd/b2HH9?= =?us-ascii?Q?IHwa3hVKYeeTGq6N8h1cEOUvVwyv4F2veHMk9YDUNlMwEElIQfgfbKsAM2qT?= =?us-ascii?Q?GKSVPDAO3AjF36FDipqI44Db7NFnu3IvClcsbVnneJDnhkeidvtqOS48TO0W?= =?us-ascii?Q?szxOMLkwfqOX705qSCYNfGtl2uxeALYj64bTCc4xB2oauyNeKMGNPymGJlkl?= =?us-ascii?Q?6IH0s9Sd8RSlLjdMCPc4EAPEXg8Ke1TlqrcNnFC2zBzm0142kRFPkdRC9gfV?= =?us-ascii?Q?aZP3Ex45G9/Ze95AF49VLMg3rldHRfpmc2oW8rPCWVduup6iY9QSoBY7PQaC?= =?us-ascii?Q?9XHXuRq1jjG5kmhDZTHhh9ttEWJfOH5QnJ/EKDAgHRZR+eG75DPNjqKT5Cnx?= =?us-ascii?Q?M0/GR7KksD1ZU58+RPTL5gimcRw+pQVbsP5ULrZYKpSEKs+4QRwW5ftKwqJn?= =?us-ascii?Q?tCjJ3JXZveOTH0S0Lh6hk6kKqQYgbHwZPi4Rz+5XNaC97BmqU/NpsgoIU94c?= =?us-ascii?Q?jvpaJEMHPDgDYpTONhRWk/zuE0GOOunW?= 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:(13230040)(1800799024)(82310400026)(36860700013)(376014); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2024 13:04:22.1565 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f03625b0-a2f0-4d66-b643-08dcbacf48c8 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: SJ5PEPF0000020A.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB7836 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 23.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 08/14/24. 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=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=971d455e59e6b9d225e56722f1e48e5fecb98765 coverity's Thanks. Xueming Li --- >From 971d455e59e6b9d225e56722f1e48e5fecb98765 Mon Sep 17 00:00:00 2001 From: Anatoly Burakov Date: Fri, 12 Jul 2024 12:41:35 +0100 Subject: [PATCH] malloc: fix multi-process wait condition handling Cc: Xueming Li [ upstream commit 429219adab185909a8127e680d19f7628af62fb2 ] >From coverity's point of view, it is theoretically possible to have an infinite wait on a wait condition because while we do check for timeout, we do not check for whether the event we are waiting for has already occurred by the time we get to the first cond_wait call (in this case, it's state of memory request list entry's state being set to COMPLETE). This can't really happen as the only time a wait condition is triggered is when we are receiving a memory event (so the entry we are waiting on cannot change before wait condition is triggered because it's protected by a mutex), so either we receive an event and modify entry state, or we exit wait on a timeout and do not care about request state. However, it's better to keep coverity happy. Coverity issue: 425709 Fixes: 07dcbfe0101f ("malloc: support multiprocess memory hotplug") Signed-off-by: Anatoly Burakov --- lib/eal/common/malloc_mp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/eal/common/malloc_mp.c b/lib/eal/common/malloc_mp.c index 4d62397aba..a704eb01d1 100644 --- a/lib/eal/common/malloc_mp.c +++ b/lib/eal/common/malloc_mp.c @@ -756,7 +756,8 @@ request_to_primary(struct malloc_mp_req *user_req) do { ret = pthread_cond_timedwait(&entry->cond, &mp_request_list.lock, &ts); - } while (ret != 0 && ret != ETIMEDOUT); + } while ((ret != 0 && ret != ETIMEDOUT) && + entry->state == REQ_STATE_ACTIVE); if (entry->state != REQ_STATE_COMPLETE) { RTE_LOG(ERR, EAL, "Request timed out\n"); -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-08-12 20:44:07.047283139 +0800 +++ 0143-malloc-fix-multi-process-wait-condition-handling.patch 2024-08-12 20:44:02.555069385 +0800 @@ -1 +1 @@ -From 429219adab185909a8127e680d19f7628af62fb2 Mon Sep 17 00:00:00 2001 +From 971d455e59e6b9d225e56722f1e48e5fecb98765 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 429219adab185909a8127e680d19f7628af62fb2 ] @@ -21 +23,0 @@ -Cc: stable@dpdk.org @@ -29 +31 @@ -index 2d39b0716f..9765277f5d 100644 +index 4d62397aba..a704eb01d1 100644 @@ -41 +43 @@ - EAL_LOG(ERR, "Request timed out"); + RTE_LOG(ERR, EAL, "Request timed out\n");