x86/setup: use memblock_reserve_kern for memory used by kernel

memblock_reserve() does not distinguish memory used by firmware from
memory used by kernel.

The distinction is nice to have for accounting of early memory allocations
and reservations, but it is essential for kexec handover (kho) to know how
much memory kernel consumes during boot.

Use memblock_reserve_kern() to reserve kernel memory, such as kernel
image, initrd and setup data.

Link: https://lkml.kernel.org/r/20250509074635.3187114-11-changyuanl@google.com
Signed-off-by: Mike Rapoport (Microsoft) <rppt@kernel.org>
Signed-off-by: Changyuan Lyu <changyuanl@google.com>
Acked-by: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Alexander Graf <graf@amazon.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Anthony Yznaga <anthony.yznaga@oracle.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Ashish Kalra <ashish.kalra@amd.com>
Cc: Ben Herrenschmidt <benh@kernel.crashing.org>
Cc: Borislav Betkov <bp@alien8.de>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Eric Biederman <ebiederm@xmission.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: James Gowans <jgowans@amazon.com>
Cc: Jason Gunthorpe <jgg@nvidia.com>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Krzysztof Kozlowski <krzk@kernel.org>
Cc: Marc Rutland <mark.rutland@arm.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Pasha Tatashin <pasha.tatashin@soleen.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Pratyush Yadav <ptyadav@amazon.de>
Cc: Rob Herring <robh@kernel.org>
Cc: Saravana Kannan <saravanak@google.com>
Cc: Stanislav Kinsburskii <skinsburskii@linux.microsoft.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Thomas Gleinxer <tglx@linutronix.de>
Cc: Thomas Lendacky <thomas.lendacky@amd.com>
Cc: Will Deacon <will@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 9d2a13b37833c9687eaf5dc51a8d3c9c1c07dfce..766176c4f5ee83c145c6b01f67d4e0ef7208b79f 100644 (file)
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -286,8 +286,8 @@ static void __init cleanup_highmap(void)
 static void __init reserve_brk(void)
 {
        if (_brk_end > _brk_start)
-               memblock_reserve(__pa_symbol(_brk_start),
-                                _brk_end - _brk_start);
+               memblock_reserve_kern(__pa_symbol(_brk_start),
+                                     _brk_end - _brk_start);
 
        /* Mark brk area as locked down and no longer taking any
           new allocations */
@@ -360,7 +360,7 @@ static void __init early_reserve_initrd(void)
            !ramdisk_image || !ramdisk_size)
                return;         /* No initrd provided by bootloader */
 
-       memblock_reserve(ramdisk_image, ramdisk_end - ramdisk_image);
+       memblock_reserve_kern(ramdisk_image, ramdisk_end - ramdisk_image);
 }
 
 static void __init reserve_initrd(void)
@@ -413,7 +413,7 @@ static void __init add_early_ima_buffer(u64 phys_addr)
        }
 
        if (data->size) {
-               memblock_reserve(data->addr, data->size);
+               memblock_reserve_kern(data->addr, data->size);
                ima_kexec_buffer_phys = data->addr;
                ima_kexec_buffer_size = data->size;
        }
@@ -553,7 +553,7 @@ static void __init memblock_x86_reserve_range_setup_data(void)
                len = sizeof(*data);
                pa_next = data->next;
 
-               memblock_reserve(pa_data, sizeof(*data) + data->len);
+               memblock_reserve_kern(pa_data, sizeof(*data) + data->len);
 
                if (data->type == SETUP_INDIRECT) {
                        len += data->len;
@@ -567,7 +567,7 @@ static void __init memblock_x86_reserve_range_setup_data(void)
                        indirect = (struct setup_indirect *)data->data;
 
                        if (indirect->type != SETUP_INDIRECT)
-                               memblock_reserve(indirect->addr, indirect->len);
+                               memblock_reserve_kern(indirect->addr, indirect->len);
                }
 
                pa_data = pa_next;
@@ -770,8 +770,8 @@ static void __init early_reserve_memory(void)
         * __end_of_kernel_reserve symbol must be explicitly reserved with a
         * separate memblock_reserve() or they will be discarded.
         */
-       memblock_reserve(__pa_symbol(_text),
-                        (unsigned long)__end_of_kernel_reserve - (unsigned long)_text);
+       memblock_reserve_kern(__pa_symbol(_text),
+                             (unsigned long)__end_of_kernel_reserve - (unsigned long)_text);
 
        /*
         * The first 4Kb of memory is a BIOS owned area, but generally it is