From nobody Thu Apr 2 11:01:48 2026 Received: from mail-oi1-f177.google.com (mail-oi1-f177.google.com [209.85.167.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 208AA354AE3 for ; Fri, 20 Mar 2026 19:27:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774034865; cv=none; b=We4X8el74fFWxZV/NZ5rBfCq096eObcEHkPRFGIjvHzQc5vOagGDPdSDVvonnAcq1JkWl6OBWi35ZmNh+uaL1Er33eH3PiGrDM/0Zr4WME/fyvgMB8Dg7y8ZUgTZA5PCLM2CPta7hxBjWf8st54MjY5efqqb+hD0SYlbArGQXDg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774034865; c=relaxed/simple; bh=LlHIWMKorAg3gifPtuIPuc9aL19mRqXLOyrlrlnvDI0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KpNqDDl/5/hRD1yclhCpWz1G10UUqWuac01HH4PdpWkycKq+31ky9HGnJ7+PC0zBNaCSOiF1vmSD2mXRcjmv1a+JaFlWrRPdjKMkS8pNdQAi6ZzAo+uoosgmMswDqmoIt2/Wcxm542WBIBefQ8iyw1OyDO7vkOPImOL9NbCRzJo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=bw+etyR8; arc=none smtp.client-ip=209.85.167.177 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="bw+etyR8" Received: by mail-oi1-f177.google.com with SMTP id 5614622812f47-4670676ba03so824823b6e.1 for ; Fri, 20 Mar 2026 12:27:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1774034863; x=1774639663; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ZHzOeFlaQp2gdFIuNzaMDht2eyy5SJ0a+c6tcwRztv0=; b=bw+etyR8tp1SSd0RskyIC6G1hhmgIGhotiXSu6+/EjiyCgvEu18wuEjhIShc2QolQi nfXWz6fgEWoUb0cQVKpOmvF3R3a0puoOI5CBdHcm6fMGnGsVpuEieVvgtFybc3J8hWSr trPKXpWAifqPTWEuP/xKwQkarcUFZfioJcxYAFBV4RcPk3Q8aOh12KGG8Un3iUL5Otsu XsMRxhde/XFicGrtxyu/brRrlth+XWDmNEaaRLH934CggSLsYoxzp2O2y9zC4Wb5i/C/ Uqq9KDXfdhlDg+KsPAGWTU2Bv3B1kNQ8cCElxnrRENAFC5UZVz0FcXYoAzZuKOfL4iUB hrkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774034863; x=1774639663; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=ZHzOeFlaQp2gdFIuNzaMDht2eyy5SJ0a+c6tcwRztv0=; b=GZhLm96r2ll9WQHbKYIBZKAZ5n7xuiiCipywED6+iKarXyCh1s7/SxwVrEHg86Oqvt rCvkXGLMSqytaUxkXcSJDCYh4C18fkC9cISuj7cFIDECAilFuGglXRK7I9XJW3boW6yV QAKXRncJLW9CcVJRM4vt+AuPlnwV6HS7mRPTvUCq1khVzujA3RlMpwtSj0f+dA6d4TNe dY0IAEjR0bsH30iaYdPyHhT9Bb2UFrNFv1YIhPXrqG7P2ODnXUn21jRQqqHisbHhjaz3 l+C89dvRM6pgjemDuiJsm3lvb02VV9tCGqlWRny2wufxrf89XhE0Q+XqL1h6mutFKxPh PmUg== X-Forwarded-Encrypted: i=1; AJvYcCXZ1Lq7V0JJ0k6767w0y1ISiTXNHFl7PURXI01TwprYTYFkL4OeT3fc4CND0NwecGU13GZaq2Q17Wy3K68=@vger.kernel.org X-Gm-Message-State: AOJu0Yzulqx9CFA/I7LiQR/N6sq94ouhKUFkzFgqxjyB6vypcqO6bgqd E9KO6hTQCp5h+Fz/Q3KOwIKvLIwKy0syfPiAYd5SXqKWHVnbg3dfwu54 X-Gm-Gg: ATEYQzwDQRTAFJj8j/AUOwnSMXlqPiiVfwCmOIPsQ7wKWWv6tBfn+/BmLMpQMz1aLvq iaqOApvB9BTnRbUX4bpt6sgE0wGsmGh42cp5i0DazdC+LquSekHAmz76c3cfk7VINRUQ3dFKqj4 4bzWmdv1/m2Al7tS9VThHWRVKhHF4KnRn9IGFgNkXJb6IxtD977OS3Twq9WmnYGwj5Rv9YTmzeI 9Gx+IRzozikO6PduGZZZGeusmQ0Qnp2dPrAY5JF52CqR8BkaGrCVa/2ItLF/EVL7g9xR7QSUY/U e2nvvF2JJ8WpSH6Z5nbKazzzLZABNKzZkJDOvOSP5vbcal0Mns7ldiq42X6BmyuueaNeofedhby xJ0ds5eZEFOPOrKg1EXLPRPbR3Gjn1XkMBcttpGrnI8SZi63sy3SGGp8KbCMNZGQZ6xZ3aPydYM 3wQmLDedHy/7ik2L6lAAucg41oQCmb4Lg+TQtk69dgax5XINQD6DI5vrlD X-Received: by 2002:a05:6808:228f:b0:467:2509:c207 with SMTP id 5614622812f47-467e5d9cf3emr2304552b6e.17.1774034862980; Fri, 20 Mar 2026 12:27:42 -0700 (PDT) Received: from localhost ([2a03:2880:10ff:5d::]) by smtp.gmail.com with ESMTPSA id 5614622812f47-467e7ef9c05sm1872071b6e.13.2026.03.20.12.27.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Mar 2026 12:27:41 -0700 (PDT) From: Nhat Pham To: kasong@tencent.com Cc: Liam.Howlett@oracle.com, akpm@linux-foundation.org, apopple@nvidia.com, axelrasmussen@google.com, baohua@kernel.org, baolin.wang@linux.alibaba.com, bhe@redhat.com, byungchul@sk.com, cgroups@vger.kernel.org, chengming.zhou@linux.dev, chrisl@kernel.org, corbet@lwn.net, david@kernel.org, dev.jain@arm.com, gourry@gourry.net, hannes@cmpxchg.org, hughd@google.com, jannh@google.com, joshua.hahnjy@gmail.com, lance.yang@linux.dev, lenb@kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-pm@vger.kernel.org, lorenzo.stoakes@oracle.com, matthew.brost@intel.com, mhocko@suse.com, muchun.song@linux.dev, npache@redhat.com, nphamcs@gmail.com, pavel@kernel.org, peterx@redhat.com, peterz@infradead.org, pfalcato@suse.de, rafael@kernel.org, rakie.kim@sk.com, roman.gushchin@linux.dev, rppt@kernel.org, ryan.roberts@arm.com, shakeel.butt@linux.dev, shikemeng@huaweicloud.com, surenb@google.com, tglx@kernel.org, vbabka@suse.cz, weixugc@google.com, ying.huang@linux.alibaba.com, yosry.ahmed@linux.dev, yuanchu@google.com, zhengqi.arch@bytedance.com, ziy@nvidia.com, kernel-team@meta.com, riel@surriel.com Subject: [PATCH v5 04/21] zswap: add new helpers for zswap entry operations Date: Fri, 20 Mar 2026 12:27:18 -0700 Message-ID: <20260320192735.748051-5-nphamcs@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260320192735.748051-1-nphamcs@gmail.com> References: <20260320192735.748051-1-nphamcs@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add new helper functions to abstract away zswap entry operations, in order to facilitate re-implementing these functions when swap is virtualized. Signed-off-by: Nhat Pham --- mm/zswap.c | 59 ++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 40 insertions(+), 19 deletions(-) diff --git a/mm/zswap.c b/mm/zswap.c index 315e4d0d08311..a5a3f068bd1a6 100644 --- a/mm/zswap.c +++ b/mm/zswap.c @@ -234,6 +234,38 @@ static inline struct xarray *swap_zswap_tree(swp_entry= _t swp) >> ZSWAP_ADDRESS_SPACE_SHIFT]; } =20 +static inline void *zswap_entry_store(swp_entry_t swpentry, + struct zswap_entry *entry) +{ + struct xarray *tree =3D swap_zswap_tree(swpentry); + pgoff_t offset =3D swp_offset(swpentry); + + return xa_store(tree, offset, entry, GFP_KERNEL); +} + +static inline void *zswap_entry_load(swp_entry_t swpentry) +{ + struct xarray *tree =3D swap_zswap_tree(swpentry); + pgoff_t offset =3D swp_offset(swpentry); + + return xa_load(tree, offset); +} + +static inline void *zswap_entry_erase(swp_entry_t swpentry) +{ + struct xarray *tree =3D swap_zswap_tree(swpentry); + pgoff_t offset =3D swp_offset(swpentry); + + return xa_erase(tree, offset); +} + +static inline bool zswap_empty(swp_entry_t swpentry) +{ + struct xarray *tree =3D swap_zswap_tree(swpentry); + + return xa_empty(tree); +} + #define zswap_pool_debug(msg, p) \ pr_debug("%s pool %s\n", msg, (p)->tfm_name) =20 @@ -1000,8 +1032,6 @@ static bool zswap_decompress(struct zswap_entry *entr= y, struct folio *folio) static int zswap_writeback_entry(struct zswap_entry *entry, swp_entry_t swpentry) { - struct xarray *tree; - pgoff_t offset =3D swp_offset(swpentry); struct folio *folio; struct mempolicy *mpol; bool folio_was_allocated; @@ -1040,8 +1070,7 @@ static int zswap_writeback_entry(struct zswap_entry *= entry, * old compressed data. Only when this is successful can the entry * be dereferenced. */ - tree =3D swap_zswap_tree(swpentry); - if (entry !=3D xa_load(tree, offset)) { + if (entry !=3D zswap_entry_load(swpentry)) { ret =3D -ENOMEM; goto out; } @@ -1051,7 +1080,7 @@ static int zswap_writeback_entry(struct zswap_entry *= entry, goto out; } =20 - xa_erase(tree, offset); + zswap_entry_erase(swpentry); =20 count_vm_event(ZSWPWB); if (entry->objcg) @@ -1427,9 +1456,7 @@ static bool zswap_store_page(struct page *page, if (!zswap_compress(page, entry, pool)) goto compress_failed; =20 - old =3D xa_store(swap_zswap_tree(page_swpentry), - swp_offset(page_swpentry), - entry, GFP_KERNEL); + old =3D zswap_entry_store(page_swpentry, entry); if (xa_is_err(old)) { int err =3D xa_err(old); =20 @@ -1563,11 +1590,9 @@ bool zswap_store(struct folio *folio) unsigned type =3D swp_type(swp); pgoff_t offset =3D swp_offset(swp); struct zswap_entry *entry; - struct xarray *tree; =20 for (index =3D 0; index < nr_pages; ++index) { - tree =3D swap_zswap_tree(swp_entry(type, offset + index)); - entry =3D xa_erase(tree, offset + index); + entry =3D zswap_entry_erase(swp_entry(type, offset + index)); if (entry) zswap_entry_free(entry); } @@ -1599,9 +1624,7 @@ bool zswap_store(struct folio *folio) int zswap_load(struct folio *folio) { swp_entry_t swp =3D folio->swap; - pgoff_t offset =3D swp_offset(swp); bool swapcache =3D folio_test_swapcache(folio); - struct xarray *tree =3D swap_zswap_tree(swp); struct zswap_entry *entry; =20 VM_WARN_ON_ONCE(!folio_test_locked(folio)); @@ -1619,7 +1642,7 @@ int zswap_load(struct folio *folio) return -EINVAL; } =20 - entry =3D xa_load(tree, offset); + entry =3D zswap_entry_load(swp); if (!entry) return -ENOENT; =20 @@ -1648,7 +1671,7 @@ int zswap_load(struct folio *folio) */ if (swapcache) { folio_mark_dirty(folio); - xa_erase(tree, offset); + zswap_entry_erase(swp); zswap_entry_free(entry); } =20 @@ -1658,14 +1681,12 @@ int zswap_load(struct folio *folio) =20 void zswap_invalidate(swp_entry_t swp) { - pgoff_t offset =3D swp_offset(swp); - struct xarray *tree =3D swap_zswap_tree(swp); struct zswap_entry *entry; =20 - if (xa_empty(tree)) + if (zswap_empty(swp)) return; =20 - entry =3D xa_erase(tree, offset); + entry =3D zswap_entry_erase(swp); if (entry) zswap_entry_free(entry); } --=20 2.52.0