Patch series "mm: memcg: kmem API cleanup", v2. This patchset aims to clean up the kernel memory charging API. It doesn't bring any functional changes, just removes unused arguments, renames some functions and fixes some comments. Currently it's not obvious which functions are most basic (memcg_kmem_(un)charge_memcg()) and which are based on them (memcg_kmem_(un)charge()). The patchset renames these functions and removes unused arguments: TL;DR: was: memcg_kmem_charge_memcg(page, gfp, order, memcg) memcg_kmem_uncharge_memcg(memcg, nr_pages) memcg_kmem_charge(page, gfp, order) memcg_kmem_uncharge(page, order) now: memcg_kmem_charge(memcg, gfp, nr_pages) memcg_kmem_uncharge(memcg, nr_pages) memcg_kmem_charge_page(page, gfp, order) memcg_kmem_uncharge_page(page, order) This patch (of 6): The first argument of memcg_kmem_charge_memcg() and __memcg_kmem_charge_memcg() is the page pointer and it's not used. Let's drop it. Memcg pointer is passed as the last argument. Move it to the first place for consistency with other memcg functions, e.g. __memcg_kmem_uncharge_memcg() or try_charge().
Showing the changes to include/linux (1 of 3 files). Show all
Unified · Split
| @@ -1369,8 +1369,7 @@ void memcg_kmem_put_cache(struct kmem_cache *cachep); · 1368 unmodified lines | |||
| 1369 | #ifdef CONFIG_MEMCG_KMEM | 1369 | #ifdef CONFIG_MEMCG_KMEM |
| 1370 | int __memcg_kmem_charge(struct page *page, gfp_t gfp, int order); | 1370 | int __memcg_kmem_charge(struct page *page, gfp_t gfp, int order); |
| 1371 | void __memcg_kmem_uncharge(struct page *page, int order); | 1371 | void __memcg_kmem_uncharge(struct page *page, int order); |
| 1372 | int __memcg_kmem_charge_memcg(struct page *page, gfp_t gfp, int order, | 1372 | int __memcg_kmem_charge_memcg(struct mem_cgroup *memcg, gfp_t gfp, int order); |
| 1373 | struct mem_cgroup *memcg); | ||
| 1374 | void __memcg_kmem_uncharge_memcg(struct mem_cgroup *memcg, | 1373 | void __memcg_kmem_uncharge_memcg(struct mem_cgroup *memcg, |
| 1375 | unsigned int nr_pages); | 1374 | unsigned int nr_pages); |
| 1376 | 1375 | ||
| @@ -1407,11 +1406,11 @@ static inline void memcg_kmem_uncharge(struct page *page, int order) · 30 unmodified lines | |||
| 1407 | __memcg_kmem_uncharge(page, order); | 1406 | __memcg_kmem_uncharge(page, order); |
| 1408 | } | 1407 | } |
| 1409 | 1408 | ||
| 1410 | static inline int memcg_kmem_charge_memcg(struct page *page, gfp_t gfp, | 1409 | static inline int memcg_kmem_charge_memcg(struct mem_cgroup *memcg, gfp_t gfp, |
| 1411 | int order, struct mem_cgroup *memcg) | 1410 | int order) |
| 1412 | { | 1411 | { |
| 1413 | if (memcg_kmem_enabled()) | 1412 | if (memcg_kmem_enabled()) |
| 1414 | return __memcg_kmem_charge_memcg(page, gfp, order, memcg); | 1413 | return __memcg_kmem_charge_memcg(memcg, gfp, order); |
| 1415 | return 0; | 1414 | return 0; |
| 1416 | } | 1415 | } |
| 1417 | 1416 | ||