Skip to content

Refine memblock API

Mike Rapoport linux-alpha linux-arm-kernel linux-devicetree linux-ia64 linux-mips linux-mm linux-s390 linux-sh linux-snps-arc linux-um linux-usb linuxppc-dev lkml openrisc sparclinux xen-devel 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest21 patches 26 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/21openrisc: prefer memblock APIs returning virtual addressarch/openrisc/mm/init.c+4 -10 replies
1/21openrisc: prefer memblock APIs returning virtual addressarch/openrisc/mm/init.c+4 -10 replies
2/21powerpc: use memblock functions returning virtual addressarch/powerpc/kernel/dt_cpu_ftrs.c arch/powerpc/kernel/irq.c arch/powerpc/kernel/paca.c +2 more+26 -190 replies
3/21memblock: replace memblock_alloc_base(ANYWHERE) with memblock_phys_allocarch/arm/mm/init.c arch/sh/boards/mach-ap325rxa/setup.c arch/sh/boards/mach-ecovec24/setup.c +4 more+9 -100 replies
3/21memblock: replace memblock_alloc_base(ANYWHERE) with memblock_phys_allocarch/arm/mm/init.c arch/sh/boards/mach-ap325rxa/setup.c arch/sh/boards/mach-ecovec24/setup.c +4 more+9 -100 replies
4/21memblock: drop memblock_alloc_base_nid()include/linux/memblock.h mm/memblock.c+4 -140 replies
4/21memblock: drop memblock_alloc_base_nid()include/linux/memblock.h mm/memblock.c+4 -140 replies
5/21memblock: emphasize that memblock_alloc_range() returns a physical addressinclude/linux/memblock.h mm/cma.c mm/memblock.c+11 -130 replies
5/21memblock: emphasize that memblock_alloc_range() returns a physical addressinclude/linux/memblock.h mm/cma.c mm/memblock.c+11 -130 replies
6/21memblock: memblock_phys_alloc_try_nid(): don't panicarch/arm64/mm/numa.c arch/powerpc/mm/numa.c mm/memblock.c+11 -10 replies
6/21memblock: memblock_phys_alloc_try_nid(): don't panicarch/arm64/mm/numa.c arch/powerpc/mm/numa.c mm/memblock.c+11 -10 replies
7/21memblock: memblock_phys_alloc(): don't panicarch/arm/mm/init.c arch/arm64/mm/mmu.c arch/powerpc/sysdev/dart_iommu.c +10 more+45 -60 replies
7/21memblock: memblock_phys_alloc(): don't panicarch/arm/mm/init.c arch/arm64/mm/mmu.c arch/powerpc/sysdev/dart_iommu.c +10 more+45 -60 replies
8/21memblock: drop __memblock_alloc_base()arch/sh/kernel/machine_kexec.c arch/x86/kernel/e820.c arch/x86/mm/numa.c +3 more+11 -242 replies
8/21memblock: drop __memblock_alloc_base()arch/sh/kernel/machine_kexec.c arch/x86/kernel/e820.c arch/x86/mm/numa.c +3 more+11 -240 replies
9/21memblock: drop memblock_alloc_base()arch/powerpc/kernel/rtas.c arch/powerpc/mm/hash_utils_64.c arch/s390/kernel/smp.c +3 more+17 -210 replies
10/21memblock: refactor internal allocation functionsinclude/linux/memblock.h mm/memblock.c+78 -960 replies
10/21memblock: refactor internal allocation functionsinclude/linux/memblock.h mm/memblock.c+78 -960 replies
11/21memblock: make memblock_find_in_range_node() and choose_memblock_flags() staticinclude/linux/memblock.h mm/memblock.c+2 -60 replies
12/21arch: use memblock_alloc() instead of memblock_alloc_from(size, align, 0)arch/alpha/kernel/core_cia.c arch/alpha/kernel/pci_iommu.c arch/alpha/kernel/setup.c +5 more+13 -142 replies
12/21arch: use memblock_alloc() instead of memblock_alloc_from(size, align, 0)arch/alpha/kernel/core_cia.c arch/alpha/kernel/pci_iommu.c arch/alpha/kernel/setup.c +5 more+13 -140 replies
13/21arch: don't memset(0) memory returned by memblock_alloc()arch/c6x/mm/init.c arch/h8300/mm/init.c arch/ia64/kernel/mca.c +3 more+2 -112 replies
13/21arch: don't memset(0) memory returned by memblock_alloc()arch/c6x/mm/init.c arch/h8300/mm/init.c arch/ia64/kernel/mca.c +3 more+2 -110 replies
14/21ia64: add checks for the return value of memblock_alloc*()arch/ia64/kernel/mca.c arch/ia64/mm/contig.c arch/ia64/mm/discontig.c +4 more+74 -170 replies
14/21ia64: add checks for the return value of memblock_alloc*()arch/ia64/kernel/mca.c arch/ia64/mm/contig.c arch/ia64/mm/discontig.c +4 more+74 -170 replies
15/21sparc: add checks for the return value of memblock_alloc*()arch/sparc/kernel/prom_32.c arch/sparc/kernel/setup_64.c arch/sparc/kernel/smp_64.c +2 more+39 -02 replies
15/21sparc: add checks for the return value of memblock_alloc*()arch/sparc/kernel/prom_32.c arch/sparc/kernel/setup_64.c arch/sparc/kernel/smp_64.c +2 more+39 -00 replies
16/21mm/percpu: add checks for the return value of memblock_alloc*()mm/percpu.c+56 -170 replies
16/21mm/percpu: add checks for the return value of memblock_alloc*()mm/percpu.c+56 -170 replies
17/21init/main: add checks for the return value of memblock_alloc*()init/main.c+20 -60 replies
17/21init/main: add checks for the return value of memblock_alloc*()init/main.c+20 -60 replies
18/21swiotlb: add checks for the return value of memblock_alloc*()kernel/dma/swiotlb.c+13 -60 replies
18/21swiotlb: add checks for the return value of memblock_alloc*()kernel/dma/swiotlb.c+13 -60 replies
19/21treewide: add checks for the return value of memblock_alloc*()arch/alpha/kernel/core_cia.c arch/alpha/kernel/core_marvel.c arch/alpha/kernel/pci-noop.c +71 more+415 -2914 replies
19/21treewide: add checks for the return value of memblock_alloc*()arch/alpha/kernel/core_cia.c arch/alpha/kernel/core_marvel.c arch/alpha/kernel/pci-noop.c +71 more+415 -290 replies
20/21memblock: memblock_alloc_try_nid: don't panicmm/memblock.c+5 -100 replies
20/21memblock: memblock_alloc_try_nid: don't panicmm/memblock.c+5 -100 replies
21/21memblock: drop memblock_alloc_*_nopanic() variantsarch/arc/kernel/unwind.c arch/sh/mm/init.c arch/x86/kernel/setup_percpu.c +11 more+37 -1144 replies
21/21memblock: drop memblock_alloc_*_nopanic() variantsarch/arc/kernel/unwind.c arch/sh/mm/init.c arch/x86/kernel/setup_percpu.c +11 more+37 -1140 replies

