From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2A335C433E0 for ; Wed, 17 Feb 2021 15:06:46 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id C9E4860238 for ; Wed, 17 Feb 2021 15:06:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C9E4860238 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=suse.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 53EFF6B006E; Wed, 17 Feb 2021 10:06:45 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 516938D0002; Wed, 17 Feb 2021 10:06:45 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3E0EA8D0001; Wed, 17 Feb 2021 10:06:45 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0039.hostedemail.com [216.40.44.39]) by kanga.kvack.org (Postfix) with ESMTP id 2549D6B006E for ; Wed, 17 Feb 2021 10:06:45 -0500 (EST) Received: from smtpin17.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id E3EE382499B9 for ; Wed, 17 Feb 2021 15:06:44 +0000 (UTC) X-FDA: 77828086728.17.paint39_250c11b2764d Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin17.hostedemail.com (Postfix) with ESMTP id C8890180D078B for ; Wed, 17 Feb 2021 15:06:44 +0000 (UTC) X-HE-Tag: paint39_250c11b2764d X-Filterd-Recvd-Size: 4241 Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) by imf21.hostedemail.com (Postfix) with ESMTP for ; Wed, 17 Feb 2021 15:06:44 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1613574403; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=k6dBzKXy/EXV9qFYBWQcgPsAD8tD43VtG3457euIWxw=; b=AV3SrKn4DQSEjgAbawUctdUOlcP+ZuByCkMtRa9sBy0Hsw25DvHD55WRYRNuPyL4BDyhsy Xt7CWRh7XfP4ZpCMYJWKufuKaWdOgVk6RU4Ie8rS6Uaj+U+9Nye5wCcNhqwXug96K4g/E3 cqTmkguZyQtleYn8VQdwkK189cVAwJo= Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 090BAB8FE; Wed, 17 Feb 2021 15:06:43 +0000 (UTC) Date: Wed, 17 Feb 2021 16:06:42 +0100 From: Michal Hocko To: Oscar Salvador Cc: Andrew Morton , Mike Kravetz , David Hildenbrand , Muchun Song , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 2/2] mm: Make alloc_contig_range handle in-use hugetlb pages Message-ID: References: <20210217100816.28860-1-osalvador@suse.de> <20210217100816.28860-3-osalvador@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210217100816.28860-3-osalvador@suse.de> X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Wed 17-02-21 11:08:16, Oscar Salvador wrote: > In-use hugetlb pages can be migrated as any other page (LRU > and Movable), so let alloc_contig_range handle them. > > All we need is to succesfully isolate such page. > > Signed-off-by: Oscar Salvador > --- > include/linux/hugetlb.h | 5 +++-- > mm/compaction.c | 11 ++++++++++- > mm/hugetlb.c | 6 ++++-- > mm/vmscan.c | 5 +++-- > 4 files changed, 20 insertions(+), 7 deletions(-) > > diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h > index 72352d718829..8c17d0dbc87c 100644 > --- a/include/linux/hugetlb.h > +++ b/include/linux/hugetlb.h > @@ -505,7 +505,7 @@ struct huge_bootmem_page { > struct hstate *hstate; > }; > > -bool isolate_or_dissolve_huge_page(struct page *page); > +bool isolate_or_dissolve_huge_page(struct page *page, struct list_head *list); > struct page *alloc_huge_page(struct vm_area_struct *vma, > unsigned long addr, int avoid_reserve); > struct page *alloc_huge_page_nodemask(struct hstate *h, int preferred_nid, > @@ -776,7 +776,8 @@ void set_page_huge_active(struct page *page); > #else /* CONFIG_HUGETLB_PAGE */ > struct hstate {}; > > -static inline bool isolate_or_dissolve_huge_page(struct page *page) > +static inline bool isolate_or_dissolve_huge_page(struct page *page, > + struct list_head *list) > { > return false; > } > diff --git a/mm/compaction.c b/mm/compaction.c > index d52506ed9db7..55a41a9228a9 100644 > --- a/mm/compaction.c > +++ b/mm/compaction.c > @@ -906,9 +906,17 @@ isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn, > } > > if (PageHuge(page) && cc->alloc_contig) { > - if (!isolate_or_dissolve_huge_page(page)) > + if (!isolate_or_dissolve_huge_page(page, &cc->migratepages)) > goto isolate_fail; > > + if (PageHuge(page)) { > + /* > + * Hugepage was succesfully isolated. > + */ > + low_pfn += compound_nr(page) - 1; > + goto isolate_success_no_list; > + } > + > /* > * Ok, the hugepage was dissolved. Now these pages are > * Buddy and cannot be re-allocated because they are > @@ -1053,6 +1061,7 @@ isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn, > > isolate_success: > list_add(&page->lru, &cc->migratepages); > +isolate_success_no_list: > cc->nr_migratepages += compound_nr(page); I do not follow. You have successfully isolated huge pages so why don't you add that page to the migratepages list to be migrated? -- Michal Hocko SUSE Labs