From patchwork Wed Jun 15 20:06:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kirill A . Shutemov" X-Patchwork-Id: 9179267 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7E35A60776 for ; Wed, 15 Jun 2016 20:06:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6B03127DCE for ; Wed, 15 Jun 2016 20:06:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5EFA727F07; Wed, 15 Jun 2016 20:06:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E037C27DCE for ; Wed, 15 Jun 2016 20:06:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753758AbcFOUG4 (ORCPT ); Wed, 15 Jun 2016 16:06:56 -0400 Received: from mga14.intel.com ([192.55.52.115]:40088 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751867AbcFOUGy (ORCPT ); Wed, 15 Jun 2016 16:06:54 -0400 Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga103.fm.intel.com with ESMTP; 15 Jun 2016 13:06:55 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.26,477,1459839600"; d="scan'208";a="122579737" Received: from black.fi.intel.com ([10.237.72.93]) by fmsmga004.fm.intel.com with ESMTP; 15 Jun 2016 13:06:49 -0700 Received: by black.fi.intel.com (Postfix, from userid 1000) id A6AB0279; Wed, 15 Jun 2016 23:06:48 +0300 (EEST) From: "Kirill A. Shutemov" To: Hugh Dickins , Andrea Arcangeli , Andrew Morton Cc: Dave Hansen , Vlastimil Babka , Christoph Lameter , Naoya Horiguchi , Jerome Marchand , Yang Shi , Sasha Levin , Andres Lagar-Cavilla , Ning Qu , linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, Ebru Akagunduz , "Kirill A. Shutemov" , Michal Hocko Subject: [PATCHv9-rebased2 02/37] mm-thp-make-swapin-readahead-under-down_read-of-mmap_sem-fix Date: Wed, 15 Jun 2016 23:06:07 +0300 Message-Id: <1466021202-61880-3-git-send-email-kirill.shutemov@linux.intel.com> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1466021202-61880-1-git-send-email-kirill.shutemov@linux.intel.com> References: <1465222029-45942-1-git-send-email-kirill.shutemov@linux.intel.com> <1466021202-61880-1-git-send-email-kirill.shutemov@linux.intel.com> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Passing 'vma' to hugepage_vma_revlidate() is useless. It doesn't make use of it anyway. Link: http://lkml.kernel.org/r/20160530095058.GA53044@black.fi.intel.com Cc: Ebru Akagunduz Cc: Hugh Dickins Cc: Michal Hocko Signed-off-by: Andrew Morton --- mm/huge_memory.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 96dfe3f09bf6..7bb30e853335 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -2384,10 +2384,9 @@ static bool hugepage_vma_check(struct vm_area_struct *vma) * value (scan code). */ -static int hugepage_vma_revalidate(struct mm_struct *mm, - struct vm_area_struct *vma, - unsigned long address) +static int hugepage_vma_revalidate(struct mm_struct *mm, unsigned long address) { + struct vm_area_struct *vma; unsigned long hstart, hend; if (unlikely(khugepaged_test_exit(mm))) @@ -2436,7 +2435,7 @@ static bool __collapse_huge_page_swapin(struct mm_struct *mm, if (ret & VM_FAULT_RETRY) { down_read(&mm->mmap_sem); /* vma is no longer available, don't continue to swapin */ - if (hugepage_vma_revalidate(mm, vma, address)) + if (hugepage_vma_revalidate(mm, address)) return false; } if (ret & VM_FAULT_ERROR) { @@ -2487,7 +2486,7 @@ static void collapse_huge_page(struct mm_struct *mm, } down_read(&mm->mmap_sem); - result = hugepage_vma_revalidate(mm, vma, address); + result = hugepage_vma_revalidate(mm, address); if (result) goto out; @@ -2514,7 +2513,7 @@ static void collapse_huge_page(struct mm_struct *mm, * handled by the anon_vma lock + PG_lock. */ down_write(&mm->mmap_sem); - result = hugepage_vma_revalidate(mm, vma, address); + result = hugepage_vma_revalidate(mm, address); if (result) goto out;