From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id BB90EC982F1 for ; Tue, 22 Sep 2026 04:13:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 664C36B00A4; Tue, 22 Sep 2026 00:13:47 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 62AA06B00A6; Tue, 22 Sep 2026 00:13:47 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4F2CB6B00A5; Tue, 22 Sep 2026 00:13:47 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 1FEFC6B00A2 for ; Tue, 22 Sep 2026 00:13:47 -0400 (EDT) Received: from smtpin19.hostedemail.com (lb01a-stub [10.200.18.249]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 8163612034A for ; Tue, 22 Sep 2026 04:13:46 +0000 (UTC) X-FDA: 85240079652.19.39B4E13 Received: from sea.source.kernel.org (sea.source.kernel.org [172.234.252.31]) by imf07.hostedemail.com (Postfix) with ESMTP id C6ABD40004 for ; Tue, 22 Sep 2026 04:13:44 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20260515 header.b=oi0FZIVx; spf=pass (imf07.hostedemail.com: domain of pratyush@kernel.org designates 172.234.252.31 as permitted sender) smtp.mailfrom=pratyush@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1790050424; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=Bvaf0w5QPzwCv2wIIdqM/Z0E7fX8LOsuubg/s4zocj8=; b=AuJ/xTF9MxQralQt+oGDhnBaKXqm5ca6Ha0YEZ0G9J6EQPIEm2YkA0HYWUt0xRbq0kn42K ESu2/ykKciGd8iPaxR6/Gs+RTAhZfgtYp/694JOzhE/u451E7+phELijLzARhhUNkQmZQh dmyZT02fQvvm1VAHLxqH3YrfbTtcfkk= ARC-Seal: i=1; a=rsa-sha256; d=hostedemail.com; s=arc-20220608; cv=none; t=1790050424; b=QxntpWACZ1SKqxTbXTW0tlnR/iHNoliUyWtj3MFt1KOKd2QJzJtW+DVo+xfXEPj9lzh7BR kbqmoyS+xBBr9UrJHbxphDohCRy/aNPSTRXjx9bk6Vqucs7nljlTKUiB3lBCv3kctq7u8/ XW/IG6nNSL/r5o//cYKhWw/ltJVpaJE= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20260515 header.b=oi0FZIVx; spf=pass (imf07.hostedemail.com: domain of pratyush@kernel.org designates 172.234.252.31 as permitted sender) smtp.mailfrom=pratyush@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) by sea.source.kernel.org (Postfix) with ESMTP id 11BDB447B2; Tue, 22 Sep 2026 04:13:44 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E1DB61F00893; Tue, 22 Sep 2026 04:13:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1790050423; bh=Bvaf0w5QPzwCv2wIIdqM/Z0E7fX8LOsuubg/s4zocj8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=oi0FZIVxsm91tPtVwvsPGXW0aKx05qvNQ7tGCYojBE48ngWMLK9ZVIQ2nEN4xYbrr FPBM5iaelIEPM/Y0sRlJ6oJq9WdnxuMkTAU2nGesa7MP4BZTlITEZSaCNb2xeQRjyZ jLc3bBy/pYHNnvDMwJ2NukNsHp/8cYyh7IC7FoYXDl4WCMrkNEKTaO1MBt5ACR/tLi 5ei3tTaUWvWCTQrmJCLGjWdXAgXjmEszRukgRdrBONVk4aPJsxckUHP/0zFBr6fo2h bt0lvoeDR5xdVQkqapnwPokzOY7zZNY64iIlyvmmNazPfXwp+sg6znIrkQIAaF/tKd G2X/auQdvBbFA== From: Pratyush Yadav To: Jonathan Corbet , Shuah Khan , Mike Rapoport , Pasha Tatashin , Pratyush Yadav , Alexander Graf , Andrew Morton , David Hildenbrand , Lorenzo Stoakes , "Liam R. Howlett" , Vlastimil Babka , Suren Baghdasaryan , Michal Hocko , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H. Peter Anvin" , Ard Biesheuvel , Ilias Apalodimas , Rob Herring , Saravana Kannan , Arnd Bergmann , Baoquan He Cc: x86@kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, kexec@lists.infradead.org, linux-mm@kvack.org, linux-efi@vger.kernel.org, devicetree@vger.kernel.org, linux-arch@vger.kernel.org Subject: [PATCH v3 1/4] memblock: get rid of CONFIG_MEMBLOCK_KHO_SCRATCH Date: Tue, 22 Sep 2026 06:13:13 +0200 Message-ID: <20260922041321.233986-2-pratyush@kernel.org> X-Mailer: git-send-email 2.55.0.1082.g2b9226bbc0-goog In-Reply-To: <20260922041321.233986-1-pratyush@kernel.org> References: <20260922041321.233986-1-pratyush@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam04 X-Rspam-User: X-Stat-Signature: pi5bim9sqi1icos7n6gceirsj1auymet X-Rspamd-Queue-Id: C6ABD40004 X-HE-Tag: 1790050424-528431 X-HE-Meta: U2FsdGVkX19zDqsRqzm4PP6BLXO0SMMO00/CFoCmWDXOrp5Czx/ZsnvUevGiZzxq9o6DxGb8JoKDXlftUPqv7J9ryT1s5MKsETuYBk8YPfUDdU6vAfiL2tuA8IYHKm3bjtggSy+U5ScaPdLkvt/ACd5o/Sn7S41s5owzfdBKWtxWS8dU9S78GTeUB9R1dxMaZ0DerG1JXtdo1o2hMrMYEd1ExMhTIuRRCLTY1W2HBTWmDVmcGD9C4en2wO1kp8T/flYoZ464h+XyfStCn4aihsgA5CEiIrfFvJobUJCXgia9bWXL5aNSzoTEyOI2AEFPAxq0OBy30wVjaiC99+GgTDChDxn2Dd2cxexeOZgHBK6bbU0A8jjB4SS1PXTpgDpRHsyK3sHdsB4S0wUklvTmqgKjnZB2OPwR/epqRfpMpIta4kM2dGxGfaKvoHU4Pu61UiKuOhicHXp3/sN5McULmCwHAoTSuh7NJighRaZ4XvaP1ZvDca0q7rn8kik+ciTboECfR8WJ9WwapaDdX063SrRkzfGrXOFRjFnp63r4ySHKcsPGq+S2Gmb3l/oeYBSVwXV9YpquMt494mGlCTg7/yV4wlqEkomYcyNalN+9T9+He0w40OvXAQ/0n93fE2AMs+s9va7u4jyJeRYX+aVdx1LcAHZkk0WDPmLu+jXSOEeH+bR3cEnRvEG4UhiJyCKr9fm5aL+rHAy4hw5/V2jq5Vbj6gemjrdPoBG7BJ7TmLswMqY9gOQVLcsesEDef9r+hYxJSinIvAyUUMAwfXeaaL62YDIbfNWstAoGquCmFRP1Q5ksUJizMNMSy5HC0LZge2VFghdk5+vxrlRxlpVldStDkzyx5c875xcK6bewJV4yBkO0SZTQ9KoBmKYCrj8MbhlJLbbt89ze+EJYzOzpAAneCCnVGKGRRkQuisSJST4XvJr1K/IUDbanANk9lycbh2WesMcIfL9eRRAJ5qA 3jBQriFV UZ7bsa2XLJVBEo/mcJE2CriXif+h0YuOH5/jMkRPfxyzpz+heR+j+cnvqpTyKYUa0SlyUlmfXlRWwmE697Dy7dbI4Ge35u6dkBem6XQOh1oCya/cAleJHGwChP4/uSvCpYnYMenOQct8z2CUDjt9IjkHmWWDyuDvQCLKbHaiTAr3/qhMUI5xrqI/RxJdONE6IRY09hZqngKl0A8yU4c4av9dkIUnwuB4dog/D1sUVNWQvlZHMUiWq+RwwTsY5n5SMFCSP9GdPT5gX0gqxo/kQVwf3j0RwwhLVgb7XNvnb8ixwF0AAjoqRKRHIFrsV0e3k3MWR4p1P+q/bEPgY+vChL1k52s9kTNqOHxYEBfsoZkrGuNtOyfw+Sksz6aHllEWOSggWnWZX1DwJtg8A8RXING0z5g== Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: From: "Pratyush Yadav (Google)" This config is only a proxy for CONFIG_KEXEC_HANDOVER. It is only enabled by KHO. No point in the indirection. Use CONFIG_KEXEC_HANDOVER directly. Signed-off-by: Pratyush Yadav (Google) --- include/linux/memblock.h | 2 +- kernel/liveupdate/Kconfig | 1 - mm/Kconfig | 4 ---- mm/memblock.c | 4 ++-- 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/include/linux/memblock.h b/include/linux/memblock.h index d62db9e776cf..db3b106c6335 100644 --- a/include/linux/memblock.h +++ b/include/linux/memblock.h @@ -614,7 +614,7 @@ static inline void early_memtest(phys_addr_t start, phys_addr_t end) { } static inline void memtest_report_meminfo(struct seq_file *m) { } #endif -#ifdef CONFIG_MEMBLOCK_KHO_SCRATCH +#ifdef CONFIG_KEXEC_HANDOVER void memblock_set_kho_scratch_only(void); void memblock_clear_kho_scratch_only(void); #else diff --git a/kernel/liveupdate/Kconfig b/kernel/liveupdate/Kconfig index c13af38ba23a..f50daee8eff0 100644 --- a/kernel/liveupdate/Kconfig +++ b/kernel/liveupdate/Kconfig @@ -5,7 +5,6 @@ menu "Live Update and Kexec HandOver" config KEXEC_HANDOVER bool "kexec handover" depends on ARCH_SUPPORTS_KEXEC_HANDOVER && ARCH_SUPPORTS_KEXEC_FILE - select MEMBLOCK_KHO_SCRATCH select KEXEC_FILE select LIBFDT select CMA diff --git a/mm/Kconfig b/mm/Kconfig index 604c58199acb..631a410eaee9 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -483,10 +483,6 @@ config HAVE_GUP_FAST depends on MMU bool -# Enable memblock support for scratch memory which is needed for kexec handover -config MEMBLOCK_KHO_SCRATCH - bool - # Don't discard allocated memory used to track "memory" and "reserved" memblocks # after early boot, so it can still be used to test for validity of memory. # Also, memblocks are updated with memory hot(un)plug. diff --git a/mm/memblock.c b/mm/memblock.c index 9ce86349a29f..197d854c18d5 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -113,7 +113,7 @@ unsigned long min_low_pfn; unsigned long max_pfn; unsigned long long max_possible_pfn; -#ifdef CONFIG_MEMBLOCK_KHO_SCRATCH +#ifdef CONFIG_KEXEC_HANDOVER /* When set to true, only allocate from MEMBLOCK_KHO_SCRATCH ranges */ static bool kho_scratch_only; #else @@ -2596,7 +2596,7 @@ int reserve_mem_release_by_name(const char *name) return 1; } -#ifdef CONFIG_MEMBLOCK_KHO_SCRATCH +#ifdef CONFIG_KEXEC_HANDOVER __init void memblock_set_kho_scratch_only(void) { kho_scratch_only = true; -- 2.55.0.1082.g2b9226bbc0-goog