Skip to content

Commit 64b586d

Browse files
Hugh Dickinstorvalds
authored andcommitted
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). Signed-off-by: Hugh Dickins <hughd@google.com> Reviewed-by: Shakeel Butt <shakeelb@google.com> Reviewed-by: Alistair Popple <apopple@nvidia.com> Link: https://lore.kernel.org/lkml/563ce5b2-7a44-5b4d-1dfd-59a0e65932a9@google.com/ Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Jason Gunthorpe <jgg@nvidia.com> Cc: Ralph Campbell <rcampbell@nvidia.com> Cc: Christoph Hellwig <hch@lst.de> Cc: Yang Shi <shy828301@gmail.com> Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent 98f7fdc commit 64b586d

File tree

2 files changed

+2
-7
lines changed

2 files changed

+2
-7
lines changed

mm/huge_memory.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2331,7 +2331,7 @@ static void remap_page(struct page *page, unsigned int nr)
23312331
{
23322332
int i;
23332333

2334-
/* If TTU_SPLIT_FREEZE is ever extended to file, remove this check */
2334+
/* If unmap_page() uses try_to_migrate() on file, remove this check */
23352335
if (!PageAnon(page))
23362336
return;
23372337
if (PageTransHuge(page)) {

mm/rmap.c

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1439,8 +1439,6 @@ static bool try_to_unmap_one(struct page *page, struct vm_area_struct *vma,
14391439
while (page_vma_mapped_walk(&pvmw)) {
14401440
/*
14411441
* If the page is mlock()d, we cannot swap it out.
1442-
* If it's recently referenced (perhaps page_referenced
1443-
* skipped over this mm) then we should reactivate it.
14441442
*/
14451443
if (!(flags & TTU_IGNORE_MLOCK)) {
14461444
if (vma->vm_flags & VM_LOCKED) {
@@ -1687,8 +1685,7 @@ void try_to_unmap(struct page *page, enum ttu_flags flags)
16871685
* @arg: enum ttu_flags will be passed to this argument.
16881686
*
16891687
* If TTU_SPLIT_HUGE_PMD is specified any PMD mappings will be split into PTEs
1690-
* containing migration entries. This and TTU_RMAP_LOCKED are the only supported
1691-
* flags.
1688+
* containing migration entries.
16921689
*/
16931690
static bool try_to_migrate_one(struct page *page, struct vm_area_struct *vma,
16941691
unsigned long address, void *arg)
@@ -1928,8 +1925,6 @@ static bool try_to_migrate_one(struct page *page, struct vm_area_struct *vma,
19281925
*
19291926
* Tries to remove all the page table entries which are mapping this page and
19301927
* replace them with special swap entries. Caller must hold the page lock.
1931-
*
1932-
* If is successful, return true. Otherwise, false.
19331928
*/
19341929
void try_to_migrate(struct page *page, enum ttu_flags flags)
19351930
{

0 commit comments

Comments
 (0)