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 68226C43334 for ; Tue, 7 Jun 2022 19:33:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DCB226B0074; Tue, 7 Jun 2022 15:33:07 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D7A818D0005; Tue, 7 Jun 2022 15:33:07 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C1A5D8D0003; Tue, 7 Jun 2022 15:33:07 -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 B367E6B0074 for ; Tue, 7 Jun 2022 15:33:07 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 82360C28 for ; Tue, 7 Jun 2022 19:33:07 +0000 (UTC) X-FDA: 79552438014.01.AA12EA3 Received: from mail-lf1-f47.google.com (mail-lf1-f47.google.com [209.85.167.47]) by imf03.hostedemail.com (Postfix) with ESMTP id 9F58E20062 for ; Tue, 7 Jun 2022 19:33:06 +0000 (UTC) Received: by mail-lf1-f47.google.com with SMTP id y32so29858964lfa.6 for ; Tue, 07 Jun 2022 12:33:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=qzlpGPcIHkUBEq8LcXNh8npQQbxnuVcjwNBOo+WNnuE=; b=pEN6S14QkDRM1JOdqDKB+0EPBCu/LVSs5SrWljLvK2EVsZ5rt3sYiGduJXzBTdGz8W tnsFIS8LR0CCKfy9SwAeK8f+Zjulo59mJc7Vrp/NFj2flWujOxUGPq/+2+vnaZr74KMy qc8qPeNUTS6X8GQxluGjvmPzBm/W0xhOc3Ug6X60gGpjvxRx/MAR3QBr1XriGzdUZBnT Xfh8Z/ETcA3lXHoH5L9yE+oU9GjjpP3dPJ4F2KpD4uIZ2QLdZ3IP6Amn7f+dkyjolow7 1uZyOMORsNF7m931O3DH1/P8M0O4lMo7mrx6n1fI5I5ecCV+UK2Ng+My3735VqzSs8ec +K+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=qzlpGPcIHkUBEq8LcXNh8npQQbxnuVcjwNBOo+WNnuE=; b=JfcBYWvHwpa/RG2UeNbX0cR4TsG3QdnJJu/k9BQZQlBbw0Yuj4V+rq1cCuuAtLrg8S oK6V1as8cZMy5CbGKZhOVw7+02OgIlUoQpId4YJdIxS/sB8vGnOq3BVrZOhQs6KRlD80 RjItiSj/c7NRfzgW0lgLcO1zMfIwQIBThnxYKNdOjLlM/m3qjsF1WX2wBxXctZT69KKN 4aqepAqAIaca6WTb/tn9mj8buwy4NCbyRr3dyFtaX2RaYC95aoOm2gtQGHgJh+fmIT8Q nFC4Aytsp6BmS2UVRR8L84ZqQUOLiTIG8mCryBmZ0pckLaJJ2Gducv3wPAH0tLhCMgqn PhtA== X-Gm-Message-State: AOAM530gLXEi3jyW8Ruzm2j9f7kL/bhwlNwHUNq5un+vPRoelZs0whBj MFtNR4ipmKol6S35eJLlvx6Nmt2lSV+pe5xfUAFfrQ== X-Google-Smtp-Source: ABdhPJyLETH7GMVD9jKxLVWubOWz22lEswsDnOEXVFcKcN8dbag/rUUw8n8GpOUTKkAJybvClaRBHdPsVmt7EAnMEr8= X-Received: by 2002:a05:6512:e94:b0:478:f6ad:c9d7 with SMTP id bi20-20020a0565120e9400b00478f6adc9d7mr19831115lfb.198.1654630380356; Tue, 07 Jun 2022 12:33:00 -0700 (PDT) MIME-Version: 1.0 References: <20220604004004.954674-1-zokeefe@google.com> <20220604004004.954674-3-zokeefe@google.com> In-Reply-To: From: "Zach O'Keefe" Date: Tue, 7 Jun 2022 12:32:23 -0700 Message-ID: Subject: Re: [PATCH v6 02/15] mm/khugepaged: record SCAN_PMD_MAPPED when scan_pmd() finds THP To: Yang Shi Cc: Alex Shi , David Hildenbrand , David Rientjes , Matthew Wilcox , Michal Hocko , Pasha Tatashin , Peter Xu , Rongwei Wang , SeongJae Park , Song Liu , Vlastimil Babka , Zi Yan , Linux MM , Andrea Arcangeli , Andrew Morton , Arnd Bergmann , Axel Rasmussen , Chris Kennelly , Chris Zankel , Helge Deller , Hugh Dickins , Ivan Kokshaysky , "James E.J. Bottomley" , Jens Axboe , "Kirill A. Shutemov" , Matt Turner , Max Filippov , Miaohe Lin , Minchan Kim , Patrick Xia , Pavel Begunkov , Thomas Bogendoerfer Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 9F58E20062 X-Stat-Signature: 6tynp7x487zy3uthdjhraeirhtxcouzf X-Rspam-User: Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=pEN6S14Q; spf=pass (imf03.hostedemail.com: domain of zokeefe@google.com designates 209.85.167.47 as permitted sender) smtp.mailfrom=zokeefe@google.com; dmarc=pass (policy=reject) header.from=google.com X-Rspamd-Server: rspam08 X-HE-Tag: 1654630386-952479 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 Tue, Jun 7, 2022 at 9:01 AM Zach O'Keefe wrote: > > On Mon, Jun 6, 2022 at 1:46 PM Yang Shi wrote: > > > > On Fri, Jun 3, 2022 at 5:40 PM Zach O'Keefe wrote: > > > > > > When scanning an anon pmd to see if it's eligible for collapse, return > > > SCAN_PMD_MAPPED if the pmd already maps a THP. Note that > > > SCAN_PMD_MAPPED is different from SCAN_PAGE_COMPOUND used in the > > > file-collapse path, since the latter might identify pte-mapped compound > > > pages. This is required by MADV_COLLAPSE which necessarily needs to > > > know what hugepage-aligned/sized regions are already pmd-mapped. > > > > > > Signed-off-by: Zach O'Keefe > > > --- > > > include/trace/events/huge_memory.h | 1 + > > > mm/internal.h | 1 + > > > mm/khugepaged.c | 32 ++++++++++++++++++++++++++---- > > > mm/rmap.c | 15 ++++++++++++-- > > > 4 files changed, 43 insertions(+), 6 deletions(-) > > > > > > diff --git a/include/trace/events/huge_memory.h b/include/trace/events/huge_memory.h > > > index d651f3437367..55392bf30a03 100644 > > > --- a/include/trace/events/huge_memory.h > > > +++ b/include/trace/events/huge_memory.h > > > @@ -11,6 +11,7 @@ > > > EM( SCAN_FAIL, "failed") \ > > > EM( SCAN_SUCCEED, "succeeded") \ > > > EM( SCAN_PMD_NULL, "pmd_null") \ > > > + EM( SCAN_PMD_MAPPED, "page_pmd_mapped") \ > > > EM( SCAN_EXCEED_NONE_PTE, "exceed_none_pte") \ > > > EM( SCAN_EXCEED_SWAP_PTE, "exceed_swap_pte") \ > > > EM( SCAN_EXCEED_SHARED_PTE, "exceed_shared_pte") \ > > > diff --git a/mm/internal.h b/mm/internal.h > > > index 6e14749ad1e5..f768c7fae668 100644 > > > --- a/mm/internal.h > > > +++ b/mm/internal.h > > > @@ -188,6 +188,7 @@ extern void reclaim_throttle(pg_data_t *pgdat, enum vmscan_throttle_state reason > > > /* > > > * in mm/rmap.c: > > > */ > > > +pmd_t *mm_find_pmd_raw(struct mm_struct *mm, unsigned long address); > > > extern pmd_t *mm_find_pmd(struct mm_struct *mm, unsigned long address); > > > > > > /* > > > diff --git a/mm/khugepaged.c b/mm/khugepaged.c > > > index cc3d6fb446d5..7a914ca19e96 100644 > > > --- a/mm/khugepaged.c > > > +++ b/mm/khugepaged.c > > > @@ -28,6 +28,7 @@ enum scan_result { > > > SCAN_FAIL, > > > SCAN_SUCCEED, > > > SCAN_PMD_NULL, > > > + SCAN_PMD_MAPPED, > > > SCAN_EXCEED_NONE_PTE, > > > SCAN_EXCEED_SWAP_PTE, > > > SCAN_EXCEED_SHARED_PTE, > > > @@ -901,6 +902,31 @@ static int hugepage_vma_revalidate(struct mm_struct *mm, unsigned long address, > > > return 0; > > > } > > > > > > +static int find_pmd_or_thp_or_none(struct mm_struct *mm, > > > + unsigned long address, > > > + pmd_t **pmd) > > > +{ > > > + pmd_t pmde; > > > + > > > + *pmd = mm_find_pmd_raw(mm, address); > > > + if (!*pmd) > > > + return SCAN_PMD_NULL; > > > + > > > + pmde = pmd_read_atomic(*pmd); > > > + > > > +#ifdef CONFIG_TRANSPARENT_HUGEPAGE > > > + /* See comments in pmd_none_or_trans_huge_or_clear_bad() */ > > > + barrier(); > > > +#endif > > > + if (!pmd_present(pmde)) > > > + return SCAN_PMD_NULL; > > > + if (pmd_trans_huge(pmde)) > > > + return SCAN_PMD_MAPPED; > > > + if (pmd_bad(pmde)) > > > + return SCAN_FAIL; > > > > khugepaged doesn't handle pmd_bad before, IIRC it may just return > > SCAN_SUCCEED if everything else is good? It is fine to add it, but it > > may be better to return SCAN_PMD_NULL? > > Correct, pmd_bad() wasn't handled before. I actually don't know how a > bad pmd might arise in the wild (would love to actually know this), > but I don't see the check hurting (might be overly convervative > though). Conversely, I'm not sure where things go astray currently if > the pmd is bad. Guess it depends in what way the flags are mutated. > Returning SCAN_PMD_NULL SGTM. > > > > > > + return SCAN_SUCCEED; > > > +} > > > + > > > /* > > > * Bring missing pages in from swap, to complete THP collapse. > > > * Only done if khugepaged_scan_pmd believes it is worthwhile. > > > @@ -1146,11 +1172,9 @@ static int khugepaged_scan_pmd(struct mm_struct *mm, > > > > > > VM_BUG_ON(address & ~HPAGE_PMD_MASK); > > > > > > - pmd = mm_find_pmd(mm, address); > > > - if (!pmd) { > > > - result = SCAN_PMD_NULL; > > > + result = find_pmd_or_thp_or_none(mm, address, &pmd); > > > + if (result != SCAN_SUCCEED) > > > > There are a couple of other callsites for mm_find_pmd(), you may need > > to change all of them to find_pmd_or_thp_or_none() for MADV_COLLAPSE > > since khugepaged may collapse the area before MADV_COLLAPSE > > reacquiring mmap_lock IIUC and MADV_COLLAPSE does care this case. It > > is fine w/o MADV_COLLAPSE since khupaged doesn't care if it is PMD > > mapped or not. > > Ya, I was just questioning the same thing after responding above - at > least w.r.t whether the pmd_bad() also needs to be in these callsites > (check for pmd mapping, as you mention, I think is definitely > necessary). Thanks for catching this! > > > So it may be better to move this patch right before MADV_COLLAPSE is introduced? > > I think this should be ok - I'll give it a try at least. > > Again, thank you for taking the time to thoroughly review this. > > Best, > Zach > > > > goto out; > > > - } > > > > > > memset(khugepaged_node_load, 0, sizeof(khugepaged_node_load)); > > > pte = pte_offset_map_lock(mm, pmd, address, &ptl); > > > diff --git a/mm/rmap.c b/mm/rmap.c > > > index 04fac1af870b..c9979c6ad7a1 100644 > > > --- a/mm/rmap.c > > > +++ b/mm/rmap.c > > > @@ -767,13 +767,12 @@ unsigned long page_address_in_vma(struct page *page, struct vm_area_struct *vma) > > > return vma_address(page, vma); > > > } > > > > > > -pmd_t *mm_find_pmd(struct mm_struct *mm, unsigned long address) > > > +pmd_t *mm_find_pmd_raw(struct mm_struct *mm, unsigned long address) > > > > May be better to have some notes for mm_find_pmd_raw() and mm_find_pmd(). > > Agreed. Looking over this code again, there are only 3 users of mm_find_pmd(): 1) khugepaged 2) ksm (replace_page()) 3) split_huge_pmd_address() Once khugepaged codepaths care about THP-pmds, ksm is the only remaining user that really wants a pte-mapping pmd. I've gone and consolidated the open-coded code in split_huge_pmd_address() to use the mm_find_pmd_raw(). I've also done a name switch: mm_find_pmd() -> mm_find_pte_pmd() mm_find_pmd_raw() -> mm_find_pmd() This basically reverts mm_find_pmd() to its pre commit f72e7dcdd252 ("mm: let mm_find_pmd fix buggy race with THP fault") behavior, and special cases (what will be, after MADV_COLLAPSE file support) the only remaining callsite which *doesn't* care about THP-pmds (ksm). The naming here is a little more meaningful than "*raw", and IMHO more readable. > > > { > > > pgd_t *pgd; > > > p4d_t *p4d; > > > pud_t *pud; > > > pmd_t *pmd = NULL; > > > - pmd_t pmde; > > > > > > pgd = pgd_offset(mm, address); > > > if (!pgd_present(*pgd)) > > > @@ -788,6 +787,18 @@ pmd_t *mm_find_pmd(struct mm_struct *mm, unsigned long address) > > > goto out; > > > > > > pmd = pmd_offset(pud, address); > > > +out: > > > + return pmd; > > > +} > > > + > > > +pmd_t *mm_find_pmd(struct mm_struct *mm, unsigned long address) > > > +{ > > > + pmd_t pmde; > > > + pmd_t *pmd; > > > + > > > + pmd = mm_find_pmd_raw(mm, address); > > > + if (!pmd) > > > + goto out; > > > /* > > > * Some THP functions use the sequence pmdp_huge_clear_flush(), set_pmd_at() > > > * without holding anon_vma lock for write. So when looking for a > > > -- > > > 2.36.1.255.ge46751e96f-goog > > >