mm: memcg/slab: remove unused argument by charge_slab_page()
Subsystems (3)
PATCH 1/3 mm: memcg/slab: remove unused argument by charge_slab_page()
charge_slab_page() is not using the gfp argument anymore, remove it.
--- mm/slab.c | 2 +- mm/slab.h | 3 +-- mm/slub.c | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-)
mm/slab.c +1 -1
@@ -1379,7 +1379,7 @@ static struct page *kmem_getpages(struct kmem_cache *cachep, gfp_t flags,return NULL ; } -charge_slab_page (page, flags, cachep->gfporder, cachep); +charge_slab_page (page, cachep->gfporder, cachep);__SetPageSlab (page);/* Record if ALLOC_NO_WATERMARKS was set when allocating the slab */ if (sk_memalloc_socks () &&page_is_pfmemalloc (page))
mm/slab.h +1 -2
@@ -440,8 +440,7 @@ static inline struct kmem_cache *virt_to_cache(const void *obj)return page->slab_cache; } -static __always_inline void charge_slab_page(struct page *page, -gfp_t gfp,int order, +static __always_inline void charge_slab_page(struct page *page, int order,struct kmem_cache *s) { mod_node_page_state(page_pgdat(page), cache_vmstat_idx(s),
mm/slub.c +1 -1
@@ -1621,7 +1621,7 @@ static inline struct page *alloc_slab_page(struct kmem_cache *s, page =__alloc_pages_node (node, flags, order);if (page) -charge_slab_page (page, flags, order, s); +charge_slab_page (page, order, s);return page; }
Signature · 1 line
2.26.2
PATCH 2/3 mm: slab: rename (un)charge_slab_page() to (un)account_slab_page()
charge_slab_page() and uncharge_slab_page() are not related anymore to memcg charging and uncharging. In order to make their names less confusing, let's rename them to account_slab_page() and unaccount_slab_page() respectively.
--- mm/slab.c | 4 ++-- mm/slab.h | 8 ++++---- mm/slub.c | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-)
mm/slab.c +2 -2
@@ -1379,7 +1379,7 @@ static struct page *kmem_getpages(struct kmem_cache *cachep, gfp_t flags,return NULL ; } -charge_slab_page (page, cachep->gfporder, cachep); +account_slab_page (page, cachep->gfporder, cachep);__SetPageSlab (page);/* Record if ALLOC_NO_WATERMARKS was set when allocating the slab */ if (sk_memalloc_socks () &&page_is_pfmemalloc (page))
@@ -1403,7 +1403,7 @@ static void kmem_freepages(struct kmem_cache *cachep, struct page *page)if (current->reclaim_state) current->reclaim_state->reclaimed_slab +=1 << order; -uncharge_slab_page (page, order, cachep); +unaccount_slab_page (page, order, cachep);__free_pages (page, order); }
mm/slab.h +4 -4
@@ -440,15 +440,15 @@ static inline struct kmem_cache *virt_to_cache(const void *obj)return page->slab_cache; } -static __always_inline void charge_slab_page(struct page *page, int order, -struct kmem_cache *s) +static __always_inline void account_slab_page(struct page *page, int order, +struct kmem_cache *s) {mod_node_page_state (page_pgdat (page),cache_vmstat_idx (s),PAGE_SIZE << order); } -static __always_inline void uncharge_slab_page(struct page *page, int order, -struct kmem_cache *s) +static __always_inline void unaccount_slab_page(struct page *page, int order, +struct kmem_cache *s) {if (memcg_kmem_enabled ())memcg_free_page_obj_cgroups (page);
mm/slub.c +2 -2
@@ -1621,7 +1621,7 @@ static inline struct page *alloc_slab_page(struct kmem_cache *s, page =__alloc_pages_node (node, flags, order);if (page) -charge_slab_page (page, order, s); +account_slab_page (page, order, s);return page; }
@@ -1844,7 +1844,7 @@ static void __free_slab(struct kmem_cache *s, struct page *page) page->mapping =NULL ;if (current->reclaim_state) current->reclaim_state->reclaimed_slab += pages; -uncharge_slab_page (page, order, s); +unaccount_slab_page (page, order, s);__free_pages (page, order); }
Signature · 1 line
2.26.2
Re: [PATCH 2/3] mm: slab: rename (un)charge_slab_page() to (un)account_slab_page()
Quoted 7 lines · Roman Gushchin
charge_slab_page()anduncharge_slab_page()are not related anymore to memcg charging and uncharging. In order to make their names less confusing, let's rename them toaccount_slab_page()andunaccount_slab_page()respectively.Signed-off-by Roman Gushchin <[email protected]>
Re: [PATCH 2/3] mm: slab: rename (un)charge_slab_page() to (un)account_slab_page()
In reply to Roman GushchinQuoted 6 lines · Roman Gushchin
charge_slab_page()anduncharge_slab_page()are not related anymore to memcg charging and uncharging. In order to make their names less confusing, let's rename them toaccount_slab_page()andunaccount_slab_page()respectively.Signed-off-by Roman Gushchin <[email protected]>
Quoted 75 lines
--- mm/slab.c | 4 ++-- mm/slab.h | 8 ++++---- mm/slub.c | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-)mm/slab.c +2
-2@@ -1379,7 +1379,7 @@ static struct page *kmem_getpages(struct kmem_cache *cachep, gfp_t flags,return NULL ; } -charge_slab_page (page, cachep->gfporder, cachep); +account_slab_page (page, cachep->gfporder, cachep);__SetPageSlab (page);/* Record if ALLOC_NO_WATERMARKS was set when allocating the slab */ if (sk_memalloc_socks () &&page_is_pfmemalloc (page))@@ -1403,7 +1403,7 @@ static void kmem_freepages(struct kmem_cache *cachep, struct page *page)if (current->reclaim_state) current->reclaim_state->reclaimed_slab +=1 << order; -uncharge_slab_page (page, order, cachep); +unaccount_slab_page (page, order, cachep);__free_pages (page, order); }mm/slab.h +4
-4@@ -440,15 +440,15 @@ static inline struct kmem_cache *virt_to_cache(const void *obj)return page->slab_cache; } -static __always_inline void charge_slab_page(struct page *page, int order, -struct kmem_cache *s) +static __always_inline void account_slab_page(struct page *page, int order, +struct kmem_cache *s) {mod_node_page_state (page_pgdat (page),cache_vmstat_idx (s),PAGE_SIZE << order); } -static __always_inline void uncharge_slab_page(struct page *page, int order, -struct kmem_cache *s) +static __always_inline void unaccount_slab_page(struct page *page, int order, +struct kmem_cache *s) {if (memcg_kmem_enabled ())memcg_free_page_obj_cgroups (page);mm/slub.c +2
-2@@ -1621,7 +1621,7 @@ static inline struct page *alloc_slab_page(struct kmem_cache *s, page =__alloc_pages_node (node, flags, order);if (page) -charge_slab_page (page, order, s); +account_slab_page (page, order, s);return page; }@@ -1844,7 +1844,7 @@ static void __free_slab(struct kmem_cache *s, struct page *page) page->mapping =NULL ;if (current->reclaim_state) current->reclaim_state->reclaimed_slab += pages; -uncharge_slab_page (page, order, s); +unaccount_slab_page (page, order, s);__free_pages (page, order); }
PATCH 3/3 mm: kmem: switch to static_branch_likely() in memcg_kmem_enabled()
In reply to Roman GushchinCurrently memcg_kmem_enabled() is optimized for the kernel memory accounting being off. It was so for a long time, and arguably the reason behind was that the kernel memory accounting was initially an opt-in feature. However, now it's on by default on both cgroup v1 and cgroup v2, and it's on for all cgroups. So let's switch over to static_branch_likely() to reflect this fact.
Unlikely there is a significant performance difference, as the cost of a memory allocation and its accounting significantly exceeds the cost of a jump. However, the conversion makes the code look more logically.
--- include/linux/memcontrol.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/memcontrol.h +1 -1
@@ -1456,7 +1456,7 @@ void memcg_put_cache_ids(void);static inline bool memcg_kmem_enabled (void ) { -return static_branch_unlikely (&memcg_kmem_enabled_key); +return static_branch_likely (&memcg_kmem_enabled_key); }static inline bool memcg_kmem_bypass (void )
Signature · 1 line
2.26.2
Re: [PATCH 3/3] mm: kmem: switch to static_branch_likely() in memcg_kmem_enabled()
Quoted 8 lines · Roman Gushchin
Currently
memcg_kmem_enabled()is optimized for the kernel memory accounting being off. It was so for a long time, and arguably the reason behind was that the kernel memory accounting was initially an opt-in feature. However, now it's on by default on both cgroup v1 and cgroup v2, and it's on for all cgroups. So let's switch over tostatic_branch_likely()to reflect this fact.
Quoted 6 lines
Unlikely there is a significant performance difference, as the cost of a memory allocation and its accounting significantly exceeds the cost of a jump. However, the conversion makes the code look more logically.
Signed-off-by Roman Gushchin <[email protected]>
Re: [PATCH 3/3] mm: kmem: switch to static_branch_likely() in memcg_kmem_enabled()
In reply to Roman GushchinQuoted 7 lines · Roman Gushchin
Currently
memcg_kmem_enabled()is optimized for the kernel memory accounting being off. It was so for a long time, and arguably the reason behind was that the kernel memory accounting was initially an opt-in feature. However, now it's on by default on both cgroup v1 and cgroup v2, and it's on for all cgroups. So let's switch over tostatic_branch_likely()to reflect this fact.
Quoted 6 lines
Unlikely there is a significant performance difference, as the cost of a memory allocation and its accounting significantly exceeds the cost of a jump. However, the conversion makes the code look more logically.
Signed-off-by Roman Gushchin <[email protected]>
Quoted 18 lines
--- include/linux/memcontrol.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)include/linux/memcontrol.h +1
-1@@ -1456,7 +1456,7 @@ void memcg_put_cache_ids(void);static inline bool memcg_kmem_enabled (void ) { -return static_branch_unlikely (&memcg_kmem_enabled_key); +return static_branch_likely (&memcg_kmem_enabled_key); }static inline bool memcg_kmem_bypass (void )
Quoted 5 lines · Roman Gushchin
charge_slab_page()is not using the gfp argument anymore, remove it.Signed-off-by Roman Gushchin <[email protected]>
Quoted 4 lines · Roman Gushchin
charge_slab_page()is not using the gfp argument anymore, remove it.Signed-off-by Roman Gushchin <[email protected]>
Quoted 47 lines
--- mm/slab.c | 2 +- mm/slab.h | 3 +-- mm/slub.c | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-)mm/slab.c +1
-1@@ -1379,7 +1379,7 @@ static struct page *kmem_getpages(struct kmem_cache *cachep, gfp_t flags,return NULL ; } -charge_slab_page (page, flags, cachep->gfporder, cachep); +charge_slab_page (page, cachep->gfporder, cachep);__SetPageSlab (page);/* Record if ALLOC_NO_WATERMARKS was set when allocating the slab */ if (sk_memalloc_socks () &&page_is_pfmemalloc (page))mm/slab.h +1
-2@@ -440,8 +440,7 @@ static inline struct kmem_cache *virt_to_cache(const void *obj)return page->slab_cache; } -static __always_inline void charge_slab_page(struct page *page, -gfp_t gfp,int order, +static __always_inline void charge_slab_page(struct page *page, int order,struct kmem_cache *s) { mod_node_page_state(page_pgdat(page), cache_vmstat_idx(s),mm/slub.c +1
-1@@ -1621,7 +1621,7 @@ static inline struct page *alloc_slab_page(struct kmem_cache *s, page =__alloc_pages_node (node, flags, order);if (page) -charge_slab_page (page, flags, order, s); +charge_slab_page (page, order, s);return page; }