Reviews trailers per patch

12 of 39 patches have a Reviewed-by or Acked-by.

PatchGeert UytterhoevenJuergen GrossRob HerringDavid S. MillerGuo RenGreg Kroah-HartmanHeiko CarstensPaul Burton
1/21
1/21
2/21
3/21
3/21
4/21
4/21
5/21
5/21
6/21
6/21
7/21
7/21
8/21A-b A-b
8/21A-b A-b
9/21
10/21
10/21
11/21
12/21A-b A-b
12/21A-b A-b
13/21A-b A-b
13/21A-b A-b
14/21
14/21
15/21A-b A-b
15/21A-b A-b
16/21
16/21
17/21
17/21
18/21
18/21
19/21R-b R-b A-b A-b R-b R-b A-b A-b A-b A-b
19/21R-b R-b A-b A-b R-b R-b A-b A-b A-b A-b
20/21
20/21
21/21A-b A-b
21/21A-b A-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 8 reviewers.

Read the v1 thread

Cover letter [PATCH 00/21] Refine memblock API

Hi,

Current memblock API is quite extensive and, which is more annoying, duplicated. Except the low-level functions that allow searching for a free memory region and marking it as reserved, memblock provides three (well, two and a half) sets of functions to allocate memory. There are several overlapping functions that return a physical address and there are functions that return virtual address. Those that return the virtual address may also clear the allocated memory. And, on top of all that, some allocators panic and some return NULL in case of error.

This set tries to reduce the mess, and trim down the amount of memblock allocation methods.

Patches 1-10 consolidate the functions that return physical address of the allocated memory

Patches 11-13 are some trivial cleanups

Patches 14-19 add checks for the return value of memblock_alloc*() and panics in case of errors. The patches 14-18 include some minor refactoring to have better readability of the resulting code and patch 19 is a mechanical addition of

	if (!ptr)
		panic();

after memblock_alloc*() calls.

And, finally, patches 20 and 21 remove panic() calls memblock and _nopanic variants from memblock.

