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: [RESEND PATCH v4 5/6] arm64/mm: Populate the swapper_pg_dir by fixmap. Date: Wed, 22 Aug 2018 17:54:31 +0800 [thread overview] Message-ID: <20180822095432.12125-6-yaojun8558363@gmail.com> (raw) In-Reply-To: <20180822095432.12125-1-yaojun8558363@gmail.com> Since we will move the swapper_pg_dir to rodata section, we need a way to update it. The fixmap can handle it. When the swapper_pg_dir needs to be updated, we map it dynamically. The map will be canceled after the update is complete. In this way, we can defend against KSMA(Kernel Space Mirror Attack). Signed-off-by: Jun Yao <yaojun8558363@gmail.com> --- arch/arm64/include/asm/pgtable.h | 68 ++++++++++++++++++++++++++------ arch/arm64/mm/mmu.c | 2 + 2 files changed, 59 insertions(+), 11 deletions(-) diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h index 46ef21ebfe47..d5c3df99af7b 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -45,6 +45,13 @@ #include <linux/mm_types.h> #include <linux/sched.h> +extern pgd_t init_pg_dir[PTRS_PER_PGD]; +extern pgd_t init_pg_end[]; +extern pgd_t swapper_pg_dir[PTRS_PER_PGD]; +extern pgd_t swapper_pg_end[]; +extern pgd_t idmap_pg_dir[PTRS_PER_PGD]; +extern pgd_t tramp_pg_dir[PTRS_PER_PGD]; + extern void __pte_error(const char *file, int line, unsigned long val); extern void __pmd_error(const char *file, int line, unsigned long val); extern void __pud_error(const char *file, int line, unsigned long val); @@ -428,8 +435,32 @@ extern pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn, PUD_TYPE_TABLE) #endif +extern spinlock_t swapper_pgdir_lock; + +#define pgd_set_fixmap(addr) ((pgd_t *)set_fixmap_offset(FIX_PGD, addr)) +#define pgd_clear_fixmap() clear_fixmap(FIX_PGD) + +static inline bool in_swapper_pgdir(void *addr) +{ + return ((unsigned long)addr & PAGE_MASK) == + ((unsigned long)swapper_pg_dir & PAGE_MASK); +} + static inline void set_pmd(pmd_t *pmdp, pmd_t pmd) { +#ifdef __PAGETABLE_PMD_FOLDED + if (in_swapper_pgdir(pmdp)) { + pmd_t *fixmap_pmdp; + + spin_lock(&swapper_pgdir_lock); + fixmap_pmdp = (pmd_t *)pgd_set_fixmap(__pa(pmdp)); + WRITE_ONCE(*fixmap_pmdp, pmd); + dsb(ishst); + pgd_clear_fixmap(); + spin_unlock(&swapper_pgdir_lock); + return; + } +#endif WRITE_ONCE(*pmdp, pmd); dsb(ishst); } @@ -480,6 +511,19 @@ static inline phys_addr_t pmd_page_paddr(pmd_t pmd) static inline void set_pud(pud_t *pudp, pud_t pud) { +#ifdef __PAGETABLE_PUD_FOLDED + if (in_swapper_pgdir(pudp)) { + pud_t *fixmap_pudp; + + spin_lock(&swapper_pgdir_lock); + fixmap_pudp = (pud_t *)pgd_set_fixmap(__pa(pudp)); + WRITE_ONCE(*fixmap_pudp, pud); + dsb(ishst); + pgd_clear_fixmap(); + spin_unlock(&swapper_pgdir_lock); + return; + } +#endif WRITE_ONCE(*pudp, pud); dsb(ishst); } @@ -532,8 +576,19 @@ static inline phys_addr_t pud_page_paddr(pud_t pud) static inline void set_pgd(pgd_t *pgdp, pgd_t pgd) { - WRITE_ONCE(*pgdp, pgd); - dsb(ishst); + if (in_swapper_pgdir(pgdp)) { + pgd_t *fixmap_pgdp; + + spin_lock(&swapper_pgdir_lock); + fixmap_pgdp = pgd_set_fixmap(__pa(pgdp)); + WRITE_ONCE(*fixmap_pgdp, pgd); + dsb(ishst); + pgd_clear_fixmap(); + spin_unlock(&swapper_pgdir_lock); + } else { + WRITE_ONCE(*pgdp, pgd); + dsb(ishst); + } } static inline void pgd_clear(pgd_t *pgdp) @@ -586,8 +641,6 @@ static inline phys_addr_t pgd_page_paddr(pgd_t pgd) /* to find an entry in a kernel page-table-directory */ #define pgd_offset_k(addr) pgd_offset(&init_mm, addr) -#define pgd_set_fixmap(addr) ((pgd_t *)set_fixmap_offset(FIX_PGD, addr)) -#define pgd_clear_fixmap() clear_fixmap(FIX_PGD) static inline pte_t pte_modify(pte_t pte, pgprot_t newprot) { @@ -712,13 +765,6 @@ static inline pmd_t pmdp_establish(struct vm_area_struct *vma, } #endif -extern pgd_t init_pg_dir[PTRS_PER_PGD]; -extern pgd_t init_pg_end[]; -extern pgd_t swapper_pg_dir[PTRS_PER_PGD]; -extern pgd_t swapper_pg_end[]; -extern pgd_t idmap_pg_dir[PTRS_PER_PGD]; -extern pgd_t tramp_pg_dir[PTRS_PER_PGD]; - /* * Encode and decode a swap entry: * bits 0-1: present (must be zero) diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c index b7f9afb628ac..691a05bbf87b 100644 --- a/arch/arm64/mm/mmu.c +++ b/arch/arm64/mm/mmu.c @@ -67,6 +67,8 @@ static pte_t bm_pte[PTRS_PER_PTE] __page_aligned_bss; static pmd_t bm_pmd[PTRS_PER_PMD] __page_aligned_bss __maybe_unused; static pud_t bm_pud[PTRS_PER_PUD] __page_aligned_bss __maybe_unused; +DEFINE_SPINLOCK(swapper_pgdir_lock); + pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn, unsigned long size, pgprot_t vma_prot) { -- 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: [RESEND PATCH v4 5/6] arm64/mm: Populate the swapper_pg_dir by fixmap. Date: Wed, 22 Aug 2018 17:54:31 +0800 [thread overview] Message-ID: <20180822095432.12125-6-yaojun8558363@gmail.com> (raw) In-Reply-To: <20180822095432.12125-1-yaojun8558363@gmail.com> Since we will move the swapper_pg_dir to rodata section, we need a way to update it. The fixmap can handle it. When the swapper_pg_dir needs to be updated, we map it dynamically. The map will be canceled after the update is complete. In this way, we can defend against KSMA(Kernel Space Mirror Attack). Signed-off-by: Jun Yao <yaojun8558363@gmail.com> --- arch/arm64/include/asm/pgtable.h | 68 ++++++++++++++++++++++++++------ arch/arm64/mm/mmu.c | 2 + 2 files changed, 59 insertions(+), 11 deletions(-) diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h index 46ef21ebfe47..d5c3df99af7b 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -45,6 +45,13 @@ #include <linux/mm_types.h> #include <linux/sched.h> +extern pgd_t init_pg_dir[PTRS_PER_PGD]; +extern pgd_t init_pg_end[]; +extern pgd_t swapper_pg_dir[PTRS_PER_PGD]; +extern pgd_t swapper_pg_end[]; +extern pgd_t idmap_pg_dir[PTRS_PER_PGD]; +extern pgd_t tramp_pg_dir[PTRS_PER_PGD]; + extern void __pte_error(const char *file, int line, unsigned long val); extern void __pmd_error(const char *file, int line, unsigned long val); extern void __pud_error(const char *file, int line, unsigned long val); @@ -428,8 +435,32 @@ extern pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn, PUD_TYPE_TABLE) #endif +extern spinlock_t swapper_pgdir_lock; + +#define pgd_set_fixmap(addr) ((pgd_t *)set_fixmap_offset(FIX_PGD, addr)) +#define pgd_clear_fixmap() clear_fixmap(FIX_PGD) + +static inline bool in_swapper_pgdir(void *addr) +{ + return ((unsigned long)addr & PAGE_MASK) == + ((unsigned long)swapper_pg_dir & PAGE_MASK); +} + static inline void set_pmd(pmd_t *pmdp, pmd_t pmd) { +#ifdef __PAGETABLE_PMD_FOLDED + if (in_swapper_pgdir(pmdp)) { + pmd_t *fixmap_pmdp; + + spin_lock(&swapper_pgdir_lock); + fixmap_pmdp = (pmd_t *)pgd_set_fixmap(__pa(pmdp)); + WRITE_ONCE(*fixmap_pmdp, pmd); + dsb(ishst); + pgd_clear_fixmap(); + spin_unlock(&swapper_pgdir_lock); + return; + } +#endif WRITE_ONCE(*pmdp, pmd); dsb(ishst); } @@ -480,6 +511,19 @@ static inline phys_addr_t pmd_page_paddr(pmd_t pmd) static inline void set_pud(pud_t *pudp, pud_t pud) { +#ifdef __PAGETABLE_PUD_FOLDED + if (in_swapper_pgdir(pudp)) { + pud_t *fixmap_pudp; + + spin_lock(&swapper_pgdir_lock); + fixmap_pudp = (pud_t *)pgd_set_fixmap(__pa(pudp)); + WRITE_ONCE(*fixmap_pudp, pud); + dsb(ishst); + pgd_clear_fixmap(); + spin_unlock(&swapper_pgdir_lock); + return; + } +#endif WRITE_ONCE(*pudp, pud); dsb(ishst); } @@ -532,8 +576,19 @@ static inline phys_addr_t pud_page_paddr(pud_t pud) static inline void set_pgd(pgd_t *pgdp, pgd_t pgd) { - WRITE_ONCE(*pgdp, pgd); - dsb(ishst); + if (in_swapper_pgdir(pgdp)) { + pgd_t *fixmap_pgdp; + + spin_lock(&swapper_pgdir_lock); + fixmap_pgdp = pgd_set_fixmap(__pa(pgdp)); + WRITE_ONCE(*fixmap_pgdp, pgd); + dsb(ishst); + pgd_clear_fixmap(); + spin_unlock(&swapper_pgdir_lock); + } else { + WRITE_ONCE(*pgdp, pgd); + dsb(ishst); + } } static inline void pgd_clear(pgd_t *pgdp) @@ -586,8 +641,6 @@ static inline phys_addr_t pgd_page_paddr(pgd_t pgd) /* to find an entry in a kernel page-table-directory */ #define pgd_offset_k(addr) pgd_offset(&init_mm, addr) -#define pgd_set_fixmap(addr) ((pgd_t *)set_fixmap_offset(FIX_PGD, addr)) -#define pgd_clear_fixmap() clear_fixmap(FIX_PGD) static inline pte_t pte_modify(pte_t pte, pgprot_t newprot) { @@ -712,13 +765,6 @@ static inline pmd_t pmdp_establish(struct vm_area_struct *vma, } #endif -extern pgd_t init_pg_dir[PTRS_PER_PGD]; -extern pgd_t init_pg_end[]; -extern pgd_t swapper_pg_dir[PTRS_PER_PGD]; -extern pgd_t swapper_pg_end[]; -extern pgd_t idmap_pg_dir[PTRS_PER_PGD]; -extern pgd_t tramp_pg_dir[PTRS_PER_PGD]; - /* * Encode and decode a swap entry: * bits 0-1: present (must be zero) diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c index b7f9afb628ac..691a05bbf87b 100644 --- a/arch/arm64/mm/mmu.c +++ b/arch/arm64/mm/mmu.c @@ -67,6 +67,8 @@ static pte_t bm_pte[PTRS_PER_PTE] __page_aligned_bss; static pmd_t bm_pmd[PTRS_PER_PMD] __page_aligned_bss __maybe_unused; static pud_t bm_pud[PTRS_PER_PUD] __page_aligned_bss __maybe_unused; +DEFINE_SPINLOCK(swapper_pgdir_lock); + pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn, unsigned long size, pgprot_t vma_prot) { -- 2.17.1
next prev parent reply other threads:[~2018-08-22 9:54 UTC|newest] Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-08-22 9:54 [RESEND PATCH v4 0/6] arm64/mm: Move swapper_pg_dir to rodata Jun Yao 2018-08-22 9:54 ` Jun Yao 2018-08-22 9:54 ` [RESEND PATCH v4 1/6] arm64/mm: Introduce the init_pg_dir Jun Yao 2018-08-22 9:54 ` Jun Yao 2018-09-07 9:57 ` James Morse 2018-09-07 9:57 ` James Morse 2018-08-22 9:54 ` [RESEND PATCH v4 2/6] arm64/mm: Pass ttbr1 as a parameter to __enable_mmu() Jun Yao 2018-08-22 9:54 ` Jun Yao 2018-09-07 9:57 ` James Morse 2018-09-07 9:57 ` James Morse 2018-08-22 9:54 ` [RESEND PATCH v4 3/6] arm64/mm: Create the initial page table in the init_pg_dir Jun Yao 2018-08-22 9:54 ` Jun Yao 2018-09-07 9:57 ` James Morse 2018-09-07 9:57 ` James Morse 2018-08-22 9:54 ` [RESEND PATCH v4 4/6] arm64/mm: Create the final page table directly in swapper_pg_dir Jun Yao 2018-08-22 9:54 ` Jun Yao 2018-09-07 9:57 ` James Morse 2018-09-07 9:57 ` James Morse 2018-08-22 9:54 ` Jun Yao [this message] 2018-08-22 9:54 ` [RESEND PATCH v4 5/6] arm64/mm: Populate the swapper_pg_dir by fixmap Jun Yao 2018-09-07 9:58 ` James Morse 2018-09-07 9:58 ` James Morse 2018-09-10 11:41 ` Jun Yao 2018-09-10 11:41 ` Jun Yao 2018-09-14 8:44 ` James Morse 2018-09-14 8:44 ` James Morse 2018-09-13 10:50 ` Jun Yao 2018-09-13 10:50 ` Jun Yao 2018-09-14 8:38 ` James Morse 2018-09-14 8:38 ` James Morse 2018-08-22 9:54 ` [RESEND PATCH v4 6/6] arm64/mm: Move {idmap_pg_dir .. swapper_pg_dir} to rodata section Jun Yao 2018-08-22 9:54 ` Jun Yao 2018-09-07 9:57 ` [RESEND PATCH v4 0/6] arm64/mm: Move swapper_pg_dir to rodata James Morse 2018-09-07 9:57 ` 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=20180822095432.12125-6-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.