From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758612AbaGARH7 (ORCPT ); Tue, 1 Jul 2014 13:07:59 -0400 Received: from mx1.redhat.com ([209.132.183.28]:62988 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758585AbaGARHz (ORCPT ); Tue, 1 Jul 2014 13:07:55 -0400 From: Naoya Horiguchi To: linux-mm@kvack.org Cc: Andrew Morton , Dave Hansen , Hugh Dickins , "Kirill A. Shutemov" , Jerome Marchand , linux-kernel@vger.kernel.org, Naoya Horiguchi Subject: [PATCH v4 06/13] pagemap: use walk->vma instead of calling find_vma() Date: Tue, 1 Jul 2014 13:07:24 -0400 Message-Id: <1404234451-21695-7-git-send-email-n-horiguchi@ah.jp.nec.com> In-Reply-To: <1404234451-21695-1-git-send-email-n-horiguchi@ah.jp.nec.com> References: <1404234451-21695-1-git-send-email-n-horiguchi@ah.jp.nec.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Page table walker has the information of the current vma in mm_walk, so we don't have to call find_vma() in each pagemap_hugetlb_range() call. NULL-vma check is omitted because we assume that we never run hugetlb_entry() callback on the address without vma. And even if it were broken, null pointer dereference would be detected, so we can get enough information for debugging. Signed-off-by: Naoya Horiguchi Acked-by: Kirill A. Shutemov --- fs/proc/task_mmu.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git v3.16-rc3.orig/fs/proc/task_mmu.c v3.16-rc3/fs/proc/task_mmu.c index df9f368e01b7..5ebc238d1a38 100644 --- v3.16-rc3.orig/fs/proc/task_mmu.c +++ v3.16-rc3/fs/proc/task_mmu.c @@ -1080,15 +1080,12 @@ static int pagemap_hugetlb_range(pte_t *pte, unsigned long hmask, struct mm_walk *walk) { struct pagemapread *pm = walk->private; - struct vm_area_struct *vma; + struct vm_area_struct *vma = walk->vma; int err = 0; int flags2; pagemap_entry_t pme; - vma = find_vma(walk->mm, addr); - WARN_ON_ONCE(!vma); - - if (vma && (vma->vm_flags & VM_SOFTDIRTY)) + if (vma->vm_flags & VM_SOFTDIRTY) flags2 = __PM_SOFT_DIRTY; else flags2 = 0; -- 1.9.3