From nobody Sat Sep 13 20:25:02 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 46B9FC636CD for ; Mon, 30 Jan 2023 21:44:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230513AbjA3VoF (ORCPT ); Mon, 30 Jan 2023 16:44:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34578 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230370AbjA3Vn6 (ORCPT ); Mon, 30 Jan 2023 16:43:58 -0500 Received: from mail-pj1-x1031.google.com (mail-pj1-x1031.google.com [IPv6:2607:f8b0:4864:20::1031]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AD9981732 for ; Mon, 30 Jan 2023 13:43:56 -0800 (PST) Received: by mail-pj1-x1031.google.com with SMTP id nn18-20020a17090b38d200b0022bfb584987so12489499pjb.2 for ; Mon, 30 Jan 2023 13:43:56 -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=ediNP9jmTx5MiZXyPNx7A5RKRq6cvf2YdQqsm1ekQJg=; b=PBaFoOSG+jh+Xjk4yu5k0mclCq95zVowkLwfwnozwaJGsZ7dJuUO+HAwSj2CnMiWu2 04OjiWdzrsGfsiNhiAN8aI91IRKA+6362I3k3iKQYr21do8lFKqzPXLqL6iPOJSxvDm8 ESs/tnac1+S84ztkx0YgGN0x3NIN3ai8D6zq2CVxcbmdeK2SmbKzjLD3nVv4XyHiLp3z BA+QOsuRp7JdeNdp8HrY1T1o3fGUajdyiy9WJdxE66pg9lzEfEmcADYX3qVB7MkJcotn TkujXEQLlM/xDXB9oy/BbqiTPHEbCAbrHMBDu37iilqmoWmBkMcRcAOTM5RKP4Qzejlk Q9zQ== 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=ediNP9jmTx5MiZXyPNx7A5RKRq6cvf2YdQqsm1ekQJg=; b=jwAkguSsA5fTpOvquE5iRay7J3d34TjzHf72sa17/ugcaAiMIP0pS6dO9ibpp+LVEv I519s7kXhxFacM20pr0bXEQV0iQhCELMefmCsPMb8PFKcbi99p/hp1JXHEDLHT9HArQS lkTJ1MGIBulzC8ZjCWxwxsSPeaf2FgQaAqY2jq/I5Or2XQxkTDCodK4Zn3WrnLcAcz+r 1XmhuWVwie9sWkaB/QRR31q/DwbmWcX6WfztdcBOV6FivrSryk1PNgYFDF5/a/O+EUoD YduU9M1MFFXcgMMlvQ4gPsPCYdKtXNm2fjbbD6L8TLGlHXXFsaDlGuC3y5HQ7nqqi80E aTeQ== X-Gm-Message-State: AO0yUKXhg8Xoj9qs9Ne4B2Vk5AS/G8VIfn/APFHV6dR7cA3gM4UGYF86 6SYOYcdwhyTrgwL0gfyNQeWTvDLF08E= X-Google-Smtp-Source: AK7set+vv9jj+URyyrDpX/kMFZKfmRfYhOWM9Dd+Bv8gep0RDdihfzO4kLqoGfEgi8XlOrozIiYlmw== X-Received: by 2002:a17:90b:1a92:b0:22c:d57:519f with SMTP id ng18-20020a17090b1a9200b0022c0d57519fmr10945094pjb.34.1675115036137; Mon, 30 Jan 2023 13:43:56 -0800 (PST) Received: from fedora.hsd1.ca.comcast.net ([2601:644:937f:7f20::a8cd]) by smtp.googlemail.com with ESMTPSA id d5-20020a17090a628500b0022bbad75af6sm25156403pjj.1.2023.01.30.13.43.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 13:43:55 -0800 (PST) From: "Vishal Moola (Oracle)" To: linux-mm@kvack.org Cc: akpm@linux-foundation.org, willy@infradead.org, linux-kernel@vger.kernel.org, "Vishal Moola (Oracle)" Subject: [PATCH mm-unstable v2 1/4] mm: Add folio_get_nontail_page() Date: Mon, 30 Jan 2023 13:43:49 -0800 Message-Id: <20230130214352.40538-2-vishal.moola@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230130214352.40538-1-vishal.moola@gmail.com> References: <20230130214352.40538-1-vishal.moola@gmail.com> 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" folio_get_nontail_page() returns the folio associated with a head page. This is necessary for folio conversions where the behavior of that function differs between head pages and tail pages. Signed-off-by: Vishal Moola (Oracle) --- include/linux/mm.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/linux/mm.h b/include/linux/mm.h index dd295c020e85..5da260346406 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -879,6 +879,13 @@ static inline bool get_page_unless_zero(struct page *p= age) return page_ref_add_unless(page, 1, 0); } =20 +static inline struct folio *folio_get_nontail_page(struct page *page) +{ + if (unlikely(!get_page_unless_zero(page))) + return NULL; + return (struct folio *)page; +} + extern int page_is_ram(unsigned long pfn); =20 enum { --=20 2.38.1 From nobody Sat Sep 13 20:25:02 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 9F153C54EAA for ; Mon, 30 Jan 2023 21:44:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231290AbjA3VoJ (ORCPT ); Mon, 30 Jan 2023 16:44:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34394 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230154AbjA3VoA (ORCPT ); Mon, 30 Jan 2023 16:44:00 -0500 Received: from mail-pl1-x62f.google.com (mail-pl1-x62f.google.com [IPv6:2607:f8b0:4864:20::62f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 976E38A50 for ; Mon, 30 Jan 2023 13:43:57 -0800 (PST) Received: by mail-pl1-x62f.google.com with SMTP id e6so4863124plg.12 for ; Mon, 30 Jan 2023 13:43:57 -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=AQAnzIUAKIo9PYy8DfeQ6dEwBvy6hOjFsZ5eeKz+fAM=; b=NjXIlAyiR0deTTuNNGqVsVHStl1zv2yUiMk8LF3V+2UtWWEHxxEmH/WvTi38H+n0Km efIzZVLPFI6fFsWKBixvsI+LtIvzevHWJ+BRJCXj74j2duQD4H9Xu/hhpB7rkZLpWRJL U0KGKvqNkZBhudk97/JFB/sv/NyIDA94Lxd5odZrq3EoWC9vFm2nFt+OblfVQNGS0T+8 wr1lJMCeholQggE+m5KdhOi/3J+J2T7MTpg4IYHPjkee38uGJP/1vgLjpoW86/G+iRBJ XDS0eY0nC4YtjetJpiyTakPSzkVZ3XPBLhNeygirPQljkPeCsB2exIMM9QmJ7hRAYQ21 vjaQ== 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=AQAnzIUAKIo9PYy8DfeQ6dEwBvy6hOjFsZ5eeKz+fAM=; b=nOnmvRjONIiTu0eQ6k2ztj92ciG8RHig4OQIUWNN/HgKETMn+xdiODPD64OsNw9HLy WlVASQZtVy2HMZe0LNLEc+XzefiV8l8qdtcrgAlNITqiLNTtd2Crdq4mpThfzC7uSJK0 3eootd8lQIDRMXLOaHoEqYgYiTehpVDV4u5laOwwDq4Ff0Fci4jM9QNSIb8f2qC37zlM MbHnHmTLwHTd+58bU9/Lme+HrJD17EGX9gXC0PQQpBmZbyGGkX45QoTHdz9CozNVjvlV S+UfICbuPTBp/ZyL3AQ0jZpXHefyhfO6xk2jggHMVZqrmSLVpdfFnmogEEle2ZKA82XI 9r2A== X-Gm-Message-State: AO0yUKV10KJ1roVsa5Ujgi3b1BDZSrOOGmkeC5zk4kVHgvPkf6xAy/HH 33Jt4cE5lhlyUzvZaj55aj4= X-Google-Smtp-Source: AK7set+50P1Topiogo/75E3Ef3QePYzzis+t8Ra6SjIFk0sHPphfrVD3y0rm/SQHvyF6Hg/a1Kiu+Q== X-Received: by 2002:a17:90b:3ec2:b0:22c:2166:3eca with SMTP id rm2-20020a17090b3ec200b0022c21663ecamr18852242pjb.6.1675115036961; Mon, 30 Jan 2023 13:43:56 -0800 (PST) Received: from fedora.hsd1.ca.comcast.net ([2601:644:937f:7f20::a8cd]) by smtp.googlemail.com with ESMTPSA id d5-20020a17090a628500b0022bbad75af6sm25156403pjj.1.2023.01.30.13.43.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 13:43:56 -0800 (PST) From: "Vishal Moola (Oracle)" To: linux-mm@kvack.org Cc: akpm@linux-foundation.org, willy@infradead.org, linux-kernel@vger.kernel.org, "Vishal Moola (Oracle)" Subject: [PATCH mm-unstable v2 2/4] mm/migrate: Add folio_movable_ops() Date: Mon, 30 Jan 2023 13:43:50 -0800 Message-Id: <20230130214352.40538-3-vishal.moola@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230130214352.40538-1-vishal.moola@gmail.com> References: <20230130214352.40538-1-vishal.moola@gmail.com> 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" folio_movable_ops() does the same as page_movable_ops() except uses folios instead of pages. This function will help make folio conversions in migrate.c more readable. Signed-off-by: Vishal Moola (Oracle) --- include/linux/migrate.h | 9 +++++++++ mm/migrate.c | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/include/linux/migrate.h b/include/linux/migrate.h index 7376074f2e1e..c88b96b48be7 100644 --- a/include/linux/migrate.h +++ b/include/linux/migrate.h @@ -123,6 +123,15 @@ static inline bool folio_test_movable(struct folio *fo= lio) return PageMovable(&folio->page); } =20 +static inline +const struct movable_operations *folio_movable_ops(struct folio *folio) +{ + VM_BUG_ON(!__folio_test_movable(folio)); + + return (const struct movable_operations *) + ((unsigned long)folio->mapping - PAGE_MAPPING_MOVABLE); +} + static inline const struct movable_operations *page_movable_ops(struct page *page) { diff --git a/mm/migrate.c b/mm/migrate.c index b971edbf32fc..fcb2e9fa1953 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -990,7 +990,7 @@ static int move_to_new_folio(struct folio *dst, struct = folio *src, goto out; } =20 - mops =3D page_movable_ops(&src->page); + mops =3D folio_movable_ops(src); rc =3D mops->migrate_page(&dst->page, &src->page, mode); WARN_ON_ONCE(rc =3D=3D MIGRATEPAGE_SUCCESS && !folio_test_isolated(src)); --=20 2.38.1 From nobody Sat Sep 13 20:25:02 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 AB2E7C636CD for ; Mon, 30 Jan 2023 21:44:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230407AbjA3VoH (ORCPT ); Mon, 30 Jan 2023 16:44:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34470 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230124AbjA3Vn7 (ORCPT ); Mon, 30 Jan 2023 16:43:59 -0500 Received: from mail-pj1-x1030.google.com (mail-pj1-x1030.google.com [IPv6:2607:f8b0:4864:20::1030]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6A1896EB1 for ; Mon, 30 Jan 2023 13:43:58 -0800 (PST) Received: by mail-pj1-x1030.google.com with SMTP id e8-20020a17090a9a8800b0022c387f0f93so11913147pjp.3 for ; Mon, 30 Jan 2023 13:43:58 -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=hfgb6gximncpFcsdfMQZVX+G30+IO/lhUGcO4BdjekA=; b=WG8BHcH4b1Q2VPyQkFR4MwsGeXdQ+pi68nFKuACv3H2cq9hquUdwYMOwfn5Clg75vW tdaTbnzo30g1mw2TSnN6h8Y6lgg1wtmy7ON2KRh8nI82wfIkH/LpFE2K2KGn9m0dQnK+ EdiAMPBmX4di1Eob2v/sMtOoZQFb9TFmKbcFfBiMNz2GkEqkfEVm7j6AQvMvVO3QspMi i3x8iytVYGMWkQPh+NbcLozKU0gaNSS4IQgHkklSFDruW2i0iL46jgpRRq1X8wOYNoNT 7PD2lsqw+ZNG9C1EUsY6JUPymqtXQAJyQWkqCphkWagIz21CNTfeNJSRmt5MinrcDjBU JrcQ== 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=hfgb6gximncpFcsdfMQZVX+G30+IO/lhUGcO4BdjekA=; b=VsIEBx9FktOyJ5aR1TCT3n0xoRsIQBdUVR9G4UztHhEnTZxIRJJrFVTK0AV7d6lgxS S8/DcBqj/zBRsTz9uXfF64+qhqCV15OB8KfWNR8l5KhJwpmCV3JkyzNi+m8/DX1uQr7w IgvM9GFakQt27ifA2KotcgcNI/bdLmNfDTn8AvNAuvRDjCqnuOjp0O2N3zui4Eh3uBVk yh4PzpUW+5NlfNobGAgCm0bA3x26iUNxOQI+SVt+zyj0pQ7Nc+qIyIJPV0/UhtaadUoB UXekecCJrwp9Z+EhjiKPp70JOtpJhTNqw7ChvWKQxWs/6Cce1ULWf4RN1fzLtb1qoY8P Pziw== X-Gm-Message-State: AFqh2kpZF92KSgCbir4uh6yF0rxKV+iNWnnWXkaqLAOQ33QayWupb9t9 Ggavo3oUzzwall2pXZ6rtDAcNhEFYcs= X-Google-Smtp-Source: AMrXdXui3s7CpN8ff+PUDq7P7VExTnu8iNhcubhGWvTur95s0s6deUUCtdeQOmlXVeR6u10FVmghBg== X-Received: by 2002:a17:90a:2f89:b0:219:6619:848a with SMTP id t9-20020a17090a2f8900b002196619848amr53344104pjd.36.1675115037864; Mon, 30 Jan 2023 13:43:57 -0800 (PST) Received: from fedora.hsd1.ca.comcast.net ([2601:644:937f:7f20::a8cd]) by smtp.googlemail.com with ESMTPSA id d5-20020a17090a628500b0022bbad75af6sm25156403pjj.1.2023.01.30.13.43.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 13:43:57 -0800 (PST) From: "Vishal Moola (Oracle)" To: linux-mm@kvack.org Cc: akpm@linux-foundation.org, willy@infradead.org, linux-kernel@vger.kernel.org, "Vishal Moola (Oracle)" Subject: [PATCH mm-unstable v2 3/4] mm/migrate: Convert isolate_movable_page() to use folios Date: Mon, 30 Jan 2023 13:43:51 -0800 Message-Id: <20230130214352.40538-4-vishal.moola@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230130214352.40538-1-vishal.moola@gmail.com> References: <20230130214352.40538-1-vishal.moola@gmail.com> 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" Removes 6 calls to compound_head() and prepares the function to take in a folio instead of page argument. Signed-off-by: Vishal Moola (Oracle) --- mm/migrate.c | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/mm/migrate.c b/mm/migrate.c index fcb2e9fa1953..c20d9f531db4 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -60,6 +60,7 @@ =20 int isolate_movable_page(struct page *page, isolate_mode_t mode) { + struct folio *folio =3D folio_get_nontail_page(page); const struct movable_operations *mops; =20 /* @@ -71,11 +72,11 @@ int isolate_movable_page(struct page *page, isolate_mod= e_t mode) * the put_page() at the end of this block will take care of * release this page, thus avoiding a nasty leakage. */ - if (unlikely(!get_page_unless_zero(page))) + if (!folio) goto out; =20 - if (unlikely(PageSlab(page))) - goto out_putpage; + if (unlikely(folio_test_slab(folio))) + goto out_putfolio; /* Pairs with smp_wmb() in slab freeing, e.g. SLUB's __free_slab() */ smp_rmb(); /* @@ -83,12 +84,12 @@ int isolate_movable_page(struct page *page, isolate_mod= e_t mode) * we use non-atomic bitops on newly allocated page flags so * unconditionally grabbing the lock ruins page's owner side. */ - if (unlikely(!__PageMovable(page))) - goto out_putpage; + if (unlikely(!__folio_test_movable(folio))) + goto out_putfolio; /* Pairs with smp_wmb() in slab allocation, e.g. SLUB's alloc_slab_page()= */ smp_rmb(); - if (unlikely(PageSlab(page))) - goto out_putpage; + if (unlikely(folio_test_slab(folio))) + goto out_putfolio; =20 /* * As movable pages are not isolated from LRU lists, concurrent @@ -101,29 +102,29 @@ int isolate_movable_page(struct page *page, isolate_m= ode_t mode) * lets be sure we have the page lock * before proceeding with the movable page isolation steps. */ - if (unlikely(!trylock_page(page))) - goto out_putpage; + if (unlikely(!folio_trylock(folio))) + goto out_putfolio; =20 - if (!PageMovable(page) || PageIsolated(page)) + if (!folio_test_movable(folio) || folio_test_isolated(folio)) goto out_no_isolated; =20 - mops =3D page_movable_ops(page); - VM_BUG_ON_PAGE(!mops, page); + mops =3D folio_movable_ops(folio); + VM_BUG_ON_FOLIO(!mops, folio); =20 - if (!mops->isolate_page(page, mode)) + if (!mops->isolate_page(&folio->page, mode)) goto out_no_isolated; =20 /* Driver shouldn't use PG_isolated bit of page->flags */ - WARN_ON_ONCE(PageIsolated(page)); - SetPageIsolated(page); - unlock_page(page); + WARN_ON_ONCE(folio_test_isolated(folio)); + folio_set_isolated(folio); + folio_unlock(folio); =20 return 0; =20 out_no_isolated: - unlock_page(page); -out_putpage: - put_page(page); + folio_unlock(folio); +out_putfolio: + folio_put(folio); out: return -EBUSY; } --=20 2.38.1 From nobody Sat Sep 13 20:25:02 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 B5579C636CD for ; Mon, 30 Jan 2023 21:44:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230410AbjA3VoL (ORCPT ); Mon, 30 Jan 2023 16:44:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34456 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230249AbjA3VoA (ORCPT ); Mon, 30 Jan 2023 16:44:00 -0500 Received: from mail-pl1-x62a.google.com (mail-pl1-x62a.google.com [IPv6:2607:f8b0:4864:20::62a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 32B613AAD for ; Mon, 30 Jan 2023 13:43:59 -0800 (PST) Received: by mail-pl1-x62a.google.com with SMTP id z1so5550570plg.6 for ; Mon, 30 Jan 2023 13:43:59 -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=4UBov3sv7172TVhYTWoSlpD7u+6AtPn48Pn1/2ZA2fU=; b=GGZic+SgYRe3M4jfPhEI4uBwZjpwo1LVgsuMKjaYJEcaof28Rdl8bIcKFRGFMOo/v1 vp0jipI83f4E8yLw84AyXoFw7/AEoOEMI+BoFH6TyK7yw5bqlH0Folia7f0LDUPXUSJE sY+zofDSWUUjnW10KVNYHPtOqTI6aPq7W30CZzkt0G3OGeXkeyWsvPP7iC9ue60m7d00 bjlF3UiLdcksT0VkBZi8djwpFJHz2Xc6LE1uP9ILm9lxEvvt1RGL5cpq++cvkTHcL/Vo SYDFpZ+xHAZLbBBZjx6hjNav9fmIUKe+EZvnLPpHqhYQ6AeAvHnAJyrSodxo/+yBRygT JotA== 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=4UBov3sv7172TVhYTWoSlpD7u+6AtPn48Pn1/2ZA2fU=; b=t+5wMWVY9ONes9fF9rI1a2KC5kknt4XR+En4nIteiPedlfFH32nC0Nwbg83ygdkkaT K3f/9abFziniQYc/Z8vgl4SgtMNchOxwBx7dPQuBCr9E71tSxwd4/7NEa8TZZtROjoKw VA98fjgL4GZjezYNoyxhqQaVwuSJZEJ4s+Cz9mfhcZUZfZOKULyLUsemhDfYr33aSWGL X3u7FoyMm6jkli1f/3RFtBwRtd5aqLaCl7voOFGJBerXnkJVM1oduL0V1U09ByM6ZV5y x0SQqm0kTqoopKwxKCncscq/+2CS8RRiDmNl6Rj6aSD6RDRG0UzemGdeFIXzZQI8Ud1D zoDQ== X-Gm-Message-State: AO0yUKW7wpSluv8qYZIun7xMFw0z+ji68kHGZ71xeWb/7TzCGZXIHY7b ZHWyzk4cT/xT3jEWh73xGh26AUxtbO4= X-Google-Smtp-Source: AK7set/TKhPV3YcjWGwxjEFSpRV7C5X/JGvIQRGhQ6P+HCTujOoxc+xfB2YEufD5hkNCey2k4eu/Tw== X-Received: by 2002:a17:90b:1b48:b0:22c:59c3:869a with SMTP id nv8-20020a17090b1b4800b0022c59c3869amr11510265pjb.21.1675115038671; Mon, 30 Jan 2023 13:43:58 -0800 (PST) Received: from fedora.hsd1.ca.comcast.net ([2601:644:937f:7f20::a8cd]) by smtp.googlemail.com with ESMTPSA id d5-20020a17090a628500b0022bbad75af6sm25156403pjj.1.2023.01.30.13.43.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 13:43:58 -0800 (PST) From: "Vishal Moola (Oracle)" To: linux-mm@kvack.org Cc: akpm@linux-foundation.org, willy@infradead.org, linux-kernel@vger.kernel.org, "Vishal Moola (Oracle)" Subject: [PATCH mm-unstable v2 4/4] mm/migrate: Convert putback_movable_pages() to use folios Date: Mon, 30 Jan 2023 13:43:52 -0800 Message-Id: <20230130214352.40538-5-vishal.moola@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230130214352.40538-1-vishal.moola@gmail.com> References: <20230130214352.40538-1-vishal.moola@gmail.com> 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" Removes 6 calls to compound_head(), and replaces putback_movable_page() with putback_movable_folio() as well. Signed-off-by: Vishal Moola (Oracle) --- mm/migrate.c | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/mm/migrate.c b/mm/migrate.c index c20d9f531db4..db480dc08bac 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -129,12 +129,12 @@ int isolate_movable_page(struct page *page, isolate_m= ode_t mode) return -EBUSY; } =20 -static void putback_movable_page(struct page *page) +static void putback_movable_folio(struct folio *folio) { - const struct movable_operations *mops =3D page_movable_ops(page); + const struct movable_operations *mops =3D folio_movable_ops(folio); =20 - mops->putback_page(page); - ClearPageIsolated(page); + mops->putback_page(&folio->page); + folio_clear_isolated(folio); } =20 /* @@ -147,33 +147,33 @@ static void putback_movable_page(struct page *page) */ void putback_movable_pages(struct list_head *l) { - struct page *page; - struct page *page2; + struct folio *folio; + struct folio *folio2; =20 - list_for_each_entry_safe(page, page2, l, lru) { - if (unlikely(PageHuge(page))) { - folio_putback_active_hugetlb(page_folio(page)); + list_for_each_entry_safe(folio, folio2, l, lru) { + if (unlikely(folio_test_hugetlb(folio))) { + folio_putback_active_hugetlb(folio); continue; } - list_del(&page->lru); + list_del(&folio->lru); /* - * We isolated non-lru movable page so here we can use - * __PageMovable because LRU page's mapping cannot have + * We isolated non-lru movable folio so here we can use + * __PageMovable because LRU folio's mapping cannot have * PAGE_MAPPING_MOVABLE. */ - if (unlikely(__PageMovable(page))) { - VM_BUG_ON_PAGE(!PageIsolated(page), page); - lock_page(page); - if (PageMovable(page)) - putback_movable_page(page); + if (unlikely(__folio_test_movable(folio))) { + VM_BUG_ON_FOLIO(!folio_test_isolated(folio), folio); + folio_lock(folio); + if (folio_test_movable(folio)) + putback_movable_folio(folio); else - ClearPageIsolated(page); - unlock_page(page); - put_page(page); + folio_clear_isolated(folio); + folio_unlock(folio); + folio_put(folio); } else { - mod_node_page_state(page_pgdat(page), NR_ISOLATED_ANON + - page_is_file_lru(page), -thp_nr_pages(page)); - putback_lru_page(page); + node_stat_mod_folio(folio, NR_ISOLATED_ANON + + folio_is_file_lru(folio), -folio_nr_pages(folio)); + folio_putback_lru(folio); } } } --=20 2.38.1