Christophe Leroy (1):
powerpc: use memblock functions returning virtual address

Mike Rapoport (20):
openrisc: prefer memblock APIs returning virtual address
memblock: replace memblock_alloc_base(ANYWHERE) with memblock_phys_alloc
memblock: drop memblock_alloc_base_nid()
memblock: emphasize that memblock_alloc_range() returns a physical address
memblock: memblock_phys_alloc_try_nid(): don't panic
memblock: memblock_phys_alloc(): don't panic
memblock: drop __memblock_alloc_base()
memblock: drop memblock_alloc_base()
memblock: refactor internal allocation functions
memblock: make memblock_find_in_range_node() and choose_memblock_flags() static
arch: use memblock_alloc() instead of memblock_alloc_from(size, align, 0)
arch: don't memset(0) memory returned by memblock_alloc()
ia64: add checks for the return value of memblock_alloc*()
sparc: add checks for the return value of memblock_alloc*() mm/percpu: add checks for the return value of memblock_alloc*() init/main: add checks for the return value of memblock_alloc*()
swiotlb: add checks for the return value of memblock_alloc*()
treewide: add checks for the return value of memblock_alloc*()
memblock: memblock_alloc_try_nid: don't panic
memblock: drop memblock_alloc_*_nopanic() variants

 arch/alpha/kernel/core_cia.c              |   5 +-
 arch/alpha/kernel/core_marvel.c           |   6 +
 arch/alpha/kernel/pci-noop.c              |  11 +-
 arch/alpha/kernel/pci.c                   |  11 +-
 arch/alpha/kernel/pci_iommu.c             |  16 +-
 arch/alpha/kernel/setup.c                 |   2 +-
 arch/arc/kernel/unwind.c                  |   3 +-
 arch/arc/mm/highmem.c                     |   4 +
 arch/arm/kernel/setup.c                   |   6 +
 arch/arm/mm/init.c                        |   6 +-
 arch/arm/mm/mmu.c                         |  14 +-
 arch/arm64/kernel/setup.c                 |   9 +-
 arch/arm64/mm/kasan_init.c                |  10 ++
 arch/arm64/mm/mmu.c                       |   2 +
 arch/arm64/mm/numa.c                      |   4 +
 arch/c6x/mm/dma-coherent.c                |   4 +
 arch/c6x/mm/init.c                        |   4 +-
 arch/csky/mm/highmem.c                    |   5 +
 arch/h8300/mm/init.c                      |   4 +-
 arch/ia64/kernel/mca.c                    |  25 +--
 arch/ia64/mm/contig.c                     |   8 +-
 arch/ia64/mm/discontig.c                  |   4 +
 arch/ia64/mm/init.c                       |  38 ++++-
 arch/ia64/mm/tlb.c                        |   6 +
 arch/ia64/sn/kernel/io_common.c           |   3 +
 arch/ia64/sn/kernel/setup.c               |  12 +-
 arch/m68k/atari/stram.c                   |   4 +
 arch/m68k/mm/init.c                       |   3 +
 arch/m68k/mm/mcfmmu.c                     |   7 +-
 arch/m68k/mm/motorola.c                   |   9 ++
 arch/m68k/mm/sun3mmu.c                    |   6 +
 arch/m68k/sun3/sun3dvma.c                 |   3 +
 arch/microblaze/mm/init.c                 |  10 +-
 arch/mips/cavium-octeon/dma-octeon.c      |   3 +
 arch/mips/kernel/setup.c                  |   3 +
 arch/mips/kernel/traps.c                  |   5 +-
 arch/mips/mm/init.c                       |   5 +
 arch/nds32/mm/init.c                      |  12 ++
 arch/openrisc/mm/init.c                   |   5 +-
 arch/openrisc/mm/ioremap.c                |   8 +-
 arch/powerpc/kernel/dt_cpu_ftrs.c         |   8 +-
 arch/powerpc/kernel/irq.c                 |   5 -
 arch/powerpc/kernel/paca.c                |   6 +-
 arch/powerpc/kernel/pci_32.c              |   3 +
 arch/powerpc/kernel/prom.c                |   5 +-
 arch/powerpc/kernel/rtas.c                |   6 +-
 arch/powerpc/kernel/setup-common.c        |   3 +
 arch/powerpc/kernel/setup_32.c            |  26 ++--
 arch/powerpc/kernel/setup_64.c            |   4 +
 arch/powerpc/lib/alloc.c                  |   3 +
 arch/powerpc/mm/hash_utils_64.c           |  11 +-
 arch/powerpc/mm/mmu_context_nohash.c      |   9 ++
 arch/powerpc/mm/numa.c                    |   4 +
 arch/powerpc/mm/pgtable-book3e.c          |  12 +-
 arch/powerpc/mm/pgtable-book3s64.c        |   3 +
 arch/powerpc/mm/pgtable-radix.c           |   9 +-
 arch/powerpc/mm/ppc_mmu_32.c              |   3 +
 arch/powerpc/platforms/pasemi/iommu.c     |   3 +
 arch/powerpc/platforms/powermac/nvram.c   |   3 +
 arch/powerpc/platforms/powernv/opal.c     |   3 +
 arch/powerpc/platforms/powernv/pci-ioda.c |   8 +
 arch/powerpc/platforms/ps3/setup.c        |   3 +
 arch/powerpc/sysdev/dart_iommu.c          |   3 +
 arch/powerpc/sysdev/msi_bitmap.c          |   3 +
 arch/s390/kernel/crash_dump.c             |   3 +
 arch/s390/kernel/setup.c                  |  16 ++
 arch/s390/kernel/smp.c                    |   9 +-
 arch/s390/kernel/topology.c               |   6 +
 arch/s390/numa/mode_emu.c                 |   3 +
 arch/s390/numa/numa.c                     |   6 +-
 arch/s390/numa/toptree.c                  |   8 +-
 arch/sh/boards/mach-ap325rxa/setup.c      |   5 +-
 arch/sh/boards/mach-ecovec24/setup.c      |  10 +-
 arch/sh/boards/mach-kfr2r09/setup.c       |   5 +-
 arch/sh/boards/mach-migor/setup.c         |   5 +-
 arch/sh/boards/mach-se/7724/setup.c       |  10 +-
 arch/sh/kernel/machine_kexec.c            |   3 +-
 arch/sh/mm/init.c                         |   8 +-
 arch/sh/mm/numa.c                         |   4 +
 arch/sparc/kernel/prom_32.c               |   6 +-
 arch/sparc/kernel/setup_64.c              |   6 +
 arch/sparc/kernel/smp_64.c                |  12 ++
 arch/sparc/mm/init_32.c                   |   2 +-
 arch/sparc/mm/init_64.c                   |  11 ++
 arch/sparc/mm/srmmu.c                     |  18 ++-
 arch/um/drivers/net_kern.c                |   3 +
 arch/um/drivers/vector_kern.c             |   3 +
 arch/um/kernel/initrd.c                   |   2 +
 arch/um/kernel/mem.c                      |  16 ++
 arch/unicore32/kernel/setup.c             |   4 +
 arch/unicore32/mm/mmu.c                   |  15 +-
 arch/x86/kernel/acpi/boot.c               |   3 +
 arch/x86/kernel/apic/io_apic.c            |   5 +
 arch/x86/kernel/e820.c                    |   5 +-
 arch/x86/kernel/setup_percpu.c            |  10 +-
 arch/x86/mm/kasan_init_64.c               |  14 +-
 arch/x86/mm/numa.c                        |  12 +-
 arch/x86/platform/olpc/olpc_dt.c          |   3 +
 arch/x86/xen/p2m.c                        |  11 +-
 arch/xtensa/mm/kasan_init.c               |  10 +-
 arch/xtensa/mm/mmu.c                      |   3 +
 drivers/clk/ti/clk.c                      |   3 +
 drivers/firmware/memmap.c                 |   2 +-
 drivers/macintosh/smu.c                   |   5 +-
 drivers/of/fdt.c                          |   8 +-
 drivers/of/of_reserved_mem.c              |   7 +-
 drivers/of/unittest.c                     |   8 +-
 drivers/usb/early/xhci-dbc.c              |   2 +-
 drivers/xen/swiotlb-xen.c                 |   7 +-
 include/linux/memblock.h                  |  59 +------
 init/main.c                               |  26 +++-
 kernel/dma/swiotlb.c                      |  21 ++-
 kernel/power/snapshot.c                   |   3 +
 kernel/printk/printk.c                    |  17 +-
 lib/cpumask.c                             |   3 +
 mm/cma.c                                  |  10 +-
 mm/kasan/init.c                           |  10 +-
 mm/memblock.c                             | 249 ++++++++++--------------------
 mm/page_alloc.c                           |  10 +-
 mm/page_ext.c                             |   2 +-
 mm/percpu.c                               |  84 +++++++---
 mm/sparse.c                               |  25 ++-
 122 files changed, 872 insertions(+), 415 deletions(-)
Signature · 1 line
2.7.4