From patchwork Fri Apr 29 19:23:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 12832639 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 D5E01C433F5 for ; Fri, 29 Apr 2022 19:23:45 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B35146B0072; Fri, 29 Apr 2022 15:23:41 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 784696B0085; Fri, 29 Apr 2022 15:23:41 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 146666B007D; Fri, 29 Apr 2022 15:23:40 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (relay.hostedemail.com [64.99.140.25]) by kanga.kvack.org (Postfix) with ESMTP id AF9586B0073 for ; Fri, 29 Apr 2022 15:23:40 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 844C42099E for ; Fri, 29 Apr 2022 19:23:40 +0000 (UTC) X-FDA: 79410891000.13.B4621F8 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf31.hostedemail.com (Postfix) with ESMTP id 6F7A820069 for ; Fri, 29 Apr 2022 19:23:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=5quld6PgXDQsno1p/cxFOWTDpBSk6Vh4OG/wcGOVDgY=; b=kCj8khlO4IKPEsVGbJ1geu9qPi YCrdv3pYTzURzF38AFcsCprOq0MYn4Aj2747klJl3rjOng785yj9mkwR1oW1/WPCeLgwYfkjh2G5+ iatUghFtKLVV+cbOnEfDoi71uM4KTYVrES18ECF9tXfAqxJyXTIidfZvScbmg0c0uii+wtfBrX+8E EpZPEpt2UReIKR+OtNKfRTl36UXxjH7VszqJD7PUL3N5MYn7zBSpOrLI6pls2I2gxsILrYeKp6S2u dd9l+fTIpxdLakEtwCxUYHAgpKp++WhR2oqOfhO2xujYtE61P1wcbZtV+ZCgn15356du+WppUFFtD wxmHcn7g==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1nkWDJ-00CjPM-WD; Fri, 29 Apr 2022 19:23:38 +0000 From: "Matthew Wilcox (Oracle)" To: akpm@linuxfoundation.org Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org Subject: [PATCH 12/21] vmscan: Convert the activate_locked portion of shrink_page_list to folios Date: Fri, 29 Apr 2022 20:23:20 +0100 Message-Id: <20220429192329.3034378-13-willy@infradead.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220429192329.3034378-1-willy@infradead.org> References: <20220429192329.3034378-1-willy@infradead.org> MIME-Version: 1.0 X-Stat-Signature: 7fxs5e6sqxzyay8yqe7x6uutr3oqme4u X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 6F7A820069 X-Rspam-User: Authentication-Results: imf31.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=kCj8khlO; dmarc=none; spf=none (imf31.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org X-HE-Tag: 1651260208-279869 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: This accounts the number of pages activated correctly for large folios. Signed-off-by: Matthew Wilcox (Oracle) --- mm/vmscan.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/mm/vmscan.c b/mm/vmscan.c index 9ac2583ca5e5..85c9758f6f32 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -1927,15 +1927,16 @@ static unsigned int shrink_page_list(struct list_head *page_list, } activate_locked: /* Not a candidate for swapping, so reclaim swap space. */ - if (PageSwapCache(page) && (mem_cgroup_swap_full(page) || - PageMlocked(page))) - try_to_free_swap(page); - VM_BUG_ON_PAGE(PageActive(page), page); - if (!PageMlocked(page)) { - int type = page_is_file_lru(page); - SetPageActive(page); + if (folio_test_swapcache(folio) && + (mem_cgroup_swap_full(&folio->page) || + folio_test_mlocked(folio))) + try_to_free_swap(&folio->page); + VM_BUG_ON_FOLIO(folio_test_active(folio), folio); + if (!folio_test_mlocked(folio)) { + int type = folio_is_file_lru(folio); + folio_set_active(folio); stat->nr_activate[type] += nr_pages; - count_memcg_page_event(page, PGACTIVATE); + count_memcg_folio_events(folio, PGACTIVATE, nr_pages); } keep_locked: unlock_page(page);