The patch titled
Subject: mm/rmap: fix comments left over from recent changes
has been added to the -mm tree. Its filename is
mm-rmap-fix-comments-left-over-from-recent-changes.patch
This patch should soon appear at
https://ozlabs.org/~akpm/mmots/broken-out/mm-rmap-fix-comments-left-over-from-recent-changes.patch
and later at
https://ozlabs.org/~akpm/mmotm/broken-out/mm-rmap-fix-comments-left-over-from-recent-changes.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: Hugh Dickins <hughd@xxxxxxxxxx>
Subject: mm/rmap: fix comments left over from recent changes
Parallel developments in mm/rmap.c have left behind some out-of-date
comments: try_to_migrate_one() also accepts TTU_SYNC (already commented in
try_to_migrate() itself), and try_to_migrate() returns nothing at all.
TTU_SPLIT_FREEZE has just been deleted, so reword the comment about it in
mm/huge_memory.c; and TTU_IGNORE_ACCESS was removed in 5.11, so delete the
"recently referenced" comment from try_to_unmap_one() (once upon a time
the comment was near the removed codeblock, but they drifted apart).
Link: https://lkml.kernel.org/r/563ce5b2-7a44-5b4d-1dfd-59a0e65932a9@xxxxxxxxxx
Signed-off-by: Hugh Dickins <hughd@xxxxxxxxxx>
Reviewed-by: Shakeel Butt <shakeelb@xxxxxxxxxx>
Reviewed-by: Alistair Popple <apopple@xxxxxxxxxx>
Cc: Yang Shi <shy828301@xxxxxxxxx>
Cc: Jason Gunthorpe <jgg@xxxxxxxxxx>
Cc: Ralph Campbell <rcampbell@xxxxxxxxxx>
Cc: Christoph Hellwig <hch@xxxxxx>
Cc: "Kirill A. Shutemov" <kirill.shutemov@xxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/huge_memory.c | 2 +-
mm/rmap.c | 7 +------
2 files changed, 2 insertions(+), 7 deletions(-)
--- a/mm/huge_memory.c~mm-rmap-fix-comments-left-over-from-recent-changes
+++ a/mm/huge_memory.c
@@ -2331,7 +2331,7 @@ static void remap_page(struct page *page
{
int i;
- /* If TTU_SPLIT_FREEZE is ever extended to file, remove this check */
+ /* If unmap_page() uses try_to_migrate() on file, remove this check */
if (!PageAnon(page))
return;
if (PageTransHuge(page)) {
--- a/mm/rmap.c~mm-rmap-fix-comments-left-over-from-recent-changes
+++ a/mm/rmap.c
@@ -1439,8 +1439,6 @@ static bool try_to_unmap_one(struct page
while (page_vma_mapped_walk(&pvmw)) {
/*
* If the page is mlock()d, we cannot swap it out.
- * If it's recently referenced (perhaps page_referenced
- * skipped over this mm) then we should reactivate it.
*/
if (!(flags & TTU_IGNORE_MLOCK)) {
if (vma->vm_flags & VM_LOCKED) {
@@ -1687,8 +1685,7 @@ void try_to_unmap(struct page *page, enu
* @arg: enum ttu_flags will be passed to this argument.
*
* If TTU_SPLIT_HUGE_PMD is specified any PMD mappings will be split into PTEs
- * containing migration entries. This and TTU_RMAP_LOCKED are the only supported
- * flags.
+ * containing migration entries.
*/
static bool try_to_migrate_one(struct page *page, struct vm_area_struct *vma,
unsigned long address, void *arg)
@@ -1928,8 +1925,6 @@ static bool try_to_migrate_one(struct pa
*
* Tries to remove all the page table entries which are mapping this page and
* replace them with special swap entries. Caller must hold the page lock.
- *
- * If is successful, return true. Otherwise, false.
*/
void try_to_migrate(struct page *page, enum ttu_flags flags)
{
_
Patches currently in -mm which might be from hughd@xxxxxxxxxx are
mm-rmap-fix-comments-left-over-from-recent-changes.patch
mm-rmap-fix-old-bug-munlocking-thp-missed-other-mlocks.patch
mm-rmap-fix-new-bug-premature-return-from-page_mlock_one.patch
mm-rmap-try_to_migrate-skip-zone_device-device_private.patch
fs-mm-fix-race-in-unlinking-swapfile.patch
