From patchwork Fri Jun 14 00:49:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baolin Wang X-Patchwork-Id: 13697692 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 58AF1C27C75 for ; Fri, 14 Jun 2024 00:49:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4DFCD6B00A6; Thu, 13 Jun 2024 20:49:32 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 48F666B00A8; Thu, 13 Jun 2024 20:49:32 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 37E9D6B00AA; Thu, 13 Jun 2024 20:49:32 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 18FAF6B00A6 for ; Thu, 13 Jun 2024 20:49:32 -0400 (EDT) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id C9229A039E for ; Fri, 14 Jun 2024 00:49:31 +0000 (UTC) X-FDA: 82227660942.26.876B945 Received: from out30-133.freemail.mail.aliyun.com (out30-133.freemail.mail.aliyun.com [115.124.30.133]) by imf23.hostedemail.com (Postfix) with ESMTP id DEA2014000E for ; Fri, 14 Jun 2024 00:49:29 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=dvNwvf77; dmarc=pass (policy=none) header.from=linux.alibaba.com; spf=pass (imf23.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.133 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1718326168; a=rsa-sha256; cv=none; b=SDf3ih8dZy2TVST1jmyXjNLRloVhnon5xTPID6tDmzec6HhTi9A8Usnx8qISAKBtxSulxz T/nCF0bxcY7IW6/xiVwLbGupwVSlQ22AJuYH0xm5TxvhtvDWSqCz41uaVhRWmfrptmnc1D GZTVtsibvjfT1VowOtY0IdEhP/0UYk4= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=dvNwvf77; dmarc=pass (policy=none) header.from=linux.alibaba.com; spf=pass (imf23.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.133 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1718326168; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:references:dkim-signature; bh=Z6jkMmRB8swkEwPnU1U4t7PuL8OFWR4mPrX+ypimZlA=; b=yX3xg+MSqUBCXWcdzrAPSoo5xZz6WHUEuWmsEuqizmfLIsnBSzgybGdWbgT5X9Bxtk/9hj +oJMX9JBPh88bgyF4dGlFFIlNZHDsOcdsXtHs2/yEhk3zp8QjS4cAF2GVhiV6NADoJq3fJ 5IeoYWO2Del2F/cDq/wpKinQ+E9c4N4= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1718326167; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=Z6jkMmRB8swkEwPnU1U4t7PuL8OFWR4mPrX+ypimZlA=; b=dvNwvf773JjfCvO+aAxAlI9di289/q/85tyExmEB1LIaWyy6ym8mCU00F5oGMhp4A6eELycXMgySKSjZvj1C1ZxJD2kg1SybJh21KUYY+hRueHJE9HSH0TVvI2Je6J0QzCbKe5WF28GNZtBejscRo/YKCoyRUEgHnVCzmfKvEhQ= X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R121e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=maildocker-contentspam033045075189;MF=baolin.wang@linux.alibaba.com;NM=1;PH=DS;RN=12;SR=0;TI=SMTPD_---0W8PHTzl_1718326165; Received: from localhost(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0W8PHTzl_1718326165) by smtp.aliyun-inc.com; Fri, 14 Jun 2024 08:49:26 +0800 From: Baolin Wang To: akpm@linux-foundation.org, hughd@google.com Cc: mhocko@kernel.org, roman.gushchin@linux.dev, shakeel.butt@linux.dev, muchun.song@linux.dev, hannes@cmpxchg.org, nphamcs@gmail.com, yosryahmed@google.com, baolin.wang@linux.alibaba.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v2] mm: shmem: fix getting incorrect lruvec when replacing a shmem folio Date: Fri, 14 Jun 2024 08:49:13 +0800 Message-Id: <5ab860d8ee987955e917748f9d6da525d3b52690.1718326003.git.baolin.wang@linux.alibaba.com> X-Mailer: git-send-email 2.39.3 MIME-Version: 1.0 X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: DEA2014000E X-Stat-Signature: qoco5gjcrmox3uaae11gebs5eb6rpk8m X-Rspam-User: X-HE-Tag: 1718326169-131586 X-HE-Meta: U2FsdGVkX1+bK0HuVUZxGX6OEA+jnbmgzh4f+ShvUWG5OE9BSdbq8/qtHtd3h6r6zM4cv95dZL1eFEFzZqei9zSkMPiN928My0sFbtVXxUdY+xCWEmQO0u8DnwCW7P/HMccqKMn+1ImcwFnOjze/YZsp5lPeROT8ke95LwK37r27umFSgu84i8vFSWu4ne14UedUtWsWmEbc5cWgAenUsnB1sOLCR+/HM2deTDVTQbfQC5WUQ2dtjxcrAl9Rdhl9zDshZVUvTGf6uItYpKZd2TmnxTCe50gxlQHshIf58N/zY35Rmb08X/9m8guGb0igmA9Ety+4Nek9wYK3nNQn+Iy0cVrx9TB7rzZCD6IqCPdFoJn1pLpCCTgu5pN4Pl7aIji00dh4XB2kY82ywbTn5HNc3j8ZrCPG3najc/Bw7IE1GQvUkR8JcPWOoKgye9RQ+aBnCLr+oc8O63UrkPcpuvh/hfrRlctocUCD3x1ndybd1YzY6EmCeIdP3ru4hosetJaaJyxbgEy7jWCxSCcEU78mbVdKktyQN/6ze/bbVfJAoburtTOzEeyGYwOmAGGq5l8EP7/hQ1vMRmjWC4deuSaJjg78D7wimVGlaHKJ7qolg3tgF4+j+whoYZCX+U5iLcUAN9D2hL5yJ6mSBV7fHebacJEyCvEHlJlk6AZXf7hOflQL5YLuSkRnOtmYgphZKBRlkyRQWzczFHUEiuRV7BruI019aDgiPIHbCtOAhejfJiZSssI7vTVs323QSROcFwrtHNCMug7VcD38kZAyTx9BSLtVyTr1WzL3ux3zepTa1IVTz33A3Jy8Dq/2/k+2F3I086g5Bo/aQlHsQM55yF2o5BlM4mpz0TtA42hsVbLzbsWgmbWbPQrI84okeJCkpPC9lQijkP2mm3avGn+E95QCRSPPk6sciEoYtCspkDtp9aLnjYkJaVPVSDFk9RaetLfZtvaQRijDMISxB+l TH3FRxO5 2Nd9vUMZ9cxQQxXH5I3VmE+WwcP+LHu0TAzVNoyQfBZ6tr+nPe00LNfvmi/yJwVzx3hBhthIlmeRxt/SpvkNcKdIewwLBJQ2w6tBpPaLXCq0sxOXYDGhVIhCeurLtGZSxWKRixNCcRWvSJ9ah9cA1RafBmWAMsuzv4au14VIBk/nh7511Pqgw9FT2nP0/VJYHG6IHJ6KnRrFmHvELXklLIlTJoavF0KpivGOaUDuB+P9blv4= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: When testing shmem swapin, I encountered the warning below on my machine. The reason is that replacing an old shmem folio with a new one causes mem_cgroup_migrate() to clear the old folio's memcg data. As a result, the old folio cannot get the correct memcg's lruvec needed to remove itself from the LRU list when it is being freed. This could lead to possible serious problems, such as LRU list crashes due to holding the wrong LRU lock, and incorrect LRU statistics. To fix this issue, we can fallback to use the mem_cgroup_replace_folio() to replace the old shmem folio. [ 5241.100311] page: refcount:0 mapcount:0 mapping:0000000000000000 index:0x0 pfn:0x5d9960 [ 5241.100317] head: order:4 mapcount:0 entire_mapcount:0 nr_pages_mapped:0 pincount:0 [ 5241.100319] flags: 0x17fffe0000040068(uptodate|lru|head|swapbacked|node=0|zone=2|lastcpupid=0x3ffff) [ 5241.100323] raw: 17fffe0000040068 fffffdffd6687948 fffffdffd69ae008 0000000000000000 [ 5241.100325] raw: 0000000000000000 0000000000000000 00000000ffffffff 0000000000000000 [ 5241.100326] head: 17fffe0000040068 fffffdffd6687948 fffffdffd69ae008 0000000000000000 [ 5241.100327] head: 0000000000000000 0000000000000000 00000000ffffffff 0000000000000000 [ 5241.100328] head: 17fffe0000000204 fffffdffd6665801 ffffffffffffffff 0000000000000000 [ 5241.100329] head: 0000000a00000010 0000000000000000 00000000ffffffff 0000000000000000 [ 5241.100330] page dumped because: VM_WARN_ON_ONCE_FOLIO(!memcg && !mem_cgroup_disabled()) [ 5241.100338] ------------[ cut here ]------------ [ 5241.100339] WARNING: CPU: 19 PID: 78402 at include/linux/memcontrol.h:775 folio_lruvec_lock_irqsave+0x140/0x150 [...] [ 5241.100374] pc : folio_lruvec_lock_irqsave+0x140/0x150 [ 5241.100375] lr : folio_lruvec_lock_irqsave+0x138/0x150 [ 5241.100376] sp : ffff80008b38b930 [...] [ 5241.100398] Call trace: [ 5241.100399] folio_lruvec_lock_irqsave+0x140/0x150 [ 5241.100401] __page_cache_release+0x90/0x300 [ 5241.100404] __folio_put+0x50/0x108 [ 5241.100406] shmem_replace_folio+0x1b4/0x240 [ 5241.100409] shmem_swapin_folio+0x314/0x528 [ 5241.100411] shmem_get_folio_gfp+0x3b4/0x930 [ 5241.100412] shmem_fault+0x74/0x160 [ 5241.100414] __do_fault+0x40/0x218 [ 5241.100417] do_shared_fault+0x34/0x1b0 [ 5241.100419] do_fault+0x40/0x168 [ 5241.100420] handle_pte_fault+0x80/0x228 [ 5241.100422] __handle_mm_fault+0x1c4/0x440 [ 5241.100424] handle_mm_fault+0x60/0x1f0 [ 5241.100426] do_page_fault+0x120/0x488 [ 5241.100429] do_translation_fault+0x4c/0x68 [ 5241.100431] do_mem_abort+0x48/0xa0 [ 5241.100434] el0_da+0x38/0xc0 [ 5241.100436] el0t_64_sync_handler+0x68/0xc0 [ 5241.100437] el0t_64_sync+0x14c/0x150 [ 5241.100439] ---[ end trace 0000000000000000 ]--- Fixes: 85ce2c517ade ("memcontrol: only transfer the memcg data for migration") Signed-off-by: Baolin Wang Reviewed-by: Shakeel Butt --- Changes from v1: - Add reviewed tag from Shakeel. - Update related comments, per Yosry. --- mm/memcontrol.c | 5 +++-- mm/shmem.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index a811dfff10cd..4d9fda1d84a0 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -7780,8 +7780,9 @@ void __mem_cgroup_uncharge_folios(struct folio_batch *folios) * @new: Replacement folio. * * Charge @new as a replacement folio for @old. @old will - * be uncharged upon free. This is only used by the page cache - * (in replace_page_cache_folio()). + * be uncharged upon free. This is used by the page cache + * and shmem (in replace_page_cache_folio() and + * shmem_replace_folio()). * * Both folios must be locked, @new->mapping must be set up. */ diff --git a/mm/shmem.c b/mm/shmem.c index 99bd3c34f0fb..4acaf02bfe44 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -1908,7 +1908,7 @@ static int shmem_replace_folio(struct folio **foliop, gfp_t gfp, xa_lock_irq(&swap_mapping->i_pages); error = shmem_replace_entry(swap_mapping, swap_index, old, new); if (!error) { - mem_cgroup_migrate(old, new); + mem_cgroup_replace_folio(old, new); __lruvec_stat_mod_folio(new, NR_FILE_PAGES, 1); __lruvec_stat_mod_folio(new, NR_SHMEM, 1); __lruvec_stat_mod_folio(old, NR_FILE_PAGES, -1);