From nobody Sun Apr 5 13:04:14 2026 Received: from mail-wm1-f73.google.com (mail-wm1-f73.google.com [209.85.128.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CC2142D3ECF for ; Fri, 20 Feb 2026 16:52:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771606335; cv=none; b=YJY/mIrHgEracnEFGtyHANEI31Ovy0+d0wiceBqDnFQr1x0l73L8i6hiF8RMU6enpYFvumWxFY5ldhICNoxf/f2B4GUSINDldEgABQ//LrOVXj+Pv1mivFhhJsHupQgUhGblraSsJL6lqB9CmFSnukBG0pmgPFULFdkvZ+gGyVU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771606335; c=relaxed/simple; bh=m7ka/d1YRmZPGrNxJ7PEcq9nFxIXUV5ui/a4AzsotuY=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=k8nnySdCYU5bBD6CJmXr5U0QoAcROtPYN8XAyz01rYsrfeLkpjrXnuZNJO9AYm2Kg96C38ZCBCsA9+KAvlFBNf5zMCHooDriAvBqrH/5KrYeD1b6frdq02ZT2158/VyOvazG3TVAn/3t76o0riSblkmWrW0PNRqhhuum3R4L9BE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--mclapinski.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=grTz3aBC; arc=none smtp.client-ip=209.85.128.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--mclapinski.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="grTz3aBC" Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-4806cfffca6so22072095e9.2 for ; Fri, 20 Feb 2026 08:52:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1771606332; x=1772211132; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=/cSTzAkt5CK3RH1LCsoiWKzafA/Onxi/2uJ8AKZyka0=; b=grTz3aBC7sNlCghPlRfpKOeuJUb1PawAcvn0IdOuafYsoF0++TXQvn+OUHpJxfB2Xg Ra+WmqdgzUa4mLg7oY21jck3hKVlYwwfNlbxhGsWx/TI9qmsEiI4BzIsuZrtlHWqVxjl IbVQgwWWvnPn/V5txg0vTfcFMTDL9sRQxulUeW6N1ZtJ66eVLxr5L+i8ID6UpsXw0pc+ Ij0g8oqb7R07d3mloyrWI60oeu+IyRJRQk6iIj19I2ZVFUMig3hqhFOuCMB4Q4yaktEF i+dxDldPmuIaL8BD8Zg8vzUFI2BYrg1hBTl0DM78F6+QPruQ1Gs0Q9juTYmZPP2SDSgh RpMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771606332; x=1772211132; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=/cSTzAkt5CK3RH1LCsoiWKzafA/Onxi/2uJ8AKZyka0=; b=sncFSWN5EB92fuHkzWxOeCoTYoDv3MvVEXzxjMiGyU8gELAdLvWHRucqsfojNXs9nW 2Wwufhoy5Z0/GorRPj69z7jRxWq/rAeLAe3gCXc5Aooz7vY78acb/ahe62rRaU2ehP52 YIFseMk2bC6NTCnejkmMZKvzIkZehtpVrQ+yN0jL27ci2VlpCKURbHkCx0dOLkdsHWOn JJzYudLqfdSQDfqCw+AX/tgJks1ll0TaJvg/Sfu9KvDJge0xNPQqSIYHSbgxYQ6tK/2I BCoU0xIXLBSqpqv1V/TFaVGChVlhxk7H2dmj/u8K7ar7XV2JnVKVP9T3KJT9sMBtCv0r wwyg== X-Gm-Message-State: AOJu0Yw9scX1eKd269dIbpyekag28qJlh3aO5s/FUJ3uvwNsGTuYlCZv brd8Q4oPO0E7yssS0rFIlgtJkEqbSXYw79y2WTV3FLeKCjlLa86gntbesvmogG4hHnwRulBYu7K 10V7fUzKRXVQsBxZn7ZJ3uw== X-Received: from wmhn17.prod.google.com ([2002:a05:600c:3051:b0:480:4a03:7b79]) (user=mclapinski job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:3153:b0:480:3b4e:41b8 with SMTP id 5b1f17b1804b1-483a9603c07mr2950695e9.33.1771606332067; Fri, 20 Feb 2026 08:52:12 -0800 (PST) Date: Fri, 20 Feb 2026 17:52:02 +0100 In-Reply-To: <20260220165203.3213375-1-mclapinski@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260220165203.3213375-1-mclapinski@google.com> X-Mailer: git-send-email 2.53.0.345.g96ddfc5eaa-goog Message-ID: <20260220165203.3213375-2-mclapinski@google.com> Subject: [PATCH v4 1/2] kho: fix deferred init of kho scratch From: Michal Clapinski To: Evangelos Petrongonas , Pasha Tatashin , Mike Rapoport , Pratyush Yadav , Alexander Graf , kexec@lists.infradead.org, linux-mm@kvack.org Cc: linux-kernel@vger.kernel.org, Andrew Morton , Michal Clapinski Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Currently, mm_core_init calls kho_memory_init, which calls kho_release_scratch. If DEFERRED is enabled, kho_release_scratch will first initialize the struct pages of kho scratch. This is not needed. We can just let page_alloc_init_late init it. Next, kho_release_scratch will mark scratch as MIGRATE_CMA. If DEFERRED is enabled, this will be overwritten later in deferred_free_pages. To fix this, I removed the whole kho_release_scratch. Marking the pageblocks as MIGRATE_CMA now happens in kho_init, which runs after deferred_free_pages. Signed-off-by: Michal Clapinski Reviewed-by: Mike Rapoport (Microsoft) --- include/linux/memblock.h | 2 -- kernel/liveupdate/kexec_handover.c | 43 ++++++++---------------------- mm/memblock.c | 22 --------------- 3 files changed, 11 insertions(+), 56 deletions(-) diff --git a/include/linux/memblock.h b/include/linux/memblock.h index 221118b5a16e..35d9cf6bbf7a 100644 --- a/include/linux/memblock.h +++ b/include/linux/memblock.h @@ -614,11 +614,9 @@ static inline void memtest_report_meminfo(struct seq_f= ile *m) { } #ifdef CONFIG_MEMBLOCK_KHO_SCRATCH void memblock_set_kho_scratch_only(void); void memblock_clear_kho_scratch_only(void); -void memmap_init_kho_scratch_pages(void); #else static inline void memblock_set_kho_scratch_only(void) { } static inline void memblock_clear_kho_scratch_only(void) { } -static inline void memmap_init_kho_scratch_pages(void) {} #endif =20 #endif /* _LINUX_MEMBLOCK_H */ diff --git a/kernel/liveupdate/kexec_handover.c b/kernel/liveupdate/kexec_h= andover.c index b851b09a8e99..de167bfa2c8d 100644 --- a/kernel/liveupdate/kexec_handover.c +++ b/kernel/liveupdate/kexec_handover.c @@ -1377,11 +1377,6 @@ static __init int kho_init(void) if (err) goto err_free_fdt; =20 - if (fdt) { - kho_in_debugfs_init(&kho_in.dbg, fdt); - return 0; - } - for (int i =3D 0; i < kho_scratch_cnt; i++) { unsigned long base_pfn =3D PHYS_PFN(kho_scratch[i].addr); unsigned long count =3D kho_scratch[i].size >> PAGE_SHIFT; @@ -1397,8 +1392,17 @@ static __init int kho_init(void) */ kmemleak_ignore_phys(kho_scratch[i].addr); for (pfn =3D base_pfn; pfn < base_pfn + count; - pfn +=3D pageblock_nr_pages) - init_cma_reserved_pageblock(pfn_to_page(pfn)); + pfn +=3D pageblock_nr_pages) { + if (fdt) + init_cma_pageblock(pfn_to_page(pfn)); + else + init_cma_reserved_pageblock(pfn_to_page(pfn)); + } + } + + if (fdt) { + kho_in_debugfs_init(&kho_in.dbg, fdt); + return 0; } =20 WARN_ON_ONCE(kho_debugfs_fdt_add(&kho_out.dbg, "fdt", @@ -1421,35 +1425,10 @@ static __init int kho_init(void) } fs_initcall(kho_init); =20 -static void __init kho_release_scratch(void) -{ - phys_addr_t start, end; - u64 i; - - memmap_init_kho_scratch_pages(); - - /* - * Mark scratch mem as CMA before we return it. That way we - * ensure that no kernel allocations happen on it. That means - * we can reuse it as scratch memory again later. - */ - __for_each_mem_range(i, &memblock.memory, NULL, NUMA_NO_NODE, - MEMBLOCK_KHO_SCRATCH, &start, &end, NULL) { - ulong start_pfn =3D pageblock_start_pfn(PFN_DOWN(start)); - ulong end_pfn =3D pageblock_align(PFN_UP(end)); - ulong pfn; - - for (pfn =3D start_pfn; pfn < end_pfn; pfn +=3D pageblock_nr_pages) - init_pageblock_migratetype(pfn_to_page(pfn), - MIGRATE_CMA, false); - } -} - void __init kho_memory_init(void) { if (kho_in.mem_map_phys) { kho_scratch =3D phys_to_virt(kho_in.scratch_phys); - kho_release_scratch(); kho_mem_deserialize(phys_to_virt(kho_in.mem_map_phys)); } else { kho_reserve_scratch(); diff --git a/mm/memblock.c b/mm/memblock.c index 6cff515d82f4..3eff19124fc0 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -959,28 +959,6 @@ __init void memblock_clear_kho_scratch_only(void) { kho_scratch_only =3D false; } - -__init void memmap_init_kho_scratch_pages(void) -{ - phys_addr_t start, end; - unsigned long pfn; - int nid; - u64 i; - - if (!IS_ENABLED(CONFIG_DEFERRED_STRUCT_PAGE_INIT)) - return; - - /* - * Initialize struct pages for free scratch memory. - * The struct pages for reserved scratch memory will be set up in - * reserve_bootmem_region() - */ - __for_each_mem_range(i, &memblock.memory, NULL, NUMA_NO_NODE, - MEMBLOCK_KHO_SCRATCH, &start, &end, &nid) { - for (pfn =3D PFN_UP(start); pfn < PFN_DOWN(end); pfn++) - init_deferred_page(pfn, nid); - } -} #endif =20 /** --=20 2.53.0.345.g96ddfc5eaa-goog