From nobody Mon Dec 1 22:03:47 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 B3FDB32ED26 for ; Fri, 28 Nov 2025 17:33:16 +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=1764351198; cv=none; b=er7zhN0pgnlG4hiqVPaAUGO9CEaT8tUP9jMSz/P8rAEgNQZ+jQG05lph8oeOVjwGd1+4Awce7MpMAG+0zHJhfDytGRGOFUfYKFlLI1yqqmINOe46TBvLkfYDOKNvb7uKWxEBjK1grKWNJEaIpANA1VwEQZdM1h7I4jAOF2gUe3k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764351198; c=relaxed/simple; bh=Qn1HxljsC+4K012I4c9CncI8uy8SOomVEZF3XX0/23U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=W672HQcEBzjedAieey8jL4bVyWXow9DlZyCKtrPXLld4IXW5q9NTA3g4r3bVOWhstjZT3YOIIyuPhPOPZvPUccGWMAb15vgc9Cn/UIt9fDEqwkYzNLl+KChsVwGARJYBBOXKhvvg7biPJr2SQW+knOygGqOMzkWNzr9mH5XRZuo= 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=JMSwfNaS; 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="JMSwfNaS" Received: by mail-ot1-f45.google.com with SMTP id 46e09a7af769-7c7660192b0so1439777a34.0 for ; Fri, 28 Nov 2025 09:33:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1764351196; x=1764955996; 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=bzVmZEhrWIC+aQZyznc5Rubu1tLJPaR0ZiI+G8KnN/c=; b=JMSwfNaSevJKNyRprdgkA9WGQt7hcOki6jOyY0XNptWtxRldGFBRYxQ766kJR/TEOH t+1nor4A9Ky99gXb4c5wGLdsz9bHKCEylnG44ltv3dxmOvmNxyV6yuNUU7bTnMDdTLIB J80IZRXHwGDFt+H6Qz2Pp//XC+vXT2gKi+CrRqWJrW9jKsSAUY4C4WcQv9rPngB0h7ql C+Jvd/u4H/jYDpRP+OdCZEknjwS2MjZI92JkblJBup8ltBGb6KvC5Gz/TWQTL2ygQt85 BjN7S4daaYay57rkAJhESC9T28z1tXiMrqSkGnWJk4EJOJDPD1vCtVGiQ7cL+gPTq5Qz nrAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764351196; x=1764955996; 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=bzVmZEhrWIC+aQZyznc5Rubu1tLJPaR0ZiI+G8KnN/c=; b=r+K6RlJBKfNfM82Q3+jQot/UE7WOo0vTREf2Ro0eZ3PMxL3mxqDGAxa0RofaH99fRP jtSc4lVg1g/o5Wd6Cn/hfvZn+k8pwUOoxHiXPX/5QrRo7J/7eaREGFVNjHudV9QooL6E 5NwIubfMzxcPp6pm15VPEl25Idzypx5wB2kG33uM8Wa0K/b4tQ2Gl8gR3lylZi0GWoSc /JqcO1gqwyg4w4h9a/U9/z6YNht7v8+MemLSRD4jcGitrIwq0xo+KkHFFsa8ARKZJQp9 rg6RmUlKOiUF98tonAnX0CKexzZzJutL/KxLMfnUYeysKAbdzBaC2rM7aUUmWTFzBZdy rimw== X-Forwarded-Encrypted: i=1; AJvYcCV7SmepgXm4aIPrhTzOBrXo2WxzxWAxlGE4twGWsy/TTrDHnAGSiRnHB9Gs8qHTc5QbTGXspQQ7mCluix4=@vger.kernel.org X-Gm-Message-State: AOJu0YyZSGkL/5df/7HP2UThfbiZoCXRpC4i5kCfAIH02w0lVo6ci38t s2gqOFAD4KLOd3TIygK7HXpOuKJkzRKahk710XYE+0vlrp5oVfhhof2z X-Gm-Gg: ASbGncvLkRlkp5fUmLnAkPFDLtJHWfWy64zOyYo5BjtUlGi6dGKb/C4ZXL8cVLnFGCW dM6TBtC7EX7P/rZT1uXcOARP13uPIiC24KfbfbfVBDYUyoKCdmA/BUZ1/i+B2FY8UIO9BDwg46h 1iYRagMWSDhzPndOknLF9v4qqSRSEGZaaSvyKnxTNyOJ16CAQk+9cUqsYY83aj+B89y594dsOVF fxkhJACkwWH1oaSH8/4GJME6PT7xRrDy4u6pFRudXm9s24QoEts1jBA9SLtk3+vWBbIxetKjgo0 5UnEnFo4IGisCSn6d7uBIB8wuNUm1aOfLNO4qxUdOQFx4D2RXMLdk4mg0FDl+AmWv1L1gQiAcDk SDSM+yfdWgxAyRCCYBgkh7bjEWu7QXSUbUa93oexxyNPx7CJMM8j0sPdhDZuS0yG3N4kghlrwHT vVag/U7/XzMpXMgDVQManl X-Google-Smtp-Source: AGHT+IFtERT/7TfmhkqmMJead8jqcToHnN489Nt4KW+PvO7c4NBncwinwClG8PD/VeK3DQq8gpMMGQ== X-Received: by 2002:a05:6830:4186:b0:7c7:8280:edd8 with SMTP id 46e09a7af769-7c7990bb98dmr15434592a34.37.1764351195677; Fri, 28 Nov 2025 09:33:15 -0800 (PST) Received: from localhost ([2a03:2880:10ff:4d::]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-7c90fde227asm1758310a34.18.2025.11.28.09.33.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Nov 2025 09:33:15 -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 v3 1/2] mm/memblock: remove CONFIG_MEMBLOCK_KHO_SCRATCH option Date: Fri, 28 Nov 2025 17:29:33 +0000 Message-ID: <20251128173257.969322-2-usamaarif642@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251128173257.969322-1-usamaarif642@gmail.com> References: <20251128173257.969322-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 cofig option 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: Pratyush Yadav Reviewed-by: Kiryl Shutsemau --- 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