The patch titled
Subject: mm/swapfile.c: call free_swap_slot() in __swap_entry_free()
has been added to the -mm tree. Its filename is
swap-call-free_swap_slot-in-__swap_entry_free.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/swap-call-free_swap_slot-in-__swap_entry_free.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/swap-call-free_swap_slot-in-__swap_entry_free.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Huang Ying <ying.huang@xxxxxxxxx>
Subject: mm/swapfile.c: call free_swap_slot() in __swap_entry_free()
This is a code cleanup patch without functionality change.
Originally, when __swap_entry_free() is called, and its return value is 0,
free_swap_slot() will always be called to free the swap entry to the
per-CPU pool. So move the call to free_swap_slot() to __swap_entry_free()
to simplify the code.
Link: http://lkml.kernel.org/r/20180827075535.17406-3-ying.huang@xxxxxxxxx
Signed-off-by: "Huang, Ying" <ying.huang@xxxxxxxxx>
Reviewed-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Cc: Dave Hansen <dave.hansen@xxxxxxxxxxxxxxx>
Cc: Michal Hocko <mhocko@xxxxxxxx>
Cc: Johannes Weiner <hannes@xxxxxxxxxxx>
Cc: Shaohua Li <shli@xxxxxxxxxx>
Cc: Hugh Dickins <hughd@xxxxxxxxxx>
Cc: Minchan Kim <minchan@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/swapfile.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
--- a/mm/swapfile.c~swap-call-free_swap_slot-in-__swap_entry_free
+++ a/mm/swapfile.c
@@ -1182,6 +1182,8 @@ static unsigned char __swap_entry_free(s
ci = lock_cluster_or_swap_info(p, offset);
usage = __swap_entry_free_locked(p, offset, usage);
unlock_cluster_or_swap_info(p, ci);
+ if (!usage)
+ free_swap_slot(entry);
return usage;
}
@@ -1212,10 +1214,8 @@ void swap_free(swp_entry_t entry)
struct swap_info_struct *p;
p = _swap_info_get(entry);
- if (p) {
- if (!__swap_entry_free(p, entry, 1))
- free_swap_slot(entry);
- }
+ if (p)
+ __swap_entry_free(p, entry, 1);
}
/*
@@ -1637,8 +1637,6 @@ int free_swap_and_cache(swp_entry_t entr
!swap_page_trans_huge_swapped(p, entry))
__try_to_reclaim_swap(p, swp_offset(entry),
TTRS_UNMAPPED | TTRS_FULL);
- else if (!count)
- free_swap_slot(entry);
}
return p != NULL;
}
_
Patches currently in -mm which might be from ying.huang@xxxxxxxxx are
swap-use-__try_to_reclaim_swap-in-free_swap_and_cache.patch
swap-call-free_swap_slot-in-__swap_entry_free.patch
swap-clear-si-swap_map-in-swap_free_cluster.patch
mm-swap-fix-race-between-swapoff-and-some-swap-operations.patch
mm-swap-fix-race-between-swapoff-and-some-swap-operations-v6.patch
mm-fix-race-between-swapoff-and-mincore.patch
