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 8BC2BC47DB3 for ; Thu, 18 Jan 2024 18:16:53 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 21A2F6B00A6; Thu, 18 Jan 2024 13:16:53 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 1A3916B00A7; Thu, 18 Jan 2024 13:16:53 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 01CDA6B00A8; Thu, 18 Jan 2024 13:16:52 -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 DEDBF6B00A6 for ; Thu, 18 Jan 2024 13:16:52 -0500 (EST) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id BFB8E807E3 for ; Thu, 18 Jan 2024 18:16:52 +0000 (UTC) X-FDA: 81693237864.25.04694C9 Received: from mail-io1-f51.google.com (mail-io1-f51.google.com [209.85.166.51]) by imf13.hostedemail.com (Postfix) with ESMTP id 0928E2002E for ; Thu, 18 Jan 2024 18:16:50 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=Gypuepr8; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf13.hostedemail.com: domain of nphamcs@gmail.com designates 209.85.166.51 as permitted sender) smtp.mailfrom=nphamcs@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1705601811; 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=8h1yBz/J7E0Ht6qB3EEpyUc4skdwfMJw+NDm6XA4Q44=; b=ZMNXi3OEMKZDE+75xt0Ait12iXRHdnkXDO1a8diGKA9j3sfXGKACdxSy046vDTQTQKX3vX SpPUHGIX8aGR8K70dJGOe1f7kSGSHV7HNY9rKXz7Zwa98JRY2XlCms5Quo5x+4tCXcrTmK luKYRn7rzOS0dRaqnODE3btSfsZsVkc= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=Gypuepr8; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf13.hostedemail.com: domain of nphamcs@gmail.com designates 209.85.166.51 as permitted sender) smtp.mailfrom=nphamcs@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1705601811; a=rsa-sha256; cv=none; b=KpeqALna96PMrscD7bnbheU+IEv1hQcsoZgN1Dv0CQOik8ueJ657Akd3frPlIkbeD0nA23 JYtzAhC7YCeWaVsMjiLnYm/XVlQTW8+4jBOuw/IEpxbg5KDfJM2y0xJb/gIHcqwfIGrVmZ GgLOinr/S3GAk4EllIcPQHPDaH7cb8E= Received: by mail-io1-f51.google.com with SMTP id ca18e2360f4ac-7bf0f3bf331so249943939f.3 for ; Thu, 18 Jan 2024 10:16:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705601810; x=1706206610; 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=8h1yBz/J7E0Ht6qB3EEpyUc4skdwfMJw+NDm6XA4Q44=; b=Gypuepr8FJhiPDBAhvlcrbWZAZ+/+sFoxBDKeft+xKNv0XtAaeJo/CgdBhJxIpE30V HtBqzW3tmkTPNwbl4cky3J2DUtW/uU1qiD2o1Uae2TDHCpZTvp+IaL8tE68C5DJ+XHpM wZ+hAH7qFrct/YHmvK6nbtZMBhgLT3Bv363SYYWJZOaGXQoT3ZpI/2zM5btWdjfi/QUm OZcLbuk10fMFAwl8DbQ6GVCucTGsO6xDzzDG1OFf1YLTPRC1y7XkOTR81TLzmrqVu7ho rKUi/4vQjC/ernAwCUZHGMDlRwpFb2NXgXaPk75sLNRbenXzvXj8E44JjZSI9BQ0CccN ugxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705601810; x=1706206610; 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=8h1yBz/J7E0Ht6qB3EEpyUc4skdwfMJw+NDm6XA4Q44=; b=PNgIiXy8rw8zZRSaV+QmeQqIuRP1+ZnbB0rAc8GEmIhLtacHZS6V+hmKXHiDbPUqrN SEpOG+FQn+lkLfmcesBbBgsdmCwCvhYcrTyoc4wR7dTxqVKD+5Dr2jRoxMeo6QWUOfdc zfHoW04mdc9DTDIIfCeQhqA3CCK++i92aCNQ0wIFOXAZRqjLOJY1m4nJf4o/4ZnZKsXQ JNoJZlC/qqz5XBsA+wco6RWS7MuhRTAkTH37Jwyo0QV5MbMP7Gpv2UxFm007ooYElTQ+ z1dSaBDdUVFHWlIxFjXu9bAqdrNrJ24NrjY1JEkdbWlBPA76x2ZBQi8g9SEhNN5Z4KNY YG2A== X-Gm-Message-State: AOJu0Yxp9ZTIFWqvFfkvO3LEhJJrdDsdowJ5GdTpDkNYe9m8Oaj6zgGH 2cePBybQCXYr+BHH4DGYJMZG4WfZdMWCeNJk2BzOvBDJfvU+O63Zn0JNKLJgXG2KUbV5aWGRUIS n4+Z+VyNu3abagHXuEfLHhSsbc9r9IPg2me8= X-Google-Smtp-Source: AGHT+IF4ac27YHrVkcC7cplUn0qBT5WLu6b/s4Z+TAj7QYcFXrWFEosv+9IOrBbhUqVNXgro3OsJqjySMhRjv7WeDr0= X-Received: by 2002:a6b:6f18:0:b0:7bf:4f28:11a1 with SMTP id k24-20020a6b6f18000000b007bf4f2811a1mr1471678ioc.11.1705601810023; Thu, 18 Jan 2024 10:16:50 -0800 (PST) MIME-Version: 1.0 References: <20240117-b4-zswap-lock-optimize-v1-0-23f6effe5775@bytedance.com> <20240117-b4-zswap-lock-optimize-v1-1-23f6effe5775@bytedance.com> In-Reply-To: <20240117-b4-zswap-lock-optimize-v1-1-23f6effe5775@bytedance.com> From: Nhat Pham Date: Thu, 18 Jan 2024 10:16:39 -0800 Message-ID: Subject: Re: [PATCH 1/2] mm/zswap: make sure each swapfile always have zswap rb-tree To: Chengming Zhou Cc: Andrew Morton , Yosry Ahmed , linux-kernel@vger.kernel.org, Johannes Weiner , linux-mm@kvack.org, Chris Li Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 0928E2002E X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: qjgy35ztqjmeei838tkq1q3o48gciery X-HE-Tag: 1705601810-763371 X-HE-Meta: U2FsdGVkX18DPNOod79vNWketxNYGD7D/nb12zgxPnlp6DjPWiMy5IekH57mm6OYRdd3zdMC0cw1qryevCdNgMVPli+PYh+3g0IdIz1sg3/HFvOzt5WTqRVJbkQ9wZFmmADDUAHJz22OeDNOD23SH/j/389wRIcxai8mGjgjcKTN9Wb6+GZdd83n89HF886UGGcYXm791/AdKk62T5SjBN8rCT4b400Q+WQQUFmGTk1NZwJeJPaRWlvFhv2F+QVSWQzhLFua9leTEyyK2aP5g6uLC7KLRjP+x4qRE7O82i67I/f6a0uVHZwFNtnHeDRaks45OH5HH9cqK5jvgKErl33+QENxGAcTHODpPORdHltX7tMuN40PA5Ncway26upX/gZqJw/YW0/r47RvR1bZ84tENt5QM2gdFo7DJc9WAGs0BvFW0Q/XOodbVOvmFT+C+lEOTOXU52VhiyYgrzBKJz2qpSo5btQZDYFXZ2B84cz81KwHjSixRyat/3wsHco8LuxQElty48SBk29j3ntchUjNvgGmtkYCy8fiFmlmpfx/YttL2ZCXBGNjFc0GLSuHcK3uz8qIMn6KP7e2ULfBDVEBFoErBN9kM0YBIzbyOfCBoDA529YD8r7R+/G4NFzIQj7VaF0w1pxHCQOETxnHnxk8F7VxhKjb+oWJq727/FZ7mvSmc1OpPsiLTG3vfULu1KGSNb5cQmJWdk53T3BKLabk0AdyR8fop+J62XI6ki5k+OPsG3wBy0H/cEQx0mJp2sDs4yMDl4h/zEJoTqnZ6TKH/byov2I2ZI7QR2P4wG2Rueyx0MW5WlsQ+WIuxJp/EMtF1D+LRagjZqby7lXIoZRJF/Uu3G1HMUHoPV4WzcAQj9Fwpxskfn9vJU2OnWyAyMDIFw+7LBdZznyjHMaCLpF7na2Vb2Z4hG3oZptiZsyuyphzjvd5MTiiiSwDEz+myaTC6Z20ke8NBXmu40r Grn4NgZu zZIiijzbNhuQNZIiY4Ylthn7B/HAeuc+0Un81Co30TQNmmiFBJXKgsWfqEjRdXIfQe6WAD4h/xmeDRcm/avEsuxU9+v7jq94AqTuxKThpCqHYv4pE10HlMf/VW81rMs36WGR+BA6SelkoT6vO2LAsdXFWrHj9K3bDNaMEzLCy9ftMP+3u1pgoCk8Xh5XIwqqWJWYi80BGuPwsAHtj7e3xazp9xuU81NG61KNAFHb2VzwvoCqvnC+wJPYHm+YRMbOdxTkt8l/ooHNEett5XHn/r4w12fj4z+z2EXGMw5NOvopBOmatsLirPwZ07TNwebE7Bbs5h+OOD5+gSNXQ615i0HVf1LvWr99gTR3aBBBAc7kZcJREIQCLglsOyQCaogn5Cq0L9jGvOQA2VZwyUJVDDdWXxUzKx8xdQeBGfcGtVpeqQw5fOdbiYWTzS/jHKJaG4zCKPmBE8/kMKviCBos8SQ9Y3F7cd+sqYx+e 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 Wed, Jan 17, 2024 at 1:23=E2=80=AFAM Chengming Zhou wrote: > > 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 This seems fine to me. IIUC, zswap_swapon() only fails when the rbtree allocation fails, and the tree's memory footprint is small so that's unlikely anyway. Acked-by: Nhat Pham > --- > 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_struc= t *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 *, speci= alfile, int, swap_flags) > if (error) > goto bad_swap_unlock_inode; > > + error =3D 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 *, specia= lfile, int, swap_flags) > error =3D inode_drain_writes(inode); > if (error) { > inode->i_flags &=3D ~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 *, specia= lfile, int, swap_flags) > > error =3D 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 =3D kzalloc(sizeof(*tree), GFP_KERNEL); > if (!tree) { > pr_err("alloc failed, zswap disabled for swap type %d\n",= type); > - return; > + return -ENOMEM; > } > > tree->rbroot =3D RB_ROOT; > spin_lock_init(&tree->lock); > zswap_trees[type] =3D tree; > + return 0; > } > > void zswap_swapoff(int type) > > -- > b4 0.10.1