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 515E0C25B74 for ; Tue, 21 May 2024 13:30:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A9E9D6B009B; Tue, 21 May 2024 09:30:55 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A50136B009D; Tue, 21 May 2024 09:30:55 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8EEF36B009E; Tue, 21 May 2024 09:30:55 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 70A626B009B for ; Tue, 21 May 2024 09:30:55 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 2767E408CA for ; Tue, 21 May 2024 13:30:55 +0000 (UTC) X-FDA: 82142488470.25.03375D4 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by imf07.hostedemail.com (Postfix) with ESMTP id F360140002 for ; Tue, 21 May 2024 13:30:51 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=suse.com header.s=susede1 header.b=CGy+yAOc; dkim=pass header.d=suse.com header.s=susede1 header.b=CGy+yAOc; dmarc=pass (policy=quarantine) header.from=suse.com; spf=pass (imf07.hostedemail.com: domain of mhocko@suse.com designates 195.135.223.131 as permitted sender) smtp.mailfrom=mhocko@suse.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1716298252; 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-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=CZtj7ithXukrZLqGcjLLDPzON2J3WyD3PPi0aZrb5T4=; b=CbO1aX+9AS44xw6Nxb865LAPrieHsZDDjs9zLjzPqG5M4XqmfP2zZ79v/0OifNoDc7XGoN pr6+UJtRWU5a/eQcFD16C1+x4L4CWdbgopWrHUKlqWlJzlqcBPAEvZT3P/C6Cr9CIX90Sj tVw64wRHv9kmJ2INiSNJusJAwXaChbc= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=suse.com header.s=susede1 header.b=CGy+yAOc; dkim=pass header.d=suse.com header.s=susede1 header.b=CGy+yAOc; dmarc=pass (policy=quarantine) header.from=suse.com; spf=pass (imf07.hostedemail.com: domain of mhocko@suse.com designates 195.135.223.131 as permitted sender) smtp.mailfrom=mhocko@suse.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1716298252; a=rsa-sha256; cv=none; b=vhB1CKuEm5HFaAeie8N4jm6HE0EAxNvYsbcL7PNpML9Jwe6y/1wfI1+BtTPbYM+/FqLjyZ roryKX6YnXf3h6WAtIdtjl+cJVCOK1hsMbw7mkCPg+DvJRRS8aFx4FiCybWWI41QQxjx/n hSxQFM3+bYnt1D980JTCrmT1uukwCIs= Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 1C7235C1A0; Tue, 21 May 2024 13:30:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1716298250; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=CZtj7ithXukrZLqGcjLLDPzON2J3WyD3PPi0aZrb5T4=; b=CGy+yAOcEuCLZp1trz2PoHSliE+pniM6LMjtq6Y6q/THSw6ajYcHNhiZMfnSfIigCMg7FH CNxLkBVC6WQ8CZ3+d4nsPhuQi6m9YOhEsaACBcleU7Tuu1zDPQeDbNBns/fZ7+S3IsvBAc onhshcQybX1z+v3VgsIt9xkkF12lBX8= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1716298250; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=CZtj7ithXukrZLqGcjLLDPzON2J3WyD3PPi0aZrb5T4=; b=CGy+yAOcEuCLZp1trz2PoHSliE+pniM6LMjtq6Y6q/THSw6ajYcHNhiZMfnSfIigCMg7FH CNxLkBVC6WQ8CZ3+d4nsPhuQi6m9YOhEsaACBcleU7Tuu1zDPQeDbNBns/fZ7+S3IsvBAc onhshcQybX1z+v3VgsIt9xkkF12lBX8= Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 02D8B13685; Tue, 21 May 2024 13:30:49 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id VMCROQmiTGYvVwAAD6G6ig (envelope-from ); Tue, 21 May 2024 13:30:49 +0000 Date: Tue, 21 May 2024 15:30:34 +0200 From: Michal Hocko To: Kefeng Wang Cc: Andrew Morton , Johannes Weiner , Roman Gushchin , Shakeel Butt , Muchun Song , linux-mm@kvack.org, cgroups@vger.kernel.org Subject: Re: [PATCH] mm: memcontrol: remove page_memcg() Message-ID: References: <20240521131556.142176-1-wangkefeng.wang@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240521131556.142176-1-wangkefeng.wang@huawei.com> X-Rspamd-Queue-Id: F360140002 X-Stat-Signature: buxoxugcep31uh7xubhd1tqkrbsszfc8 X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1716298251-195590 X-HE-Meta: U2FsdGVkX182wXlEuxEZfYbToYUMglv9z+82Ligi83AaHvvfkH3JcaWYqQFIdlaSiWf6BA1mx6tzWd9F4dZyOaKZ7VkK5EQu7G7RuqlDc2BnAAVsyyf1gOmk+p5xLsS3n2lwZbOdfEAm4XNQFa4bW90W73Vd7GlpteWSw54TqtjxZi9i9baeVrZXCcGqC4mnLZB2anQyjs7zNWBD8vt4bmj8/zYbAyKwToR8Ek7OBzGgFVvQwiPQQlYhPAirngTyHrWXy4h0G5ZJbwY3lGWj1w1tBf3ummqQCRTjtD2vKyS0guSls7zlmTtzG/CF8jQbYMb3nj5oYvZAycAzByeSlWoKe0SNomOvfEwdRNqVUGHvbWoClOsMQ262YhU/TQdcjizFtrhk0J+1cD6/eOF6Oy97CYzfP/Ei7IoDWbplt9XtZyJxXgd0w4ImZpndy8V421E1t9vA7fAXu28bKIt657v9e1g1GMG5h4Km6CZb43XJTyhfQNpcu9KBUqi4KTw2DdTKwuCAA1ac4MYc/bIT4FhxY5elNJrkNnDbQm1j8+11OTQLhzeuyHcxEJkrJaAluQpP3wW2gf2r/DedD5xyG52vogdW6FhrrO9d3x2f4PYWGM0o3BJ68KJJbzcm7WbkwHVEm5MsJbEm3SNGob6vdBKTF0xSmo+H++SziJ0haDAVOKNJqIO1HTbI9bBOfYrVjH1XSk0g6QOONb3cdLRpnLUEyRoJMZKXXKDm6ywfHFePVFk/oULaEOpms2nUYQaWcZlEPSPyIAqRZtwza2kcJfhhUDNHJ5pekXWo/DAwLKd+r6BUaLPAtknvA8xjhN0PMnVqUL9Tf6Akf7ZgYKmC/q7+Ai6b8fBhi/hP1AWxHtCkDq5d/iEMAFK//0twtqbju0KYsLrxJKHaKcSfTdC/vLeEfMYbP//eOumeadbfHlmK5mkerDWxPFdGjMAyJv6FQazX5iHaZx7L+/Dmaka scsksmaX p6g2MJmbnikPn7pYD1QJ0026cEABzMQb5J3JUhjp2b1sXOz9iiLZ5XES8a7Vs4e5tKFNxDjIA/9BHLGPvLlA0HEJClf9UwPuL86nLPDpxN6Ez2RNOBW8QI/JgYlet1hPjo8o7Pn5TK+k0T1+48dbRhYLNE/6tw0tjMjSqOfCNtgIKRmyeu2eIQZG8QLl67pIw2+vIzvEYLL51BYx0h+3deNemSTzkzHUjt1wMW/LmZqzeOKWW0WJEK/ltWzfVh9qVHDyb18clIEnJuGQRpBhQsXsL0Q4dJIiNMNQPhpxtf6x8mwIeLSh5mlxJ/47JWwf0P4sJODLfv/3sj4VNDz74PimXy0s9lEeqmaRU 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: List-Subscribe: List-Unsubscribe: On Tue 21-05-24 21:15:56, Kefeng Wang wrote: > The page_memcg() only called by mod_memcg_page_state(), so squash it to > cleanup page_memcg(). > > Signed-off-by: Kefeng Wang Acked-by: Michal Hocko Thanks! > --- > include/linux/memcontrol.h | 14 ++------------ > mm/memcontrol.c | 2 +- > 2 files changed, 3 insertions(+), 13 deletions(-) > > diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h > index 030d34e9d117..8abc70cc7219 100644 > --- a/include/linux/memcontrol.h > +++ b/include/linux/memcontrol.h > @@ -443,11 +443,6 @@ static inline struct mem_cgroup *folio_memcg(struct folio *folio) > return __folio_memcg(folio); > } > > -static inline struct mem_cgroup *page_memcg(struct page *page) > -{ > - return folio_memcg(page_folio(page)); > -} > - > /** > * folio_memcg_rcu - Locklessly get the memory cgroup associated with a folio. > * @folio: Pointer to the folio. > @@ -1014,7 +1009,7 @@ static inline void mod_memcg_page_state(struct page *page, > return; > > rcu_read_lock(); > - memcg = page_memcg(page); > + memcg = folio_memcg(page_folio(page)); > if (memcg) > mod_memcg_state(memcg, idx, val); > rcu_read_unlock(); > @@ -1133,11 +1128,6 @@ static inline struct mem_cgroup *folio_memcg(struct folio *folio) > return NULL; > } > > -static inline struct mem_cgroup *page_memcg(struct page *page) > -{ > - return NULL; > -} > - > static inline struct mem_cgroup *folio_memcg_rcu(struct folio *folio) > { > WARN_ON_ONCE(!rcu_read_lock_held()); > @@ -1636,7 +1626,7 @@ static inline void unlock_page_lruvec_irqrestore(struct lruvec *lruvec, > spin_unlock_irqrestore(&lruvec->lru_lock, flags); > } > > -/* Test requires a stable page->memcg binding, see page_memcg() */ > +/* Test requires a stable page->memcg binding, see folio_memcg() */ > static inline bool folio_matches_lruvec(struct folio *folio, > struct lruvec *lruvec) > { > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index 54070687aad2..72833f6f0944 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -3811,7 +3811,7 @@ void __memcg_slab_free_hook(struct kmem_cache *s, struct slab *slab, > #endif /* CONFIG_MEMCG_KMEM */ > > /* > - * Because page_memcg(head) is not set on tails, set it now. > + * Because folio_memcg(head) is not set on tails, set it now. > */ > void split_page_memcg(struct page *head, int old_order, int new_order) > { > -- > 2.41.0 -- Michal Hocko SUSE Labs