From mboxrd@z Thu Jan 1 00:00:00 1970 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 22B88C83F09 for ; Thu, 10 Jul 2025 03:37:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B8ED06B009F; Wed, 9 Jul 2025 23:37:41 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B66866B00A0; Wed, 9 Jul 2025 23:37:41 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A54C36B00A1; Wed, 9 Jul 2025 23:37:41 -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 93D6B6B009F for ; Wed, 9 Jul 2025 23:37:41 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 602DCB90FE for ; Thu, 10 Jul 2025 03:37:41 +0000 (UTC) X-FDA: 83646945522.29.65C17D6 Received: from mail-pg1-f176.google.com (mail-pg1-f176.google.com [209.85.215.176]) by imf20.hostedemail.com (Postfix) with ESMTP id 864BA1C0017 for ; Thu, 10 Jul 2025 03:37:39 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=k1B90iwy; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf20.hostedemail.com: domain of ryncsn@gmail.com designates 209.85.215.176 as permitted sender) smtp.mailfrom=ryncsn@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1752118659; h=from:from:sender:reply-to: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:in-reply-to:references:references:dkim-signature; bh=Bl/mZF3g2hMilPsP1iGl5oIVwOLv3WwEcuUx0SZOALE=; b=1iZvywi7rMbzwzoEgyS8JQoEsBSL8BX0KQ22OsSwRa2b+b96w4ykjBoe2nRWyR2MQ6/o+4 UUcCdunv+qWD8QP2ukOo7mFDIpHaeNCedgNQK4eQZI764Wezg7kxulzBAPMJVWwmn6CCyX v/1h0Q1c37ekuf3xsuJ9upF+AgaiyEA= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=k1B90iwy; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf20.hostedemail.com: domain of ryncsn@gmail.com designates 209.85.215.176 as permitted sender) smtp.mailfrom=ryncsn@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1752118659; a=rsa-sha256; cv=none; b=5EXn76y6QLu+BYCjq0IY8DIuC+FSgE4FgSdmAuAf4JJDxg/JTh2Gae0qFNMd1XdteNXg/m N0JUmZlisMrH6fCOpfmmS8Tof9J+gzZr4fQ6h4t749RjV0I6c+3uYVUf6Zj0sNUpuufKaW dwS1AA0ZAmcaaq8YYr/723hRudDEq9M= Received: by mail-pg1-f176.google.com with SMTP id 41be03b00d2f7-b39011e5f8eso622868a12.0 for ; Wed, 09 Jul 2025 20:37:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1752118658; x=1752723458; darn=kvack.org; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=Bl/mZF3g2hMilPsP1iGl5oIVwOLv3WwEcuUx0SZOALE=; b=k1B90iwyh8qXC9AomISxLArBRl5gpqKc3PsX/Uefwrs/0l73nH0QKy3yrtrJtdYlD/ bQXAA0VV24mFTv9iT45N66mqXOiTC7ANpU8FF7DADXXNGTBTSqkmqekNI8KkHEYbDcR6 5rk69JIMlzCfPwu6Z6wWqjplUGx0FkcmLhgo8IEPfte80/WKsmXoyZrTNWHT7XRjuOLo unffL8nXSMk7uY5qiow1g/B9Vw85V0NDXTKwhE4ddMorDq/xRJT/Lb4Ceh0ouH/UNNVk Cj9l6Hj7voiVq8iZTuJjD5s8nVNBLBopAEm2U9XMiU4nbQ8cIOJJgiF9xDuuSVB+Dpi4 55jQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752118658; x=1752723458; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=Bl/mZF3g2hMilPsP1iGl5oIVwOLv3WwEcuUx0SZOALE=; b=d8VHgRsfBj7T/o+69n27RBKJq63xSwbl/xes/V8anX/nKEgclrhfy5fipXHjPbI6EW d9pKMevV0+1OqpIabLuL11pPKzVxBKY9sdfWsTkC9Vpjn2cLskrfcpFrBNiDwWTpT+zk g1TTIXl3+4FK9ufiKjXYsPW8k7tdX6FoGZusG+SXzP+XjrlsTWRaD8SsBrynUi0/Ktny e8y3qW3HPmYirdTP4PGz7NvAnYwtU8joY6avKihpfwBzNi4h7QTvPizEt/tLnHl2dDyR 8s5QbYEmTAOhNyGyZ2EF+qaVHurZ6qtGndQV0+t0ik0D6W1FaFNz42PaH+fbOkUYoaeK Wz7Q== X-Gm-Message-State: AOJu0YwGbsAE3ISTQsupjZUnsgmGexgSrMp3yrjvTHsECz0fNCw/jCvQ OFKwkVpLpSd1BjBkMOfqrQ9ZSfuK4UwYi6h1nCO9iRz1N3OngNDEphpXJCCkO0PXCbc= X-Gm-Gg: ASbGncsthy6ulgzW5QTZTct9zOcupnGAugbyGL2DOBFr6E41BBw/xXiUepepgCLHicN 49T2lxHppkNlgR2D137zro87L+owiPPEwgxiAYf1UvVrUEAF+2z8+ETlcRCWgRBE4x/Pefty4AD fqoE4anNJIHHTlsPsvxJEJmjIWE8TxKexrW1pPoxomBtipBMBaQjPW6S/nnM2lo5tIqkfXb9cS3 caZ9cPs2XqNQqUgS5pJC2bIzpUCpOeIUZyEeyQ1AmGg/9Tz9wXiHPe13rnETHPqeXjOAO9uGSDP qXtMeP8RtfsY6pE2VP9r6McBYWfXGu41J4qEjjTPiA2zQbhj+Jgs+3Koo1ZNi7R9ix07m0TzjeM k X-Google-Smtp-Source: AGHT+IHjm1osjfE3BDbqUtnApUOiVzDzZtYqYWPkiNlunBCJHYXm4X1KAkOQOJDiTMx24KRJxs5NqA== X-Received: by 2002:a17:90b:1f8d:b0:311:ffe8:20e9 with SMTP id 98e67ed59e1d1-31c3f00b99bmr1966495a91.17.1752118657447; Wed, 09 Jul 2025 20:37:37 -0700 (PDT) Received: from KASONG-MC4 ([43.132.141.20]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-31c300689aasm3716320a91.13.2025.07.09.20.37.33 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 09 Jul 2025 20:37:36 -0700 (PDT) From: Kairui Song To: linux-mm@kvack.org Cc: Andrew Morton , Hugh Dickins , Baolin Wang , Matthew Wilcox , Kemeng Shi , Chris Li , Nhat Pham , Baoquan He , Barry Song , linux-kernel@vger.kernel.org, Kairui Song , stable@vger.kernel.org Subject: [PATCH v5 1/8] mm/shmem, swap: improve cached mTHP handling and fix potential hung Date: Thu, 10 Jul 2025 11:36:59 +0800 Message-ID: <20250710033706.71042-2-ryncsn@gmail.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250710033706.71042-1-ryncsn@gmail.com> References: <20250710033706.71042-1-ryncsn@gmail.com> Reply-To: Kairui Song MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 864BA1C0017 X-Stat-Signature: dktthmzysj1ykzmt4xdrp7cpt7zu1ntz X-Rspam-User: X-HE-Tag: 1752118659-199563 X-HE-Meta: U2FsdGVkX1/xlH8AWUtZjp1XX+VYxHXqEBNlQQvVJCp+ONqxTTNcaq7EZFKIZzsPud9pYuLTdPCulMlHnLX0v1ZHkuApAXV1batRLfM7G57233gGzo4Fyk9nauyibXKdIOwxVE3fosC47j4mUmAQDoRuStcKM89WIrdY49z/TXTXcj/H9I/MujiMxKK39L95fldvr47+mGTe52mPz/g91xg0KWt9bYJBg3pI5THdiiExp3mMoOwtFKfPFSuPF/IjHlvyyzbYyft672SA/tX2+Gzjd3V2sSDxv4ow2MgZbhmBAzm9jHzJjmKV41M1r6CvHLbkbbP4YtUIgmmdbVvA/b9Ju6ipawbphl8caVeUCXnGe5p28ti4qUIkYNFwb2yUADsqtvs0AD8ME+IZrzqY9wmNup/iU6oB2C5DZjL/UWw4LEPA0Kdo1D3LpJ68el63cyRlX4N/1CuuN9db5WF9ihbqeZeS25y+zDV1jEvtV/4h4y44jKLjh4nbvbnIBkdEHd5pCV/SvjlxYT8l2UIMfsEBPC8W+tCCbvVyUDaBEoiNbAH5tecFgKINE8KYyMpKsqpAylBhJR1i2IeBo1TVNnHVCm83aYXfVDFMlzKamTXjkOR/jAL0sRBispVIx9lj8T+bJVWTbsZBSzxIMRYUh/RQn/XTE69WWEtmw/FWWUzcIImo0N8VlOFUxUAsshnphptMpJOkl0Xmhaxq7MzfKVBukg4NYpZMr9PDTTEZHGa57Kl2TDyzcaR86TcH1mqi+6sYLjDIsVtw2VBaYIpF8WjLtgqk7yTlDQVxGBDb0On8Xl/pimoDG4djbCJvwJ2E7E9w7sowo5k/omWktX2AfiTo7MER1s8ZaFv0T1MY+9yRO8rkIKmQP9OAXfV8rH6fOiD1vKyR73VfT56obrLXKt85ajaPkljmOtftXvV1SXMwjRR4Nz6C1qxjLe3+R+cKD9mDHAfJAGhgs2xtbfK 8daGBS3R lofZxjRFLvzy082K/Mp6TEsK39cDedxg886wqZKImuNJAfFUHTOzPZXZcou+ozTL0AInuLo/eYhoHas3N29Vk6YIz60z/kclFKjtxAqgLY94cjmvpgSo6+qN99PONMhoQqGxoiHJAxlH/ik2H4R6UQjDr7pB1QvEm4ixVPfLs6KhR/ZvKAmIk8dT4jH0b+BqJm1ZJA33w/cpX8q5NJVtVv4PdM9hP8NRijcZ0WVUxLjPkXgMoWTq7YF4JwAy9QNLbcZfc20a0K0zheCUL5gb+y06mIf98qO6TZZwS/IQ2bow8JCG59tzJBBUUntahc/uNbkho948gHG0TVCq2FDGYZEc7iEnxMqgrkB4mJkfwcQals60opX3mGuRAh8Go5RXeuUGV4AUvyVTw3xg5M4F+PZSKZ05SSBmAabDbl4D9thJ5x0mhR4kNeZ/JM4qgswjx8KwWnPPN6n7CtKLUdRi0Ta28XYvp2DT1DpBMOomCXWBZSToSIX9rMPPSuCIqTC7nyE9KbEJj+c81d6SfRda2aAVbgIlHBPYr+udJjpJJt8yZ8AarIqXdL5QEP+T15vh3Z1cNrxYM97O5NIpd0MOoty6hqBpI9Cy9oouVD1TnfSc7xgD4x/g7AxYAp8+sw4kWOQ3A8NOVxZqceZLEHQsRpT0zCEmxn8PiMsKeH7R6aU0mBC8= 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: From: Kairui Song The current swap-in code assumes that, when a swap entry in shmem mapping is order 0, its cached folios (if present) must be order 0 too, which turns out not always correct. The problem is shmem_split_large_entry is called before verifying the folio will eventually be swapped in, one possible race is: CPU1 CPU2 shmem_swapin_folio /* swap in of order > 0 swap entry S1 */ folio = swap_cache_get_folio /* folio = NULL */ order = xa_get_order /* order > 0 */ folio = shmem_swap_alloc_folio /* mTHP alloc failure, folio = NULL */ <... Interrupted ...> shmem_swapin_folio /* S1 is swapped in */ shmem_writeout /* S1 is swapped out, folio cached */ shmem_split_large_entry(..., S1) /* S1 is split, but the folio covering it has order > 0 now */ Now any following swapin of S1 will hang: `xa_get_order` returns 0, and folio lookup will return a folio with order > 0. The `xa_get_order(&mapping->i_pages, index) != folio_order(folio)` will always return false causing swap-in to return -EEXIST. And this looks fragile. So fix this up by allowing seeing a larger folio in swap cache, and check the whole shmem mapping range covered by the swapin have the right swap value upon inserting the folio. And drop the redundant tree walks before the insertion. This will actually improve performance, as it avoids two redundant Xarray tree walks in the hot path, and the only side effect is that in the failure path, shmem may redundantly reallocate a few folios causing temporary slight memory pressure. And worth noting, it may seems the order and value check before inserting might help reducing the lock contention, which is not true. The swap cache layer ensures raced swapin will either see a swap cache folio or failed to do a swapin (we have SWAP_HAS_CACHE bit even if swap cache is bypassed), so holding the folio lock and checking the folio flag is already good enough for avoiding the lock contention. The chance that a folio passes the swap entry value check but the shmem mapping slot has changed should be very low. Fixes: 809bc86517cc ("mm: shmem: support large folio swap out") Signed-off-by: Kairui Song Reviewed-by: Kemeng Shi Reviewed-by: Baolin Wang Tested-by: Baolin Wang Cc: --- mm/shmem.c | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index 334b7b4a61a0..e3c9a1365ff4 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -884,7 +884,9 @@ static int shmem_add_to_page_cache(struct folio *folio, pgoff_t index, void *expected, gfp_t gfp) { XA_STATE_ORDER(xas, &mapping->i_pages, index, folio_order(folio)); - long nr = folio_nr_pages(folio); + unsigned long nr = folio_nr_pages(folio); + swp_entry_t iter, swap; + void *entry; VM_BUG_ON_FOLIO(index != round_down(index, nr), folio); VM_BUG_ON_FOLIO(!folio_test_locked(folio), folio); @@ -896,14 +898,24 @@ static int shmem_add_to_page_cache(struct folio *folio, gfp &= GFP_RECLAIM_MASK; folio_throttle_swaprate(folio, gfp); + swap = iter = radix_to_swp_entry(expected); do { xas_lock_irq(&xas); - if (expected != xas_find_conflict(&xas)) { - xas_set_err(&xas, -EEXIST); - goto unlock; + xas_for_each_conflict(&xas, entry) { + /* + * The range must either be empty, or filled with + * expected swap entries. Shmem swap entries are never + * partially freed without split of both entry and + * folio, so there shouldn't be any holes. + */ + if (!expected || entry != swp_to_radix_entry(iter)) { + xas_set_err(&xas, -EEXIST); + goto unlock; + } + iter.val += 1 << xas_get_order(&xas); } - if (expected && xas_find_conflict(&xas)) { + if (expected && iter.val - nr != swap.val) { xas_set_err(&xas, -EEXIST); goto unlock; } @@ -2323,7 +2335,7 @@ static int shmem_swapin_folio(struct inode *inode, pgoff_t index, error = -ENOMEM; goto failed; } - } else if (order != folio_order(folio)) { + } else if (order > folio_order(folio)) { /* * Swap readahead may swap in order 0 folios into swapcache * asynchronously, while the shmem mapping can still stores @@ -2348,15 +2360,15 @@ static int shmem_swapin_folio(struct inode *inode, pgoff_t index, swap = swp_entry(swp_type(swap), swp_offset(swap) + offset); } + } else if (order < folio_order(folio)) { + swap.val = round_down(swap.val, 1 << folio_order(folio)); } alloced: /* We have to do this with folio locked to prevent races */ folio_lock(folio); if ((!skip_swapcache && !folio_test_swapcache(folio)) || - folio->swap.val != swap.val || - !shmem_confirm_swap(mapping, index, swap) || - xa_get_order(&mapping->i_pages, index) != folio_order(folio)) { + folio->swap.val != swap.val) { error = -EEXIST; goto unlock; } -- 2.50.0