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 8E1F6C4167D for ; Wed, 13 Dec 2023 04:18:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 70EF88D0009; Tue, 12 Dec 2023 23:18:41 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 4F3DD6B02A6; Tue, 12 Dec 2023 23:18:41 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 362EC8D0015; Tue, 12 Dec 2023 23:18:41 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 152378D0009 for ; Tue, 12 Dec 2023 23:18:41 -0500 (EST) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id D329380B9A for ; Wed, 13 Dec 2023 04:18:40 +0000 (UTC) X-FDA: 81560488800.07.9F41D00 Received: from out-173.mta0.migadu.com (out-173.mta0.migadu.com [91.218.175.173]) by imf24.hostedemail.com (Postfix) with ESMTP id F3BE6180020 for ; Wed, 13 Dec 2023 04:18:38 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=bytedance.com (policy=quarantine); spf=pass (imf24.hostedemail.com: domain of chengming.zhou@linux.dev designates 91.218.175.173 as permitted sender) smtp.mailfrom=chengming.zhou@linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1702441119; 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; bh=T7X6sO4QEs0CdCbHgDwct+75aKQI1ePv0U68eCa5kaA=; b=ag/bZ5T98NV4xGnPPRVqN89qsUHsUOoLAB9bYnNyj1+axXpwl+XSSuvi29U46maoImQvf6 KEg28tI3cux7KEwUWyfX3M5FQ/7yqspIUmi055alszsGZJr1xmKLbUkvcWCzCs1dWR73sh RxHPRsfj486nI5PxKmSi2ccEwjdKMvY= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=bytedance.com (policy=quarantine); spf=pass (imf24.hostedemail.com: domain of chengming.zhou@linux.dev designates 91.218.175.173 as permitted sender) smtp.mailfrom=chengming.zhou@linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1702441119; a=rsa-sha256; cv=none; b=VZifEDr6dzPHuqtNhaRlSf5mdB2eJCKJthLlmxozs0KviNMZpNT/WSKUBTh9SShvh0H7RO D7nRbC/Gb5WVJTZAMc6WXhdqQahmoA/fspxl/tvNQoAy2A6cl2qQ73yf4XHyiI7P85pgCE ujiFTbO9zG4ty1nwD3ewPP/Oc+0tA64= X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Chengming Zhou Date: Wed, 13 Dec 2023 04:18:01 +0000 Subject: [PATCH 4/5] mm/zswap: cleanup zswap_load() MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Message-Id: <20231213-zswap-dstmem-v1-4-896763369d04@bytedance.com> References: <20231213-zswap-dstmem-v1-0-896763369d04@bytedance.com> In-Reply-To: <20231213-zswap-dstmem-v1-0-896763369d04@bytedance.com> To: Andrew Morton , Nhat Pham , Chris Li , Johannes Weiner , Seth Jennings , Dan Streetman , Vitaly Wool , Yosry Ahmed Cc: Nhat Pham , linux-kernel@vger.kernel.org, linux-mm@kvack.org, Chengming Zhou X-Developer-Signature: v=1; a=ed25519-sha256; t=1702441093; l=1420; i=zhouchengming@bytedance.com; s=20231204; h=from:subject:message-id; bh=gHk9F7eN5VVpt8CHpkuzKmAhJem3BWIWL9xkZea1e1U=; b=Mq7ZVygwDSg26fqcIH0lgGs33EOIphxRRADgWgY+gCZsSYodcZU12+MAMo+qu+v55RREfVaQD qasMy8oE2aaBeXRlyCau99fMz3B22hGNgTkHN3IdyqWLfrnbHDZ9MEG X-Developer-Key: i=zhouchengming@bytedance.com; a=ed25519; pk=xFTmRtMG3vELGJBUiml7OYNdM393WOMv0iWWeQEVVdA= X-Migadu-Flow: FLOW_OUT X-Rspam-User: X-Rspamd-Pre-Result: action=add header; module=dmarc; Action set by DMARC X-Stat-Signature: dmqyu3i8g5wssxg1g1ajbmzcw3hu5ccn X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: F3BE6180020 X-Rspam: Yes X-HE-Tag: 1702441118-960852 X-HE-Meta: U2FsdGVkX1+yEa6RQo2hEOpajDyqEpPqc4VlMSVcdSVlEzQQD81i5uxJV4x4Dv7ndG3xSzZ7ZRKkaloucuGtDi5hFbZrruwCKHJ9/EXtLXIzxxoK2Js3Ly4gy4KUquZC2j/HvpyEV74hP+pCLd3YlcsbUFyNa4/Kjhue9B47V91hP8ZWOV5Eb4WhxY4DwJRUTmwYSSGuPSjL3hN7FRDTG/kuxEBOtNxzihF9AKZz/UURzcE7MPZTj3eeysE+RjXb50Ln55ncjEHI1CX03FKxYHIehxQev7kv/XEnFMRRXKqzae3ZUoSGTM29VphNhxie+kFt/JDuaRUrLBQuwRBjxLfVazZPSqEyW4ZWEDdRbw6r69wAEo1xZdtKfPX699QwBSehWHsAIhJjJzr6RDrmuZSWLwWlGVBFqT4J2YuWiNhgqftr79qhXi4QcRKxDxmrS2MVSKY/xDLVXFJoG+dWOTcDHU9pygo0lO631rnD3Y8co2EMZ1BWHJdZX6EwXgCsktkSoVFQ1Ut6mzmOYIwPE6mgMY2J5dfo0N2g4+JwqifvOHMK0RDYfwjt6rkMpigDTEO8dfRTQxjjXKRNvz07glS7fteVMYllsJvX6wqNAQQIsRh49isKyApRbF+0dhqb5iiInyZGqDzXANQrYRwpGnGZy8tmv+SAfuO5Heq2Al7u5UScmpKRtysspkxt+Nx/IASonCjeqSUNEHNs4AuFlFj11TvXYOIyhEg05tI/7C+2dbS8EFmOCS4GMRTf5LMMnFNznW7FHiyPbvYhmaZIaS3tt0e9QrsW7uAfbg1i81SKbUbI5RNxaGeM4f+sWbMdRiyoUdWD+Yhtvi2+OW6Gg2kjO+PA3/y14DfRRVDvAHMvWvBurpY244gqoeRbvnanK+YvYZJehGMvXpmulzjSz1QLVBP6g5z29aa80n0m2IMMZ5rwDsSQ8zRtV+xpVa3hDV0ZcnCkoQYpSET/Rcn y0N+2wn1 9L2ogVP7RORIQzUQSr0g+0ziRA0A69SwGoZMkKBgrqjtTm6AcMZW/V73xp9AjtiOn9XDtnPTqnnO3KMTHnThBtnB1zTj8YEh3w0Z5Mvc5kPFF6C8ITlGk/K3UvrMduXelzN3WlX+ViwOq71HsRBxSqKO4g9q3NXMhy12C4kV48Me1O8MqTEO0YlumsuM8rgRX5jXeKTs9F9a2rYbDFiRD6osBlaiBtxg1LYW6l1OHRN2IzOPX3AxP9a+iZOOYV7NhLkMvo9VR8MEVkyGpS8JWMSyw8ay7wlxAfDh0lV6FAuyubYLlg49jIs0/MYaCCAqhZOpg/6Cv+QIYLYDCmOqThWJaawYqQs9cnqSpsvOILLAoDur5dHSkDkpN3Q== 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: After the common decompress part goes to __zswap_load(), we can cleanup the zswap_load() a little. 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 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 = 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 = kmap_local_page(page); zswap_fill_page(dst, entry->value); kunmap_local(dst); - ret = true; - goto stats; + } else { + __zswap_load(entry, page); } - __zswap_load(entry, page); - ret = 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