Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966289Ab3HIJ1b (ORCPT ); Fri, 9 Aug 2013 05:27:31 -0400 Received: from LGEMRELSE7Q.lge.com ([156.147.1.151]:52749 "EHLO LGEMRELSE7Q.lge.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966060Ab3HIJ1U (ORCPT ); Fri, 9 Aug 2013 05:27:20 -0400 X-AuditID: 9c930197-b7b44ae00000347f-b4-5204b5efb130 From: Joonsoo Kim To: Andrew Morton Cc: Rik van Riel , Mel Gorman , Michal Hocko , "Aneesh Kumar K.V" , KAMEZAWA Hiroyuki , Hugh Dickins , Davidlohr Bueso , David Gibson , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Joonsoo Kim , Wanpeng Li , Naoya Horiguchi , Hillf Danton , Joonsoo Kim Subject: [PATCH v2 17/20] mm, hugetlb: move up anon_vma_prepare() Date: Fri, 9 Aug 2013 18:26:35 +0900 Message-Id: <1376040398-11212-18-git-send-email-iamjoonsoo.kim@lge.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1376040398-11212-1-git-send-email-iamjoonsoo.kim@lge.com> References: <1376040398-11212-1-git-send-email-iamjoonsoo.kim@lge.com> X-Brightmail-Tracker: AAAAAA== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1705 Lines: 55 If we fail with a allocated hugepage, we need some effort to recover properly. So, it is better not to allocate a hugepage as much as possible. So move up anon_vma_prepare() which can be failed in OOM situation. Signed-off-by: Joonsoo Kim diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 2372f75..7e9a651 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -2520,6 +2520,17 @@ retry_avoidcopy: spin_unlock(&mm->page_table_lock); /* + * When the original hugepage is shared one, it does not have + * anon_vma prepared. + */ + if (unlikely(anon_vma_prepare(vma))) { + page_cache_release(old_page); + /* Caller expects lock to be held */ + spin_lock(&mm->page_table_lock); + return VM_FAULT_OOM; + } + + /* * If the process that created a MAP_PRIVATE mapping is about to * perform a COW due to a shared page count, attempt to satisfy * the allocation without using the existing reserves. The pagecache @@ -2578,18 +2589,6 @@ retry_avoidcopy: return VM_FAULT_SIGBUS; } - /* - * When the original hugepage is shared one, it does not have - * anon_vma prepared. - */ - if (unlikely(anon_vma_prepare(vma))) { - page_cache_release(new_page); - page_cache_release(old_page); - /* Caller expects lock to be held */ - spin_lock(&mm->page_table_lock); - return VM_FAULT_OOM; - } - copy_user_huge_page(new_page, old_page, address, vma, pages_per_huge_page(h)); __SetPageUptodate(new_page); -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/