| Message ID | 20221216114853.8227-20-julien@xen.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Remove the directmap | expand |
Hi Julien, > -----Original Message----- > Subject: [PATCH 19/22] xen/arm32: mm: Rename 'first' to 'root' in > init_secondary_pagetables() > > From: Julien Grall <jgrall@amazon.com> > > The arm32 version of init_secondary_pagetables() will soon be re-used > for arm64 as well where the root table start at level 0 rather than level 1. Nit: s/start at/starts at/ > > So rename 'first' to 'root'. > > Signed-off-by: Julien Grall <jgrall@amazon.com> Reviewed-by: Henry Wang <Henry.Wang@arm.com> Kind regards, Henry
On Fri, 16 Dec 2022, Julien Grall wrote: > From: Julien Grall <jgrall@amazon.com> > > The arm32 version of init_secondary_pagetables() will soon be re-used > for arm64 as well where the root table start at level 0 rather than level 1. > > So rename 'first' to 'root'. > > Signed-off-by: Julien Grall <jgrall@amazon.com> Reviewed-by: Stefano Stabellini <sstabellini@kernel.org> > --- > xen/arch/arm/mm.c | 16 +++++++--------- > 1 file changed, 7 insertions(+), 9 deletions(-) > > diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c > index 0fc6f2992dd1..4e208f7d20c8 100644 > --- a/xen/arch/arm/mm.c > +++ b/xen/arch/arm/mm.c > @@ -571,32 +571,30 @@ int init_secondary_pagetables(int cpu) > #else > int init_secondary_pagetables(int cpu) > { > - lpae_t *first; > + lpae_t *root = alloc_xenheap_page(); > > - first = alloc_xenheap_page(); /* root == first level on 32-bit 3-level trie */ > - > - if ( !first ) > + if ( !root ) > { > - printk("CPU%u: Unable to allocate the first page-table\n", cpu); > + printk("CPU%u: Unable to allocate the root page-table\n", cpu); > return -ENOMEM; > } > > /* Initialise root pagetable from root of boot tables */ > - memcpy(first, cpu0_pgtable, PAGE_SIZE); > - per_cpu(xen_pgtable, cpu) = first; > + memcpy(root, cpu0_pgtable, PAGE_SIZE); > + per_cpu(xen_pgtable, cpu) = root; > > if ( !init_domheap_mappings(cpu) ) > { > printk("CPU%u: Unable to prepare the domheap page-tables\n", cpu); > per_cpu(xen_pgtable, cpu) = NULL; > - free_xenheap_page(first); > + free_xenheap_page(root); > return -ENOMEM; > } > > clear_boot_pagetables(); > > /* Set init_ttbr for this CPU coming up */ > - init_ttbr = __pa(first); > + init_ttbr = __pa(root); > clean_dcache(init_ttbr); > > return 0; > -- > 2.38.1 >
diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 0fc6f2992dd1..4e208f7d20c8 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -571,32 +571,30 @@ int init_secondary_pagetables(int cpu) #else int init_secondary_pagetables(int cpu) { - lpae_t *first; + lpae_t *root = alloc_xenheap_page(); - first = alloc_xenheap_page(); /* root == first level on 32-bit 3-level trie */ - - if ( !first ) + if ( !root ) { - printk("CPU%u: Unable to allocate the first page-table\n", cpu); + printk("CPU%u: Unable to allocate the root page-table\n", cpu); return -ENOMEM; } /* Initialise root pagetable from root of boot tables */ - memcpy(first, cpu0_pgtable, PAGE_SIZE); - per_cpu(xen_pgtable, cpu) = first; + memcpy(root, cpu0_pgtable, PAGE_SIZE); + per_cpu(xen_pgtable, cpu) = root; if ( !init_domheap_mappings(cpu) ) { printk("CPU%u: Unable to prepare the domheap page-tables\n", cpu); per_cpu(xen_pgtable, cpu) = NULL; - free_xenheap_page(first); + free_xenheap_page(root); return -ENOMEM; } clear_boot_pagetables(); /* Set init_ttbr for this CPU coming up */ - init_ttbr = __pa(first); + init_ttbr = __pa(root); clean_dcache(init_ttbr); return 0;