From: Greg Kroah-Hartman Date: Tue, 10 Dec 2024 10:25:55 +0000 (+0100) Subject: 6.12-stable patches X-Git-Tag: v6.6.65~12 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bb48f8213ba14046e63fe40e3968cfc008848d37;p=thirdparty%2Fkernel%2Fstable-queue.git 6.12-stable patches added patches: memblock-allow-zero-threshold-in-validate_numa_converage.patch --- diff --git a/queue-6.12/memblock-allow-zero-threshold-in-validate_numa_converage.patch b/queue-6.12/memblock-allow-zero-threshold-in-validate_numa_converage.patch new file mode 100644 index 00000000000..7862ca36be5 --- /dev/null +++ b/queue-6.12/memblock-allow-zero-threshold-in-validate_numa_converage.patch @@ -0,0 +1,42 @@ +From 9cdc6423acb49055efb444ecd895d853a70ef931 Mon Sep 17 00:00:00 2001 +From: "Mike Rapoport (Microsoft)" +Date: Fri, 29 Nov 2024 11:13:47 +0200 +Subject: memblock: allow zero threshold in validate_numa_converage() + +From: Mike Rapoport (Microsoft) + +commit 9cdc6423acb49055efb444ecd895d853a70ef931 upstream. + +Currently memblock validate_numa_converage() returns false negative when +threshold set to zero. + +Make the check if the memory size with invalid node ID is greater than +the threshold exclusive to fix that. + +Link: https://lore.kernel.org/all/Z0mIDBD4KLyxyOCm@kernel.org/ +Signed-off-by: Mike Rapoport (Microsoft) +Signed-off-by: Greg Kroah-Hartman +--- + mm/memblock.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/mm/memblock.c ++++ b/mm/memblock.c +@@ -735,7 +735,7 @@ int __init_memblock memblock_add(phys_ad + /** + * memblock_validate_numa_coverage - check if amount of memory with + * no node ID assigned is less than a threshold +- * @threshold_bytes: maximal number of pages that can have unassigned node ++ * @threshold_bytes: maximal memory size that can have unassigned node + * ID (in bytes). + * + * A buggy firmware may report memory that does not belong to any node. +@@ -755,7 +755,7 @@ bool __init_memblock memblock_validate_n + nr_pages += end_pfn - start_pfn; + } + +- if ((nr_pages << PAGE_SHIFT) >= threshold_bytes) { ++ if ((nr_pages << PAGE_SHIFT) > threshold_bytes) { + mem_size_mb = memblock_phys_mem_size() >> 20; + pr_err("NUMA: no nodes coverage for %luMB of %luMB RAM\n", + (nr_pages << PAGE_SHIFT) >> 20, mem_size_mb); diff --git a/queue-6.12/series b/queue-6.12/series index 04e9103c49b..cc3dce141e4 100644 --- a/queue-6.12/series +++ b/queue-6.12/series @@ -216,3 +216,4 @@ mm-open-code-page_folio-in-dump_page.patch mm-fix-vrealloc-s-kasan-poisoning-logic.patch mm-respect-mmap-hint-address-when-aligning-for-thp.patch scsi-ufs-pltfrm-drop-pm-runtime-reference-count-after-ufshcd_remove.patch +memblock-allow-zero-threshold-in-validate_numa_converage.patch