From nobody Wed Sep 17 03:31:49 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4F1E8C4332F for ; Thu, 22 Dec 2022 19:48:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231337AbiLVTsy (ORCPT ); Thu, 22 Dec 2022 14:48:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38342 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229950AbiLVTss (ORCPT ); Thu, 22 Dec 2022 14:48:48 -0500 Received: from mail-wr1-x432.google.com (mail-wr1-x432.google.com [IPv6:2a00:1450:4864:20::432]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 68EB21838B for ; Thu, 22 Dec 2022 11:48:42 -0800 (PST) Received: by mail-wr1-x432.google.com with SMTP id y8so2661751wrl.13 for ; Thu, 22 Dec 2022 11:48:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=WF0czWG0z2T4oq6TY2ZkLRE6dWmClGYr0kuRjGhgjlc=; b=MwlMQDojPRl1N9RKswNye3CDEdP22NLQDZUxmKlxgtsd8sFEE9avKa8OUrmMpIrDOo Aon+VZIurNEFXw6IJhGWiW+VFEAsegrOwl4WFS1jMQhSQ5fZh3XoJaiY3BPkj5/zlcm9 aN38lXwyHCc7/V4rdO312r8Rzu8HSP5ddz77APwlAgLiQYiClEaE34pMSo61W49YSVT7 BwALNp1tPo0ADZziuee4Kvo+X8H5L0NfrheCjhDjPGWO+Th4gUZ2AKvDQ+t9agou4j6U FYgZ5sqQNPaMOSkhV9S2NrQpntsNyJKqeeJDicruSV1dKsr1Q2tLYk/lap/UrDzmUn+O lQFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WF0czWG0z2T4oq6TY2ZkLRE6dWmClGYr0kuRjGhgjlc=; b=Pd8AYuyAM5Xn9AG5MhpMHumJm3eW2SwRdZXEusQt17OuoLLXwSgyrdNLgMVDXF2TnW rKr2Zwg0C55gO4X5/6uRgR4YgKGn0xjr9+dRyqjNSlUrpCmfCV40audGXvVVJrznhuJn Z0bIgKIjYA8Phcnqb8C2JJ7XFlDnalcYQJFWX5DPqRbNvgyg4Hmx0O7nTw7m/vNSNHk/ CB+ZR46X6R4d8D+of20jHvv6kVr/Dfix+JU3f6bOaDNuG22PUJkWRB6U//klmlAxxK8N eHgsLBke3bnhzFA2+1B77N4cgBP7PZY55byWnD8BTLFf7GD2B3IqT1d+CFFJb/QayhNq RWGw== X-Gm-Message-State: AFqh2kqRPqvLnn6aCugIuQo65b2lFPoa4dyYP+RZcZ5dKR2ppJnFiMdM 6/EjlYIVwx9ecc5b45AOfVc= X-Google-Smtp-Source: AMrXdXsY64F/wSGDz+J4qfQmolIKAjlZatXRULqtAUfDbCSbyupYNuq2zWD2zglwlDhx08crJ3WGiQ== X-Received: by 2002:a05:6000:128a:b0:236:7591:cf13 with SMTP id f10-20020a056000128a00b002367591cf13mr4904284wrx.40.1671738520872; Thu, 22 Dec 2022 11:48:40 -0800 (PST) Received: from lucifer.home ([2a00:23c5:dc8c:8701:1663:9a35:5a7b:1d76]) by smtp.googlemail.com with ESMTPSA id i1-20020adfb641000000b002425787c5easm1349317wre.96.2022.12.22.11.48.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Dec 2022 11:48:40 -0800 (PST) From: Lorenzo Stoakes To: linux-mm@kvack.org, Andrew Morton , linux-kernel@vger.kernel.org Cc: Matthew Wilcox , Hugh Dickins , Vlastimil Babka , Liam Howlett , William Kucharski , Christian Brauner , Jonathan Corbet , Mike Rapoport , Joel Fernandes , Lorenzo Stoakes Subject: [PATCH 1/4] mm: pagevec: add folio_batch_reinit() Date: Thu, 22 Dec 2022 19:48:30 +0000 Message-Id: X-Mailer: git-send-email 2.39.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This performs the same task as pagevec_reinit(), only modifying a folio batch rather than a pagevec. Signed-off-by: Lorenzo Stoakes --- include/linux/pagevec.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/linux/pagevec.h b/include/linux/pagevec.h index 215eb6c3bdc9..2a6f61a0c10a 100644 --- a/include/linux/pagevec.h +++ b/include/linux/pagevec.h @@ -103,6 +103,11 @@ static inline void folio_batch_init(struct folio_batch= *fbatch) fbatch->percpu_pvec_drained =3D false; } =20 +static inline void folio_batch_reinit(struct folio_batch *fbatch) +{ + fbatch->nr =3D 0; +} + static inline unsigned int folio_batch_count(struct folio_batch *fbatch) { return fbatch->nr; --=20 2.39.0 From nobody Wed Sep 17 03:31:49 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0457DC4332F for ; Thu, 22 Dec 2022 19:49:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235460AbiLVTtB (ORCPT ); Thu, 22 Dec 2022 14:49:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38348 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229995AbiLVTst (ORCPT ); Thu, 22 Dec 2022 14:48:49 -0500 Received: from mail-wr1-x435.google.com (mail-wr1-x435.google.com [IPv6:2a00:1450:4864:20::435]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3939D1838D for ; Thu, 22 Dec 2022 11:48:44 -0800 (PST) Received: by mail-wr1-x435.google.com with SMTP id y16so2700065wrm.2 for ; Thu, 22 Dec 2022 11:48:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=VLkOKeT4uIbBG6ss89Hd1tlt6NrDYEFm7lc6id39hK0=; b=qaVTeJBr0AB0s3zFjlbBmH6X/y6e0XSR+iRAd0acuOKDc0gLhdkkp4b0e6i0+x6SVZ bTVRoj29yr3mjHORwcggnN8TK8ejdSwcJb/PMMRNz1VUf0Bk8jC4xTqW9Sl6TbHEOq7q +mag8pB/j9H7bNZgiBJjgYCe4IkYcuMfpiaedTzbN3o0MxeA1HAqc0/PmSiDVsF+pthU OV4fY9Ildjb3u0DXp7/W7QKRrOKexJaGdnn+D/DwQz8VncM77pYGYjtlnQVezc8OxQgk XMao8+aSfs7jz7UC871WOzc+CQXp+pl/Na/F5uk+t815ejTt3kCbHCPvtXXg1n4b8qtr 18RQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VLkOKeT4uIbBG6ss89Hd1tlt6NrDYEFm7lc6id39hK0=; b=mlyhoAes4dp7z8zd8wW47ZPir7lekhCkTqYTd3JjJw3brSi4d1hUTgHYKWdWRPxfwF AnmrOfFLxiS9QakeFAXA3w9XTW/f+2IHj7XW7df5aPabXRe4SYwCuiBHdFZDcbrObUMo MzfTLoAPu/2dyjPBYv2sycJil/2NDeXoNMibcb2c0Y+QfiomXj7POcsDRnXo5+xiCNVN B7NcEytCAadHlpwnOJp9GS2X1FRGWqAOLyDMBouRYg6RsT685TCnmq6A3vFSV2W4Cyt5 WRCXlEuPA1qACv0ddKv/cNv7cLAxwRDu++V1MfoTwUmvW1rw1CnzegNZgPBMhE7WRI37 KhKQ== X-Gm-Message-State: AFqh2kqyEMpw8KyBIH6Wm8rAYRty6zujOt37+2zAWOI62XHDZi0tjH4z wUTYMz3+kqGJOg66CbTFVGPnrbxMziNENw== X-Google-Smtp-Source: AMrXdXuGSfcyX4JBZQVgEBq/oTLCneSYDqqUl8X2gg7SriuUfyRTav7lultTztWm9vrEl6sdsCDt8g== X-Received: by 2002:a5d:4568:0:b0:242:803:537f with SMTP id a8-20020a5d4568000000b002420803537fmr4497291wrc.18.1671738522730; Thu, 22 Dec 2022 11:48:42 -0800 (PST) Received: from lucifer.home ([2a00:23c5:dc8c:8701:1663:9a35:5a7b:1d76]) by smtp.googlemail.com with ESMTPSA id i1-20020adfb641000000b002425787c5easm1349317wre.96.2022.12.22.11.48.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Dec 2022 11:48:41 -0800 (PST) From: Lorenzo Stoakes To: linux-mm@kvack.org, Andrew Morton , linux-kernel@vger.kernel.org Cc: Matthew Wilcox , Hugh Dickins , Vlastimil Babka , Liam Howlett , William Kucharski , Christian Brauner , Jonathan Corbet , Mike Rapoport , Joel Fernandes , Lorenzo Stoakes Subject: [PATCH 2/4] mm: mlock: use folios and a folio batch internally Date: Thu, 22 Dec 2022 19:48:31 +0000 Message-Id: X-Mailer: git-send-email 2.39.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This brings mlock in line with the folio batches declared in mm/swap.c and makes the code more consistent across the two. The existing mechanism for identifying which operation each folio in the batch is undergoing is maintained, i.e. using the lower 2 bits of the struct folio address (previously struct page address). This should continue to function correctly as folios remain at least system word-aligned. All invoctions of mlock() pass either a non-compound page or the head of a THP-compound page and no tail pages need updating so this functionality works with struct folios being used internally rather than struct pages. In this patch the external interface is kept identical to before in order to maintain separation between patches in the series, using a rather awkward conversion from struct page to struct folio in relevant functions. However, this maintenance of the existing interface is intended to be temporary - the next patch in the series will update the interfaces to accept folios directly. Signed-off-by: Lorenzo Stoakes --- mm/mlock.c | 238 +++++++++++++++++++++++++++-------------------------- 1 file changed, 120 insertions(+), 118 deletions(-) diff --git a/mm/mlock.c b/mm/mlock.c index 7032f6dd0ce1..e9ba47fe67ed 100644 --- a/mm/mlock.c +++ b/mm/mlock.c @@ -28,12 +28,12 @@ =20 #include "internal.h" =20 -struct mlock_pvec { +struct mlock_fbatch { local_lock_t lock; - struct pagevec vec; + struct folio_batch fbatch; }; =20 -static DEFINE_PER_CPU(struct mlock_pvec, mlock_pvec) =3D { +static DEFINE_PER_CPU(struct mlock_fbatch, mlock_fbatch) =3D { .lock =3D INIT_LOCAL_LOCK(lock), }; =20 @@ -48,192 +48,192 @@ bool can_do_mlock(void) EXPORT_SYMBOL(can_do_mlock); =20 /* - * Mlocked pages are marked with PageMlocked() flag for efficient testing + * Mlocked folios are marked with the PG_mlocked flag for efficient testing * in vmscan and, possibly, the fault path; and to support semi-accurate * statistics. * - * An mlocked page [PageMlocked(page)] is unevictable. As such, it will - * be placed on the LRU "unevictable" list, rather than the [in]active lis= ts. - * The unevictable list is an LRU sibling list to the [in]active lists. - * PageUnevictable is set to indicate the unevictable state. + * An mlocked folio [folio_test_mlocked(folio)] is unevictable. As such, = it + * will be ostensibly placed on the LRU "unevictable" list (actually no su= ch + * list exists), rather than the [in]active lists. PG_unevictable is set to + * indicate the unevictable state. */ =20 -static struct lruvec *__mlock_page(struct page *page, struct lruvec *lruve= c) +static struct lruvec *__mlock_folio(struct folio *folio, struct lruvec *lr= uvec) { /* There is nothing more we can do while it's off LRU */ - if (!TestClearPageLRU(page)) + if (!folio_test_clear_lru(folio)) return lruvec; =20 - lruvec =3D folio_lruvec_relock_irq(page_folio(page), lruvec); + lruvec =3D folio_lruvec_relock_irq(folio, lruvec); =20 - if (unlikely(page_evictable(page))) { + if (unlikely(folio_evictable(folio))) { /* - * This is a little surprising, but quite possible: - * PageMlocked must have got cleared already by another CPU. - * Could this page be on the Unevictable LRU? I'm not sure, - * but move it now if so. + * This is a little surprising, but quite possible: PG_mlocked + * must have got cleared already by another CPU. Could this + * folio be unevictable? I'm not sure, but move it now if so. */ - if (PageUnevictable(page)) { - del_page_from_lru_list(page, lruvec); - ClearPageUnevictable(page); - add_page_to_lru_list(page, lruvec); + if (folio_test_unevictable(folio)) { + lruvec_del_folio(lruvec, folio); + folio_clear_unevictable(folio); + lruvec_add_folio(lruvec, folio); + __count_vm_events(UNEVICTABLE_PGRESCUED, - thp_nr_pages(page)); + folio_nr_pages(folio)); } goto out; } =20 - if (PageUnevictable(page)) { - if (PageMlocked(page)) - page->mlock_count++; + if (folio_test_unevictable(folio)) { + if (folio_test_mlocked(folio)) + folio->mlock_count++; goto out; } =20 - del_page_from_lru_list(page, lruvec); - ClearPageActive(page); - SetPageUnevictable(page); - page->mlock_count =3D !!PageMlocked(page); - add_page_to_lru_list(page, lruvec); - __count_vm_events(UNEVICTABLE_PGCULLED, thp_nr_pages(page)); + lruvec_del_folio(lruvec, folio); + folio_clear_active(folio); + folio_set_unevictable(folio); + folio->mlock_count =3D !!folio_test_mlocked(folio); + lruvec_add_folio(lruvec, folio); + __count_vm_events(UNEVICTABLE_PGCULLED, folio_nr_pages(folio)); out: - SetPageLRU(page); + folio_set_lru(folio); return lruvec; } =20 -static struct lruvec *__mlock_new_page(struct page *page, struct lruvec *l= ruvec) +static struct lruvec *__mlock_new_folio(struct folio *folio, struct lruvec= *lruvec) { - VM_BUG_ON_PAGE(PageLRU(page), page); + VM_BUG_ON_FOLIO(folio_test_lru(folio), folio); =20 - lruvec =3D folio_lruvec_relock_irq(page_folio(page), lruvec); + lruvec =3D folio_lruvec_relock_irq(folio, lruvec); =20 /* As above, this is a little surprising, but possible */ - if (unlikely(page_evictable(page))) + if (unlikely(folio_evictable(folio))) goto out; =20 - SetPageUnevictable(page); - page->mlock_count =3D !!PageMlocked(page); - __count_vm_events(UNEVICTABLE_PGCULLED, thp_nr_pages(page)); + folio_set_unevictable(folio); + folio->mlock_count =3D !!folio_test_mlocked(folio); + __count_vm_events(UNEVICTABLE_PGCULLED, folio_nr_pages(folio)); out: - add_page_to_lru_list(page, lruvec); - SetPageLRU(page); + lruvec_add_folio(lruvec, folio); + folio_set_lru(folio); return lruvec; } =20 -static struct lruvec *__munlock_page(struct page *page, struct lruvec *lru= vec) +static struct lruvec *__munlock_folio(struct folio *folio, struct lruvec *= lruvec) { - int nr_pages =3D thp_nr_pages(page); + int nr_pages =3D folio_nr_pages(folio); bool isolated =3D false; =20 - if (!TestClearPageLRU(page)) + if (!folio_test_clear_lru(folio)) goto munlock; =20 isolated =3D true; - lruvec =3D folio_lruvec_relock_irq(page_folio(page), lruvec); + lruvec =3D folio_lruvec_relock_irq(folio, lruvec); =20 - if (PageUnevictable(page)) { + if (folio_test_unevictable(folio)) { /* Then mlock_count is maintained, but might undercount */ - if (page->mlock_count) - page->mlock_count--; - if (page->mlock_count) + if (folio->mlock_count) + folio->mlock_count--; + if (folio->mlock_count) goto out; } /* else assume that was the last mlock: reclaim will fix it if not */ =20 munlock: - if (TestClearPageMlocked(page)) { - __mod_zone_page_state(page_zone(page), NR_MLOCK, -nr_pages); - if (isolated || !PageUnevictable(page)) + if (folio_test_clear_mlocked(folio)) { + zone_stat_mod_folio(folio, NR_MLOCK, -nr_pages); + if (isolated || !folio_test_unevictable(folio)) __count_vm_events(UNEVICTABLE_PGMUNLOCKED, nr_pages); else __count_vm_events(UNEVICTABLE_PGSTRANDED, nr_pages); } =20 - /* page_evictable() has to be checked *after* clearing Mlocked */ - if (isolated && PageUnevictable(page) && page_evictable(page)) { - del_page_from_lru_list(page, lruvec); - ClearPageUnevictable(page); - add_page_to_lru_list(page, lruvec); + /* folio_evictable() has to be checked *after* clearing Mlocked */ + if (isolated && folio_test_unevictable(folio) && folio_evictable(folio)) { + lruvec_del_folio(lruvec, folio); + folio_clear_unevictable(folio); + lruvec_add_folio(lruvec, folio); __count_vm_events(UNEVICTABLE_PGRESCUED, nr_pages); } out: if (isolated) - SetPageLRU(page); + folio_set_lru(folio); return lruvec; } =20 /* - * Flags held in the low bits of a struct page pointer on the mlock_pvec. + * Flags held in the low bits of a struct folio pointer on the mlock_fbatc= h. */ #define LRU_PAGE 0x1 #define NEW_PAGE 0x2 -static inline struct page *mlock_lru(struct page *page) +static inline struct folio *mlock_lru(struct folio *folio) { - return (struct page *)((unsigned long)page + LRU_PAGE); + return (struct folio *)((unsigned long)folio + LRU_PAGE); } =20 -static inline struct page *mlock_new(struct page *page) +static inline struct folio *mlock_new(struct folio *folio) { - return (struct page *)((unsigned long)page + NEW_PAGE); + return (struct folio *)((unsigned long)folio + NEW_PAGE); } =20 /* - * mlock_pagevec() is derived from pagevec_lru_move_fn(): - * perhaps that can make use of such page pointer flags in future, - * but for now just keep it for mlock. We could use three separate - * pagevecs instead, but one feels better (munlocking a full pagevec - * does not need to drain mlocking pagevecs first). + * mlock_folio_batch() is derived from folio_batch_move_lru(): perhaps tha= t can + * make use of such page pointer flags in future, but for now just keep it= for + * mlock. We could use three separate folio batches instead, but one feels + * better (munlocking a full folio batch does not need to drain mlocking f= olio + * batches first). */ -static void mlock_pagevec(struct pagevec *pvec) +static void mlock_folio_batch(struct folio_batch *fbatch) { struct lruvec *lruvec =3D NULL; unsigned long mlock; - struct page *page; + struct folio *folio; int i; =20 - for (i =3D 0; i < pagevec_count(pvec); i++) { - page =3D pvec->pages[i]; - mlock =3D (unsigned long)page & (LRU_PAGE | NEW_PAGE); - page =3D (struct page *)((unsigned long)page - mlock); - pvec->pages[i] =3D page; + for (i =3D 0; i < folio_batch_count(fbatch); i++) { + folio =3D fbatch->folios[i]; + mlock =3D (unsigned long)folio & (LRU_PAGE | NEW_PAGE); + folio =3D (struct folio *)((unsigned long)folio - mlock); + fbatch->folios[i] =3D folio; =20 if (mlock & LRU_PAGE) - lruvec =3D __mlock_page(page, lruvec); + lruvec =3D __mlock_folio(folio, lruvec); else if (mlock & NEW_PAGE) - lruvec =3D __mlock_new_page(page, lruvec); + lruvec =3D __mlock_new_folio(folio, lruvec); else - lruvec =3D __munlock_page(page, lruvec); + lruvec =3D __munlock_folio(folio, lruvec); } =20 if (lruvec) unlock_page_lruvec_irq(lruvec); - release_pages(pvec->pages, pvec->nr); - pagevec_reinit(pvec); + release_pages(fbatch->folios, fbatch->nr); + folio_batch_reinit(fbatch); } =20 void mlock_page_drain_local(void) { - struct pagevec *pvec; + struct folio_batch *fbatch; =20 - local_lock(&mlock_pvec.lock); - pvec =3D this_cpu_ptr(&mlock_pvec.vec); - if (pagevec_count(pvec)) - mlock_pagevec(pvec); - local_unlock(&mlock_pvec.lock); + local_lock(&mlock_fbatch.lock); + fbatch =3D this_cpu_ptr(&mlock_fbatch.fbatch); + if (folio_batch_count(fbatch)) + mlock_folio_batch(fbatch); + local_unlock(&mlock_fbatch.lock); } =20 void mlock_page_drain_remote(int cpu) { - struct pagevec *pvec; + struct folio_batch *fbatch; =20 WARN_ON_ONCE(cpu_online(cpu)); - pvec =3D &per_cpu(mlock_pvec.vec, cpu); - if (pagevec_count(pvec)) - mlock_pagevec(pvec); + fbatch =3D &per_cpu(mlock_fbatch.fbatch, cpu); + if (folio_batch_count(fbatch)) + mlock_folio_batch(fbatch); } =20 bool need_mlock_page_drain(int cpu) { - return pagevec_count(&per_cpu(mlock_pvec.vec, cpu)); + return folio_batch_count(&per_cpu(mlock_fbatch.fbatch, cpu)); } =20 /** @@ -242,10 +242,10 @@ bool need_mlock_page_drain(int cpu) */ void mlock_folio(struct folio *folio) { - struct pagevec *pvec; + struct folio_batch *fbatch; =20 - local_lock(&mlock_pvec.lock); - pvec =3D this_cpu_ptr(&mlock_pvec.vec); + local_lock(&mlock_fbatch.lock); + fbatch =3D this_cpu_ptr(&mlock_fbatch.fbatch); =20 if (!folio_test_set_mlocked(folio)) { int nr_pages =3D folio_nr_pages(folio); @@ -255,10 +255,10 @@ void mlock_folio(struct folio *folio) } =20 folio_get(folio); - if (!pagevec_add(pvec, mlock_lru(&folio->page)) || + if (!folio_batch_add(fbatch, mlock_lru(folio)) || folio_test_large(folio) || lru_cache_disabled()) - mlock_pagevec(pvec); - local_unlock(&mlock_pvec.lock); + mlock_folio_batch(fbatch); + local_unlock(&mlock_fbatch.lock); } =20 /** @@ -267,20 +267,22 @@ void mlock_folio(struct folio *folio) */ void mlock_new_page(struct page *page) { - struct pagevec *pvec; - int nr_pages =3D thp_nr_pages(page); + struct folio_batch *fbatch; + struct folio *folio =3D page_folio(page); + int nr_pages =3D folio_nr_pages(folio); =20 - local_lock(&mlock_pvec.lock); - pvec =3D this_cpu_ptr(&mlock_pvec.vec); - SetPageMlocked(page); - mod_zone_page_state(page_zone(page), NR_MLOCK, nr_pages); + local_lock(&mlock_fbatch.lock); + fbatch =3D this_cpu_ptr(&mlock_fbatch.fbatch); + folio_set_mlocked(folio); + + zone_stat_mod_folio(folio, NR_MLOCK, nr_pages); __count_vm_events(UNEVICTABLE_PGMLOCKED, nr_pages); =20 - get_page(page); - if (!pagevec_add(pvec, mlock_new(page)) || - PageHead(page) || lru_cache_disabled()) - mlock_pagevec(pvec); - local_unlock(&mlock_pvec.lock); + folio_get(folio); + if (!folio_batch_add(fbatch, mlock_new(folio)) || + folio_test_large(folio) || lru_cache_disabled()) + mlock_folio_batch(fbatch); + local_unlock(&mlock_fbatch.lock); } =20 /** @@ -289,20 +291,20 @@ void mlock_new_page(struct page *page) */ void munlock_page(struct page *page) { - struct pagevec *pvec; + struct folio_batch *fbatch; + struct folio *folio =3D page_folio(page); =20 - local_lock(&mlock_pvec.lock); - pvec =3D this_cpu_ptr(&mlock_pvec.vec); + local_lock(&mlock_fbatch.lock); + fbatch =3D this_cpu_ptr(&mlock_fbatch.fbatch); /* - * TestClearPageMlocked(page) must be left to __munlock_page(), - * which will check whether the page is multiply mlocked. + * folio_test_clear_mlocked(folio) must be left to __munlock_folio(), + * which will check whether the folio is multiply mlocked. */ - - get_page(page); - if (!pagevec_add(pvec, page) || - PageHead(page) || lru_cache_disabled()) - mlock_pagevec(pvec); - local_unlock(&mlock_pvec.lock); + folio_get(folio); + if (!folio_batch_add(fbatch, folio) || + folio_test_large(folio) || lru_cache_disabled()) + mlock_folio_batch(fbatch); + local_unlock(&mlock_fbatch.lock); } =20 static int mlock_pte_range(pmd_t *pmd, unsigned long addr, --=20 2.39.0 From nobody Wed Sep 17 03:31:49 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 55F57C4167B for ; Thu, 22 Dec 2022 19:49:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229898AbiLVTtD (ORCPT ); Thu, 22 Dec 2022 14:49:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38350 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230002AbiLVTsu (ORCPT ); Thu, 22 Dec 2022 14:48:50 -0500 Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 87D9618397 for ; Thu, 22 Dec 2022 11:48:45 -0800 (PST) Received: by mail-wr1-x436.google.com with SMTP id bx10so2726208wrb.0 for ; Thu, 22 Dec 2022 11:48:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=65qxl2pPQDnBMbGwdUZ+PFGonfHL4ihIaGu2BHcPC3E=; b=YBprBzKRdYFFFrBXK09fE8px7jN7JkycOZoSJJjAiu6CndU2eQZb8+Xf3fYy3GAD3v xOI+SAV6Tyr2acqkHoN6iTJgCS0kKqBa4EOfn+GAhaXMGw8g4kEDHhJgim8plbwr9lrO We2YZqoCMcMb6zNFjEVorjE+cjFFgVqXcJaeqtxsPWpn92qndZj8PK8KsfqHwzU4td/C MPlhABSyTCapn60sbkdAfW08wE4NoAKJKQoAiU7EPEuarT16lBvzWuNnxM+t2K3KlxY3 2HqOxVBD0J3fg/ynr/s8S+K1JG65FmbI4U4wG5wi5Gapw2WckkhNpufSa32HP49icntM LkVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=65qxl2pPQDnBMbGwdUZ+PFGonfHL4ihIaGu2BHcPC3E=; b=tz+U9XSUlfqFM6EgTIYh+AGPmH7l7LYiUJADqgha5UcADVh8IQazXfclIhkrBbh6td 9hSHR7HXCoi+QY37xuHzt1b+A5FymGC0PRuxWG5VKwzO73CkkKNjeBDw+zAEeES0F2L1 0EZFPdbzQM7VsWwoYfrzK23qiiAgKVLmZhyCNWYdNex2Reukzg+spcSo1TliThltoy8C cdZN4aODMHx0x0OPp15ZCUA8IOFltCgf5Ie9ix5Rz1elCiO9xmcyR3RmJbOwR7IVCwtb RFrS7kC2YC5LBK43e00XOUoFSBwtPSczaKsr9fGx6em0vg/eeZhHVtTHqB4izPuNpdDd We7g== X-Gm-Message-State: AFqh2krL6xpNuSMiwbce5tuaWUwG0R4BNthI06MvFGjGQ3ToWHaa7lzG HU446GZ5tTPSJc+w0jGSa9k= X-Google-Smtp-Source: AMrXdXtJv2D8LcU9sAIqibpjZPAJqk11UKT8kZq7nYM+2O+d3EGDGtD/EMLR6gF5i8Ha/6mz3lRcPg== X-Received: by 2002:a5d:4803:0:b0:26a:b8e3:b772 with SMTP id l3-20020a5d4803000000b0026ab8e3b772mr4200098wrq.23.1671738524060; Thu, 22 Dec 2022 11:48:44 -0800 (PST) Received: from lucifer.home ([2a00:23c5:dc8c:8701:1663:9a35:5a7b:1d76]) by smtp.googlemail.com with ESMTPSA id i1-20020adfb641000000b002425787c5easm1349317wre.96.2022.12.22.11.48.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Dec 2022 11:48:43 -0800 (PST) From: Lorenzo Stoakes To: linux-mm@kvack.org, Andrew Morton , linux-kernel@vger.kernel.org Cc: Matthew Wilcox , Hugh Dickins , Vlastimil Babka , Liam Howlett , William Kucharski , Christian Brauner , Jonathan Corbet , Mike Rapoport , Joel Fernandes , Lorenzo Stoakes Subject: [PATCH 3/4] mm: mlock: update the interface to use folios Date: Thu, 22 Dec 2022 19:48:32 +0000 Message-Id: <74874865335885dabe0751c1140a6d198dea333d.1671738120.git.lstoakes@gmail.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This patch updates the mlock interface to accept folios rather than pages, bringing the interface in line with the internal implementation. munlock_vma_page() still requires a page_folio() conversion, however this is consistent with the existent mlock_vma_page() implementation and a product of rmap still dealing in pages rather than folios. Signed-off-by: Lorenzo Stoakes --- mm/internal.h | 26 ++++++++++++++++---------- mm/mlock.c | 32 +++++++++++++++----------------- mm/swap.c | 2 +- 3 files changed, 32 insertions(+), 28 deletions(-) diff --git a/mm/internal.h b/mm/internal.h index 1d6f4e168510..8a6e83315369 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -515,10 +515,9 @@ extern int mlock_future_check(struct mm_struct *mm, un= signed long flags, * should be called with vma's mmap_lock held for read or write, * under page table lock for the pte/pmd being added or removed. * - * mlock is usually called at the end of page_add_*_rmap(), - * munlock at the end of page_remove_rmap(); but new anon - * pages are managed by lru_cache_add_inactive_or_unevictable() - * calling mlock_new_page(). + * mlock is usually called at the end of page_add_*_rmap(), munlock at + * the end of page_remove_rmap(); but new anon folios are managed by + * folio_add_lru_vma() calling mlock_new_folio(). * * @compound is used to include pmd mappings of THPs, but filter out * pte mappings of THPs, which cannot be consistently counted: a pte @@ -547,15 +546,22 @@ static inline void mlock_vma_page(struct page *page, mlock_vma_folio(page_folio(page), vma, compound); } =20 -void munlock_page(struct page *page); -static inline void munlock_vma_page(struct page *page, +void munlock_folio(struct folio *folio); + +static inline void munlock_vma_folio(struct folio *folio, struct vm_area_struct *vma, bool compound) { if (unlikely(vma->vm_flags & VM_LOCKED) && - (compound || !PageTransCompound(page))) - munlock_page(page); + (compound || !folio_test_large(folio))) + munlock_folio(folio); +} + +static inline void munlock_vma_page(struct page *page, + struct vm_area_struct *vma, bool compound) +{ + munlock_vma_folio(page_folio(page), vma, compound); } -void mlock_new_page(struct page *page); +void mlock_new_folio(struct folio *folio); bool need_mlock_page_drain(int cpu); void mlock_page_drain_local(void); void mlock_page_drain_remote(int cpu); @@ -647,7 +653,7 @@ static inline void mlock_vma_page(struct page *page, struct vm_area_struct *vma, bool compound) { } static inline void munlock_vma_page(struct page *page, struct vm_area_struct *vma, bool compound) { } -static inline void mlock_new_page(struct page *page) { } +static inline void mlock_new_folio(struct folio *folio) { } static inline bool need_mlock_page_drain(int cpu) { return false; } static inline void mlock_page_drain_local(void) { } static inline void mlock_page_drain_remote(int cpu) { } diff --git a/mm/mlock.c b/mm/mlock.c index e9ba47fe67ed..3982ef4d1632 100644 --- a/mm/mlock.c +++ b/mm/mlock.c @@ -262,13 +262,12 @@ void mlock_folio(struct folio *folio) } =20 /** - * mlock_new_page - mlock a newly allocated page not yet on LRU - * @page: page to be mlocked, either a normal page or a THP head. + * mlock_new_folio - mlock a newly allocated folio not yet on LRU + * @folio: folio to be mlocked, either normal or a THP head. */ -void mlock_new_page(struct page *page) +void mlock_new_folio(struct folio *folio) { struct folio_batch *fbatch; - struct folio *folio =3D page_folio(page); int nr_pages =3D folio_nr_pages(folio); =20 local_lock(&mlock_fbatch.lock); @@ -286,13 +285,12 @@ void mlock_new_page(struct page *page) } =20 /** - * munlock_page - munlock a page - * @page: page to be munlocked, either a normal page or a THP head. + * munlock_folio - munlock a folio + * @folio: folio to be munlocked, either normal or a THP head. */ -void munlock_page(struct page *page) +void munlock_folio(struct folio *folio) { struct folio_batch *fbatch; - struct folio *folio =3D page_folio(page); =20 local_lock(&mlock_fbatch.lock); fbatch =3D this_cpu_ptr(&mlock_fbatch.fbatch); @@ -314,7 +312,7 @@ static int mlock_pte_range(pmd_t *pmd, unsigned long ad= dr, struct vm_area_struct *vma =3D walk->vma; spinlock_t *ptl; pte_t *start_pte, *pte; - struct page *page; + struct folio *folio; =20 ptl =3D pmd_trans_huge_lock(pmd, vma); if (ptl) { @@ -322,11 +320,11 @@ static int mlock_pte_range(pmd_t *pmd, unsigned long = addr, goto out; if (is_huge_zero_pmd(*pmd)) goto out; - page =3D pmd_page(*pmd); + folio =3D page_folio(pmd_page(*pmd)); if (vma->vm_flags & VM_LOCKED) - mlock_folio(page_folio(page)); + mlock_folio(folio); else - munlock_page(page); + munlock_folio(folio); goto out; } =20 @@ -334,15 +332,15 @@ static int mlock_pte_range(pmd_t *pmd, unsigned long = addr, for (pte =3D start_pte; addr !=3D end; pte++, addr +=3D PAGE_SIZE) { if (!pte_present(*pte)) continue; - page =3D vm_normal_page(vma, addr, *pte); - if (!page || is_zone_device_page(page)) + folio =3D vm_normal_folio(vma, addr, *pte); + if (!folio || folio_is_zone_device(folio)) continue; - if (PageTransCompound(page)) + if (folio_test_large(folio)) continue; if (vma->vm_flags & VM_LOCKED) - mlock_folio(page_folio(page)); + mlock_folio(folio); else - munlock_page(page); + munlock_folio(folio); } pte_unmap(start_pte); out: diff --git a/mm/swap.c b/mm/swap.c index e54e2a252e27..7df297b143f9 100644 --- a/mm/swap.c +++ b/mm/swap.c @@ -562,7 +562,7 @@ void folio_add_lru_vma(struct folio *folio, struct vm_a= rea_struct *vma) VM_BUG_ON_FOLIO(folio_test_lru(folio), folio); =20 if (unlikely((vma->vm_flags & (VM_LOCKED | VM_SPECIAL)) =3D=3D VM_LOCKED)) - mlock_new_page(&folio->page); + mlock_new_folio(folio); else folio_add_lru(folio); } --=20 2.39.0 From nobody Wed Sep 17 03:31:49 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C2EF3C4332F for ; Thu, 22 Dec 2022 19:49:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235635AbiLVTtI (ORCPT ); Thu, 22 Dec 2022 14:49:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38352 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229526AbiLVTsu (ORCPT ); Thu, 22 Dec 2022 14:48:50 -0500 Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [IPv6:2a00:1450:4864:20::429]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 74FAC183AC for ; Thu, 22 Dec 2022 11:48:46 -0800 (PST) Received: by mail-wr1-x429.google.com with SMTP id i7so2681195wrv.8 for ; Thu, 22 Dec 2022 11:48:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=r2F81c9AgLyck1wSShCjUojXRC7u44cFLH6IR6oWmN4=; b=kSlZyEuZcFe3XKq6gnldT7ZyYLU+Awg8l/XPuFUO6xWtYw2ql8CF2LrYCXZh+rLhpa 5AxuhZlgHyNYEFINeAHMf5n203LqWTNZnbPtsuL1cCbkHKpI/jcw7ADkXOCsfPfoyT2N 5Oz1QSJ0EFDUDuFRZQdw4VKokCQwLWCPmIjb76j42aHzWO13v65n6CUhnmHQ/jcj8pVW lI+Y9QO/g+vozwln/Eiq+pDvUEk86SJxIjVd3UUrCrRJdP3RbXSNo3nRqNm3CiDxZ5eO /829JKee1x2sONrCsGazWVX92jRgfQiH3jq76ofawUgUnCgeXLgzC3ERx62TFVQ602hc LkWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=r2F81c9AgLyck1wSShCjUojXRC7u44cFLH6IR6oWmN4=; b=nNb2+j3R9y1KPZi3eJZvGk4Hu3P8J4fGMGdIlMKlLiSyBHromG5SRdQ2PTst1EcML+ VaIMhbnz0oTfrja6XmSQMLLw38YbfRPOmKLH2qscCXD+agf/dcVgIEWeYR1Fsj/QfDVr deYr4hoMjeAY5gRFNwWS7lTKENYvuznBrDpyux3bLwfK4+Cf2qxKL2jRYEk91C/tI9dh XHLW5y9O443T2fCuUwbtv7c5mcUygT006RXK/B5uk3nlB639Onn6EF7fCLuNnAR7MT6R vf8UbKy/JXNUSMQVGb8nOu53rhl0+vYeulJIywKdtGUjGF7JemgjicwFWznHmA6pRtaZ RwbQ== X-Gm-Message-State: AFqh2kodqP5cC14hDd5j9OZTNzgCF7gYa+Z2vUaaiD+G8gmnYnI0zkM7 /UW8PCc0p2Zt6UVZna/jt2o= X-Google-Smtp-Source: AMrXdXspmFuBlfR7gc2dyZfjSGXzAUYJQsYI7d+BPRPXgeycabrEGMA3kSnSuTF+GM0HYPE8veGWIg== X-Received: by 2002:a5d:61ce:0:b0:242:fd7:285c with SMTP id q14-20020a5d61ce000000b002420fd7285cmr4337447wrv.48.1671738525359; Thu, 22 Dec 2022 11:48:45 -0800 (PST) Received: from lucifer.home ([2a00:23c5:dc8c:8701:1663:9a35:5a7b:1d76]) by smtp.googlemail.com with ESMTPSA id i1-20020adfb641000000b002425787c5easm1349317wre.96.2022.12.22.11.48.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Dec 2022 11:48:44 -0800 (PST) From: Lorenzo Stoakes To: linux-mm@kvack.org, Andrew Morton , linux-kernel@vger.kernel.org Cc: Matthew Wilcox , Hugh Dickins , Vlastimil Babka , Liam Howlett , William Kucharski , Christian Brauner , Jonathan Corbet , Mike Rapoport , Joel Fernandes , Lorenzo Stoakes Subject: [PATCH 4/4] Documentation/mm: Update references to __m[un]lock_page() to *_folio() Date: Thu, 22 Dec 2022 19:48:33 +0000 Message-Id: X-Mailer: git-send-email 2.39.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" We now pass folios to these functions, so update the documentation accordingly. Additionally, correct the outdated reference to __pagevec_lru_add_fn(), the referenced action occurs in __munlock_folio() directly now. Signed-off-by: Lorenzo Stoakes --- Documentation/mm/unevictable-lru.rst | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Documentation/mm/unevictable-lru.rst b/Documentation/mm/unevic= table-lru.rst index 4a0e158aa9ce..153629e0c100 100644 --- a/Documentation/mm/unevictable-lru.rst +++ b/Documentation/mm/unevictable-lru.rst @@ -308,22 +308,22 @@ do end up getting faulted into this VM_LOCKED VMA, th= ey will be handled in the fault path - which is also how mlock2()'s MLOCK_ONFAULT areas are handled. =20 For each PTE (or PMD) being faulted into a VMA, the page add rmap function -calls mlock_vma_page(), which calls mlock_page() when the VMA is VM_LOCKED +calls mlock_vma_page(), which calls mlock_folio() when the VMA is VM_LOCKED (unless it is a PTE mapping of a part of a transparent huge page). Or when it is a newly allocated anonymous page, lru_cache_add_inactive_or_unevicta= ble() -calls mlock_new_page() instead: similar to mlock_page(), but can make bett= er +calls mlock_new_folio() instead: similar to mlock_folio(), but can make be= tter judgments, since this page is held exclusively and known not to be on LRU = yet. =20 -mlock_page() sets PageMlocked immediately, then places the page on the CPU= 's -mlock pagevec, to batch up the rest of the work to be done under lru_lock = by -__mlock_page(). __mlock_page() sets PageUnevictable, initializes mlock_co= unt +mlock_folio() sets PageMlocked immediately, then places the page on the CP= U's +mlock folio batch, to batch up the rest of the work to be done under lru_l= ock by +__mlock_folio(). __mlock_folio() sets PageUnevictable, initializes mlock_= count and moves the page to unevictable state ("the unevictable LRU", but with mlock_count in place of LRU threading). Or if the page was already PageLRU and PageUnevictable and PageMlocked, it simply increments the mlock_count. =20 But in practice that may not work ideally: the page may not yet be on an L= RU, or it may have been temporarily isolated from LRU. In such cases the mlock_c= ount -field cannot be touched, but will be set to 0 later when __pagevec_lru_add= _fn() +field cannot be touched, but will be set to 0 later when __munlock_folio() returns the page to "LRU". Races prohibit mlock_count from being set to 1= then: rather than risk stranding a page indefinitely as unevictable, always err = with mlock_count on the low side, so that when munlocked the page will be rescu= ed to --=20 2.39.0