From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from LGEAMRELO12.lge.com ([156.147.23.52]:41814 "EHLO lgeamrelo12.lge.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1031265AbbKFCTe (ORCPT ); Thu, 5 Nov 2015 21:19:34 -0500 Date: Fri, 6 Nov 2015 11:19:46 +0900 From: Minchan Kim To: CC: aarcange@redhat.com, akpm@linux-foundation.org, hughd@google.com, kirill.shutemov@linux.intel.com, mgorman@suse.de, riel@redhat.com, stable@vger.kernel.org, torvalds@linux-foundation.org, vbabka@suse.cz Subject: Re: FAILED: patch "[PATCH] thp: use is_zero_pfn() only after pte_present() check" failed to apply to 4.1-stable tree Message-ID: <20151106021946.GB12520@bbox> References: <144676979511171@kroah.com> MIME-Version: 1.0 In-Reply-To: <144676979511171@kroah.com> Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline Sender: stable-owner@vger.kernel.org List-ID: On Thu, Nov 05, 2015 at 04:29:55PM -0800, gregkh@linuxfoundation.org wrote: > > The patch below does not apply to the 4.1-stable tree. > If someone wants it applied there, or to any other stable or longterm > tree, then please email the backport, including the original git commit > id to . > > thanks, > > greg k-h This is backport for v4.1.12. If something is wrong, let me know it. Thanks. >>From e87967c60da35240e161bc04b06c3f02c4bf358d Mon Sep 17 00:00:00 2001 From: Minchan Kim Date: Fri, 6 Nov 2015 11:11:08 +0900 Subject: [PATCH] thp: use is_zero_pfn() only after pte_present() check This is backport for v4.1.12. Original commit id is 47aee4d8e314384807e98b67ade07f6da476aa75 Signed-off-by: Minchan Kim --- mm/huge_memory.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 078832c..8e792ec 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -2137,7 +2137,8 @@ static int __collapse_huge_page_isolate(struct vm_area_struct *vma, for (_pte = pte; _pte < pte+HPAGE_PMD_NR; _pte++, address += PAGE_SIZE) { pte_t pteval = *_pte; - if (pte_none(pteval) || is_zero_pfn(pte_pfn(pteval))) { + if (pte_none(pteval) || (pte_present(pteval) && + is_zero_pfn(pte_pfn(pteval)))) { if (++none_or_zero <= khugepaged_max_ptes_none) continue; else -- 1.9.1