{"id":811792,"url":"http://patchwork.ozlabs.org/api/1.2/patches/811792/?format=json","web_url":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/1504894024-2750-11-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-11-git-send-email-ldufour@linux.vnet.ibm.com>","list_archive_url":"https://lore.kernel.org/linuxppc-dev/1504894024-2750-11-git-send-email-ldufour@linux.vnet.ibm.com/","date":"2017-09-08T18:06:54","name":"[v3,10/20] mm: Introduce __lru_cache_add_active_or_unevictable","commit_ref":null,"pull_url":null,"state":"not-applicable","archived":false,"hash":"3ba314b05c4b02b9bacf48478d9aac6f0a760d49","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-11-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/811792/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/811792/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 3xpmMj2WqYz9s82\n\tfor ;\n\tSat, 9 Sep 2017 04:40:01 +1000 (AEST)","from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 3xpmMj0K24zDrVq\n\tfor ;\n\tSat, 9 Sep 2017 04:40:01 +1000 (AEST)","from mx0a-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com\n\t[148.163.158.5])\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 3xplfY5Wv2zDrVn\n\tfor ;\n\tSat, 9 Sep 2017 04:07:49 +1000 (AEST)","from pps.filterd (m0098419.ppops.net [127.0.0.1])\n\tby mx0b-001b2d01.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id\n\tv88I4SNS021455\n\tfor ; Fri, 8 Sep 2017 14:07:47 -0400","from e06smtp15.uk.ibm.com (e06smtp15.uk.ibm.com [195.75.94.111])\n\tby mx0b-001b2d01.pphosted.com with ESMTP id 2cuuu8x79c-1\n\t(version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT)\n\tfor ; Fri, 08 Sep 2017 14:07:47 -0400","from localhost\n\tby e06smtp15.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:45 +0100","from b06cxnps3074.portsmouth.uk.ibm.com (9.149.109.194)\n\tby e06smtp15.uk.ibm.com (192.168.101.145) with IBM ESMTP SMTP\n\tGateway: Authorized Use Only! Violators will be prosecuted; \n\tFri, 8 Sep 2017 19:07:38 +0100","from d06av24.portsmouth.uk.ibm.com (d06av24.portsmouth.uk.ibm.com\n\t[9.149.105.60])\n\tby b06cxnps3074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with\n\tESMTP id v88I7cje18219056; Fri, 8 Sep 2017 18:07:38 GMT","from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1])\n\tby IMSVA (Postfix) with ESMTP id 34AB442041;\n\tFri, 8 Sep 2017 19:04:05 +0100 (BST)","from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1])\n\tby IMSVA (Postfix) with ESMTP id 6C16042042;\n\tFri, 8 Sep 2017 19:04:03 +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:03 +0100 (BST)"],"Authentication-Results":"ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=linux.vnet.ibm.com\n\t(client-ip=148.163.158.5; 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 10/20] mm: Introduce __lru_cache_add_active_or_unevictable","Date":"Fri, 8 Sep 2017 20:06:54 +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-0020-0000-0000-000003B69F46","X-IBM-AV-DETECTION":"SAVI=unused REMOTE=unused XFE=unused","x-cbparentid":"17090818-0021-0000-0000-00004247AAAB","Message-Id":"<1504894024-2750-11-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=2\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":"The speculative page fault handler which is run without holding the\nmmap_sem is calling lru_cache_add_active_or_unevictable() but the vm_flags\nis not guaranteed to remain constant.\nIntroducing __lru_cache_add_active_or_unevictable() which has the vma flags\nvalue parameter instead of the vma pointer.\n\nSigned-off-by: Laurent Dufour \n---\n include/linux/swap.h | 11 +++++++++--\n mm/memory.c | 8 ++++----\n mm/swap.c | 12 ++++++------\n 3 files changed, 19 insertions(+), 12 deletions(-)","diff":"diff --git a/include/linux/swap.h b/include/linux/swap.h\nindex 8a807292037f..9b4dbb98af89 100644\n--- a/include/linux/swap.h\n+++ b/include/linux/swap.h\n@@ -323,8 +323,15 @@ extern void swap_setup(void);\n \n extern void add_page_to_unevictable_list(struct page *page);\n \n-extern void lru_cache_add_active_or_unevictable(struct page *page,\n-\t\t\t\t\t\tstruct vm_area_struct *vma);\n+extern void __lru_cache_add_active_or_unevictable(struct page *page,\n+\t\t\t\t\t\tunsigned long vma_flags);\n+\n+static inline void lru_cache_add_active_or_unevictable(struct page *page,\n+\t\t\t\t\t\tstruct vm_area_struct *vma)\n+{\n+\treturn __lru_cache_add_active_or_unevictable(page, vma->vm_flags);\n+}\n+\n \n /* linux/mm/vmscan.c */\n extern unsigned long zone_reclaimable_pages(struct zone *zone);\ndiff --git a/mm/memory.c b/mm/memory.c\nindex a4982917c16e..4583f354be94 100644\n--- a/mm/memory.c\n+++ b/mm/memory.c\n@@ -2509,7 +2509,7 @@ static int wp_page_copy(struct vm_fault *vmf)\n \t\tptep_clear_flush_notify(vma, vmf->address, vmf->pte);\n \t\tpage_add_new_anon_rmap(new_page, vma, vmf->address, false);\n \t\tmem_cgroup_commit_charge(new_page, memcg, false, false);\n-\t\tlru_cache_add_active_or_unevictable(new_page, vma);\n+\t\t__lru_cache_add_active_or_unevictable(new_page, vmf->vma_flags);\n \t\t/*\n \t\t * We call the notify macro here because, when using secondary\n \t\t * mmu page tables (such as kvm shadow page tables), we want the\n@@ -2998,7 +2998,7 @@ int do_swap_page(struct vm_fault *vmf)\n \t} else { /* ksm created a completely new copy */\n \t\tpage_add_new_anon_rmap(page, vma, vmf->address, false);\n \t\tmem_cgroup_commit_charge(page, memcg, false, false);\n-\t\tlru_cache_add_active_or_unevictable(page, vma);\n+\t\t__lru_cache_add_active_or_unevictable(page, vmf->vma_flags);\n \t}\n \n \tswap_free(entry);\n@@ -3144,7 +3144,7 @@ static int do_anonymous_page(struct vm_fault *vmf)\n \tinc_mm_counter_fast(vma->vm_mm, MM_ANONPAGES);\n \tpage_add_new_anon_rmap(page, vma, vmf->address, false);\n \tmem_cgroup_commit_charge(page, memcg, false, false);\n-\tlru_cache_add_active_or_unevictable(page, vma);\n+\t__lru_cache_add_active_or_unevictable(page, vmf->vma_flags);\n setpte:\n \tset_pte_at(vma->vm_mm, vmf->address, vmf->pte, entry);\n \n@@ -3396,7 +3396,7 @@ int alloc_set_pte(struct vm_fault *vmf, struct mem_cgroup *memcg,\n \t\tinc_mm_counter_fast(vma->vm_mm, MM_ANONPAGES);\n \t\tpage_add_new_anon_rmap(page, vma, vmf->address, false);\n \t\tmem_cgroup_commit_charge(page, memcg, false, false);\n-\t\tlru_cache_add_active_or_unevictable(page, vma);\n+\t\t__lru_cache_add_active_or_unevictable(page, vmf->vma_flags);\n \t} else {\n \t\tinc_mm_counter_fast(vma->vm_mm, mm_counter_file(page));\n \t\tpage_add_file_rmap(page, false);\ndiff --git a/mm/swap.c b/mm/swap.c\nindex 9295ae960d66..b084bb16d769 100644\n--- a/mm/swap.c\n+++ b/mm/swap.c\n@@ -470,21 +470,21 @@ void add_page_to_unevictable_list(struct page *page)\n }\n \n /**\n- * lru_cache_add_active_or_unevictable\n- * @page: the page to be added to LRU\n- * @vma: vma in which page is mapped for determining reclaimability\n+ * __lru_cache_add_active_or_unevictable\n+ * @page:\tthe page to be added to LRU\n+ * @vma_flags: vma in which page is mapped for determining reclaimability\n *\n * Place @page on the active or unevictable LRU list, depending on its\n * evictability. Note that if the page is not evictable, it goes\n * directly back onto it's zone's unevictable list, it does NOT use a\n * per cpu pagevec.\n */\n-void lru_cache_add_active_or_unevictable(struct page *page,\n-\t\t\t\t\t struct vm_area_struct *vma)\n+void __lru_cache_add_active_or_unevictable(struct page *page,\n+\t\t\t\t\t unsigned long vma_flags)\n {\n \tVM_BUG_ON_PAGE(PageLRU(page), page);\n \n-\tif (likely((vma->vm_flags & (VM_LOCKED | VM_SPECIAL)) != VM_LOCKED)) {\n+\tif (likely((vma_flags & (VM_LOCKED | VM_SPECIAL)) != VM_LOCKED)) {\n \t\tSetPageActive(page);\n \t\tlru_cache_add(page);\n \t\treturn;\n","prefixes":["v3","10/20"]}