Received: by 2002:ab2:f03:0:b0:1ef:ffd0:ce49 with SMTP id i3csp58689lqf; Tue, 26 Mar 2024 14:21:18 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCUmeLr3qyJWEhzVtS3kmISKf6UPHH3eDXqxqEH9B2pUSjryMIKS80Q/KCLTgdWdulrNZU3SpRPOB6fWdlek8fVLuQQWmCS0+Qg9lHVFeA== X-Google-Smtp-Source: AGHT+IHXvS1O0mdXfyEqmt5+Nw5/Nhh/GEQFaVKcqYH/zoIpu4HkJasuUcwxQ7lhD8inr6mMJZEI X-Received: by 2002:a05:622a:4b0c:b0:431:3e97:ca53 with SMTP id et12-20020a05622a4b0c00b004313e97ca53mr12125313qtb.43.1711488078405; Tue, 26 Mar 2024 14:21:18 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1711488078; cv=pass; d=google.com; s=arc-20160816; b=s18J78bueeDiIdM89I4zbhLN1/jb9Fd9f+90iu07oTgWDxTtCx4ErO7uyegeVU5R3r SqO9GolGOCIf1m4Ua+2UEqKLiwhrO30NXUoo3snyCNpjme+YQkKG8++dK91yoXtr0Z2A EWr7w9nG6wx8OByxUMw7OtKhwQBIf3Wz5wQP4E9OqAAOKzOEWkHYTVGpcvIspAMG20vp Tto/Mz1QjDfr3Dg/pJHsS1olMM2MckuVISGUu+alj2Zpv7XK0VfE6bEEklRhale93xwV r8mV/u3QKF4AE48uCJ+Rj04CLZwSVw5EkoLpAPVMoOWfy7Wq6v+kQ8ufEZGw88QD7Ps0 0p6g== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:list-unsubscribe:list-subscribe :list-id:precedence:dkim-signature; bh=f3X+p2cQIXLunY4fM/FACVTNTQlPnKBSCpuObEa286Y=; fh=1dFyf739SS2BxH9q1tAjLNquJwH6m49DZDO7JASb3pc=; b=fnZz2EMJ88aY9hKWY/o/ahZgroyaKekNERjIE2rsCnUaEaFkm8beoJoo/UTjNIT3tH mxhqUMfDsLZSotwsEycExwnLvBQZ3iTAX7cYy07hv0KIO7LjX6GEINWf170ET6p+hGYe FCyeDYxVKfmzungVZ80z6PwTKlYkd54XyqXTHkbGDILQWa8k2vPGpzWonwRmaHp/8LQ1 6qJvqRswlZ8n03hHE6CFmc9NqzRFwJtdY0mJQA7O6Y2IYGel6GfVEaNSonFYPjeeuaCc GDoQmyewBA2/CqNkI8fspGbX/WYWGtIMg7pcccpMfBjnGi9OcE/EYIH76SZW17Js7UA6 WmRw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=NttaDzCH; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-119997-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-119997-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id z7-20020a05622a124700b00430d8ca526dsi9061020qtx.762.2024.03.26.14.21.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Mar 2024 14:21:18 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-119997-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=NttaDzCH; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-119997-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-119997-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 2477B1C6747B for ; Tue, 26 Mar 2024 21:21:18 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 29F5313D617; Tue, 26 Mar 2024 21:21:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="NttaDzCH" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 5608512C7FF for ; Tue, 26 Mar 2024 21:21:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711488071; cv=none; b=eSmhWB09bbzgw8q3JjNxBdRFr9TEIsNJ5yx3LGJZI51hMZtRcRXmlmLoD/HeqDeRB/wHmY79zlKFPinsMAqJad5vylSa4trwmivwZex37oDi5cZPtQPQ8aEpUHmhgb1H6hOuxtbvEYLQVFqTLjy4mviQQCUECTW9wSwMdRXYiL0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711488071; c=relaxed/simple; bh=ktBOuN/l0Oqul05K8wPsro6WSmUcfgpQoRmRKkgldYg=; h=MIME-Version:References:In-Reply-To:From:Date:Message-ID:Subject: To:Cc:Content-Type; b=jTAmsGDg1CGm6i7MgI+BBcYnr0wpbaNvqHHXWwPUvJYwbDQzQe2AujgrZJUnB2py0f5K+4UIi8gQbMZY72xzVf4dzwIJzDaADUyn5fHPgf03espnzMFsFWqmphl0YwfJVo7+LrS1sLfZVkgqSR+aVfcf3DFPWckbZIqGM7sKT2w= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=NttaDzCH; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id CFA05C43390 for ; Tue, 26 Mar 2024 21:21:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711488070; bh=ktBOuN/l0Oqul05K8wPsro6WSmUcfgpQoRmRKkgldYg=; h=References:In-Reply-To:From:Date:Subject:To:Cc:From; b=NttaDzCH0nFE8/OnuI3TFzJPM4f4n0RToHYl7crqDD6iDXABdcYvfaOrbHX8oxOgm 7ETBZr7GlUtIPTnxjXf7ldSCdPDFvT+aFQbKOTQst3cnqp28o36NrwF8l6GXzHnk8+ sWYIdYdWJYvlJFCTMKWXIFtbb6/RYrzFV13Y4tY2Htog4iqsq9PMuSXI6DM4lgABe2 CRm8y2XhLxUekNT1n2F6sg53tsBBY68weqyYJd3Fy8oJ34C74S6i8560gtdhQxprqD GTxfkw/9CQC157sOTMqtdXEgsgVHth0xRzq26SbnOVAUI3gbqfQSVssOb1UX7P0xnz l5jTa8LVFbc3A== Received: by mail-lf1-f47.google.com with SMTP id 2adb3069b0e04-5159f9de7fbso4503532e87.1 for ; Tue, 26 Mar 2024 14:21:10 -0700 (PDT) X-Forwarded-Encrypted: i=1; AJvYcCUnWd75udiJlESd2vXNVJ12dUP3XBmKuVvvJTUZav/hrOhH2eLEM8XvDhMvqrgPtGwV9XrdggOkVKYIB8bKNJ6gl9Xqyj1+tigX2wMa X-Gm-Message-State: AOJu0YzL01LP0j4TMBhdXE8qRMDGSEKlA01F7hFrwnQM2VH6BZzGmy4i eMsfwgTAb9Q0pvaiY6I7ijm0PUbLYCU7PVxjO2qJh00xCrkh9dqRoWTv5wKY7kRUoGM8TMcmT63 ioK2jdEGtIV/mnDFcALzJa2ikvw== X-Received: by 2002:a19:5e58:0:b0:513:ccbe:d79f with SMTP id z24-20020a195e58000000b00513ccbed79fmr519276lfi.8.1711488069574; Tue, 26 Mar 2024 14:21:09 -0700 (PDT) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 References: <20240326-zswap-xarray-v9-1-d2891a65dfc7@kernel.org> In-Reply-To: From: Chris Li Date: Tue, 26 Mar 2024 14:20:58 -0700 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH v9] zswap: replace RB tree with xarray To: Nhat Pham Cc: Andrew Morton , linux-kernel@vger.kernel.org, linux-mm@kvack.org, Yosry Ahmed , Johannes Weiner , "Matthew Wilcox (Oracle)" , Chengming Zhou , Barry Song Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Hi Yosry, Johannes and Nhat, Thank you for your review. I have sent out V10 to revert the comment. Chris On Tue, Mar 26, 2024 at 2:04=E2=80=AFPM Nhat Pham wrote= : > > On Tue, Mar 26, 2024 at 11:42=E2=80=AFAM Chris Li wro= te: > > > > > - * 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 tw= o > > > * in-memory copies outweighs any benefits of caching the > > > @@ -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 =3D xa_erase(tree, offset); > > > + else > > > + entry =3D xa_load(tree, offset); > > > > This is the place I make the modification for the conflict resolution. > > It depends on the swapcache to execute xa_erase() or xa_load(). > > Obviously, the xa_load() will not delete the entry from the tree. > > > > The conflict resolution itself LGTM. I'll let you and Johannes decide > on the comment (but FWIW, the original meaning still holds, so I don't > see why we need to fix it). > > Reviewed-by: Nhat Pham >