{"id":811798,"url":"http://patchwork.ozlabs.org/api/1.2/patches/811798/?format=json","web_url":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/1504894024-2750-13-git-send-email-ldufour@linux.vnet.ibm.com/","project":{"id":2,"url":"http://patchwork.ozlabs.org/api/1.2/projects/2/?format=json","name":"Linux PPC development","link_name":"linuxppc-dev","list_id":"linuxppc-dev.lists.ozlabs.org","list_email":"linuxppc-dev@lists.ozlabs.org","web_url":"https://github.com/linuxppc/wiki/wiki","scm_url":"https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git","webscm_url":"https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/","list_archive_url":"https://lore.kernel.org/linuxppc-dev/","list_archive_url_format":"https://lore.kernel.org/linuxppc-dev/{}/","commit_url_format":"https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/commit/?id={}"},"msgid":"<1504894024-2750-13-git-send-email-ldufour@linux.vnet.ibm.com>","list_archive_url":"https://lore.kernel.org/linuxppc-dev/1504894024-2750-13-git-send-email-ldufour@linux.vnet.ibm.com/","date":"2017-09-08T18:06:56","name":"[v3,12/20] mm: Introduce __vm_normal_page()","commit_ref":null,"pull_url":null,"state":"not-applicable","archived":false,"hash":"124017475aa171b61fc4c8e443362b79af939e2a","submitter":{"id":40248,"url":"http://patchwork.ozlabs.org/api/1.2/people/40248/?format=json","name":"Laurent Dufour","email":"ldufour@linux.vnet.ibm.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/1504894024-2750-13-git-send-email-ldufour@linux.vnet.ibm.com/mbox/","series":[{"id":2269,"url":"http://patchwork.ozlabs.org/api/1.2/series/2269/?format=json","web_url":"http://patchwork.ozlabs.org/project/linuxppc-dev/list/?series=2269","date":"2017-09-08T18:06:44","name":"Speculative page faults","version":3,"mbox":"http://patchwork.ozlabs.org/series/2269/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/811798/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/811798/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":["patchwork-incoming@ozlabs.org","linuxppc-dev@lists.ozlabs.org"],"Delivered-To":["patchwork-incoming@ozlabs.org","linuxppc-dev@lists.ozlabs.org"],"Received":["from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68])\n\t(using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xpmSw4257z9s82\n\tfor ;\n\tSat, 9 Sep 2017 04:44:32 +1000 (AEST)","from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 3xpmSw31qJzDqZ4\n\tfor ;\n\tSat, 9 Sep 2017 04:44:32 +1000 (AEST)","from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com\n\t[148.163.156.1])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby lists.ozlabs.org (Postfix) with ESMTPS id 3xplfh35bhzDrVj\n\tfor ;\n\tSat, 9 Sep 2017 04:07:56 +1000 (AEST)","from pps.filterd (m0098394.ppops.net [127.0.0.1])\n\tby mx0a-001b2d01.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id\n\tv88I4QpX102002\n\tfor ; Fri, 8 Sep 2017 14:07:53 -0400","from e06smtp12.uk.ibm.com (e06smtp12.uk.ibm.com [195.75.94.108])\n\tby mx0a-001b2d01.pphosted.com with ESMTP id 2cux2te9k5-1\n\t(version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT)\n\tfor ; Fri, 08 Sep 2017 14:07:53 -0400","from localhost\n\tby e06smtp12.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use\n\tOnly! Violators will be prosecuted\n\tfor from ;\n\tFri, 8 Sep 2017 19:07:51 +0100","from b06cxnps4074.portsmouth.uk.ibm.com (9.149.109.196)\n\tby e06smtp12.uk.ibm.com (192.168.101.142) with IBM ESMTP SMTP\n\tGateway: Authorized Use Only! Violators will be prosecuted; \n\tFri, 8 Sep 2017 19:07:45 +0100","from d06av24.portsmouth.uk.ibm.com (d06av24.portsmouth.uk.ibm.com\n\t[9.149.105.60])\n\tby b06cxnps4074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with\n\tESMTP id v88I7jlD20709504; Fri, 8 Sep 2017 18:07:45 GMT","from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1])\n\tby IMSVA (Postfix) with ESMTP id 6787042041;\n\tFri, 8 Sep 2017 19:04:12 +0100 (BST)","from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1])\n\tby IMSVA (Postfix) with ESMTP id 899BB42045;\n\tFri, 8 Sep 2017 19:04:09 +0100 (BST)","from nimbus.lab.toulouse-stg.fr.ibm.com (unknown [9.145.31.125])\n\tby d06av24.portsmouth.uk.ibm.com (Postfix) with ESMTP;\n\tFri, 8 Sep 2017 19:04:09 +0100 (BST)"],"Authentication-Results":"ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=linux.vnet.ibm.com\n\t(client-ip=148.163.156.1; helo=mx0a-001b2d01.pphosted.com;\n\tenvelope-from=ldufour@linux.vnet.ibm.com; receiver=)","From":"Laurent Dufour ","To":"paulmck@linux.vnet.ibm.com, peterz@infradead.org,\n\takpm@linux-foundation.org, kirill@shutemov.name, ak@linux.intel.com, \n\tmhocko@kernel.org, dave@stgolabs.net, jack@suse.cz,\n\tMatthew Wilcox , benh@kernel.crashing.org,\n\tmpe@ellerman.id.au, paulus@samba.org,\n\tThomas Gleixner , Ingo Molnar , \n\thpa@zytor.com, Will Deacon ,\n\tSergey Senozhatsky ","Subject":"[PATCH v3 12/20] mm: Introduce __vm_normal_page()","Date":"Fri, 8 Sep 2017 20:06:56 +0200","X-Mailer":"git-send-email 2.7.4","In-Reply-To":"<1504894024-2750-1-git-send-email-ldufour@linux.vnet.ibm.com>","References":"<1504894024-2750-1-git-send-email-ldufour@linux.vnet.ibm.com>","X-TM-AS-GCONF":"00","x-cbid":"17090818-0008-0000-0000-000004959E68","X-IBM-AV-DETECTION":"SAVI=unused REMOTE=unused XFE=unused","x-cbparentid":"17090818-0009-0000-0000-00001E26A5F6","Message-Id":"<1504894024-2750-13-git-send-email-ldufour@linux.vnet.ibm.com>","X-Proofpoint-Virus-Version":"vendor=fsecure engine=2.50.10432:, ,\n\tdefinitions=2017-09-08_12:, , signatures=0","X-Proofpoint-Spam-Details":"rule=outbound_notspam policy=outbound score=0\n\tspamscore=0 suspectscore=0\n\tmalwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam\n\tadjust=0 reason=mlx scancount=1 engine=8.0.1-1707230000\n\tdefinitions=main-1709080270","X-BeenThere":"linuxppc-dev@lists.ozlabs.org","X-Mailman-Version":"2.1.23","Precedence":"list","List-Id":"Linux on PowerPC Developers Mail List\n\t","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"linuxppc-dev@lists.ozlabs.org, x86@kernel.org,\n\tlinux-kernel@vger.kernel.org, npiggin@gmail.com, linux-mm@kvack.org,\n\tTim Chen , \n\tharen@linux.vnet.ibm.com, khandual@linux.vnet.ibm.com","Errors-To":"linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org","Sender":"\"Linuxppc-dev\"\n\t"},"content":"When dealing with the speculative fault path we should use the VMA's field\ncached value stored in the vm_fault structure.\n\nCurrently vm_normal_page() is using the pointer to the VMA to fetch the\nvm_flags value. This patch provides a new __vm_normal_page() which is\nreceiving the vm_flags flags value as parameter.\n\nNote: The speculative path is turned on for architecture providing support\nfor special PTE flag. So only the first block of vm_normal_page is used\nduring the speculative path.\n\nSigned-off-by: Laurent Dufour \n---\n include/linux/mm.h | 7 +++++--\n mm/memory.c | 18 ++++++++++--------\n 2 files changed, 15 insertions(+), 10 deletions(-)","diff":"diff --git a/include/linux/mm.h b/include/linux/mm.h\nindex bb0c87f1c725..a2857aaa03f1 100644\n--- a/include/linux/mm.h\n+++ b/include/linux/mm.h\n@@ -1246,8 +1246,11 @@ struct zap_details {\n \tpgoff_t last_index;\t\t\t/* Highest page->index to unmap */\n };\n \n-struct page *_vm_normal_page(struct vm_area_struct *vma, unsigned long addr,\n-\t\t\t pte_t pte, bool with_public_device);\n+struct page *__vm_normal_page(struct vm_area_struct *vma, unsigned long addr,\n+\t\t\t pte_t pte, bool with_public_device,\n+\t\t\t unsigned long vma_flags);\n+#define _vm_normal_page(vma, addr, pte, with_public_device) \\\n+\t__vm_normal_page(vma, addr, pte, with_public_device, (vma)->vm_flags);\n #define vm_normal_page(vma, addr, pte) _vm_normal_page(vma, addr, pte, false)\n \n struct page *vm_normal_page_pmd(struct vm_area_struct *vma, unsigned long addr,\ndiff --git a/mm/memory.c b/mm/memory.c\nindex c306f1f64c9e..a5b5fe833ed3 100644\n--- a/mm/memory.c\n+++ b/mm/memory.c\n@@ -822,8 +822,9 @@ static void print_bad_pte(struct vm_area_struct *vma, unsigned long addr,\n #else\n # define HAVE_PTE_SPECIAL 0\n #endif\n-struct page *_vm_normal_page(struct vm_area_struct *vma, unsigned long addr,\n-\t\t\t pte_t pte, bool with_public_device)\n+struct page *__vm_normal_page(struct vm_area_struct *vma, unsigned long addr,\n+\t\t\t pte_t pte, bool with_public_device,\n+\t\t\t unsigned long vma_flags)\n {\n \tunsigned long pfn = pte_pfn(pte);\n \n@@ -832,7 +833,7 @@ struct page *_vm_normal_page(struct vm_area_struct *vma, unsigned long addr,\n \t\t\tgoto check_pfn;\n \t\tif (vma->vm_ops && vma->vm_ops->find_special_page)\n \t\t\treturn vma->vm_ops->find_special_page(vma, addr);\n-\t\tif (vma->vm_flags & (VM_PFNMAP | VM_MIXEDMAP))\n+\t\tif (vma_flags & (VM_PFNMAP | VM_MIXEDMAP))\n \t\t\treturn NULL;\n \t\tif (is_zero_pfn(pfn))\n \t\t\treturn NULL;\n@@ -864,8 +865,8 @@ struct page *_vm_normal_page(struct vm_area_struct *vma, unsigned long addr,\n \n \t/* !HAVE_PTE_SPECIAL case follows: */\n \n-\tif (unlikely(vma->vm_flags & (VM_PFNMAP|VM_MIXEDMAP))) {\n-\t\tif (vma->vm_flags & VM_MIXEDMAP) {\n+\tif (unlikely(vma_flags & (VM_PFNMAP|VM_MIXEDMAP))) {\n+\t\tif (vma_flags & VM_MIXEDMAP) {\n \t\t\tif (!pfn_valid(pfn))\n \t\t\t\treturn NULL;\n \t\t\tgoto out;\n@@ -874,7 +875,7 @@ struct page *_vm_normal_page(struct vm_area_struct *vma, unsigned long addr,\n \t\t\toff = (addr - vma->vm_start) >> PAGE_SHIFT;\n \t\t\tif (pfn == vma->vm_pgoff + off)\n \t\t\t\treturn NULL;\n-\t\t\tif (!is_cow_mapping(vma->vm_flags))\n+\t\t\tif (!is_cow_mapping(vma_flags))\n \t\t\t\treturn NULL;\n \t\t}\n \t}\n@@ -2687,7 +2688,8 @@ static int do_wp_page(struct vm_fault *vmf)\n {\n \tstruct vm_area_struct *vma = vmf->vma;\n \n-\tvmf->page = vm_normal_page(vma, vmf->address, vmf->orig_pte);\n+\tvmf->page = __vm_normal_page(vma, vmf->address, vmf->orig_pte, false,\n+\t\t\t\t vmf->vma_flags);\n \tif (!vmf->page) {\n \t\t/*\n \t\t * VM_MIXEDMAP !pfn_valid() case, or VM_SOFTDIRTY clear on a\n@@ -3749,7 +3751,7 @@ static int do_numa_page(struct vm_fault *vmf)\n \tptep_modify_prot_commit(vma->vm_mm, vmf->address, vmf->pte, pte);\n \tupdate_mmu_cache(vma, vmf->address, vmf->pte);\n \n-\tpage = vm_normal_page(vma, vmf->address, pte);\n+\tpage = __vm_normal_page(vma, vmf->address, pte, false, vmf->vma_flags);\n \tif (!page) {\n \t\tpte_unmap_unlock(vmf->pte, vmf->ptl);\n \t\treturn 0;\n","prefixes":["v3","12/20"]}