From nobody Thu Sep 18 05:38:08 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 95772C10F1B for ; Thu, 8 Dec 2022 20:35:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230029AbiLHUfO (ORCPT ); Thu, 8 Dec 2022 15:35:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37460 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229796AbiLHUfI (ORCPT ); Thu, 8 Dec 2022 15:35:08 -0500 Received: from mail-pl1-x629.google.com (mail-pl1-x629.google.com [IPv6:2607:f8b0:4864:20::629]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4A7D885D32 for ; Thu, 8 Dec 2022 12:35:08 -0800 (PST) Received: by mail-pl1-x629.google.com with SMTP id a9so2670982pld.7 for ; Thu, 08 Dec 2022 12:35:08 -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=YC6lmTEI2DddOWPjuQmefmlclj4ZLY2oiewxsoGP1Vs=; b=fvvYF98hTiJGOMFMCMtIoAJFjddR3ZNFHwcDPozFhzpj20s5sT2JGxRa4/JsoWeSxR 27O4Hyx3dB8flhxlRct4WhUwoyuhQ4DZa0fBQViceKnlJwnt1M4STuay8S1ELwivT4W5 JnFuebtJ/6heRA7futibraynFvgPzx5EmJuSPiVNpscBAw1y+0HX2KpqZedNdKX+q9A2 G7EH4P2kHgqJ2MivIeUQpAIzYMbDFn5k7YjhM+D7xCoV9xRpKYOEzznz3w9NL3P1rsBw zHlmiEQdjCjKY6pWfRpw9uokV7ZAai9Fv9pxWmVWIiS+vtmSBZa5JyP1KGX34V0TBLnw 9lhw== 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=YC6lmTEI2DddOWPjuQmefmlclj4ZLY2oiewxsoGP1Vs=; b=fezdE0bmKgj+GxvMfM0a1SJBVF9NLY2HANmkmwXbgM008YiT5zhWeN+zbJMU+ukT/0 9sToC4L4qAlqKjS0F94G736iZQjWvdrU1bNFp86WMHARRD+izpXPMB0G7Qubugkc+IZS UE6dvsv2tHSaDK83StTG7DT8PK1siP5728nA/vu8V8IF5WYtNQizZZTUYHakAQdd8hCy eSkJgUn8rSU/tfem8UDxGO6S0eondnLEKpNkeoB74II1ZcwrVkvY5GBlrtvYsVSXh+a9 o68lwPQst3iNGdKRBHswi+KQxjTsYVpaOuYUeT+VL8KQGz5QAqnYW0Zyze+DO7BcEGTq 18sg== X-Gm-Message-State: ANoB5pm+0aJ7skAyWgLwv0QNmplFfoOFG5KJMrvwDBzPB216Gi+xsuL+ +mi00gg9V5gvaK+wCa1nNbk= X-Google-Smtp-Source: AA0mqf5DoA93piz5CVF9XnFBz7DCsU5iv2lttlOp9VDYowFUmIgZu7ivcuR8M/O6WoSa+05bardiCQ== X-Received: by 2002:a17:902:6a8b:b0:186:fb8d:f4d3 with SMTP id n11-20020a1709026a8b00b00186fb8df4d3mr3201464plk.5.1670531707818; Thu, 08 Dec 2022 12:35:07 -0800 (PST) Received: from fedora.hsd1.ca.comcast.net ([2601:644:8002:1c20::2c6b]) by smtp.googlemail.com with ESMTPSA id f5-20020a170902860500b00189951514c4sm16954349plo.206.2022.12.08.12.35.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Dec 2022 12:35:07 -0800 (PST) From: "Vishal Moola (Oracle)" To: linux-mm@kvack.org Cc: damon@lists.linux.dev, linux-kernel@vger.kernel.org, akpm@linux-foundation.org, sj@kernel.org, "Vishal Moola (Oracle)" Subject: [PATCH v3 1/4] mm/memory: Add vm_normal_folio() Date: Thu, 8 Dec 2022 12:35:00 -0800 Message-Id: <20221208203503.20665-2-vishal.moola@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221208203503.20665-1-vishal.moola@gmail.com> References: <20221208203503.20665-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" Introduce a wrapper function called vm_normal_folio(). This function calls vm_normal_page() and returns the folio of the page found, or null if no page is found. This function allows callers to get a folio from a pte, which will eventually allow them to completely replace their struct page variables with struct folio instead. Signed-off-by: Vishal Moola (Oracle) Reviewed-by: Matthew Wilcox (Oracle) --- include/linux/mm.h | 2 ++ mm/memory.c | 10 ++++++++++ 2 files changed, 12 insertions(+) diff --git a/include/linux/mm.h b/include/linux/mm.h index 8bbcccbc5565..626ae0757bd3 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -1860,6 +1860,8 @@ static inline bool can_do_mlock(void) { return false;= } extern int user_shm_lock(size_t, struct ucounts *); extern void user_shm_unlock(size_t, struct ucounts *); =20 +struct folio *vm_normal_folio(struct vm_area_struct *vma, unsigned long ad= dr, + pte_t pte); struct page *vm_normal_page(struct vm_area_struct *vma, unsigned long addr, pte_t pte); struct page *vm_normal_page_pmd(struct vm_area_struct *vma, unsigned long = addr, diff --git a/mm/memory.c b/mm/memory.c index f88c351aecd4..1247c19c516c 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -672,6 +672,16 @@ struct page *vm_normal_page(struct vm_area_struct *vma= , unsigned long addr, return pfn_to_page(pfn); } =20 +struct folio *vm_normal_folio(struct vm_area_struct *vma, unsigned long ad= dr, + pte_t pte) +{ + struct page *page =3D vm_normal_page(vma, addr, pte); + + if (page) + return page_folio(page); + return NULL; +} + #ifdef CONFIG_TRANSPARENT_HUGEPAGE struct page *vm_normal_page_pmd(struct vm_area_struct *vma, unsigned long = addr, pmd_t pmd) --=20 2.38.1 From nobody Thu Sep 18 05:38:08 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 800E3C4332F for ; Thu, 8 Dec 2022 20:35:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229930AbiLHUfU (ORCPT ); Thu, 8 Dec 2022 15:35:20 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37466 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230003AbiLHUfK (ORCPT ); Thu, 8 Dec 2022 15:35:10 -0500 Received: from mail-pj1-x102d.google.com (mail-pj1-x102d.google.com [IPv6:2607:f8b0:4864:20::102d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 592FF8566C for ; Thu, 8 Dec 2022 12:35:09 -0800 (PST) Received: by mail-pj1-x102d.google.com with SMTP id gt4so1022860pjb.1 for ; Thu, 08 Dec 2022 12:35:09 -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=wHUznzZJR/+2eFOYGxPgX5SObHA9uL1BQ/OTB3xHgrA=; b=NEepa2sCfJJvgnX3ejRFOGPrjMYmgXnKRjN5unAOsJ/tE/BFewdxSNeEpPh1ad1sGm sIvarvzBcw9Q3fQ8zNawaQb5T7z+NwATAYhUr1/Zzfia5k8LSv8jP7nLAWj12z2ly+ZT f1GUI5W5sCMhxUsXXmc3IaXRX1EDRvErMLIqll3a5CVIKNBy+z+Ps/lbk08QQ9KaT7Xk XnMYibTX66/3+am1vVR/kGAVRT7Ww4h9duW2iIIY993dThq5e7aPSkAMZ/4u08o/kpj9 hMuvayRPzWZ61DFZfjIkSk7CofF4B5i1NolYOU2OWLJeiOsFr0kMvqfSPwlc83/zYe2K Aagw== 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=wHUznzZJR/+2eFOYGxPgX5SObHA9uL1BQ/OTB3xHgrA=; b=B2O0XujTXoUJhQy//u25987oImAnoV3tDLjZ/7K44u2BvMFjEiry9/1zUmFgVUUbtU jsQgQNTG9MlkjdPEDq6NJDwVXm9Z/0FQM+l8MjeneYG5f/dacsFiPcGgiZzZoclwr32X 6XzEQaNP6AdGHXM9cKqV5FFXzv3EUkTlBXab9jr4W+e1+7Braa66sPaZgEsPsafTy8++ 74ADDBOBgZyV5r7RLCx6HvqWj2z+3eZ+tlQErNEAwTKHpjFV86nd474FLJjI1RWvJ6mj zmtkufVm+9LzaC/llI3CP/aDrcnLdpmo0cLgvjiqqrTeVDFL4XQqKj1F489/FOi4L2GG nxHg== X-Gm-Message-State: ANoB5plUOGTA1LgQzifMSz0jML/uK+3Ixr6v8lx0OPDXMIE/CjkEDpkD /7O/oGePh6zjdXJyM7nJVW0= X-Google-Smtp-Source: AA0mqf5+O1BZXrE1YEC4dz/Cxj4pggZ4XHVB3Kve73sA6I4CTYSn6JfKCq6XbOm2qlu7J9B/7TW1zQ== X-Received: by 2002:a17:902:d58a:b0:189:a11e:9995 with SMTP id k10-20020a170902d58a00b00189a11e9995mr3527512plh.13.1670531708818; Thu, 08 Dec 2022 12:35:08 -0800 (PST) Received: from fedora.hsd1.ca.comcast.net ([2601:644:8002:1c20::2c6b]) by smtp.googlemail.com with ESMTPSA id f5-20020a170902860500b00189951514c4sm16954349plo.206.2022.12.08.12.35.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Dec 2022 12:35:08 -0800 (PST) From: "Vishal Moola (Oracle)" To: linux-mm@kvack.org Cc: damon@lists.linux.dev, linux-kernel@vger.kernel.org, akpm@linux-foundation.org, sj@kernel.org, "Vishal Moola (Oracle)" Subject: [PATCH v3 2/4] madvise: Convert madvise_cold_or_pageout_pte_range() to use folios Date: Thu, 8 Dec 2022 12:35:01 -0800 Message-Id: <20221208203503.20665-3-vishal.moola@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221208203503.20665-1-vishal.moola@gmail.com> References: <20221208203503.20665-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" This change removes a number of calls to compound_head(), and saves 1319 bytes of kernel text. Signed-off-by: Vishal Moola (Oracle) Reviewed-by: Matthew Wilcox (Oracle) --- mm/madvise.c | 92 ++++++++++++++++++++++++++-------------------------- 1 file changed, 46 insertions(+), 46 deletions(-) diff --git a/mm/madvise.c b/mm/madvise.c index 2baa93ca2310..2a84b5dfbb4c 100644 --- a/mm/madvise.c +++ b/mm/madvise.c @@ -332,8 +332,8 @@ static int madvise_cold_or_pageout_pte_range(pmd_t *pmd, struct vm_area_struct *vma =3D walk->vma; pte_t *orig_pte, *pte, ptent; spinlock_t *ptl; - struct page *page =3D NULL; - LIST_HEAD(page_list); + struct folio *folio =3D NULL; + LIST_HEAD(folio_list); =20 if (fatal_signal_pending(current)) return -EINTR; @@ -358,23 +358,23 @@ static int madvise_cold_or_pageout_pte_range(pmd_t *p= md, goto huge_unlock; } =20 - page =3D pmd_page(orig_pmd); + folio =3D pfn_folio(pmd_pfn(orig_pmd)); =20 - /* Do not interfere with other mappings of this page */ - if (page_mapcount(page) !=3D 1) + /* Do not interfere with other mappings of this folio */ + if (folio_mapcount(folio) !=3D 1) goto huge_unlock; =20 if (next - addr !=3D HPAGE_PMD_SIZE) { int err; =20 - get_page(page); + folio_get(folio); spin_unlock(ptl); - lock_page(page); - err =3D split_huge_page(page); - unlock_page(page); - put_page(page); + folio_lock(folio); + err =3D split_folio(folio); + folio_unlock(folio); + folio_put(folio); if (!err) - goto regular_page; + goto regular_folio; return 0; } =20 @@ -386,25 +386,25 @@ static int madvise_cold_or_pageout_pte_range(pmd_t *p= md, tlb_remove_pmd_tlb_entry(tlb, pmd, addr); } =20 - ClearPageReferenced(page); - test_and_clear_page_young(page); + folio_clear_referenced(folio); + folio_test_clear_young(folio); if (pageout) { - if (!isolate_lru_page(page)) { - if (PageUnevictable(page)) - putback_lru_page(page); + if (!folio_isolate_lru(folio)) { + if (folio_test_unevictable(folio)) + folio_putback_lru(folio); else - list_add(&page->lru, &page_list); + list_add(&folio->lru, &folio_list); } } else - deactivate_page(page); + deactivate_page(&folio->page); huge_unlock: spin_unlock(ptl); if (pageout) - reclaim_pages(&page_list); + reclaim_pages(&folio_list); return 0; } =20 -regular_page: +regular_folio: if (pmd_trans_unstable(pmd)) return 0; #endif @@ -421,31 +421,31 @@ static int madvise_cold_or_pageout_pte_range(pmd_t *p= md, if (!pte_present(ptent)) continue; =20 - page =3D vm_normal_page(vma, addr, ptent); - if (!page || is_zone_device_page(page)) + folio =3D vm_normal_folio(vma, addr, ptent); + if (!folio || folio_is_zone_device(folio)) continue; =20 /* * Creating a THP page is expensive so split it only if we * are sure it's worth. Split it if we are only owner. */ - if (PageTransCompound(page)) { - if (page_mapcount(page) !=3D 1) + if (folio_test_large(folio)) { + if (folio_mapcount(folio) !=3D 1) break; - get_page(page); - if (!trylock_page(page)) { - put_page(page); + folio_get(folio); + if (!folio_trylock(folio)) { + folio_put(folio); break; } pte_unmap_unlock(orig_pte, ptl); - if (split_huge_page(page)) { - unlock_page(page); - put_page(page); + if (split_folio(folio)) { + folio_unlock(folio); + folio_put(folio); orig_pte =3D pte_offset_map_lock(mm, pmd, addr, &ptl); break; } - unlock_page(page); - put_page(page); + folio_unlock(folio); + folio_put(folio); orig_pte =3D pte =3D pte_offset_map_lock(mm, pmd, addr, &ptl); pte--; addr -=3D PAGE_SIZE; @@ -453,13 +453,13 @@ static int madvise_cold_or_pageout_pte_range(pmd_t *p= md, } =20 /* - * Do not interfere with other mappings of this page and - * non-LRU page. + * Do not interfere with other mappings of this folio and + * non-LRU folio. */ - if (!PageLRU(page) || page_mapcount(page) !=3D 1) + if (!folio_test_lru(folio) || folio_mapcount(folio) !=3D 1) continue; =20 - VM_BUG_ON_PAGE(PageTransCompound(page), page); + VM_BUG_ON_FOLIO(folio_test_large(folio), folio); =20 if (pte_young(ptent)) { ptent =3D ptep_get_and_clear_full(mm, addr, pte, @@ -470,28 +470,28 @@ static int madvise_cold_or_pageout_pte_range(pmd_t *p= md, } =20 /* - * We are deactivating a page for accelerating reclaiming. - * VM couldn't reclaim the page unless we clear PG_young. + * We are deactivating a folio for accelerating reclaiming. + * VM couldn't reclaim the folio unless we clear PG_young. * As a side effect, it makes confuse idle-page tracking * because they will miss recent referenced history. */ - ClearPageReferenced(page); - test_and_clear_page_young(page); + folio_clear_referenced(folio); + folio_test_clear_young(folio); if (pageout) { - if (!isolate_lru_page(page)) { - if (PageUnevictable(page)) - putback_lru_page(page); + if (!folio_isolate_lru(folio)) { + if (folio_test_unevictable(folio)) + folio_putback_lru(folio); else - list_add(&page->lru, &page_list); + list_add(&folio->lru, &folio_list); } } else - deactivate_page(page); + deactivate_page(&folio->page); } =20 arch_leave_lazy_mmu_mode(); pte_unmap_unlock(orig_pte, ptl); if (pageout) - reclaim_pages(&page_list); + reclaim_pages(&folio_list); cond_resched(); =20 return 0; --=20 2.38.1 From nobody Thu Sep 18 05:38:08 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 4DB7CC4332F for ; Thu, 8 Dec 2022 20:35:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230057AbiLHUfX (ORCPT ); Thu, 8 Dec 2022 15:35:23 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37476 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230011AbiLHUfK (ORCPT ); Thu, 8 Dec 2022 15:35:10 -0500 Received: from mail-pj1-x102f.google.com (mail-pj1-x102f.google.com [IPv6:2607:f8b0:4864:20::102f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5A6AF862C4 for ; Thu, 8 Dec 2022 12:35:10 -0800 (PST) Received: by mail-pj1-x102f.google.com with SMTP id k88-20020a17090a4ce100b00219d0b857bcso2751742pjh.1 for ; Thu, 08 Dec 2022 12:35:10 -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=Ihy8jPmuCwZF2NUxckyF8mvKKJAfgGLMAeVZly3BYIQ=; b=Ii3vt0qJdv0V25/feuGUMH7PzkflNrD7g8L2x6z6/EYO9gzRto4zD8ZTJENpqeU8XP gLmydlYQJhHXfGq9y5BeriBDQ11jeq2TYMS4ysPrNZ9lPX61JatrrzxhNPq8b43OY+1j ptjf++BriBBDjvyJBWStE5HuQ96Co+07MfQnvCs2OW/l8Fnd4dMK7S3wmVg9uQ10eoQe daaPLy51OxzLCvTwyZhN2Miw3T/m5LTvMPAIzD6bUUY+4EQQU/bJ69w/ZA8Q6XpK5xLy SxVqHOiUx+drkxy5pADNtrFlAQV+RXgMmv1emA5DGz0XXWcWdkZMZTar5/QzNUuvgqaX Bdxg== 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=Ihy8jPmuCwZF2NUxckyF8mvKKJAfgGLMAeVZly3BYIQ=; b=wW6aerC7mH30USWPjCeg/CdCbWsf9B3EUmf32Z6o5J7knUo0KD7g7DwQDv4afteo+H sq53hCZmyitRvd9FWf9gYx9nCqFKF8kZlydZV1l4VaDbB2juybMBWUWpCyd+x+yV2uPn eHvg6zMhAX3NrALaGHXOOaYlUJpMq1cFlJ2Bd95+AhGsPTN27Jk7bEeuttGMVE4oooFp h6a5wMnsvb0/m6Xz+5HBThipgxlQttrIsoN4tyyBkoFJO+VhzZfrQgzNiACjePTZXF3f 22A+9tB9nQ21xXYIXaR3JU5ByvULmy159IQ25Pp5SsAONIbbS/QgxbpD2gsaW6jpDAAn JGGw== X-Gm-Message-State: ANoB5pnCBklSmuf1yRoQjttX44SIPAyWt/08FZZexCWKkkUsECWiLQoc p5tFbwn6zNQs1bQpsrM1ZsdIybEpC8w= X-Google-Smtp-Source: AA0mqf4+5Zv1Qu99xU00p+xkeABzV897h+Xfstc+913jbdXvjz2pIi2b+ZYYSdFCNInv+po5xPqf2w== X-Received: by 2002:a17:902:e806:b0:185:4421:72e5 with SMTP id u6-20020a170902e80600b00185442172e5mr3989355plg.42.1670531709851; Thu, 08 Dec 2022 12:35:09 -0800 (PST) Received: from fedora.hsd1.ca.comcast.net ([2601:644:8002:1c20::2c6b]) by smtp.googlemail.com with ESMTPSA id f5-20020a170902860500b00189951514c4sm16954349plo.206.2022.12.08.12.35.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Dec 2022 12:35:09 -0800 (PST) From: "Vishal Moola (Oracle)" To: linux-mm@kvack.org Cc: damon@lists.linux.dev, linux-kernel@vger.kernel.org, akpm@linux-foundation.org, sj@kernel.org, "Vishal Moola (Oracle)" Subject: [PATCH v3 3/4] mm/damon: Convert damon_pa_mark_accessed_or_deactivate() to use folios Date: Thu, 8 Dec 2022 12:35:02 -0800 Message-Id: <20221208203503.20665-4-vishal.moola@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221208203503.20665-1-vishal.moola@gmail.com> References: <20221208203503.20665-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" This change replaces 2 calls to compound_head() with one. This is in preparation for the conversion of deactivate_page() to folio_deactivate(). Signed-off-by: Vishal Moola (Oracle) Reviewed-by: Matthew Wilcox (Oracle) Reviewed-by: SeongJae Park --- mm/damon/paddr.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/mm/damon/paddr.c b/mm/damon/paddr.c index e1a4315c4be6..73548bc82297 100644 --- a/mm/damon/paddr.c +++ b/mm/damon/paddr.c @@ -238,15 +238,18 @@ static inline unsigned long damon_pa_mark_accessed_or= _deactivate( =20 for (addr =3D r->ar.start; addr < r->ar.end; addr +=3D PAGE_SIZE) { struct page *page =3D damon_get_page(PHYS_PFN(addr)); + struct folio *folio; =20 if (!page) continue; + folio =3D page_folio(page); + if (mark_accessed) - mark_page_accessed(page); + folio_mark_accessed(folio); else - deactivate_page(page); - put_page(page); - applied++; + deactivate_page(&folio->page); + folio_put(folio); + applied +=3D folio_nr_pages(folio); } return applied * PAGE_SIZE; } --=20 2.38.1 From nobody Thu Sep 18 05:38:08 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 37C3CC4332F for ; Thu, 8 Dec 2022 20:35:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230072AbiLHUf2 (ORCPT ); Thu, 8 Dec 2022 15:35:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37488 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230019AbiLHUfM (ORCPT ); Thu, 8 Dec 2022 15:35:12 -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 ABAEF86591 for ; Thu, 8 Dec 2022 12:35:11 -0800 (PST) Received: by mail-pj1-x1030.google.com with SMTP id e7-20020a17090a77c700b00216928a3917so5863867pjs.4 for ; Thu, 08 Dec 2022 12:35:11 -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=IgIdh8nt+mq77dQQNk9/S7rfV6TiIO4QqyG3Sqp+yaY=; b=iWudK4xr8eyn/01wdfoGvrxyUZ3k1Zp/c9SZe2LcNl4BOQDgNz1rrGJo+5CwWhbxsB ekFj/Vx5q+l+Er2zXRcjiwwJ7Org396Wm7q4Qi1iKNkG/8p8agHenkkce3pEZ2WWcyJv HWDgSY5KjyzddNWRNvF5+ItpMrECfjvrPJdosOTLsMFYLgac6nNGyRFOwiYuGbaC2MoE dbZNnKV4+iKB3vUXa9waapqdDgJkv+WDMARouAaHEBewwulZ+Bj8Q56TL7piK4KIKDcW C3m6/Gz0ZDe4U3xG2q8ctJWNYAp/WE2rQqaalZBdrEiETAX6nj01t2ihO7VPs3yUYnGw tn4Q== 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=IgIdh8nt+mq77dQQNk9/S7rfV6TiIO4QqyG3Sqp+yaY=; b=prRkbBjLMrUTyUfnKjpoFPWElgobXo8r/uvPkuyNM6A6bxtIWvGkoA7hxsgkG1KHU5 +ZDA9btaj/iZ68NVuFQWiVIGxVP/TLILJeWKJK2cPN/IEnhE44aab5e/hOx9yC9wJx5x gYy4myxO4Au3ZevjYT9VFJ1i8XpyWwL2KTAyCudGz4q8LhiONkfMQ7/hofBVI7O6vtpr I358U/374KJXQJYh3UHrS2uBmIobg31D7m/FIS+unnI/RhJaCyD/f5nOgo1sM84x+BKL H8yXeDcnhlZXUGV0/pWnXUUQ3jQSzg996lC6wBUi8lp/hP7hyA5sbvFHWK/QQXlcTrFD tjsg== X-Gm-Message-State: ANoB5pkTS5A8ni+Z37BfDR8vCRP7DlituLhDa1QqVnz9mLlmjyLYq2LJ RlJ4HrCjjIwgCbNU+szEJIM= X-Google-Smtp-Source: AA0mqf5LuEF6hw5v4QfYtY1YTYCQswEq2LvxbAKaP13F6C+lHoQVP968dI3AQN2b+rJ2dSyg/9P1qA== X-Received: by 2002:a17:902:b289:b0:189:70c1:4ff5 with SMTP id u9-20020a170902b28900b0018970c14ff5mr3560139plr.37.1670531711111; Thu, 08 Dec 2022 12:35:11 -0800 (PST) Received: from fedora.hsd1.ca.comcast.net ([2601:644:8002:1c20::2c6b]) by smtp.googlemail.com with ESMTPSA id f5-20020a170902860500b00189951514c4sm16954349plo.206.2022.12.08.12.35.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Dec 2022 12:35:10 -0800 (PST) From: "Vishal Moola (Oracle)" To: linux-mm@kvack.org Cc: damon@lists.linux.dev, linux-kernel@vger.kernel.org, akpm@linux-foundation.org, sj@kernel.org, "Vishal Moola (Oracle)" Subject: [PATCH v3 4/4] mm/swap: Convert deactivate_page() to folio_deactivate() Date: Thu, 8 Dec 2022 12:35:03 -0800 Message-Id: <20221208203503.20665-5-vishal.moola@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221208203503.20665-1-vishal.moola@gmail.com> References: <20221208203503.20665-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" Deactivate_page() has already been converted to use folios, this change converts it to take in a folio argument instead of calling page_folio(). It also renames the function folio_deactivate() to be more consistent with other folio functions. Signed-off-by: Vishal Moola (Oracle) Reviewed-by: Matthew Wilcox (Oracle) Reviewed-by: SeongJae Park --- include/linux/swap.h | 2 +- mm/damon/paddr.c | 2 +- mm/madvise.c | 4 ++-- mm/swap.c | 14 ++++++-------- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/include/linux/swap.h b/include/linux/swap.h index a18cf4b7c724..6427b3af30c3 100644 --- a/include/linux/swap.h +++ b/include/linux/swap.h @@ -409,7 +409,7 @@ extern void lru_add_drain(void); extern void lru_add_drain_cpu(int cpu); extern void lru_add_drain_cpu_zone(struct zone *zone); extern void lru_add_drain_all(void); -extern void deactivate_page(struct page *page); +void folio_deactivate(struct folio *folio); extern void mark_page_lazyfree(struct page *page); extern void swap_setup(void); =20 diff --git a/mm/damon/paddr.c b/mm/damon/paddr.c index 73548bc82297..6b36de1396a4 100644 --- a/mm/damon/paddr.c +++ b/mm/damon/paddr.c @@ -247,7 +247,7 @@ static inline unsigned long damon_pa_mark_accessed_or_d= eactivate( if (mark_accessed) folio_mark_accessed(folio); else - deactivate_page(&folio->page); + folio_deactivate(folio); folio_put(folio); applied +=3D folio_nr_pages(folio); } diff --git a/mm/madvise.c b/mm/madvise.c index 2a84b5dfbb4c..1ab293019862 100644 --- a/mm/madvise.c +++ b/mm/madvise.c @@ -396,7 +396,7 @@ static int madvise_cold_or_pageout_pte_range(pmd_t *pmd, list_add(&folio->lru, &folio_list); } } else - deactivate_page(&folio->page); + folio_deactivate(folio); huge_unlock: spin_unlock(ptl); if (pageout) @@ -485,7 +485,7 @@ static int madvise_cold_or_pageout_pte_range(pmd_t *pmd, list_add(&folio->lru, &folio_list); } } else - deactivate_page(&folio->page); + folio_deactivate(folio); } =20 arch_leave_lazy_mmu_mode(); diff --git a/mm/swap.c b/mm/swap.c index 955930f41d20..9cc8215acdbb 100644 --- a/mm/swap.c +++ b/mm/swap.c @@ -720,17 +720,15 @@ void deactivate_file_folio(struct folio *folio) } =20 /* - * deactivate_page - deactivate a page - * @page: page to deactivate + * folio_deactivate - deactivate a folio + * @folio: folio to deactivate * - * deactivate_page() moves @page to the inactive list if @page was on the = active - * list and was not an unevictable page. This is done to accelerate the r= eclaim - * of @page. + * folio_deactivate() moves @folio to the inactive list if @folio was on t= he + * active list and was not unevictable. This is done to accelerate the + * reclaim of @folio. */ -void deactivate_page(struct page *page) +void folio_deactivate(struct folio *folio) { - struct folio *folio =3D page_folio(page); - if (folio_test_lru(folio) && !folio_test_unevictable(folio) && (folio_test_active(folio) || lru_gen_enabled())) { struct folio_batch *fbatch; --=20 2.38.1