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 0C154C0015E for ; Thu, 27 Jul 2023 18:09:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 629366B0075; Thu, 27 Jul 2023 14:09:43 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5D99E6B0078; Thu, 27 Jul 2023 14:09:43 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4C8526B007B; Thu, 27 Jul 2023 14:09:43 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 3B8236B0075 for ; Thu, 27 Jul 2023 14:09:43 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id D71041605AD for ; Thu, 27 Jul 2023 18:09:42 +0000 (UTC) X-FDA: 81058179804.07.D0332BA Received: from mail-ej1-f41.google.com (mail-ej1-f41.google.com [209.85.218.41]) by imf09.hostedemail.com (Postfix) with ESMTP id 127F514000B for ; Thu, 27 Jul 2023 18:09:40 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=u9Lcnt4A; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf09.hostedemail.com: domain of yosryahmed@google.com designates 209.85.218.41 as permitted sender) smtp.mailfrom=yosryahmed@google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1690481381; 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:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=vFXw2+/KjQw8lFjUIikFW0fpJeY+CVFCOxN28DSc2EU=; b=3gsYxrgnTrgaFyDDGsqR/NTklFnG8KXLgiTOPbZieraAL4Xf5GnlgflEeJ7PkmojNvLqq2 A5Vcs18QgEBxWDWLzCdtbkX0XU10ghXngrP3AdnNzuQusdizJZVcssQHZfI5SNuy2mcTLL ciiRIqoSFwUgHuiW/xNsoK9n+2XcMTQ= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=u9Lcnt4A; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf09.hostedemail.com: domain of yosryahmed@google.com designates 209.85.218.41 as permitted sender) smtp.mailfrom=yosryahmed@google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1690481381; a=rsa-sha256; cv=none; b=ymnkiKeJ4hxnHPdfFmGqP5M5PVeYj7/lI/K5R1jhvFU4HgpctfS908CGhrgzkIbhfezKix T3VDzD5q8BLMXxQ23V95IzZE20m8qMs+drnK1Cb3wmInJJxZ79YNXw2o79r2T596K8dDE2 CpmHArLQ00m8aLnd3EGIsEAjYfyb+Ig= Received: by mail-ej1-f41.google.com with SMTP id a640c23a62f3a-99bcc0adab4so172234266b.2 for ; Thu, 27 Jul 2023 11:09:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1690481379; x=1691086179; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=vFXw2+/KjQw8lFjUIikFW0fpJeY+CVFCOxN28DSc2EU=; b=u9Lcnt4AIVuUkFcAGaUnmpymF9rWEHPvOXpXB6dGhP3BOSP7gSH4v2E6z5lSYZkUyl 0v0unc1ZvcWA6/dofZ0iAsJjUnlcOrkw/t7VbQf1vBMncRJymzx0Ob/i5xWsHuiHyJro mzdinAzZaleSfyM792cjxJXh+8ckauv3PEYzY9/oc25YwSgah//rUVvFFyDofJBQaSUr 8wcgis6hBaE7K9wTpAQKokZufhksFyM28GVWKljwbLQ4MB9Fbe4YxjOea7Wx1UfRnC8C EZ51XNS29AKcr+QSK8p3pvrewa2uFhVr+Z1yc5cFpat5gIvM/b+T0u+1Iwi79EfmO1nS evfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690481379; x=1691086179; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vFXw2+/KjQw8lFjUIikFW0fpJeY+CVFCOxN28DSc2EU=; b=AcWHlk/dA0/a9aXUVk8PbqfEZlXdzwUJiyVTMH8t8Ik7mpnKta5SwWlXh6YNt5ocU/ JJ7TFCS1Ti30U9cs2rkKUxVn5JnQJ8340Z+o0RVyn+WkXE1c22hYsV3fIb0s5VJ7Eo3U NGgfg4OOgqF0yCwHnO8c/fDrhyZsi9Ghylz2wswBSmPURn66bpgH1wZHkjzsLTvFNxRK kjnuBozT07Zsa03xVwFcq0JbexA9NWL7keEeB1Q8R/19k/f3g8tpRHVkWzIBW5beHtdr /XFQe+HKCb149q6uVoK9p+iiyw5DeIgP8uOxyz/RvwJX5SWnqCX9GP6cv/ffo4zIcaaB BgSA== X-Gm-Message-State: ABy/qLYsDu36mqaKsBhn7MqnVPg9jObasbiQRk+Hh7AzKCIgT6GgOkFC zoM2drZQ0nw+dtRRBenSqXL9zF4wTDEJ1eOYkcKcZA== X-Google-Smtp-Source: APBJJlHl5UMe26ZqOdJ7Wb5Cc+wP3dMkf8dMEosn/hCK/e11IH0Aq0+Ky3eDwmpJR1ZDe9gPp7oy/Y9Rf8VFX5KTgeU= X-Received: by 2002:a17:907:2cc8:b0:99b:cc2f:c47c with SMTP id hg8-20020a1709072cc800b0099bcc2fc47cmr2592178ejc.53.1690481379333; Thu, 27 Jul 2023 11:09:39 -0700 (PDT) MIME-Version: 1.0 References: <20230727162343.1415598-1-hannes@cmpxchg.org> <20230727162343.1415598-2-hannes@cmpxchg.org> In-Reply-To: <20230727162343.1415598-2-hannes@cmpxchg.org> From: Yosry Ahmed Date: Thu, 27 Jul 2023 11:09:03 -0700 Message-ID: Subject: Re: [PATCH 1/3] mm: zswap: use zswap_invalidate_entry() for duplicates To: Johannes Weiner Cc: Andrew Morton , Nhat Pham , Domenico Cerasuolo , linux-mm@kvack.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 127F514000B X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: m7s4nzexbkxg7ob7fkh4hh9c8xss9d4u X-HE-Tag: 1690481380-487695 X-HE-Meta: U2FsdGVkX1815zNgB2JrvloKhmKHk4jTfJFMhjvnMkn7TXUFhVAlA848Uj4RUKu7+NZdRNUuiMuoFG1XfHpM9+UOpnS9ZVg5FodPCHqMq6+H9A+4vrRFMPy5CVDncXoicVsH642Q4HD7ToxawJKbqOhPGP9OR2tySQbz2CcMTfCjF0WThoCtDXXtYx1Ql2/FRFTCa2bzDTHJ33TNA3tn9jw0ADISgx4XxU+2ciEOpn0L4w4m902EZFqYcwfF7dBBp9/2QMcSyDMiXuRAYKtjv0zupsm6/DuuTsxyNj220Fzym/mkE0bKuHgjP6zkXIqx04hLhOUGkrVSBr4k7CTZm7l7eBXsmZ/kKxwcm4bOnYOAlOHUCgVUaaoyB/DT517NQLda0byBP0pkIP5YNo0wZkyGPKjHk3jwAjbmS9eaFeMW8JnMboQr7xXURhKGGT1eG64KIMnUiS3ro6IeO/7pDePrqhmkPDxuVjG4an0lhVnvjA1q7/ZjXHOSUCpyVszEpfzeKN7yp5FY5xo89dD/xT3iVn5GAF/WGZlQeIY1DEmhdLlK4vq8a6WX0MmIdyuyQ9lzOYzufseZi+jZt7kJ4+3YeMP6yLrEfce/YIFMoopgC0aCBZHJ+X6lVMABV0Y7foswva5uf3kKAm5h7UGZuwC2TwQhD/V8tkJQ1lci2FxlCvu/im6NEQZSqR82J8oxElhj/ku/RrfH3yjDS3FK84qinXu3xnbbaLlQxW6lKNaCAgcCibCidNWkD7HRUdIevb5mQ2gp79Ya4QBR5HNwwgv0rdIoz5+adnS6gxoux6oDrPzsAFD61ZWlBF8EloZ7fBhPRwVgKd7PDZbA3NB4qWf8L6OVUqs6XJXtAG3zZkFihxKTJEqHh+Ub43GQXI22ex6FG8pvn2McvPGlg2hEOQUN/kVn5Yyt41SYr9Jd/F+JpkNkCs22MClAMcPIQjfXE8i1oLYVn8q8h2NwxSc ASBKWxfW Lh1Co1M5LqoYkmf/d1IpFIRWmM5O5nCH35Ht9oaZuYV2rV9NlSRAnSfLXWoXHaa4lkbLhcfKDN/Vw7QL6fSh4VxW6Nktvd/I/VDcS+EVNk1w1nUw0NCHKk+57J1hqN561QowkYsfKsg6367VGF6KHlrk75j3IDUFZZqOE5XNhnOdWrI790pzyvv0FESHWQ4lxkS8t0I+4wZt7JmJjD7u1WFh4nprLFu3FJpj/5mKuKVrObgnfjUwqwpBAfIFXlgmC0xOM/hmSkMtn16juu9eshYA78uX/VHBajyBqqGpaJ6umlJ45G/K5x1iZfuysBijL0O5K0xOlkG2xjpnD1UuiEGNj6bzwu32tX1EF 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: On Thu, Jul 27, 2023 at 9:23=E2=80=AFAM Johannes Weiner wrote: > > Minor cleanup. Instead of open-coding the tree deletion and the put, > use the zswap_invalidate_entry() convenience helper. > > Suggested-by: Yosry Ahmed > Signed-off-by: Johannes Weiner Reviewed-by: Yosry Ahmed Thanks! > --- > mm/zswap.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/mm/zswap.c b/mm/zswap.c > index 583ef7b84dc3..e123b1c7981c 100644 > --- a/mm/zswap.c > +++ b/mm/zswap.c > @@ -1344,9 +1344,7 @@ bool zswap_store(struct page *page) > spin_lock(&tree->lock); > while (zswap_rb_insert(&tree->rbroot, entry, &dupentry) =3D=3D -E= EXIST) { > zswap_duplicate_entry++; > - /* remove from rbtree */ > - zswap_rb_erase(&tree->rbroot, dupentry); > - zswap_entry_put(tree, dupentry); > + zswap_invalidate_entry(tree, dupentry); > } > if (entry->length) { > spin_lock(&entry->pool->lru_lock); > -- > 2.41.0 >