Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755886AbbFUVJB (ORCPT ); Sun, 21 Jun 2015 17:09:01 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33104 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751700AbbFUVIy (ORCPT ); Sun, 21 Jun 2015 17:08:54 -0400 Date: Sun, 21 Jun 2015 23:07:40 +0200 From: Oleg Nesterov To: Andrew Morton Cc: Al Viro , Benjamin LaHaise , Hugh Dickins , Jeff Moyer , Kirill Shutemov , Linus Torvalds , linux-kernel@vger.kernel.org Subject: [PATCH 1/3] mm: introduce vma_is_anonymous(vma) helper Message-ID: <20150621210740.GA18234@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20150621210725.GA18220@redhat.com> User-Agent: Mutt/1.5.18 (2008-05-17) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1898 Lines: 59 Preparation. Add the new simple helper, vma_is_anonymous(vma), and change handle_pte_fault() to use it. It will have more users. The name is not very accurate, say mmap_mem/VM_PFNMAP vma is not anonymous. Perhaps it should be named vma_has_fault() instead. But it matches the logic in mmap.c/memory.c, see next changes. Signed-off-by: Oleg Nesterov --- include/linux/mm.h | 5 +++++ mm/memory.c | 13 ++++++------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index 0755b9f..a0fe3d3 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -1225,6 +1225,11 @@ static inline int vma_growsdown(struct vm_area_struct *vma, unsigned long addr) return vma && (vma->vm_end == addr) && (vma->vm_flags & VM_GROWSDOWN); } +static inline bool vma_is_anonymous(struct vm_area_struct *vma) +{ + return !vma->vm_ops || !vma->vm_ops->fault; +} + static inline int stack_guard_page_start(struct vm_area_struct *vma, unsigned long addr) { diff --git a/mm/memory.c b/mm/memory.c index 22e037e..f50ed81 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -3242,13 +3242,12 @@ static int handle_pte_fault(struct mm_struct *mm, barrier(); if (!pte_present(entry)) { if (pte_none(entry)) { - if (vma->vm_ops) { - if (likely(vma->vm_ops->fault)) - return do_fault(mm, vma, address, pte, - pmd, flags, entry); - } - return do_anonymous_page(mm, vma, address, - pte, pmd, flags); + if (vma_is_anonymous(vma)) + return do_anonymous_page(mm, vma, address, + pte, pmd, flags); + else + return do_fault(mm, vma, address, pte, pmd, + flags, entry); } return do_swap_page(mm, vma, address, pte, pmd, flags, entry); -- 1.5.5.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in Please read the FAQ at http://www.tux.org/lkml/