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.5 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 5E976C433E0 for ; Thu, 28 Jan 2021 07:04:42 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id DB73364DD6 for ; Thu, 28 Jan 2021 07:04:39 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DB73364DD6 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 031696B007D; Thu, 28 Jan 2021 02:04:31 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id EFBBF6B007E; Thu, 28 Jan 2021 02:04:30 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D28136B0080; Thu, 28 Jan 2021 02:04:30 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0225.hostedemail.com [216.40.44.225]) by kanga.kvack.org (Postfix) with ESMTP id B4F9A6B007D for ; Thu, 28 Jan 2021 02:04:30 -0500 (EST) Received: from smtpin25.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 839D88249980 for ; Thu, 28 Jan 2021 07:04:30 +0000 (UTC) X-FDA: 77754295500.25.cord36_01142d32759d Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin25.hostedemail.com (Postfix) with ESMTP id 5C7D51804E3A9 for ; Thu, 28 Jan 2021 07:04:30 +0000 (UTC) X-HE-Tag: cord36_01142d32759d X-Filterd-Recvd-Size: 6096 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf33.hostedemail.com (Postfix) with ESMTP for ; Thu, 28 Jan 2021 07:04:29 +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=S0uQo/Yk1v2sMp6b+mV5hXUQDMHIn5aK5Y5Umb7Odeo=; b=Ikx90UlcrKeK++Jncqw0KHmwCA OBhYSdnMutx+RpnvqwA78gNLYZpH7+monWhW1o2415pJGiXdtH7n4FXABCPd+GJEY7QYNhv4+54RZ YJQGlu04DFHIl3faqUeHdl7uEjMTM6Dr0hL48Ps6kA6O/a61qMdelr/EdvL7V0mPXmFNcMYS1dUIJ o0FN2khrWY6L34ySrQ+rdyILoWrRD6Y8XBCOzTP6rpk9qoLITezbo+0R5deeE/fFgUwSXKHg9hwX4 iY1XIGrdNhJTllaYbfqa5hAFtET/kyeKmDkNT+G+jOe2fezzghFUylnGg7oT4A1ezcHrjhjdzNX3p SNuMxFmg==; Received: from willy by casper.infradead.org with local (Exim 4.94 #2 (Red Hat Linux)) id 1l51Lr-00847d-Tp; Thu, 28 Jan 2021 07:04:24 +0000 From: "Matthew Wilcox (Oracle)" To: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" , linux-kernel@vger.kernel.org Subject: [PATCH v3 11/25] mm/memcg: Add folio_memcg, lock_folio_memcg and unlock_folio_memcg Date: Thu, 28 Jan 2021 07:03:50 +0000 Message-Id: <20210128070404.1922318-12-willy@infradead.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210128070404.1922318-1-willy@infradead.org> References: <20210128070404.1922318-1-willy@infradead.org> MIME-Version: 1.0 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: The memcontrol code already assumes that page_memcg() will be called with a non-tail page, so make that more natural by wrapping it with a folio API. Signed-off-by: Matthew Wilcox (Oracle) --- include/linux/memcontrol.h | 16 ++++++++++++++++ mm/memcontrol.c | 36 ++++++++++++++++++++++++------------ 2 files changed, 40 insertions(+), 12 deletions(-) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 7a38a1517a05..89aaa22506e6 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 @@ -869,8 +874,10 @@ void mem_cgroup_print_oom_group(struct mem_cgroup *m= emcg); extern bool cgroup_memory_noswap; #endif =20 +struct mem_cgroup *lock_folio_memcg(struct folio *folio); struct mem_cgroup *lock_page_memcg(struct page *page); void __unlock_page_memcg(struct mem_cgroup *memcg); +void unlock_folio_memcg(struct folio *folio); void unlock_page_memcg(struct page *page); =20 /* @@ -1298,6 +1305,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; @@ -1307,6 +1319,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) { } diff --git a/mm/memcontrol.c b/mm/memcontrol.c index ed5cc78a8dbf..c3c0c8124b09 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -2139,19 +2139,18 @@ void mem_cgroup_print_oom_group(struct mem_cgroup= *memcg) } =20 /** - * lock_page_memcg - lock a page and memcg binding - * @page: the page + * lock_folio_memcg - lock a folio and memcg binding + * @folio: the folio * - * This function protects unlocked LRU pages from being moved to + * This function protects unlocked LRU folios from being moved to * another cgroup. * * It ensures lifetime of the returned memcg. Caller is responsible - * for the lifetime of the page; __unlock_page_memcg() is available - * when @page might get freed inside the locked section. + * for the lifetime of the folio; __unlock_folio_memcg() is available + * when @folio might get freed inside the locked section. */ -struct mem_cgroup *lock_page_memcg(struct page *page) +struct mem_cgroup *lock_folio_memcg(struct folio *folio) { - struct page *head =3D compound_head(page); /* rmap on tail pages */ struct mem_cgroup *memcg; unsigned long flags; =20 @@ -2171,7 +2170,7 @@ struct mem_cgroup *lock_page_memcg(struct page *pag= e) if (mem_cgroup_disabled()) return NULL; again: - memcg =3D page_memcg(head); + memcg =3D folio_memcg(folio); if (unlikely(!memcg)) return NULL; =20 @@ -2185,7 +2184,7 @@ struct mem_cgroup *lock_page_memcg(struct page *pag= e) return memcg; =20 spin_lock_irqsave(&memcg->move_lock, flags); - if (memcg !=3D page_memcg(head)) { + if (memcg !=3D folio_memcg(folio)) { spin_unlock_irqrestore(&memcg->move_lock, flags); goto again; } @@ -2200,6 +2199,12 @@ struct mem_cgroup *lock_page_memcg(struct page *pa= ge) =20 return memcg; } +EXPORT_SYMBOL(lock_folio_memcg); + +struct mem_cgroup *lock_page_memcg(struct page *page) +{ + return lock_folio_memcg(page_folio(page)); +} EXPORT_SYMBOL(lock_page_memcg); =20 /** @@ -2222,15 +2227,22 @@ void __unlock_page_memcg(struct mem_cgroup *memcg= ) rcu_read_unlock(); } =20 +/** + * unlock_folio_memcg - unlock a folio and memcg binding + * @folio: the folio + */ +void unlock_folio_memcg(struct folio *folio) +{ + __unlock_page_memcg(folio_memcg(folio)); +} + /** * unlock_page_memcg - unlock a page and memcg binding * @page: the page */ void unlock_page_memcg(struct page *page) { - struct page *head =3D compound_head(page); - - __unlock_page_memcg(page_memcg(head)); + unlock_folio_memcg(page_folio(page)); } EXPORT_SYMBOL(unlock_page_memcg); =20 --=20 2.29.2