gh0s7/mckernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

memory/x86_64: fix linux safe_kernel_map

Browse Source 
init_linux_kernel_mapping is called in setup_x86_phase1 way
before arguments are setup, but we can access kernel boot args
directly and use that, so ugly fix for now.

Change-Id: I285ecc31c6646d6d18566d411b09ae3190e8101e
Refs: #1228
This commit is contained in:
Dominique Martinet
2018-12-04 18:11:33 +09:00
committed by Masamichi Takagi
parent bbc39480d2
commit 52cd57fed2
2 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
arch/x86_64/kernel/memory.c
View File

@@ -39,8 +39,6 @@ extern char _head[], _end[];
extern unsigned long x86_kernel_phys_base; extern unsigned long x86_kernel_phys_base;
int safe_kernel_map = 0;
/* Arch specific early allocation routine */ /* Arch specific early allocation routine */
void *early_alloc_pages(int nr_pages) void *early_alloc_pages(int nr_pages)
{ {
@@ -2543,6 +2541,8 @@ static void init_normal_area(struct page_table *pt)
} }
} }
extern char *find_command_line(char *name);
static void init_linux_kernel_mapping(struct page_table *pt) static void init_linux_kernel_mapping(struct page_table *pt)
{ {
unsigned long map_start, map_end, phys; unsigned long map_start, map_end, phys;
@@ -2552,7 +2552,7 @@ static void init_linux_kernel_mapping(struct page_table *pt)
/* In case of safe_kernel_map option (safe_kernel_map == 1), /* In case of safe_kernel_map option (safe_kernel_map == 1),
* processing to prevent destruction of the memory area on Linux side * processing to prevent destruction of the memory area on Linux side
* is executed */ * is executed */
if (safe_kernel_map == 0) { if (find_command_line("safe_kernel_map") == NULL) {
kprintf("Straight-map entire physical memory\n"); kprintf("Straight-map entire physical memory\n");
/* Map 2 TB for now */ /* Map 2 TB for now */

7
kernel/init.c
View File

@@ -130,8 +130,6 @@ char *find_command_line(char *name)
return strstr(cmdline, name); return strstr(cmdline, name);
} }
extern int safe_kernel_map;
static void parse_kargs(void) static void parse_kargs(void)
{ {
char *ptr; char *ptr;
@@ -152,11 +150,6 @@ static void parse_kargs(void)
} }
ihk_mc_set_dump_level(dump_level); ihk_mc_set_dump_level(dump_level);
ptr = find_command_line("safe_kernel_map");
if (ptr) {
safe_kernel_map = 1;
}
/* idle_halt option */ /* idle_halt option */
ptr = find_command_line("idle_halt"); ptr = find_command_line("idle_halt");
if (ptr) { if (ptr) {