Merge tag 'thermal-6.6-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

[tomoyo/tomoyo-test1.git] / mm / madvise.c

diff --git a/mm/madvise.c b/mm/madvise.c
index ec30f48..4dded5d 100644 (file)
--- a/mm/madvise.c
+++ b/mm/madvise.c
@@ -173,9 +173,8 @@ static int madvise_update_vma(struct vm_area_struct *vma,
        }
 
 success:
-       /*
-        * vm_flags is protected by the mmap_lock held in write mode.
-        */
+       /* vm_flags is protected by the mmap_lock held in write mode. */
+       vma_start_write(vma);
        vm_flags_reset(vma, new_flags);
        if (!vma->vm_file || vma_is_anon_shmem(vma)) {
                error = replace_anon_vma_name(vma, anon_name);
@@ -218,7 +217,7 @@ static int swapin_walk_pmd_entry(pmd_t *pmd, unsigned long start,
                ptep = NULL;
 
                page = read_swap_cache_async(entry, GFP_HIGHUSER_MOVABLE,
-                                            vma, addr, false, &splug);
+                                            vma, addr, &splug);
                if (page)
                        put_page(page);
        }
@@ -263,7 +262,7 @@ static void shmem_swapin_range(struct vm_area_struct *vma,
                rcu_read_unlock();
 
                page = read_swap_cache_async(entry, mapping_gfp_mask(mapping),
-                                            vma, addr, false, &splug);
+                                            vma, addr, &splug);
                if (page)
                        put_page(page);
 
@@ -414,6 +413,8 @@ static int madvise_cold_or_pageout_pte_range(pmd_t *pmd,
 
                folio_clear_referenced(folio);
                folio_test_clear_young(folio);
+               if (folio_test_active(folio))
+                       folio_set_workingset(folio);
                if (pageout) {
                        if (folio_isolate_lru(folio)) {
                                if (folio_test_unevictable(folio))
@@ -511,6 +512,8 @@ regular_folio:
                 */
                folio_clear_referenced(folio);
                folio_test_clear_young(folio);
+               if (folio_test_active(folio))
+                       folio_set_workingset(folio);
                if (pageout) {
                        if (folio_isolate_lru(folio)) {
                                if (folio_test_unevictable(folio))
@@ -662,7 +665,7 @@ static int madvise_free_pte_range(pmd_t *pmd, unsigned long addr,
                                free_swap_and_cache(entry);
                                pte_clear_not_present_full(mm, addr, pte, tlb->fullmm);
                        } else if (is_hwpoison_entry(entry) ||
-                                  is_swapin_error_entry(entry)) {
+                                  is_poisoned_swp_entry(entry)) {
                                pte_clear_not_present_full(mm, addr, pte, tlb->fullmm);
                        }
                        continue;