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 D664E4301F for ; Thu, 10 Aug 2023 02:00:27 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CB7BA43259; Thu, 10 Aug 2023 02:00:27 +0200 (CEST) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2067.outbound.protection.outlook.com [40.107.244.67]) by mails.dpdk.org (Postfix) with ESMTP id 10F5940DD8 for ; Thu, 10 Aug 2023 02:00:26 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UG05AYK0uDipuiCHB6TCShg4AvA0MDJ1SNVQFvEGNyU6dSC6z5T7mkjDkAZdi82OrIHfsfyBDayVAacYHtzCtq5fmdkwcwpy/uv+k/uT76J2+8RF2VZKPZPjCzIaaX+B4Pgqhfg7MLl+yHf9lTEkbt/k+VwueUnWDp33aPTo/dzeFYZih0ZpxhoydOtmxmr+21+zeUscJMAe5BGd5etHjKff701SA8Oboob+vklQmQw/NUG5bVgFWoZJMoXBf4eJGHa4rllWPzWM9OQOm3yaVxI/Z5lUwXD/Jtxy3/CwLEBC60IJhS+TmQFrYHqnVhcfs1HVrLhAFz8cajprvMzCwA== 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=p+jMtucgJR5gX+UsKFYqoeesBTl8fN+/zhd69+YLW2Q=; b=HLdEiewknMvoFvGmXO+c/RraX7Sn1Yhtl7ohsf3HOxYi8Fo8rgS8sTMEIVqQ70kdA5pluzWGs5Art7PI2H/BaHfgaAfgZN5otEIgysY2RaDwPEYafPGGgnyUAumGj3/N7rog2vjfLavJLeJQjN5UbwlJypC9zn+o7mIG1FqJo6b3/y9kVcIZ41tKgZwjmAWayOf5Pr/8hgnroz11zdZ5jUbAcgvjywyyGH8sFNFOuCs6zaXBgcvYDYUjTY+1N/PM+wN1iZH7AOX9Jp1LUvY08QdU79xxES0Vq98Cv0RteE+U7g417jGfkaoWpPpcXhvsipeoqUbhfFdzhOfaihnTyg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=bytedance.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=p+jMtucgJR5gX+UsKFYqoeesBTl8fN+/zhd69+YLW2Q=; b=qUgSecUpJgIVAhlLUOcXdWUVDdfAZpBJg1oDx7v0FxcnFHlh9KTO2oG1pOwWBDeSH15cpKEJWwqjVfrVO6dUOJn3oTTYnpwleuNB3faf2NymbJoYG3owQ7UKFmp9jqrYzdXq396HfxibfSJ7IsUgCUumlbsQAXQrbCu/Yv/VmaAaIxBRdffRjI9Qbs6oZEWp/Jv0eWXGEc/HYnxkExRCc3KadaEuPawY4sJd7kODyhnFQp1xmcNzDoj98q83H6E5941K97AQNBELSzh1SHv5s6bQsQMOcfgJqLpLLXhcDV1lb7jHqRP6XYwHZLNcNYCSirroE3+FMbkeKI+ZhC2XJw== Received: from MW4PR04CA0084.namprd04.prod.outlook.com (2603:10b6:303:6b::29) by DS7PR12MB8348.namprd12.prod.outlook.com (2603:10b6:8:e5::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.30; Thu, 10 Aug 2023 00:00:18 +0000 Received: from CO1PEPF000042A9.namprd03.prod.outlook.com (2603:10b6:303:6b:cafe::2a) by MW4PR04CA0084.outlook.office365.com (2603:10b6:303:6b::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.30 via Frontend Transport; Thu, 10 Aug 2023 00:00:18 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) 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.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by CO1PEPF000042A9.mail.protection.outlook.com (10.167.243.38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.19 via Frontend Transport; Thu, 10 Aug 2023 00:00:17 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.5; Wed, 9 Aug 2023 17:00:05 -0700 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; Wed, 9 Aug 2023 17:00:03 -0700 From: Xueming Li To: Fengnan Chang CC: Anatoly Burakov , Chengwen Feng , dpdk stable Subject: patch 'mem: fix memsegs exhausted message' has been queued to stable release 22.11.3 Date: Thu, 10 Aug 2023 07:58:35 +0800 Message-ID: <20230809235947.1187-3-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230809235947.1187-1-xuemingl@nvidia.com> References: <20230625063544.11183-1-xuemingl@nvidia.com> <20230809235947.1187-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: CO1PEPF000042A9:EE_|DS7PR12MB8348:EE_ X-MS-Office365-Filtering-Correlation-Id: cbdaf525-6674-4a94-6f0b-08db9934c855 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: OJ7ZhjG/DdQE2pfDgYlOyBZnBAUR4fk4orwB0Qz2FclSf42wiS1YdClg1XCpOq6cBViXk5dOc4+i1vlxtuhHjj7SG2i9F1aZVCJbOiw7k5iGM+rLIS6GgrWpFB8ESW7wdRCewOfHd+6YowMa4irmLj26ArdqFeI/nBDRnMOPQvNQ1BEEZoogYMA9MB1O7WJ3FDJAb+7nXqnFjs856lbsQlFmrdrNJrBkvQuobke8CEsClC83Z3+9TKjxK9EqfnPs8Xt8cTjQ5nGcfF24HP6muaYb46T2s2VOGtyRIzW8yjHHEkC429x9lqW+pm3j1E3eXGhUMPnP8JMJFJ8qQ8zlZZmkVfLuohGxSq612y15DicZcI1Xeuz28NtZDclY2iaVzaOlwofP6RS5XS/zIWvSIelK/xj0HozTfZSbSIaNUjePzrc+g2C6WWwa6MoVTgTSeEUxVUhwFSYeZErN2xheG0dE/Nukkv4pB2kbEHXcLmbQRAg8Pv6UC7UbWdgUxEBgfMeenpTgoOvX+BZm0XtCG3PKYFlKKaajZMxIO+kBxtk3MNW1pOSbf74IlP9/JGcp9PFql3VdALoQNoSQkTKig3jh06KTWAfj5KCATzAT4X7pBopiFltuuTiP3NFfZAQFMCdLO7pZLgMtiYXZhVMJMI9oF6+4WVEWleuyDUCMpMIuPUMSDzaytgXxK0vd6o/NHPq8PN/DOOKDHMmrnuHnO6LBBJV7H3/CxjwzPg+zXjfH7aaBdVSlh21+kFyvGadPWD4wU3NqsJVIQrA1mqBQdQ== X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230028)(4636009)(136003)(376002)(39860400002)(346002)(396003)(451199021)(1800799006)(82310400008)(186006)(40470700004)(46966006)(36840700001)(316002)(336012)(8676002)(8936002)(40460700003)(41300700001)(1076003)(26005)(53546011)(356005)(7636003)(82740400003)(478600001)(36756003)(40480700001)(6916009)(4326008)(55016003)(70586007)(966005)(70206006)(54906003)(6666004)(7696005)(15650500001)(83380400001)(2906002)(426003)(2616005)(47076005)(36860700001)(86362001)(5660300002)(6286002)(16526019); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Aug 2023 00:00:17.9885 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: cbdaf525-6674-4a94-6f0b-08db9934c855 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.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1PEPF000042A9.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR12MB8348 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.3 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/11/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=7e6b4e9d63bc8c3ae31512f8de5a1517e676cc23 Thanks. Xueming Li --- >From 7e6b4e9d63bc8c3ae31512f8de5a1517e676cc23 Mon Sep 17 00:00:00 2001 From: Fengnan Chang Date: Tue, 4 Jul 2023 20:17:51 +0800 Subject: [PATCH] mem: fix memsegs exhausted message Cc: Xueming Li [ upstream commit d93000bb9310685d0df3aa2c11cff3000ed17a82 ] When there is not enough space to memsegs, we should prompt which configuration should be modified instead of printing some numbers. Fixes: dd61b34d580b ("mem: error if requesting more segments than MAX_MEMSEG") Fixes: 66cc45e293ed ("mem: replace memseg with memseg lists") Signed-off-by: Fengnan Chang Acked-by: Anatoly Burakov Acked-by: Chengwen Feng --- lib/eal/common/eal_common_dynmem.c | 6 ++---- lib/eal/freebsd/eal_memory.c | 8 +++----- lib/eal/linux/eal_memory.c | 11 ++++------- 3 files changed, 9 insertions(+), 16 deletions(-) diff --git a/lib/eal/common/eal_common_dynmem.c b/lib/eal/common/eal_common_dynmem.c index 52e52e5986..bdbbe233a0 100644 --- a/lib/eal/common/eal_common_dynmem.c +++ b/lib/eal/common/eal_common_dynmem.c @@ -120,8 +120,7 @@ eal_dynmem_memseg_lists_init(void) max_seglists_per_type = RTE_MAX_MEMSEG_LISTS / n_memtypes; if (max_seglists_per_type == 0) { - RTE_LOG(ERR, EAL, "Cannot accommodate all memory types, please increase %s\n", - RTE_STR(RTE_MAX_MEMSEG_LISTS)); + RTE_LOG(ERR, EAL, "Cannot accommodate all memory types, please increase RTE_MAX_MEMSEG_LISTS\n"); goto out; } @@ -180,8 +179,7 @@ eal_dynmem_memseg_lists_init(void) for (cur_seglist = 0; cur_seglist < n_seglists; cur_seglist++) { if (msl_idx >= RTE_MAX_MEMSEG_LISTS) { RTE_LOG(ERR, EAL, - "No more space in memseg lists, please increase %s\n", - RTE_STR(RTE_MAX_MEMSEG_LISTS)); + "No more space in memseg lists, please increase RTE_MAX_MEMSEG_LISTS\n"); goto out; } msl = &mcfg->memsegs[msl_idx++]; diff --git a/lib/eal/freebsd/eal_memory.c b/lib/eal/freebsd/eal_memory.c index 17ab10e0ca..5c6165c580 100644 --- a/lib/eal/freebsd/eal_memory.c +++ b/lib/eal/freebsd/eal_memory.c @@ -172,9 +172,8 @@ rte_eal_hugepage_init(void) break; } if (msl_idx == RTE_MAX_MEMSEG_LISTS) { - RTE_LOG(ERR, EAL, "Could not find space for memseg. Please increase %s and/or %s in configuration.\n", - RTE_STR(RTE_MAX_MEMSEG_PER_TYPE), - RTE_STR(RTE_MAX_MEM_MB_PER_TYPE)); + RTE_LOG(ERR, EAL, "Could not find space for memseg. Please increase RTE_MAX_MEMSEG_PER_LIST " + "RTE_MAX_MEMSEG_PER_TYPE and/or RTE_MAX_MEM_MB_PER_TYPE in configuration.\n"); return -1; } arr = &msl->memseg_arr; @@ -404,8 +403,7 @@ memseg_primary_init(void) if (msl_idx >= RTE_MAX_MEMSEG_LISTS) { RTE_LOG(ERR, EAL, - "No more space in memseg lists, please increase %s\n", - RTE_STR(RTE_MAX_MEMSEG_LISTS)); + "No more space in memseg lists, please increase RTE_MAX_MEMSEG_LISTS\n"); return -1; } diff --git a/lib/eal/linux/eal_memory.c b/lib/eal/linux/eal_memory.c index 0876974631..9b6f08fba8 100644 --- a/lib/eal/linux/eal_memory.c +++ b/lib/eal/linux/eal_memory.c @@ -716,9 +716,8 @@ remap_segment(struct hugepage_file *hugepages, int seg_start, int seg_end) break; } if (msl_idx == RTE_MAX_MEMSEG_LISTS) { - RTE_LOG(ERR, EAL, "Could not find space for memseg. Please increase %s and/or %s in configuration.\n", - RTE_STR(RTE_MAX_MEMSEG_PER_TYPE), - RTE_STR(RTE_MAX_MEM_MB_PER_TYPE)); + RTE_LOG(ERR, EAL, "Could not find space for memseg. Please increase RTE_MAX_MEMSEG_PER_LIST " + "RTE_MAX_MEMSEG_PER_TYPE and/or RTE_MAX_MEM_MB_PER_TYPE in configuration.\n"); return -1; } @@ -966,8 +965,7 @@ prealloc_segments(struct hugepage_file *hugepages, int n_pages) break; } if (msl_idx == RTE_MAX_MEMSEG_LISTS) { - RTE_LOG(ERR, EAL, "Not enough space in memseg lists, please increase %s\n", - RTE_STR(RTE_MAX_MEMSEG_LISTS)); + RTE_LOG(ERR, EAL, "Not enough space in memseg lists, please increase RTE_MAX_MEMSEG_LISTS\n"); return -1; } @@ -1833,8 +1831,7 @@ memseg_primary_init_32(void) if (msl_idx >= RTE_MAX_MEMSEG_LISTS) { RTE_LOG(ERR, EAL, - "No more space in memseg lists, please increase %s\n", - RTE_STR(RTE_MAX_MEMSEG_LISTS)); + "No more space in memseg lists, please increase RTE_MAX_MEMSEG_LISTS\n"); return -1; } -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-08-09 21:51:19.627711600 +0800 +++ 0056-mem-fix-memsegs-exhausted-message.patch 2023-08-09 21:51:18.204352000 +0800 @@ -1 +1 @@ -From d93000bb9310685d0df3aa2c11cff3000ed17a82 Mon Sep 17 00:00:00 2001 +From 7e6b4e9d63bc8c3ae31512f8de5a1517e676cc23 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit d93000bb9310685d0df3aa2c11cff3000ed17a82 ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org