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 X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 17599C433DB for ; Fri, 5 Mar 2021 04:23:26 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id A993C65014 for ; Fri, 5 Mar 2021 04:23:25 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A993C65014 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 439476B0008; Thu, 4 Mar 2021 23:23:25 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 3E8926B000A; Thu, 4 Mar 2021 23:23:25 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2D8246B000D; Thu, 4 Mar 2021 23:23:25 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0212.hostedemail.com [216.40.44.212]) by kanga.kvack.org (Postfix) with ESMTP id 0CA756B0008 for ; Thu, 4 Mar 2021 23:23:25 -0500 (EST) Received: from smtpin02.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id CA9EA3658 for ; Fri, 5 Mar 2021 04:23:24 +0000 (UTC) X-FDA: 77884526328.02.AF4364B Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf02.hostedemail.com (Postfix) with ESMTP id CF5D1407F8F3 for ; Fri, 5 Mar 2021 04:23:20 +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=OeuwNxzVk52kWY8FtpOwc6yIjdYdkVvfN03G7e/qaqE=; b=F8xZYKPdFD5KN2VsEC1HcYRhhR ja3lBgAfbAoA0uq72SIm73VsH2GoLB3JKjH4mIQD4TwyYcoUZUFMR4cetnM/J22qvf/CH8bzj6Vw9 uAxTMANRs47KrtVzL63x7NhKoRYjCaQoYClE2xoL/3/9U9nP50zK8w7v8Kz08d19PwrgDoc5aZ5KV droHRWOOqMvgGxhuA0aU7mIqlkYM21pvUlxPnOV8f1Gjf+8ruDHzSlmr9Dzx8FwjyysJUNThaxjrc +xBaz832GU4n63hF/x3pY1vz4vhrR25O929eafuB7yLOAjTX/cxKCB6zGkuz+RglmxfDv0i+w2qdt yI+KO2XA==; Received: from willy by casper.infradead.org with local (Exim 4.94 #2 (Red Hat Linux)) id 1lI1ya-00A3i5-2g; Fri, 05 Mar 2021 04:22:16 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" , linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH v4 11/25] mm/memcg: Add folio wrappers for various memcontrol functions Date: Fri, 5 Mar 2021 04:18:47 +0000 Message-Id: <20210305041901.2396498-12-willy@infradead.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210305041901.2396498-1-willy@infradead.org> References: <20210305041901.2396498-1-willy@infradead.org> MIME-Version: 1.0 X-Stat-Signature: bt5jfyykd5io1k6yu39ax4ppxa11gbtp X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: CF5D1407F8F3 Received-SPF: none (infradead.org>: No applicable sender policy available) receiver=imf02; identity=mailfrom; envelope-from=""; helo=casper.infradead.org; client-ip=90.155.50.34 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1614918200-840575 Content-Transfer-Encoding: quoted-printable 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: Add new functions folio_memcg(), lock_folio_memcg(), unlock_folio_memcg() and mem_cgroup_folio_lruvec(). These will all be used by other functions later. Signed-off-by: Matthew Wilcox (Oracle) --- include/linux/memcontrol.h | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index e6dc793d587d..564ce61319d4 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -383,6 +383,11 @@ static inline struct mem_cgroup *page_memcg(struct p= age *page) return (struct mem_cgroup *)(memcg_data & ~MEMCG_DATA_FLAGS_MASK); } =20 +static inline struct mem_cgroup *folio_memcg(struct folio *folio) +{ + return page_memcg(&folio->page); +} + /* * page_memcg_rcu - locklessly get the memory cgroup associated with a p= age * @page: a pointer to the page struct @@ -871,6 +876,16 @@ struct mem_cgroup *lock_page_memcg(struct page *page= ); void __unlock_page_memcg(struct mem_cgroup *memcg); void unlock_page_memcg(struct page *page); =20 +static inline struct mem_cgroup *lock_folio_memcg(struct folio *folio) +{ + return lock_page_memcg(&folio->page); +} + +static inline void unlock_folio_memcg(struct folio *folio) +{ + unlock_page_memcg(&folio->page); +} + /* * idx can be of type enum memcg_stat_item or node_stat_item. * Keep in sync with memcg_exact_page_state(). @@ -1291,6 +1306,11 @@ mem_cgroup_print_oom_meminfo(struct mem_cgroup *me= mcg) { } =20 +static inline struct mem_cgroup *lock_folio_memcg(struct folio *folio) +{ + return NULL; +} + static inline struct mem_cgroup *lock_page_memcg(struct page *page) { return NULL; @@ -1300,6 +1320,10 @@ static inline void __unlock_page_memcg(struct mem_= cgroup *memcg) { } =20 +static inline void unlock_folio_memcg(struct folio *folio) +{ +} + static inline void unlock_page_memcg(struct page *page) { } @@ -1431,6 +1455,12 @@ static inline void lruvec_memcg_debug(struct lruve= c *lruvec, struct page *page) } #endif /* CONFIG_MEMCG */ =20 +static inline struct lruvec *mem_cgroup_folio_lruvec(struct folio *folio= , + struct pglist_data *pgdat) +{ + return mem_cgroup_page_lruvec(&folio->page, pgdat); +} + static inline void __inc_lruvec_kmem_state(void *p, enum node_stat_item = idx) { __mod_lruvec_kmem_state(p, idx, 1); --=20 2.30.0