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 848A1C4332F for ; Thu, 8 Dec 2022 21:56:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EB95D8E0005; Thu, 8 Dec 2022 16:56:34 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id E69F68E0001; Thu, 8 Dec 2022 16:56:34 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D34408E0005; Thu, 8 Dec 2022 16:56:34 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id C15488E0001 for ; Thu, 8 Dec 2022 16:56:34 -0500 (EST) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 8FE32140FDF for ; Thu, 8 Dec 2022 21:56:34 +0000 (UTC) X-FDA: 80220498708.03.6CB4A0C Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by imf03.hostedemail.com (Postfix) with ESMTP id DD87D20005 for ; Thu, 8 Dec 2022 21:56:32 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=jgg7917l; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf03.hostedemail.com: domain of sj@kernel.org designates 145.40.68.75 as permitted sender) smtp.mailfrom=sj@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1670536593; 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=5RTEouPmntLMDNFJC8ghYFnroET6tERqRbfuiYBNoU8=; b=kCb5mbchixkrr3+fL7PUPwY3QuJV1Okj+sXHUepxQ0JL9Pp7K3VaKNoJeHTRujGOFVmaM3 dtDqWxXHYIP1/SWrtTFv/IcACLHGI0vnh3ZIikMD+mZbFujf4qsKSZEcfTaPtrWAg9fvDd EJNbCQaal9QNAUjm2MHBGY6BBzsVv/E= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=jgg7917l; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf03.hostedemail.com: domain of sj@kernel.org designates 145.40.68.75 as permitted sender) smtp.mailfrom=sj@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1670536593; a=rsa-sha256; cv=none; b=ep2NtYyegxgvbd0QRSfatEB9SM7AsJSvC2w4ZCNd1HW0GYOKwuKGLBp53x+HRfoozr6CpS sPSKXArkcihdZ/JkcqqGHC/WaBT2vEmBAOSVaiMczTklQHVbPpUIB3vwNOvA9k3sZGKg81 XErOSIOnM0Ux6/8S39HeFnaR4jVgqic= Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 2DFA1B82444; Thu, 8 Dec 2022 21:56:31 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 70FEDC433D2; Thu, 8 Dec 2022 21:56:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1670536590; bh=bFNu3vNOxRzISUHbhrcGwqprv78edRC0TLjOn0yrO78=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jgg7917lyxodDm1WbIW+2Tx+zBacForxyiPmNzhfg6WQBEX9JAXM3Jn46tHhaTcAN C9rOtlO1PHDlbL1jjSAjp52xrx+axl9hp2KyZk4HoWiLFh3pQbYlo+A8aeDuKfc7o6 mw6cxE6S5wGxkZmJmkPX7FUjSXHlxgZ1EOxoo6lqkbTsrzEyKrj/3dlenhdGtrT5VD FMeANQ2guYHBdQO2BTsXk0yr4wm47pskJ0vHDor432z2HK4mrJvHRSmropCawyGgyu z4ebrnz/2eDrxvNSHX93Q5702Hi/IW8Eyj2qBqwaimluETtvYXYYgNdKhT9yT33yel Yz/2RyOIlKVkQ== From: SeongJae Park To: "Vishal Moola (Oracle)" Cc: linux-mm@kvack.org, damon@lists.linux.dev, linux-kernel@vger.kernel.org, akpm@linux-foundation.org, sj@kernel.org Subject: Re: [PATCH v3 4/4] mm/swap: Convert deactivate_page() to folio_deactivate() Date: Thu, 8 Dec 2022 21:56:27 +0000 Message-Id: <20221208215627.116940-1-sj@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221208203503.20665-5-vishal.moola@gmail.com> References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: DD87D20005 X-Stat-Signature: 9y4em8b1ic8japua6fptz9i9dyc3s695 X-HE-Tag: 1670536592-622385 X-HE-Meta: U2FsdGVkX1/xa3KrA2VWYurKog7JmkqhODDUvKYLNXkTJnGEY7O8up9GoicpcFVCJ+I3TVZ1abLbV9/OjSmmZ4C+DHbbUd1q4+x4mYzs6WTyXQqnG5m1HzFvpRyNarttCA9/CyWwNbFYPPw5X6Vucz4eAYOcVPzOEMLDqTBpTVJent8nkd66YiCNkAhK9hilK/GTviXM+c01VR/TV5xgXT0P9LHU+1MEyX9SqM2r6qoW6JVQ4L0ZgvAcnvkBOfT6fcy+CD8o1lFttvAQFtBts8NBQYdC6fm5rWmQCX+fwX64BKJiGbMqS9CN/qqCvrlzDS2CUA6llyYf+YT2AKWkauTTOr/OwW4cSkj418jCiwdpRVBn3LAuQCpWv5eSJ4I91YM4OS7FWrXpDoQ7jyrzHaeE5HSmimJyAwEmYCdf7HlNst9LPDaumts6zJQnH63nLILT8ZxdrsFiRLzYg2wrbvJY1rNz3ze0dU8+kgA1AUwyFf10UxqeL3VH1iyVtiKEbrKNW9LZX+OeilYHibc8yjstpdq7eLZ0iU8L6Ea7sD9bQTdULqzj9qdMFWYS5lI7H/Fj6rDXsKbgxNXDMwZxkmOrJsZ6pHTxuX5tHi+8ByhjcmVdChJlWaS2ReN+sEs5OmZwHecCxaYtAJJXzgbtQ+6USsN67VbRCSL4IuK9y7bc0cFQhkkANTqfsV3BXOvssO7RqPz4PGwG+V284vdODEceepL7UWIswyF7pXFxBtmvue/IATp8mcwK2iy95nwnVUrj78BsTw3XBDWwEnQPUZG3fcNp5hG5pZdvlo6abkCYa4NfcIW5RnJUf5zjC+Ea9P2OgSoDWRlrDpYT+P++sjj0Jj7MKgSnGdhbnUhMXswgazY/qqVRpApzijVnNznh1/Vm/vZ92YHP+WVA8ZYFQ3UY0kzPHeqSAYMTl4kOIyI7oh0xSVanXUf46h1PXbVkcSLk4Rn4/hcyWC2R5Z6 UlyD6q4q BR6U0DqxpP9UCQaJc/YcWMc/AsHwmJ4HtPyaSHlltXwvYYnc/7xzxw/nl/Y/9xaSLyliipZPmC95TCh1hk+bBT9s3B/q6SZ9KWsVAOg/ApRiLsJYvEz0/koRiHrCjnwGLME7Xrok5seneygj2R1Mi/Iy9gn8jRs5OsbuBOBkqHhlUwHYP0yKl9lQylQ== 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: On Thu, 8 Dec 2022 12:35:03 -0800 "Vishal Moola (Oracle)" wrote: > 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: SeongJae Park Thanks, SJ > --- > 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); > > 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_deactivate( > if (mark_accessed) > folio_mark_accessed(folio); > else > - deactivate_page(&folio->page); > + folio_deactivate(folio); > folio_put(folio); > applied += 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); > } > > 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) > } > > /* > - * 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 reclaim > - * of @page. > + * folio_deactivate() moves @folio to the inactive list if @folio was on the > + * 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 = 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 >