Rename (__)memcg_kmem_(un)charge() into (__)memcg_kmem_(un)charge_page() to better reflect what they are actually doing: 1) call __memcg_kmem_(un)charge_memcg() to actually charge or uncharge the current memcg 2) set or clear the PageKmemcg flag
Showing the changes to include/linux (1 of 5 files). Show all
Unified · Split
| @@ -1367,8 +1367,8 @@ struct kmem_cache *memcg_kmem_get_cache(struct kmem_cache *cachep); · 1366 unmodified lines | |||
| 1367 | void memcg_kmem_put_cache(struct kmem_cache *cachep); | 1367 | void memcg_kmem_put_cache(struct kmem_cache *cachep); |
| 1368 | 1368 | ||
| 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_page(struct page *page, gfp_t gfp, int order); |
| 1371 | void __memcg_kmem_uncharge(struct page *page, int order); | 1371 | void __memcg_kmem_uncharge_page(struct page *page, int order); |
| 1372 | int __memcg_kmem_charge_memcg(struct mem_cgroup *memcg, gfp_t gfp, int order); | 1372 | int __memcg_kmem_charge_memcg(struct mem_cgroup *memcg, gfp_t gfp, int order); |
| 1373 | void __memcg_kmem_uncharge_memcg(struct mem_cgroup *memcg, | 1373 | void __memcg_kmem_uncharge_memcg(struct mem_cgroup *memcg, |
| 1374 | unsigned int nr_pages); | 1374 | unsigned int nr_pages); |
| @@ -1393,17 +1393,18 @@ static inline bool memcg_kmem_enabled(void) · 18 unmodified lines | |||
| 1393 | return static_branch_unlikely(&memcg_kmem_enabled_key); | 1393 | return static_branch_unlikely(&memcg_kmem_enabled_key); |
| 1394 | } | 1394 | } |
| 1395 | 1395 | ||
| 1396 | static inline int memcg_kmem_charge(struct page *page, gfp_t gfp, int order) | 1396 | static inline int memcg_kmem_charge_page(struct page *page, gfp_t gfp, |
| 1397 | int order) | ||
| 1397 | { | 1398 | { |
| 1398 | if (memcg_kmem_enabled()) | 1399 | if (memcg_kmem_enabled()) |
| 1399 | return __memcg_kmem_charge(page, gfp, order); | 1400 | return __memcg_kmem_charge_page(page, gfp, order); |
| 1400 | return 0; | 1401 | return 0; |
| 1401 | } | 1402 | } |
| 1402 | 1403 | ||
| 1403 | static inline void memcg_kmem_uncharge(struct page *page, int order) | 1404 | static inline void memcg_kmem_uncharge_page(struct page *page, int order) |
| 1404 | { | 1405 | { |
| 1405 | if (memcg_kmem_enabled()) | 1406 | if (memcg_kmem_enabled()) |
| 1406 | __memcg_kmem_uncharge(page, order); | 1407 | __memcg_kmem_uncharge_page(page, order); |
| 1407 | } | 1408 | } |
| 1408 | 1409 | ||
| 1409 | static inline int memcg_kmem_charge_memcg(struct mem_cgroup *memcg, gfp_t gfp, | 1410 | static inline int memcg_kmem_charge_memcg(struct mem_cgroup *memcg, gfp_t gfp, |
| @@ -1435,21 +1436,23 @@ struct mem_cgroup *mem_cgroup_from_obj(void *p); · 25 unmodified lines | |||
| 1435 | 1436 | ||
| 1436 | #else | 1437 | #else |
| 1437 | 1438 | ||
| 1438 | static inline int memcg_kmem_charge(struct page *page, gfp_t gfp, int order) | 1439 | static inline int memcg_kmem_charge_page(struct page *page, gfp_t gfp, |
| 1440 | int order) | ||
| 1439 | { | 1441 | { |
| 1440 | return 0; | 1442 | return 0; |
| 1441 | } | 1443 | } |
| 1442 | 1444 | ||
| 1443 | static inline void memcg_kmem_uncharge(struct page *page, int order) | 1445 | static inline void memcg_kmem_uncharge_page(struct page *page, int order) |
| 1444 | { | 1446 | { |
| 1445 | } | 1447 | } |
| 1446 | 1448 | ||
| 1447 | static inline int __memcg_kmem_charge(struct page *page, gfp_t gfp, int order) | 1449 | static inline int __memcg_kmem_charge_page(struct page *page, gfp_t gfp, |
| 1450 | int order) | ||
| 1448 | { | 1451 | { |
| 1449 | return 0; | 1452 | return 0; |
| 1450 | } | 1453 | } |
| 1451 | 1454 | ||
| 1452 | static inline void __memcg_kmem_uncharge(struct page *page, int order) | 1455 | static inline void __memcg_kmem_uncharge_page(struct page *page, int order) |
| 1453 | { | 1456 | { |
| 1454 | } | 1457 | } |
| 1455 | 1458 | ||