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 37847C41535 for ; Tue, 19 Dec 2023 12:47:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AAE8B6B0083; Tue, 19 Dec 2023 07:47:30 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id A36BB6B0085; Tue, 19 Dec 2023 07:47:30 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8D7BD6B0087; Tue, 19 Dec 2023 07:47:30 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 7851D6B0083 for ; Tue, 19 Dec 2023 07:47:30 -0500 (EST) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 48BA6C0A9A for ; Tue, 19 Dec 2023 12:47:30 +0000 (UTC) X-FDA: 81583543860.16.8FA1AA9 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf20.hostedemail.com (Postfix) with ESMTP id 64E5E1C001B for ; Tue, 19 Dec 2023 12:47:28 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=jRlvAXUP; spf=pass (imf20.hostedemail.com: domain of chrisl@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=chrisl@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1702990048; 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=UWAQk1G3KTdX3NKnJLL0oqqFo5tshXSINqL5yX0a2hw=; b=ALPg24klkzvNqm0JTwbKtr6OPqGKYCkAwv9E241y5vLJT5n8w+vBh+D2PEpzaITAvFoRlE sY49BM8sVOo9i+v4dAip8AJT4oXeqlywBRbl6bWSKHbaKEbDkXIislAwYv6wME71OwFpOh e8aqr62vBrHC331E/wUhU5uJdWW/MbU= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1702990048; a=rsa-sha256; cv=none; b=wyXjoaBB90RqZe2fNvP8ZIhA0ZoZIm2eKcwLvnLr4x9kx4Mkq/pSHwXs+lpIjMB091HeZC eQgDk77dS6PTK0Af5jdiTQmnXo1DeY/oI67Z4i/bzqduoOFgIt6GBn04NaI+17C+idvXi+ xDC0rUC8AwhQpWtMxbxCzLFcPYd+ohg= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=jRlvAXUP; spf=pass (imf20.hostedemail.com: domain of chrisl@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=chrisl@kernel.org; dmarc=pass (policy=none) header.from=kernel.org Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 63B11612CE for ; Tue, 19 Dec 2023 12:47:27 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 13A8FC433CA for ; Tue, 19 Dec 2023 12:47:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1702990047; bh=hnFmc+s8sR5Tye7KepwE2+51ZjDZCNpery1XwfqQ5F0=; h=References:In-Reply-To:From:Date:Subject:To:Cc:From; b=jRlvAXUP+1kY4QMJTKSXR/xxbNRW8HMS8vmuY/SHgxSH96hz9NsXqUwlVvIg69m5o 0zl4BHCdPgqAaJ8wZKcdyZCUrGhrZ9+XelrYMbbAzyJf6BcqJ1HpdW+RY2VNYicUVC lRqSTI4HGQchFRUGJNDtpqWF26XVwlbpYIkWkZUhHNggUQnEZK+I+VPcW5M7e6jFUd A/jB2WOvcqJcXn7iXekaQj3StDLPU7sJjqLRgt9F1o2x5vghQuEyO48nAqt5HenAf5 MRgc3+omDjDckG+PTJUTdh6r8y6bXKzu8MUM56q6qcJjdWeCtI4FoYZFO0BEucb6xR sks6WiLQe6jNQ== Received: by mail-pg1-f178.google.com with SMTP id 41be03b00d2f7-5cd5cdba609so3480190a12.0 for ; Tue, 19 Dec 2023 04:47:27 -0800 (PST) X-Gm-Message-State: AOJu0Yx6/mrGe26uy+eEgKXjiKAlG6XmaXqqLb0FD4FeK2aZxhd6lj+w 9jlgi+qMpYQlUQjGN4oeLfD1MsbQNV1H/H7zU78NjA== X-Google-Smtp-Source: AGHT+IE48aXiDCbcHxbz9HcyCylBO3zRDq2Z4NyaPTm/pSzXxwWB9ViYMnRA83jxVStJWBss1SRBcsIeg/jy+9eMFbo= X-Received: by 2002:a17:90b:2285:b0:28b:904a:93f2 with SMTP id kx5-20020a17090b228500b0028b904a93f2mr2011222pjb.32.1702990046576; Tue, 19 Dec 2023 04:47:26 -0800 (PST) MIME-Version: 1.0 References: <20231213-zswap-dstmem-v3-0-4eac09b94ece@bytedance.com> <20231213-zswap-dstmem-v3-4-4eac09b94ece@bytedance.com> In-Reply-To: <20231213-zswap-dstmem-v3-4-4eac09b94ece@bytedance.com> From: Chris Li Date: Tue, 19 Dec 2023 04:47:14 -0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH v3 4/6] mm/zswap: cleanup zswap_load() To: Chengming Zhou Cc: Seth Jennings , Yosry Ahmed , Vitaly Wool , Dan Streetman , Johannes Weiner , Andrew Morton , Nhat Pham , linux-kernel@vger.kernel.org, linux-mm@kvack.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Stat-Signature: gai9tgqkq84ykpejm4hkgi68u8gk5f7f X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 64E5E1C001B X-Rspam-User: X-HE-Tag: 1702990048-330941 X-HE-Meta: U2FsdGVkX18eEzbTLs1XjLwHDO29zl560QxtpTLJocgUl1oHmNki+DCY4ErxZpuk69Db/gos3ETzyU/t76apSKM8vqAA5qaAA4ChAphKD4yAYYqwo165t+EN7mXjnPlSbLJBN6nte4s7nHF6GL4s/2TwqAZfK1w9PnhCHsxdxUuYnQFGuL4Sa7osWJLqyc/Hl8sEIqh9JLv07bUDuf+F2ZwDNHxpE+tjpRv4k5Trf6uLaDjYZLmlXYbnXNM0kvr1zP90xl54K9a5SnTpxRZ03I+VyjMZlqpxFYPrRS/3ppGzUIRQ7ukfgx/Z+uTQACS3ZynUmovLyrE0JV/RfVWlvqPr0b+eG6ob0M9PZU98gU9FrmpKCf5ABwBS20oXO0oMRV6u9TPKvuGALQgPApny5TcyfuWuq1I1YDjhfZ1439nwVjGWRjjHw9JEe/I/WlnAiRqpaBFnAcVVUUyLF9UuQmtCp0zTtm0r5SqZRXMWVtro0ILh4IQWQ5fvuiMiV4Kej7KUNu0XRPmmCr9OKCnbWVMG9Q+O1Q7sRKBDV8xMSyalfgHL+DRhOdwD/S8iesYfsGPmswdX+DYTPHZLrkfV1aC6EC3vkf5PKgGoFQY3yAb6xOa5/IxdRVvQxDim/28xA5JTgWfx+eqmxl7n9dBk197nSARPHpzk4wZ6ukpFUgx13xcddpYtA17uKIM8goB6BbDkE2ahX455QTOE8NF4gQTtcgMDmjXUg0P9Hu3o76Ui5OFZegvYa+Ppy32eAhDdHk+5XQFfzwNzZLWoJtIEo+Z9XUEEUiT+1kGL++J/92OckyVtnnxHxJQOClRsqmnUtvB6SJvRqZYSfIIRATkAchxE243YaTQqIu/WlRveXRHJH3QKb4ZVcFXaiovEcFzFil3n2GkSIUg59ukqtS8ksI0UUfdj6N539/f8g4wjrwOavLhyYoB9zS/jAIxZvWK4gj2xWqkzFh1ZEcQh0nr PvJ7cNmC 5Qi+KMwlBHWIHQ10ufxpeteQ6/A26LwIQR+v/LaI0Pa+OelbHiIbRgSUjdTmZYOMJKh6Dho9RVEIMN+yqaNI1fZXLM7ohpKNpXxto1xAbCP4fJVfIn+O9ksblr3SMq/VozJMKK6lRLC/plyhM0rQwIv/IkRwhd6I5BZpbLv6czQjUBIUKB09k5q1ZB7xlSyRt1N/0bUyRNlJ6abADPmdOXkTW4b+MmjXax5MBapNSGMjHMtBTZvI2w525W+NBzbDTvgnQWicykSAF1bB+S9qi2OVGVQLioO4wdWRp7+4zfZVJ5ztjXPd81iP1QVfWsMeFAZlbuskByrV/zhiGlfaGOittcH7Pk2jF9wpMpPh8vUULi7CvWOUalwSmnOWmlCtVeF9QcNq2wjs+Lk+R64Cysvxi6w== 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 Mon, Dec 18, 2023 at 3:50=E2=80=AFAM Chengming Zhou wrote: > > After the common decompress part goes to __zswap_load(), we can cleanup > the zswap_load() a little. > > Reviewed-by: Yosry Ahmed > Signed-off-by: Chengming Zhou > --- > mm/zswap.c | 12 ++++-------- > 1 file changed, 4 insertions(+), 8 deletions(-) > > diff --git a/mm/zswap.c b/mm/zswap.c > index 3433bd6b3cef..86886276cb81 100644 > --- a/mm/zswap.c > +++ b/mm/zswap.c > @@ -1759,7 +1759,6 @@ bool zswap_load(struct folio *folio) > struct zswap_tree *tree =3D zswap_trees[type]; > struct zswap_entry *entry; > u8 *dst; > - bool ret; > > VM_WARN_ON_ONCE(!folio_test_locked(folio)); > > @@ -1776,19 +1775,16 @@ bool zswap_load(struct folio *folio) > dst =3D kmap_local_page(page); > zswap_fill_page(dst, entry->value); > kunmap_local(dst); > - ret =3D true; > - goto stats; > + } else { > + __zswap_load(entry, page); Very minor nitpick. I think this change you only take out the "ret", you don't have to remove the goto. Personally I prefer the one with the goto because If (!entry->length) is a rare case, having them indented match the normal execution flow is the streamlined one without indentation. If you keep the else statement without the goto. You can move __zswap_load(entry,page) to the if statement so most common case go through the if statement rather than else. I also think this commit can fold into the previous one. As I said, this is minor comment, it is your call. Acked-by: Chis Li (Google) Chris