On Wed, Jun 26, 2024 at 5:55 AM Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> wrote: > > > The patch titled > Subject: hack > has been added to the -mm mm-unstable branch. Its filename is > hack.patch > > This patch will shortly appear at > https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/hack.patch > > This patch will later appear in the mm-unstable branch at > git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm > > 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 via the mm-everything > branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm > and is updated there every 2-3 working days > > ------------------------------------------------------ > From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> > Subject: hack > Date: Tue Jun 25 02:51:36 PM PDT 2024 > > um, Lance? LGTM. I think this patch has fixed the bug[1] introduced by me. [1] https://lore.kernel.org/all/20240622100057.3352-1-ioworker0@xxxxxxxxx/T/#u Reported-by: kernel test robot <lkp@xxxxxxxxx> Closes: https://lore.kernel.org/oe-kbuild-all/202406260514.SLhNM9kQ-lkp@xxxxxxxxx/ Thanks again for stepping in to help! Lance > > Cc: Lance Yang <ioworker0@xxxxxxxxx> > Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> > --- > > mm/huge_memory.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > --- a/mm/huge_memory.c~hack > +++ a/mm/huge_memory.c > @@ -2696,7 +2696,6 @@ static bool __discard_anon_folio_pmd_loc > struct mm_struct *mm = vma->vm_mm; > int ref_count, map_count; > pmd_t orig_pmd = *pmdp; > - struct page *page; > > if (folio_test_dirty(folio) || pmd_dirty(orig_pmd)) > return false; > @@ -2732,7 +2731,7 @@ static bool __discard_anon_folio_pmd_loc > return false; > } > > - folio_remove_rmap_pmd(folio, page, vma); > + folio_remove_rmap_pmd(folio, pmd_page(orig_pmd), vma); > zap_deposited_table(mm, pmdp); > add_mm_counter(mm, MM_ANONPAGES, -HPAGE_PMD_NR); > if (vma->vm_flags & VM_LOCKED) > _ > > Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are > > hack.patch > mm-allow-reuse-of-the-lower-16-bit-of-the-page-type-with-an-actual-type-fix.patch > mm-extend-rmap-flags-arguments-for-folio_add_new_anon_rmap-fix.patch > mm-use-folio_add_new_anon_rmap-if-folio_test_anonfolio==false-fix.patch > tools-mm-introduce-a-tool-to-assess-swap-entry-allocation-for-thp_swapout-fix.patch >
