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 6A162C46CD3 for ; Tue, 26 Dec 2023 15:55:02 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0010B6B0082; Tue, 26 Dec 2023 10:55:02 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id ECD826B0083; Tue, 26 Dec 2023 10:55:01 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D45966B0085; Tue, 26 Dec 2023 10:55:01 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id C339F6B0082 for ; Tue, 26 Dec 2023 10:55:01 -0500 (EST) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 9A112120382 for ; Tue, 26 Dec 2023 15:55:01 +0000 (UTC) X-FDA: 81609418002.24.569BCEE Received: from out-170.mta0.migadu.com (out-170.mta0.migadu.com [91.218.175.170]) by imf18.hostedemail.com (Postfix) with ESMTP id B184E1C002A for ; Tue, 26 Dec 2023 15:54:59 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=none; spf=pass (imf18.hostedemail.com: domain of chengming.zhou@linux.dev designates 91.218.175.170 as permitted sender) smtp.mailfrom=chengming.zhou@linux.dev; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=bytedance.com (policy=quarantine) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1703606099; 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=Xn7ksme6twQw82nMBXJ4dYxxzHaCP+EO0zfhYUSni6c=; b=28qjjyrq8hDQGIlo1M/ybBeLpHpyc8aGzL6BfcEOKtGR8KlTLqg2q1A2qU0uJIfWiQdjdF IEHN2aAh2FJF/rbotXchhL9eOz4MeT630pNh7qJAsb4UHMI8PuZFv203mRS5Zb0COoJqpB /ndfvt1DLU6R8+tBf+ChTzCpMqPKin0= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1703606099; a=rsa-sha256; cv=none; b=LE7780CAFJQsPti7YJIwxN4fQdtaYWX2GdPiSaZqF95//33zuYxN9yeqON6LSmww3RekCa yclbFQx0KJrvvgpo32V+T2Pk0KtXdx8W/eiZo7xQyrA/GnheCs1dEAe3JMAuJ0mreCwjgU lOyRBuoyf+v3EDCKHwg3qqubtO3cIZI= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=none; spf=pass (imf18.hostedemail.com: domain of chengming.zhou@linux.dev designates 91.218.175.170 as permitted sender) smtp.mailfrom=chengming.zhou@linux.dev; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=bytedance.com (policy=quarantine) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Chengming Zhou Date: Tue, 26 Dec 2023 15:54:11 +0000 Subject: [PATCH v4 4/6] 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-v4-4-f228b059dd89@bytedance.com> References: <20231213-zswap-dstmem-v4-0-f228b059dd89@bytedance.com> In-Reply-To: <20231213-zswap-dstmem-v4-0-f228b059dd89@bytedance.com> To: Andrew Morton , Seth Jennings , Johannes Weiner , Vitaly Wool , Nhat Pham , Chris Li , Yosry Ahmed , Dan Streetman Cc: linux-kernel@vger.kernel.org, Chengming Zhou , linux-mm@kvack.org, Nhat Pham , Yosry Ahmed , Chris Li X-Developer-Signature: v=1; a=ed25519-sha256; t=1703606082; l=1518; i=zhouchengming@bytedance.com; s=20231204; h=from:subject:message-id; bh=rkes+J7eJM7t0YHK81EpBcYXvy/jNev7hTPxYOeqbUg=; b=EMECwijc3Cop46ntV6xtp5hN60obHUUAxQdRv1B1TZNaLQmm/7W7OGjUfEwdkOlvVPeLksp90 8QboHPBWsnnD2aRQe8a9oroWGYNCKyszGFtZFKrkZZcaWZnrG3gi0aT X-Developer-Key: i=zhouchengming@bytedance.com; a=ed25519; pk=xFTmRtMG3vELGJBUiml7OYNdM393WOMv0iWWeQEVVdA= X-Migadu-Flow: FLOW_OUT X-Rspamd-Pre-Result: action=add header; module=dmarc; Action set by DMARC X-Rspam-User: X-Rspamd-Queue-Id: B184E1C002A X-Rspamd-Server: rspam11 X-Stat-Signature: ahz1tw1zs7io69bidhcwa4dqs6jcwkey X-Rspam: Yes X-HE-Tag: 1703606099-276389 X-HE-Meta: U2FsdGVkX1/DAcC+cE1l5qt4vbQQ84dWFE+N+iOsF8/D6JVCl7KkAllDJIcVv/hTEwGfH7BRn6MXSGF4HQ6crJoJ0nYFZmZtCseE7LLj7D6dYnOCEqvpwVaV2OEtoVnHMIio0p7OadN+soonnhSxlM4vHG+tLrMWQja53LweU/rxeYbo3ctS+lyKV7d3nXsQ5KhSW9h7GfUqz84XCgW3OOAEd9P+0Y4FntJbOviVx1/9QohGmqGD+PcBFdva3OKovZyica1k+j+9ntoTC5CQvprQt15OgURJt17NyBk58M/DdbpulzrGeYrWkIUa4MnEUr4B4LVDbW4R0+6ZkR3VNIqR0DmcBmmfYeqOQBr+keltoOjK2H11lyZnPX5v0EOHmTB3hmqox0GRy3i08V4LxqCjGDcxSF42j9FSu3PYvWhABuRTwW6YozwI1QWH0A7Ilw+5pgVlLM+w/MZKpuXYExOjkPXYYyCXCsWB3nCGENWHGqPP/DQ2QUyI+4Dv3xPMAGtUhdt73+FiWhQzEoAUoyhRpl2iBMSVE0XhU1uocAAS+vJMILrjR3L/xLEYS+MLCwwe7XzINOasZ+2acUEVanbTf2OeOLTlZJ/y0EWB4xZ+hgLl5bgfCWhHIFSapUAr+EtY7aZuQsuVRfKYt5CXjK/Q74DDD9a5OF3NEgOzbAuwCXF6yICYHHMceuxa/fS8gC2cZKK2WssDMxLHTXCxOjyJJr+bkLVbiYNQsocP2YkvNJMvY032qX+e73suSJBEDEI/KlePas339Mju/ZMnN3odnDLKNT74plTXKhc8VlgbKA4mKikGyuyN89N2UphYj11ohAvgQGs88t1UeisYnRSC2v4T+u2/+5EfACGQmBo7QgX2YVG3YudFDEmiUR3uARw5cEzQECWfkUyMWUEkGGi0TIA25k1RJs73iZwkb6Uzn308DUaohlv4LLh+c1rhLN8tUHyNE2lJVPecEt1 RmQazZD3 SvYwJEWfVQV5F965sV18VigDXX6KDgceQofN6399lje3+bHK/8JPUdM9Vy6hohH+PQXmqjiY+PxF6xKb/zUbYp0x1jZPtG2fodBVOAkeS77WllW3GCBlZOfsi2aMNDbHFiIqid5GtXZNRv16kFePuxPNhuqGIKtuJAjRa6TDpif+EBsE77LUn40OQ5bkuKOSvKOMxzGs/HfEgZ72bsEWtXz9lAS792YTnRUnfqimNAML7n43al8+NJpfrQ0T1eBQTcCN6Zxgc3NSmwhA2tetfuNt8qMofFNMCeTohgy73Q/Lwy3hYb9TmBfIwh3WJDqNUUg4EkJWnBCPdq4qEk/KKr5+b1Mhrk0710THw55uo8lQn7jqxeVE1eL9m83KV+j5kFTtElMCzAW5BBesahMMU8ZeABGXCvah6u7cT4DO4ktG34OhQfcKcUQP/PxwLFy9V+Ti57I8Rb99OkgTkKLH5hxpxNR4iU3y5lq7RE6FucoYwVxK9yE8H3RrjUA== 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. Reviewed-by: Yosry Ahmed Acked-by: Chis Li (Google) 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); } - __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) { @@ -1798,7 +1794,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