From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C46E6C433E2 for ; Mon, 7 Sep 2020 10:36:11 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 410B920768 for ; Mon, 7 Sep 2020 10:36:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 410B920768 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=loongson.cn Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 7424A6B005C; Mon, 7 Sep 2020 06:36:09 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6F3286B0062; Mon, 7 Sep 2020 06:36:09 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5E02A8E0001; Mon, 7 Sep 2020 06:36:09 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0118.hostedemail.com [216.40.44.118]) by kanga.kvack.org (Postfix) with ESMTP id 451526B005C for ; Mon, 7 Sep 2020 06:36:09 -0400 (EDT) Received: from smtpin23.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 01D59181AC9CB for ; Mon, 7 Sep 2020 10:36:09 +0000 (UTC) X-FDA: 77235910458.23.corn30_5a150bc270cb Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin23.hostedemail.com (Postfix) with ESMTP id C829B37608 for ; Mon, 7 Sep 2020 10:36:08 +0000 (UTC) X-HE-Tag: corn30_5a150bc270cb X-Filterd-Recvd-Size: 11114 Received: from loongson.cn (mail.loongson.cn [114.242.206.163]) by imf40.hostedemail.com (Postfix) with ESMTP for ; Mon, 7 Sep 2020 10:36:06 +0000 (UTC) Received: from ambrosehua-HP-xw6600-Workstation (unknown [182.149.160.36]) by mail.loongson.cn (Coremail) with SMTP id AQAAf9AxauQHDVZfXVASAA--.22416S2; Mon, 07 Sep 2020 18:35:53 +0800 (CST) Date: Mon, 7 Sep 2020 18:35:51 +0800 From: Huang Pei To: maobibo Cc: Thomas Bogendoerfer , ambrosehua@gmail.com, Andrew Morton , linux-mips@vger.kernel.org, linux-arch@vger.kernel.org, linux-mm@kvack.org, Jiaxun Yang , Paul Burton , Li Xuefeng , Yang Tiezhu , Gao Juxin , Fuxin Zhang , Huacai Chen Subject: Re: [PATCH] MIPS: make userspace mapping young by default Message-ID: <20200907103551.2pkntwm66t3yma6u@ambrosehua-HP-xw6600-Workstation> References: <20200904084926.20924-1-huangpei@loongson.cn> <27a393fa-f00b-fbcc-0d3b-529113bc0e61@loongson.cn> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <27a393fa-f00b-fbcc-0d3b-529113bc0e61@loongson.cn> User-Agent: NeoMutt/20171215 X-CM-TRANSID:AQAAf9AxauQHDVZfXVASAA--.22416S2 X-Coremail-Antispam: 1UD129KBjvJXoW3Ww1xJF43Jw4fWw1kKw1ftFb_yoW3uw48pa s7CFy0yay3Xry3AryxZrnrAw1rAwsFqFy0qwnrCa15X343Z34ktrs8KrZ3ZryDuFZ2kw48 ZF1UXr45ua9I9rUanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUvl14x267AKxVW8JVW5JwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK02 1l84ACjcxK6xIIjxv20xvE14v26r1I6r4UM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26r4j 6F4UM28EF7xvwVC2z280aVAFwI0_Cr1j6rxdM28EF7xvwVC2z280aVCY1x0267AKxVW0oV Cq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0 I7IYx2IY67AKxVWUGVWUXwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r 4UM4x0Y48IcVAKI48JM4x0x7Aq67IIx4CEVc8vx2IErcIFxwACI402YVCY1x02628vn2kI c2xKxwCY02Avz4vE14v_Gw1l42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr 1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE 14v26r1q6r43MIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7 IYx2IY6xkF7I0E14v26r4j6F4UMIIF0xvE42xK8VAvwI8IcIk0rVWrZr1j6s0DMIIF0xvE x4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Gr0_Gr1UYxBIdaVFxhVjvj DU0xZFpf9x0JUZYFZUUUUU= X-CM-SenderInfo: xkxd0whshlqz5rrqw2lrqou0/ X-Rspamd-Queue-Id: C829B37608 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam04 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Mon, Sep 07, 2020 at 04:50:45PM +0800, maobibo wrote: > Sorry for the late reply. > > Would you like to remove definition of macro pte_sw_mkyoung in header > file include/linux/pgtable.h, since it is not used any more. > > The others look good to me. > > regards > bibo,mao > > On 09/04/2020 04:49 PM, Huang Pei wrote: > > This version removes pte_sw_mkyoung without polluting MM code and covers > > both no-RIXI and RIXI MIPS CPUs and makes page fault delay of MIPS on par > > with other architecture > > > > MIPS page fault path take 3 exceptions (1 TLB Miss + 2 TLB Invalid), but > > the second TLB Invalid exception is just triggered by __update_tlb from > > do_page_fault writing tlb without _PAGE_VALID set. By making userspace > > mapping young by default, aka _PAGE_VALID and _PAGE_ACCESSED both set in > > prot, it only take 1 TLB Miss + 1 TLB Invalid exceptions > > > > [1]: https://lkml.kernel.org/lkml/1591416169-26666-1-git-send-email > > -maobibo@loongson.cn/ > > > > Co-developed-by: Bibo Mao > > Co-developed-by: Huang Pei > > Signed-off-by: Huang Pei > > --- > > arch/mips/include/asm/pgtable.h | 32 +++++++++++++++----------------- > > arch/mips/mm/cache.c | 25 +++++++++++++------------ > > mm/memory.c | 3 --- > > 3 files changed, 28 insertions(+), 32 deletions(-) > > > > diff --git a/arch/mips/include/asm/pgtable.h b/arch/mips/include/asm/pgtable.h > > index dd7a0f552cac..aaafe3d6a0a1 100644 > > --- a/arch/mips/include/asm/pgtable.h > > +++ b/arch/mips/include/asm/pgtable.h > > @@ -25,22 +25,22 @@ > > struct mm_struct; > > struct vm_area_struct; > > > > -#define PAGE_NONE __pgprot(_PAGE_PRESENT | _PAGE_NO_READ | \ > > - _page_cachable_default) > > -#define PAGE_SHARED __pgprot(_PAGE_PRESENT | _PAGE_WRITE | \ > > - _page_cachable_default) > > -#define PAGE_COPY __pgprot(_PAGE_PRESENT | _PAGE_NO_EXEC | \ > > - _page_cachable_default) > > -#define PAGE_READONLY __pgprot(_PAGE_PRESENT | \ > > - _page_cachable_default) > > -#define PAGE_KERNEL __pgprot(_PAGE_PRESENT | __READABLE | __WRITEABLE | \ > > - _PAGE_GLOBAL | _page_cachable_default) > > -#define PAGE_KERNEL_NC __pgprot(_PAGE_PRESENT | __READABLE | __WRITEABLE | \ > > - _PAGE_GLOBAL | _CACHE_CACHABLE_NONCOHERENT) > > -#define PAGE_USERIO __pgprot(_PAGE_PRESENT | _PAGE_WRITE | \ > > - _page_cachable_default) > > +#define PAGE_NONE __pgprot(_PAGE_PRESENT | _PAGE_NO_READ | \ > > + _page_cachable_default) > > +#define PAGE_SHARED __pgprot(_PAGE_PRESENT | _PAGE_WRITE | \ > > + __READABLE | _page_cachable_default) > > +#define PAGE_COPY __pgprot(_PAGE_PRESENT | _PAGE_NO_EXEC | \ > > + __READABLE | _page_cachable_default) > > +#define PAGE_READONLY __pgprot(_PAGE_PRESENT | __READABLE | \ > > + _page_cachable_default) > > +#define PAGE_KERNEL __pgprot(_PAGE_PRESENT | __READABLE | __WRITEABLE | \ > > + _PAGE_GLOBAL | _page_cachable_default) > > +#define PAGE_KERNEL_NC __pgprot(_PAGE_PRESENT | __READABLE | __WRITEABLE | \ > > + _PAGE_GLOBAL | _CACHE_CACHABLE_NONCOHERENT) > > +#define PAGE_USERIO __pgprot(_PAGE_PRESENT | _PAGE_WRITE | \ > > + _page_cachable_default) > > #define PAGE_KERNEL_UNCACHED __pgprot(_PAGE_PRESENT | __READABLE | \ > > - __WRITEABLE | _PAGE_GLOBAL | _CACHE_UNCACHED) > > + __WRITEABLE | _PAGE_GLOBAL | _CACHE_UNCACHED) > > > > /* > > * If _PAGE_NO_EXEC is not defined, we can't do page protection for > > @@ -414,8 +414,6 @@ static inline pte_t pte_mkyoung(pte_t pte) > > return pte; > > } > > > > -#define pte_sw_mkyoung pte_mkyoung > > - > > #ifdef CONFIG_MIPS_HUGE_TLB_SUPPORT > > static inline int pte_huge(pte_t pte) { return pte_val(pte) & _PAGE_HUGE; } > > > > diff --git a/arch/mips/mm/cache.c b/arch/mips/mm/cache.c > > index 3e81ba000096..ed75f2871aad 100644 > > --- a/arch/mips/mm/cache.c > > +++ b/arch/mips/mm/cache.c > > @@ -159,22 +159,23 @@ static inline void setup_protection_map(void) > > { > > if (cpu_has_rixi) { > > protection_map[0] = __pgprot(_page_cachable_default | _PAGE_PRESENT | _PAGE_NO_EXEC | _PAGE_NO_READ); > > - protection_map[1] = __pgprot(_page_cachable_default | _PAGE_PRESENT | _PAGE_NO_EXEC); > > + protection_map[1] = __pgprot(_page_cachable_default | _PAGE_PRESENT | _PAGE_NO_EXEC | __READABLE); > > protection_map[2] = __pgprot(_page_cachable_default | _PAGE_PRESENT | _PAGE_NO_EXEC | _PAGE_NO_READ); > > - protection_map[3] = __pgprot(_page_cachable_default | _PAGE_PRESENT | _PAGE_NO_EXEC); > > - protection_map[4] = __pgprot(_page_cachable_default | _PAGE_PRESENT); > > - protection_map[5] = __pgprot(_page_cachable_default | _PAGE_PRESENT); > > - protection_map[6] = __pgprot(_page_cachable_default | _PAGE_PRESENT); > > - protection_map[7] = __pgprot(_page_cachable_default | _PAGE_PRESENT); > > + protection_map[3] = __pgprot(_page_cachable_default | _PAGE_PRESENT | _PAGE_NO_EXEC | __READABLE); > > + protection_map[4] = __pgprot(_page_cachable_default | _PAGE_PRESENT | __READABLE); > > + protection_map[5] = __pgprot(_page_cachable_default | _PAGE_PRESENT | __READABLE); > > + protection_map[6] = __pgprot(_page_cachable_default | _PAGE_PRESENT | __READABLE); > > + protection_map[7] = __pgprot(_page_cachable_default | _PAGE_PRESENT | __READABLE); > > > > protection_map[8] = __pgprot(_page_cachable_default | _PAGE_PRESENT | _PAGE_NO_EXEC | _PAGE_NO_READ); > > - protection_map[9] = __pgprot(_page_cachable_default | _PAGE_PRESENT | _PAGE_NO_EXEC); > > + protection_map[9] = __pgprot(_page_cachable_default | _PAGE_PRESENT | _PAGE_NO_EXEC | __READABLE); > > protection_map[10] = __pgprot(_page_cachable_default | _PAGE_PRESENT | _PAGE_NO_EXEC | _PAGE_WRITE | _PAGE_NO_READ); > > - protection_map[11] = __pgprot(_page_cachable_default | _PAGE_PRESENT | _PAGE_NO_EXEC | _PAGE_WRITE); > > - protection_map[12] = __pgprot(_page_cachable_default | _PAGE_PRESENT); > > - protection_map[13] = __pgprot(_page_cachable_default | _PAGE_PRESENT); > > - protection_map[14] = __pgprot(_page_cachable_default | _PAGE_PRESENT | _PAGE_WRITE); > > - protection_map[15] = __pgprot(_page_cachable_default | _PAGE_PRESENT | _PAGE_WRITE); > > + protection_map[11] = __pgprot(_page_cachable_default | _PAGE_PRESENT | _PAGE_NO_EXEC | _PAGE_WRITE | __READABLE); > > + protection_map[12] = __pgprot(_page_cachable_default | _PAGE_PRESENT | __READABLE); > > + protection_map[13] = __pgprot(_page_cachable_default | _PAGE_PRESENT | __READABLE); > > + protection_map[14] = __pgprot(_page_cachable_default | _PAGE_PRESENT | _PAGE_NO_EXEC | __READABLE); > > + protection_map[15] = __pgprot(_page_cachable_default | _PAGE_PRESENT | _PAGE_NO_EXEC | __READABLE); > > + > > > > } else { > > protection_map[0] = PAGE_NONE; > > diff --git a/mm/memory.c b/mm/memory.c > > index 602f4283122f..5100ab5bcf77 100644 > > --- a/mm/memory.c > > +++ b/mm/memory.c > > @@ -2705,7 +2705,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); > > /* > > * Clear the pte entry and flush it first, before updating the > > @@ -3386,7 +3385,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)); > > > > @@ -3661,7 +3659,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 */ > > I search for pte_sw_mkyoung/pte_{clear,mk,}_savewrite, none of which is used, do I really need to remove pte_sw_mkyoung in this patch just for *not used* ?