Subject: + mm-make-try_to_unmap_one-static-and-cleanup-ttu_flags.patch added to -mm tree
To: koct9i@xxxxxxxxx,riel@xxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Thu, 29 May 2014 13:16:00 -0700
The patch titled
Subject: mm/rmap.c: cleanup ttu_flags
has been added to the -mm tree. Its filename is
mm-make-try_to_unmap_one-static-and-cleanup-ttu_flags.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/mm-make-try_to_unmap_one-static-and-cleanup-ttu_flags.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/mm-make-try_to_unmap_one-static-and-cleanup-ttu_flags.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/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Konstantin Khlebnikov <koct9i@xxxxxxxxx>
Subject: mm/rmap.c: cleanup ttu_flags
Transform action part of ttu_flags into individiual bits. These flags
aren't part of any uses-space visible api or even trace events.
Signed-off-by: Konstantin Khlebnikov <koct9i@xxxxxxxxx>
Cc: Rik van Riel <riel@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/rmap.h | 7 +++----
mm/rmap.c | 10 +++++-----
2 files changed, 8 insertions(+), 9 deletions(-)
diff -puN include/linux/rmap.h~mm-make-try_to_unmap_one-static-and-cleanup-ttu_flags include/linux/rmap.h
--- a/include/linux/rmap.h~mm-make-try_to_unmap_one-static-and-cleanup-ttu_flags
+++ a/include/linux/rmap.h
@@ -72,10 +72,9 @@ struct anon_vma_chain {
};
enum ttu_flags {
- TTU_UNMAP = 0, /* unmap mode */
- TTU_MIGRATION = 1, /* migration mode */
- TTU_MUNLOCK = 2, /* munlock mode */
- TTU_ACTION_MASK = 0xff,
+ TTU_UNMAP = 1, /* unmap mode */
+ TTU_MIGRATION = 2, /* migration mode */
+ TTU_MUNLOCK = 4, /* munlock mode */
TTU_IGNORE_MLOCK = (1 << 8), /* ignore mlock */
TTU_IGNORE_ACCESS = (1 << 9), /* don't age */
diff -puN mm/rmap.c~mm-make-try_to_unmap_one-static-and-cleanup-ttu_flags mm/rmap.c
--- a/mm/rmap.c~mm-make-try_to_unmap_one-static-and-cleanup-ttu_flags
+++ a/mm/rmap.c
@@ -1156,7 +1156,7 @@ static int try_to_unmap_one(struct page
if (vma->vm_flags & VM_LOCKED)
goto out_mlock;
- if (TTU_ACTION(flags) == TTU_MUNLOCK)
+ if (flags & TTU_MUNLOCK)
goto out_unmap;
}
if (!(flags & TTU_IGNORE_ACCESS)) {
@@ -1224,7 +1224,7 @@ static int try_to_unmap_one(struct page
* pte. do_swap_page() will wait until the migration
* pte is removed and then restart fault handling.
*/
- BUG_ON(TTU_ACTION(flags) != TTU_MIGRATION);
+ BUG_ON(!(flags & TTU_MIGRATION));
entry = make_migration_entry(page, pte_write(pteval));
}
swp_pte = swp_entry_to_pte(entry);
@@ -1233,7 +1233,7 @@ static int try_to_unmap_one(struct page
set_pte_at(mm, address, pte, swp_pte);
BUG_ON(pte_file(*pte));
} else if (IS_ENABLED(CONFIG_MIGRATION) &&
- (TTU_ACTION(flags) == TTU_MIGRATION)) {
+ (flags & TTU_MIGRATION)) {
/* Establish migration entry for a file page */
swp_entry_t entry;
entry = make_migration_entry(page, pte_write(pteval));
@@ -1246,7 +1246,7 @@ static int try_to_unmap_one(struct page
out_unmap:
pte_unmap_unlock(pte, ptl);
- if (ret != SWAP_FAIL && TTU_ACTION(flags) != TTU_MUNLOCK)
+ if (ret != SWAP_FAIL && !(flags & TTU_MUNLOCK))
mmu_notifier_invalidate_page(mm, address);
out:
return ret;
@@ -1533,7 +1533,7 @@ int try_to_unmap(struct page *page, enum
* locking requirements of exec(), migration skips
* temporary VMAs until after exec() completes.
*/
- if (flags & TTU_MIGRATION && !PageKsm(page) && PageAnon(page))
+ if ((flags & TTU_MIGRATION) && !PageKsm(page) && PageAnon(page))
rwc.invalid_vma = invalid_migration_vma;
ret = rmap_walk(page, &rwc);
_
Patches currently in -mm which might be from koct9i@xxxxxxxxx are
tools-vm-page-typesc-catch-sigbus-if-raced-with-truncate.patch
mm-process_vm_access-move-config-option-into-init-kconfig.patch
mm-dont-call-mmu_notifier_invalidate_page-during-munlock.patch
mm-make-try_to_unmap_one-static-and-cleanup-ttu_flags.patch
linux-next.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
