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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 610BFC5B572 for ; Tue, 11 Aug 2026 16:27:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=abxli+Hzhv9GVR5sItE1YFTra2NUUXXbp3pvRn5p7EU=; b=lonXKdABSPKTf45aI5rHIMj6MB eVf0Pvtl3WKlJ5S7j7CieuklQ8Y3SJsv6xMTgjNoJRZfaxy0wNizuiEyk2H5+kpG4btzt1lC0JpJG +wBM2dTDyPQfnsHYuVQHZP3OyF8YMm6q6QmrVqI5GmZZLbT1jb+u3MrQ2laF9UCk/aPPhLtAwxrHw c8DhcxYwVk4mcyKOT/Fz/N+9WxuRNCICrE9i6CIxixlo/WJmez4vidAR2YQkMjoVR8WlDCZFAL5gJ VyCBtDKy+/L7mvaMTZsw2RWuI79yFqTljKbJ8BSq/P+6qMjbL7z5mdXyFd0hFmF+Vzx4sWR6///up a54luuVQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wtpJx-0000000EUpy-1CBk; Tue, 11 Aug 2026 16:27:21 +0000 Received: from tor.source.kernel.org ([172.105.4.254]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1wtpJu-0000000EUpB-3Eyc for kexec@lists.infradead.org; Tue, 11 Aug 2026 16:27:18 +0000 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) by tor.source.kernel.org (Postfix) with ESMTP id 38D5C600AE; Tue, 11 Aug 2026 16:27:18 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CCD631F000E9; Tue, 11 Aug 2026 16:27:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1786465637; bh=abxli+Hzhv9GVR5sItE1YFTra2NUUXXbp3pvRn5p7EU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=U3hKLmyE9986h21u1I/RYnOIZZQXOwKmw5BknJic+XPSFq11Z0jpodg9LbbUjqcsR 8THgcVfT6zhyVwsyzYmZnBzOZyIp+7YNYIFjtnYwtNZ8jnTjFX6rO9nJbo4Ve/XX0E vsrtZo+G8TdCC2Lu68eihAUSbYyTwKrXBEqHecknJ+dKLoyFUfYqeGbyJcC4k1ZmhK hy88SyPClFgmp65Gsbp5TGsynaCq0AcUzDed1/fEyLth93t/k3+ip+/8LJO/YL+KZx BrOBxNM9dluoM1mXwFfPGo2HQnxfToZ2WHB2TDklPUqt0riNb8HrROcTv4SfH2Cm3y HAYOnlFhz6v7Q== 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 4/4] kho: rename kho_scratch= commandline parameter to kho_bootmem= Date: Tue, 11 Aug 2026 18:26:40 +0200 Message-ID: <20260811162642.3504565-5-pratyush@kernel.org> X-Mailer: git-send-email 2.55.0.679.g6767b8d81c-goog In-Reply-To: <20260811162642.3504565-1-pratyush@kernel.org> References: <20260811162642.3504565-1-pratyush@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: kexec@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "kexec" Errors-To: kexec-bounces+kexec=archiver.kernel.org@lists.infradead.org From: "Pratyush Yadav (Google)" KHO now no longer uses "scratch" to describe the memory areas passed by previous kernel. Instead, it calls them boot memory, or bootmem in short. Rename the kho_scratch= commandline parameter to reflect this terminology change. Signed-off-by: Pratyush Yadav (Google) --- Documentation/admin-guide/kernel-parameters.txt | 2 +- Documentation/admin-guide/mm/kho.rst | 4 ++-- kernel/liveupdate/kexec_handover.c | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index e2212f058812..a03927ffb85d 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -2989,7 +2989,7 @@ Kernel parameters "0" | "off" | "n" - kexec handover is disabled "1" | "on" | "y" - kexec handover is enabled - kho_scratch= [KEXEC,EARLY] + kho_bootmem= [KEXEC,EARLY] Format: ll[KMG],mm[KMG],nn[KMG] | nn% Defines the size of the KHO boot memory region. The diff --git a/Documentation/admin-guide/mm/kho.rst b/Documentation/admin-guide/mm/kho.rst index 4fae09096038..f14c8d9ad6a4 100644 --- a/Documentation/admin-guide/mm/kho.rst +++ b/Documentation/admin-guide/mm/kho.rst @@ -20,8 +20,8 @@ need to enable if you would like to preserve their respective state across kexec. To use KHO, please boot the kernel with the ``kho=on`` command line -parameter. You may use ``kho_scratch`` parameter to define size of the -boot memory regions. For example ``kho_scratch=16M,512M,256M`` will reserve a +parameter. You may use ``kho_bootmem`` parameter to define size of the +boot memory regions. For example ``kho_bootmem=16M,512M,256M`` will reserve a 16 MiB low memory bootmem area, a 512 MiB global bootmem region, and 256 MiB per NUMA node bootmem regions on boot. diff --git a/kernel/liveupdate/kexec_handover.c b/kernel/liveupdate/kexec_handover.c index 3bfdbe86aaf9..da8d5ecb915b 100644 --- a/kernel/liveupdate/kexec_handover.c +++ b/kernel/liveupdate/kexec_handover.c @@ -669,12 +669,12 @@ unsigned int kho_bootmem_cnt; * The bootmem areas are scaled by default as percent of memory allocated from * memblock. A user can override the scale with command line parameter: * - * kho_scratch=N% + * kho_bootmem=N% * * It is also possible to explicitly define size for a lowmem, a global and * per-node bootmem areas: * - * kho_scratch=l[KMG],n[KMG],m[KMG] + * kho_bootmem=l[KMG],n[KMG],m[KMG] * * The explicit size definition takes precedence over scale definition. */ @@ -749,7 +749,7 @@ static int __init kho_parse_bootmem_size(char *p) return 0; } -early_param("kho_scratch", kho_parse_bootmem_size); +early_param("kho_bootmem", kho_parse_bootmem_size); static void __init bootmem_size_update(void) { -- 2.55.0.679.g6767b8d81c-goog