Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756537AbbGaVqC (ORCPT ); Fri, 31 Jul 2015 17:46:02 -0400 Received: from mx2.suse.de ([195.135.220.15]:33014 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753960AbbGaVpt (ORCPT ); Fri, 31 Jul 2015 17:45:49 -0400 Message-ID: <55BBEC86.1070307@suse.cz> Date: Fri, 31 Jul 2015 23:45:42 +0200 From: Vlastimil Babka User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: David Rientjes , Andrew Morton CC: Christoph Lameter , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Mel Gorman , Greg Thelen , "Aneesh Kumar K.V" , Pekka Enberg , Joonsoo Kim , Naoya Horiguchi , Johannes Weiner , linux-ia64@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, cbe-oss-dev@lists.ozlabs.org, kvm@vger.kernel.org, Tony Luck , Fenghua Yu , Arnd Bergmann , Benjamin Herrenschmidt , Paul Mackerras , Gleb Natapov , Paolo Bonzini , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Cliff Whickman , Michael Ellerman , Robin Holt Subject: Re: [PATCH v3 1/3] mm: rename alloc_pages_exact_node to __alloc_pages_node References: <1438274071-22551-1-git-send-email-vbabka@suse.cz> <55BA822B.3020508@suse.cz> In-Reply-To: Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1661 Lines: 40 On 31.7.2015 23:25, David Rientjes wrote: > On Thu, 30 Jul 2015, Vlastimil Babka wrote: > >> diff --git a/mm/huge_memory.c b/mm/huge_memory.c >> index aa58a32..56355f2 100644 >> --- a/mm/huge_memory.c >> +++ b/mm/huge_memory.c >> @@ -2469,7 +2469,7 @@ khugepaged_alloc_page(struct page **hpage, gfp_t gfp, struct mm_struct *mm, >> */ >> up_read(&mm->mmap_sem); >> >> - *hpage = alloc_pages_exact_node(node, gfp, HPAGE_PMD_ORDER); >> + *hpage = __alloc_pages_node(node, gfp, HPAGE_PMD_ORDER); >> if (unlikely(!*hpage)) { >> count_vm_event(THP_COLLAPSE_ALLOC_FAILED); >> *hpage = ERR_PTR(-ENOMEM); >> @@ -2568,9 +2568,7 @@ static void collapse_huge_page(struct mm_struct *mm, >> >> VM_BUG_ON(address & ~HPAGE_PMD_MASK); >> >> - /* Only allocate from the target node */ >> - gfp = alloc_hugepage_gfpmask(khugepaged_defrag(), __GFP_OTHER_NODE) | >> - __GFP_THISNODE; >> + gfp = alloc_hugepage_gfpmask(khugepaged_defrag(), 0); >> >> /* release the mmap_sem read lock. */ >> new_page = khugepaged_alloc_page(hpage, gfp, mm, vma, address, node); > > Hmm, where is the __GFP_THISNODE enforcement in khugepaged_alloc_page() > that is removed in collapse_huge_page()? I also don't see what happened > to the __GFP_OTHER_NODE. Crap, I messed up with git, this hunk was supposed to be gone. Thanks for noticing. Please apply without the collapse_huge_page hunk, or tell me to resend once more. -- 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/