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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id D677EE706FA for ; Thu, 21 Sep 2023 09:32:02 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 016B36B0175; Thu, 21 Sep 2023 05:32:02 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id F09296B0180; Thu, 21 Sep 2023 05:32:01 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DD07D6B01F0; Thu, 21 Sep 2023 05:32:01 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id CD4136B0175 for ; Thu, 21 Sep 2023 05:32:01 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 9C621B3F1C for ; Thu, 21 Sep 2023 09:32:01 +0000 (UTC) X-FDA: 81260088042.12.E2E7331 Received: from out-210.mta0.migadu.com (out-210.mta0.migadu.com [91.218.175.210]) by imf28.hostedemail.com (Postfix) with ESMTP id B78CFC0002 for ; Thu, 21 Sep 2023 09:31:58 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=m0Jnoa2k; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf28.hostedemail.com: domain of muchun.song@linux.dev designates 91.218.175.210 as permitted sender) smtp.mailfrom=muchun.song@linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1695288719; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=pKhMatc/zWl01dwnOp27ljqTW92ejv5Ec290/gJM4Oc=; b=4s59ZaSLJpgWao+tMmgXf5DrigP6fRJmvuuzNtcbyv7nSp3ppILUxZjg2dmNHlxdXzN5Yd P+HB5ZZyiwcZkJXHSzj1u+SPQklwiOWXTyxcpruzIShsqb6J9lmhnkfExBrpQXk4mQMB7g 8tmZmCUj9IU1M/t47fLAHaL/RvX/qCY= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=m0Jnoa2k; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf28.hostedemail.com: domain of muchun.song@linux.dev designates 91.218.175.210 as permitted sender) smtp.mailfrom=muchun.song@linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1695288719; a=rsa-sha256; cv=none; b=YfJSjpoeKMZtdMcrXMvU1jutwmkt6faOtZ+56BIAdNTQ2JtBmt1FK3cRL9tQuZf2CW9Cpf p3TfSScn0G1JDMxlwMVDkMsbyNwYGryz2Lwr0dqf/VJzxH1ABP42M4TJ8ghiYBKUN54b6U z+UZE/ALTc0ukrfXmjKTxymRy0+ZwoY= Message-ID: <306da2a1-0dd4-e858-930f-211947a466d2@linux.dev> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1695288716; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=pKhMatc/zWl01dwnOp27ljqTW92ejv5Ec290/gJM4Oc=; b=m0Jnoa2kFHdll+Nw+8YnTmeEIwb1Qj3RIrdsl47EiO7ljvbjft3oKzBWTirdSVRjMUHAU/ K2XmHtNKpOqv0nt4wZZPC5TjLH2zn+oTFkXU06GdO711LpFzbh+H14uFT817248Qak9shi juAQiSFgXk8L27noIldHR/Y+88UFCm0= Date: Thu, 21 Sep 2023 17:31:47 +0800 MIME-Version: 1.0 Subject: Re: [PATCH v4 4/8] hugetlb: perform vmemmap restoration on a list of pages To: Mike Kravetz Cc: Linux-MM , LKML , Muchun Song , Joao Martins , Oscar Salvador , David Hildenbrand , Miaohe Lin , David Rientjes , Anshuman Khandual , Naoya Horiguchi , Barry Song <21cnbao@gmail.com>, Michal Hocko , Matthew Wilcox , Xiongchun Duan , Andrew Morton References: <20230918230202.254631-1-mike.kravetz@oracle.com> <20230918230202.254631-5-mike.kravetz@oracle.com> <20230919205756.GB425719@monkey> <2FDB2018-74AE-4514-9B43-01664A8E5DBF@linux.dev> <20230921011223.GC4065@monkey> X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Muchun Song In-Reply-To: <20230921011223.GC4065@monkey> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Migadu-Flow: FLOW_OUT X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: B78CFC0002 X-Stat-Signature: dmxdk6r6ngpttp4o9qwjddhdqf4u3zz9 X-Rspam-User: X-HE-Tag: 1695288718-13505 X-HE-Meta: U2FsdGVkX1++0SOmUQu6BB8mfqPWVnREFj+5t87ZrG9eLJ4keh25Sk+v0pYvRg0KrGWC6GTrSYWyvHiMwQsl21reyTcnk5EWPYdeajmnw4LAySB8GTdmlR96FArLoc86xbcO4VX7h9whNnNisTDFErk/ivQbch39jSshikjzP6rG9G0n3yaxUD0P93dl/4F5q8+8sgepx6haJZrbrzSdgQnJNK7QmKOZTc4agWRlgBKM817xyoh0kfVeGc0QS+cQWjHhfX8liEq35iYuqkBemtT4M//yGF45iIQ2CZy7Yp97+ei4EeRYBBcV9HyvzKyveUWVT3DcvH/GPjKlGKBtufRU5/8cMUFCHnFqd04C2O09M8k/E/VZwlxcUQrK52gAfEjE9QKnwcPqTVrQN8mxgjlkFt9UlsKks61IvEQlIjNp5rJwByNsA5s7XcM1HhLE9BEsO/kAwIB0pp62EWGlae9QhcUUNQh3s6qwCXEfNi3xtaKbFenJ5/RE/4EA+ZR7Af1erk/HATuAWOoeyEPD/bcc4itPBFVaB7otw543n4RgQXRzEllRAItf6lEbjx3GmWkJ7m8N53eP8XPodaXkxrOzuEQf5jTInONRPWcFmidN5r8j/AGoFKb1jDpn4x8hM93Y18v4XLc7nvARNEFtTw7rnV7eLwPFZ71dp8tqhb3piWy8X9yp/qfxAJzNOX7SVt6nP1c0AN7YSDui07OHE0vsyOMG12IpBctproys3jlaZclmzutjHyHl9n99sI/He4JOXHxBqlXavBYWIH3Zrs+1+MoxpGlGxMgMeE07DWk0W1bn563coq7heukR+dkeZayahmY0+KsuGX6AvCk8IZXqT/BoxRVdvnY9Wmy4WDg3EkrfGnlZ2V+MaKdaAJZbPBKRrr5rFA2alixSiEWocmvaktEXokJvLoyTDdvJa+3f8Hg3McKN0Ej4Y6O43OKxyQpGff8ChJ9En01+Oj9 7e4R1I3g ujmyBlatQpekcI0qAlBUgOJoFLhnzPwUnf3UblJvfUfyfbtaer1TxzJqoANNa4axc6XwY/xG3WqX0yafabnTLAmiyG4OVedUCliEnAj+DslD5s00iZHg2PV0UkA== 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 2023/9/21 09:12, Mike Kravetz wrote: > On 09/20/23 11:03, Muchun Song wrote: >>> On Sep 20, 2023, at 10:56, Muchun Song wrote: >>>> On Sep 20, 2023, at 04:57, Mike Kravetz wrote: >>>> On 09/19/23 17:52, Muchun Song wrote: >>>>> On 2023/9/19 07:01, Mike Kravetz wrote: >>>>> >>>>> I still think we should free a non-optimized HugeTLB page if we >>>>> encounter an OOM situation instead of continue to restore >>>>> vemmmap pages. Restoring vmemmmap pages will only aggravate >>>>> the OOM situation. The suitable appraoch is to free a non-optimized >>>>> HugeTLB page to satisfy our allocation of vmemmap pages, what's >>>>> your opinion, Mike? >>>> I agree. >>>> >>>> As you mentioned previously, this may complicate this code path a bit. >>>> I will rewrite to make this happen. >>> Maybe we could introduced two list passed to update_and_free_pages_bulk (this >>> will be easy for the callers of it), one is for non-optimized huge page, >>> another is optimized one. In update_and_free_pages_bulk, we could first >>> free those non-optimized huge page, and then restore vemmmap pages for >>> those optimized ones, in which case, the code could be simple. >>> hugetlb_vmemmap_restore_folios() dose not need to add complexity, which >>> still continue to restore vmemmap pages and will stop once we encounter >>> an OOM situation. > I am not sure if passing in optimized and non-optimized lists to > update_and_free_pages_bulk will help much. IIUC, it will almost always > be the case where only one list has entries. Is that mostly accurate? I think you are right. It will be less helpful since most of pages will be not optimized when HVO is enabled. >> BTW, maybe we should try again iff there are some non-optimized huge page >> whose vmemmap pages are restored successfully previously and could be freed >> first, then continue to restore the vmemmap pages of the remaining huge pages. >> I think the retry code could be done in update_and_free_pages_bulk() as well. > I came up with a new routine to handle these ENOMEM returns from > hugetlb_vmemmap_restore_folios. I 'think' it handles these situations. > Here is an updated version of this patch. Sorry, diff makes it a bit > hard to read. > > From b13bdccb01730f995191944769f87d0725c289ad Mon Sep 17 00:00:00 2001 > From: Mike Kravetz > Date: Sun, 10 Sep 2023 16:14:50 -0700 > Subject: [PATCH] hugetlb: perform vmemmap restoration on a list of pages > > The routine update_and_free_pages_bulk already performs vmemmap > restoration on the list of hugetlb pages in a separate step. In > preparation for more functionality to be added in this step, create a > new routine hugetlb_vmemmap_restore_folios() that will restore > vmemmap for a list of folios. > > This new routine must provide sufficient feedback about errors and > actual restoration performed so that update_and_free_pages_bulk can > perform optimally. > > Special care must be taken when encountering a ENOMEM error from > hugetlb_vmemmap_restore_folios. We want to continue making as much > forward progress as possible. A new routine bulk_vmemmap_restore_enomem > handles this specific situation. > > Signed-off-by: Mike Kravetz > --- > mm/hugetlb.c | 83 ++++++++++++++++++++++++++++++++++---------- > mm/hugetlb_vmemmap.c | 39 +++++++++++++++++++++ > mm/hugetlb_vmemmap.h | 11 ++++++ > 3 files changed, 115 insertions(+), 18 deletions(-) > > diff --git a/mm/hugetlb.c b/mm/hugetlb.c > index 70fedf8682c4..52abe56cf38a 100644 > --- a/mm/hugetlb.c > +++ b/mm/hugetlb.c > @@ -1834,38 +1834,85 @@ static void update_and_free_hugetlb_folio(struct hstate *h, struct folio *folio, > schedule_work(&free_hpage_work); > } > > -static void update_and_free_pages_bulk(struct hstate *h, struct list_head *list) > +static void bulk_vmemmap_restore_enomem(struct hstate *h, > + struct list_head *list, > + unsigned long restored) > { > struct folio *folio, *t_folio; > - bool clear_dtor = false; > > - /* > - * First allocate required vmemmmap (if necessary) for all folios on > - * list. If vmemmap can not be allocated, we can not free folio to > - * lower level allocator, so add back as hugetlb surplus page. > - * add_hugetlb_folio() removes the page from THIS list. > - * Use clear_dtor to note if vmemmap was successfully allocated for > - * ANY page on the list. > - */ > - list_for_each_entry_safe(folio, t_folio, list, lru) { > - if (folio_test_hugetlb_vmemmap_optimized(folio)) { > + if (restored) { > + /* > + * On ENOMEM error, free any restored hugetlb pages so that > + * restore of the entire list can be retried. > + * The idea is that by freeing hugetlb pages with vmemmap > + * (those previously restored) we will free up memory so that > + * we can allocate vmemmap for more hugetlb pages. > + * We must examine and possibly free EVERY hugetlb page on list > + * in order to call hugetlb_vmemmap_restore_folios again. > + * This is not optimal, but is an error case that should not > + * happen frequently. > + */ > + list_for_each_entry_safe(folio, t_folio, list, lru) > + if (!folio_test_hugetlb_vmemmap_optimized(folio)) { > + list_del(&folio->lru); > + spin_lock_irq(&hugetlb_lock); > + __clear_hugetlb_destructor(h, folio); > + spin_unlock_irq(&hugetlb_lock); > + update_and_free_hugetlb_folio(h, folio, false); > + cond_resched(); > + } > + } else { > + /* > + * In the case where vmemmap was not restored for ANY folios, > + * we loop through them trying to restore individually in the > + * hope that someone elsewhere may free enough memory. > + * If unable to restore a page, the hugetlb page is made a > + * surplus page and removed from the list. > + * If are able to restore vmemmap for one hugetlb page, we free > + * it and quit processing the list to retry the bulk operation. > + */ > + list_for_each_entry_safe(folio, t_folio, list, lru) > if (hugetlb_vmemmap_restore(h, &folio->page)) { > spin_lock_irq(&hugetlb_lock); > add_hugetlb_folio(h, folio, true); > spin_unlock_irq(&hugetlb_lock); > - } else > - clear_dtor = true; > - } > + } else { > + list_del(&folio->lru); > + spin_lock_irq(&hugetlb_lock); > + __clear_hugetlb_destructor(h, folio); > + spin_unlock_irq(&hugetlb_lock); > + update_and_free_hugetlb_folio(h, folio, false); > + break; > + } > } > +} > + > +static void update_and_free_pages_bulk(struct hstate *h, struct list_head *list) > +{ > + int ret; > + unsigned long restored; > + struct folio *folio, *t_folio; > > /* > - * If vmemmmap allocation was performed on any folio above, take lock > - * to clear destructor of all folios on list. This avoids the need to > + * First allocate required vmemmmap (if necessary) for all folios. > + * Carefully handle ENOMEM errors and free up any available hugetlb > + * pages in order to make forward progress. > + */ > +retry: > + ret = hugetlb_vmemmap_restore_folios(h, list, &restored); > + if (ret == -ENOMEM) { > + bulk_vmemmap_restore_enomem(h, list, restored); > + goto retry; > + } > + > + /* > + * If vmemmmap allocation was performed on ANY folio , take lock to > + * clear destructor of all folios on list. This avoids the need to > * lock/unlock for each individual folio. > * The assumption is vmemmap allocation was performed on all or none > * of the folios on the list. This is true expect in VERY rare cases. > */ > - if (clear_dtor) { > + if (restored) { > spin_lock_irq(&hugetlb_lock); > list_for_each_entry(folio, list, lru) > __clear_hugetlb_destructor(h, folio); > diff --git a/mm/hugetlb_vmemmap.c b/mm/hugetlb_vmemmap.c > index 4558b814ffab..cc91edbfb68b 100644 > --- a/mm/hugetlb_vmemmap.c > +++ b/mm/hugetlb_vmemmap.c > @@ -480,6 +480,45 @@ int hugetlb_vmemmap_restore(const struct hstate *h, struct page *head) > return ret; > } > > +/** > + * hugetlb_vmemmap_restore_folios - restore vmemmap for every folio on the list. > + * @h: struct hstate. > + * @folio_list: list of folios. > + * @restored: Set to number of folios for which vmemmap was restored > + * successfully if caller passes a non-NULL pointer. > + * > + * Return: %0 if vmemmap exists for all folios on the list. If an error is > + * encountered restoring vmemmap for ANY folio, an error code > + * will be returned to the caller. It is then the responsibility > + * of the caller to check the hugetlb vmemmap optimized flag of > + * each folio to determine if vmemmap was actually restored. > + * Note that processing is stopped when first error is encountered. > + */ > +int hugetlb_vmemmap_restore_folios(const struct hstate *h, > + struct list_head *folio_list, > + unsigned long *restored) How about changing parameter of @restored to a list_head type which returns the non-optimized (previously) or vmemmap-restored-sucessful huge pages? In which case, the caller could traverse this returned list to free them first like you have implemented in bulk_vmemmap_restore_enomem(), it will be more efficient. The meaning of returned value should also be changed accordingly since update_and_free_pages_bulk() wants to whether there is a vmemmap-optimized huge page being restored sucessfully to determine if it should clear hugetlb flag. So hugetlb_vmemmap_restore_folios() could return how many huge pages being restored successful, if a negative number is returned meaning there is some error in the process of restoring of vmemmap. Thanks. > +{ > + unsigned long num_restored; > + struct folio *folio; > + int ret = 0; > + > + num_restored = 0; > + list_for_each_entry(folio, folio_list, lru) { > + if (folio_test_hugetlb_vmemmap_optimized(folio)) { > + ret = hugetlb_vmemmap_restore(h, &folio->page); > + if (ret) > + goto out; > + else > + num_restored++; > + } > + } > + > +out: > + if (*restored) > + *restored = num_restored; > + return ret; > +} > + > /* Return true iff a HugeTLB whose vmemmap should and can be optimized. */ > static bool vmemmap_should_optimize(const struct hstate *h, const struct page *head) > { > diff --git a/mm/hugetlb_vmemmap.h b/mm/hugetlb_vmemmap.h > index c512e388dbb4..bb58453c3cc0 100644 > --- a/mm/hugetlb_vmemmap.h > +++ b/mm/hugetlb_vmemmap.h > @@ -19,6 +19,8 @@ > > #ifdef CONFIG_HUGETLB_PAGE_OPTIMIZE_VMEMMAP > int hugetlb_vmemmap_restore(const struct hstate *h, struct page *head); > +int hugetlb_vmemmap_restore_folios(const struct hstate *h, > + struct list_head *folio_list, unsigned long *restored); > void hugetlb_vmemmap_optimize(const struct hstate *h, struct page *head); > void hugetlb_vmemmap_optimize_folios(struct hstate *h, struct list_head *folio_list); > > @@ -45,6 +47,15 @@ static inline int hugetlb_vmemmap_restore(const struct hstate *h, struct page *h > return 0; > } > > +static inline int hugetlb_vmemmap_restore_folios(const struct hstate *h, > + struct list_head *folio_list, > + unsigned long *restored) > +{ > + if (restored) > + *restored = 0; > + return 0; > +} > + > static inline void hugetlb_vmemmap_optimize(const struct hstate *h, struct page *head) > { > }