* [GIT PULL] memblock: updates for 7.4-rc1
@ 2026-10-24 11:21 Mike Rapoport
0 siblings, 0 replies; only message in thread
From: Mike Rapoport @ 2026-10-24 11:21 UTC (permalink / raw)
To: Linus Torvalds
Cc: Mike Rapoport, Andrew Morton, David Hildenbrand, linux-mm, linux-kernel
Hi Linus,
The following changes since commit 6e33dc90df108c76899dc544a42d17adcba61668:
MAINTAINERS: update memblock tree URLs (2026-09-09 20:28:14 +0300)
are available in the Git repository at:
https://git.kernel.org/pub/scm/linux/kernel/git/mm/memblock.git tags/memblock-v7.4-rc1
for you to fetch changes up to 7933ad3f669670ca5f5f13de2b5cb0f92b91abf5:
memblock: use binary search to locate candidate regions (2026-10-15 09:39:37 +0300)
There is a conflict in mm/sparse-vmemmap.c and here is how my resolution shows
up with git diff --cc 17bb0e2f6c804 -- mm/sparse-vmemmap.c:
diff --cc mm/sparse-vmemmap.c
index 5a2469fb1838c,23b31bc4bf94a..0000000000000
--- a/mm/sparse-vmemmap.c
+++ b/mm/sparse-vmemmap.c
@@@ -78,8 -62,7 +62,7 @@@ void __ref *vmemmap_alloc_block(unsigne
}
return NULL;
} else
- return __earlyonly_bootmem_alloc(node, size, size,
- __pa(MAX_DMA_ADDRESS));
- return memmap_alloc(size, size, __pa(MAX_DMA_ADDRESS), node, false);
++ return memmap_alloc(size, size, __pa(MAX_DMA_ADDRESS), node);
}
static void * __meminit altmap_alloc_block_buf(unsigned long size,
----------------------------------------------------------------
memblock: updates for 7.4-rc1
Performance improvement:
* Use binary search in memblock_add_range() and memblock_isolate_range()
Cleanups:
* Several simplifications in memblock and mm_init that remvove redundand
code.
* After rework of sparsemem buffer preallocation, memmap_alloc() does not
require exact_nid parameter. Remove that parameter, drop now unused
memblock_alloc_exact_nid_raw() and ajust memblock tests accordingly.
memblock test updates:
* add coverage for lowmem allocations
* fix 32-bit build warinings
----------------------------------------------------------------
Kaitao Cheng (3):
mm: Remove unused exact_nid parameter from memmap_alloc()
memblock tests: Move exact nid tests to memblock_alloc_range_nid()
memblock: Remove unused memblock_alloc_exact_nid_raw()
Mike Rapoport (Microsoft) (3):
Merge patch series "memblock tests: cover low-address allocations"
Merge patch series "memblock tests: fix BUILD=32 address conversions and warnings"
Merge patch series "memblock: Remove unused exact nid allocation API"
Sang-Heon Jeon (4):
memblock: simplify reset_all_zones_managed_pages()
memblock: remove conditional return with no effect
mm/mm_init: remove zone_absent_pages_in_node()
memblock: reject non-page-aligned reserve_mem regions
Tarun Sahu (2):
memblock: drop for_each_memblock_type() and open code its users
memblock: use binary search to locate candidate regions
Tianyi Chen (6):
memblock tests: model the low allocation limit within dummy memory
memblock tests: cover allocations below the low address limit
memblock tests: use physical addresses for region removal
memblock tests: zero-extend simulated memory addresses
tools: use __pa() in virt_to_phys()
memblock: initialize the region merge end index
Documentation/admin-guide/kernel-parameters.txt | 3 +
include/linux/memblock.h | 4 -
mm/memblock.c | 127 +++---
mm/mm_init.c | 38 +-
mm/mm_init.h | 4 +-
mm/sparse-vmemmap.c | 17 +-
mm/sparse.c | 2 +-
tools/include/linux/mm.h | 2 +-
tools/testing/memblock/Makefile | 3 +-
tools/testing/memblock/README | 12 +-
tools/testing/memblock/TODO | 5 -
tools/testing/memblock/asm/dma.h | 6 +
tools/testing/memblock/main.c | 2 +
tools/testing/memblock/tests/alloc_exact_nid_api.c | 454 ++-------------------
tools/testing/memblock/tests/alloc_low_api.c | 148 +++++++
tools/testing/memblock/tests/alloc_low_api.h | 9 +
tools/testing/memblock/tests/alloc_nid_api.c | 20 -
tools/testing/memblock/tests/alloc_nid_api.h | 1 -
tools/testing/memblock/tests/basic_api.c | 20 +-
tools/testing/memblock/tests/common.c | 12 +-
tools/testing/memblock/tests/common.h | 2 -
21 files changed, 294 insertions(+), 597 deletions(-)
delete mode 100644 tools/testing/memblock/TODO
create mode 100644 tools/testing/memblock/tests/alloc_low_api.c
create mode 100644 tools/testing/memblock/tests/alloc_low_api.h
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2026-10-24 11:21 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-10-24 11:21 [GIT PULL] memblock: updates for 7.4-rc1 Mike Rapoport
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®