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 63038C00A8F for ; Tue, 24 Oct 2023 17:38:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D9CE56B02CE; Tue, 24 Oct 2023 13:38:07 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D4D126B02CF; Tue, 24 Oct 2023 13:38:07 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C13FE6B02D0; Tue, 24 Oct 2023 13:38:07 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id B33CE6B02CE for ; Tue, 24 Oct 2023 13:38:07 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 7E71C1CB4FD for ; Tue, 24 Oct 2023 17:38:07 +0000 (UTC) X-FDA: 81381063414.27.9EA9254 Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com [209.85.210.175]) by imf11.hostedemail.com (Postfix) with ESMTP id A4D514000A for ; Tue, 24 Oct 2023 17:38:05 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=XPHENfKM; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf11.hostedemail.com: domain of shy828301@gmail.com designates 209.85.210.175 as permitted sender) smtp.mailfrom=shy828301@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1698169085; 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=g7zN8TITOFW53OV70gZW15XJJiZwhp5pdZptIds+tMc=; b=446PHXbAF2FvkLoqbXjIJff+XsUr+DBViozXYepVx6iEhqc0fQE2y0okkwk0wmKFlbxZa2 3XfP/F1VY6Z/rN2RRrZbBC9LltpWvUvs2TuxmUg2vtPQPO032X4yYaIgceJTN4lShUEz/e eG/4i6V4Av+m5GmLy+Yf//OAhcEK/Wc= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=XPHENfKM; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf11.hostedemail.com: domain of shy828301@gmail.com designates 209.85.210.175 as permitted sender) smtp.mailfrom=shy828301@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1698169085; a=rsa-sha256; cv=none; b=eAEm6gMqX9/RxUKFcMn98UvoKbG92E1X+A2X6JHBTb7iNpq7QteauNlHGMtgChekrmPfIT 99U7t79HqrDQfKaSu+jcu0d2Cknc7j3e6woUZtnbPWN1yaZqVJrV7u55h30JKPSXjAqFEb ql7yzMNT964gM82cO+NXfhgDxOcEGoU= Received: by mail-pf1-f175.google.com with SMTP id d2e1a72fcca58-6b7f0170d7bso4503476b3a.2 for ; Tue, 24 Oct 2023 10:38:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698169084; x=1698773884; darn=kvack.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=g7zN8TITOFW53OV70gZW15XJJiZwhp5pdZptIds+tMc=; b=XPHENfKMArfEpdT7RLffliET7CROEpahSPQfnufedSUfIy1gxsrHR58hK5Wptc536Y 8Lhzt8gW+4D/RDGE0TV3QxMBi5bZrQQezEXBzFpQcsEF+B2XD1GLkJf9m/ymJtVGldf6 pPs4k5tCOa23/yqk0wrRKYFegGFwPzQks1i7PT4DVXeQqfvaw0BRuOQzp3/7IxLUBj9+ SHXp6Rv64e8cxxbBsIGl5MT5qm9hVVVTvRruO4fBNzvXdAHxJ/VwYmkVNCq/mthgsGNN FIKS0UHUj2V+DJNBGIHhElb17EIR0zlsGY8lu2JjLiFEv9ozvkSjPIGsxzQLvUC9PEtw OnbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698169084; x=1698773884; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=g7zN8TITOFW53OV70gZW15XJJiZwhp5pdZptIds+tMc=; b=bG7aq7DxggdB5FxS4DhanPd5s/p2LzgujCx4aLjrGwwT/XtDStcYSWfj/e/UHCxJ0J AqaX3638gt6ehfCMJN5YEsg2ZFhBgS4wKDJ6YL5gU0hmM6ljCxrgJ67i1OnBE92+LkTu I/8+d9vO1rbXqeqccw3Dz5gzIKxxeLtJigYjioB1YYKimHnuMNONzWOgM4Db0FW8Bwyg XVApsbaJumJIyPo+NdNOL9Rgp9jUxq4HSdW9B+EEThcl5QcP9BMWC50Em/xZDpbnyCLG tUVT5trWdyEXS69qunasn5y/pMKcT4+ttR21w2dCX7ZeXCHUMs4FteLCuWdlfUneKcYq 9CTA== X-Gm-Message-State: AOJu0YxxSYHX6xlZ59tvnzJe/uEFFp2OFLCC8ciREcdICQomSGznf7XQ kmC2dCfRbEBi1bhgC0mjoswFD9azXnwB0KCgFY0= X-Google-Smtp-Source: AGHT+IGH8x9WV2KFCDlabjXB0cys93DMPBhKOh3cSI9O76HdDAzZbggT47bUR1f0qAzCWvabzQbqFQFRUH4esfQPaVw= X-Received: by 2002:a05:6a20:12c5:b0:17a:284:de50 with SMTP id v5-20020a056a2012c500b0017a0284de50mr4011177pzg.6.1698169084187; Tue, 24 Oct 2023 10:38:04 -0700 (PDT) MIME-Version: 1.0 References: <20231020183331.10770-1-vishal.moola@gmail.com> <20231020183331.10770-2-vishal.moola@gmail.com> In-Reply-To: <20231020183331.10770-2-vishal.moola@gmail.com> From: Yang Shi Date: Tue, 24 Oct 2023 10:37:52 -0700 Message-ID: Subject: Re: [PATCH v3 1/5] mm/khugepaged: Convert __collapse_huge_page_isolate() to use folios To: "Vishal Moola (Oracle)" Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, akpm@linux-foundation.org, Matthew Wilcox Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: A4D514000A X-Stat-Signature: jidpgaeunnka4egoqart8od31c9gczyh X-Rspam-User: X-HE-Tag: 1698169085-394170 X-HE-Meta: U2FsdGVkX1/ojWCtxq2DkbulHeQkmrv2qj9osJdxHR4I+X2n6mLJedt5DjwPv1w+tNUy/U7U8xWuIhCMGLsHX2YTbQVp0UcT5d2QrGaxdQoSDqB+MOirn6YCm7wBeqY6KXfkoYcS6ZMyCEIEhTW8IZtT2oCVaroPPTc/7aT6sDuL4Uokk2bBV/CgVmIF8k6kkZVIOOeRkMCQTgF8t13O+wNEeghJKP2BTGamIHKFlmJDQDalyuyqeUwUfUZJo/WS2vzESRPNf2ZQ+9Yk7jWlscgfXcVj0oTdLmh9BkEUdd3t6LpwYgy6ahnvZC6svm4sA3O/V/KRKpTXxridxQOoDietWgb5EV3rlabqFUwJhO63xkZkcTvKThsOjVEP3UvVTonOVWKMbhEHSAMggEJ8nhcIltZTuEO51vKbdv4PZy87XsK35dKbqzGCz+3BSlND1SbVypnebuPJPqjZ2zsl+/qHvP/s0h4ZakvknErIpV6G2bguhPXXd7+LSQCDdPooJ02l01YDT71YlrKLZAzI78FDCTSaPEBcoLN8i6jVcNhhrQVAz0ul3ln3Ey8sLRqRcxcd9exGLPoKVN2sMec3qcBz6lPIgx5mp60rDIKJcwjgP2HeOIRYDL+kAwCrqFJM/KTSc+IzQu9aMgtlyodRH4Ot4O0V4075oK0rmQBHMagUyPg94JHWW0b1+Cv+Ac8D5vFDZYSSNvVyUc2Xwq7aF9upRn60x9kDj4PFFuTVt4iqHGjxqw60h0CtHWo52fYSXk33j6ix+yT/F9Jk8gWEp27Y8qN7SXqIj8OnGSsLXn/92/iMFworYkteesfvk7QEGs37wmTXdIKaPvqJ7lSM6w0ceNOn4D8JDLdh66d1anPMOA1SzdDySVW/t5C4R7+J4sHdY1t8jjKxNmnZUqZxEajKa9lQ+28l1Vv5WSUz7AG4DfyQj2cqqSJUlJam1u+A+9exPALekiP25oiUk1s BSlUu+GL s8AcVNZPKxszIRYrNJHxupzlrvmuL9bgH9y5Mm8Jvqao9QSa1JC2JWXIp0RAqLZTN751axNQ9MhEW0Z4BuRBqCjJMfrVnpRWUBGKo781R8txhbQAdBqPrejocCFTM2PVCliBJMiy1TRNimJua0n2K1D6BCWPeikWqsneFMHzMXmmezhrz/udKJb6HNqvDYnqnAQKhbcOyCGUOjqN3BuoL+/mK85dHJ/N1zaJQ7aKXxensa4E6+byG2iu4uDTOmn9F5T5Ld4wmOPQD9Qjj5TRaZ62WZGoMslm8ATK8N/FS9nMIRAjIUEeNkgpGuMBfDzjo6usIhuaIz7UdLXNlyWcsAcv8+Dou/1b9O3NE7Fi530vAo1NXJSw62+9Gm0tlDCf+0N3UahpX7vO6GlnS2OcZX1x2XBuLWJlCplr/lGWjtOe0XebH/KgzOSmO735mKefgkrmz3YaxH6G4ZDlRi0w8x1df3VlvzWXMmuWfqyYNbQ30cgO+pZzko5Glyc9sZYcdHFHMfj71EklDh6W+zQakWJWnOnLQxJuxeQGz6gQV1hzCVhc= 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: List-Subscribe: List-Unsubscribe: On Fri, Oct 20, 2023 at 11:33=E2=80=AFAM Vishal Moola (Oracle) wrote: > > Replaces 11 calls to compound_head() with 1, and removes 1348 bytes of > kernel text. > > Reviewed-by: Matthew Wilcox (Oracle) > Signed-off-by: Vishal Moola (Oracle) Reviewed-by: Yang Shi > --- > mm/khugepaged.c | 45 +++++++++++++++++++++++---------------------- > 1 file changed, 23 insertions(+), 22 deletions(-) > > diff --git a/mm/khugepaged.c b/mm/khugepaged.c > index 88433cc25d8a..500756604488 100644 > --- a/mm/khugepaged.c > +++ b/mm/khugepaged.c > @@ -542,6 +542,7 @@ static int __collapse_huge_page_isolate(struct vm_are= a_struct *vma, > struct list_head *compound_pageli= st) > { > struct page *page =3D NULL; > + struct folio *folio =3D NULL; > pte_t *_pte; > int none_or_zero =3D 0, shared =3D 0, result =3D SCAN_FAIL, refer= enced =3D 0; > bool writable =3D false; > @@ -576,7 +577,8 @@ static int __collapse_huge_page_isolate(struct vm_are= a_struct *vma, > goto out; > } > > - VM_BUG_ON_PAGE(!PageAnon(page), page); > + folio =3D page_folio(page); > + VM_BUG_ON_FOLIO(!folio_test_anon(folio), folio); > > if (page_mapcount(page) > 1) { > ++shared; > @@ -588,16 +590,15 @@ static int __collapse_huge_page_isolate(struct vm_a= rea_struct *vma, > } > } > > - if (PageCompound(page)) { > - struct page *p; > - page =3D compound_head(page); > + if (folio_test_large(folio)) { > + struct folio *f; > > /* > * Check if we have dealt with the compound page > * already > */ > - list_for_each_entry(p, compound_pagelist, lru) { > - if (page =3D=3D p) > + list_for_each_entry(f, compound_pagelist, lru) { > + if (folio =3D=3D f) > goto next; > } > } > @@ -608,7 +609,7 @@ static int __collapse_huge_page_isolate(struct vm_are= a_struct *vma, > * is needed to serialize against split_huge_page > * when invoked from the VM. > */ > - if (!trylock_page(page)) { > + if (!folio_trylock(folio)) { > result =3D SCAN_PAGE_LOCK; > goto out; > } > @@ -624,8 +625,8 @@ static int __collapse_huge_page_isolate(struct vm_are= a_struct *vma, > * but not from this process. The other process cannot wr= ite to > * the page, only trigger CoW. > */ > - if (!is_refcount_suitable(page)) { > - unlock_page(page); > + if (!is_refcount_suitable(&folio->page)) { > + folio_unlock(folio); > result =3D SCAN_PAGE_COUNT; > goto out; > } > @@ -634,27 +635,27 @@ static int __collapse_huge_page_isolate(struct vm_a= rea_struct *vma, > * Isolate the page to avoid collapsing an hugepage > * currently in use by the VM. > */ > - if (!isolate_lru_page(page)) { > - unlock_page(page); > + if (!folio_isolate_lru(folio)) { > + folio_unlock(folio); > result =3D SCAN_DEL_PAGE_LRU; > goto out; > } > - mod_node_page_state(page_pgdat(page), > - NR_ISOLATED_ANON + page_is_file_lru(page)= , > - compound_nr(page)); > - VM_BUG_ON_PAGE(!PageLocked(page), page); > - VM_BUG_ON_PAGE(PageLRU(page), page); > + node_stat_mod_folio(folio, > + NR_ISOLATED_ANON + folio_is_file_lru(foli= o), > + folio_nr_pages(folio)); > + VM_BUG_ON_FOLIO(!folio_test_locked(folio), folio); > + VM_BUG_ON_FOLIO(folio_test_lru(folio), folio); > > - if (PageCompound(page)) > - list_add_tail(&page->lru, compound_pagelist); > + if (folio_test_large(folio)) > + list_add_tail(&folio->lru, compound_pagelist); > next: > /* > * If collapse was initiated by khugepaged, check that th= ere is > * enough young pte to justify collapsing the page > */ > if (cc->is_khugepaged && > - (pte_young(pteval) || page_is_young(page) || > - PageReferenced(page) || mmu_notifier_test_young(vma-= >vm_mm, > + (pte_young(pteval) || folio_test_young(folio) || > + folio_test_referenced(folio) || mmu_notifier_test_yo= ung(vma->vm_mm, > addr= ess))) > referenced++; > > @@ -668,13 +669,13 @@ static int __collapse_huge_page_isolate(struct vm_a= rea_struct *vma, > result =3D SCAN_LACK_REFERENCED_PAGE; > } else { > result =3D SCAN_SUCCEED; > - trace_mm_collapse_huge_page_isolate(page, none_or_zero, > + trace_mm_collapse_huge_page_isolate(&folio->page, none_or= _zero, > referenced, writable,= result); > return result; > } > out: > release_pte_pages(pte, _pte, compound_pagelist); > - trace_mm_collapse_huge_page_isolate(page, none_or_zero, > + trace_mm_collapse_huge_page_isolate(&folio->page, none_or_zero, > referenced, writable, result)= ; > return result; > } > -- > 2.40.1 >