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 948BEC352A1 for ; Wed, 7 Dec 2022 00:22:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 186C48E0007; Tue, 6 Dec 2022 19:22:16 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 139428E0001; Tue, 6 Dec 2022 19:22:16 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E08958E0007; Tue, 6 Dec 2022 19:22:15 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id D145C8E0001 for ; Tue, 6 Dec 2022 19:22:15 -0500 (EST) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id A743880E1E for ; Wed, 7 Dec 2022 00:22:15 +0000 (UTC) X-FDA: 80213608230.18.B3902D1 Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) by imf04.hostedemail.com (Postfix) with ESMTP id 4FE544000D for ; Wed, 7 Dec 2022 00:22:14 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=nOt7hYfh; spf=pass (imf04.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.216.42 as permitted sender) smtp.mailfrom=vishal.moola@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1670372534; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=OEZ3nXZq4E7igsh2DmFsHgveY1W51E+N0X432dfJHyo=; b=da+jL2NC8dgKAFzqicEVH/qzj+WELsoZ4PlBMQFe8B70qVYi6tGWfOgZ0/cQ0SmJxcKU4H sU09zFrR5pvPkI6KNoBSi02/XegQsO+oVYPHvqaWPANveHzHCExP3qehCj0m9+7cog7QJx Jq+UOJHS6yhoP2fu4G31bl5B8VLEFrM= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=nOt7hYfh; spf=pass (imf04.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.216.42 as permitted sender) smtp.mailfrom=vishal.moola@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1670372534; a=rsa-sha256; cv=none; b=zQ0tudqHVaF3KC8mNwveMW17w6fDk9AuMXQjVr/aOKC+D3MzZaLYXInvqC6AdGGeYKIIjz s0GDIZgnC2GGYTRWvtfv4iOXJbFKF7hOZSawej7Dn35Ix5sGfj5Mo9fnLc0TAAhqM7a1cb +wqsbp3zg2kIPg0FGWZVK50IPAe+wA0= Received: by mail-pj1-f42.google.com with SMTP id v13-20020a17090a6b0d00b00219c3be9830so8450673pjj.4 for ; Tue, 06 Dec 2022 16:22:14 -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=OEZ3nXZq4E7igsh2DmFsHgveY1W51E+N0X432dfJHyo=; b=nOt7hYfhoJxkHqluSJnxpRExcW/m2quhpIhnCt2VmhwAHoWhp+foIWoMsEF6wIdkvI Rbf8GNmAIVnTLG+lIA6ThCYViUdKlHharbhvotCvy2BvDU36itd3ooK0vKMM914ZXS3K llSojtAyxUiRTUSgxDaGmOOdKjFCGPZwwkuMLrvFrsKtQhXvutBKuXRg2TdB/B72kQEw ueYt6FAFjRVdQ+xVslRGRaDThzeJGgZpIuqzVT7gWw+v991mrr4aqeEw3Ki2PlaLHaFb gcvNJY6QM6cXqabzvF8qSR/n2mJeeEOfUOMw5pNtyskDaAD4PBFedJ9w/MKFIIJs30gf /R4A== 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=OEZ3nXZq4E7igsh2DmFsHgveY1W51E+N0X432dfJHyo=; b=FQlplBFOw+bsZmEyX1UkAau5SKenV13NnEroxuGVokumovtMVHr+skcOmfDPHH4ZjX OJY3tgFdJsl3E7Zn/a5hbVJZPTxGm6QhSrFBumQUvpghA3SK3sPptq1DG0gqP8gsbw1V /JEt+ot25Ye0CoAnjIK6PXo19tarxpMKIk7+fyFyPo4bqs03ZzxgJKX4KYNTxyg5YRYq UxKWRhjvMSAvYkYGS+l96ePBUecQVEP+cjmSfnIUFMyLK5+FDOV79EawzLvAifPO1PBz 1MuPAwwuyimjQI9cSSz0fjoE66EzfN1ADw3+I76lOPqXvROyZvAxnamOHRjwIDDtFYqm VE5w== X-Gm-Message-State: ANoB5plrI53fbO0i49BbuUz1oash60GgZZ+8Y/445wrpSDalXJpT68ht yAKd1PJYxWpLgNXAKchSwSG/9RelR+w= X-Google-Smtp-Source: AA0mqf6Z7Vfk8E9GO2/aJOFHDYEsNCpnkpUq8FGPv4LkM++FMgwrWiZpHKRYzDycb6i+3+PmCuR+9Q== X-Received: by 2002:a17:902:e411:b0:189:8796:7813 with SMTP id m17-20020a170902e41100b0018987967813mr46531581ple.110.1670372533159; Tue, 06 Dec 2022 16:22:13 -0800 (PST) Received: from fedora.hsd1.ca.comcast.net ([2601:644:8002:1c20::2c6b]) by smtp.googlemail.com with ESMTPSA id i92-20020a17090a3de500b00218ec4ff0d4sm13369459pjc.6.2022.12.06.16.22.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Dec 2022 16:22:12 -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 3/3] swap: Convert deactivate_page() to deactivate_folio() Date: Tue, 6 Dec 2022 16:21:58 -0800 Message-Id: <20221207002158.418789-4-vishal.moola@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221207002158.418789-1-vishal.moola@gmail.com> References: <20221207002158.418789-1-vishal.moola@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 4FE544000D X-Stat-Signature: gugnsccphjic1f1cnkisuc14xgyunknz X-Spamd-Result: default: False [2.10 / 9.00]; BAYES_HAM(-6.00)[99.99%]; SORBS_IRL_BL(3.00)[209.85.216.42:from]; R_MISSING_CHARSET(2.50)[]; SUSPICIOUS_RECIPS(1.50)[]; SUBJECT_HAS_UNDERSCORES(1.00)[]; MIME_GOOD(-0.10)[text/plain]; BAD_REP_POLICIES(0.10)[]; RCVD_NO_TLS_LAST(0.10)[]; PREVIOUSLY_DELIVERED(0.00)[linux-mm@kvack.org]; MID_RHS_MATCH_FROM(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; FROM_HAS_DN(0.00)[]; R_DKIM_ALLOW(0.00)[gmail.com:s=20210112]; TAGGED_RCPT(0.00)[]; ARC_SIGNED(0.00)[hostedemail.com:s=arc-20220608:i=1]; ARC_NA(0.00)[]; TAGGED_FROM(0.00)[]; DKIM_TRACE(0.00)[gmail.com:+]; RCVD_COUNT_THREE(0.00)[3]; RCPT_COUNT_FIVE(0.00)[6]; R_SPF_ALLOW(0.00)[+ip4:209.85.128.0/17:c]; DMARC_POLICY_ALLOW(0.00)[gmail.com,none]; MIME_TRACE(0.00)[0:+]; FROM_EQ_ENVFROM(0.00)[]; TO_DN_SOME(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[] X-Rspam-User: X-HE-Tag: 1670372534-193615 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: Deactivate_page() has already been converted to use folios, this change converts it to take in a folio argument instead of calling page_folio(). Signed-off-by: Vishal Moola (Oracle) --- 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..f404790222c0 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); +extern void deactivate_folio(struct folio *folio); extern void mark_page_lazyfree(struct page *page); extern void swap_setup(void); diff --git a/mm/damon/paddr.c b/mm/damon/paddr.c index 73548bc82297..828961fc7899 100644 --- a/mm/damon/paddr.c +++ b/mm/damon/paddr.c @@ -247,7 +247,7 @@ static inline unsigned long damon_pa_mark_accessed_or_deactivate( if (mark_accessed) folio_mark_accessed(folio); else - deactivate_page(&folio->page); + deactivate_folio(folio); folio_put(folio); applied += folio_nr_pages(folio); } diff --git a/mm/madvise.c b/mm/madvise.c index 59bfc6c9c548..afe957994317 100644 --- a/mm/madvise.c +++ b/mm/madvise.c @@ -397,7 +397,7 @@ static int madvise_cold_or_pageout_pte_range(pmd_t *pmd, list_add(&folio->lru, &folio_list); } } else - deactivate_page(&folio->page); + deactivate_folio(folio); huge_unlock: spin_unlock(ptl); if (pageout) @@ -487,7 +487,7 @@ static int madvise_cold_or_pageout_pte_range(pmd_t *pmd, list_add(&folio->lru, &folio_list); } } else - deactivate_page(&folio->page); + deactivate_folio(folio); } arch_leave_lazy_mmu_mode(); diff --git a/mm/swap.c b/mm/swap.c index 955930f41d20..9982469e8da8 100644 --- a/mm/swap.c +++ b/mm/swap.c @@ -720,17 +720,15 @@ void deactivate_file_folio(struct folio *folio) } /* - * deactivate_page - deactivate a page - * @page: page to deactivate + * deactivate_folio - 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 reclaim - * of @page. + * deactivate_folio() moves @folio to the inactive list if @folio was on the + * active list and was not an unevictable page. This is done to accelerate + * the reclaim of @folio. */ -void deactivate_page(struct page *page) +void deactivate_folio(struct folio *folio) { - struct folio *folio = page_folio(page); - if (folio_test_lru(folio) && !folio_test_unevictable(folio) && (folio_test_active(folio) || lru_gen_enabled())) { struct folio_batch *fbatch; -- 2.38.1