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 9F19EC25B0C for ; Mon, 8 Aug 2022 19:35:19 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 30370940010; Mon, 8 Aug 2022 15:35:19 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 236B0940007; Mon, 8 Aug 2022 15:35:19 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0B0F294000F; Mon, 8 Aug 2022 15:35:19 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id E9195940007 for ; Mon, 8 Aug 2022 15:35:18 -0400 (EDT) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id BE90E1C6453 for ; Mon, 8 Aug 2022 19:35:18 +0000 (UTC) X-FDA: 79777429116.17.1EA17A9 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf09.hostedemail.com (Postfix) with ESMTP id 62374140025 for ; Mon, 8 Aug 2022 19:35:18 +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=UpApTrl+fGVezBdm8XccGS5Ph+9HSF3fVBpF2a3IHhc=; b=m/MCIClVd9YKLBTs0iYMWITuQp nF1/mvjxtrVRj7MXhpwuSD9niVqsTrDrHcuqjn1FDCv0rwOhJaRytiLRnepbjUKI+LdUSeTgTkSbQ gJazzZeoX39E04DrWsg5KES5uFPrMoAsftfudHVXwRctbHWI492QR99p9K90E3JXCU9urgC0tQtin G9VMiZGKwcLP3qJc9seGO7UD2Nq1yq2aGZfDkwwiiTLKPhYYamsSXqUMsEzMmHzhpFS8E809ggW5e 564bvZQGQ22SNJRUIMUQqSjfBwigvA8tvM22GlFEHmSE/Tl5ciHhznv9JBesPsTBIc1E7q+LoMbDN lEaMRy+g==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1oL8Ww-00EAvZ-6V; Mon, 08 Aug 2022 19:35:14 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" , hughd@google.com Subject: [PATCH 19/59] memcg: Convert mem_cgroup_swapin_charge_page() to mem_cgroup_swapin_charge_folio() Date: Mon, 8 Aug 2022 20:33:47 +0100 Message-Id: <20220808193430.3378317-20-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220808193430.3378317-1-willy@infradead.org> References: <20220808193430.3378317-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1659987318; 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=UpApTrl+fGVezBdm8XccGS5Ph+9HSF3fVBpF2a3IHhc=; b=b8BbVl5DRmXwcS2rrT5Svanz0lJTwJ3VFxVd9yMznNjni50cnQ7xz96f2QBlSdqTgXRvoh KPVb+4K4BY4R2r64prVdrSLdhmG8xlBfw+Q7wr4xmYH+CAjCqZ9/YJDRdoCLe1x+LdVdH9 hWpgUBq4xAPBr1b2sf2pdux7ogdM/Fo= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b="m/MCIClV"; dmarc=none; spf=none (imf09.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1659987318; a=rsa-sha256; cv=none; b=CYbR/aPKIagbDkxMUnJvfWBzgq7gV4Gt1Q7Xr9kisSVutr2M6OcR8YuFQh08Bvri2fj8t+ W0ZHtMouipx5Lg3NKAWOwEaD5U1ZsGb4472Lqud3C94UbX1QRtG419JwE8Z+nCTnCPkQh/ smqxveA9qyIwV9uDQrkd3OizxRHy+/o= X-Rspamd-Queue-Id: 62374140025 Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b="m/MCIClV"; dmarc=none; spf=none (imf09.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-Rspamd-Server: rspam07 X-Stat-Signature: 4q1nde3irxk7d3jbb6t5ykrgscyfjptu X-HE-Tag: 1659987318-931329 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 pass it in here and remove an unnecessary call to page_folio(). Signed-off-by: Matthew Wilcox (Oracle) --- include/linux/memcontrol.h | 4 ++-- mm/memcontrol.c | 13 ++++++------- mm/memory.c | 2 +- mm/swap_state.c | 2 +- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 4d31ce55b1c0..5d7e834f37ba 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -689,7 +689,7 @@ static inline int mem_cgroup_charge(struct folio *folio, struct mm_struct *mm, return __mem_cgroup_charge(folio, mm, gfp); } -int mem_cgroup_swapin_charge_page(struct page *page, struct mm_struct *mm, +int mem_cgroup_swapin_charge_folio(struct folio *folio, struct mm_struct *mm, gfp_t gfp, swp_entry_t entry); void mem_cgroup_swapin_uncharge_swap(swp_entry_t entry); @@ -1227,7 +1227,7 @@ static inline int mem_cgroup_charge(struct folio *folio, return 0; } -static inline int mem_cgroup_swapin_charge_page(struct page *page, +static inline int mem_cgroup_swapin_charge_folio(struct folio *folio, struct mm_struct *mm, gfp_t gfp, swp_entry_t entry) { return 0; diff --git a/mm/memcontrol.c b/mm/memcontrol.c index b69979c9ced5..f65833efe90d 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -6813,21 +6813,20 @@ int __mem_cgroup_charge(struct folio *folio, struct mm_struct *mm, gfp_t gfp) } /** - * mem_cgroup_swapin_charge_page - charge a newly allocated page for swapin - * @page: page to charge + * mem_cgroup_swapin_charge_folio - Charge a newly allocated folio for swapin. + * @folio: folio to charge. * @mm: mm context of the victim * @gfp: reclaim mode - * @entry: swap entry for which the page is allocated + * @entry: swap entry for which the folio is allocated * - * This function charges a page allocated for swapin. Please call this before - * adding the page to the swapcache. + * This function charges a folio allocated for swapin. Please call this before + * adding the folio to the swapcache. * * Returns 0 on success. Otherwise, an error code is returned. */ -int mem_cgroup_swapin_charge_page(struct page *page, struct mm_struct *mm, +int mem_cgroup_swapin_charge_folio(struct folio *folio, struct mm_struct *mm, gfp_t gfp, swp_entry_t entry) { - struct folio *folio = page_folio(page); struct mem_cgroup *memcg; unsigned short id; int ret; diff --git a/mm/memory.c b/mm/memory.c index 471102f0cbf2..23b164bf3c70 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -3777,7 +3777,7 @@ vm_fault_t do_swap_page(struct vm_fault *vmf) __folio_set_locked(folio); __folio_set_swapbacked(folio); - if (mem_cgroup_swapin_charge_page(page, + if (mem_cgroup_swapin_charge_folio(folio, vma->vm_mm, GFP_KERNEL, entry)) { ret = VM_FAULT_OOM; diff --git a/mm/swap_state.c b/mm/swap_state.c index ea354efd3735..a7e0438902dd 100644 --- a/mm/swap_state.c +++ b/mm/swap_state.c @@ -480,7 +480,7 @@ struct page *__read_swap_cache_async(swp_entry_t entry, gfp_t gfp_mask, __folio_set_locked(folio); __folio_set_swapbacked(folio); - if (mem_cgroup_swapin_charge_page(&folio->page, NULL, gfp_mask, entry)) + if (mem_cgroup_swapin_charge_folio(folio, NULL, gfp_mask, entry)) goto fail_unlock; /* May fail (-ENOMEM) if XArray node allocation failed. */ -- 2.35.1