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 B1A14C3DA4A for ; Fri, 16 Aug 2024 08:01:57 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 32AB06B02DB; Fri, 16 Aug 2024 04:01:57 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2DB326B02DC; Fri, 16 Aug 2024 04:01:57 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1A2AE6B02DD; Fri, 16 Aug 2024 04:01:57 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id EF65F6B02DB for ; Fri, 16 Aug 2024 04:01:56 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 99E3616199A for ; Fri, 16 Aug 2024 08:01:56 +0000 (UTC) X-FDA: 82457365032.05.0F0EFA3 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf18.hostedemail.com (Postfix) with ESMTP id 97F161C0009 for ; Fri, 16 Aug 2024 08:01:54 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="Km7r/Z7Q"; spf=pass (imf18.hostedemail.com: domain of chrisl@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=chrisl@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1723795240; 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=ZzDLTvi9JCQ85UrunUNohKjKbqoxHiQnWHad4uP8ADE=; b=OlZRNxJKCvRUMbbY9Ov+w21Ulx8pQ92kw8T33vcJ7tNBjEO0LZA1A6GzdaNMKCmi+bj02Y ezk82P/G01w77Y+p79nd4MezxmlPDZWt56lv7FCQ4Ltz57sDz+yAaSL7cf3V7yYL4YP6gj madPq03mHHguhF5/1ux4aOIEvn+Z4XE= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1723795240; a=rsa-sha256; cv=none; b=P4eeaXW6vrpa9+pviqmI93BKj3TUpH6aG4bktxM5Sj7KhH+Bpfec2ZJJJNN65NV8DgcThy 2EIiYXCMW5bqcXxrbP6i4W/T+FvyRLHQ9SKJ0zNTtAzvU9DekjNUAUASSlQt7opvzcpUac hvRhBs5RuxWKwid23R3pc8hSdKTazQM= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="Km7r/Z7Q"; spf=pass (imf18.hostedemail.com: domain of chrisl@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=chrisl@kernel.org; dmarc=pass (policy=none) header.from=kernel.org Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id A9DCE620E8 for ; Fri, 16 Aug 2024 08:01:53 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 63285C4AF09 for ; Fri, 16 Aug 2024 08:01:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1723795313; bh=PqiXV8v2CEz2TTGEV4fB+NpOMuGJApvPrzEMwpopwTs=; h=References:In-Reply-To:From:Date:Subject:To:Cc:From; b=Km7r/Z7QSTFPfgzJaMSAW1d9fQIf7mcCOS7di8SwgTz/fJPRrpsXPahCKukWl9KAV wBbjiiNpLr5weLVjaNKE41r+2ppmmYko/G/USmR6txW/j0TOI5aZrKH6/2ZzJLaORR MoLlF4CdZF83W6Rtx+5UbDxh1qF6/B8SximwWfKP64RLSnS0i0s/jd1MFaoQCmNJBu a1m5nC+DLq7sbiJYhJbsFYrH1KWwdTPJlFPevZg2JMbuMbYDjRHGrQi+GTalSlLA2F YAjXGeBK5+WAm6mVJdLyNGPlP535pXykjSZAT6G0XJ5uLCiRNE0nWM1OJ+MtxKoIIL IRkOAOTb228Iw== Received: by mail-yw1-f174.google.com with SMTP id 00721157ae682-65f9708c50dso16004467b3.2 for ; Fri, 16 Aug 2024 01:01:53 -0700 (PDT) X-Forwarded-Encrypted: i=1; AJvYcCWyxDGW+c3A36Qms4qknf4aTBgxryENnrzZub6gc3KVGjjNf0sDHYRPVSt4C68ibpo92A9j7drvKoSD42EXGXDwdEs= X-Gm-Message-State: AOJu0Yx9JVuQsf9cGNcfaWuzIC+HCzJYj/pApBolEyNpkPAmAkAVC8AN G8z2YG0T1pYpJbpg92efSJyIyNV35wazN5iPsxzTGGv+iiPgkNI8uPipRofIl07FVNHrmZeYXRV WzKe4gj3Iv4UCQISCrPcmywJtqQCjYeakmtWgpA== X-Google-Smtp-Source: AGHT+IFEZusVZzrM/+uEeHMOCidiTmtG6ke4RPG56HzV8fpFJseWcNqnS9L/ESv3a1uiFxePrdIQz+DgvTmf/LYF+Vo= X-Received: by 2002:a05:690c:7690:b0:65f:ca0b:451c with SMTP id 00721157ae682-6b1b890e704mr23973577b3.21.1723795312597; Fri, 16 Aug 2024 01:01:52 -0700 (PDT) MIME-Version: 1.0 References: <20240730-swap-allocator-v5-0-cb9c148b9297@kernel.org> <20240730-swap-allocator-v5-2-cb9c148b9297@kernel.org> <87bk23250r.fsf@yhuang6-desk2.ccr.corp.intel.com> In-Reply-To: <87bk23250r.fsf@yhuang6-desk2.ccr.corp.intel.com> From: Chris Li Date: Fri, 16 Aug 2024 01:01:41 -0700 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH v5 2/9] mm: swap: mTHP allocate swap entries from nonfull list To: "Huang, Ying" Cc: Andrew Morton , Kairui Song , Hugh Dickins , Ryan Roberts , Kalesh Singh , linux-kernel@vger.kernel.org, linux-mm@kvack.org, Barry Song Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 97F161C0009 X-Stat-Signature: mto8xwhmq9eoq5bpykz4octwdi8n6go5 X-HE-Tag: 1723795314-471943 X-HE-Meta: U2FsdGVkX19hXu435+JAqJV3uY4TT82UngaR0+FnZnjpIR7eqOd5M36WTTcbgB5hKZL8FM2zZ3i1kjQlYjkjmQK4ozD/S+t3+wBQh7X1GsCHx03b3ZMpL9Zku9aDY9twvQdQtp8zH5JaIhplCvb53eM7gdrk1Uk7BrmyvhRYzTNScgVVwzXMRJo56oiVOn/gsIVy4pFY8SBw8hPrOPNs1izDrlEMZ+G2tsztkmt2GM8W0G4M9bndvc1aE++oqIoduk5jNGS97ID39ca46xzBm9yX3EW027/dw9Nj92QSCSxZs/ru/JP2uD/WGt/zzrVlybsmfnlk9eu+0HzrCiY7XEDyMM2k1XeK6DXrhHW9WH6K6PXDFQ2RgCJ3GPcGelcEFopgu8UiD2SRAXrRy/BZZy4Kz36ZMP6ETq05KmU+y0KH27AAgX8/WiU/cmq8XKa+PRp9CsJZcQm+TzYw6oErhQ1Mgf/n4j4E1eUKv5Jlfo6lirCl/lnMSbMHW7WTLZnszDA5ZoPE9H7IFZwyEb93inBN2QxnjqiFCuMT5FETD4IsrxQ/yOgGy+XT7uoNSWvoNACo/Rb/zjo8wx3/wRjlRrFGv6/LjueOlYgw/SdCAxwZYj46F8/fns0PoG2gymQBd0V0c5ynjRdNu1iGdYKl4Q/ZXPcu96BnXDJMT00EiXDfvYLGV6728UW9PjVgasgz6Eu49k0M26tGXcB6BkWXS4VLWObpTWsBE4akkWc/Wzsz3h0UZ3Eg6YyxHF/QPeGWEgH5LEUXSiIeroejzVstxgogsDJbuquq2lQPy1f26TMcSE8NBwda3v/+/dOhovpBzjFcIfiWYxZw3D6M6dW4DL0lcxaoTXOspadH7GgEwkgrmZRooUR80DuP49lNZ0aIk5nxlA1+ZXA57wrAWSIqTtK6LgtckBmnq52jgBeNCN46CKwATH+SsQm9KBz8P3ckYYx3xwNMxKOXTEg/NG5 SLDoE4yq xvWLbjjz7+Q4nEvg+z+2FSZb1uEDs8X9hALLIhqRy6MZLW2Aih9DpDJPBYBFjha1kxhcRma9T8wOYi+lLN1PrAdWwSkfZPGB7g2MWWV/C13DYRN8AS8l07kEFxXqAabNuGOjSGSA2ND+jppaUBNE0zz2qaBSz57quDjDm7ooTOutUbimRRB8kho/AbDvqE8b8sHFTZSmUJOUJDmZ6zPeU1ZVJYJf1/rIZgdK+53pfbqd7d0yLPvX0IIlFulNBEs+EDJ+MfE9cEKmNh6vJHIdZx5dGCGzuD7834R+Rp7uMNx4VxG5RTR614YMTdw0+OH8h+rWARe9WMYUVmrgGNnjP7XI23bGAa5Vkysr5Oc+Eu7Fa3PRBwPwVLYQiOp/Lgu7Nd5j5 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, Aug 7, 2024 at 6:14=E2=80=AFPM Huang, Ying w= rote: > > Chris Li writes: > > > Track the nonfull cluster as well as the empty cluster > > on lists. Each order has one nonfull cluster list. > > > > The cluster will remember which order it was used during > > new cluster allocation. > > > > When the cluster has free entry, add to the nonfull[order] > > list. When the free cluster list is empty, also allocate > > from the nonempty list of that order. > > > > This improves the mTHP swap allocation success rate. > > > > There are limitations if the distribution of numbers of > > different orders of mTHP changes a lot. e.g. there are a lot > > of nonfull cluster assign to order A while later time there > > are a lot of order B allocation while very little allocation > > in order A. Currently the cluster used by order A will not > > reused by order B unless the cluster is 100% empty. > > > > Signed-off-by: Chris Li > > --- > > include/linux/swap.h | 4 ++++ > > mm/swapfile.c | 38 +++++++++++++++++++++++++++++++++++--- > > 2 files changed, 39 insertions(+), 3 deletions(-) > > > > diff --git a/include/linux/swap.h b/include/linux/swap.h > > index edafd52d7ac4..6716ef236766 100644 > > --- a/include/linux/swap.h > > +++ b/include/linux/swap.h > > @@ -254,9 +254,11 @@ struct swap_cluster_info { > > */ > > u16 count; > > u8 flags; > > + u8 order; > > struct list_head list; > > }; > > #define CLUSTER_FLAG_FREE 1 /* This cluster is free */ > > +#define CLUSTER_FLAG_NONFULL 2 /* This cluster is on nonfull list */ > > > > /* > > * The first page in the swap file is the swap header, which is always= marked > > @@ -295,6 +297,8 @@ struct swap_info_struct { > > unsigned long *zeromap; /* vmalloc'ed bitmap to track zer= o pages */ > > struct swap_cluster_info *cluster_info; /* cluster info. Only for= SSD */ > > struct list_head free_clusters; /* free clusters list */ > > + struct list_head nonfull_clusters[SWAP_NR_ORDERS]; > > + /* list of cluster that contains = at least one free slot */ > > unsigned int lowest_bit; /* index of first free in swap_ma= p */ > > unsigned int highest_bit; /* index of last free in swap_map= */ > > unsigned int pages; /* total of usable pages of swap = */ > > diff --git a/mm/swapfile.c b/mm/swapfile.c > > index bceead7f9e3c..dcf09eb549db 100644 > > --- a/mm/swapfile.c > > +++ b/mm/swapfile.c > > @@ -361,14 +361,22 @@ static void swap_cluster_schedule_discard(struct = swap_info_struct *si, > > memset(si->swap_map + idx * SWAPFILE_CLUSTER, > > SWAP_MAP_BAD, SWAPFILE_CLUSTER); > > > > - list_add_tail(&ci->list, &si->discard_clusters); > > + VM_BUG_ON(ci->flags & CLUSTER_FLAG_FREE); > > + if (ci->flags & CLUSTER_FLAG_NONFULL) > > + list_move_tail(&ci->list, &si->discard_clusters); > > + else > > + list_add_tail(&ci->list, &si->discard_clusters); > > + ci->flags =3D 0; > > As Ryan pointed out before, it's better to clear the specific bit > instead of assigning 0. This will make code future proof. Ack. BTW, I plan to change the bit to a list number in the future.I can define a list bit mask for now. > > > schedule_work(&si->discard_work); > > } > > > > static void __free_cluster(struct swap_info_struct *si, struct swap_cl= uster_info *ci) > > { > > + if (ci->flags & CLUSTER_FLAG_NONFULL) > > + list_move_tail(&ci->list, &si->free_clusters); > > + else > > + list_add_tail(&ci->list, &si->free_clusters); > > ci->flags =3D CLUSTER_FLAG_FREE; > > - list_add_tail(&ci->list, &si->free_clusters); > > } > > > > /* > > @@ -491,8 +499,15 @@ static void dec_cluster_info_page(struct swap_info= _struct *p, struct swap_cluste > > VM_BUG_ON(ci->count =3D=3D 0); > > ci->count--; > > > > - if (!ci->count) > > + if (!ci->count) { > > free_cluster(p, ci); > > + return; > > + } > > + > > + if (!(ci->flags & CLUSTER_FLAG_NONFULL)) { > > + list_add_tail(&ci->list, &p->nonfull_clusters[ci->order])= ; > > + ci->flags |=3D CLUSTER_FLAG_NONFULL; > > + } > > } > > > > /* > > @@ -553,6 +568,19 @@ static bool scan_swap_map_try_ssd_cluster(struct s= wap_info_struct *si, > > if (tmp =3D=3D SWAP_NEXT_INVALID) { > > if (!list_empty(&si->free_clusters)) { > > ci =3D list_first_entry(&si->free_clusters, struc= t swap_cluster_info, list); > > + list_del(&ci->list); > > + spin_lock(&ci->lock); > > + ci->order =3D order; > > + ci->flags =3D 0; > > + spin_unlock(&ci->lock); > > + tmp =3D cluster_index(si, ci) * SWAPFILE_CLUSTER; > > + } else if (!list_empty(&si->nonfull_clusters[order])) { > > + ci =3D list_first_entry(&si->nonfull_clusters[ord= er], > > + struct swap_cluster_info, l= ist); > > + list_del(&ci->list); > > + spin_lock(&ci->lock); > > + ci->flags =3D 0; > > + spin_unlock(&ci->lock); > > tmp =3D cluster_index(si, ci) * SWAPFILE_CLUSTER; > > } else if (!list_empty(&si->discard_clusters)) { > > We should check discard_clusters before nonfull clusters. And the reason behind that is? I see the discard_cluster can take a long time. It will take a synchronous wait for the issuing the discard command. Why not just use the nonfull list and return immediately. When the discard command finished. It will show up in the free list anyway. BTW, what is your take on my previous analysis of the current SSD prefer write new cluster can wear out the SSD faster? I think it might be useful to provide users an option to choose to write a non full list first. The trade off is more friendly to SSD wear out than preferring to write new blocks. If you keep doing the swap long enough, there will be no new free cluster anyway. The example I give in this email: https://lore.kernel.org/linux-mm/CACePvbXGBNC9WzzL4s2uB2UciOkV6nb4bKKkc5TBZ= P6QuHS_aQ@mail.gmail.com/ Chris > > > /* > > @@ -967,6 +995,7 @@ static void swap_free_cluster(struct swap_info_stru= ct *si, unsigned long idx) > > ci =3D lock_cluster(si, offset); > > memset(si->swap_map + offset, 0, SWAPFILE_CLUSTER); > > ci->count =3D 0; > > + ci->order =3D 0; > > ci->flags =3D 0; > > free_cluster(si, ci); > > unlock_cluster(ci); > > @@ -2922,6 +2951,9 @@ static int setup_swap_map_and_extents(struct swap= _info_struct *p, > > INIT_LIST_HEAD(&p->free_clusters); > > INIT_LIST_HEAD(&p->discard_clusters); > > > > + for (i =3D 0; i < SWAP_NR_ORDERS; i++) > > + INIT_LIST_HEAD(&p->nonfull_clusters[i]); > > + > > for (i =3D 0; i < swap_header->info.nr_badpages; i++) { > > unsigned int page_nr =3D swap_header->info.badpages[i]; > > if (page_nr =3D=3D 0 || page_nr > swap_header->info.last_= page) > > -- > Best Regards, > Huang, Ying