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 57036C46CD2 for ; Tue, 30 Jan 2024 07:52:01 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BFBB66B007E; Tue, 30 Jan 2024 02:52:00 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id B830D6B0082; Tue, 30 Jan 2024 02:52:00 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9FCFF6B0087; Tue, 30 Jan 2024 02:52:00 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 893816B007E for ; Tue, 30 Jan 2024 02:52:00 -0500 (EST) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 53178A1A49 for ; Tue, 30 Jan 2024 07:52:00 +0000 (UTC) X-FDA: 81735208800.26.3C533EE Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.202]) by imf01.hostedemail.com (Postfix) with ESMTP id 24A4B40011 for ; Tue, 30 Jan 2024 07:51:56 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=SIDzb244; spf=pass (imf01.hostedemail.com: domain of 3nKq4ZQoKCAk7x107jqvnmpxxpun.lxvurw36-vvt4jlt.x0p@flex--yosryahmed.bounces.google.com designates 209.85.219.202 as permitted sender) smtp.mailfrom=3nKq4ZQoKCAk7x107jqvnmpxxpun.lxvurw36-vvt4jlt.x0p@flex--yosryahmed.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1706601117; 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=aC2acMvCrsnsCSaOBPgEXr/tWbb4doa7fO8e2ncEHsI=; b=i7IY/TRyY7Q7SmIP2EDNfGq1cZ8h3bUaX6ONtgJmrVGHS8yUyFzZxNr/IOTzaxYLTEoqwV +xVk+xG9jK1U+XI7V/MBt345mgZivmiTK3H3ZSKsYGcxMly3DMn+LQYfVjSHhWYp5mP9Zp gEWj0wxK5KhJmmXIRnEQ1iSIHuwQiSY= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1706601117; a=rsa-sha256; cv=none; b=K1uWDczl/xDFDqfY0IiCz96PFXhFxsxJhukRhNgWrrnyhhvJGWpTMU1rrGwmUgyNCCk5H6 PR9+1Bdmmja9KSofXStQ2/uNwUQ0tcGOHkRMSsKo6css1W3AHxRlCefrGXM9yb8aBDgCcG 0byz2V5FR4+OxWS8AScN6EYxTYcuke0= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=SIDzb244; spf=pass (imf01.hostedemail.com: domain of 3nKq4ZQoKCAk7x107jqvnmpxxpun.lxvurw36-vvt4jlt.x0p@flex--yosryahmed.bounces.google.com designates 209.85.219.202 as permitted sender) smtp.mailfrom=3nKq4ZQoKCAk7x107jqvnmpxxpun.lxvurw36-vvt4jlt.x0p@flex--yosryahmed.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com Received: by mail-yb1-f202.google.com with SMTP id 3f1490d57ef6-dc64b659a9cso6477806276.3 for ; Mon, 29 Jan 2024 23:51:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1706601116; x=1707205916; darn=kvack.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=aC2acMvCrsnsCSaOBPgEXr/tWbb4doa7fO8e2ncEHsI=; b=SIDzb244UXZxKcFx9QFfjrqLX4hK7ppnnwj4lNF14L3pgiNch8bitjnipIE+KbRem8 u/imn32uPSyrh5d5KDBST0a+r3kiTjYP2NerBW1wSwIgXNKHO2BcTUzTuW3TmgYJxXAF FZFSHwQ01jBMWZ2R0ZDR8xt2oWFD6kxdp7vRUrKGKk8ep6pQ+cQC1/khz7seiQ5ESW1s WVz5o11FAL3DY84G8Ph5NEYw4RP44jR1MCZBppxlmwIQcyem430B9L8Xp1uuuaDtzZbn LgJtJncTSVUv2Rph0TgwlcnwXeKIh+oiJU29Hnw42rebckP00ERz3jD1kvQzRUlHtnT9 w7UA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706601116; x=1707205916; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=aC2acMvCrsnsCSaOBPgEXr/tWbb4doa7fO8e2ncEHsI=; b=TrHbFF4fZpQVVCnZbhEUpig9ahsr6JmZvKkagGIQ6RseBCcW+j1zKijHzh8YZ5m8yT N2dyEh/mFxGNvyY/hxoO8i0b9JLORQ7cZDfa/vMyiad2anfZcrturhi5NylCvlMrdKd3 NCf34AXINLJgcC6S+5DlxAzr5pjVWPuIc4HtES4GDzvNs6zOBHv1SUAA6Fo7zR3rE8Qg Bel3MmFr6UPOqUOTB7seFqyS6sbCOsUbk9+6HM8/Lu8PK3twtGEqrrdVwT+k3w0Q/kfh FfPYbzh2KxJU75K9Q+AZ1brhRks6raErwsZDF7Q4hdYEp1rfMwQ3YGJsfRvAAo9i15aS KTXQ== X-Gm-Message-State: AOJu0YwA12heHxxyTIaipWrhBjFpP6g8ZEemXf+CzenlEwxrC5lO6EnW 4Jqv9UxFPeV97ui2YUr/Mt6Rt9vl4h8fwvZUlkT/OQA/YqzUMcljNMNn03qs8HjcQaIx6xVAcWZ VPcrd1f7S3mT5VHNoYw== X-Google-Smtp-Source: AGHT+IFujAJSnIpBcmAbV97uHmHUldTU/Nx6o0IeMBQyrYJ/AkEZInSvGk6j70Unc0QUBg4KgRSkRB0BXb9FU1/9 X-Received: from yosry.c.googlers.com ([fda3:e722:ac3:cc00:20:ed76:c0a8:29b4]) (user=yosryahmed job=sendgmr) by 2002:a05:6902:108f:b0:dc2:23d8:722d with SMTP id v15-20020a056902108f00b00dc223d8722dmr2809887ybu.13.1706601116113; Mon, 29 Jan 2024 23:51:56 -0800 (PST) Date: Tue, 30 Jan 2024 07:51:54 +0000 In-Reply-To: <20240130014208.565554-6-hannes@cmpxchg.org> Mime-Version: 1.0 References: <20240130014208.565554-1-hannes@cmpxchg.org> <20240130014208.565554-6-hannes@cmpxchg.org> Message-ID: Subject: Re: [PATCH 05/20] mm: zswap: clean up zswap_entry_put() From: Yosry Ahmed To: Johannes Weiner Cc: Andrew Morton , Nhat Pham , Chengming Zhou , linux-mm@kvack.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="us-ascii" X-Rspamd-Queue-Id: 24A4B40011 X-Rspam-User: X-Stat-Signature: qu1sppexp81sgbbxy6uf1ww993ruq1mp X-Rspamd-Server: rspam03 X-HE-Tag: 1706601116-945078 X-HE-Meta: U2FsdGVkX19OOo0A3LjtVsBzrgrKO8J7zkZEsmfwEzfuVjpbtFOIeuQCqd0DP8xvZdOYcGm6PP4zXn+fMknFy6+IHn/Yalv6/UGFKWyNda0nzSfe5sokJyeaOsGnhCLQ2D4U67PzTSksIT/NEDqqRCmmxgW5bmLhQlnSHZgMRvNXAG9rj7aWKWWkQU0pnfpEjXEPWcumg5xzi0kRo6GF/n218YdwXdeQScWvUJszy2vaB73MKhXuFxHEKBrhdLljsi9Mb0RUx28sk7AhK2V7Aci7bvbo885yP1yzlilGSrFWzBCkFgqjs1pBy9DxUDjnGHM9NP/Sz76JnPA4XiEL9oaoPv5e1ys8IuRwxJfylOdzhwMnU88VFbZGuA4G/nCGB/h6BejSWKkvdvpnFJ8RH115IxkspaIS5gRqh9tZeQCTD2cbvVrsLoD+zyGSAs1MbyuMntQY9YAK+XObqz6r6NuLSwzi3m2GPKfngR/0Q0saEY2bvuLOFNOwmOOZQuWaYscZ6j99hh7sB8g/0gH256w+LIeH19LynZo0NQqVOhl32TmvLzLLmErySNPV12Otoe3pgC/WxvOp7dX2oIHMW/Jv5njkhe6gDbJUWvtZ3ajVA1OojBPsZ9qrxnAWsYt7X0xm9h1fkS3p9RTsTeKPN8VhFY0+e79Y5asXCfHOp8lMx17Lu50whIeoyhKx/4OtVW4yXrlMOZtXGwHcSOeYHB59crDGqHByAzME3Bh5S0X63xd3crdZcP9pRDjvcWTY7lVyLdawcDpZ75207yHz2aI9YIzYVzQiXXWyJa06Z5pkkzGM+scI2YrjSRuQ+/gUXq5mWOynL6+lVJgnsxDtNhCjF6kme5lIYLOZsMWhNIhtUwQIZ6epEgKDpC9IJGYH/Ca0MKv6nWCER4IAU5drqJHDxs/Bx3vYr2KPM/vB1BxDE4zxNADofRnL3D4GuuU9QLS3lbB0ORKe+gwOseG KN3anxtI aZguhsX3OZG0ub+quNkquXVnGKaPKEELEUpFFmtu7QCmwfWTzh/Yjv083DstPtlJcL7atHdcvdeX/5qIn/CQMvkhDZf4sCwHdtsBlGMh79P1viSq/gdmSaw44uR277C7SfKawOBixGfYCbU6ecp3k2nI+uaLQTPW7ioUKXVqeQz5G/0/SfUT8TW+OB/GLoWFs5KlkO/SkgGE2WyzavE99+Smuj/SnWTeO3wbvge/ccDs8AzShDW/YMnhd+9jV3mCxBeRoRgkCMfR3RZJs/iwqa8LVfqv+4RJ+2VmkO+h9OKqjaNH5yMVIqKFdt8FakC8dtgoZX1BcmvfCrbh1PQvk8CLRUwHX+jn6AmpEcA7UE60IBetDXSjJrl+MwzoxB11ofh9j4BwP/v21zR93ksLv1T1SWN3x6MA3JqfaGAbSq7fhvROAPEQWHywqo08pcHFIhgVCzoOQKw8iM8i75jhp+IePGQWCqdkwCP2ob6eIxqiaEExtVNDACOOQpW5K2P3DdgCyOcBemBWjW/gSpLOwu/wXWT0AVihgiV+WhUFDd4MN48sp2fc5jcZd8WESgtP76izDa35YMMfwyYGyqYsvNV6Kh/NE9tOAzfn0D3vQp1W9GD/9GmzZNwT/Hc/Upb7yWpja4oLkJQMjqoAdUXyTnZq79r3Ih1teV2ElpwTRVRaFI9LweCLVhB96TOOw38Qw7R5g1SoDrWjQwUWPT/Qok4XsRw== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000133, 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 Mon, Jan 29, 2024 at 08:36:41PM -0500, Johannes Weiner wrote: > Remove stale comment and unnecessary local variable. > > Signed-off-by: Johannes Weiner > --- > mm/zswap.c | 10 +++------- > 1 file changed, 3 insertions(+), 7 deletions(-) > > diff --git a/mm/zswap.c b/mm/zswap.c > index 0c6adaf2fdb6..7a7e8da2b4f8 100644 > --- a/mm/zswap.c > +++ b/mm/zswap.c > @@ -546,15 +546,11 @@ static void zswap_entry_get(struct zswap_entry *entry) > entry->refcount++; > } > > -/* caller must hold the tree lock > -* remove from the tree and free it, if nobody reference the entry > -*/ > +/* caller must hold the tree lock */ We should replace all those "caller must hold the tree lock" comments with lockdep_assert_held() or assert_spin_locked() or something. I can send follow up patches on top if you don't want to resend this series. > static void zswap_entry_put(struct zswap_entry *entry) > { > - int refcount = --entry->refcount; > - > - WARN_ON_ONCE(refcount < 0); > - if (refcount == 0) { > + WARN_ON_ONCE(!entry->refcount); > + if (--entry->refcount == 0) { > WARN_ON_ONCE(!RB_EMPTY_NODE(&entry->rbnode)); > zswap_entry_free(entry); > } > -- > 2.43.0 >