From: Nicholas Piggin <npiggin@gmail.com>
To: ambrosehua@gmail.com, Huang Pei <huangpei@loongson.cn>,
Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Andrew Morton <akpm@linux-foundation.org>,
Huacai Chen <chenhc@lemote.com>, Gao Juxin <gaojuxin@loongson.cn>,
Jiaxun Yang <jiaxun.yang@flygoat.com>,
linux-arch@vger.kernel.org, linux-mips@vger.kernel.org,
linux-mm@kvack.org, Li Xuefeng <lixuefeng@loongson.cn>,
Bibo Mao <maobibo@loongson.cn>,
Paul Burton <paulburton@kernel.org>,
Yang Tiezhu <yangtiezhu@loongson.cn>,
Fuxin Zhang <zhangfx@lemote.com>
Subject: Re: [PATCH] MIPS: make userspace mapping young by default
Date: Thu, 04 Feb 2021 13:29:26 +1000 [thread overview]
Message-ID: <1612409285.q4gi3x2bhk.astroid@bobo.none> (raw)
In-Reply-To: <20210204013942.8398-1-huangpei@loongson.cn>
Excerpts from Huang Pei's message of February 4, 2021 11:39 am:
> MIPS page fault path(except huge page) takes 3 exceptions (1 TLB Miss
> + 2 TLB Invalid), butthe second TLB Invalid exception is just
> triggered by __update_tlb from do_page_fault writing tlb without
> _PAGE_VALID set. With this patch, user space mapping prot is made
> young by default (with both _PAGE_VALID and _PAGE_YOUNG set),
> and it only take 1 TLB Miss + 1 TLB Invalid exception
>
> Remove pte_sw_mkyoung without polluting MM code and make page fault
> delay of MIPS on par with other architecture
>
> Signed-off-by: Huang Pei <huangpei@loongson.cn>
Could we merge this? For the core code,
Reviewed-by: Nicholas Piggin <npiggin@gmail.com>
> ---
> arch/mips/mm/cache.c | 30 ++++++++++++++++--------------
> include/linux/pgtable.h | 8 --------
> mm/memory.c | 3 ---
> 3 files changed, 16 insertions(+), 25 deletions(-)
>
> diff --git a/arch/mips/mm/cache.c b/arch/mips/mm/cache.c
> index 23b16bfd97b2..e19cf424bb39 100644
> --- a/arch/mips/mm/cache.c
> +++ b/arch/mips/mm/cache.c
> @@ -156,29 +156,31 @@ unsigned long _page_cachable_default;
> EXPORT_SYMBOL(_page_cachable_default);
>
> #define PM(p) __pgprot(_page_cachable_default | (p))
> +#define PVA(p) PM(_PAGE_VALID | _PAGE_ACCESSED | (p))
>
> static inline void setup_protection_map(void)
> {
> protection_map[0] = PM(_PAGE_PRESENT | _PAGE_NO_EXEC | _PAGE_NO_READ);
> - protection_map[1] = PM(_PAGE_PRESENT | _PAGE_NO_EXEC);
> - protection_map[2] = PM(_PAGE_PRESENT | _PAGE_NO_EXEC | _PAGE_NO_READ);
> - protection_map[3] = PM(_PAGE_PRESENT | _PAGE_NO_EXEC);
> - protection_map[4] = PM(_PAGE_PRESENT);
> - protection_map[5] = PM(_PAGE_PRESENT);
> - protection_map[6] = PM(_PAGE_PRESENT);
> - protection_map[7] = PM(_PAGE_PRESENT);
> + protection_map[1] = PVA(_PAGE_PRESENT | _PAGE_NO_EXEC);
> + protection_map[2] = PVA(_PAGE_PRESENT | _PAGE_NO_EXEC | _PAGE_NO_READ);
> + protection_map[3] = PVA(_PAGE_PRESENT | _PAGE_NO_EXEC);
> + protection_map[4] = PVA(_PAGE_PRESENT);
> + protection_map[5] = PVA(_PAGE_PRESENT);
> + protection_map[6] = PVA(_PAGE_PRESENT);
> + protection_map[7] = PVA(_PAGE_PRESENT);
>
> protection_map[8] = PM(_PAGE_PRESENT | _PAGE_NO_EXEC | _PAGE_NO_READ);
> - protection_map[9] = PM(_PAGE_PRESENT | _PAGE_NO_EXEC);
> - protection_map[10] = PM(_PAGE_PRESENT | _PAGE_NO_EXEC | _PAGE_WRITE |
> + protection_map[9] = PVA(_PAGE_PRESENT | _PAGE_NO_EXEC);
> + protection_map[10] = PVA(_PAGE_PRESENT | _PAGE_NO_EXEC | _PAGE_WRITE |
> _PAGE_NO_READ);
> - protection_map[11] = PM(_PAGE_PRESENT | _PAGE_NO_EXEC | _PAGE_WRITE);
> - protection_map[12] = PM(_PAGE_PRESENT);
> - protection_map[13] = PM(_PAGE_PRESENT);
> - protection_map[14] = PM(_PAGE_PRESENT | _PAGE_WRITE);
> - protection_map[15] = PM(_PAGE_PRESENT | _PAGE_WRITE);
> + protection_map[11] = PVA(_PAGE_PRESENT | _PAGE_NO_EXEC | _PAGE_WRITE);
> + protection_map[12] = PVA(_PAGE_PRESENT);
> + protection_map[13] = PVA(_PAGE_PRESENT);
> + protection_map[14] = PVA(_PAGE_PRESENT);
> + protection_map[15] = PVA(_PAGE_PRESENT);
> }
>
> +#undef _PVA
> #undef PM
>
> void cpu_cache_init(void)
> diff --git a/include/linux/pgtable.h b/include/linux/pgtable.h
> index 8fcdfa52eb4b..8c042627399a 100644
> --- a/include/linux/pgtable.h
> +++ b/include/linux/pgtable.h
> @@ -432,14 +432,6 @@ static inline void ptep_set_wrprotect(struct mm_struct *mm, unsigned long addres
> * To be differentiate with macro pte_mkyoung, this macro is used on platforms
> * where software maintains page access bit.
> */
> -#ifndef pte_sw_mkyoung
> -static inline pte_t pte_sw_mkyoung(pte_t pte)
> -{
> - return pte;
> -}
> -#define pte_sw_mkyoung pte_sw_mkyoung
> -#endif
> -
> #ifndef pte_savedwrite
> #define pte_savedwrite pte_write
> #endif
> diff --git a/mm/memory.c b/mm/memory.c
> index feff48e1465a..95718a623884 100644
> --- a/mm/memory.c
> +++ b/mm/memory.c
> @@ -2890,7 +2890,6 @@ static vm_fault_t wp_page_copy(struct vm_fault *vmf)
> }
> flush_cache_page(vma, vmf->address, pte_pfn(vmf->orig_pte));
> entry = mk_pte(new_page, vma->vm_page_prot);
> - entry = pte_sw_mkyoung(entry);
> entry = maybe_mkwrite(pte_mkdirty(entry), vma);
>
> /*
> @@ -3548,7 +3547,6 @@ static vm_fault_t do_anonymous_page(struct vm_fault *vmf)
> __SetPageUptodate(page);
>
> entry = mk_pte(page, vma->vm_page_prot);
> - entry = pte_sw_mkyoung(entry);
> if (vma->vm_flags & VM_WRITE)
> entry = pte_mkwrite(pte_mkdirty(entry));
>
> @@ -3824,7 +3822,6 @@ vm_fault_t alloc_set_pte(struct vm_fault *vmf, struct page *page)
>
> flush_icache_page(vma, page);
> entry = mk_pte(page, vma->vm_page_prot);
> - entry = pte_sw_mkyoung(entry);
> if (write)
> entry = maybe_mkwrite(pte_mkdirty(entry), vma);
> /* copy-on-write page */
> --
> 2.17.1
>
>
>
next prev parent reply other threads:[~2021-02-04 3:30 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-04 1:39 [PATCH] MIPS: make userspace mapping young by default Huang Pei
2021-02-04 3:29 ` Nicholas Piggin [this message]
2021-02-04 4:46 ` 黄沛
2021-02-04 10:34 ` Thomas Bogendoerfer
2021-02-04 11:27 ` Nicholas Piggin
2021-02-04 15:22 ` Thomas Bogendoerfer
2021-02-05 23:41 ` Andrew Morton
2021-02-08 17:44 ` Christophe Leroy
2021-02-08 19:48 ` Andrew Morton
-- strict thread matches above, loose matches on Subject: below --
2020-09-19 7:39 Huang Pei
2020-09-04 8:49 Huang Pei
2020-09-07 8:50 ` maobibo
2020-09-07 10:35 ` Huang Pei
2020-09-07 13:10 ` maobibo
2020-07-26 8:32 [PATCH v2 1/2] MIPS: Set page access bit with pgprot on platforms with RIXI Thomas Bogendoerfer
2020-08-25 3:20 ` [PATCH v2 1/2] MIPS: Set page access bit with pgprot on Huang Pei
2020-08-25 3:20 ` [PATCH] MIPS: make userspace mapping young by default Huang Pei
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=1612409285.q4gi3x2bhk.astroid@bobo.none \
--to=npiggin@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=ambrosehua@gmail.com \
--cc=chenhc@lemote.com \
--cc=gaojuxin@loongson.cn \
--cc=huangpei@loongson.cn \
--cc=jiaxun.yang@flygoat.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-mips@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=lixuefeng@loongson.cn \
--cc=maobibo@loongson.cn \
--cc=paulburton@kernel.org \
--cc=tsbogend@alpha.franken.de \
--cc=yangtiezhu@loongson.cn \
--cc=zhangfx@lemote.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).