From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755418AbdEKJvm (ORCPT ); Thu, 11 May 2017 05:51:42 -0400 Received: from mx2.suse.de ([195.135.220.15]:33836 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754951AbdEKJvl (ORCPT ); Thu, 11 May 2017 05:51:41 -0400 Subject: Re: [patch] mm, thp: copying user pages must schedule on collapse To: David Rientjes , Andrew Morton Cc: "Kirill A. Shutemov" , Johannes Weiner , Mel Gorman , linux-kernel@vger.kernel.org, linux-mm@kvack.org References: From: Vlastimil Babka Message-ID: Date: Thu, 11 May 2017 11:51:37 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.1.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 05/10/2017 11:27 PM, David Rientjes wrote: > We have encountered need_resched warnings in __collapse_huge_page_copy() > while doing {clear,copy}_user_highpage() over HPAGE_PMD_NR source pages. > > mm->mmap_sem is held for write, but the iteration is well bounded. > > Reschedule as needed. > > Signed-off-by: David Rientjes Acked-by: Vlastimil Babka > --- > mm/khugepaged.c | 7 +++---- > 1 file changed, 3 insertions(+), 4 deletions(-) > > diff --git a/mm/khugepaged.c b/mm/khugepaged.c > --- a/mm/khugepaged.c > +++ b/mm/khugepaged.c > @@ -612,7 +612,8 @@ static void __collapse_huge_page_copy(pte_t *pte, struct page *page, > spinlock_t *ptl) > { > pte_t *_pte; > - for (_pte = pte; _pte < pte+HPAGE_PMD_NR; _pte++) { > + for (_pte = pte; _pte < pte + HPAGE_PMD_NR; > + _pte++, page++, address += PAGE_SIZE) { > pte_t pteval = *_pte; > struct page *src_page; > > @@ -651,9 +652,7 @@ static void __collapse_huge_page_copy(pte_t *pte, struct page *page, > spin_unlock(ptl); > free_page_and_swap_cache(src_page); > } > - > - address += PAGE_SIZE; > - page++; > + cond_resched(); > } > } > >