diff options
| author | Vasily Gorbik <gor@linux.ibm.com> | 2023-01-29 01:55:04 +0300 |
|---|---|---|
| committer | Heiko Carstens <hca@linux.ibm.com> | 2023-02-06 13:13:54 +0300 |
| commit | bf64f0517e5d0d8f3248143fc49535c1d1594b4f (patch) | |
| tree | ccfc742dbf1f7d39fd3dbc308bcae23f938040ed /arch/s390/boot/vmem.c | |
| parent | 22476f47b6b7fb7d066c71f67ebc11892adb0849 (diff) | |
| download | linux-bf64f0517e5d0d8f3248143fc49535c1d1594b4f.tar.xz | |
s390/mem_detect: handle online memory limit just once
Introduce mem_detect_truncate() to cut any online memory ranges above
established identity mapping size, so that mem_detect users wouldn't
have to do it over and over again.
Suggested-by: Alexander Gordeev <agordeev@linux.ibm.com>
Reviewed-by: Alexander Gordeev <agordeev@linux.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
Diffstat (limited to 'arch/s390/boot/vmem.c')
| -rw-r--r-- | arch/s390/boot/vmem.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/arch/s390/boot/vmem.c b/arch/s390/boot/vmem.c index a35c251c9123..82ef57827042 100644 --- a/arch/s390/boot/vmem.c +++ b/arch/s390/boot/vmem.c @@ -39,7 +39,7 @@ static void boot_check_oom(void) error("out of memory on boot\n"); } -static void pgtable_populate_init(unsigned long ident_map_size) +static void pgtable_populate_init(void) { unsigned long initrd_end; unsigned long kernel_end; @@ -51,7 +51,7 @@ static void pgtable_populate_init(unsigned long ident_map_size) pgalloc_low = max(pgalloc_low, initrd_end); } - pgalloc_end = round_down(min(ident_map_size, get_mem_detect_end()), PAGE_SIZE); + pgalloc_end = round_down(get_mem_detect_end(), PAGE_SIZE); pgalloc_pos = pgalloc_end; boot_check_oom(); @@ -226,7 +226,7 @@ static void pgtable_populate(unsigned long addr, unsigned long end, enum populat } } -void setup_vmem(unsigned long ident_map_size, unsigned long asce_limit) +void setup_vmem(unsigned long asce_limit) { unsigned long start, end; unsigned long asce_type; @@ -250,13 +250,10 @@ void setup_vmem(unsigned long ident_map_size, unsigned long asce_limit) * To prevent creation of a large page at address 0 first map * the lowcore and create the identity mapping only afterwards. */ - pgtable_populate_init(ident_map_size); + pgtable_populate_init(); pgtable_populate(0, sizeof(struct lowcore), POPULATE_ONE2ONE); - for_each_mem_detect_block(i, &start, &end) { - if (start >= ident_map_size) - break; - pgtable_populate(start, min(end, ident_map_size), POPULATE_ONE2ONE); - } + for_each_mem_detect_block(i, &start, &end) + pgtable_populate(start, end, POPULATE_ONE2ONE); pgtable_populate(__abs_lowcore, __abs_lowcore + sizeof(struct lowcore), POPULATE_ABS_LOWCORE); pgtable_populate(__memcpy_real_area, __memcpy_real_area + PAGE_SIZE, |