From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from LGEAMRELO12.lge.com ([156.147.23.52]:41323 "EHLO lgeamrelo12.lge.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1031044AbbKFCP4 (ORCPT ); Thu, 5 Nov 2015 21:15:56 -0500 Date: Fri, 6 Nov 2015 11:16:02 +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.2-stable tree Message-ID: <20151106021602.GA12520@bbox> References: <1446769788222250@kroah.com> MIME-Version: 1.0 In-Reply-To: <1446769788222250@kroah.com> Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline Sender: stable-owner@vger.kernel.org List-ID: Hi Greg, On Thu, Nov 05, 2015 at 04:29:48PM -0800, gregkh@linuxfoundation.org wrote: > > The patch below does not apply to the 4.2-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 . This is backport patch for v4.2.5. If something is wrong(e.g. process, description and so on), let me know it. Thanks. >>From 6db5ccd1e927fc1181ea849ca73f089608071ed9 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.2.5 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 097c7a4..da0ac6a 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -2132,7 +2132,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