[03/78] mm/memcg: remove unused definitions

Message ID	20201218220135.8ZtqsqPmA%akpm@linux-foundation.org (mailing list archive)
State	New, archived
Headers	show Return-Path: <SRS0=Y0WR=FW=kvack.org=owner-linux-mm@kernel.org> DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BD80323B97 Date: Fri, 18 Dec 2020 14:01:35 -0800 From: Andrew Morton <akpm@linux-foundation.org> To: akpm@linux-foundation.org, guro@fb.com, hannes@cmpxchg.org, linux-mm@kvack.org, mhocko@suse.com, mm-commits@vger.kernel.org, richard.weiyang@gmail.com, shakeelb@google.com, torvalds@linux-foundation.org Subject: [patch 03/78] mm/memcg: remove unused definitions Message-ID: <20201218220135.8ZtqsqPmA%akpm@linux-foundation.org> In-Reply-To: <20201218140046.497484741326828e5b5d46ec@linux-foundation.org> User-Agent: s-nail v14.8.16 Sender: owner-linux-mm@kvack.org Precedence: bulk
Series	[01/78] mm/memcg: bail early from swap accounting if memcg disabled \| expand [01/78] mm/memcg: bail early from swap accounting if memcg disabled [02/78] mm/memcg: warning on !memcg after readahead page charged [03/78] mm/memcg: remove unused definitions [04/78] mm, kvm: account kvm_vcpu_mmap to kmemcg [05/78] mm/memcontrol:rewrite mem_cgroup_page_lruvec() [06/78] epoll: check for events when removing a timed out thread from the wait queue [07/78] epoll: simplify signal handling [08/78] epoll: pull fatal signal checks into ep_send_events() [09/78] epoll: move eavail next to the list_empty_careful check [10/78] epoll: simplify and optimize busy loop logic [11/78] epoll: pull all code between fetch_events and send_event into the loop [12/78] epoll: replace gotos with a proper loop [13/78] epoll: eliminate unnecessary lock for zero timeout [14/78] kasan: drop unnecessary GPL text from comment headers [15/78] kasan: KASAN_VMALLOC depends on KASAN_GENERIC [16/78] kasan: group vmalloc code [17/78] kasan: shadow declarations only for software modes [18/78] kasan: rename (un)poison_shadow to (un)poison_range [19/78] kasan: rename KASAN_SHADOW_* to KASAN_GRANULE_* [20/78] kasan: only build init.c for software modes [21/78] kasan: split out shadow.c from common.c [22/78] kasan: define KASAN_MEMORY_PER_SHADOW_PAGE [23/78] kasan: rename report and tags files [24/78] kasan: don't duplicate config dependencies [25/78] kasan: hide invalid free check implementation [26/78] kasan: decode stack frame only with KASAN_STACK_ENABLE [27/78] kasan, arm64: only init shadow for software modes [28/78] kasan, arm64: only use kasan_depth for software modes [29/78] kasan, arm64: move initialization message [30/78] kasan, arm64: rename kasan_init_tags and mark as __init [31/78] kasan: rename addr_has_shadow to addr_has_metadata [32/78] kasan: rename print_shadow_for_address to print_memory_metadata [33/78] kasan: rename SHADOW layout macros to META [34/78] kasan: separate metadata_fetch_row for each mode [35/78] kasan: introduce CONFIG_KASAN_HW_TAGS [36/78] arm64: enable armv8.5-a asm-arch option [37/78] arm64: mte: add in-kernel MTE helpers [38/78] arm64: mte: reset the page tag in page->flags [39/78] arm64: mte: add in-kernel tag fault handler [40/78] arm64: kasan: allow enabling in-kernel MTE [41/78] arm64: mte: convert gcr_user into an exclude mask [42/78] arm64: mte: switch GCR_EL1 in kernel entry and exit [43/78] kasan, mm: untag page address in free_reserved_area [44/78] arm64: kasan: align allocations for HW_TAGS [45/78] arm64: kasan: add arch layer for memory tagging helpers [46/78] kasan: define KASAN_GRANULE_SIZE for HW_TAGS [47/78] kasan, x86, s390: update undef CONFIG_KASAN [48/78] kasan, arm64: expand CONFIG_KASAN checks [49/78] kasan, arm64: implement HW_TAGS runtime [50/78] kasan, arm64: print report from tag fault handler [51/78] kasan, mm: reset tags when accessing metadata [52/78] kasan, arm64: enable CONFIG_KASAN_HW_TAGS [53/78] kasan: add documentation for hardware tag-based mode [54/78] kselftest/arm64: check GCR_EL1 after context switch [55/78] kasan: simplify quarantine_put call site [56/78] kasan: rename get_alloc/free_info [57/78] kasan: introduce set_alloc_info [58/78] kasan, arm64: unpoison stack only with CONFIG_KASAN_STACK [59/78] kasan: allow VMAP_STACK for HW_TAGS mode [60/78] kasan: remove __kasan_unpoison_stack [61/78] kasan: inline kasan_reset_tag for tag-based modes [62/78] kasan: inline random_tag for HW_TAGS [63/78] kasan: open-code kasan_unpoison_slab [64/78] kasan: inline (un)poison_range and check_invalid_free [65/78] kasan: add and integrate kasan boot parameters [66/78] kasan, mm: check kasan_enabled in annotations [67/78] kasan, mm: rename kasan_poison_kfree [68/78] kasan: don't round_up too much [69/78] kasan: simplify assign_tag and set_tag calls [70/78] kasan: clarify comment in __kasan_kfree_large [71/78] kasan: sanitize objects when metadata doesn't fit [72/78] kasan, mm: allow cache merging with no metadata [73/78] kasan: update documentation [74/78] mm/Kconfig: fix spelling mistake "whats" -> "what's" [75/78] epoll: convert internal api to timespec64 [76/78] epoll: add syscall epoll_pwait2 [77/78] epoll: wire up syscall epoll_pwait2 [78/78] selftests/filesystems: expand epoll with epoll_pwait2

