Received-SPF: pass (google.com: domain of linux-kernel+bounces-156072-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
From: Byungchul Park <byungchul@sk.com>
To: tglx@linutronix.de,
	mingo@redhat.com,
	bp@alien8.de,
	dave.hansen@linux.intel.com,
	x86@kernel.org,
	hpa@zytor.com,
	jbohac@suse.cz,
	dyoung@redhat.com
Cc: kernel_team@skhynix.com,
	linux-kernel@vger.kernel.org
Subject: [PATCH v2] x86/e820: apply 'mem=' boot command while reserving memory using boot_params
Date: Wed, 24 Apr 2024 10:03:13 +0900
Message-Id: <20240424010313.25264-1-byungchul@sk.com>
In-Reply-To: <20240423102320.GA47818@system.software.com>
References: <20240423102320.GA47818@system.software.com>
Precedence: bulk

I might miss something.  Please lemme know if I go wrong.  Thanks.

	Byungchul

Changes from v1
	1. before - handle boot_mem_limit assuming the default is U64_MAX.
	   after  - handle boot_mem_limit assuming the default is 0.

--->8---
From e8bf247d6024b35af5300914dcff9135df9c1d66 Mon Sep 17 00:00:00 2001
From: Byungchul Park <byungchul@sk.com>
Date: Wed, 24 Apr 2024 09:55:25 +0900
Subject: [PATCH v2] x86/e820: apply 'mem=' boot command while reserving memory using boot_params

When a user specifies 'mem=' boot command, it's expected to limit the
maximum address of usable memory for the kernel no matter what the
memory map source is.  However, 'mem=' boot command doesn't work since
it doesn't respect it when reserving memory using boot_params.

Applied the restriction when reserving memory using boot_params.  While
at it, renamed mem_size to a more specific name, boot_mem_limit.

Signed-off-by: Byungchul Park <byungchul@sk.com>
---
 arch/x86/kernel/e820.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c
index 6f1b379e3b38..e3f716128caf 100644
--- a/arch/x86/kernel/e820.c
+++ b/arch/x86/kernel/e820.c
@@ -880,11 +880,11 @@ static void __init early_panic(char *msg)
 
 static int userdef __initdata;
 
+static u64 boot_mem_limit;
+
 /* The "mem=nopentium" boot option disables 4MB page tables on 32-bit kernels: */
 static int __init parse_memopt(char *p)
 {
-	u64 mem_size;
-
 	if (!p)
 		return -EINVAL;
 
@@ -899,16 +899,16 @@ static int __init parse_memopt(char *p)
 	}
 
 	userdef = 1;
-	mem_size = memparse(p, &p);
+	boot_mem_limit = memparse(p, &p);
 
 	/* Don't remove all memory when getting "mem={invalid}" parameter: */
-	if (mem_size == 0)
+	if (boot_mem_limit == 0)
 		return -EINVAL;
 
-	e820__range_remove(mem_size, ULLONG_MAX - mem_size, E820_TYPE_RAM, 1);
+	e820__range_remove(boot_mem_limit, ULLONG_MAX - boot_mem_limit, E820_TYPE_RAM, 1);
 
 #ifdef CONFIG_MEMORY_HOTPLUG
-	max_mem_size = mem_size;
+	max_mem_size = boot_mem_limit;
 #endif
 
 	return 0;
@@ -1036,6 +1036,9 @@ void __init e820__reserve_setup_data(void)
 		early_memunmap(data, len);
 	}
 
+	if (boot_mem_limit)
+		e820__range_remove(boot_mem_limit, ULLONG_MAX - boot_mem_limit,
+				E820_TYPE_RESERVED_KERN, 1);
 	e820__update_table(e820_table);
 
 	pr_info("extended physical RAM map:\n");
-- 
2.17.1