From patchwork Fri Jan 19 11:22:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chengming Zhou X-Patchwork-Id: 13523672 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 9F802C47DAF for ; Fri, 19 Jan 2024 11:22:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 338696B0087; Fri, 19 Jan 2024 06:22:36 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 2E7816B0088; Fri, 19 Jan 2024 06:22:36 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 13A926B0089; Fri, 19 Jan 2024 06:22:36 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 00E676B0087 for ; Fri, 19 Jan 2024 06:22:35 -0500 (EST) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id C926DA02D0 for ; Fri, 19 Jan 2024 11:22:35 +0000 (UTC) X-FDA: 81695822670.06.5F4EDC2 Received: from out-173.mta1.migadu.com (out-173.mta1.migadu.com [95.215.58.173]) by imf06.hostedemail.com (Postfix) with ESMTP id 16E1418000A for ; Fri, 19 Jan 2024 11:22:33 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=bytedance.com (policy=quarantine); spf=pass (imf06.hostedemail.com: domain of chengming.zhou@linux.dev designates 95.215.58.173 as permitted sender) smtp.mailfrom=chengming.zhou@linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1705663354; a=rsa-sha256; cv=none; b=jnjD8HrEKnRhiRwOslg46DMNmkVQwKpDlcz5RYiEPbysnEgNyv4G6w55L5hVSFjbwnjK53 BvXR1wB0s7sjpy7RYs2Go4TLQmBo1kvAog024dX1XVnY/+cWnBMh38FmHHMoDjDkeKsU39 bnok6g0v7psl5qrQF3hEA7GiG9PI5XQ= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=bytedance.com (policy=quarantine); spf=pass (imf06.hostedemail.com: domain of chengming.zhou@linux.dev designates 95.215.58.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=1705663354; 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=im+oZh7D52Qo0VKnj3v7ImDRPWA9Mx27/6HpzQKQ3Xw=; b=NaTy4WNnd8dcO/lD/sdh3rb+89RIqQEvy5+70B/cHo02ALOfaoLNTidU9nxWhpzPBoEZOo tH516ge8CBPLUBRHquYL8rpOlIJxDC2cCRogOhrfAPwnFdLULgC7L7pJEMuFzxhiODfnHC RmgYz0nMqjfrLaLTgdwG0dtv+K/DY2c= X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Chengming Zhou Date: Fri, 19 Jan 2024 11:22:22 +0000 Subject: [PATCH v2 1/2] mm/zswap: make sure each swapfile always have zswap rb-tree MIME-Version: 1.0 Message-Id: <20240117-b4-zswap-lock-optimize-v2-1-b5cc55479090@bytedance.com> References: <20240117-b4-zswap-lock-optimize-v2-0-b5cc55479090@bytedance.com> In-Reply-To: <20240117-b4-zswap-lock-optimize-v2-0-b5cc55479090@bytedance.com> To: Andrew Morton Cc: Nhat Pham , Yosry Ahmed , Chris Li , linux-kernel@vger.kernel.org, linux-mm@kvack.org, Johannes Weiner , Chengming Zhou X-Developer-Signature: v=1; a=ed25519-sha256; t=1705663348; l=3856; i=zhouchengming@bytedance.com; s=20231204; h=from:subject:message-id; bh=Ww0tpfXtXMIxkPC0TnYSY6Lo486E6iMFggamrlAqd04=; b=RsNXM/3brVq/czYsuZMfYA4JSKEbbtdqGV1hWHOScf1lIt+ZlT5Mg/lkd+fc47r4OgeUxFgEc GcQwCzexskfAeYSEKTUePrWu6U/JYT6UJHgMVkDommVe/YE9URXUvwU X-Developer-Key: i=zhouchengming@bytedance.com; a=ed25519; pk=xFTmRtMG3vELGJBUiml7OYNdM393WOMv0iWWeQEVVdA= X-Migadu-Flow: FLOW_OUT X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 16E1418000A X-Stat-Signature: ii1e14fwp81up1smmeeb5hatbo7kdc5i X-Rspamd-Pre-Result: action=add header; module=dmarc; Action set by DMARC X-Rspam-User: X-Rspam: Yes X-HE-Tag: 1705663353-425559 X-HE-Meta: U2FsdGVkX1+8GEG3qtsjS8x1xuWMTppOZR4W2gs1f7pukztON9L5Aei0JFylfuoX1dimd+1vWSVZS3bVknEd6TNAX7MO7xsmdoo7s0PptypIAnnmvKM/yDyskf+TeaXwjcVJxJrr+J9EzjFBcpNmGOc3it71+3yNFSPZq0ROhs5SNvG02Czcgpow0xtAGhZp7tqvlV6YicOCXQqnoriTBarHnc3/O1WeCEyDAF/45/BH8LLYzLrHkwSpjVtTEM3BN6qsiCm/P5fzn2OxRUhr5aYFnCJHHaexXAMdTgq9Mvb6neFWPKPvfIi8OGyaD7779ZqEqtz+CihW6HUVq4JJ2jYlKuFH3H8/ne8xQqWFOkATXndAJXpAtw1zDni8UhJ40nxhLT+PYKZkjDyE8CX4pblp0HZXSRqOPqnz4lfh1VrABiq6MezE1BVhBDRn47SLbvGLf0joyFgIR7KzTdLtGqHJBF+o5vlWfZWf4fgSwXdFDTaZXiqJFGmYLP7A8H+gmmW93Alv2UxXjR/RHXEpg8CrnVMgk5sTebSn+PmYSfSwUZw6OiIWcCI53tqXNQo67DALkMYn32Wj7JGtgrBYrf0yievqgZ6mQYeXKZuQDBnZYgJ/Qq6lQyDYpNK+2KBEszSLA50OGiVzTkyfa4zd6rnQTRD+KIxOpUkeSHiTuf6+z/fzz6KWV/MMn4UIE03oM4RSUAjYEw9JgjEc1UhVPhi3YWZ1VVMDLLMC+ELn09rNhLkTAkYk+mv9xfA5LC8KCCX7J/yc6c87pnrBaV3NJIOsMI9mmios51g8PYvM7BsUerWO3dq0hOgfEZasF2agHeTGmoeUl7WBP/WV8d7rpkpc/5J4a5FCKFFqTY+Q7MMMuwUhdpxLo1j/WuQIK7GIruR14Pp9USYuMxtAkmOygNdReqNx11mXUii/9xfjc7cpUK91CRt+Kz4KpfwajY/J6xXuUs2B98ZNIj08frx ke4GStVc pw4eo 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. Acked-by: Nhat Pham Acked-by: Johannes Weiner Acked-by: Yosry Ahmed 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)