From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out-188.mta1.migadu.com (out-188.mta1.migadu.com [95.215.58.188]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 041AF37BE6E for ; Wed, 22 Jul 2026 15:21:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.188 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784733702; cv=none; b=GmNN9j3N0QlQnqbH/20SBTc9BxewP1b2zeScwdbbMHszRG/XNnbJ36tDmNk4wVEBrUYcJ23HWCqe6H89TeeD4v8WX5F+3oSeCI81BupXLIqMYLz+QI1c7fBjGrx/CFbQ6s0nUjMsvwzcehOGKYJSUtBO+dBfq2iPa43dS6Bq7Yw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784733702; c=relaxed/simple; bh=x6mfL2gCYXY08hhwFw7TlUyVYJCFg7KtW3fTOJ8V2kc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=EOpwSj3TtSah/FqzQLzfTbxwg82BIVyJiSNfRQ88rH2IQlBKpS0TozOZjNnYRxDiIhuAzOry0Yq7pDluUoK5sqxMU0VlDafIdCSYZ/eKm/TfGMYgo+l0TDjLLqbsWSN6t4CnhoJCYILSFFgBH9jBusjZCpL6vG/gdN3gL9rl70Y= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=PpjeU8Ai; arc=none smtp.client-ip=95.215.58.188 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="PpjeU8Ai" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1784733696; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DewUAhzakWqHnF6VoxFjXFO25R073z6cEiSODUJgVTA=; b=PpjeU8Ai7QJ+j1EQvdHgQBe60U5pDk1ClQ/f2mPV3ZHtKz1TlDO62fS/QgP2cBQBpxOQ/B 19fHPYsVhaCn5QG2FvxAnuz/O9YJ0QY9YYpDyK2NDJHp6zGakyY7aOWLpMCIBcnGqfxhta geGN+XadjJNItwGxKgrm6BXVwYeizaU= From: Usama Arif To: Andrew Morton , david@kernel.org, chrisl@kernel.org, kasong@tencent.com, ljs@kernel.org, ziy@nvidia.com, linux-mm@kvack.org Cc: ying.huang@linux.alibaba.com, Baoquan He , willy@infradead.org, youngjun.park@lge.com, hannes@cmpxchg.org, riel@surriel.com, shakeel.butt@linux.dev, alex@ghiti.fr, kas@kernel.org, baohua@kernel.org, dev.jain@arm.com, baolin.wang@linux.alibaba.com, Nico Pache , Liam R. Howlett , ryan.roberts@arm.com, Vlastimil Babka , lance.yang@linux.dev, linux-kernel@vger.kernel.org, nphamcs@gmail.com, shikemeng@huaweicloud.com, yosry@kernel.org, kernel-team@meta.com, Alexandre Ghiti , Usama Arif Subject: [PATCH v5 04/11] mm: zswap: add range lookup for large-folio swapin Date: Wed, 22 Jul 2026 08:19:35 -0700 Message-ID: <20260722152043.2273289-5-usama.arif@linux.dev> In-Reply-To: <20260722152043.2273289-1-usama.arif@linux.dev> References: <20260722152043.2273289-1-usama.arif@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT From: Alexandre Ghiti A large folio reaches zswap_load() only when the caller expects the whole range to be on disk. Zswap still stores large folios as independent order-0 entries, so reconstructing a large folio from zswap entries would risk returning partially initialized data. Teach zswap_load() to scan the covered range. If no slot is in zswap, return -ENOENT so swap_read_folio() reads the backing device. If any slot is still in zswap, fail the large-folio read so the caller can fall back to per-page swapin. Return -EIO rather than -EINVAL for that conflict. Large-folio loads are now valid requests; the error means zswap cannot safely satisfy the request from partial per-page compressed state, not that the request is unsupported. Existing callers only distinguish -ENOENT, so this is a semantic clarification rather than a behavioral change. Add zswap_is_present() so PMD swap-entry consumers can make the same range decision before attempting PMD-order swapin. Signed-off-by: Alexandre Ghiti Signed-off-by: Usama Arif --- include/linux/zswap.h | 6 ++++++ mm/zswap.c | 42 ++++++++++++++++++++++++++++++++---------- 2 files changed, 38 insertions(+), 10 deletions(-) diff --git a/include/linux/zswap.h b/include/linux/zswap.h index 30c193a1207e..cd9efcf9dec9 100644 --- a/include/linux/zswap.h +++ b/include/linux/zswap.h @@ -35,6 +35,7 @@ void zswap_lruvec_state_init(struct lruvec *lruvec); void zswap_folio_swapin(struct folio *folio); bool zswap_is_enabled(void); bool zswap_never_enabled(void); +bool zswap_is_present(swp_entry_t entry, unsigned int nr); #else struct zswap_lruvec_state {}; @@ -69,6 +70,11 @@ static inline bool zswap_never_enabled(void) return true; } +static inline bool zswap_is_present(swp_entry_t entry, unsigned int nr) +{ + return false; +} + #endif #endif /* _LINUX_ZSWAP_H */ diff --git a/mm/zswap.c b/mm/zswap.c index 4e76a4a87cdc..384492f1f696 100644 --- a/mm/zswap.c +++ b/mm/zswap.c @@ -1561,6 +1561,23 @@ bool zswap_store(struct folio *folio) return ret; } +/** + * zswap_is_present() - is any slot in [entry, entry + nr) in zswap? + * @entry: base swap entry of the range + * @nr: number of contiguous slots to check (pass 1 for a single-slot query) + */ +bool zswap_is_present(swp_entry_t entry, unsigned int nr) +{ + pgoff_t offset = swp_offset(entry); + struct xarray *tree = swap_zswap_tree(entry); + unsigned long index = offset; + + if (!nr || zswap_never_enabled()) + return false; + + return xa_find(tree, &index, offset + nr - 1, XA_PRESENT); +} + /** * zswap_load() - load a folio from zswap * @folio: folio to load @@ -1573,10 +1590,9 @@ bool zswap_store(struct folio *folio) * NOT marked up-to-date, so that an IO error is emitted (e.g. do_swap_page() * will SIGBUS). * - * -EINVAL: if the swapped out content was in zswap, but the page belongs - * to a large folio, which is not supported by zswap. The folio is unlocked, - * but NOT marked up-to-date, so that an IO error is emitted (e.g. - * do_swap_page() will SIGBUS). + * -EIO: if a slot in a large-folio range is unexpectedly still in zswap. + * The folio is unlocked, but NOT marked up-to-date, so that an IO + * error is emitted (e.g. do_swap_page() will SIGBUS). * * -ENOENT: if the swapped out content was not in zswap. The folio remains * locked on return. @@ -1595,13 +1611,19 @@ int zswap_load(struct folio *folio) return -ENOENT; /* - * Large folios should not be swapped in while zswap is being used, as - * they are not properly handled. Zswap does not properly load large - * folios, and a large folio may only be partially in zswap. + * A large folio reaches zswap_load() only when its whole range is + * expected to be on disk: PMD swap-entry consumers split before + * calling into PMD-order swapin whenever any slot is still in zswap. + * Confirm the range is entirely absent from zswap and return -ENOENT + * so the caller reads it from disk; if a slot is unexpectedly still in + * zswap, fail the read rather than return partially-initialized data. */ - if (WARN_ON_ONCE(folio_test_large(folio))) { - folio_unlock(folio); - return -EINVAL; + if (folio_test_large(folio)) { + if (zswap_is_present(swp, folio_nr_pages(folio))) { + folio_unlock(folio); + return -EIO; + } + return -ENOENT; } entry = xa_load(tree, offset); -- 2.53.0-Meta