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 6D30FC2BBCA for ; Tue, 25 Jun 2024 07:09:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F41408D0003; Tue, 25 Jun 2024 03:09:50 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id EF1FC8D0002; Tue, 25 Jun 2024 03:09:50 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D924C8D0003; Tue, 25 Jun 2024 03:09:50 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id BB2C18D0002 for ; Tue, 25 Jun 2024 03:09:50 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 4CD621A1830 for ; Tue, 25 Jun 2024 07:09:50 +0000 (UTC) X-FDA: 82268536140.08.C52FA0F Received: from mail-ed1-f44.google.com (mail-ed1-f44.google.com [209.85.208.44]) by imf09.hostedemail.com (Postfix) with ESMTP id 571AF140023 for ; Tue, 25 Jun 2024 07:09:48 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=suse.com header.s=google header.b="TVtY/1AC"; spf=pass (imf09.hostedemail.com: domain of mhocko@suse.com designates 209.85.208.44 as permitted sender) smtp.mailfrom=mhocko@suse.com; dmarc=pass (policy=quarantine) header.from=suse.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1719299377; 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=9FlVF62jftBeeziv2TfJtX0hEZ+vRuIG/5jJSL5Ty+Q=; b=bq+90MeJ5aKwOgsmxQoq+Nf3wQfz5NNAsHFyw6rxlyf4Xx2nzToB1/tXK/3FaMEl8xz+x9 LxJI/1QeNdTnU6hAhfcP7vrTpEhnRDQWSgWnC42E3z+OMEvmkp0nPi2vqCdLE1LMd2CvLK DCJatmaVS7ZJMbN9MYPkYLv82hkaO9s= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=suse.com header.s=google header.b="TVtY/1AC"; spf=pass (imf09.hostedemail.com: domain of mhocko@suse.com designates 209.85.208.44 as permitted sender) smtp.mailfrom=mhocko@suse.com; dmarc=pass (policy=quarantine) header.from=suse.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1719299377; a=rsa-sha256; cv=none; b=BRXr1smBxGuj0XwLFtoAsDrM808IyT4W5D5sJkre2MF3nraP9C1aQO0WHtOWtzHMDmAfmW iQeBAnvIRRqTAszIllsb9rOW2RPv7mHsHRsdduJ6eTysgWZDAhXa8F70Rw81EjCLnLceK1 kFGDkpWtZSE09IZLvjUwrDsuUKZD9BA= Received: by mail-ed1-f44.google.com with SMTP id 4fb4d7f45d1cf-57d0699fd02so2724022a12.0 for ; Tue, 25 Jun 2024 00:09:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1719299387; x=1719904187; darn=kvack.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=9FlVF62jftBeeziv2TfJtX0hEZ+vRuIG/5jJSL5Ty+Q=; b=TVtY/1ACZJ8jOop/bvgh7+ssMDBIvJSMw1hqR5HB66TJsTtXUxqMC6rq5kXkE6S4as IxUTlQ8WD6tKgOUrXrgZg9V14lwTuDdq+ZZmWky59o7yww3EdClRMkyab1tKYpxxN+sb +UjhvYga6vi6sQ1ZEbQguDsMzL5xR2Lrp7TG7XACikHoKmJCiMbVTnRex3r5v/kjX9ZG tkYG6rxZGvvt3pQfGM3D2uGHfuxQSxpMLlHk0nHiLaCiuu+divTkGlKIZa90g5fhPwnW PgV3EdGIPka7A3r20VUrO4l14q1WKz8E15xuXJeeNQKf+YzMH/5JtNF42wZaCTn62Mbg DC9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719299387; x=1719904187; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=9FlVF62jftBeeziv2TfJtX0hEZ+vRuIG/5jJSL5Ty+Q=; b=freExsnxxXFxxl5P0QWTCK8OOnfRvgRyWJVmS3tZavKt4gqQlUGH8kUm7Zr/UH3J38 mMif86wQEhp9BvgIea5Nl321oGMzDyU1K8NaX0sIBGRANEUYnKl694xbVwxBUXcbikQk 04JMq7vvAH6fyO4wRgeL+eoBe+r4Dk7mojVaWf59hUneuA6VesQVZgs5jq6Yy0fsd+Ob qZwJ/fviL3Fpgj5Vax9jwAkFcGJrpx/lT6SNjCrV5wX0dhOJzxsf8MW0B0Lw8uHpLCDK zi08kl1xX1rIsNtDFpQAb61gXyMzvQ3UwzFXfnlymDZVK5MtrSilJHKD4lO0jy6VRc9B 6ieA== X-Forwarded-Encrypted: i=1; AJvYcCXX4M93tWNZea0RtuGILSuEmcAfFIHQ127Q9gU9BNnPHr55/oSpZGEBtkIMrF3Yhxdalo5VW6oKDkm8CHsR1anvuFc= X-Gm-Message-State: AOJu0YzLIJNe0q+FyhSCdPOvI3WSrN9V809xOSJv8CMVwIUqHe08XMeo Av4U80oV5eSWAV717G0mJswsBYc+U1SAFs76cEdWKEQ9GZnlldR3P60JRrg+9e0= X-Google-Smtp-Source: AGHT+IEIkM0//edoDpFK3pOGjO68dBBhJP5wZHsA3ogZl2/GgQyjf5B/SU5xaIgIMm7M0tp3kPQyUQ== X-Received: by 2002:a50:d5d3:0:b0:57c:7c44:74df with SMTP id 4fb4d7f45d1cf-57d4bdcabb7mr5520022a12.29.1719299386820; Tue, 25 Jun 2024 00:09:46 -0700 (PDT) Received: from localhost (109-81-95-13.rct.o2.cz. [109.81.95.13]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5827db501d9sm45240a12.7.2024.06.25.00.09.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Jun 2024 00:09:46 -0700 (PDT) Date: Tue, 25 Jun 2024 09:09:45 +0200 From: Michal Hocko To: Roman Gushchin Cc: Andrew Morton , Johannes Weiner , Shakeel Butt , Muchun Song , linux-kernel@vger.kernel.org, cgroups@vger.kernel.org, linux-mm@kvack.org Subject: Re: [PATCH v2 12/14] mm: memcg: group cgroup v1 memcg related declarations Message-ID: References: <20240625005906.106920-1-roman.gushchin@linux.dev> <20240625005906.106920-13-roman.gushchin@linux.dev> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240625005906.106920-13-roman.gushchin@linux.dev> X-Stat-Signature: icwdjryygqs33g7suheqw8ohqtcmx94o X-Rspam-User: X-Rspamd-Queue-Id: 571AF140023 X-Rspamd-Server: rspam02 X-HE-Tag: 1719299388-933824 X-HE-Meta: U2FsdGVkX19qUWDgzj1Hm11MtZXQSzETi9on1XxmyxlrmHAAeMf+4eTIWaXWo5KIDTFfX3wR3clBxmhIeNgan3HwgoQAB4ISUiNfeTY7ShmddIzR4+dw4YGMry7CKko9t+GubpAEQJfUAvHKLKuyMV8MwNkzFqNxJAG2munQ/jz7y4WpwfCENycq0Od6pkAukl8H/UdpPnOoFSFAwf8+zUjlSbOD3qoQhYnt48JDP8MCeuq5ScwVIMqzYNUxWW8G+W3FumIAiMUhfFRX1vuGeaXdo9BB6/1zUYJm/2FL386JNjHEgXbDrCxeXUGfSfqsMVEqAgcf40E1qx38KAMsiRhurzb3WL7YkzBAgTaRVBcs6DBs3la/+s9qMeJ06Ei82IJavySKIFCFrYGcvwQW7bXPw2X16U69CcmJW6DGdhug5tPK5Wtrd3PheEdF5dOW5DAJ2QPCVnDR5R9oRyNO5mPHwD2/I8SU+8af02wa4RHHuoqogVLGCbAO0qlNtMUJ04YZGAUdDiYSne4mfU66awDCWa1LVKgAXnQiU+ai/1w71+fDkz5mwjiFBWqZbYgm1ClSPXJjl8RxHyUoiKn34cf/tS1PQErFA2/dSfASZgOfwIPyV5/nhU8e8rkOS87uIanvzDHY5qHUAmn66Oy1A32dhOq+nfUyLQFcq5XdEjl02UZ5EoVFeRSKT9FwSe7u0EcOwO9d3sjVCZy3UNV4hQPCmt3C21cXBNT0bxwB72c3umjECRhLUPUsKsov9qrYFNcVcFjvVsetOATVEt2/alRiVqTK9xUr+m67JyD1kvykhVBPWQF3QlyM4y0427l+Umvlos/q1xxfMim+siZbQM+bdu+sto9ZM+tqty8mXVpNokmf6a7dZ5WqUjjrBl3KufAx9Rmr1kZqkLfUcDt5XRd5A1wivDxku7dTMDu2y7cjqok7jOynugDgEkF7Gb+ggy40jn8ZuHih9Wd4g/a s7/3r/3c kqJBgmGbf3neeP2YsvAZOcoZl60zKjjfcPgPovquwiNksV7PgZEudGC5fc6s1j61KMUdjaC/Xpgu+oVv9rnad341Djn6oppxxI5T071MZHVMyeiOlNToytoq5HCRPaFwpTpQNFKpo+u6fBeQI9u/UQ1nyRKqHIwjm/eTEvxeP2S3cBs5lsks0wBmPSsuIzstvBToFO3iLz3cmfNT4GgmRCny8DKglNDFgTCOwGehiV6X4COIeqqiZBR7Fx9uWtnmNs8xcbFSWj1YU11mAAL53eZ/doLjClVPv4cdiEXmC7tfkBWydSZlN7lXlOyu1xd0wDuYcDwrtS6iVjvVXRQR8q84dgA== 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 Mon 24-06-24 17:59:04, Roman Gushchin wrote: > Group all cgroup v1-related declarations at the end of memcontrol.h > and mm/memcontrol-v1.h with an intention to put them all together > under a config option later on. It should make things easier to > follow and maintain too. > > Signed-off-by: Roman Gushchin Acked-by: Michal Hocko > --- > include/linux/memcontrol.h | 144 +++++++++++++++++++------------------ > mm/memcontrol-v1.h | 89 ++++++++++++----------- > 2 files changed, 123 insertions(+), 110 deletions(-) > > diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h > index 588179d29849..a70d64ed04f5 100644 > --- a/include/linux/memcontrol.h > +++ b/include/linux/memcontrol.h > @@ -950,39 +950,13 @@ static inline void mem_cgroup_exit_user_fault(void) > current->in_user_fault = 0; > } > > -static inline bool task_in_memcg_oom(struct task_struct *p) > -{ > - return p->memcg_in_oom; > -} > - > -bool mem_cgroup_oom_synchronize(bool wait); > struct mem_cgroup *mem_cgroup_get_oom_group(struct task_struct *victim, > struct mem_cgroup *oom_domain); > void mem_cgroup_print_oom_group(struct mem_cgroup *memcg); > > -void folio_memcg_lock(struct folio *folio); > -void folio_memcg_unlock(struct folio *folio); > - > void __mod_memcg_state(struct mem_cgroup *memcg, enum memcg_stat_item idx, > int val); > > -/* try to stablize folio_memcg() for all the pages in a memcg */ > -static inline bool mem_cgroup_trylock_pages(struct mem_cgroup *memcg) > -{ > - rcu_read_lock(); > - > - if (mem_cgroup_disabled() || !atomic_read(&memcg->moving_account)) > - return true; > - > - rcu_read_unlock(); > - return false; > -} > - > -static inline void mem_cgroup_unlock_pages(void) > -{ > - rcu_read_unlock(); > -} > - > /* idx can be of type enum memcg_stat_item or node_stat_item */ > static inline void mod_memcg_state(struct mem_cgroup *memcg, > enum memcg_stat_item idx, int val) > @@ -1109,10 +1083,6 @@ static inline void memcg_memory_event_mm(struct mm_struct *mm, > > void split_page_memcg(struct page *head, int old_order, int new_order); > > -unsigned long memcg1_soft_limit_reclaim(pg_data_t *pgdat, int order, > - gfp_t gfp_mask, > - unsigned long *total_scanned); > - > #else /* CONFIG_MEMCG */ > > #define MEM_CGROUP_ID_SHIFT 0 > @@ -1423,26 +1393,6 @@ mem_cgroup_print_oom_meminfo(struct mem_cgroup *memcg) > { > } > > -static inline void folio_memcg_lock(struct folio *folio) > -{ > -} > - > -static inline void folio_memcg_unlock(struct folio *folio) > -{ > -} > - > -static inline bool mem_cgroup_trylock_pages(struct mem_cgroup *memcg) > -{ > - /* to match folio_memcg_rcu() */ > - rcu_read_lock(); > - return true; > -} > - > -static inline void mem_cgroup_unlock_pages(void) > -{ > - rcu_read_unlock(); > -} > - > static inline void mem_cgroup_handle_over_high(gfp_t gfp_mask) > { > } > @@ -1455,16 +1405,6 @@ static inline void mem_cgroup_exit_user_fault(void) > { > } > > -static inline bool task_in_memcg_oom(struct task_struct *p) > -{ > - return false; > -} > - > -static inline bool mem_cgroup_oom_synchronize(bool wait) > -{ > - return false; > -} > - > static inline struct mem_cgroup *mem_cgroup_get_oom_group( > struct task_struct *victim, struct mem_cgroup *oom_domain) > { > @@ -1558,14 +1498,6 @@ void count_memcg_event_mm(struct mm_struct *mm, enum vm_event_item idx) > static inline void split_page_memcg(struct page *head, int old_order, int new_order) > { > } > - > -static inline > -unsigned long memcg1_soft_limit_reclaim(pg_data_t *pgdat, int order, > - gfp_t gfp_mask, > - unsigned long *total_scanned) > -{ > - return 0; > -} > #endif /* CONFIG_MEMCG */ > > /* > @@ -1916,4 +1848,80 @@ static inline bool mem_cgroup_zswap_writeback_enabled(struct mem_cgroup *memcg) > } > #endif > > + > +/* Cgroup v1-related declarations */ > + > +#ifdef CONFIG_MEMCG > +unsigned long memcg1_soft_limit_reclaim(pg_data_t *pgdat, int order, > + gfp_t gfp_mask, > + unsigned long *total_scanned); > + > +bool mem_cgroup_oom_synchronize(bool wait); > + > +static inline bool task_in_memcg_oom(struct task_struct *p) > +{ > + return p->memcg_in_oom; > +} > + > +void folio_memcg_lock(struct folio *folio); > +void folio_memcg_unlock(struct folio *folio); > + > +/* try to stablize folio_memcg() for all the pages in a memcg */ > +static inline bool mem_cgroup_trylock_pages(struct mem_cgroup *memcg) > +{ > + rcu_read_lock(); > + > + if (mem_cgroup_disabled() || !atomic_read(&memcg->moving_account)) > + return true; > + > + rcu_read_unlock(); > + return false; > +} > + > +static inline void mem_cgroup_unlock_pages(void) > +{ > + rcu_read_unlock(); > +} > + > +#else /* CONFIG_MEMCG */ > +static inline > +unsigned long memcg1_soft_limit_reclaim(pg_data_t *pgdat, int order, > + gfp_t gfp_mask, > + unsigned long *total_scanned) > +{ > + return 0; > +} > + > +static inline void folio_memcg_lock(struct folio *folio) > +{ > +} > + > +static inline void folio_memcg_unlock(struct folio *folio) > +{ > +} > + > +static inline bool mem_cgroup_trylock_pages(struct mem_cgroup *memcg) > +{ > + /* to match folio_memcg_rcu() */ > + rcu_read_lock(); > + return true; > +} > + > +static inline void mem_cgroup_unlock_pages(void) > +{ > + rcu_read_unlock(); > +} > + > +static inline bool task_in_memcg_oom(struct task_struct *p) > +{ > + return false; > +} > + > +static inline bool mem_cgroup_oom_synchronize(bool wait) > +{ > + return false; > +} > + > +#endif /* CONFIG_MEMCG */ > + > #endif /* _LINUX_MEMCONTROL_H */ > diff --git a/mm/memcontrol-v1.h b/mm/memcontrol-v1.h > index 7d6ac4a4fb36..89d420793048 100644 > --- a/mm/memcontrol-v1.h > +++ b/mm/memcontrol-v1.h > @@ -5,15 +5,9 @@ > > #include > > -void memcg1_remove_from_trees(struct mem_cgroup *memcg); > - > -static inline void memcg1_soft_limit_reset(struct mem_cgroup *memcg) > -{ > - WRITE_ONCE(memcg->soft_limit, PAGE_COUNTER_MAX); > -} > +/* Cgroup v1 and v2 common declarations */ > > void mem_cgroup_charge_statistics(struct mem_cgroup *memcg, int nr_pages); > -void memcg1_check_events(struct mem_cgroup *memcg, int nid); > int try_charge_memcg(struct mem_cgroup *memcg, gfp_t gfp_mask, > unsigned int nr_pages); > > @@ -29,30 +23,6 @@ static inline int try_charge(struct mem_cgroup *memcg, gfp_t gfp_mask, > void mem_cgroup_id_get_many(struct mem_cgroup *memcg, unsigned int n); > void mem_cgroup_id_put_many(struct mem_cgroup *memcg, unsigned int n); > > -bool memcg1_wait_acct_move(struct mem_cgroup *memcg); > -struct cgroup_taskset; > -int memcg1_can_attach(struct cgroup_taskset *tset); > -void memcg1_cancel_attach(struct cgroup_taskset *tset); > -void memcg1_move_task(void); > - > -/* > - * Per memcg event counter is incremented at every pagein/pageout. With THP, > - * it will be incremented by the number of pages. This counter is used > - * to trigger some periodic events. This is straightforward and better > - * than using jiffies etc. to handle periodic memcg event. > - */ > -enum mem_cgroup_events_target { > - MEM_CGROUP_TARGET_THRESH, > - MEM_CGROUP_TARGET_SOFTLIMIT, > - MEM_CGROUP_NTARGETS, > -}; > - > -/* Whether legacy memory+swap accounting is active */ > -static bool do_memsw_account(void) > -{ > - return !cgroup_subsys_on_dfl(memory_cgrp_subsys); > -} > - > /* > * Iteration constructs for visiting all cgroups (under a tree). If > * loops are exited prematurely (break), mem_cgroup_iter_break() must > @@ -68,24 +38,28 @@ static bool do_memsw_account(void) > iter != NULL; \ > iter = mem_cgroup_iter(NULL, iter, NULL)) > > -void memcg1_css_offline(struct mem_cgroup *memcg); > +/* Whether legacy memory+swap accounting is active */ > +static bool do_memsw_account(void) > +{ > + return !cgroup_subsys_on_dfl(memory_cgrp_subsys); > +} > > -/* for encoding cft->private value on file */ > -enum res_type { > - _MEM, > - _MEMSWAP, > - _KMEM, > - _TCP, > +/* > + * Per memcg event counter is incremented at every pagein/pageout. With THP, > + * it will be incremented by the number of pages. This counter is used > + * to trigger some periodic events. This is straightforward and better > + * than using jiffies etc. to handle periodic memcg event. > + */ > +enum mem_cgroup_events_target { > + MEM_CGROUP_TARGET_THRESH, > + MEM_CGROUP_TARGET_SOFTLIMIT, > + MEM_CGROUP_NTARGETS, > }; > > bool mem_cgroup_event_ratelimit(struct mem_cgroup *memcg, > enum mem_cgroup_events_target target); > unsigned long mem_cgroup_usage(struct mem_cgroup *memcg, bool swap); > > -bool memcg1_oom_prepare(struct mem_cgroup *memcg, bool *locked); > -void memcg1_oom_finish(struct mem_cgroup *memcg, bool locked); > -void memcg1_oom_recover(struct mem_cgroup *memcg); > - > void drain_all_stock(struct mem_cgroup *root_memcg); > unsigned long mem_cgroup_nr_lru_pages(struct mem_cgroup *memcg, > unsigned int lru_mask, bool tree); > @@ -100,6 +74,37 @@ unsigned long memcg_page_state_output(struct mem_cgroup *memcg, int item); > unsigned long memcg_page_state_local_output(struct mem_cgroup *memcg, int item); > int memory_stat_show(struct seq_file *m, void *v); > > +/* Cgroup v1-specific declarations */ > + > +void memcg1_remove_from_trees(struct mem_cgroup *memcg); > + > +static inline void memcg1_soft_limit_reset(struct mem_cgroup *memcg) > +{ > + WRITE_ONCE(memcg->soft_limit, PAGE_COUNTER_MAX); > +} > + > +bool memcg1_wait_acct_move(struct mem_cgroup *memcg); > + > +struct cgroup_taskset; > +int memcg1_can_attach(struct cgroup_taskset *tset); > +void memcg1_cancel_attach(struct cgroup_taskset *tset); > +void memcg1_move_task(void); > +void memcg1_css_offline(struct mem_cgroup *memcg); > + > +/* for encoding cft->private value on file */ > +enum res_type { > + _MEM, > + _MEMSWAP, > + _KMEM, > + _TCP, > +}; > + > +bool memcg1_oom_prepare(struct mem_cgroup *memcg, bool *locked); > +void memcg1_oom_finish(struct mem_cgroup *memcg, bool locked); > +void memcg1_oom_recover(struct mem_cgroup *memcg); > + > +void memcg1_check_events(struct mem_cgroup *memcg, int nid); > + > void memcg1_stat_format(struct mem_cgroup *memcg, struct seq_buf *s); > > extern struct cftype memsw_files[]; > -- > 2.45.2 -- Michal Hocko SUSE Labs