From: Ryan Roberts <ryan.roberts@arm.com>
To: Barry Song <21cnbao@gmail.com>,
akpm@linux-foundation.org, linux-mm@kvack.org
Cc: baolin.wang@linux.alibaba.com, chrisl@kernel.org,
david@redhat.com, hanchuanhua@oppo.com, hannes@cmpxchg.org,
hughd@google.com, kasong@tencent.com,
linux-kernel@vger.kernel.org, surenb@google.com,
v-songbaohua@oppo.com, willy@infradead.org, xiang@kernel.org,
ying.huang@intel.com, yosryahmed@google.com, yuzhao@google.com,
ziy@nvidia.com, "Rafael J. Wysocki" <rafael@kernel.org>,
Pavel Machek <pavel@ucw.cz>, Len Brown <len.brown@intel.com>,
Christoph Hellwig <hch@infradead.org>
Subject: Re: [PATCH v4 2/6] mm: remove the implementation of swap_free() and always use swap_free_nr()
Date: Fri, 10 May 2024 10:11:45 +0100 [thread overview]
Message-ID: <38caf210-0607-4937-b6d0-13b99f155060@arm.com> (raw)
In-Reply-To: <20240508224040.190469-3-21cnbao@gmail.com>
On 08/05/2024 23:40, Barry Song wrote:
> From: Barry Song <v-songbaohua@oppo.com>
>
> To streamline maintenance efforts, we propose removing the implementation
> of swap_free(). Instead, we can simply invoke swap_free_nr() with nr
> set to 1. swap_free_nr() is designed with a bitmap consisting of only
> one long, resulting in overhead that can be ignored for cases where nr
> equals 1.
>
> A prime candidate for leveraging swap_free_nr() lies within
> kernel/power/swap.c. Implementing this change facilitates the adoption
> of batch processing for hibernation.
>
> Suggested-by: "Huang, Ying" <ying.huang@intel.com>
> Signed-off-by: Barry Song <v-songbaohua@oppo.com>
> Reviewed-by: "Huang, Ying" <ying.huang@intel.com>
> Acked-by: Chris Li <chrisl@kernel.org>
> Cc: "Rafael J. Wysocki" <rafael@kernel.org>
> Cc: Pavel Machek <pavel@ucw.cz>
> Cc: Len Brown <len.brown@intel.com>
> Cc: Hugh Dickins <hughd@google.com>
> Cc: Christoph Hellwig <hch@infradead.org>
Reviewed-by: Ryan Roberts <ryan.roberts@arm.com>
> ---
> include/linux/swap.h | 10 +++++-----
> kernel/power/swap.c | 5 ++---
> mm/swapfile.c | 17 ++++-------------
> 3 files changed, 11 insertions(+), 21 deletions(-)
>
> diff --git a/include/linux/swap.h b/include/linux/swap.h
> index d1d35e92d7e9..48131b869a4d 100644
> --- a/include/linux/swap.h
> +++ b/include/linux/swap.h
> @@ -482,7 +482,6 @@ extern int add_swap_count_continuation(swp_entry_t, gfp_t);
> extern void swap_shmem_alloc(swp_entry_t);
> extern int swap_duplicate(swp_entry_t);
> extern int swapcache_prepare(swp_entry_t);
> -extern void swap_free(swp_entry_t);
> extern void swap_free_nr(swp_entry_t entry, int nr_pages);
> extern void swapcache_free_entries(swp_entry_t *entries, int n);
> extern void free_swap_and_cache_nr(swp_entry_t entry, int nr);
> @@ -561,10 +560,6 @@ static inline int swapcache_prepare(swp_entry_t swp)
> return 0;
> }
>
> -static inline void swap_free(swp_entry_t swp)
> -{
> -}
> -
> static inline void swap_free_nr(swp_entry_t entry, int nr_pages)
> {
> }
> @@ -613,6 +608,11 @@ static inline void free_swap_and_cache(swp_entry_t entry)
> free_swap_and_cache_nr(entry, 1);
> }
>
> +static inline void swap_free(swp_entry_t entry)
> +{
> + swap_free_nr(entry, 1);
> +}
> +
> #ifdef CONFIG_MEMCG
> static inline int mem_cgroup_swappiness(struct mem_cgroup *memcg)
> {
> diff --git a/kernel/power/swap.c b/kernel/power/swap.c
> index 5bc04bfe2db1..75bc9e3f9d59 100644
> --- a/kernel/power/swap.c
> +++ b/kernel/power/swap.c
> @@ -200,12 +200,11 @@ void free_all_swap_pages(int swap)
>
> while ((node = swsusp_extents.rb_node)) {
> struct swsusp_extent *ext;
> - unsigned long offset;
>
> ext = rb_entry(node, struct swsusp_extent, node);
> rb_erase(node, &swsusp_extents);
> - for (offset = ext->start; offset <= ext->end; offset++)
> - swap_free(swp_entry(swap, offset));
> + swap_free_nr(swp_entry(swap, ext->start),
> + ext->end - ext->start + 1);
>
> kfree(ext);
> }
> diff --git a/mm/swapfile.c b/mm/swapfile.c
> index ec12f2b9d229..99e701620562 100644
> --- a/mm/swapfile.c
> +++ b/mm/swapfile.c
> @@ -1343,19 +1343,6 @@ static void swap_entry_free(struct swap_info_struct *p, swp_entry_t entry)
> swap_range_free(p, offset, 1);
> }
>
> -/*
> - * Caller has made sure that the swap device corresponding to entry
> - * is still around or has not been recycled.
> - */
> -void swap_free(swp_entry_t entry)
> -{
> - struct swap_info_struct *p;
> -
> - p = _swap_info_get(entry);
> - if (p)
> - __swap_entry_free(p, entry);
> -}
> -
> static void cluster_swap_free_nr(struct swap_info_struct *sis,
> unsigned long offset, int nr_pages)
> {
> @@ -1385,6 +1372,10 @@ static void cluster_swap_free_nr(struct swap_info_struct *sis,
> unlock_cluster_or_swap_info(sis, ci);
> }
>
> +/*
> + * Caller has made sure that the swap device corresponding to entry
> + * is still around or has not been recycled.
> + */
> void swap_free_nr(swp_entry_t entry, int nr_pages)
> {
> int nr;
next prev parent reply other threads:[~2024-05-10 9:11 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-08 22:40 [PATCH v4 0/6] large folios swap-in: handle refault cases first Barry Song
2024-05-08 22:40 ` [PATCH v4 1/6] mm: swap: introduce swap_free_nr() for batched swap_free() Barry Song
2024-05-08 22:40 ` [PATCH v4 2/6] mm: remove the implementation of swap_free() and always use swap_free_nr() Barry Song
2024-05-10 9:11 ` Ryan Roberts [this message]
2024-05-08 22:40 ` [PATCH v4 3/6] mm: introduce pte_move_swp_offset() helper which can move offset bidirectionally Barry Song
2024-05-08 22:40 ` [PATCH v4 4/6] mm: introduce arch_do_swap_page_nr() which allows restore metadata for nr pages Barry Song
2024-05-08 22:40 ` [PATCH v4 5/6] mm: swap: make should_try_to_free_swap() support large-folio Barry Song
2024-05-08 22:40 ` [PATCH v4 6/6] mm: swap: entirely map large folios found in swapcache Barry Song
2024-05-09 7:44 ` Huang, Ying
2024-05-21 21:21 ` [PATCH v4 0/6] large folios swap-in: handle refault cases first Barry Song
2024-05-21 21:59 ` Andrew Morton
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=38caf210-0607-4937-b6d0-13b99f155060@arm.com \
--to=ryan.roberts@arm.com \
--cc=21cnbao@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=baolin.wang@linux.alibaba.com \
--cc=chrisl@kernel.org \
--cc=david@redhat.com \
--cc=hanchuanhua@oppo.com \
--cc=hannes@cmpxchg.org \
--cc=hch@infradead.org \
--cc=hughd@google.com \
--cc=kasong@tencent.com \
--cc=len.brown@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=pavel@ucw.cz \
--cc=rafael@kernel.org \
--cc=surenb@google.com \
--cc=v-songbaohua@oppo.com \
--cc=willy@infradead.org \
--cc=xiang@kernel.org \
--cc=ying.huang@intel.com \
--cc=yosryahmed@google.com \
--cc=yuzhao@google.com \
--cc=ziy@nvidia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).