From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 7D5CF2E738B for ; Mon, 6 Jul 2026 21:36:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783373805; cv=none; b=DlHcHJ+vJ+1jeqIJSlMojBrWEeTHqzAoVmm4C/3p/db88RnqtZ8Wt5OgXuafKwP5FrLP3jx/SCms+VhQ4n7F+2uJn4zErj5K+YiTJqHxLWxHMwfoOMSNQ2veikvTBNaDJIR2CaqB7T8KAhCcpfAWqcZrQ81jkdO0K2WZjc0Rc4A= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783373805; c=relaxed/simple; bh=TFjKf8zs9Ftgi8APFnmXMLKGDxSAuN7n9XrxGdMnaLI=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=CeerLztGO0jnr2Yaj9bkAirwasmy2Ygd6dGG09M4z9ROrTlBN/7XSJYpbl4jkv1yX125G9pao9B1tLOnR86JlddbTCX7bRMbND4L63sDVk4jhrdMIJ7ognMwA5dd3zn/NVHdynfSnvoq/6SqfqY9gPDgitRrIXZWayxLISbXVvo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=hXIg0GCe; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="hXIg0GCe" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 33F981F00A3A; Mon, 6 Jul 2026 21:36:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1783373804; bh=ac21k4ticVS4yv0U1IuUM4EIwyqtnzpMkDPbmZhqQtI=; h=Date:From:To:Cc:Subject:References:In-Reply-To; b=hXIg0GCeF+aqjI6UETlLd3mu7zOduBcSAE5HI9lzAy3xTH6wZElghJqEyQdaD2chz /obo0A559dX7I6iYdNTjJ/bh+JRcRcJFICRaoizHtW4xtw2RHeY9AmBsvKwp52Y1TX QLyLNEcIrM3NUMhIzi+ELQjo9UFTMLQzzaNizmhiUlg43K9WVOL21NNDaAqA62CxMp aGbHQOLU1HNN6gvrJLcTPlHB6/tB9r4mE9H5dDdoJPdrCSasn7PFryQLbCmIxhnvxo YE9JJL+VKSIxixBi4tWZ1Nn4shVu8w8sSAIWJfYHrIQAAWDoKi+WOMwfWSe+EAzG49 93jzKL582OdHA== Date: Mon, 6 Jul 2026 21:36:41 +0000 From: Yosry Ahmed To: Usama Arif Cc: Andrew Morton , david@kernel.org, chrisl@kernel.org, kasong@tencent.com, ljs@kernel.org, ziy@nvidia.com, linux-mm@kvack.org, 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, npache@redhat.com, "Liam R. Howlett" , ryan.roberts@arm.com, Vlastimil Babka , lance.yang@linux.dev, linux-kernel@vger.kernel.org, nphamcs@gmail.com, shikemeng@huaweicloud.com, kernel-team@meta.com, Alexandre Ghiti Subject: Re: [PATCH v3 04/11] mm: zswap: add range lookup for large-folio swapin Message-ID: References: <20260703173903.3789516-1-usama.arif@linux.dev> <20260703173903.3789516-5-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-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20260703173903.3789516-5-usama.arif@linux.dev> On Fri, Jul 03, 2026 at 10:38:21AM -0700, Usama Arif wrote: > 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. > > Add zswap_range_has_entry() 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 I found this by accident, please CC me on zswap changes :) > --- > include/linux/zswap.h | 7 +++++++ > mm/zswap.c | 46 +++++++++++++++++++++++++++++++++---------- > 2 files changed, 43 insertions(+), 10 deletions(-) > > diff --git a/include/linux/zswap.h b/include/linux/zswap.h > index 30c193a1207e..de10aa528597 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_range_has_entry(swp_entry_t entry, unsigned int nr); > #else > > struct zswap_lruvec_state {}; > @@ -69,6 +70,12 @@ static inline bool zswap_never_enabled(void) > return true; > } > > +static inline bool zswap_range_has_entry(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 b5a17ea20237..89dd88a5223f 100644 > --- a/mm/zswap.c > +++ b/mm/zswap.c > @@ -1559,6 +1559,27 @@ bool zswap_store(struct folio *folio) > return ret; > } > > +/** > + * zswap_range_has_entry() - is any slot in [entry, entry + nr) in zswap? > + * @entry: base swap entry of the range > + * @nr: number of contiguous slots to check > + */ Maybe zswap_is_present() as suggested here: https://lore.kernel.org/linux-mm/CAO9r8zNni28A+9BiDgDTBRuvGTKnqH91kpbpjjeftfnKSeSOJg@mail.gmail.com/. IIUC this interface can be used for the same purpose, we just need to pass nr=1. > +bool zswap_range_has_entry(swp_entry_t entry, unsigned int nr) > +{ > + pgoff_t offset = swp_offset(entry); > + XA_STATE(xas, swap_zswap_tree(entry), offset); > + bool found; > + > + if (!nr || zswap_never_enabled()) > + return false; > + > + rcu_read_lock(); > + found = !!xas_find(&xas, offset + nr - 1); > + rcu_read_unlock(); Why not xa_find()? It seems to handle RCU locking as well as retrying. > + > + return found; > +} > + > /** > * zswap_load() - load a folio from zswap > * @folio: folio to load > @@ -1571,10 +1592,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. > @@ -1593,13 +1613,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_range_has_entry(swp, folio_nr_pages(folio))) { > + folio_unlock(folio); > + return -EIO; > + } > + return -ENOENT; > } > > entry = xa_load(tree, offset); > -- > 2.53.0-Meta > >