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 048CFC54E67 for ; Tue, 26 Mar 2024 20:48:45 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8CA336B0095; Tue, 26 Mar 2024 16:48:44 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 87AC66B0096; Tue, 26 Mar 2024 16:48:44 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 769856B0098; Tue, 26 Mar 2024 16:48:44 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 686A26B0095 for ; Tue, 26 Mar 2024 16:48:44 -0400 (EDT) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 3056B40219 for ; Tue, 26 Mar 2024 20:48:44 +0000 (UTC) X-FDA: 81940378968.26.6AF818E Received: from mail-oi1-f179.google.com (mail-oi1-f179.google.com [209.85.167.179]) by imf11.hostedemail.com (Postfix) with ESMTP id 5242E40008 for ; Tue, 26 Mar 2024 20:48:42 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=cmpxchg-org.20230601.gappssmtp.com header.s=20230601 header.b=kR4jRqC0; spf=pass (imf11.hostedemail.com: domain of hannes@cmpxchg.org designates 209.85.167.179 as permitted sender) smtp.mailfrom=hannes@cmpxchg.org; dmarc=pass (policy=none) header.from=cmpxchg.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1711486122; a=rsa-sha256; cv=none; b=J3S+XZDloEfaAx2PNPzoH1J37phr2MyoR7kH+ijiziFVpXeRRyjbBZRYeYeS2crzZ67f3S zJuFndNiuXmjCbJCiwLy1MFy7G5j2Pei0ECMLC/w09EA84oNjlOfo3sHGsFZPFl0bMY0bx 2fvPXq/Fosbq3ak+C/eMsh2AZHf8u0M= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=cmpxchg-org.20230601.gappssmtp.com header.s=20230601 header.b=kR4jRqC0; spf=pass (imf11.hostedemail.com: domain of hannes@cmpxchg.org designates 209.85.167.179 as permitted sender) smtp.mailfrom=hannes@cmpxchg.org; dmarc=pass (policy=none) header.from=cmpxchg.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1711486122; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=qadrCkOfGnwpKmFdNNDGiamy9oOJd+0dFbMg7rAWkqE=; b=b6LQSDSMOKiE58Cpw+WIjKrVPpxiH2BVIlVeZMcM4Cljcq6pOw5bBLvEv5NRo6omZbyThv Rq9+5kIdMqNxAC6agVr/puASaJ5tQDIMIKeh7Jh8LrNuxQzLLRb2oAHjwYTNQ1z0FX/m4o W7MQBDEb4tA+fcKwsi+Uv0dMa7VIaC4= Received: by mail-oi1-f179.google.com with SMTP id 5614622812f47-3bbbc6b4ed1so3433188b6e.2 for ; Tue, 26 Mar 2024 13:48:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cmpxchg-org.20230601.gappssmtp.com; s=20230601; t=1711486121; x=1712090921; darn=kvack.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=qadrCkOfGnwpKmFdNNDGiamy9oOJd+0dFbMg7rAWkqE=; b=kR4jRqC0wGZAd3wWAMibjnzjIfgFRrb09uSnGvpb+z/WgdWyeZtReBNClfaeR3aq5L DIg29dEIMlWmfQViXbrHv6nBugEbGraEFQxGkt4eG2Cstf5NGsyNhvuf+WocPLY4YaGl KuQVCNzzpfcFB7lyDBSnyGJs6dGTbjW22MQOhPFpAbIfZA+Gyer+Tsg1FCHRTCbey7sv M3bj39LVF6cb66sMUT8WtDDLRFFWpofHDspmdmWgxcrHcAvGv/MhRCMVGf0EuZNjUxxC D4Uw8ikYz0G9yIWg6+dPuB1Sl/jFzMifgdQhNmLg24WgW0zNWK3s+2Iiy/hZtHriL0IT y/Yw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711486121; x=1712090921; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=qadrCkOfGnwpKmFdNNDGiamy9oOJd+0dFbMg7rAWkqE=; b=rVGlKFQ7HpIXE4CGRlHTe1DuTxJwQ3vXDO6SkGVGBQ85qeX3WNlhkBvtKGZfqNePBh 5QaHs0//xoBUDNZsL755pIWCFEIuTOitcS61l59+OeUH2xQLIbYvX/ws1xP/vCX59kUO 8e00B44gc0Amt4N+Yp9dxnXbkoWEcu5cxljVpAVtWYjqgseoCJEB5lwrtO2K8j0lAbun 10fSloQILQoPnmQENrGbVPnuo1uuzOemGx8crYkLYnEulr3AtHBsHGQP1rXYhfQYSXeT W9Tfr42ApuTsFJ9VZ0SkKgLMUsYGoZ3tL8sbSm2K5QUQT6xCgAaVUQjOWF3YoSU+t7xX zQxA== X-Forwarded-Encrypted: i=1; AJvYcCXE5KAezSC00g3sOypXVGOOdSaEGAqKybG/CzQ9u3L0HjX1UTA5kzu+xo+APSftVps56Xip4ujQxqfGFk8PzIyZJ+U= X-Gm-Message-State: AOJu0YwPEt+O9gwP7vE2Cw5/ue20EW5y5rrS8kTf5s5x9mkLkhd8CXHq YZ54TTXDSTRzoXK/wOF5n6w0dS4cqpu9i8PuEWQSNF3UDB8XrEMBqN0QbQ4k4Gk= X-Google-Smtp-Source: AGHT+IF2SL/odI3naJVy4wPv9EHrd3HZU4bf46sQq/F/U6G5bSa+Lq7BxcDFTMMDrataI2Sz075ihw== X-Received: by 2002:a05:6808:2cc:b0:3c3:d99b:d6e3 with SMTP id a12-20020a05680802cc00b003c3d99bd6e3mr2243446oid.28.1711486121393; Tue, 26 Mar 2024 13:48:41 -0700 (PDT) Received: from localhost (2603-7000-0c01-2716-da5e-d3ff-fee7-26e7.res6.spectrum.com. [2603:7000:c01:2716:da5e:d3ff:fee7:26e7]) by smtp.gmail.com with ESMTPSA id hj2-20020a05622a620200b00430d286c58fsm4035593qtb.44.2024.03.26.13.48.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Mar 2024 13:48:41 -0700 (PDT) Date: Tue, 26 Mar 2024 16:48:36 -0400 From: Johannes Weiner To: Chris Li Cc: Andrew Morton , linux-kernel@vger.kernel.org, linux-mm@kvack.org, Yosry Ahmed , Nhat Pham , "Matthew Wilcox (Oracle)" , Chengming Zhou , Barry Song Subject: Re: [PATCH v9] zswap: replace RB tree with xarray Message-ID: <20240326204836.GC229434@cmpxchg.org> References: <20240326-zswap-xarray-v9-1-d2891a65dfc7@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240326-zswap-xarray-v9-1-d2891a65dfc7@kernel.org> X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 5242E40008 X-Stat-Signature: rsye4a5ku4gztmzow7b9tqrohc61tu96 X-Rspam-User: X-HE-Tag: 1711486122-651785 X-HE-Meta: U2FsdGVkX1+oHz+brgylFzVIYP0v0aUoIuAC5WAIBy+N7UMjOeaJ6cY2DBg3Tyj8R7ILtoznxwjDwvxi/RXYV6E0BlqYnhQrcBvM2sCR0doY8s38Nz0umgzGaGbDxu89iKHcRW2YOZvl+Uz9qGlWeiLOCu3s31ct5N38dBjkc8XQDw3ylXHSaGoLFYT9DEmy3ka3N6ldK3rlnFApAYvvO+famXxtNJYqwgRcTk/g6Ohifjk8FxSmpSxZa/cjnW1/gH7gnV8qvGAB8jBsCLcEhsPXYkiJr7ab3KsXvkSe/LEf7JUPHVXQXJo0dfbpQANAMbFBY133Vljk+mYqJ0wTCJXJodUZQUuXgscJu7V04pUjqL+ncLuuM7zz8/212gLzcMPSnjd4Fb995K3D9kwa9L8FskbiauvO1r6Exy0O0x4A6CSoVBdpBEDTXkyu79vhnefvZF7mE1Gg5uEeEgWxoMCOuZha7MTNC7a95Vihme+QXvm805BfE76C2SduVd3Zixv3gCrhDytcLiwiAGydPI0kyQb3OWq3MNkTQ9Gj9QbY60bRNLJEAP47VFUbfAthrs6j0n+psGt8CQbrFkDm1BrjhBrXGFcr9skdCZ0Cjr8HCKpenzmisno9wJwWWWv7tBM+qwIoAT4Yo4lItOM4FBzWv5Mik56nEhuyysBqTBrKdf4F1wRS32yLYZQYnkr48QSuyoZ3MaYnJdDdKWJzFDj2gtX29E0e6tzoaHNx3HcOi86Ti3YyNh9BscfAW2mReJS9WOc8q2xgNfkB8IofZTe+E80L1HdiOasGm3oaRwb5jvKi9ZdzVTz6WtShfDwQmHAThLWnFvCP9i7KAxdq5EjZK7bXscU1lf6yBZaXDC68KQXIUJN/szaYUvJe0+Psr3mYHKsbWQC9BSijmnfsR1Ztrxa6jQnu5tfUEUy/1VkLAEqdDKn/u+XDOHWHkcvpnNheWd5PAV2mYT0j1oP 9h0Yib/j QFOrj7T7VHRXJS0omvkyDSgQuSzv6UVGZDlqhTGNaBwGzMPhBFzUCjvjiQVy/8AfW7rlUdE+c0FDXTbgdLZZmIhg1O7w8lAdTqfKGIdvD4pJfu5QDkYOpFAi396aO5o50JP6NZUJuKYNwlw8= 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: On Tue, Mar 26, 2024 at 11:35:43AM -0700, Chris Li wrote: > /* > - * When reading into the swapcache, invalidate our entry. The > + * When reading into the swapcache, erase our entry. The > * swapcache can be the authoritative owner of the page and > * its mappings, and the pressure that results from having two > * in-memory copies outweighs any benefits of caching the Not sure why you editorialized this? Your patch doesn't change those semantics, for which "invalidation" of the backing copy is a much better description, given we're also marking the folio dirty again etc. Can you please send a delta fix to undo that? > @@ -1649,8 +1581,12 @@ bool zswap_load(struct folio *folio) > * the fault fails. We remain the primary owner of the entry.) > */ > if (swapcache) > - zswap_rb_erase(&tree->rbroot, entry); > - spin_unlock(&tree->lock); > + entry = xa_erase(tree, offset); > + else > + entry = xa_load(tree, offset); > + > + if (!entry) > + return false; > > if (entry->length) > zswap_decompress(entry, page); Otherwise, looks good to me Acked-by: Johannes Weiner