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 47238C47258 for ; Wed, 17 Jan 2024 09:23:52 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2FD966B00B9; Wed, 17 Jan 2024 04:23:51 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 2AC6D6B00BA; Wed, 17 Jan 2024 04:23:51 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 175EA6B00BB; Wed, 17 Jan 2024 04:23:51 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 0A8F86B00B9 for ; Wed, 17 Jan 2024 04:23:51 -0500 (EST) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id BC8E51A0AEA for ; Wed, 17 Jan 2024 09:23:50 +0000 (UTC) X-FDA: 81688265820.17.495B173 Received: from out-177.mta0.migadu.com (out-177.mta0.migadu.com [91.218.175.177]) by imf05.hostedemail.com (Postfix) with ESMTP id DE85410000D for ; Wed, 17 Jan 2024 09:23:48 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=bytedance.com (policy=quarantine); spf=pass (imf05.hostedemail.com: domain of chengming.zhou@linux.dev designates 91.218.175.177 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=1705483429; 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=JjwjCE9zbsUpeYC9mkWvuJBdlLHScaadhZbWI74mw28=; b=sl00zjAWbEEw6HGoOVcLqdW32s6PIG9anYdtqiNbaT36ykgd6uKsPnFDyi0+xt1GdW4o5v mtsjuFeH1jZT8LZRILRGkkeS3Mw9XGR8clBWZji5kz9eVA2UoqRAHK1gUrphpKq6L4stY+ Gyuw1i+nwQSjxUKcMIf5yCOmssHRTSg= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=bytedance.com (policy=quarantine); spf=pass (imf05.hostedemail.com: domain of chengming.zhou@linux.dev designates 91.218.175.177 as permitted sender) smtp.mailfrom=chengming.zhou@linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1705483429; a=rsa-sha256; cv=none; b=4z/OL3Tii6vP2u2hfSsSZ7mNI2UUGuVU1YUJU5b/MrZoTmunTYdqp6SSXno5i+g56HBY/r BcVpceJoMqpOyMv6H5jC4fuV6iVB8/poH/Qwygo8CeUClh46HCXPHrzZ7ehRyzLZWMaW0M fTmKm1pLwfqAI7VP5H/r8cxWKAJQqT4= X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Chengming Zhou Date: Wed, 17 Jan 2024 09:23:18 +0000 Subject: [PATCH 1/2] mm/zswap: make sure each swapfile always have zswap rb-tree MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Message-Id: <20240117-b4-zswap-lock-optimize-v1-1-23f6effe5775@bytedance.com> References: <20240117-b4-zswap-lock-optimize-v1-0-23f6effe5775@bytedance.com> In-Reply-To: <20240117-b4-zswap-lock-optimize-v1-0-23f6effe5775@bytedance.com> To: Andrew Morton Cc: Yosry Ahmed , Chengming Zhou , linux-kernel@vger.kernel.org, Johannes Weiner , linux-mm@kvack.org, Chris Li , Nhat Pham X-Developer-Signature: v=1; a=ed25519-sha256; t=1705483421; l=3720; i=zhouchengming@bytedance.com; s=20231204; h=from:subject:message-id; bh=yTwBO7fuapSePdtIIuK9uUbgWqoR7phetxp9o7hUhmg=; b=wqYBYZNagUKyFwJS+dwLD0bCqzZPOw7UPxfqGXbE4C15ul1rQmFIQtctYAEyQZZMDuUOGgUJR jMdWmww0EZ1Dhn9po3/A3DMC2ZRN/ZOwGBaYiDPVRhAnmGPf1AlNK4W X-Developer-Key: i=zhouchengming@bytedance.com; a=ed25519; pk=xFTmRtMG3vELGJBUiml7OYNdM393WOMv0iWWeQEVVdA= X-Migadu-Flow: FLOW_OUT X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: DE85410000D X-Stat-Signature: q5kfkyb4mcb8sj8jddbrx9htp5obwxys X-Rspamd-Pre-Result: action=add header; module=dmarc; Action set by DMARC X-Rspam-User: X-Rspam: Yes X-HE-Tag: 1705483428-281930 X-HE-Meta: U2FsdGVkX19Edt3sU+6v74EZ5pi3N6FDIoiNiYg0EiE07gk7+v7eDe/815izLc9V3H+Y0xjRvukfg96zIMQQTDaewjD9roAI3ugnTapAisYdAaa2w6p8kQIejghEzIZ7ASRzqGspQI39oDwLbIBXAuuoXSYqe7+H5BXLcLVnq3MC/Cdh/iCznLtqfCA42K3ANc66Y7ymwkN0CmhrAocZE6lGqBF2NGP/s4mXAydPO297s+BPXsZyP8cErEPSTrgjGQWbjL3tdsFPWCsThzcir/0nb9yi/Qd+B+ym7TX1xRUwvQ+/yUJ2s3QRzWufyt2uaWuaI0z9f8v2eQo/ZNKRyqlmNWOfk0t2kCnvHWru7Sj38JR6mo73uEy7vN2nxdy2ltl5az2eqL+YwXz00a4aykEObrWNdtRY2hv+AkJDPYjkKC+JTjFG0AQ/ylVtUjOENYfSVLcsSWM8UJ/tU7BT+XMY148qyXyznW8FeOcScGdMdvn1QAM/UQYKWAraT0J4Pnndjl8eXpkXl37tgZ7vkITVzVmpdGMDq4WNr6VPgo8htVYee14ckWaZpUaCdU420bICEwoWm9B44GzuDXP0Tb4v5oLlES6FbQNxjkTjYpmUO1jH9HDLIwTYJut2M+BzguRCUntSosPEoBAJ3Ir5IEryGS5UMUiqq9upbUoqDx+kcfy674jwMbUIZ2kJ+HG33Zap3U+FbpAKjBVJKyYFfaS0r0gUP131cgwX8+hc7JG7BSVfZ+hXnkwRN7d8lRfeloz2mJ0i/D350mIbmTPLCDpb71RD8XCOZiUuqEJ8EocjcXQ83blgTmDm4urxG7vtb0zMKiYcRr0vwoBGW1/S9KwCPDyHspskad0su59jvELro62oiSb/SsbppXjjURJjQinIZ8YCHKV6UX3Ztr+mDsx3QvP+3M6KhIWAO3b+iWLXYHJ1K3EWpdig8Utk7aIoTdAiTvWuAIUKHLEWhy3 sAEu38YG hv64OFQkcaFGSbXu+qBp0NEsFzwdkCVfQsCKBNSL8eyr6bjf2GAvKWrUK3Hap19bXcKtBbOeBw062S1FRoyDl6a9zlJJuSyIJigYQGQaBh6JgyXa4nryUzEloyRCMbLsD3DbF29z9mtvVWho1fAFVMkNcS2xougjmabNY+I5L8QSP0XXIZ6LT1en4jhKtvq7mS045VXGJPyk6OTbp7uD60LmBgyXWW0Kt845t44f+5YgTf7MXIGz6eGGgxgueks4R5eCIVNTwK8YS0S45vfPs/TdP7paQ837cewGwduUtku85FUGkc7KTK6PLY4toKGPLYzOPVsCMpVdLBj0geIHlMYGPupaWGo6S1HZtzEJMDfg9baqujYelmzawgA== 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: Not all zswap interfaces can handle the absence of the zswap rb-tree, actually only zswap_store() has handled it for now. To make things simple, we make sure each swapfile always have the zswap rb-tree prepared before being enabled and used. The preparation is unlikely to fail in practice, this patch just make it explicit. Signed-off-by: Chengming Zhou --- include/linux/zswap.h | 7 +++++-- mm/swapfile.c | 10 +++++++--- mm/zswap.c | 7 ++++--- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/include/linux/zswap.h b/include/linux/zswap.h index 0b709f5bc65f..eca388229d9a 100644 --- a/include/linux/zswap.h +++ b/include/linux/zswap.h @@ -30,7 +30,7 @@ struct zswap_lruvec_state { bool zswap_store(struct folio *folio); bool zswap_load(struct folio *folio); void zswap_invalidate(int type, pgoff_t offset); -void zswap_swapon(int type); +int zswap_swapon(int type); void zswap_swapoff(int type); void zswap_memcg_offline_cleanup(struct mem_cgroup *memcg); void zswap_lruvec_state_init(struct lruvec *lruvec); @@ -51,7 +51,10 @@ static inline bool zswap_load(struct folio *folio) } static inline void zswap_invalidate(int type, pgoff_t offset) {} -static inline void zswap_swapon(int type) {} +static inline int zswap_swapon(int type) +{ + return 0; +} static inline void zswap_swapoff(int type) {} static inline void zswap_memcg_offline_cleanup(struct mem_cgroup *memcg) {} static inline void zswap_lruvec_state_init(struct lruvec *lruvec) {} diff --git a/mm/swapfile.c b/mm/swapfile.c index 3eec686484ef..6c53ea06626b 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -2347,8 +2347,6 @@ static void enable_swap_info(struct swap_info_struct *p, int prio, unsigned char *swap_map, struct swap_cluster_info *cluster_info) { - zswap_swapon(p->type); - spin_lock(&swap_lock); spin_lock(&p->lock); setup_swap_info(p, prio, swap_map, cluster_info); @@ -3166,6 +3164,10 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags) if (error) goto bad_swap_unlock_inode; + error = zswap_swapon(p->type); + if (error) + goto free_swap_address_space; + /* * Flush any pending IO and dirty mappings before we start using this * swap device. @@ -3174,7 +3176,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags) error = inode_drain_writes(inode); if (error) { inode->i_flags &= ~S_SWAPFILE; - goto free_swap_address_space; + goto free_swap_zswap; } mutex_lock(&swapon_mutex); @@ -3198,6 +3200,8 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags) error = 0; goto out; +free_swap_zswap: + zswap_swapoff(p->type); free_swap_address_space: exit_swap_address_space(p->type); bad_swap_unlock_inode: diff --git a/mm/zswap.c b/mm/zswap.c index ca25b676048e..d88faea85978 100644 --- a/mm/zswap.c +++ b/mm/zswap.c @@ -1519,7 +1519,7 @@ bool zswap_store(struct folio *folio) if (folio_test_large(folio)) return false; - if (!zswap_enabled || !tree) + if (!zswap_enabled) return false; /* @@ -1772,19 +1772,20 @@ void zswap_invalidate(int type, pgoff_t offset) spin_unlock(&tree->lock); } -void zswap_swapon(int type) +int zswap_swapon(int type) { struct zswap_tree *tree; tree = kzalloc(sizeof(*tree), GFP_KERNEL); if (!tree) { pr_err("alloc failed, zswap disabled for swap type %d\n", type); - return; + return -ENOMEM; } tree->rbroot = RB_ROOT; spin_lock_init(&tree->lock); zswap_trees[type] = tree; + return 0; } void zswap_swapoff(int type) -- b4 0.10.1