From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf0-f199.google.com (mail-pf0-f199.google.com [209.85.192.199]) by kanga.kvack.org (Postfix) with ESMTP id 1135A6B025F for ; Tue, 29 Aug 2017 11:14:49 -0400 (EDT) Received: by mail-pf0-f199.google.com with SMTP id m68so5265636pfj.6 for ; Tue, 29 Aug 2017 08:14:49 -0700 (PDT) Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com. [148.163.156.1]) by mx.google.com with ESMTPS id i128si2527770pfg.29.2017.08.29.08.14.45 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Aug 2017 08:14:46 -0700 (PDT) Received: from pps.filterd (m0098410.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id v7TFEYOB094689 for ; Tue, 29 Aug 2017 11:14:45 -0400 Received: from e06smtp10.uk.ibm.com (e06smtp10.uk.ibm.com [195.75.94.106]) by mx0a-001b2d01.pphosted.com with ESMTP id 2cn6w9p518-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Tue, 29 Aug 2017 11:14:43 -0400 Received: from localhost by e06smtp10.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 29 Aug 2017 16:13:53 +0100 Subject: Re: [PATCH v2 20/20] powerpc/mm: Add speculative page fault References: <1503007519-26777-1-git-send-email-ldufour@linux.vnet.ibm.com> <1503007519-26777-21-git-send-email-ldufour@linux.vnet.ibm.com> From: Laurent Dufour Date: Tue, 29 Aug 2017 17:13:44 +0200 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=windows-1252 Content-Language: en-US Content-Transfer-Encoding: 7bit Message-Id: Sender: owner-linux-mm@kvack.org List-ID: To: Anshuman Khandual , paulmck@linux.vnet.ibm.com, peterz@infradead.org, akpm@linux-foundation.org, kirill@shutemov.name, ak@linux.intel.com, mhocko@kernel.org, dave@stgolabs.net, jack@suse.cz, Matthew Wilcox , benh@kernel.crashing.org, mpe@ellerman.id.au, paulus@samba.org, Thomas Gleixner , Ingo Molnar , hpa@zytor.com, Will Deacon Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, haren@linux.vnet.ibm.com, npiggin@gmail.com, bsingharora@gmail.com, Tim Chen , linuxppc-dev@lists.ozlabs.org, x86@kernel.org On 21/08/2017 08:58, Anshuman Khandual wrote: > On 08/18/2017 03:35 AM, Laurent Dufour wrote: >> This patch enable the speculative page fault on the PowerPC >> architecture. >> >> This will try a speculative page fault without holding the mmap_sem, >> if it returns with WM_FAULT_RETRY, the mmap_sem is acquired and the > > s/WM_FAULT_RETRY/VM_FAULT_RETRY/ Good catch ;) >> traditional page fault processing is done. >> >> Support is only provide for BOOK3S_64 currently because: >> - require CONFIG_PPC_STD_MMU because checks done in >> set_access_flags_filter() > > What checks are done in set_access_flags_filter() ? We are just > adding the code block in do_page_fault(). set_access_flags_filter() is checking for vm_flags & VM_EXEC which may be changed in our back, leading to a spurious WARN displayed. This being said, I focused on the BOOK3S as this meaningful for large system, and I didn't get time to check for embedded systems. > >> - require BOOK3S because we can't support for book3e_hugetlb_preload() >> called by update_mmu_cache() >> >> Signed-off-by: Laurent Dufour >> --- >> arch/powerpc/include/asm/book3s/64/pgtable.h | 5 +++++ >> arch/powerpc/mm/fault.c | 30 +++++++++++++++++++++++++++- >> 2 files changed, 34 insertions(+), 1 deletion(-) >> >> diff --git a/arch/powerpc/include/asm/book3s/64/pgtable.h b/arch/powerpc/include/asm/book3s/64/pgtable.h >> index 818a58fc3f4f..897f8b9f67e6 100644 >> --- a/arch/powerpc/include/asm/book3s/64/pgtable.h >> +++ b/arch/powerpc/include/asm/book3s/64/pgtable.h >> @@ -313,6 +313,11 @@ extern unsigned long pci_io_base; >> /* Advertise support for _PAGE_SPECIAL */ >> #define __HAVE_ARCH_PTE_SPECIAL >> >> +/* Advertise that we call the Speculative Page Fault handler */ >> +#if defined(CONFIG_PPC_BOOK3S_64) >> +#define __HAVE_ARCH_CALL_SPF >> +#endif >> + >> #ifndef __ASSEMBLY__ >> >> /* >> diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c >> index 4c422632047b..7b3cc4c30eab 100644 >> --- a/arch/powerpc/mm/fault.c >> +++ b/arch/powerpc/mm/fault.c >> @@ -291,9 +291,36 @@ int do_page_fault(struct pt_regs *regs, unsigned long address, >> if (is_write && is_user) >> store_update_sp = store_updates_sp(regs); >> >> - if (is_user) >> + if (is_user) { >> flags |= FAULT_FLAG_USER; >> >> +#if defined(__HAVE_ARCH_CALL_SPF) >> + /* let's try a speculative page fault without grabbing the >> + * mmap_sem. >> + */ >> + >> + /* >> + * flags is set later based on the VMA's flags, for the common >> + * speculative service, we need some flags to be set. >> + */ >> + if (is_write) >> + flags |= FAULT_FLAG_WRITE; >> + >> + fault = handle_speculative_fault(mm, address, flags); >> + if (!(fault & VM_FAULT_RETRY || fault & VM_FAULT_ERROR)) { >> + perf_sw_event(PERF_COUNT_SW_SPF_DONE, 1, >> + regs, address); >> + goto done; > > Why we should retry with classical page fault on VM_FAULT_ERROR ? > We should always return VM_FAULT_RETRY in case there is a clear > collision some where which requires retry with classical method > and return VM_FAULT_ERROR in cases where we know that it cannot > be retried and fail for good. Should not handle_speculative_fault() > be changed to accommodate this ? There is no need to change handle_speculative_fault(), it should return VM_FAULT_RETRY when a retry is required. If VM_FAULT_ERROR is return, we should be able to jump to the block dealing with VM_FAULT_ERROR and calling vm_fault_error(). > >> + } >> + >> + /* >> + * Resetting flags since the following code assumes >> + * FAULT_FLAG_WRITE is not set. >> + */ >> + flags &= ~FAULT_FLAG_WRITE; >> +#endif /* defined(__HAVE_ARCH_CALL_SPF) */ > > Setting and resetting of FAULT_FLAG_WRITE seems confusing. Why you > say that some flags need to be set for handle_speculative_fault() > function. Could you elaborate on this ? FAULT_FLAG_WRITE is required to handle write access. In the case we retry with the classical path, the flag is reset and will be set later if !is_exec and is_write. -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org