The shrinker for unused huge tmpfs folios can dereference a NULL memcg if it races with the migration of the folio at the end of a file. folio_memcg_list_lru_alloc() assumes that folio_memcg() is never NULL. But it is NULL until the folio is charged, and a migration target can be in the page cache before charging. shmem_unused_huge_shrink() looks the folio up without the folio lock, so we can race with migration: __migrate_folio() shmem_unused_huge_shrink() ================= ========================== __folio_migrate_mapping() xas_store(newfolio) filemap_get_entry() returns newfolio folio_trylock() fails shmem_unused_huge_requeue() folio_memcg_list_lru_alloc() folio_memcg() is NULL memcg->kmemcg_id folio_migrate_flags() mem_cgroup_migrate() commit_charge(newfolio) Fix it by keeping the original objcg around while the inode is isolated. Fixes: 743e7d025d2f ("mm: shmem: make unused huge shrinker memcg aware") Signed-off-by: Chris Mason --- mm/shmem.c | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index 10cef89b00b0..4465a43d6f74 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -758,6 +758,13 @@ shmem_unused_huge_alloc_lru(struct shmem_sb_info *sbinfo, struct folio *folio, { int ret; + /* + * A migration target is in the page cache before it is charged. Once + * charged, its objcg can't change while we hold a folio reference. + */ + if (!mem_cgroup_disabled() && !folio_memcg_charged(folio)) + return ERR_PTR(-EAGAIN); + ret = folio_memcg_list_lru_alloc(folio, &sbinfo->shrinklist, gfp); if (ret) return ERR_PTR(ret); @@ -887,12 +894,11 @@ static enum lru_status shmem_unused_huge_isolate(struct list_head *item, return LRU_REMOVED; } + /* keep shrinklist_objcg, requeue may need it */ list_lru_isolate(lru, item); - objcg = shmem_get_and_clear_objcg(info); set_shmem_unused_huge_isolated(info); list_add_tail(&info->shrinklist, &scan->list); spin_unlock(&info->lock); - obj_cgroup_put(objcg); return LRU_REMOVED; } @@ -928,32 +934,41 @@ static bool is_shmem_unused_huge_match(struct folio *folio, static void shmem_unused_huge_drop(struct inode *inode) { struct shmem_inode_info *info = SHMEM_I(inode); + struct obj_cgroup *objcg; spin_lock(&info->lock); list_del_init(&info->shrinklist); + objcg = shmem_get_and_clear_objcg(info); spin_unlock(&info->lock); + + obj_cgroup_put(objcg); } static void shmem_unused_huge_requeue(struct inode *inode, struct folio *folio) { struct shmem_inode_info *info = SHMEM_I(inode); struct shmem_sb_info *sbinfo = SHMEM_SB(inode->i_sb); - struct obj_cgroup *objcg; + struct obj_cgroup *objcg, *old_objcg; int nid = folio_nid(folio); objcg = shmem_unused_huge_alloc_lru(sbinfo, folio, GFP_NOWAIT); - if (IS_ERR(objcg)) { - shmem_unused_huge_drop(inode); - return; - } spin_lock(&info->lock); + old_objcg = shmem_get_and_clear_objcg(info); + /* The lists for old_objcg exist, the inode was queued under it */ + if (IS_ERR(objcg)) { + objcg = old_objcg; + old_objcg = NULL; + } + /* Requeue the inode to shrinklist */ list_del_init(&info->shrinklist); shmem_unused_huge_lru_add(sbinfo, &info->shrinklist, nid, objcg); info->shrinklist_objcg = objcg; info->shrinklist_nid = nid; spin_unlock(&info->lock); + + obj_cgroup_put(old_objcg); } static unsigned long shmem_unused_huge_shrink(struct shmem_sb_info *sbinfo, -- 2.55.0