Message ID

20201218220135.8ZtqsqPmA%akpm@linux-foundation.org (mailing list archive)

State

New, archived

Headers

DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BD80323B97
Date: Fri, 18 Dec 2020 14:01:35 -0800
From: Andrew Morton <akpm@linux-foundation.org>
To: akpm@linux-foundation.org, guro@fb.com, hannes@cmpxchg.org,
 linux-mm@kvack.org, mhocko@suse.com, mm-commits@vger.kernel.org,
 richard.weiyang@gmail.com, shakeelb@google.com,
 torvalds@linux-foundation.org
Subject: [patch 03/78] mm/memcg: remove unused definitions
Message-ID: <20201218220135.8ZtqsqPmA%akpm@linux-foundation.org>
In-Reply-To: <20201218140046.497484741326828e5b5d46ec@linux-foundation.org>
User-Agent: s-nail v14.8.16
Sender: owner-linux-mm@kvack.org
Precedence: bulk

Series

[01/78] mm/memcg: bail early from swap accounting if memcg disabled | expand

Commit Message

Andrew Morton Dec. 18, 2020, 10:01 p.m. UTC

From: Wei Yang <richard.weiyang@gmail.com>
Subject: mm/memcg: remove unused definitions

Some definitions are left unused, just clean them.

Link: https://lkml.kernel.org/r/20201108003834.12669-1-richard.weiyang@gmail.com
Signed-off-by: Wei Yang <richard.weiyang@gmail.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Reviewed-by: Shakeel Butt <shakeelb@google.com>
Reviewed-by: Roman Gushchin <guro@fb.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 include/linux/memcontrol.h |  118 -----------------------------------
 1 file changed, 118 deletions(-)

--- a/include/linux/memcontrol.h~mm-memcg-remove-unused-definitions
+++ a/include/linux/memcontrol.h
@@ -913,41 +913,6 @@  static inline void mod_memcg_state(struc
 	local_irq_restore(flags);
 }
 
