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 26BA942ECF for ; Thu, 20 Jul 2023 17:24:07 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 22C0440685; Thu, 20 Jul 2023 17:24:07 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 1A14D400D6 for ; Thu, 20 Jul 2023 17:24:05 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689866644; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fXkAQd7M4nOoAkBaLLOpScZFq1GYBCqZZ6ZSQSlORb4=; b=frD+iK9Zm8mrwX7o6R9SyW6hbiI57IQCKQUiLlmOjqMsIscVHEZBS3CH7zR8wbJVuuuyP/ AJXyYfZ3c9wVfzJRluGXyyCTsFcyQ+zXgPe8mMxTWSI2FnUoy2cJ/izNKlcOxMJFWYOD5I foFgKSHEM6l7TnxvaAezGiobcnRTgtg= Received: from mimecast-mx02.redhat.com (66.187.233.73 [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-480-qYsNsfQWPRqMby6Rqz05dA-1; Thu, 20 Jul 2023 11:21:36 -0400 X-MC-Unique: qYsNsfQWPRqMby6Rqz05dA-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id EE3653811F45; Thu, 20 Jul 2023 15:20:26 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id AD5FB492C13; Thu, 20 Jul 2023 15:20:25 +0000 (UTC) From: Kevin Traynor To: Fengnan Chang Cc: Lin Li , Anatoly Burakov , dpdk stable Subject: patch 'eal/linux: fix legacy mem init with many segments' has been queued to stable release 21.11.5 Date: Thu, 20 Jul 2023 16:17:32 +0100 Message-ID: <20230720151942.262154-21-ktraynor@redhat.com> In-Reply-To: <20230720151942.262154-1-ktraynor@redhat.com> References: <20230720151942.262154-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 21.11.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/25/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://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/b75ffdb751b64c23df0ba28ff13e512d112c8f84 Thanks. Kevin --- >From b75ffdb751b64c23df0ba28ff13e512d112c8f84 Mon Sep 17 00:00:00 2001 From: Fengnan Chang Date: Mon, 29 May 2023 19:21:30 +0800 Subject: [PATCH] eal/linux: fix legacy mem init with many segments [ upstream commit 51a5a72e2a82986b02244fcdd89c6571bc503de3 ] Under legacy mode, if the number of continuous memsegs greater than RTE_MAX_MEMSEG_PER_LIST, eal init will failed even though another memseg list is empty, because only one memseg list used to check in remap_needed_hugepages. Fix this by make remap_segment return how many segments mapped, remap_segment try to map most contiguous segments it can, if it exceed its capacity, remap_needed_hugepages will continue to map other left pages. For example: hugepage configure: cat /sys/devices/system/node/node*/hugepages/hugepages-2048kB/nr_hugepages 10241 10239 startup log: EAL: Detected memory type: socket_id:0 hugepage_sz:2097152 EAL: Detected memory type: socket_id:1 hugepage_sz:2097152 EAL: Creating 4 segment lists: n_segs:8192 socket_id:0 hugepage_sz:2097152 EAL: Creating 4 segment lists: n_segs:8192 socket_id:1 hugepage_sz:2097152 EAL: Requesting 13370 pages of size 2MB from socket 0 EAL: Requesting 7110 pages of size 2MB from socket 1 EAL: Attempting to map 14220M on socket 1 EAL: Allocated 14220M on socket 1 EAL: Attempting to map 26740M on socket 0 EAL: Could not find space for memseg. Please increase 32768 and/or 65536 in configuration. EAL: Couldn't remap hugepage files into memseg lists EAL: FATAL: Cannot init memory EAL: Cannot init memory Fixes: 66cc45e293ed ("mem: replace memseg with memseg lists") Signed-off-by: Fengnan Chang Signed-off-by: Lin Li Reviewed-by: Anatoly Burakov --- .mailmap | 2 +- lib/eal/linux/eal_memory.c | 51 +++++++++++++++++++++++++++----------- 2 files changed, 37 insertions(+), 16 deletions(-) diff --git a/.mailmap b/.mailmap index c94dacfdb1..575405b454 100644 --- a/.mailmap +++ b/.mailmap @@ -760,5 +760,5 @@ Linfan Hu Lingli Chen Lingyu Liu -Lin Li +Lin Li Linsi Yuan Lior Margalit diff --git a/lib/eal/linux/eal_memory.c b/lib/eal/linux/eal_memory.c index fda6a159d5..3bd0bc17c5 100644 --- a/lib/eal/linux/eal_memory.c +++ b/lib/eal/linux/eal_memory.c @@ -687,4 +687,5 @@ remap_segment(struct hugepage_file *hugepages, int seg_start, int seg_end) /* find free space in memseg lists */ for (msl_idx = 0; msl_idx < RTE_MAX_MEMSEG_LISTS; msl_idx++) { + int free_len; bool empty; msl = &mcfg->memsegs[msl_idx]; @@ -698,16 +699,24 @@ remap_segment(struct hugepage_file *hugepages, int seg_start, int seg_end) /* leave space for a hole if array is not empty */ empty = arr->count == 0; - ms_idx = rte_fbarray_find_next_n_free(arr, 0, - seg_len + (empty ? 0 : 1)); - - /* memseg list is full? */ + /* find start of the biggest contiguous block and its size */ + ms_idx = rte_fbarray_find_biggest_free(arr, 0); if (ms_idx < 0) continue; - + /* hole is 1 segment long, so at least two segments long. */ + free_len = rte_fbarray_find_contig_free(arr, ms_idx); + if (free_len < 2) + continue; /* leave some space between memsegs, they are not IOVA * contiguous, so they shouldn't be VA contiguous either. */ - if (!empty) + if (!empty) { ms_idx++; + free_len--; + } + + /* we might not get all of the space we wanted */ + free_len = RTE_MIN(seg_len, free_len); + seg_end = seg_start + free_len; + seg_len = seg_end - seg_start; break; } @@ -793,5 +802,5 @@ remap_segment(struct hugepage_file *hugepages, int seg_start, int seg_end) RTE_LOG(DEBUG, EAL, "Allocated %" PRIu64 "M on socket %i\n", (seg_len * page_sz) >> 20, socket_id); - return 0; + return seg_len; } @@ -1028,8 +1037,14 @@ remap_needed_hugepages(struct hugepage_file *hugepages, int n_pages) /* if this isn't the first time, remap segment */ if (cur_page != 0) { - ret = remap_segment(hugepages, seg_start_page, - cur_page); - if (ret != 0) - return -1; + int n_remapped = 0; + int n_needed = cur_page - seg_start_page; + while (n_remapped < n_needed) { + ret = remap_segment(hugepages, seg_start_page, + cur_page); + if (ret < 0) + return -1; + n_remapped += ret; + seg_start_page += ret; + } } /* remember where we started */ @@ -1040,8 +1055,14 @@ remap_needed_hugepages(struct hugepage_file *hugepages, int n_pages) /* we were stopped, but we didn't remap the last segment, do it now */ if (cur_page != 0) { - ret = remap_segment(hugepages, seg_start_page, - cur_page); - if (ret != 0) - return -1; + int n_remapped = 0; + int n_needed = cur_page - seg_start_page; + while (n_remapped < n_needed) { + ret = remap_segment(hugepages, seg_start_page, + cur_page); + if (ret < 0) + return -1; + n_remapped += ret; + seg_start_page += ret; + } } return 0; -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-07-20 16:17:57.687115271 +0100 +++ 0021-eal-linux-fix-legacy-mem-init-with-many-segments.patch 2023-07-20 16:17:54.476749752 +0100 @@ -1 +1 @@ -From 51a5a72e2a82986b02244fcdd89c6571bc503de3 Mon Sep 17 00:00:00 2001 +From b75ffdb751b64c23df0ba28ff13e512d112c8f84 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 51a5a72e2a82986b02244fcdd89c6571bc503de3 ] + @@ -38 +39,0 @@ -Cc: stable@dpdk.org @@ -49 +50 @@ -index 13167dc28b..853a89e9a4 100644 +index c94dacfdb1..575405b454 100644 @@ -52 +53 @@ -@@ -767,5 +767,5 @@ Linfan Hu +@@ -760,5 +760,5 @@ Linfan Hu @@ -60 +61 @@ -index 60fc8cc6ca..0876974631 100644 +index fda6a159d5..3bd0bc17c5 100644 @@ -63 +64 @@ -@@ -682,4 +682,5 @@ remap_segment(struct hugepage_file *hugepages, int seg_start, int seg_end) +@@ -687,4 +687,5 @@ remap_segment(struct hugepage_file *hugepages, int seg_start, int seg_end) @@ -69 +70 @@ -@@ -693,16 +694,24 @@ remap_segment(struct hugepage_file *hugepages, int seg_start, int seg_end) +@@ -698,16 +699,24 @@ remap_segment(struct hugepage_file *hugepages, int seg_start, int seg_end) @@ -100 +101 @@ -@@ -788,5 +797,5 @@ remap_segment(struct hugepage_file *hugepages, int seg_start, int seg_end) +@@ -793,5 +802,5 @@ remap_segment(struct hugepage_file *hugepages, int seg_start, int seg_end) @@ -107 +108 @@ -@@ -1023,8 +1032,14 @@ remap_needed_hugepages(struct hugepage_file *hugepages, int n_pages) +@@ -1028,8 +1037,14 @@ remap_needed_hugepages(struct hugepage_file *hugepages, int n_pages) @@ -126 +127 @@ -@@ -1035,8 +1050,14 @@ remap_needed_hugepages(struct hugepage_file *hugepages, int n_pages) +@@ -1040,8 +1055,14 @@ remap_needed_hugepages(struct hugepage_file *hugepages, int n_pages)