Skip to content

Commit

Permalink
x86/mm/64: Update comment in preallocate_vmalloc_pages()
Browse files Browse the repository at this point in the history
The comment explaining why 4-level systems only need to allocate on
the P4D level caused some confustion. Update it to better explain why
on 4-level systems the allocation on PUD level is necessary.

Signed-off-by: Joerg Roedel <jroedel@suse.de>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20200814151947.26229-3-joro@8bytes.org
  • Loading branch information
Joerg Roedel authored and Ingo Molnar committed Aug 15, 2020
1 parent 58a18fe commit 7a27ef5
Showing 1 changed file with 10 additions and 5 deletions.
15 changes: 10 additions & 5 deletions arch/x86/mm/init_64.c
Original file line number Diff line number Diff line change
Expand Up @@ -1252,14 +1252,19 @@ static void __init preallocate_vmalloc_pages(void)
if (!p4d)
goto failed;

/*
* With 5-level paging the P4D level is not folded. So the PGDs
* are now populated and there is no need to walk down to the
* PUD level.
*/
if (pgtable_l5_enabled())
continue;

/*
* The goal here is to allocate all possibly required
* hardware page tables pointed to by the top hardware
* level.
*
* On 4-level systems, the P4D layer is folded away and
* the above code does no preallocation. Below, go down
* to the pud _software_ level to ensure the second
* hardware level is allocated on 4-level systems too.
*/
lvl = "pud";
pud = pud_alloc(&init_mm, p4d, addr);
if (!pud)
Expand Down

0 comments on commit 7a27ef5

Please sign in to comment.