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 A577BCD4F4A for ; Wed, 4 Sep 2024 23:47:45 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 388BB6B0095; Wed, 4 Sep 2024 19:47:45 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2EA2E6B03B9; Wed, 4 Sep 2024 19:47:45 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1649C6B03BA; Wed, 4 Sep 2024 19:47:45 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id E25AF6B0095 for ; Wed, 4 Sep 2024 19:47:44 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id A6F001613AF for ; Wed, 4 Sep 2024 23:47:44 +0000 (UTC) X-FDA: 82528695648.03.28922CE Received: from mail-ua1-f44.google.com (mail-ua1-f44.google.com [209.85.222.44]) by imf26.hostedemail.com (Postfix) with ESMTP id D7884140008 for ; Wed, 4 Sep 2024 23:47:42 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b="B7GStGe/"; spf=pass (imf26.hostedemail.com: domain of 21cnbao@gmail.com designates 209.85.222.44 as permitted sender) smtp.mailfrom=21cnbao@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1725493614; 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=j6E895Ok1QuyQoeazIxFZMtuIiFRwRLhjoM/FP2eCn4=; b=Yr+9LfOvW0XrQo2a1Ydr8sWb6cB6uEqfS9GXd/uiwMKKRPNGz9ukMJDN07qbJ6k5Lk5cTn 6MUvseGNIlA5IFLIENV7romauAuVhxp6t4+MQVPnwozeE7VXAtZufj7qhy8p2KKT+nTGy4 Pravm/+v96Lmm3sUvPKHWVjHRIdoBAw= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b="B7GStGe/"; spf=pass (imf26.hostedemail.com: domain of 21cnbao@gmail.com designates 209.85.222.44 as permitted sender) smtp.mailfrom=21cnbao@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1725493614; a=rsa-sha256; cv=none; b=aw7/qKXTsqEh8dglj6z4mbyp3usPokWYfGaz6xq1zkG93HQXI5W7ohog+rM3YZ+4FKd3zu jvp4DDn95BpdHbF40jVqwUGo9DejZoGdTcUXTlJMgwnZ/+oE9v0YdtMnmKqW/6CiiNBBrw hRxQ+2lDFF4SfRCGzUAxPjGADAVtylw= Received: by mail-ua1-f44.google.com with SMTP id a1e0cc1a2514c-846c59979efso53956241.3 for ; Wed, 04 Sep 2024 16:47:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725493662; x=1726098462; 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=j6E895Ok1QuyQoeazIxFZMtuIiFRwRLhjoM/FP2eCn4=; b=B7GStGe/ijbeS0a7+b8/CeX80TPg0/HrAJt49NlMUWREimz41EO3OZdFcsFFvhjihP XXPuEkpeU4B/AAIBGDXZVGXp3zB0p4PZXqmuAslDj7tH6bRrMevCoZe6tMYSAwYAkXGS 1F/UkVOf4s5pAKC3j+uJvYsnJYMKCeefV7zBmXgXytPzW8lA5/KXzhgBCXRw9i2sQfFn 9bGEmJmSyX87GNEfgLHhu4ns/s/zOEgZhoHqMicurrHMf/wz9VaS08rZ2hj3esFiGuiE nRnvCLjAa79e17qJQ26WC4R4zI4f+Y98s8yDE9ZWLTkIy+TtQ0PfpF8JWUquCvdCLvyo ZxVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725493662; x=1726098462; 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=j6E895Ok1QuyQoeazIxFZMtuIiFRwRLhjoM/FP2eCn4=; b=qw/djHTL7OpX6NHTz0QKbYsRf+//ELmFbf4ZxjVQd+F2a6g+MZV1kpNXtMi9KZ8pjD frENhICaUQYz5WSWTs0hjJl8Ad47Yu2lAyzdM7tfStRGAzTW/MuTPVEt6LDUoJ/usFDO 4zrJ1M8bDEdgmb/pXFi/OfVqVQTGSrRj9Bk/UElxhYJQGzHbYb+VXA8wmlJN53BpDoIb 7Bgim8euaQEqekImz71suw8etY1fyi3PjZlM5QtV5PA8nRugVJE2znvEdG3+srIJFXOS Bsm1i/6yC+EnUw9GNXGjtg19UqZPzfpTLMegPKFdBt2K6s5k0X18/s+CTKbJrh2waSDP 26gQ== X-Forwarded-Encrypted: i=1; AJvYcCU3lcE0gnzNhochLftrsjMg3L0FBMjhJnZJRgxN0jNVyUWIW/uhknqJRydbgzVIg8l1B9L/Ldt1xw==@kvack.org X-Gm-Message-State: AOJu0YxrU6LW8jgagBH8eDVRHTiBDSGcdyeZgdNYntvLHO5AXybHHv/G QJPMhcFLGsqIUXdgiIy7EiRuKdvj5Q9tS/Af3dE9DjGuf8B1kwU+Sx+PGvbRFbm6yt31H6TL4tC WdiuoYw8LDJ6HDbmc96U1nWI7do8= X-Google-Smtp-Source: AGHT+IEaYtL9V90Z8En3PSeIRoPpridOyNjBm/1un/Z1It3AnyYv/A8yaMQuHaNqiTFi8W0VbdHhc1HokzLNTVCnORE= X-Received: by 2002:a05:6102:38d2:b0:498:9b16:234e with SMTP id ada2fe7eead31-49bad53823dmr9350659137.24.1725493661786; Wed, 04 Sep 2024 16:47:41 -0700 (PDT) MIME-Version: 1.0 References: <20240612124750.2220726-2-usamaarif642@gmail.com> <20240904055522.2376-1-21cnbao@gmail.com> <7a91ff31-1f56-4d0c-a4a7-a305331ba97a@gmail.com> In-Reply-To: From: Barry Song <21cnbao@gmail.com> Date: Thu, 5 Sep 2024 11:47:31 +1200 Message-ID: Subject: Re: [PATCH v4 1/2] mm: store zero pages to be swapped out in a bitmap To: Usama Arif Cc: akpm@linux-foundation.org, chengming.zhou@linux.dev, david@redhat.com, hannes@cmpxchg.org, hughd@google.com, kernel-team@meta.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, nphamcs@gmail.com, shakeel.butt@linux.dev, willy@infradead.org, ying.huang@intel.com, yosryahmed@google.com, hanchuanhua@oppo.com Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Server: rspam03 X-Rspam-User: X-Rspamd-Queue-Id: D7884140008 X-Stat-Signature: igeoxdsqha97odcir7zeuatokejnjs83 X-HE-Tag: 1725493662-606934 X-HE-Meta: U2FsdGVkX18bmOaBDLzRXF9YjdLk0vwT0qb7y4sjIOQ9KxMJT+9PJZJ1RAPuGVvJzzEhLSfX6cRgmBVOG8DZPH9KuolisE6JnTX7TpIsxk0jtasXbL+PvLF3C0EZLHBOhoMaH7hOuC0LA+b6ceiqvGAPU9KEv6m9apfR/CQ+j//Afr34CBz9YcnzxnQg+2/AHYmA7+7FMDy12fWvKK3+AwHFGZnmWoROUTb0SVN9C4eFgRCjFVKWmSxULsmHZy42LOOqdWUbCue9epSS4eKFJbzfI94LQYRONFcX/Ex/Mm9m2Jqw1w28WnEcrsZ3u4MF99BlJb9vdmNKOObaj1xN8BfNxdd/YOBvDyL5nRQWgVk+3nmNGEAxIEzDpgiwkgkdJH1i84T73fumnTHoltVUqSg5RS1K+weNBZXFnjUSD30GXDquE0f5lLicsxTilKMOoScEavnva60ZDwGVMawT44od8EXHSFPLkwLkBLLhpFSowDr+Gm6Okxt53iTJfjqnC3EoxyUFyFP1meXrqam5ojcC9ISvOzcKqWNYvk6/DtobR6svAr/6gpFRbPFG6RrdXqqBvgPFo0xFseses8L3Pb/djiHcmG5kgLHvJe51s+fWuFh3M3pOe3zHhaqvdYs4XMDrVeAE4B4P7wB4/GDrHwcl0gLrOA3qmCVR/PDf6ln7CiHrsthoEqNj2dI8g7PQqGSLDttDCka6hnd3/vJaDK8MP4NYYe8aNA5Ru4tkaAzroBbeiZ8/3RLwB8uIBa7rQjvLHzK792Z5YfklV4q/a/pl8JoevNAnYp3wiS8OOE0Iygj1q4z7zDxgE+pQfEafHD3WvCPuPVRu1whHg2sOxineBbk3k13NrIOGRiSAumQ2w2fLZL9qQ650yQ6yGtWucpDh/QSgSwcFTQ9uqISnJp3TdfCVTFXG6AXkKD7hqaoKtSZ0TKTQyyw4hktRuYkO4SIke9oYd9srTCqO3yd 0f//v7R9 5FniQ4Mat4b7HHlFYl4PvDSqjXSDBsk4By9aXhuj/kWdH0o8xabwri4DX7lYNCbL7qmqsChEC1INlxVqiHVSSOxjYyyWTXhOlFxLf5kGvVEy7CP/GWBtNm4jNZIBgfAicV6CWqDNWVUho0d75TBKf+jhCskJhYz7CSuvEOpSWyq4MzaOKKbctIvpilDRZtuRWwXfGcBgUIx+0F9louTY6BZ80KeMi+mlS/yAHjSzWLDLCqZ2ndxc+KroMPjkEY4FVPo0zSCXDgVxijmD0BNnM6TimA2d/63ilF6YIdGTdyshL7c3ftyyG8Q0TzG3jxgc3Mrm7++g+7l4VndWSRLoFohPdmeGGbatcStzfW27F2w/eeXjAMkSQGp31zA== 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 Thu, Sep 5, 2024 at 11:44=E2=80=AFAM Barry Song <21cnbao@gmail.com> wrot= e: > > On Wed, Sep 4, 2024 at 11:14=E2=80=AFPM Usama Arif wrote: > > > > > > > > On 04/09/2024 06:55, Barry Song wrote: > > > On Thu, Jun 13, 2024 at 12:48=E2=80=AFAM Usama Arif wrote: > > >> > > >> Approximately 10-20% of pages to be swapped out are zero pages [1]. > > >> Rather than reading/writing these pages to flash resulting > > >> in increased I/O and flash wear, a bitmap can be used to mark these > > >> pages as zero at write time, and the pages can be filled at > > >> read time if the bit corresponding to the page is set. > > >> With this patch, NVMe writes in Meta server fleet decreased > > >> by almost 10% with conventional swap setup (zswap disabled). > > >> > > >> [1] https://lore.kernel.org/all/20171018104832epcms5p1b2232e2236258d= e3d03d1344dde9fce0@epcms5p1/ > > >> > > >> Signed-off-by: Usama Arif > > >> --- > > >> include/linux/swap.h | 1 + > > >> mm/page_io.c | 114 ++++++++++++++++++++++++++++++++++++++++= ++- > > >> mm/swapfile.c | 24 ++++++++- > > >> 3 files changed, 136 insertions(+), 3 deletions(-) > > >> > > >> diff --git a/include/linux/swap.h b/include/linux/swap.h > > >> index a11c75e897ec..e88563978441 100644 > > >> --- a/include/linux/swap.h > > >> +++ b/include/linux/swap.h > > >> @@ -299,6 +299,7 @@ struct swap_info_struct { > > >> signed char type; /* strange name for an index= */ > > >> unsigned int max; /* extent of the swap_map */ > > >> unsigned char *swap_map; /* vmalloc'ed array of usage= counts */ > > >> + unsigned long *zeromap; /* vmalloc'ed bitmap to trac= k zero pages */ > > >> struct swap_cluster_info *cluster_info; /* cluster info. Onl= y for SSD */ > > >> struct swap_cluster_list free_clusters; /* free clusters lis= t */ > > >> unsigned int lowest_bit; /* index of first free in sw= ap_map */ > > >> diff --git a/mm/page_io.c b/mm/page_io.c > > >> index a360857cf75d..39fc3919ce15 100644 > > >> --- a/mm/page_io.c > > >> +++ b/mm/page_io.c > > >> @@ -172,6 +172,88 @@ int generic_swapfile_activate(struct swap_info_= struct *sis, > > >> goto out; > > >> } > > >> > > >> +static bool is_folio_page_zero_filled(struct folio *folio, int i) > > >> +{ > > >> + unsigned long *data; > > >> + unsigned int pos, last_pos =3D PAGE_SIZE / sizeof(*data) - 1= ; > > >> + bool ret =3D false; > > >> + > > >> + data =3D kmap_local_folio(folio, i * PAGE_SIZE); > > >> + if (data[last_pos]) > > >> + goto out; > > >> + for (pos =3D 0; pos < PAGE_SIZE / sizeof(*data); pos++) { > > >> + if (data[pos]) > > >> + goto out; > > >> + } > > >> + ret =3D true; > > >> +out: > > >> + kunmap_local(data); > > >> + return ret; > > >> +} > > >> + > > >> +static bool is_folio_zero_filled(struct folio *folio) > > >> +{ > > >> + unsigned int i; > > >> + > > >> + for (i =3D 0; i < folio_nr_pages(folio); i++) { > > >> + if (!is_folio_page_zero_filled(folio, i)) > > >> + return false; > > >> + } > > >> + return true; > > >> +} > > >> + > > >> +static void folio_zero_fill(struct folio *folio) > > >> +{ > > >> + unsigned int i; > > >> + > > >> + for (i =3D 0; i < folio_nr_pages(folio); i++) > > >> + clear_highpage(folio_page(folio, i)); > > >> +} > > >> + > > >> +static void swap_zeromap_folio_set(struct folio *folio) > > >> +{ > > >> + struct swap_info_struct *sis =3D swp_swap_info(folio->swap); > > >> + swp_entry_t entry; > > >> + unsigned int i; > > >> + > > >> + for (i =3D 0; i < folio_nr_pages(folio); i++) { > > >> + entry =3D page_swap_entry(folio_page(folio, i)); > > >> + set_bit(swp_offset(entry), sis->zeromap); > > >> + } > > >> +} > > >> + > > >> +static void swap_zeromap_folio_clear(struct folio *folio) > > >> +{ > > >> + struct swap_info_struct *sis =3D swp_swap_info(folio->swap); > > >> + swp_entry_t entry; > > >> + unsigned int i; > > >> + > > >> + for (i =3D 0; i < folio_nr_pages(folio); i++) { > > >> + entry =3D page_swap_entry(folio_page(folio, i)); > > >> + clear_bit(swp_offset(entry), sis->zeromap); > > >> + } > > >> +} > > >> + > > >> +/* > > >> + * Return the index of the first subpage which is not zero-filled > > >> + * according to swap_info_struct->zeromap. > > >> + * If all pages are zero-filled according to zeromap, it will retur= n > > >> + * folio_nr_pages(folio). > > >> + */ > > >> +static unsigned int swap_zeromap_folio_test(struct folio *folio) > > >> +{ > > >> + struct swap_info_struct *sis =3D swp_swap_info(folio->swap); > > >> + swp_entry_t entry; > > >> + unsigned int i; > > >> + > > >> + for (i =3D 0; i < folio_nr_pages(folio); i++) { > > >> + entry =3D page_swap_entry(folio_page(folio, i)); > > >> + if (!test_bit(swp_offset(entry), sis->zeromap)) > > >> + return i; > > >> + } > > >> + return i; > > >> +} > > >> + > > >> /* > > >> * We may have stale swap cache pages in memory: notice > > >> * them here and get rid of the unnecessary final write. > > >> @@ -195,6 +277,13 @@ int swap_writepage(struct page *page, struct wr= iteback_control *wbc) > > >> folio_unlock(folio); > > >> return ret; > > >> } > > >> + > > >> + if (is_folio_zero_filled(folio)) { > > >> + swap_zeromap_folio_set(folio); > > >> + folio_unlock(folio); > > >> + return 0; > > >> + } > > >> + swap_zeromap_folio_clear(folio); > > >> if (zswap_store(folio)) { > > >> folio_start_writeback(folio); > > >> folio_unlock(folio); > > >> @@ -426,6 +515,26 @@ static void sio_read_complete(struct kiocb *ioc= b, long ret) > > >> mempool_free(sio, sio_pool); > > >> } > > >> > > >> +static bool swap_read_folio_zeromap(struct folio *folio) > > >> +{ > > >> + unsigned int idx =3D swap_zeromap_folio_test(folio); > > >> + > > >> + if (idx =3D=3D 0) > > >> + return false; > > >> + > > >> + /* > > >> + * Swapping in a large folio that is partially in the zeroma= p is not > > >> + * currently handled. Return true without marking the folio = uptodate so > > >> + * that an IO error is emitted (e.g. do_swap_page() will sig= bus). > > >> + */ > > >> + if (WARN_ON_ONCE(idx < folio_nr_pages(folio))) > > >> + return true; > > > > > > Hi Usama, Yosry, > > > > > > I feel the warning is wrong as we could have the case where idx=3D=3D= 0 > > > is not zeromap but idx=3D1 is zeromap. idx =3D=3D 0 doesn't necessari= ly > > > mean we should return false. > > > > > > What about the below change which both fixes the warning and unblocks > > > large folios swap-in? > > > > > Hi Barry, > > > > I remembered when resending the zeromap series about the comment Yosry = had made earlier, but checked that the mTHP swap-in was not in mm-unstable. > > I should have checked the mailing list and commented! > > > > I have not tested the below diff yet (will do in a few hours). But ther= e might be a small issue with it. Have commented inline. > > > > > diff --git a/mm/page_io.c b/mm/page_io.c > > > index 4bc77d1c6bfa..7d7ff7064e2b 100644 > > > --- a/mm/page_io.c > > > +++ b/mm/page_io.c > > > @@ -226,26 +226,6 @@ static void swap_zeromap_folio_clear(struct foli= o *folio) > > > } > > > } > > > > > > -/* > > > - * Return the index of the first subpage which is not zero-filled > > > - * according to swap_info_struct->zeromap. > > > - * If all pages are zero-filled according to zeromap, it will return > > > - * folio_nr_pages(folio). > > > - */ > > > -static unsigned int swap_zeromap_folio_test(struct folio *folio) > > > -{ > > > - struct swap_info_struct *sis =3D swp_swap_info(folio->swap); > > > - swp_entry_t entry; > > > - unsigned int i; > > > - > > > - for (i =3D 0; i < folio_nr_pages(folio); i++) { > > > - entry =3D page_swap_entry(folio_page(folio, i)); > > > - if (!test_bit(swp_offset(entry), sis->zeromap)) > > > - return i; > > > - } > > > - return i; > > > -} > > > - > > > /* > > > * We may have stale swap cache pages in memory: notice > > > * them here and get rid of the unnecessary final write. > > > @@ -524,9 +504,10 @@ static void sio_read_complete(struct kiocb *iocb= , long ret) > > > > > > static bool swap_read_folio_zeromap(struct folio *folio) > > > { > > > - unsigned int idx =3D swap_zeromap_folio_test(folio); > > > + unsigned int nr_pages =3D folio_nr_pages(folio); > > > + unsigned int nr =3D swap_zeromap_entries_count(folio->swap, nr_= pages); > > > > > > - if (idx =3D=3D 0) > > > + if (nr =3D=3D 0) > > > return false; > > > > > > /* > > > @@ -534,7 +515,7 @@ static bool swap_read_folio_zeromap(struct folio = *folio) > > > * currently handled. Return true without marking the folio upt= odate so > > > * that an IO error is emitted (e.g. do_swap_page() will sigbus= ). > > > */ > > > - if (WARN_ON_ONCE(idx < folio_nr_pages(folio))) > > > + if (WARN_ON_ONCE(nr < nr_pages)) > > > return true; > > > > > > folio_zero_range(folio, 0, folio_size(folio)); > > > diff --git a/mm/swap.h b/mm/swap.h > > > index f8711ff82f84..2d59e9d89e95 100644 > > > --- a/mm/swap.h > > > +++ b/mm/swap.h > > > @@ -80,6 +80,32 @@ static inline unsigned int folio_swap_flags(struct= folio *folio) > > > { > > > return swp_swap_info(folio->swap)->flags; > > > } > > > + > > > +/* > > > + * Return the number of entries which are zero-filled according to > > > + * swap_info_struct->zeromap. It isn't precise if the return value > > > + * is larger than 0 and smaller than nr to avoid extra iterations, > > > + * In this case, it means entries haven't consistent zeromap. > > > + */ > > > +static inline unsigned int swap_zeromap_entries_count(swp_entry_t en= try, int nr) > > > +{ > > > + struct swap_info_struct *sis =3D swp_swap_info(entry); > > > + unsigned long offset =3D swp_offset(entry); > > > + unsigned int type =3D swp_type(entry); > > > + unsigned int n =3D 0; > > > + > > > + for (int i =3D 0; i < nr; i++) { > > > + entry =3D swp_entry(type, offset + i); > > > + if (test_bit(offset + i, sis->zeromap)) { > > > > Should this be if (test_bit(swp_offset(entry), sis->zeromap)) > > > > well. i feel i have a much cheaper way to implement this, which > can entirely iteration even in your original code: > > +/* > + * Return the number of entries which are zero-filled according to > + * swap_info_struct->zeromap. It isn't precise if the return value > + * is 1 for nr > 1. In this case, it means entries have inconsistent > + * zeromap. > + */ > +static inline unsigned int swap_zeromap_entries_count(swp_entry_t > entry, int nr) > +{ > + struct swap_info_struct *sis =3D swp_swap_info(entry); > + unsigned long start =3D swp_offset(entry); > + unsigned long end =3D start + nr; > + unsigned long idx =3D 0; > + > + idx =3D find_next_bit(sis->zeromap, end, start); > + if (idx =3D=3D end) > + return 0; > + if (idx > start) > + return 1; missed a case here: if (nr > 1 && find_next_zero_bit(sis->zeromap, end, start) !=3D end= ) return 1; > + return nr; > +} > + > > > > > > Also, are you going to use this in alloc_swap_folio? > > You mentioned above that this unblocks large folios swap-in, but I don'= t see > > it in the diff here. I am guessing there is some change in alloc_swap_i= nfo that > > uses swap_zeromap_entries_count? > > > > Thanks > > Usama > > > > > + if (i !=3D n) > > > + return i; > > > + n++; > > > + } > > > + } > > > + > > > + return n; > > > +} > > > + > > > #else /* CONFIG_SWAP */ > > > struct swap_iocb; > > > static inline void swap_read_folio(struct folio *folio, struct swap_= iocb **plug) > > > @@ -171,6 +197,11 @@ static inline unsigned int folio_swap_flags(stru= ct folio *folio) > > > { > > > return 0; > > > } > > > + > > > +static inline unsigned int swap_zeromap_entries_count(swp_entry_t en= try, int nr) > > > +{ > > > + return 0; > > > +} > > > #endif /* CONFIG_SWAP */ > > > > > > #endif /* _MM_SWAP_H */ > > > > > Thanks > Barry