From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795028578; b=q8gXneSwrrONWQZhNJf+2Yfs3jGaID2oKdGOL12h8hHWo1ANSOmDpkllkJaJxT+CBH15 +jKsSCeeARNATJT/Pc2CthWWNdIAYmcHMAYip7hjxGYhDhbcX41TPjKGmn5db6h96+Oey NRy5r+tGkKF6va5MdpzDFqVXPbSUdVhloiAAyiVYM/iX96gIJ5wKL63aZw91ZiQd/Vg4v oCLO4if8RkmY0xSsAXv40QON11E5t7seVACYth66E1FHYRbJQSCjdBBe/8rqE6rS6Q3wV 474HAeq7DPAVe5mJ5ao9ctmlhM35L05PABzpidCGlk62t3lth5Abggy97f9JzI1rkiw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795028578; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=osmw9RgnkOazXAvr4wlPVkl+gha7JZh4Mdq/vIyxxjQ=; b=n2M76ApCBvzfbGAfqbZu+Uz6++NaI6/MxoENCa61OAycztIP0g5yMpxEADAUPz527+9L OJf6RERDoPkeGAo9113clCVEmdw73QQZJG+2rsj7pyv+cVisu+d8tpMjHNGYdSNKgU4va lgclXkzdLM5OpiXQwxYHXQbUQLzv4+cpUMpMw+VGercu1BlKsyKOxlT5GcTn8OMH+LVbB ltCRFnkCAjwdQPMgVTQClcKoVpmYcRfhaMMa4vJS9ggLlgL6ZM6E1m5ewo4g7ce1ocdAN Qlk9JcsGvv4QOBle2U4c8KFCYddCMQxSAGkae6ShMw7H9GQ5skgbo6+ZVX4VamwAkiA== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b="g/V6H/n6"; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5DC59606A320; Wed, 18 Nov 2026 19:02:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=g/V6H/n6 Received: by smtp.kernel.org (Postfix) with ESMTPSA id B107B1F000C4; Wed, 18 Nov 2026 19:02:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795028578; bh=osmw9RgnkOazXAvr4wlPVkl+gha7JZh4Mdq/vIyxxjQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=g/V6H/n6ToM5huPHfW4maj1u7upSR4S7Rz1RBZDmYGeR0l+kQ+G4ka4poFQwmBvzT 3tNDCvme26GywmaM4ut36/diNQBuvkuh/2WUKoYQkhZB9hvfHqshJbaAzZ1M8qAzoe y6ldjLAiQn4cAjsf/PFRcUjrc/7+RntQjxg2nqaY= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, syzbot+16bf7cd0ebeb1de93aa5@syzkaller.appspotmail.com, Lance Yang , Pedro Falcato , "David Hildenbrand (Arm)" , Zi Yan , Baolin Wang , Sasha Levin Subject: [PATCH 6.12 0045/1756] khugepaged: fix readahead lock inversion in collapse_file() Date: Wed, 18 Nov 2026 15:36:12 +0100 Message-ID: <20261118150009.837923946@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150007.957976754@linuxfoundation.org> References: <20261118150007.957976754@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Lance Yang [ Upstream commit eadce52a9ef657d561b3e76c9b5f178bd99735f5 ] collapse_file() can call page_cache_sync_readahead() while still holding source folios locked. If truncate holds mapping->invalidate_lock exclusively and waits for one of those folios, readahead waits for invalidate_lock and neither side can make progress. We need to release those folio locks before starting readahead. On a page cache miss, roll back first, populate the collapse range, and retry once. Doing readahead after rollback avoids an extra pass when all folios are already present. If another miss occurs on retry, give up rather than keep retrying while truncate or reclaim removes folios. Keep page_cache_sync_readahead() and wait for read I/O with filemap_lock_folio(), releasing each folio before moving to the next. The existing uptodate check during collapse still handles read errors. Shmem uses shmem_get_folio() for swapin and fallocated folios without taking mapping->invalidate_lock, so it is unaffected. Reported-by: syzbot+16bf7cd0ebeb1de93aa5@syzkaller.appspotmail.com Closes: https://syzkaller.appspot.com/bug?extid=16bf7cd0ebeb1de93aa5 Fixes: 730633f0b7f9 ("mm: Protect operations adding pages to page cache with invalidate_lock") Cc: stable@vger.kernel.org Signed-off-by: Lance Yang Reviewed-by: Pedro Falcato Acked-by: David Hildenbrand (Arm) Acked-by: Zi Yan Reviewed-by: Baolin Wang Link: https://patch.msgid.link/20261026152013.10511-1-lance.yang@linux.dev Signed-off-by: David Hildenbrand (Arm) Signed-off-by: Sasha Levin --- mm/khugepaged.c | 49 +++++++++++++++++++++++++++++++++++++------------ 1 file changed, 37 insertions(+), 12 deletions(-) diff --git a/mm/khugepaged.c b/mm/khugepaged.c index 1250d878d7242..2e9d0e13b068a 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -1817,6 +1817,8 @@ static int collapse_file(struct mm_struct *mm, unsigned long addr, XA_STATE_ORDER(xas, &mapping->i_pages, start, HPAGE_PMD_ORDER); int nr_none = 0, result = SCAN_SUCCEED; bool is_shmem = shmem_file(file); + bool do_readahead = false; + bool readahead_done = false; VM_BUG_ON(!IS_ENABLED(CONFIG_READ_ONLY_THP_FOR_FS) && !is_shmem); VM_BUG_ON(start & (HPAGE_PMD_NR - 1)); @@ -1828,6 +1830,10 @@ static int collapse_file(struct mm_struct *mm, unsigned long addr, mapping_set_update(&xas, mapping); +retry: + result = SCAN_SUCCEED; + do_readahead = false; + xas_set_order(&xas, start, HPAGE_PMD_ORDER); __folio_set_locked(new_folio); if (is_shmem) __folio_set_swapbacked(new_folio); @@ -1892,17 +1898,9 @@ static int collapse_file(struct mm_struct *mm, unsigned long addr, } } else { /* !is_shmem */ if (!folio || xa_is_value(folio)) { - xas_unlock_irq(&xas); - page_cache_sync_readahead(mapping, &file->f_ra, - file, index, - end - index); - /* drain lru cache to help folio_isolate_lru() */ - lru_add_drain(); - folio = filemap_lock_folio(mapping, index); - if (IS_ERR(folio)) { - result = SCAN_FAIL; - goto xa_unlocked; - } + do_readahead = !readahead_done; + result = SCAN_FAIL; + goto xa_locked; } else if (folio_test_dirty(folio)) { /* * khugepaged only works on read-only fd, @@ -2044,7 +2042,10 @@ static int collapse_file(struct mm_struct *mm, unsigned long addr, * in do_dentry_open() truncating the page cache. This is * particularly important if there are dirty folios in transit. */ - filemap_invalidate_lock_shared(mapping); + if (!filemap_invalidate_trylock_shared(mapping)) { + result = SCAN_FAIL; + goto rollback; + } filemap_nr_thps_inc(mapping); /* * Paired with the fence in do_dentry_open() -> get_write_access() @@ -2245,6 +2246,30 @@ static int collapse_file(struct mm_struct *mm, unsigned long addr, new_folio->mapping = NULL; folio_unlock(new_folio); + + /* Readahead may take invalidate_lock; source folios are unlocked. */ + if (do_readahead) { + for (index = start; index < end;) { + folio = filemap_lock_folio(mapping, index); + if (IS_ERR(folio)) { + page_cache_sync_readahead(mapping, &file->f_ra, + file, index, end - index); + folio = filemap_lock_folio(mapping, index); + if (IS_ERR(folio)) { + result = SCAN_FAIL; + goto out_put; + } + } + index = folio_next_index(folio); + folio_unlock(folio); + folio_put(folio); + } + /* Drain the local LRU batch before retrying isolation. */ + lru_add_drain(); + readahead_done = true; + goto retry; + } +out_put: folio_put(new_folio); out: VM_BUG_ON(!list_empty(&pagelist)); -- 2.53.0