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 05A81C4167D for ; Thu, 14 Dec 2023 00:57:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D941F6B0190; Wed, 13 Dec 2023 19:57:12 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id CA6C76B0189; Wed, 13 Dec 2023 19:57:12 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A689C6B017C; Wed, 13 Dec 2023 19:57:12 -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 8B3946B016F for ; Wed, 13 Dec 2023 19:57:12 -0500 (EST) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 660FD1A02B8 for ; Thu, 14 Dec 2023 00:57:12 +0000 (UTC) X-FDA: 81563609904.14.E6B2AAC Received: from mail-ej1-f42.google.com (mail-ej1-f42.google.com [209.85.218.42]) by imf23.hostedemail.com (Postfix) with ESMTP id A2B6814000B for ; Thu, 14 Dec 2023 00:57:10 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=pWRzweTh; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf23.hostedemail.com: domain of yosryahmed@google.com designates 209.85.218.42 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=1702515430; 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=3B8OBzCG1IZ7Sv1aowAb1qOmx+XUkyQgXoo4Zoj7cKU=; b=VIEQgxc449dgIY/1yp9wTiR38LEn/4V5sv+UG/Docqbkj+tIEqoQNf4NMKcCuUZ5x0r01U FeHhjnUgHxw2aqzj9YlnSOHNkSHdrNUlZfBazH/qmAVbO19/AYQJfctR7ZrQN7Ofu9kXFc 9+b0/NthXAqqcBMJeHG82w7OpypC7c4= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=pWRzweTh; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf23.hostedemail.com: domain of yosryahmed@google.com designates 209.85.218.42 as permitted sender) smtp.mailfrom=yosryahmed@google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1702515430; a=rsa-sha256; cv=none; b=07jxeP4PSVNoQeKzq2PK98++c2csrmoMO2+koq8PyYmbTM19ilkgP1aABxpA18ldEnKmC0 E53FgEs02SXftA03dBmscORLQLOGfiFZSwQ4EUydbLlvuRIevBE1ogWZ7XFcZZbD5kYhcP yOBX3AcKzwtPAyT0zmAi3pyM/5QZ/Aw= Received: by mail-ej1-f42.google.com with SMTP id a640c23a62f3a-a22fb5f71d9so22517666b.0 for ; Wed, 13 Dec 2023 16:57:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1702515429; x=1703120229; darn=kvack.org; 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=3B8OBzCG1IZ7Sv1aowAb1qOmx+XUkyQgXoo4Zoj7cKU=; b=pWRzweThmfq0nDcSzcdvbL0guEWD0uwn5aZff7QEbWyLcCvIE051AdRKpa/0aE10Iu doHFYfqqKgNCzg3llDZ+u0HS0LEbvnOpHO5/tmn/M041riuz/0poD8An3m0HYjGP8BF6 9GEhlhxrAIow9hoI8Km/Y2eJ1XddndXB9Ak4XtAwa9B9lt+PrqACJ/0GXSEOWfCkYwZV 1puS1HFDK8HFOTs5+mpRXsjQEVr17njc/+3HGNJtJd2fs5a65NGiQqzHyLS4oCkZMPD5 swNdCEAcnT3lQRXGlZ6wwJhC2pZBAJ1uVr/8LfuRX0TstoQjtp8rLNiQQzXwZfk/KGLM t/LA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702515429; x=1703120229; 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=3B8OBzCG1IZ7Sv1aowAb1qOmx+XUkyQgXoo4Zoj7cKU=; b=VEJR5meZiQZj2I0yCuKCie5KrwaOkV3OC/bemzDcob62tE/g4agaABMJcEhwFWup7E JrFV0O/Z8aijGGxnUjsR/62YMGpftvkufMTBVoufTvqH4pvIaz10I1L51Tp0o8Z6t3nk w2mRnl+M9NgEfbKd5Io12UxEDtaghhWGt+gj6BGZ3lgB9A18jwrrBXLVpZKwFK8W+MsX FtQpYJyBDHA4zPgIWVUXI9SrlQRW3AU12wiSKdHafT2Rd7ItyIX1qNOj2MEaXuDcEfRn BiVTcrWbzZ28QnTsy2W0zXkybbbRg5WcY9bsCNSgA1ZGZ6rW5PdcWZkei4yhqJihss5K IX8Q== X-Gm-Message-State: AOJu0YxlRmuqg/YrM27nDmkjal9EsRMN2dgdYkh9Lk7gHn1xLADRmVWv Pki/776maeopG2Q3HaNbDAB18Y0BaUUH+1F0H2nsRQ== X-Google-Smtp-Source: AGHT+IHcshsT4bWys9L3ZKRZ0grn6m+7PCAsquWuunB9g4MODUbrDgopLM97JErFmHJ3WeM6+N5nSBbdzETyyNVsEu8= X-Received: by 2002:a17:906:4ad1:b0:a1f:ae88:b909 with SMTP id u17-20020a1709064ad100b00a1fae88b909mr5457522ejt.70.1702515429095; Wed, 13 Dec 2023 16:57:09 -0800 (PST) MIME-Version: 1.0 References: <20231213-zswap-dstmem-v1-0-896763369d04@bytedance.com> <20231213-zswap-dstmem-v1-4-896763369d04@bytedance.com> In-Reply-To: <20231213-zswap-dstmem-v1-4-896763369d04@bytedance.com> From: Yosry Ahmed Date: Wed, 13 Dec 2023 16:56:32 -0800 Message-ID: Subject: Re: [PATCH 4/5] mm/zswap: cleanup zswap_load() To: Chengming Zhou Cc: Andrew Morton , Nhat Pham , Chris Li , Johannes Weiner , Seth Jennings , Dan Streetman , Vitaly Wool , linux-kernel@vger.kernel.org, linux-mm@kvack.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspam-User: X-Stat-Signature: 1ozxe3doy3pcboiawrrx4ecdbydou97j X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: A2B6814000B X-HE-Tag: 1702515430-546832 X-HE-Meta: U2FsdGVkX18JkTemovaj2AZFYbN+oluzrZp0aK10zJ6lsKPnQmGWjmaxszH1SUtZJFSXcqpOo6HZ92Ovc/10nnn9pCVMoR9FJOGqrKeu5qTX82XeDLpiTEWIbXIajFIawEdGgU2fuJcz+PJ1Gf1CCJxQySTUgYLixeFsEF2dg4y/AIGbjtorNrB699UvS7QD1B5juGSQKGpkZaY2BnAOyUc0ZhhH5A64dRc6PgknloBWRzPfEqB5dbt+oZnOl4ba15b8q3ENiXzkxU2F6iWBSFG+h+DpvrjnaTatNIKApDNtHGGXhZc02qGZms1fx3Mo/3T1b83Pa+rALlFR4Pe3B1pgfZkiWnSkSUlcEhO0oeD5vM1gaZ1sSNgMUKVuectDKBfwmYWGh/wB1C4zsGoCtoQIpwTKGn1fjq6rP5xscxl5VghGtUQTR94C0UDSWD2+XQT/EN3I2SDrwPQisJmGa80sfUlQwxQH29rdxsBaZ2HFkom0SrkWg8sILdpK1GGPY/mT1G5pA1gYpYlpwB+39fTjU9wjKDcxTfAKMQ/Uj1RJ+8D4hlQREQN88SzZziXrrvvmOVBj1qcMeNWhTjCjuCvh1YKNMOPLOUfrpoqkXWKYDy+38HRiFfPL8bhHcYvp+kQeI42OEMkGwKTiKMXQLyHADdmF095hzGqIJcthsIGBQnpOxIQCzQ3Xe0Rxp/Wg8X0+nEi5uv5eSI1Ru+Ms4pUANmgxT1GWOHK2U9D2rcumI9+VSlY5Bh3SkgYKCBfK/kCUIWl4dNfrDdjEsfpUSDpny9ZRu6xPPF6oYzwAu7ITtngDyaUhSMCncEzwYRrC/IhBW1+eeUghRDrpLLO+zQ70xKnyk00GTaK/IBnJE60Qwab6j2RoJGDoqxv0y25Ct94holTgGKS+dc82Jq6dCaemrYXy9sgqGbxOxbhhBALR6YkuwRQAfz8H9ryhL4HNP6pfzfW5XjEIlA2gBQB 39eb6JVE JoeU/GMPnpOss4T+8bNz0JqCyVHv0oVq5H+Qdzr6HY/dzN5QE5mYAfySLKJmRjVZX1UIvFebzEQvrCHqRf+9wGes26jO402vawzKKd51ho8KPdmlGHWr6bBUdYgYEWV4U4oGYvsW7e2wDLpDGlhl78XNH1uy25yidUsblP0ICh012hmjkdiusr8TEUlNfUEhDVyTTEfB5jGwB9NNZ/IFxB84FJ+R0G0v0j4V15Cc92I8PQbBUDzEyCUtekqCF6J5L458Y9g0Eud3m8E1ZklrGvTvukEOk+RP6yKH0qs0LBXmVFH4NH3ilrueKvMbO3OAKIhSE2MVoXNQqzSFDovmbMqZwctddQymSoRn/ 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 Tue, Dec 12, 2023 at 8:18=E2=80=AFPM Chengming Zhou wrote: > > After the common decompress part goes to __zswap_load(), we can cleanup > the zswap_load() a little. > > Signed-off-by: Chengming Zhou LGTM, I think it can be squashed into the patch creating __zswap_load(), but it doesn't matter much. Reviewed-by: Yosry Ahmed > --- > mm/zswap.c | 12 ++++-------- > 1 file changed, 4 insertions(+), 8 deletions(-) > > diff --git a/mm/zswap.c b/mm/zswap.c > index 2f095c919a5c..0476e1c553c2 100644 > --- a/mm/zswap.c > +++ b/mm/zswap.c > @@ -1765,7 +1765,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)); > > @@ -1782,19 +1781,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); > } > > - __zswap_load(entry, page); > - ret =3D true; > -stats: > count_vm_event(ZSWPIN); > if (entry->objcg) > count_objcg_event(entry->objcg, ZSWPIN); > > spin_lock(&tree->lock); > - if (ret && zswap_exclusive_loads_enabled) { > + if (zswap_exclusive_loads_enabled) { > zswap_invalidate_entry(tree, entry); > folio_mark_dirty(folio); > } else if (entry->length) { > @@ -1804,7 +1800,7 @@ bool zswap_load(struct folio *folio) > zswap_entry_put(tree, entry); > spin_unlock(&tree->lock); > > - return ret; > + return true; > } > > void zswap_invalidate(int type, pgoff_t offset) > > -- > b4 0.10.1