On Tue, 25 May 2021, akpm@xxxxxxxxxxxxxxxxxxxx wrote: > > The patch titled > Subject: mm-thp-check-total_mapcount-instead-of-page_mapcount-fix-fix-fix > has been added to the -mm tree. Its filename is > mm-thp-check-total_mapcount-instead-of-page_mapcount-fix-fix-fix.patch > > This patch should soon appear at > https://ozlabs.org/~akpm/mmots/broken-out/mm-thp-check-total_mapcount-instead-of-page_mapcount-fix-fix-fix.patch > and later at > https://ozlabs.org/~akpm/mmotm/broken-out/mm-thp-check-total_mapcount-instead-of-page_mapcount-fix-fix-fix.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: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> > Subject: mm-thp-check-total_mapcount-instead-of-page_mapcount-fix-fix-fix > > fix the fix > > Cc: Hugh Dickins <hughd@xxxxxxxxxx> > Cc: kernel test robot <lkp@xxxxxxxxx> > Cc: Kirill A. Shutemov <kirill.shutemov@xxxxxxxxxxxxxxx> > Cc: Mike Kravetz <mike.kravetz@xxxxxxxxxx> > Cc: Wang Yugui <wangyugui@xxxxxxxxxxxx> > Cc: Yang Shi <shy828301@xxxxxxxxx> > Cc: Zi Yan <ziy@xxxxxxxxxx> > Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> I think this is the wrong way to go about it: since Yang Shi has a replacement on the way, so it's not worth fix-fix-fixing the original; and since this "fix" implies (I think) that mmotm's series file is ordered with Yang's patch coming after Alistair's nouveau rmap rewrite. Unfortunate timing. But I contend that we are going to want Yang's and my fixes (I've extracted relevant Google fixes into a series against 5.13-rc, that I'm working to post in a few days) go into 5.13-rc and backported to stable releases. You'd be right to point out that they are not fixing any regression new to 5.13: maybe you'll prefer them to wait until 5.14-rc; but even then they will need to be backported. The nouveau rmap reorganization adds another layer of backporting difficulty: I think it's up to me to supply you with the relevant adjustments to Alistair's patches on top of Yang's and mine - but not before I'm satisfied with what I've assembled and posted it. I suggest the right thing to do for the coming mmotm is to back out Yang Shi's mm-thp-check-total_mapcount-instead-of-page_mapcount.patch and its fixes, and give Alistair's nouveau series a spin. But when ready, insert Yang's and my THP fixes ahead of Alistair's series. Thanks, Hugh > --- > > mm/huge_memory.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > --- a/mm/huge_memory.c~mm-thp-check-total_mapcount-instead-of-page_mapcount-fix-fix-fix > +++ a/mm/huge_memory.c > @@ -2352,7 +2352,7 @@ static void unmap_page(struct page *page > VM_BUG_ON_PAGE(!PageHead(page), page); > > if (PageAnon(page)) > - unmap_success = try_to_migrate(page, ttu_flags); > + try_to_migrate(page, ttu_flags); > else > /* > * Don't install migration entries for file backed pages. This > _ > > Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are > > mm-hugetlb-fix-resv_huge_pages-underflow-on-uffdio_copy-fix.patch > mm.patch > mm-slub-kunit-add-a-kunit-test-for-slub-debugging-functionality-fix-2.patch > mm-gup-pack-has_pinned-in-mmf_has_pinned-checkpatch-fixes.patch > mm-memcg-optimize-user-context-object-stock-access-checkpatch-fixes.patch > mm-memcg-slab-create-a-new-set-of-kmalloc-cg-n-caches-v5-fix.patch > binfmt-remove-in-tree-usage-of-map_executable-fix.patch > mm-mmap-introduce-unlock_range-for-code-cleanup-fix.patch > powerpc-mm-book3s64-update-tlb-flush-routines-to-take-a-page-walk-cache-flush-argument-fix.patch > mm-mremap-use-range-flush-that-does-tlb-and-page-walk-cache-flush-fix.patch > mm-memory-failure-use-a-mutex-to-avoid-memory_failure-races-fix.patch > mm-memory_hotplug-disable-memmap_on_memory-when-hugetlb_free_vmemmap-enabled-fix.patch > mm-userfaultfd-fix-uffd-wp-special-cases-for-fork-fix.patch > mm-thp-check-total_mapcount-instead-of-page_mapcount-fix-fix.patch > mm-thp-check-total_mapcount-instead-of-page_mapcount-fix-fix-fix.patch > nommu-remove-__gfp_highmem-in-vmalloc-vzalloc-checkpatch-fixes.patch > mm-madvise-introduce-madv_populate_readwrite-to-prefault-page-tables-checkpatch-fixes.patch > kernelh-split-out-panic-and-oops-helpers-fix.patch > lib-math-rational-add-kunit-test-cases-fix.patch > lib-decompressors-remove-set-but-not-used-variabled-level-fix.patch > linux-next-pre.patch > linux-next-post.patch > mm-introduce-memfd_secret-system-call-to-create-secret-memory-areas-fix.patch > module-add-printk-formats-to-add-module-build-id-to-stacktraces-fix.patch > module-add-printk-formats-to-add-module-build-id-to-stacktraces-fix-fix.patch > kernel-forkc-export-kernel_thread-to-modules.patch