-/**
- * mod_memcg_page_state - update page state statistics
- * @page: the page
- * @idx: page state item to account
- * @val: number of pages (positive or negative)
- *
- * The @page must be locked or the caller must use lock_page_memcg()
- * to prevent double accounting when the page is concurrently being
- * moved to another memcg:
- *
- *   lock_page(page) or lock_page_memcg(page)
- *   if (TestClearPageState(page))
- *     mod_memcg_page_state(page, state, -1);
- *   unlock_page(page) or unlock_page_memcg(page)
- *
- * Kernel pages are an exception to this, since they'll never move.
- */
-static inline void __mod_memcg_page_state(struct page *page,
-					  int idx, int val)
-{
-	struct mem_cgroup *memcg = page_memcg(page);
-
-	if (memcg)
-		__mod_memcg_state(memcg, idx, val);
-}
-
-static inline void mod_memcg_page_state(struct page *page,
-					int idx, int val)
-{
-	struct mem_cgroup *memcg = page_memcg(page);
-
-	if (memcg)
-		mod_memcg_state(memcg, idx, val);
-}
-
 static inline unsigned long lruvec_page_state(struct lruvec *lruvec,
 					      enum node_stat_item idx)
 {
@@ -1395,18 +1360,6 @@  static inline void mod_memcg_state(struc
 {
 }
 
-static inline void __mod_memcg_page_state(struct page *page,
-					  int idx,
-					  int nr)
-{
-}
-
-static inline void mod_memcg_page_state(struct page *page,
-					int idx,
-					int nr)
-{
-}
-
 static inline unsigned long lruvec_page_state(struct lruvec *lruvec,
 					      enum node_stat_item idx)
 {
@@ -1479,34 +1432,6 @@  static inline void lruvec_memcg_debug(st
 }
 #endif /* CONFIG_MEMCG */
 
-/* idx can be of type enum memcg_stat_item or node_stat_item */
-static inline void __inc_memcg_state(struct mem_cgroup *memcg,
-				     int idx)
-{
-	__mod_memcg_state(memcg, idx, 1);
-}
-
-/* idx can be of type enum memcg_stat_item or node_stat_item */
-static inline void __dec_memcg_state(struct mem_cgroup *memcg,
-				     int idx)
-{
-	__mod_memcg_state(memcg, idx, -1);
-}
-
-/* idx can be of type enum memcg_stat_item or node_stat_item */
-static inline void __inc_memcg_page_state(struct page *page,
-					  int idx)
-{
-	__mod_memcg_page_state(page, idx, 1);
-}
-
-/* idx can be of type enum memcg_stat_item or node_stat_item */
-static inline void __dec_memcg_page_state(struct page *page,
-					  int idx)
-{
-	__mod_memcg_page_state(page, idx, -1);
-}
-
 static inline void __inc_lruvec_kmem_state(void *p, enum node_stat_item idx)
 {
 	__mod_lruvec_kmem_state(p, idx, 1);
@@ -1517,34 +1442,6 @@  static inline void __dec_lruvec_kmem_sta
 	__mod_lruvec_kmem_state(p, idx, -1);
 }
 
-/* idx can be of type enum memcg_stat_item or node_stat_item */
-static inline void inc_memcg_state(struct mem_cgroup *memcg,
-				   int idx)
-{
-	mod_memcg_state(memcg, idx, 1);
-}
-
-/* idx can be of type enum memcg_stat_item or node_stat_item */
-static inline void dec_memcg_state(struct mem_cgroup *memcg,
-				   int idx)
-{
-	mod_memcg_state(memcg, idx, -1);
-}
-
-/* idx can be of type enum memcg_stat_item or node_stat_item */
-static inline void inc_memcg_page_state(struct page *page,
-					int idx)
-{
-	mod_memcg_page_state(page, idx, 1);
-}
-
-/* idx can be of type enum memcg_stat_item or node_stat_item */
-static inline void dec_memcg_page_state(struct page *page,
-					int idx)
-{
-	mod_memcg_page_state(page, idx, -1);
-}
-
 static inline struct lruvec *parent_lruvec(struct lruvec *lruvec)
 {
 	struct mem_cgroup *memcg;
@@ -1733,21 +1630,6 @@  static inline void memcg_kmem_uncharge_p
 		__memcg_kmem_uncharge_page(page, order);
 }
 
-static inline int memcg_kmem_charge(struct mem_cgroup *memcg, gfp_t gfp,
-				    unsigned int nr_pages)
-{
-	if (memcg_kmem_enabled())
-		return __memcg_kmem_charge(memcg, gfp, nr_pages);
-	return 0;
-}
-
-static inline void memcg_kmem_uncharge(struct mem_cgroup *memcg,
-				       unsigned int nr_pages)
-{
-	if (memcg_kmem_enabled())
-		__memcg_kmem_uncharge(memcg, nr_pages);
-}
-
 /*
  * A helper for accessing memcg's kmem_id, used for getting
  * corresponding LRU lists.

[03/78] mm/memcg: remove unused definitions

Commit Message

Patch