From nobody Thu Apr 2 15:41:50 2026 Received: from mail-ed1-f74.google.com (mail-ed1-f74.google.com [209.85.208.74]) (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 E53B73E5570 for ; Tue, 17 Mar 2026 14:15:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773756950; cv=none; b=do+bYT385jN67kOl6Ojzuke2igpTt2joGxav0rYstZa7XrB4TFyEQ2dzVEdXUO4yW2thbQhMdj8drKoQWZx21HcEeJC73FHiFS2Qw+pfl7hLfN+qRPVtkN7oB80gGqyqNxqQg9aV+JB/5UjfaPp9U9xxzmebu493K8CGsnaX3bA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773756950; c=relaxed/simple; bh=aAjuW+iInrYyj1G1O1LeqTq5lJXMgon95IsJaRIr93s=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=maunhliC64cWx6fItfhZEW7u4TjMi1GAZLjI8TvdJycYYEHK/i+n7/1CWc20iGwxgCBRG2wXpHCz7ngT+k5FBeKx/tCecDMXe4+hcAiOzU8opyh5xwDQj7McU5Nh9nOiSI9zLaRmUxAgNLlbNktNmGA71t7LqMhb9M5JC5PoIbw= 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=o5BPwSZS; arc=none smtp.client-ip=209.85.208.74 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="o5BPwSZS" Received: by mail-ed1-f74.google.com with SMTP id 4fb4d7f45d1cf-666d0b4acfcso2177134a12.0 for ; Tue, 17 Mar 2026 07:15:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1773756947; x=1774361747; 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=ENui0Js8tkhd80bmpMrXzJoFIzd5GZKUFokCk0GUoAI=; b=o5BPwSZSzcoEoxPOqD6hgFw0fhaEG6wR989MkYrwXXHd2pc1erR16yXA3KVeLHEvuR v/HFlS0z7bcbVweGJSdnIFOWfn3hmxjj8hExOFxf3y9f12NzFRgdgLxOTdoYrOh3QEJg V88yhJsKkN67RHjMg05cJ/zsyh9T1BRhHKqhMukjz1cQYaoZOQCQNvcBBYN4VQwKDI3m VaHPSsvlqPOnUO4Q5hmcixLiWDAmSKZPLCAkae1GE9jwkYgdKbIsG/MuSclqtWEVW6do kkuwckzE6ZUIzGtPiLXzYEKIQBRkG0SKEdDS1nyCZMETfIWrPZBwYWmVs0qHWyi9nK9/ jt5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773756947; x=1774361747; 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=ENui0Js8tkhd80bmpMrXzJoFIzd5GZKUFokCk0GUoAI=; b=fdJ6OKPSBTaAUlKs5ewPF0jGYdLjzUuzP1gd6s38t+FAo80mdTKUDVgoeUWQKQtdb8 J0OYnllCPUOlqWu1+sZMHavs/8ppY2ItuV2SxaqYgrYG3MBoaQfBOjzehR71PCCNLHWM 6VsYNc12gbAjVHOz70ACcfvpCGIE5nQQAlAmTCj7+4tKvMZ6rMUfuO71OZMa4jo+A/Si X7j5gK2JF8HoBQxFye9kpphe6leXKixtdjJdE3lEGTxI9jPLlmYrqkTKpYa1hAyPGiGH s+wsLAPVrfzGH6E8a9Dc9/LAkVS7hPA+Z8nh5Bkp1jVsKHJgghUX69e0x6y99cTMwLaM WVIA== X-Gm-Message-State: AOJu0Yx9iu2yIcUGctAfCdDT+FSm+4JPFURVJ6JwGIK8r3wjAySvj7D7 JOBYfnsmXJP5w5Z7SV6dNal+WNz+/WOdaIr8AJY+xV/9asSp+7xmSSvMs/AF+mZI1O7zLjPVOgo 7uF0VYpnayM/YY3gF0Np1cw== X-Received: from edew21-n1.prod.google.com ([2002:a05:6402:a215:10b0:662:4e97:3bc9]) (user=mclapinski job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6402:26c5:b0:667:5318:2bc9 with SMTP id 4fb4d7f45d1cf-66753182f33mr1449370a12.15.1773756947028; Tue, 17 Mar 2026 07:15:47 -0700 (PDT) Date: Tue, 17 Mar 2026 15:15:33 +0100 In-Reply-To: <20260317141534.815634-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: <20260317141534.815634-1-mclapinski@google.com> X-Mailer: git-send-email 2.53.0.851.ga537e3e6e9-goog Message-ID: <20260317141534.815634-3-mclapinski@google.com> Subject: [PATCH v7 2/3] kho: fix deferred init of kho scratch From: Michal Clapinski To: Evangelos Petrongonas , Pasha Tatashin , Mike Rapoport , Pratyush Yadav , Alexander Graf , Samiullah Khawaja , 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, if DEFERRED is enabled, kho_release_scratch will initialize the struct pages and set migratetype of kho scratch. Unless the whole scratch fit below first_deferred_pfn, some of that will be overwritten either by deferred_init_pages or memmap_init_reserved_pages. To fix it, I modified kho_release_scratch to only set the migratetype on already initialized pages. Then, modified init_pageblock_migratetype to set the migratetype to CMA if the page is located inside scratch. Signed-off-by: Michal Clapinski --- include/linux/memblock.h | 2 -- kernel/liveupdate/kexec_handover.c | 10 ++++++---- mm/memblock.c | 22 ---------------------- mm/page_alloc.c | 7 +++++++ 4 files changed, 13 insertions(+), 28 deletions(-) diff --git a/include/linux/memblock.h b/include/linux/memblock.h index 6ec5e9ac0699..3e217414e12d 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 c9b982372d6e..e511a50fab9c 100644 --- a/kernel/liveupdate/kexec_handover.c +++ b/kernel/liveupdate/kexec_handover.c @@ -1477,8 +1477,7 @@ static void __init kho_release_scratch(void) { phys_addr_t start, end; u64 i; - - memmap_init_kho_scratch_pages(); + int nid; =20 /* * Mark scratch mem as CMA before we return it. That way we @@ -1486,10 +1485,13 @@ static void __init kho_release_scratch(void) * 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) { + MEMBLOCK_KHO_SCRATCH, &start, &end, &nid) { ulong start_pfn =3D pageblock_start_pfn(PFN_DOWN(start)); ulong end_pfn =3D pageblock_align(PFN_UP(end)); ulong pfn; +#ifdef CONFIG_DEFERRED_STRUCT_PAGE_INIT + end_pfn =3D min(end_pfn, NODE_DATA(nid)->first_deferred_pfn); +#endif =20 for (pfn =3D start_pfn; pfn < end_pfn; pfn +=3D pageblock_nr_pages) init_pageblock_migratetype(pfn_to_page(pfn), @@ -1500,8 +1502,8 @@ static void __init kho_release_scratch(void) void __init kho_memory_init(void) { if (kho_in.scratch_phys) { - kho_scratch =3D phys_to_virt(kho_in.scratch_phys); kho_release_scratch(); + kho_scratch =3D phys_to_virt(kho_in.scratch_phys); =20 if (kho_mem_retrieve(kho_get_fdt())) kho_in.fdt_phys =3D 0; diff --git a/mm/memblock.c b/mm/memblock.c index b3ddfdec7a80..ae6a5af46bd7 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 /** diff --git a/mm/page_alloc.c b/mm/page_alloc.c index ee81f5c67c18..5ca078dde61d 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -55,6 +55,7 @@ #include #include #include +#include #include #include "internal.h" #include "shuffle.h" @@ -549,6 +550,12 @@ void __meminit init_pageblock_migratetype(struct page = *page, migratetype < MIGRATE_PCPTYPES)) migratetype =3D MIGRATE_UNMOVABLE; =20 + /* + * Mark KHO scratch as CMA so no unmovable allocations are made there. + */ + if (unlikely(kho_scratch_overlap(page_to_phys(page), PAGE_SIZE))) + migratetype =3D MIGRATE_CMA; + flags =3D migratetype; =20 #ifdef CONFIG_MEMORY_ISOLATION --=20 2.53.0.851.ga537e3e6e9-goog