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 2387D4625C for ; Tue, 18 Feb 2025 13:39:08 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1F595402E5; Tue, 18 Feb 2025 13:39:08 +0100 (CET) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2046.outbound.protection.outlook.com [40.107.93.46]) by mails.dpdk.org (Postfix) with ESMTP id DFA1C402E1 for ; Tue, 18 Feb 2025 13:39:06 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=TKPjhrM8wU/OnbdSTKivPgZ4LZ+5gBFq0xUl+Omi7Vb8CiZbncRxnZIy5xJP71xmZyVWbNFfXQKooUQXBAR9wBrioj7TDI4RSkVAEHUXepIhnIyvvphzHWji2NbwL1TaUKKf2diHACUykkSC3egj5Dr2AusAmruUxuCyTjUF6w+nhvGAaVcSuKUSt3Tp3cPi3ZUQ/UgRF5PHtdZsjARHYbUJcyUmG+QtgxUTCbl43JaSwCbn0TfYbpMmPfUm+V/Jir2Oaf647PttNMh4IxKwGYsx2LxIjrW8Vrs56ppdFb/lJ5hk0jgpcFsT1NRaqyE3/pLsSQ9wcxP5KocbkE5w7g== 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=SPCyx2nggvXeMt9xwdpSlK4UjQTQA6v+b4ccfG8xXUU=; b=egORvhcAcZYNOthOTK+9RT8WyXP8wbkN2U7GK4mBeLIOmcdiO11frn6jZfSbzGmTZb6VrceOZac3FsTTW1QBOY6iNDtZc65f+u3PGpkYFrE3YLqctDJypQQ1Oegtv/LqRzy+/PCfS6xITbFwoEg738A38AiPxk01egPfpDoSg8cJmCiSPQX4L7BW5WKlkpQtBYq13iS6k/AGCV9uAEytuVxkLobe5ulP9Wr5H/nZz+qJyfsZzcP2N8ReRf3AYCsr4sz14xk7ljiBiEhH/Bo9Um9M+U+Y1CsiSlBCWQOrUzKIfYP12vWKHwAOypbC+jIUOmBP49IdpXpx1zN6qysd3w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=nokia-sbell.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=SPCyx2nggvXeMt9xwdpSlK4UjQTQA6v+b4ccfG8xXUU=; b=W57MrPGCt3vkG5zlcFyVnn77K7V9S/KVrURmiN6rTbMrSP1/3jLobMhr04jFS/Zwdj30rP4v4KBMf+3O5LfzpndAtQ5+/ErXaVSUhqiRcQXyIq9NgCCW1V14I42CMYz0xqDWryb76ATwJqGJhOPkudIHuzNtvrkjRbl+hCi1UvyQvTxR7GZi12gi0LnKsdMSX9rIBM6M0MmboD4Gv//y/E2xKslBxnoMLZ7TOgkcIa/WVNVGDTCSg3XUgrPOP0T6rLPJhEdkK/WTj/q2gXHGoMiOW0eApbUDlrtULTTWrD00ePbFhFkaqXL+fYIlWYYyxihgTIdaKsQcQbgwa59bPQ== Received: from MN2PR11CA0014.namprd11.prod.outlook.com (2603:10b6:208:23b::19) by MW6PR12MB9000.namprd12.prod.outlook.com (2603:10b6:303:24b::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.11; Tue, 18 Feb 2025 12:39:04 +0000 Received: from BN3PEPF0000B06F.namprd21.prod.outlook.com (2603:10b6:208:23b:cafe::6f) by MN2PR11CA0014.outlook.office365.com (2603:10b6:208:23b::19) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8445.19 via Frontend Transport; Tue, 18 Feb 2025 12:39:03 +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 BN3PEPF0000B06F.mail.protection.outlook.com (10.167.243.74) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8489.2 via Frontend Transport; Tue, 18 Feb 2025 12:39:01 +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; Tue, 18 Feb 2025 04:38:51 -0800 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.14; Tue, 18 Feb 2025 04:38:49 -0800 From: Xueming Li To: Yang Ming CC: , Dmitry Kozlyuk , "dpdk stable" Subject: patch 'eal/linux: fix memseg length in legacy mem init' has been queued to stable release 23.11.4 Date: Tue, 18 Feb 2025 20:34:27 +0800 Message-ID: <20250218123523.36836-33-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250218123523.36836-1-xuemingl@nvidia.com> References: <20250218123523.36836-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit 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: BN3PEPF0000B06F:EE_|MW6PR12MB9000:EE_ X-MS-Office365-Filtering-Correlation-Id: 4f1da3ab-1027-49af-59a0-08dd50193924 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|376014|36860700013|82310400026|7053199007; X-Microsoft-Antispam-Message-Info: =?utf-8?B?c0djMGNPMmJOSXJxV3NpM3IvanY0K3NvR0tXMitwYkw3MHNYMEhXQXRGLzFh?= =?utf-8?B?aU9SOVVnSTV2RWZlNTlCcEF0NU5WWWRDMitQQzA5bE1zdjR5dFVReGg3ZDFa?= =?utf-8?B?N0U4T0NwSUdyd0Y3NHgwL0dFYytUS2xYWXFqS1ZWS3JmRlE5Q2dqUTBVVmgr?= =?utf-8?B?cS9ZSkpoeXJrdnJId1BYRzJtaVFwOVNHM0d0NThZb2c5WXNyWEV2cHAvaERH?= =?utf-8?B?VnF5U3BIUDJpa3lldkF4TWxsU0lKZHZPdXg0aDk4NnJLSEYyU284dGNDU252?= =?utf-8?B?U1g4eVFBWXoxMlFMOTZ6eStPNHFUaURDZGhmVlV1dHVQQzNoMHRMRHVqcGpZ?= =?utf-8?B?czdva1VncnB6bm1kb1lGOTJaYUR4UUVoMUR6OGIwWXp3WlY5aUc2Nk0rN0pn?= =?utf-8?B?endhOFBYV2hwSDlETUlPekFxNGZCc3lCUWhpV1NBUEZoMFFqNTZ4SHA1djgr?= =?utf-8?B?TXNZb2pMUmt5c1YvSEN2dXRxUmNCZlRnWHNZejVZT0QxNW1XWUlMZGJqVytM?= =?utf-8?B?bnVJc2tPbFdaMGJVVTVPKzRUcndBTmJPK1BaNUd5T2ZmUnBMRGFCRUxDYkxq?= =?utf-8?B?aTh1MWV4anhYQVRrU2FKOUJjUTh3V3ZramJDdkxIUnFiajRKNUxPazNLRTRI?= =?utf-8?B?a2plOGhyMnFMa25PLzExTVZNSENGRlQ4L1FMa0wvekI0NmxGcGdRMHZuTnJp?= =?utf-8?B?MnhjWnp0eDVoUU8zR2ROUHFrNVFUcXNaWDhaNytWVkVxbFNLaGZLVnh4dDdQ?= =?utf-8?B?UlFzcGlpSjdUNGdmQlJhd0cxR0FmdEhpZ0xSV0lzUGVXRk44ZElNZlhpVTZW?= =?utf-8?B?RkJHMUwyem1ZSW9ra3Rna05PVE5FQ2QxSlNlT09hVFV5QWM0UUpsbkpsVzd4?= =?utf-8?B?VHM0UVNUWkFFNGtqSi9OUXkwR2dYbXJ2ajZUMzZrbzdiSWtrRjBIZDQ0UllC?= =?utf-8?B?eWpMMEFmdkoyUTN4c01zZmhIMEVkZTJUT21TQml4UUFzWkNNSHlCMDhCaVk5?= =?utf-8?B?dWI1UkNhU0Q2SXFLbW80aVhCcjFCWDRPbmpGTmVDZVk2MlZtNmZoYmFVODVX?= =?utf-8?B?clUxR1hYMDlabmxpR3FTVUxWNDYrV29QZkFGTFhzbG5CRWpwSUFqVFA3WU1S?= =?utf-8?B?T1VvSU1rTXhBeHd6WEJXbmtSaGV0UlgwNlBtckNRMEZRTFJ0MlhwVWwzWXJj?= =?utf-8?B?NXdYd0d4ZUh3ZHU1K1BoTVBBdGp0RVVVU09TRzlOb1hQV3JLNHBYazJTS2lE?= =?utf-8?B?U0NNeHVWT2FDYXdDQk9xd1ZJVkI1QWo5MXpDNzFKc2NZalNyMWdEdU9LY01F?= =?utf-8?B?aWMrL3lKbGl4NnVUOCtUWGZvdCswWEFSY0paa2Ird0JFTng2THhBMjJSK1Bj?= =?utf-8?B?K0NDOVRWNE9lZldLNENvcGc0ZEdDMTF3eHRvUFQ3QVI0WlczSnErVWhOT2d4?= =?utf-8?B?bER1Ym1TYURzQ29uVUVKMUNXOHJEQVo2ekh5T3lmNHliQ1BKdkoyQ3pyWUxF?= =?utf-8?B?bWtKb2tJVmRTdDJYcnhQcXo4RU5CaFlQOHgzZFprTmJoODJyd2c4RHMrTkdB?= =?utf-8?B?cVZkM25ML0JJaXNaTGVPb0ZTU0ladEREWWFSSnhMRnU3NEtkeTJHR2dEcC9t?= =?utf-8?B?d0FMZExKRTFNVXRwOVl2dTAzV05ocWUxdEpDK2V4R2lZd3gxSXhaaHNnRWQv?= =?utf-8?B?Y1NqM0JVNVYzUFc0dldOakJrRktQM1VRTjQxaHRodVZBbks4b1BJaktRVnBh?= =?utf-8?B?V1BlZ2FHbkY3VDQ1bUNqWXhoS0dTd0VEUnNvQXBEcXdsMlY0citFa2gvYmUx?= =?utf-8?B?NklpcjNlUUxxMVE1MEV0K096bXlaVjE3Q3h5UUE1U0pmZjY3L3BrSm1KNTQx?= =?utf-8?B?UmhuS1ZkQXJmemovR1NJeFBVbUtUOVR0eVFoSlJlRjI1ZkdrRDVGZG5SSWJG?= =?utf-8?B?S2hiWGIxbUlzbk5wTGxnSTVoSDJTM1pLZlpKMnpCTnJja2FacDFZY1JoL3BR?= =?utf-8?Q?ZfIDS4DhuqHtF5Ev2xNHSLq84kbP54=3D?= 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)(376014)(36860700013)(82310400026)(7053199007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Feb 2025 12:39:01.7535 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4f1da3ab-1027-49af-59a0-08dd50193924 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: BN3PEPF0000B06F.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW6PR12MB9000 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.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. 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=a242697f142110e44ed2c17385bd138993e585e8 Thanks. Xueming Li --- >From a242697f142110e44ed2c17385bd138993e585e8 Mon Sep 17 00:00:00 2001 From: Yang Ming Date: Thu, 2 Jan 2025 16:58:38 +0800 Subject: [PATCH] eal/linux: fix memseg length in legacy mem init MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Xueming Li [ upstream commit b974cbbbef6e1036e7ed7d19fefb7ef8cda0e4a1 ] Fix the issue where OS memory is mistakenly freed with rte_free by setting the length (len) of unused memseg to 0. When `eal_legacy_hugepage_init()` releases the VA space for unused memseg lists(MSLs), it does not reset MSLs' length to 0. As a result, `mlx5_mem_is_rte()` may incorrectly identify OS memory as rte memory. This can lead to `mlx_free()` calling `rte_free()` on OS memory, causing an "EAL: Error: Invalid memory" log and failing to free the OS memory. This issue is occasional and occurs when the DPDK program’s memory map places the heap address range between 0 and len(32G). In such cases, malloc may return an address less than len, causing `mlx5_mem_is_rte()` to incorrectly treat it as rte memory. Also, consider how the MSL with `base_va == NULL` ends up in `mlx5_mem_is_rte()`. It comes from `rte_mem_virt2memseg_list()` which iterates MSLs and checks that an address belongs to [`base_va`; `base_va+len`) without checking whether `base_va == NULL` i.e. that the MSL is inactive. So this patch also corrects `rte_mem_virt2memseg_list()` behavior. Fixes: 66cc45e293ed ("mem: replace memseg with memseg lists") Signed-off-by: Yang Ming Acked-by: Dmitry Kozlyuk --- .mailmap | 1 + lib/eal/linux/eal_memory.c | 1 + 2 files changed, 2 insertions(+) diff --git a/.mailmap b/.mailmap index 658de81358..60eac79c6b 100644 --- a/.mailmap +++ b/.mailmap @@ -1630,6 +1630,7 @@ Yahui Cao Yajun Wu Yangchao Zhou Yanglong Wu +Yang Ming Yang Zhang Yanjie Xu Yan Xia diff --git a/lib/eal/linux/eal_memory.c b/lib/eal/linux/eal_memory.c index 9b6f08fba8..077f77d406 100644 --- a/lib/eal/linux/eal_memory.c +++ b/lib/eal/linux/eal_memory.c @@ -1472,6 +1472,7 @@ eal_legacy_hugepage_init(void) mem_sz = msl->len; munmap(msl->base_va, mem_sz); msl->base_va = NULL; + msl->len = 0; msl->heap = 0; /* destroy backing fbarray */ -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-18 19:39:01.893148730 +0800 +++ 0032-eal-linux-fix-memseg-length-in-legacy-mem-init.patch 2025-02-18 19:39:00.528244065 +0800 @@ -1 +1 @@ -From b974cbbbef6e1036e7ed7d19fefb7ef8cda0e4a1 Mon Sep 17 00:00:00 2001 +From a242697f142110e44ed2c17385bd138993e585e8 Mon Sep 17 00:00:00 2001 @@ -7,0 +8,3 @@ +Cc: Xueming Li + +[ upstream commit b974cbbbef6e1036e7ed7d19fefb7ef8cda0e4a1 ] @@ -34 +36,0 @@ -Cc: stable@dpdk.org @@ -44 +46 @@ -index 9209a716e0..19bbdbc0c8 100644 +index 658de81358..60eac79c6b 100644 @@ -47 +49 @@ -@@ -1722,6 +1722,7 @@ Yahui Cao +@@ -1630,6 +1630,7 @@ Yahui Cao @@ -56 +58 @@ -index 45879ca743..9dda60c0e1 100644 +index 9b6f08fba8..077f77d406 100644