From nobody Mon Dec 1 22:03:16 2025 Received: from mail-ot1-f45.google.com (mail-ot1-f45.google.com [209.85.210.45]) (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 C8A11311966 for ; Thu, 27 Nov 2025 20:37:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764275862; cv=none; b=Gk6fDMgOk2QpXj/F9p01WnoimdI3x0T2IMJxx/lmYpzS1HVCIbC9Eb+BergMdFG/qESTE4jzjPXK5ItDPabwQ3Ylip0wcthpDnxG+nlTYFleB6iO7DbbGgAAdI1Vja2kTIoA97C68l1Yq6kJ5yeFs3dOmyec7ndjIcUk3aZEOPo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764275862; c=relaxed/simple; bh=Pa1lPn1d5lHa6gmBqdKRFmSoMYflMNXKO0KazOyybvc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YnZgSDj4txhEoL+KWl+tLdtuiEukxfRgaZcPLhh3OgOMmxylnWij1wxPUHWg4uPhpAArHwKgq20r/jwtMMlMonpukfoYTqCCA6OuozHidbTTTyasoRBmj6b7au10R7xazQsU6dvo9IV/KzatxVqJGF9mOVDEjQhqupnjw4pR5x4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=QR9S/CvZ; arc=none smtp.client-ip=209.85.210.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="QR9S/CvZ" Received: by mail-ot1-f45.google.com with SMTP id 46e09a7af769-7c6ce4f65f7so821175a34.0 for ; Thu, 27 Nov 2025 12:37:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1764275860; x=1764880660; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=VAo/zLdFSCy3ZivNRUcyPkQKSGvTdHQmOTB6uk6YR/E=; b=QR9S/CvZtafMGCQeBzshuyWtXUDHirqF3a0SjtGQX2fedxbKRrf+tRy+x16IQ+i348 zyEoekFLnBhdbT0tTkAYpHBdxFnsWZpLT4SaAg1fLjXXC/owMycgNGt1ihWAMgYLCAjc RR0V09bG4fP7Z4E45P34ftL85mPjzX9fccyLri0iMFzutxnlX9vzhi7/v1lbOnsUEd6C /Z2V8ezbEQ5NtoGkU2elXZ7pGyOa/ctraKHA9vQHu27MYPeFGlCc1259EZy2OuhTmKAd F4EMG3E/UQkf2B83eZnLmQ12gFCpMzXp56n8X3wQQSyjOsTJUj8BlBEV50B7HM8k9JKZ 5fuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764275860; x=1764880660; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=VAo/zLdFSCy3ZivNRUcyPkQKSGvTdHQmOTB6uk6YR/E=; b=iT0cLmXVSuCsx+VuFr7OrPqtiFm52sPhCAT2tAmfC8pBK56bM4ZTJzz3q97IqVRLY0 fZnUlWmezGrDnRlFoVFRXW0436B8nQzF8r0/+ehAGbt65NA8XZakR9eidZZesXHM4o7I jxwyNQbF0M5VqMmlkw1H3NEhWqPsNg8tlJtAAK+mD661IOO5GVVrQtWmQBPCm9tVwmyc kHO7H1Zl/dI2wgV60bCXS1oP81r+qgavwJbbl4CRitRP3qzqxo+/PrhP4OHfNz0i7FS/ 2OUhPyGhLUF+l+xBobD2D76MatUnc2oE4ggv2cymib2ujtNwMG3KX36KgS6RgqLjSnIp M1dA== X-Forwarded-Encrypted: i=1; AJvYcCXJnHQqcXDOoU8+9EOTMrv10lRvl9aX1zrjhuSUfiJbfQ1ysC944L12gDIFlxr/cIy7GGT3YJPzGLSTHI0=@vger.kernel.org X-Gm-Message-State: AOJu0Yw2V6rpYWkri2t5YuYzfxKP2x60VKqbKMmYxhi2uzdNzMLmojBy 0bNY+TzNmphF3yb38bbbYh0N9avYgWNuRS2rxkidi7CvUl1Mgr/UVDqk X-Gm-Gg: ASbGnct3v5mwn2SxBaQAZsJDLEkCjrClR3Ub6mkKWOgkYNIP9jXc7ru9GfuDoCnil0A QiPLWjMe4X2ThpQ1RZ/EuS6T6UgeutEqM89K3dmUZ5R0CrWDA5JM8nNgqT3RDTgbO8zYL7EQPlO jgaAkLo7jxVdH8zTu9xjbhbsDoauwS0pMLQOZnTOsJgK9Yj+BPU0q4952FWpHzWFIUxwniKEBLK sgYTY6EXEN9/jlF4gFIU4gngiPMI/Cjred5N8pJt1FlzWXUKegSUti1v0lHKK1Kfs/67uV5saEZ rikegFJdAMJgy722TVGyCIKrGRJ2SocU1mt/mojhcfx10j25z4MSMJKu2wgc2tRFFaMQnRG598k mG4oVIwy5mnlnCe6wxcQivHq75Ybtsc4Ms6N6rESSpXQ2eqpcxkOwZrJQFmpM60CQmC/DYH5IsA iS0H4pJMGdxoil7JhtUmUq X-Google-Smtp-Source: AGHT+IEITYWy9i5DwKGZeqsAnMC7fmhTam9fuM6t1EFIYEodQWt51NIFnOdOlkyNhfNj6pAmkAkyQQ== X-Received: by 2002:a05:6830:7309:b0:7c7:3416:ff8d with SMTP id 46e09a7af769-7c7c412baf3mr5820407a34.9.1764275859847; Thu, 27 Nov 2025 12:37:39 -0800 (PST) Received: from localhost ([2a03:2880:10ff:43::]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-7c90fe15847sm871772a34.25.2025.11.27.12.37.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Nov 2025 12:37:39 -0800 (PST) From: Usama Arif To: rppt@kernel.org, Andrew Morton Cc: kas@kernel.org, changyuanl@google.com, graf@amazon.com, leitao@debian.org, thevlad@meta.com, pratyush@kernel.org, dave.hansen@linux.intel.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, kernel-team@meta.com, Usama Arif Subject: [PATCH v2 1/2] mm/memblock: remove CONFIG_MEMBLOCK_KHO_SCRATCH option Date: Thu, 27 Nov 2025 20:33:19 +0000 Message-ID: <20251127203724.3177621-2-usamaarif642@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251127203724.3177621-1-usamaarif642@gmail.com> References: <20251127203724.3177621-1-usamaarif642@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The only defconfig that selects this is CONFIG_KEXEC_HANDOVER. Replace CONFIG_MEMBLOCK_KHO_SCRATCH with CONFIG_KEXEC_HANDOVER to simplify code. No functional change intended. Suggested-by: Kiryl Shutsemau Signed-off-by: Usama Arif Reviewed-by: Kiryl Shutsemau Reviewed-by: Pratyush Yadav --- include/linux/memblock.h | 2 +- kernel/Kconfig.kexec | 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 221118b5a16e1..8bd9bcaccceb8 100644 --- a/include/linux/memblock.h +++ b/include/linux/memblock.h @@ -611,7 +611,7 @@ static inline void early_memtest(phys_addr_t start, phy= s_addr_t end) { } static inline void memtest_report_meminfo(struct seq_file *m) { } #endif =20 -#ifdef CONFIG_MEMBLOCK_KHO_SCRATCH +#ifdef CONFIG_KEXEC_HANDOVER void memblock_set_kho_scratch_only(void); void memblock_clear_kho_scratch_only(void); void memmap_init_kho_scratch_pages(void); diff --git a/kernel/Kconfig.kexec b/kernel/Kconfig.kexec index 54e5810726176..06a7c43652cfd 100644 --- a/kernel/Kconfig.kexec +++ b/kernel/Kconfig.kexec @@ -98,7 +98,6 @@ config KEXEC_HANDOVER bool "kexec handover" depends on ARCH_SUPPORTS_KEXEC_HANDOVER && ARCH_SUPPORTS_KEXEC_FILE depends on !DEFERRED_STRUCT_PAGE_INIT - select MEMBLOCK_KHO_SCRATCH select KEXEC_FILE select DEBUG_FS select LIBFDT diff --git a/mm/Kconfig b/mm/Kconfig index bd0ea5454af82..6d6002f57c18f 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -442,10 +442,6 @@ config HAVE_GUP_FAST depends on MMU bool =20 -# Enable memblock support for scratch memory which is needed for kexec han= dover -config MEMBLOCK_KHO_SCRATCH - bool - # Don't discard allocated memory used to track "memory" and "reserved" mem= blocks # 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 e23e16618e9b3..8b13d5c28922a 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -112,7 +112,7 @@ unsigned long min_low_pfn; unsigned long max_pfn; unsigned long long max_possible_pfn; =20 -#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 @@ -948,7 +948,7 @@ int __init_memblock memblock_physmem_add(phys_addr_t ba= se, phys_addr_t size) } #endif =20 -#ifdef CONFIG_MEMBLOCK_KHO_SCRATCH +#ifdef CONFIG_KEXEC_HANDOVER __init void memblock_set_kho_scratch_only(void) { kho_scratch_only =3D true; --=20 2.47.3