From: Jun Yao <yaojun8558363@gmail.com> To: linux-arm-kernel@lists.infradead.org Cc: catalin.marinas@arm.com, will.deacon@arm.com, james.morse@arm.com, linux-kernel@vger.kernel.org Subject: [PATCH v5 4/6] arm64/mm: Create the final page table directly in swapper_pg_dir. Date: Mon, 17 Sep 2018 12:43:31 +0800 [thread overview] Message-ID: <20180917044333.30051-5-yaojun8558363@gmail.com> (raw) In-Reply-To: <20180917044333.30051-1-yaojun8558363@gmail.com> As the initial page table is created in the init_pg_dir, we can set up the final page table directly in the swapper_pg_dir. And it only contains the top level page table, so we can reduce it to a page size. Signed-off-by: Jun Yao <yaojun8558363@gmail.com> --- arch/arm64/kernel/vmlinux.lds.S | 2 +- arch/arm64/mm/mmu.c | 29 ++--------------------------- 2 files changed, 3 insertions(+), 28 deletions(-) diff --git a/arch/arm64/kernel/vmlinux.lds.S b/arch/arm64/kernel/vmlinux.lds.S index 612ffc0bbe11..a634def77442 100644 --- a/arch/arm64/kernel/vmlinux.lds.S +++ b/arch/arm64/kernel/vmlinux.lds.S @@ -237,7 +237,7 @@ SECTIONS . += RESERVED_TTBR0_SIZE; #endif swapper_pg_dir = .; - . += SWAPPER_DIR_SIZE; + . += PAGE_SIZE; swapper_pg_end = .; __pecoff_data_size = ABSOLUTE(. - __initdata_begin); diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c index af80dca335ce..71532bcd76c1 100644 --- a/arch/arm64/mm/mmu.c +++ b/arch/arm64/mm/mmu.c @@ -629,35 +629,10 @@ static void __init map_kernel(pgd_t *pgdp) */ void __init paging_init(void) { - phys_addr_t pgd_phys = early_pgtable_alloc(); - pgd_t *pgdp = pgd_set_fixmap(pgd_phys); - - map_kernel(pgdp); - map_mem(pgdp); - - /* - * We want to reuse the original swapper_pg_dir so we don't have to - * communicate the new address to non-coherent secondaries in - * secondary_entry, and so cpu_switch_mm can generate the address with - * adrp+add rather than a load from some global variable. - * - * To do this we need to go via a temporary pgd. - */ - cpu_replace_ttbr1(__va(pgd_phys)); - memcpy(swapper_pg_dir, pgdp, PGD_SIZE); + map_kernel(swapper_pg_dir); + map_mem(swapper_pg_dir); cpu_replace_ttbr1(lm_alias(swapper_pg_dir)); init_mm.pgd = swapper_pg_dir; - - pgd_clear_fixmap(); - memblock_free(pgd_phys, PAGE_SIZE); - - /* - * We only reuse the PGD from the swapper_pg_dir, not the pud + pmd - * allocated with it. - */ - memblock_free(__pa_symbol(swapper_pg_dir) + PAGE_SIZE, - __pa_symbol(swapper_pg_end) - __pa_symbol(swapper_pg_dir) - - PAGE_SIZE); } /* -- 2.17.1
WARNING: multiple messages have this Message-ID (diff)
From: yaojun8558363@gmail.com (Jun Yao) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v5 4/6] arm64/mm: Create the final page table directly in swapper_pg_dir. Date: Mon, 17 Sep 2018 12:43:31 +0800 [thread overview] Message-ID: <20180917044333.30051-5-yaojun8558363@gmail.com> (raw) In-Reply-To: <20180917044333.30051-1-yaojun8558363@gmail.com> As the initial page table is created in the init_pg_dir, we can set up the final page table directly in the swapper_pg_dir. And it only contains the top level page table, so we can reduce it to a page size. Signed-off-by: Jun Yao <yaojun8558363@gmail.com> --- arch/arm64/kernel/vmlinux.lds.S | 2 +- arch/arm64/mm/mmu.c | 29 ++--------------------------- 2 files changed, 3 insertions(+), 28 deletions(-) diff --git a/arch/arm64/kernel/vmlinux.lds.S b/arch/arm64/kernel/vmlinux.lds.S index 612ffc0bbe11..a634def77442 100644 --- a/arch/arm64/kernel/vmlinux.lds.S +++ b/arch/arm64/kernel/vmlinux.lds.S @@ -237,7 +237,7 @@ SECTIONS . += RESERVED_TTBR0_SIZE; #endif swapper_pg_dir = .; - . += SWAPPER_DIR_SIZE; + . += PAGE_SIZE; swapper_pg_end = .; __pecoff_data_size = ABSOLUTE(. - __initdata_begin); diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c index af80dca335ce..71532bcd76c1 100644 --- a/arch/arm64/mm/mmu.c +++ b/arch/arm64/mm/mmu.c @@ -629,35 +629,10 @@ static void __init map_kernel(pgd_t *pgdp) */ void __init paging_init(void) { - phys_addr_t pgd_phys = early_pgtable_alloc(); - pgd_t *pgdp = pgd_set_fixmap(pgd_phys); - - map_kernel(pgdp); - map_mem(pgdp); - - /* - * We want to reuse the original swapper_pg_dir so we don't have to - * communicate the new address to non-coherent secondaries in - * secondary_entry, and so cpu_switch_mm can generate the address with - * adrp+add rather than a load from some global variable. - * - * To do this we need to go via a temporary pgd. - */ - cpu_replace_ttbr1(__va(pgd_phys)); - memcpy(swapper_pg_dir, pgdp, PGD_SIZE); + map_kernel(swapper_pg_dir); + map_mem(swapper_pg_dir); cpu_replace_ttbr1(lm_alias(swapper_pg_dir)); init_mm.pgd = swapper_pg_dir; - - pgd_clear_fixmap(); - memblock_free(pgd_phys, PAGE_SIZE); - - /* - * We only reuse the PGD from the swapper_pg_dir, not the pud + pmd - * allocated with it. - */ - memblock_free(__pa_symbol(swapper_pg_dir) + PAGE_SIZE, - __pa_symbol(swapper_pg_end) - __pa_symbol(swapper_pg_dir) - - PAGE_SIZE); } /* -- 2.17.1
next prev parent reply other threads:[~2018-09-17 4:44 UTC|newest] Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-09-17 4:43 [PATCH v5 0/6] Move swapper_pg_dir to rodata section Jun Yao 2018-09-17 4:43 ` Jun Yao 2018-09-17 4:43 ` [PATCH v5 1/6] arm64/mm: Introduce the init_pg_dir Jun Yao 2018-09-17 4:43 ` Jun Yao 2018-09-24 13:01 ` Mark Rutland 2018-09-24 13:01 ` Mark Rutland 2018-09-24 14:03 ` Mark Rutland 2018-09-24 14:03 ` Mark Rutland 2018-09-17 4:43 ` [PATCH v5 2/6] arm64/mm: Pass ttbr1 as a parameter to __enable_mmu() Jun Yao 2018-09-17 4:43 ` Jun Yao 2018-09-24 13:26 ` Mark Rutland 2018-09-24 13:26 ` Mark Rutland 2018-09-17 4:43 ` [PATCH v5 3/6] arm64/mm: Create the initial page table in the init_pg_dir Jun Yao 2018-09-17 4:43 ` Jun Yao 2018-09-24 13:34 ` Mark Rutland 2018-09-24 13:34 ` Mark Rutland 2018-10-01 13:49 ` James Morse 2018-10-01 13:49 ` James Morse 2018-09-17 4:43 ` Jun Yao [this message] 2018-09-17 4:43 ` [PATCH v5 4/6] arm64/mm: Create the final page table directly in swapper_pg_dir Jun Yao 2018-09-17 4:43 ` [PATCH v5 5/6] arm64/mm: Populate the swapper_pg_dir by fixmap Jun Yao 2018-09-17 4:43 ` Jun Yao 2018-09-24 16:36 ` Mark Rutland 2018-09-24 16:36 ` Mark Rutland 2018-10-01 10:41 ` James Morse 2018-10-01 10:41 ` James Morse 2018-10-01 13:49 ` James Morse 2018-10-01 13:49 ` James Morse 2018-09-24 16:54 ` Mark Rutland 2018-09-24 16:54 ` Mark Rutland 2018-09-17 4:43 ` [PATCH v5 6/6] arm64/mm: Move {idmap_pg_dir .. swapper_pg_dir} to rodata section Jun Yao 2018-09-17 4:43 ` Jun Yao 2018-09-21 22:26 ` [PATCH v5 0/6] Move swapper_pg_dir " James Morse 2018-09-21 22:26 ` James Morse 2018-09-25 8:56 ` Jun Yao 2018-09-25 8:56 ` Jun Yao 2018-09-24 17:19 ` Mark Rutland 2018-09-24 17:19 ` Mark Rutland 2018-09-25 9:53 ` Jun Yao 2018-09-25 9:53 ` Jun Yao 2018-09-25 14:06 ` Mark Rutland, catalin.marinas 2018-09-25 14:06 ` Mark Rutland 2018-09-25 14:38 ` Catalin Marinas 2018-09-25 14:38 ` Catalin Marinas 2018-10-03 13:33 ` James Morse 2018-10-03 13:33 ` James Morse
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20180917044333.30051-5-yaojun8558363@gmail.com \ --to=yaojun8558363@gmail.com \ --cc=catalin.marinas@arm.com \ --cc=james.morse@arm.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=will.deacon@arm.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.