Hi Naoya, On Tue, 8 Apr 2014 17:46:25 -0400 Naoya Horiguchi wrote: > On Tue, Apr 08, 2014 at 02:21:22PM -0700, Motohiro Kosaki wrote: >> Naoya >> >>> -----Original Message----- >>> From: Naoya Horiguchi [mailto:n-horiguchi@xxxxxxxxxxxxx] >>> Sent: Tuesday, April 08, 2014 5:20 PM >>> To: akpm@xxxxxxxxxxxxxxxxxxxx >>> Cc: mhocko@xxxxxxx; Motohiro Kosaki JP; iamjoonsoo.kim@xxxxxxx; aneesh.kumar@xxxxxxxxxxxxxxxxxx; m.mizuma@xxxxxxxxxxxxxx >>> Subject: Re: [merged] mm-hugetlb-fix-softlockup-when-a-large-number-of-hugepages-are-freed.patch removed from -mm tree >>> >>> Hi Andrew, >>> # off list >>> >>> This patch is obsolete and latest version is ver.2. >>> http://www.spinics.net/lists/linux-mm/msg71283.html >>> Could you queue the new one to go to mainline? >> >> [merged] mean the patch has already been merged the linus tree. So, it can be changed. Please make >> an incremental patch. > > Here it is. Thank you for posting this incremental patch! Thanks, Masayoshi Mizuma > > Thanks, > Naoya Horiguchi > --- > Subject: [PATCH] mm/hugetlb.c: add cond_resched_lock() in return_unused_surplus_pages() > > From: "Mizuma, Masayoshi" <m.mizuma@xxxxxxxxxxxxxx> > > soft lockup in freeing gigantic hugepage fixed in commit 55f67141a892 > "mm: hugetlb: fix softlockup when a large number of hugepages are freed." > can happen in return_unused_surplus_pages(), so let's fix it. > > Signed-off-by: Masayoshi Mizuma <m.mizuma@xxxxxxxxxxxxxx> > Signed-off-by: Naoya Horiguchi <n-horiguchi@xxxxxxxxxxxxx> > Cc: Joonsoo Kim <iamjoonsoo.kim@xxxxxxx> > Cc: Michal Hocko <mhocko@xxxxxxx> > Cc: Aneesh Kumar <aneesh.kumar@xxxxxxxxxxxxxxxxxx> > Cc: KOSAKI Motohiro <kosaki.motohiro@xxxxxxxxxxxxxx> > Cc: <stable@xxxxxxxxxxxxxxx> > --- > diff --git a/mm/hugetlb.c b/mm/hugetlb.c > index 7d57af2..761ef5b 100644 > --- a/mm/hugetlb.c > +++ b/mm/hugetlb.c > @@ -1160,6 +1160,7 @@ static void return_unused_surplus_pages(struct hstate *h, > while (nr_pages--) { > if (!free_pool_huge_page(h, &node_states[N_MEMORY], 1)) > break; > + cond_resched_lock(&hugetlb_lock); > } > } > > -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@xxxxxxxxx. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@xxxxxxxxx";> email@xxxxxxxxx </a>