Skip to content

Commit 074e3e2

Browse files
Matthew Wilcox (Oracle)akpm00
authored andcommitted
memcg: convert get_obj_cgroup_from_page to get_obj_cgroup_from_folio
As the one caller now has a folio, pass it in and use it. Removes three calls to compound_head(). Link: https://lkml.kernel.org/r/[email protected] Signed-off-by: Matthew Wilcox (Oracle) <[email protected]> Cc: Christoph Hellwig <[email protected]> Cc: Domenico Cerasuolo <[email protected]> Cc: Johannes Weiner <[email protected]> Cc: Nhat Pham <[email protected]> Cc: Vitaly Wool <[email protected]> Cc: Yosry Ahmed <[email protected]> Signed-off-by: Andrew Morton <[email protected]>
1 parent 34f4c19 commit 074e3e2

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

include/linux/memcontrol.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1759,7 +1759,7 @@ int __memcg_kmem_charge_page(struct page *page, gfp_t gfp, int order);
17591759
void __memcg_kmem_uncharge_page(struct page *page, int order);
17601760

17611761
struct obj_cgroup *get_obj_cgroup_from_current(void);
1762-
struct obj_cgroup *get_obj_cgroup_from_page(struct page *page);
1762+
struct obj_cgroup *get_obj_cgroup_from_folio(struct folio *folio);
17631763

17641764
int obj_cgroup_charge(struct obj_cgroup *objcg, gfp_t gfp, size_t size);
17651765
void obj_cgroup_uncharge(struct obj_cgroup *objcg, size_t size);
@@ -1843,7 +1843,7 @@ static inline void __memcg_kmem_uncharge_page(struct page *page, int order)
18431843
{
18441844
}
18451845

1846-
static inline struct obj_cgroup *get_obj_cgroup_from_page(struct page *page)
1846+
static inline struct obj_cgroup *get_obj_cgroup_from_folio(struct folio *folio)
18471847
{
18481848
return NULL;
18491849
}

mm/memcontrol.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3036,21 +3036,21 @@ __always_inline struct obj_cgroup *get_obj_cgroup_from_current(void)
30363036
return objcg;
30373037
}
30383038

3039-
struct obj_cgroup *get_obj_cgroup_from_page(struct page *page)
3039+
struct obj_cgroup *get_obj_cgroup_from_folio(struct folio *folio)
30403040
{
30413041
struct obj_cgroup *objcg;
30423042

30433043
if (!memcg_kmem_online())
30443044
return NULL;
30453045

3046-
if (PageMemcgKmem(page)) {
3047-
objcg = __folio_objcg(page_folio(page));
3046+
if (folio_memcg_kmem(folio)) {
3047+
objcg = __folio_objcg(folio);
30483048
obj_cgroup_get(objcg);
30493049
} else {
30503050
struct mem_cgroup *memcg;
30513051

30523052
rcu_read_lock();
3053-
memcg = __folio_memcg(page_folio(page));
3053+
memcg = __folio_memcg(folio);
30543054
if (memcg)
30553055
objcg = __get_obj_cgroup_from_memcg(memcg);
30563056
else

mm/zswap.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1258,7 +1258,7 @@ bool zswap_store(struct folio *folio)
12581258
* cgroup-aware entry LRU, we will push out entries system-wide based on
12591259
* local cgroup limits.
12601260
*/
1261-
objcg = get_obj_cgroup_from_page(page);
1261+
objcg = get_obj_cgroup_from_folio(folio);
12621262
if (objcg && !obj_cgroup_may_zswap(objcg))
12631263
goto reject;
12641264

0 commit comments

Comments
 (0)