From: "Matthew Wilcox (Oracle)" <willy@infradead.org> To: linux-mm@kvack.org, cgroups@vger.kernel.org Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>, Johannes Weiner <hannes@cmpxchg.org>, Michal Hocko <mhocko@kernel.org>, Vladimir Davydov <vdavydov.dev@gmail.com> Subject: [PATCH v3 03/18] mm/memcg: Use the node id in mem_cgroup_update_tree() Date: Wed, 30 Jun 2021 05:00:19 +0100 [thread overview] Message-ID: <20210630040034.1155892-4-willy@infradead.org> (raw) In-Reply-To: <20210630040034.1155892-1-willy@infradead.org> By using the node id in mem_cgroup_update_tree(), we can delete soft_limit_tree_from_page() and mem_cgroup_page_nodeinfo(). Saves 42 bytes of kernel text on my config. Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org> --- mm/memcontrol.c | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 25cad0fb7d4e..29b28a050707 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -446,28 +446,12 @@ ino_t page_cgroup_ino(struct page *page) return ino; } -static struct mem_cgroup_per_node * -mem_cgroup_page_nodeinfo(struct mem_cgroup *memcg, struct page *page) -{ - int nid = page_to_nid(page); - - return memcg->nodeinfo[nid]; -} - static struct mem_cgroup_tree_per_node * soft_limit_tree_node(int nid) { return soft_limit_tree.rb_tree_per_node[nid]; } -static struct mem_cgroup_tree_per_node * -soft_limit_tree_from_page(struct page *page) -{ - int nid = page_to_nid(page); - - return soft_limit_tree.rb_tree_per_node[nid]; -} - static void __mem_cgroup_insert_exceeded(struct mem_cgroup_per_node *mz, struct mem_cgroup_tree_per_node *mctz, unsigned long new_usage_in_excess) @@ -538,13 +522,13 @@ static unsigned long soft_limit_excess(struct mem_cgroup *memcg) return excess; } -static void mem_cgroup_update_tree(struct mem_cgroup *memcg, struct page *page) +static void mem_cgroup_update_tree(struct mem_cgroup *memcg, int nid) { unsigned long excess; struct mem_cgroup_per_node *mz; struct mem_cgroup_tree_per_node *mctz; - mctz = soft_limit_tree_from_page(page); + mctz = soft_limit_tree_node(nid); if (!mctz) return; /* @@ -552,7 +536,7 @@ static void mem_cgroup_update_tree(struct mem_cgroup *memcg, struct page *page) * because their event counter is not touched. */ for (; memcg; memcg = parent_mem_cgroup(memcg)) { - mz = mem_cgroup_page_nodeinfo(memcg, page); + mz = memcg->nodeinfo[nid]; excess = soft_limit_excess(memcg); /* * We have to update the tree if mz is on RB-tree or @@ -879,7 +863,7 @@ static void memcg_check_events(struct mem_cgroup *memcg, struct page *page) MEM_CGROUP_TARGET_SOFTLIMIT); mem_cgroup_threshold(memcg); if (unlikely(do_softlimit)) - mem_cgroup_update_tree(memcg, page); + mem_cgroup_update_tree(memcg, page_to_nid(page)); } } -- 2.30.2
WARNING: multiple messages have this Message-ID (diff)
From: "Matthew Wilcox (Oracle)" <willy-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org> To: linux-mm-Bw31MaZKKs3YtjvyW6yDsg@public.gmane.org, cgroups-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: "Matthew Wilcox (Oracle)" <willy-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org>, Johannes Weiner <hannes-druUgvl0LCNAfugRpC6u6w@public.gmane.org>, Michal Hocko <mhocko-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>, Vladimir Davydov <vdavydov.dev-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> Subject: [PATCH v3 03/18] mm/memcg: Use the node id in mem_cgroup_update_tree() Date: Wed, 30 Jun 2021 05:00:19 +0100 [thread overview] Message-ID: <20210630040034.1155892-4-willy@infradead.org> (raw) In-Reply-To: <20210630040034.1155892-1-willy-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org> By using the node id in mem_cgroup_update_tree(), we can delete soft_limit_tree_from_page() and mem_cgroup_page_nodeinfo(). Saves 42 bytes of kernel text on my config. Signed-off-by: Matthew Wilcox (Oracle) <willy-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org> --- mm/memcontrol.c | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 25cad0fb7d4e..29b28a050707 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -446,28 +446,12 @@ ino_t page_cgroup_ino(struct page *page) return ino; } -static struct mem_cgroup_per_node * -mem_cgroup_page_nodeinfo(struct mem_cgroup *memcg, struct page *page) -{ - int nid = page_to_nid(page); - - return memcg->nodeinfo[nid]; -} - static struct mem_cgroup_tree_per_node * soft_limit_tree_node(int nid) { return soft_limit_tree.rb_tree_per_node[nid]; } -static struct mem_cgroup_tree_per_node * -soft_limit_tree_from_page(struct page *page) -{ - int nid = page_to_nid(page); - - return soft_limit_tree.rb_tree_per_node[nid]; -} - static void __mem_cgroup_insert_exceeded(struct mem_cgroup_per_node *mz, struct mem_cgroup_tree_per_node *mctz, unsigned long new_usage_in_excess) @@ -538,13 +522,13 @@ static unsigned long soft_limit_excess(struct mem_cgroup *memcg) return excess; } -static void mem_cgroup_update_tree(struct mem_cgroup *memcg, struct page *page) +static void mem_cgroup_update_tree(struct mem_cgroup *memcg, int nid) { unsigned long excess; struct mem_cgroup_per_node *mz; struct mem_cgroup_tree_per_node *mctz; - mctz = soft_limit_tree_from_page(page); + mctz = soft_limit_tree_node(nid); if (!mctz) return; /* @@ -552,7 +536,7 @@ static void mem_cgroup_update_tree(struct mem_cgroup *memcg, struct page *page) * because their event counter is not touched. */ for (; memcg; memcg = parent_mem_cgroup(memcg)) { - mz = mem_cgroup_page_nodeinfo(memcg, page); + mz = memcg->nodeinfo[nid]; excess = soft_limit_excess(memcg); /* * We have to update the tree if mz is on RB-tree or @@ -879,7 +863,7 @@ static void memcg_check_events(struct mem_cgroup *memcg, struct page *page) MEM_CGROUP_TARGET_SOFTLIMIT); mem_cgroup_threshold(memcg); if (unlikely(do_softlimit)) - mem_cgroup_update_tree(memcg, page); + mem_cgroup_update_tree(memcg, page_to_nid(page)); } } -- 2.30.2
next prev parent reply other threads:[~2021-06-30 4:03 UTC|newest] Thread overview: 122+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-06-30 4:00 [PATCH v3 00/18] Folio conversion of memcg Matthew Wilcox (Oracle) 2021-06-30 4:00 ` Matthew Wilcox (Oracle) 2021-06-30 4:00 ` [PATCH v3 01/18] mm: Add folio_nid() Matthew Wilcox (Oracle) 2021-06-30 4:00 ` Matthew Wilcox (Oracle) 2021-07-01 6:56 ` Christoph Hellwig 2021-07-01 6:56 ` Christoph Hellwig 2021-06-30 4:00 ` [PATCH v3 02/18] mm/memcg: Remove 'page' parameter to mem_cgroup_charge_statistics() Matthew Wilcox (Oracle) 2021-06-30 4:00 ` Matthew Wilcox (Oracle) 2021-06-30 14:17 ` Johannes Weiner 2021-06-30 14:17 ` Johannes Weiner 2021-06-30 4:00 ` Matthew Wilcox (Oracle) [this message] 2021-06-30 4:00 ` [PATCH v3 03/18] mm/memcg: Use the node id in mem_cgroup_update_tree() Matthew Wilcox (Oracle) 2021-06-30 6:55 ` Michal Hocko 2021-06-30 6:55 ` Michal Hocko 2021-06-30 14:18 ` Johannes Weiner 2021-06-30 14:18 ` Johannes Weiner 2021-07-01 6:57 ` Christoph Hellwig 2021-07-01 6:57 ` Christoph Hellwig 2021-06-30 4:00 ` [PATCH v3 04/18] mm/memcg: Remove soft_limit_tree_node() Matthew Wilcox (Oracle) 2021-06-30 4:00 ` Matthew Wilcox (Oracle) 2021-06-30 6:56 ` Michal Hocko 2021-06-30 6:56 ` Michal Hocko 2021-06-30 14:19 ` Johannes Weiner 2021-06-30 14:19 ` Johannes Weiner 2021-07-01 7:09 ` Christoph Hellwig 2021-07-01 7:09 ` Christoph Hellwig 2021-06-30 4:00 ` [PATCH v3 05/18] mm/memcg: Convert memcg_check_events to take a node ID Matthew Wilcox (Oracle) 2021-06-30 4:00 ` Matthew Wilcox (Oracle) 2021-06-30 6:58 ` Michal Hocko 2021-06-30 6:58 ` Michal Hocko 2021-06-30 6:59 ` Michal Hocko 2021-06-30 6:59 ` Michal Hocko 2021-07-01 7:09 ` Christoph Hellwig 2021-07-01 7:09 ` Christoph Hellwig 2021-06-30 4:00 ` [PATCH v3 06/18] mm/memcg: Add folio_memcg() and related functions Matthew Wilcox (Oracle) 2021-06-30 4:00 ` Matthew Wilcox (Oracle) 2021-06-30 6:53 ` kernel test robot 2021-06-30 6:53 ` kernel test robot 2021-06-30 6:53 ` kernel test robot 2021-07-01 7:12 ` Christoph Hellwig 2021-07-01 7:12 ` Christoph Hellwig 2021-06-30 4:00 ` [PATCH v3 07/18] mm/memcg: Convert commit_charge() to take a folio Matthew Wilcox (Oracle) 2021-06-30 4:00 ` Matthew Wilcox (Oracle) 2021-06-30 4:00 ` [PATCH v3 08/18] mm/memcg: Convert mem_cgroup_charge() " Matthew Wilcox (Oracle) 2021-06-30 4:00 ` Matthew Wilcox (Oracle) 2021-06-30 7:17 ` kernel test robot 2021-06-30 7:17 ` kernel test robot 2021-06-30 7:17 ` kernel test robot 2021-07-01 7:13 ` Christoph Hellwig 2021-07-01 7:13 ` Christoph Hellwig 2021-06-30 4:00 ` [PATCH v3 09/18] mm/memcg: Convert uncharge_page() to uncharge_folio() Matthew Wilcox (Oracle) 2021-06-30 4:00 ` Matthew Wilcox (Oracle) 2021-07-01 7:15 ` Christoph Hellwig 2021-07-01 7:15 ` Christoph Hellwig 2021-06-30 4:00 ` [PATCH v3 10/18] mm/memcg: Convert mem_cgroup_uncharge() to take a folio Matthew Wilcox (Oracle) 2021-06-30 4:00 ` Matthew Wilcox (Oracle) 2021-06-30 8:46 ` kernel test robot 2021-06-30 8:46 ` kernel test robot 2021-06-30 8:46 ` kernel test robot 2021-07-01 7:17 ` Christoph Hellwig 2021-07-01 7:17 ` Christoph Hellwig 2021-07-07 12:09 ` Matthew Wilcox 2021-07-07 12:09 ` Matthew Wilcox 2021-06-30 4:00 ` [PATCH v3 11/18] mm/memcg: Convert mem_cgroup_migrate() to take folios Matthew Wilcox (Oracle) 2021-06-30 4:00 ` Matthew Wilcox (Oracle) 2021-07-01 7:20 ` Christoph Hellwig 2021-07-01 7:20 ` Christoph Hellwig 2021-06-30 4:00 ` [PATCH v3 12/18] mm/memcg: Convert mem_cgroup_track_foreign_dirty_slowpath() to folio Matthew Wilcox (Oracle) 2021-06-30 4:00 ` Matthew Wilcox (Oracle) 2021-06-30 4:00 ` [PATCH v3 13/18] mm/memcg: Add folio_memcg_lock() and folio_memcg_unlock() Matthew Wilcox (Oracle) 2021-06-30 4:00 ` Matthew Wilcox (Oracle) 2021-06-30 8:32 ` Michal Hocko 2021-06-30 8:32 ` Michal Hocko 2021-07-07 15:10 ` Matthew Wilcox 2021-07-07 15:10 ` Matthew Wilcox 2021-07-08 7:28 ` Michal Hocko 2021-07-08 7:28 ` Michal Hocko 2021-07-07 17:08 ` Johannes Weiner 2021-07-07 17:08 ` Johannes Weiner 2021-07-07 19:28 ` Matthew Wilcox 2021-07-07 19:28 ` Matthew Wilcox 2021-07-07 20:41 ` Johannes Weiner 2021-07-07 20:41 ` Johannes Weiner 2021-07-09 19:37 ` Matthew Wilcox 2021-07-09 19:37 ` Matthew Wilcox 2021-06-30 4:00 ` [PATCH v3 14/18] mm/memcg: Convert mem_cgroup_move_account() to use a folio Matthew Wilcox (Oracle) 2021-06-30 4:00 ` Matthew Wilcox (Oracle) 2021-06-30 8:30 ` Michal Hocko 2021-06-30 8:30 ` Michal Hocko 2021-06-30 11:22 ` Matthew Wilcox 2021-06-30 11:22 ` Matthew Wilcox 2021-06-30 12:20 ` Michal Hocko 2021-06-30 12:20 ` Michal Hocko 2021-06-30 12:31 ` Matthew Wilcox 2021-06-30 12:31 ` Matthew Wilcox 2021-06-30 12:45 ` Michal Hocko 2021-06-30 12:45 ` Michal Hocko 2021-07-07 15:25 ` Matthew Wilcox 2021-07-07 15:25 ` Matthew Wilcox 2021-07-08 7:30 ` Michal Hocko 2021-07-08 7:30 ` Michal Hocko 2021-06-30 4:00 ` [PATCH v3 15/18] mm/memcg: Add mem_cgroup_folio_lruvec() Matthew Wilcox (Oracle) 2021-06-30 4:00 ` Matthew Wilcox (Oracle) 2021-06-30 8:12 ` kernel test robot 2021-06-30 8:12 ` kernel test robot 2021-06-30 8:12 ` kernel test robot 2021-06-30 19:18 ` Matthew Wilcox 2021-06-30 19:18 ` Matthew Wilcox 2021-06-30 21:21 ` Johannes Weiner 2021-06-30 21:21 ` Johannes Weiner 2021-06-30 4:00 ` [PATCH v3 16/18] mm/memcg: Add folio_lruvec_lock() and similar functions Matthew Wilcox (Oracle) 2021-06-30 4:00 ` Matthew Wilcox (Oracle) 2021-06-30 8:36 ` Michal Hocko 2021-06-30 8:36 ` Michal Hocko 2021-06-30 4:00 ` [PATCH v3 17/18] mm/memcg: Add folio_lruvec_relock_irq() and folio_lruvec_relock_irqsave() Matthew Wilcox (Oracle) 2021-06-30 4:00 ` Matthew Wilcox (Oracle) 2021-06-30 8:39 ` Michal Hocko 2021-06-30 8:39 ` Michal Hocko 2021-06-30 4:00 ` [PATCH v3 18/18] mm/workingset: Convert workingset_activation to take a folio Matthew Wilcox (Oracle) 2021-06-30 4:00 ` Matthew Wilcox (Oracle) 2021-06-30 8:44 ` [PATCH v3 00/18] Folio conversion of memcg Michal Hocko 2021-06-30 8:44 ` Michal Hocko
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210630040034.1155892-4-willy@infradead.org \ --to=willy@infradead.org \ --cc=cgroups@vger.kernel.org \ --cc=hannes@cmpxchg.org \ --cc=linux-mm@kvack.org \ --cc=mhocko@kernel.org \ --cc=vdavydov.dev@gmail.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.