The patch titled
Subject: mm, THP, swap: fix two issues in THP optimize patch
has been removed from the -mm tree. Its filename was
mm-thp-swap-delay-splitting-thp-during-swap-out-fix.patch
This patch was dropped because it was folded into mm-thp-swap-delay-splitting-thp-during-swap-out.patch
------------------------------------------------------
From: Huang Ying <ying.huang@xxxxxxxxx>
Subject: mm, THP, swap: Fix two issues in THP optimize patch
When changing the logic for cluster allocation for THP in get_swap_page(),
I made a mistake so that a normal swap slot may be allocated for a THP
instead of return with failure. This is fixed in the patch.
And I found two likely/unlikely annotation is wrong in get_swap_pages(),
because that is slow path, I just removed the likely/unlikely annotation.
Link: http://lkml.kernel.org/r/87k25ed8zo.fsf@xxxxxxxxxxxxxxxxxxxx
Signed-off-by: "Huang, Ying" <ying.huang@xxxxxxxxx>
Cc: Johannes Weiner <hannes@xxxxxxxxxxx>
Cc: Minchan Kim <minchan@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/swap_slots.c | 5 +++--
mm/swapfile.c | 4 ++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff -puN mm/swap_slots.c~mm-thp-swap-delay-splitting-thp-during-swap-out-fix mm/swap_slots.c
--- a/mm/swap_slots.c~mm-thp-swap-delay-splitting-thp-during-swap-out-fix
+++ a/mm/swap_slots.c
@@ -309,8 +309,9 @@ swp_entry_t get_swap_page(struct page *p
entry.val = 0;
- if (IS_ENABLED(CONFIG_THP_SWAP) && PageTransHuge(page)) {
- get_swap_pages(1, true, &entry);
+ if (PageTransHuge(page)) {
+ if (IS_ENABLED(CONFIG_THP_SWAP))
+ get_swap_pages(1, true, &entry);
return entry;
}
diff -puN mm/swapfile.c~mm-thp-swap-delay-splitting-thp-during-swap-out-fix mm/swapfile.c
--- a/mm/swapfile.c~mm-thp-swap-delay-splitting-thp-during-swap-out-fix
+++ a/mm/swapfile.c
@@ -937,13 +937,13 @@ start_over:
spin_unlock(&si->lock);
goto nextsi;
}
- if (likely(cluster))
+ if (cluster)
n_ret = swap_alloc_cluster(si, swp_entries);
else
n_ret = scan_swap_map_slots(si, SWAP_HAS_CACHE,
n_goal, swp_entries);
spin_unlock(&si->lock);
- if (n_ret || unlikely(cluster))
+ if (n_ret || cluster)
goto check_out;
pr_debug("scan_swap_map of si %d failed to find offset\n",
si->type);
_
Patches currently in -mm which might be from ying.huang@xxxxxxxxx are
mm-thp-swap-delay-splitting-thp-during-swap-out.patch
mm-thp-swap-check-whether-thp-can-be-split-firstly.patch
mm-thp-swap-enable-thp-swap-optimization-only-if-has-compound-map.patch
mm-swap-sort-swap-entries-before-free.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
