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 D1D74C41535 for ; Tue, 19 Dec 2023 14:08:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 280EF6B007E; Tue, 19 Dec 2023 09:08:15 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 231936B0080; Tue, 19 Dec 2023 09:08:15 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0D1C06B0081; Tue, 19 Dec 2023 09:08:15 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id EDB4F6B007E for ; Tue, 19 Dec 2023 09:08:14 -0500 (EST) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id C48BA1A0CE2 for ; Tue, 19 Dec 2023 14:08:14 +0000 (UTC) X-FDA: 81583747308.28.8A8F99C Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) by imf19.hostedemail.com (Postfix) with ESMTP id 2DD511A0024 for ; Tue, 19 Dec 2023 14:08:12 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=AWI4weDq; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf19.hostedemail.com: domain of zhouchengming@bytedance.com designates 209.85.210.172 as permitted sender) smtp.mailfrom=zhouchengming@bytedance.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1702994892; 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=58GcE9Z/uz2j3e713mEO6HJcPRG3l2oQcTHcq8xiCnE=; b=OQIPVSUC1tPjumf9ptFxbFDvc2fwjk3iFjo/0a9CuLswF0NNIJ9rnx1u6EvobzusVjwRQh lPXpAywLsqGLNFyk1IT7b3uv+yzNeD5pDDWNssZXURGUh6kFmQh6yjwTr4jqFtEuJWQ6UX zAHOLZtMJLTfNl+M5eqnJCm976GKsoA= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=AWI4weDq; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf19.hostedemail.com: domain of zhouchengming@bytedance.com designates 209.85.210.172 as permitted sender) smtp.mailfrom=zhouchengming@bytedance.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1702994892; a=rsa-sha256; cv=none; b=PGs27u3bUx8Q0g4/ePbyE26+3hcXa0nJzga0nDIYsxKcKve1DOENXokvCyHpgujECxiUQn L6Wyv7d+BWFuUgFlSw7S+CTSxS8Ggp/SFkuhXqrBV85S+ll6lyPNJD7hgoUiQh4G+mqxHa pLDuGOXrJ/3JEB4o/DpZuVjnUQI26hI= Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-6d3165ac96bso1551893b3a.0 for ; Tue, 19 Dec 2023 06:08:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1702994891; x=1703599691; darn=kvack.org; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=58GcE9Z/uz2j3e713mEO6HJcPRG3l2oQcTHcq8xiCnE=; b=AWI4weDqnuIv/lWhofVI2M8DBmY1NeqBLJ4NqibX7DRWVxBWKSfitRv9Wk4Uf3uBJb wWQ+l9KycBefiqbAki2pG4qVOcbVxcuPjKNjeBctu9slEnmZWjZmjibdxcGdZ6SM83XJ jpKM3HAyInHKdiMlI9TUCIZvFnnLJT66T24MiYMuRSa1ARP2WkaX8c7hukB6DU+n26t3 Amb/CwlxM871qbzu9m11SwsfdsVoufLDBuCqJvhoGrHCGnmc4nK6goXNqV1x6dSPTDlX P7SjquFBFe8W5pIb1UhUUvq2MuByZDHN/plSxP7AVYIOP2UQkvggJa/uflMfsqPR8RjZ pyZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702994891; x=1703599691; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=58GcE9Z/uz2j3e713mEO6HJcPRG3l2oQcTHcq8xiCnE=; b=vbyRiphZ87kqMql0CtE4mP1X783NN28aD5nrODhHm4BmDz7T4Op+0FnmPhjV8m7aid 5UpzaoSYOP1OuUkqr9DZUfo36bh0tg+RKhisRwidj1yK6CEYmcNVRLFZMdWOWC0ah1G5 xx/86RRBXluBllxj27UraL7xTe3nDBsgC1MGmV8ncCWhVVl1y33GozrqSsKrxH24Oq9l 5v9rSjW7s546O14TXDZXnoCj8FtyYu/lnL4AkBIuk8L8NVmcBDtOrWSMhjalUCxlXlEC wHlUYzlgOGj/JBbFi7FmMzuQobSwqppetCAslAvjZ5g522/9zFk4nEOExbDWraxPxt5C PMvw== X-Gm-Message-State: AOJu0YytLU6/ANlPqNexN7nGrLrjnn/tthJPJahjx1v85MT63Y+iO03Z Eb4KiPvYAtvjZhJKwbFEZd6EbQ== X-Google-Smtp-Source: AGHT+IGFTJSBxLhU68yjcoeat5xPaXoM1wmDboj99HXkH0bvKHXdQ8CSBkMkcnVP+qZtm1+N6wjNHA== X-Received: by 2002:a05:6a00:9a7:b0:6d7:affe:100d with SMTP id u39-20020a056a0009a700b006d7affe100dmr2434859pfg.13.1702994890904; Tue, 19 Dec 2023 06:08:10 -0800 (PST) Received: from ?IPV6:2409:8a28:e64:34f0:b832:9c5b:158b:a863? ([2409:8a28:e64:34f0:b832:9c5b:158b:a863]) by smtp.gmail.com with ESMTPSA id gu18-20020a056a004e5200b006d9415b769csm191274pfb.169.2023.12.19.06.08.04 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 19 Dec 2023 06:08:10 -0800 (PST) Message-ID: <66b3f3ec-7146-4763-bd51-bb48ebb4ba95@bytedance.com> Date: Tue, 19 Dec 2023 22:07:58 +0800 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v3 4/6] mm/zswap: cleanup zswap_load() Content-Language: en-US To: Chris Li Cc: Seth Jennings , Yosry Ahmed , Vitaly Wool , Dan Streetman , Johannes Weiner , Andrew Morton , Nhat Pham , linux-kernel@vger.kernel.org, linux-mm@kvack.org References: <20231213-zswap-dstmem-v3-0-4eac09b94ece@bytedance.com> <20231213-zswap-dstmem-v3-4-4eac09b94ece@bytedance.com> From: Chengming Zhou In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 2DD511A0024 X-Stat-Signature: q1fckanjj5eawy8tjatxzqu6ekye1zp5 X-Rspam-User: X-HE-Tag: 1702994892-880929 X-HE-Meta: U2FsdGVkX183eBrnQK07M6hE+XBvNdI+BzbfsYvJVA27bGXP2trN7/QNdf25Lb9y6wYpQlVeHv1Pe2WeBNuKcs7hC1++w4jmK6RCHjJ1frP182gVQ2se/xry9LjyeR05Jx04nSbAbyznd00RzGIojwSIh66way8qBxYFXFob6s5uzV4xnn/IGcecUwBCmdzkhE6d3Ayoy5UjLDQrvaoR5pgxDhyYdVMWaBkexCrltC+yJC4NlOjTBS9JPm2LDQeUJeci1c+tagJdgQprc+lVcH1vrTzP40jjz1g3HLzQCVhNRbiNgDtqP00yl189zqrH8ZGb45untz1PIbo+1coANlfIQ/uWW2plLkSieS7EFKRkU+UPi6AigTvmB4AsSHUBlOwhbXYAatPHuSsMVbzm3/1TIHZYZ8SKHcebQwYVuZ3tPaotP6G9LRi6A7E3LkZ4HJhRLMyDaegCiQgMEiIj7scyULcUWj+opH6IwDmUSZ4beFtX+wDEGN8fILsCH2jXMcDDt/rtTNZo7Mlpj1vBeNtuC2T93IJKHzuYh21iggAYktvvZiIKYs4oYT2EGzD+eS0D8QX79l6OpI58wmq8QII5Oy5k+tpN3sGlpVnQQFJm/vkb3teiz/K63qQLrXts/eAM4eeA8F396CiE+OFD9qu0tnS0RS7AohQ5KreKeaxN0kjfND2XdKfvEk747s2BEw6a9ZcuYgHtB070QqcfTa8RE236qNInzq+5zMuz2vxmWZVZ+1xjUY6nSyW2IJAlgjbIOvsXdu6dQU9Mku6PHGGtAl1yLRM81Wrrf7PAD2tHKrtDe1HL9c89x3s0zdy+vPzmnOBBTtCpq7stHapbv6TqMC4ppof/+gWJVnjv5VvtEc8//1mBfmewohhc6I3rFYTCqNsCUDw0aU0C1cmUKv1K18pkBu4CumRCQ9ZhCy+cM0V9Iojf1b4cc9nAwRjFBWJY59URTgcinAlSOez nCF2SZII 1cEXvZSlz11N0vMHSfzJacIyDoXbvHVhcJRfLTbhbjWDMQijDB0zHzagwBn645qFzxQY8zTqE1ZGxQojpOfqsxNO9R5UI7FqZ1dfobjK08WTYaYyTsGS0FWgoiHcn6xZNVuZZDhEdqdCiqS11Nw14qJXbf2LeGInjsnroZIFDQ9llnLmLLEJXrHQYIEtVe4/QaSUL+ulBHZdc6eMN2i/70OMq/FksERWlyzEC1zwS1s5AUunGrvc0eNi43P3qTUNwKkbbDg8bM/phdQAL+T6zTpkhkw60b1xnaCp6inhHBogD/cLAdtDNUX+3WT0jq244GfKAh0fm54VvHZqgmEM/P6XHezZCc2f9eQVLyRMKSqHPUvtdXjD6JmPX7YSyKsL6ja8AaRPWIEPPFwf7LzzHGYbg4Ocpy7uWcxNerhDuaktVteJfhf4H9kZx65DCvxgp6s4nZQh72fn9nP9aT0wrJGTyYzPQ0iI5neg/WdvJwwCFZAFm0rCg6iAbl6sDtSiHer7/EH+tahXuKuc9Pk15pKabWW+dfx+lgcccEm8QnzXj5avPufNITINf5ZW1fdnuwqiHyT8lnczR8vlNJAOgpSVUgMSFcarW6G1l 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 2023/12/19 20:47, Chris Li wrote: > On Mon, Dec 18, 2023 at 3:50 AM 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 = 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 = kmap_local_page(page); >> zswap_fill_page(dst, entry->value); >> kunmap_local(dst); >> - ret = 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. Make sense. I will change if a new version is needed. > > 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) Thanks for review!