jsauer/torvalds-linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-01-11 17:10:13 +00:00
Code

mm: swap: factor out helper to drop cache of entries within a single cluster

Browse Source 
Factor out helper swap_entries_put_cache() from put_swap_folio() to serve
as a general-purpose routine for dropping cache flag of entries within a
single cluster.

Link: https://lkml.kernel.org/r/20250325162528.68385-8-shikemeng@huaweicloud.com
Signed-off-by: Kemeng Shi <shikemeng@huaweicloud.com>
Reviewed-by: Tim Chen <tim.c.chen@linux.intel.com>
Reviewed-by: Baoquan He <bhe@redhat.com>
Cc: Kairui Song <kasong@tencent.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Kemeng Shi 2025-03-26 00:25:27 +08:00 committed by Andrew Morton
parent 4d71d9062d
commit d4f8000bd6
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
mm/swapfile.c
View File

@ -1463,6 +1463,22 @@ put_out:
return NULL;
}
static void swap_entries_put_cache(struct swap_info_struct *si,
swp_entry_t entry, int nr)
{
unsigned long offset = swp_offset(entry);
struct swap_cluster_info *ci;
ci = lock_cluster(si, offset);
if (swap_only_has_cache(si, offset, nr))
swap_entries_free(si, ci, entry, nr);
else {
for (int i = 0; i < nr; i++, entry.val++)
swap_entry_put_locked(si, ci, entry, SWAP_HAS_CACHE);
}
unlock_cluster(ci);
}
static bool swap_entries_put_map(struct swap_info_struct *si,
swp_entry_t entry, int nr)
{
@ -1607,8 +1623,6 @@ void swap_free_nr(swp_entry_t entry, int nr_pages)
*/
void put_swap_folio(struct folio *folio, swp_entry_t entry)
{
unsigned long offset = swp_offset(entry);
struct swap_cluster_info *ci;
struct swap_info_struct *si;
int size = 1 << swap_entry_order(folio_order(folio));
@ -1616,14 +1630,7 @@ void put_swap_folio(struct folio *folio, swp_entry_t entry)
if (!si)
return;
ci = lock_cluster(si, offset);
if (swap_only_has_cache(si, offset, size))
swap_entries_free(si, ci, entry, size);
else {
for (int i = 0; i < size; i++, entry.val++)
swap_entry_put_locked(si, ci, entry, SWAP_HAS_CACHE);
}
unlock_cluster(ci);
swap_entries_put_cache(si, entry, size);
}
int __swap_count(swp_entry_t entry)