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 37D15C83F09 for ; Fri, 4 Jul 2025 18:18:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C65ED6B8060; Fri, 4 Jul 2025 14:18:07 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C15EA6B8059; Fri, 4 Jul 2025 14:18:07 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B06AD6B8060; Fri, 4 Jul 2025 14:18:07 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 9D5496B8059 for ; Fri, 4 Jul 2025 14:18:07 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 184BB107849 for ; Fri, 4 Jul 2025 18:18:07 +0000 (UTC) X-FDA: 83627391414.05.1F66797 Received: from mail-qk1-f174.google.com (mail-qk1-f174.google.com [209.85.222.174]) by imf18.hostedemail.com (Postfix) with ESMTP id BD5721C000A for ; Fri, 4 Jul 2025 18:18:04 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=bKMWpEeM; spf=pass (imf18.hostedemail.com: domain of ryncsn@gmail.com designates 209.85.222.174 as permitted sender) smtp.mailfrom=ryncsn@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1751653084; 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=E7DvuZow/DhwGLwOTFHnf7Dnv3zcbK3xvGo89NfVbr902b6hi4RmBcPao7lOF6d6wrrY15 zPYv6a7ibTUMhd9BdYm2oENJncdcVByGvFdCFHTgtON/vebmsXeOmIIsCp4ikDJfpO3sGx oNNWVfOQYrNTr1uX+mI5kTfVQ8rspWs= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=bKMWpEeM; spf=pass (imf18.hostedemail.com: domain of ryncsn@gmail.com designates 209.85.222.174 as permitted sender) smtp.mailfrom=ryncsn@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1751653084; a=rsa-sha256; cv=none; b=IG72/KAhpx2b1fXyIrRWDie7bp1U9S4mrkcmdLpXtC+c4Sxy/BT/TRRSu7yBesVcSBV2qN B3QuNoqSmW2LDV1+FtDq6fw2gIvIn/qsFzp2T3h1g6lKygo5xPbrLn9Rh3JWxLfaz/MtZl CjTy9Ibf7EF76IKl039rM4UA4/AjwnM= Received: by mail-qk1-f174.google.com with SMTP id af79cd13be357-7d219896edeso142829985a.1 for ; Fri, 04 Jul 2025 11:18:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1751653083; x=1752257883; 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=bKMWpEeMeBOFaQhExt5qnF8ouVoem1yexR+98MO5mX15Yw/rAEgwUCZwCbxX6Es+x/ cJbHdAuc/DF//WTddsbDAGT3AtCrwqTAsyf+5FXF4BgaKp5+cTjGdaCrXdhFD8uMRlg+ fv6i7VmXzBFnQJv2RwkFLyJ1X8WiVtGDB38M4ZWI/3+iCCSY7llxUe/xPVoOYZ8dlc8O HnKsm6MyDiKNQq/g+DS1MvcDH5UrWmfGEnf2tGhIeriBNxXSAURLORy2Ds+bwhoSTuG7 u2knlsvUIQ3FeCzxFPquob6eiAE5AsIm4Rd7BwRKqDu8/oOGyVI8hRze27uG5rRfEEzj eAtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751653083; x=1752257883; 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=BSCPB1JSTT+ZqpJyEn/mhW4iztWzdtowRMf27SPgipxhr9yB4GjWmpWxb3xT5D/5f2 DcMyp+X471tQ7TT8Li+gD8zGJQrb4cSKG4abRuuCSry3a80U9918TWTVUr5IrFreEPhN v7ZMl4H+rmGszdz7BWpe/KJ9bvZ8UTLeDnEGPxhofWmCtuplUSgcAC+EJ+3aiEGN4y1f UU6J61/WFdoIwXOVOJdtOWMGWRJ4tEHxWc9nvdh058hEWZ6IU1AG2Ua4SpnTPpUWzqxj NbSpEhVsX3xm3tbbnJQoNebjw2b9t/uWj4ymFNe+9er5XvpIVi/BSBascrlmr/p5fpgp ByEA== X-Gm-Message-State: AOJu0Ywo1vej5TilZkgAb6LcyU/CAIL0DAGvM8WEG+CJmrFZrRcjzD23 WnTl+i9iGpre7zauiXr+HZRofhNQBCg/+YFrNsfpeWDfP6uOn82ni6/ctF0DFNOsgJg= X-Gm-Gg: ASbGncvA7cr4kctTYmjKSkPtYQ1RziRcePfSeXVqKcg2MP0apGBrDpd5ITXvBrH3S7E f/4ZfLiKvSLY9rOaq2r2H6eZjzkMniy4v2RusSXWWjvfw2LF5muxNZpnFhfrUJ9WLyMSXLrWOTX TJC8oPA+gGu1tvRtDLBk56onnFFDnYIJj9I+ucicstVKqrMZYKOnEVz+Oo83BPXY+3uJaVLLt93 vNPCZmhfrLVJh7EBBOJnNfHayUAGIlL2J9RfItIe0fK5nzCo0uu4WMCvNG37B2EE2ZNSCO4GBaB GklgVVOX+7vjvpAMYmlMk4wUxD9VTZDhdgdWCCFdrOe6cKk0xrZEbzXCR9WN01a+ZFA= X-Google-Smtp-Source: AGHT+IFy3tLLLYtnh/8YAuJviyCcHo1jFc1c5QzCjrQPfcPthvfTb7Ko7B/LTrElXNHWG9aZmoeYiQ== X-Received: by 2002:a05:620a:4147:b0:7d3:a580:c197 with SMTP id af79cd13be357-7d5ddc2f78fmr380974585a.31.1751653082750; Fri, 04 Jul 2025 11:18:02 -0700 (PDT) Received: from KASONG-MC4 ([101.32.222.185]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7d5dbe7c188sm183300585a.59.2025.07.04.11.17.58 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 04 Jul 2025 11:18:02 -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 v4 1/9] mm/shmem, swap: improve cached mTHP handling and fix potential hung Date: Sat, 5 Jul 2025 02:17:40 +0800 Message-ID: <20250704181748.63181-2-ryncsn@gmail.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250704181748.63181-1-ryncsn@gmail.com> References: <20250704181748.63181-1-ryncsn@gmail.com> Reply-To: Kairui Song MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Stat-Signature: hn1kyrw1iorz65bjpbsx6rthbzifrmr6 X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: BD5721C000A X-HE-Tag: 1751653084-752367 X-HE-Meta: U2FsdGVkX18UC2zrpYqO8dOh/mTl7OGiNMLducerr3gXjCWr5141xcH3ZA04PosaDXxYt8FDqh77SoOEoTMzzOUQBubVn3eopem8NMd/S6SshF+4ghrByd0uyur/wBspWOFuRZzGmSNUxvaANczmkSa/SDrnrTjHJ9pj9MyV3u7fP/GFx1jkH80HLXh5OwIRdFSPKKVHh8wjcI5Cns83Z9UCXPPC1bJ5WdTUyo/1i7v9n5NlZWh3lsqZz5424Z2gMJbPxyWInQYiRGMKT9tQI0SxJNKkbMQmlQ0EK0e3DxLnjm+6D5C9Z/c3zgxQJdDqUjhX+Ov8Xw4HnsS5RDg40RcjajIip4nvyexUKmwZUlZGiNxbnG32GAgkugjBx3R/03QFStB/Bf2cP/kIZJ/UI0abE8s5PNouw+c+VlBxOnuI9WVp3MQMeqt7NUkCE6Sl191+aqnw0JPcLYrvAngs6k8RkvZ4j2GQoAyptIkg3VHXardilxv84IkvLNtTtJhXIJHPIhAEhsnN7UdE/rElcdzi5Qt0SDz08Xi2BVaoKGnFug8mCAEGzG5pelzMBZN2BtxMEo+39CXjR5L8lRj0NdS1MhJ3A7cHYeb7CqEK+BCg5lhZ76gsuaes2Uc52l2KCsMDZZItL0KnOlS6E8n8E2hr6T0IFY2LWWjXE9kDi534lhjzyb4POJrbZXt5XIKkxT2ARBrnKn5+1HE1T3teG+x974r9822BCtficpW9ML6yAWoOjzsCi5JAA2GDge/g5eVPrj0Q0AHMFqyPebyexp97I8xBPXgTIvRFd5mN3IPGWAAgrE4BoipXoqzKkA+3WIsfrXk/OtHfllYOmsVznw0/6Z3Cnq7Y+B3GLQxsCxhjcsLjZX3aOgljbpwJ1cZYzWLBYF7PVrr9dL3R67ct8y43UFctCqehcqSjbsK6J3D+N2jfQcMSpaM3eJiAEFLrQkwVGnGPwYqtFdyWGCg q1I0DKIS CjO5ctg+gyQMt8rhkxd2o+DCqyLUx8D5+0saTzGNj+KQnYzF+PvGQCyi6dywa2hdufE6W5PmWQNLyO3WFkR4mR83YDBVnshADxV7lxeMs7gd4gLZxZY+UoaVJahuCuF0VqFcyfmfuOu1QwsXnxnpg94pBVO5vTp8ILQD1MfBwGLj0Iqr+ifp6jP4pEcFpA+maBdHS7Tuf4IqDNWXbT2SAebnL2xzuWzS85cSq08rP8ALu1Cpkyte8dsGWuCuTMkXJHJ/qncMiAQ8W1/2Q6klwGT1bIEmRwUgMRY3D6LhWOGCPQPhOW5/lKyk+iMHDb2MpcBddSh/MUpL8V5cSGUw2AU2f7jQthy3qTUXEERONFAREehDeyZaFcXrnSxmE7oNi5JNOoi03Z6kBg45IJJsLowZJJo7lANU8QjqObSCaNMLm8snqJ2AJAuIkXPX7U2GeF1uqqgzVNRXR1UnKbE52NziNL7b7ad63pHlmwNPCbpYCs0XJcR24grHryspaGErpCen00pumb4wBl+ar8RMfBHWntSP/Ie22/EjCRT2UpKtTfBG+UGDeTnBGJVTBipSYSFHBtznmmnBBibAi7Q3zeEEn/6He017yr/+A7dm0l3jlTjw96ajwyty3smiOz7WCUIdhOvwFAG5LOo2GZk9M4qT09mXUFFtp9+IwxJA/bmjmeHs= 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