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 D5876C6FA82 for ; Fri, 2 Sep 2022 19:48:00 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3E41B80107; Fri, 2 Sep 2022 15:47:07 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id ABA198010B; Fri, 2 Sep 2022 15:47:06 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5BCC1800FA; Fri, 2 Sep 2022 15:47:06 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 58940800FA for ; Fri, 2 Sep 2022 15:47:04 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 3729A14064B for ; Fri, 2 Sep 2022 19:47:04 +0000 (UTC) X-FDA: 79868178768.21.BAA86AE Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf20.hostedemail.com (Postfix) with ESMTP id E6C5D1C005F for ; Fri, 2 Sep 2022 19:47:03 +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=7aj2gwVlj5VcsZXUySMc7S7T76WQ2vhifR2A0XWxgfs=; b=Zb+2mXeM2KGyaVFUI57piyTyce HSRh1ZebjjIyMEq2CUwzcFrktdi9Ob/Qm1Y+tOkLQdT2ZfBpRZ2ukzK+woXVOoGSCuvwKhfXBUEi8 VyuTeBzTJMF+FqpdDNUi0ThcFzpXAIzZSgu35otADCo7tRUH5tPBo/XTkB14YwtQTSttmEicJZBNg vzjbXTNrlt03rsXSfAXXeyCXYzuTCVcL13IJThmknzY00gGt8BRAKSdQDOclasjrWP9piSJgB6VJ3 ZW71dYThq39TA0dm624uPoY21lYtxBtKtQYWG62QgaKuaxtU/lmYRJnGeOUtRGZhAG5mkVsP9kExL X9i1/QRA==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1oUCd5-007Ih5-JV; Fri, 02 Sep 2022 19:47:03 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org Subject: [PATCH v2 47/57] memcg: Convert mem_cgroup_swap_full() to take a folio Date: Fri, 2 Sep 2022 20:46:43 +0100 Message-Id: <20220902194653.1739778-48-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220902194653.1739778-1-willy@infradead.org> References: <20220902194653.1739778-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1662148024; a=rsa-sha256; cv=none; b=Pt13intQp6O44Vaqf3F811PqdPVBLwoh8Z/EC+c+kgKX3+/u4u7QgYFxNmFewky9kcrDDL Tza0/4V92hrqX/s5QSRH7NSatSatzZ6AGONOLg0ky2GTg8hqODMO4P35SWHcAC66xMSy6S DCi8PcDGqa4UajB8Plv0rp+rdtUcY8c= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=Zb+2mXeM; dmarc=none; spf=none (imf20.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1662148024; 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=7aj2gwVlj5VcsZXUySMc7S7T76WQ2vhifR2A0XWxgfs=; b=XqpuMS/MhcOKAmJz6O61nSUp8AZ80S340l5ltraM9fa1FfKcjxW8LOf/mP3AqoRi6gm4Ei vShrAsSUHgt+OsHs9PCuQqaof4sDW+umCD2nE9jFJuGZNDpY1Md+qowfhGaI+YswB9Koyr UnyC0N7NVCKmLdVYJ3VBnAv9W6rw72o= X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: E6C5D1C005F Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=Zb+2mXeM; dmarc=none; spf=none (imf20.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org X-Rspam-User: X-Stat-Signature: 8scmeuwuuzegxedxbrard5jgk1jj6yqg X-HE-Tag: 1662148023-862588 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: All callers now have a folio, so convert the function to take a folio. Saves a couple of calls to compound_head(). Signed-off-by: Matthew Wilcox (Oracle) --- include/linux/swap.h | 4 ++-- mm/memcontrol.c | 6 +++--- mm/memory.c | 2 +- mm/swapfile.c | 2 +- mm/vmscan.c | 3 +-- 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/include/linux/swap.h b/include/linux/swap.h index f16c9af6bf32..8178ec471fe3 100644 --- a/include/linux/swap.h +++ b/include/linux/swap.h @@ -688,7 +688,7 @@ static inline void mem_cgroup_uncharge_swap(swp_entry_t entry, unsigned int nr_p } extern long mem_cgroup_get_nr_swap_pages(struct mem_cgroup *memcg); -extern bool mem_cgroup_swap_full(struct page *page); +extern bool mem_cgroup_swap_full(struct folio *folio); #else static inline void mem_cgroup_swapout(struct folio *folio, swp_entry_t entry) { @@ -710,7 +710,7 @@ static inline long mem_cgroup_get_nr_swap_pages(struct mem_cgroup *memcg) return get_nr_swap_pages(); } -static inline bool mem_cgroup_swap_full(struct page *page) +static inline bool mem_cgroup_swap_full(struct folio *folio) { return vm_swap_full(); } diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 3b0698faf1ee..557579f43e7b 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -7375,18 +7375,18 @@ long mem_cgroup_get_nr_swap_pages(struct mem_cgroup *memcg) return nr_swap_pages; } -bool mem_cgroup_swap_full(struct page *page) +bool mem_cgroup_swap_full(struct folio *folio) { struct mem_cgroup *memcg; - VM_BUG_ON_PAGE(!PageLocked(page), page); + VM_BUG_ON_FOLIO(!folio_test_locked(folio), folio); if (vm_swap_full()) return true; if (cgroup_memory_noswap || !cgroup_subsys_on_dfl(memory_cgrp_subsys)) return false; - memcg = page_memcg(page); + memcg = folio_memcg(folio); if (!memcg) return false; diff --git a/mm/memory.c b/mm/memory.c index f39dc23ddb69..3c7b2f1dbf6e 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -3641,7 +3641,7 @@ static inline bool should_try_to_free_swap(struct folio *folio, { if (!folio_test_swapcache(folio)) return false; - if (mem_cgroup_swap_full(&folio->page) || (vma->vm_flags & VM_LOCKED) || + if (mem_cgroup_swap_full(folio) || (vma->vm_flags & VM_LOCKED) || folio_test_mlocked(folio)) return true; /* diff --git a/mm/swapfile.c b/mm/swapfile.c index 9ee42a12cffc..74929a8cbf88 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -144,7 +144,7 @@ static int __try_to_reclaim_swap(struct swap_info_struct *si, if (folio_trylock(folio)) { if ((flags & TTRS_ANYWAY) || ((flags & TTRS_UNMAPPED) && !folio_mapped(folio)) || - ((flags & TTRS_FULL) && mem_cgroup_swap_full(&folio->page))) + ((flags & TTRS_FULL) && mem_cgroup_swap_full(folio))) ret = folio_free_swap(folio); folio_unlock(folio); } diff --git a/mm/vmscan.c b/mm/vmscan.c index ac7f6f77e28a..85af57bbfd81 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -2002,8 +2002,7 @@ static unsigned int shrink_folio_list(struct list_head *folio_list, activate_locked: /* Not a candidate for swapping, so reclaim swap space. */ if (folio_test_swapcache(folio) && - (mem_cgroup_swap_full(&folio->page) || - folio_test_mlocked(folio))) + (mem_cgroup_swap_full(folio) || folio_test_mlocked(folio))) folio_free_swap(folio); VM_BUG_ON_FOLIO(folio_test_active(folio), folio); if (!folio_test_mlocked(folio)) { -- 2.35.1