mm-rmap-add-hugetlb-sanity-checks-for-anon-rmap-handling.patch removed from -mm tree
The quilt patch titled
Subject: mm/rmap: add hugetlb sanity checks for anon rmap handling
has been removed from the -mm tree. Its filename was
mm-rmap-add-hugetlb-sanity-checks-for-anon-rmap-handling.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: David Hildenbrand <[email protected]>
Subject: mm/rmap: add hugetlb sanity checks for anon rmap handling
Date: Wed, 20 Dec 2023 23:44:30 +0100
Let's make sure we end up with the right folios in the right functions when adding an anon rmap, just like we already do in the other rmap functions.
---
mm/rmap.c | 6 ++++++ 1 file changed, 6 insertions(+)
mm/rmap.c renamed from mm/rmap.c~mm-rmap-add-hugetlb-sanity-checks-for-anon-rmap-handling +6 -0
@@ -1262,6 +1262,8 @@ void page_add_anon_rmap(struct page *pagbool compound = flags &RMAP_COMPOUND ;bool first; +VM_WARN_ON_FOLIO (folio_test_hugetlb (folio), folio); +/* Is page being mapped by PTE? Is this its first map to be added? */ if (likely (!compound)) { first =atomic_inc_and_test (&page->_mapcount);
@@ -1343,6 +1345,7 @@ void folio_add_new_anon_rmap(struct foli {int nr =folio_nr_pages (folio); +VM_WARN_ON_FOLIO (folio_test_hugetlb (folio), folio);VM_BUG_ON_VMA (address < vma->vm_start || address + (nr <<PAGE_SHIFT ) > vma->vm_end, vma);__folio_set_swapbacked (folio);
@@ -2634,6 +2637,7 @@ void rmap_walk_locked(struct folio *folivoid hugetlb_add_anon_rmap (struct folio *folio,struct vm_area_struct *vma,unsigned long address,rmap_t flags) { +VM_WARN_ON_FOLIO (!folio_test_hugetlb (folio), folio);VM_WARN_ON_FOLIO (!folio_test_anon (folio), folio);atomic_inc (&folio->_entire_mapcount);
@@ -2646,6 +2650,8 @@ void hugetlb_add_anon_rmap(struct foliovoid hugetlb_add_new_anon_rmap (struct folio *folio,struct vm_area_struct *vma,unsigned long address) { +VM_WARN_ON_FOLIO (!folio_test_hugetlb (folio), folio); +BUG_ON (address < vma->vm_start || address >= vma->vm_end);/* increment count (starts at -1) */ atomic_set (&folio->_entire_mapcount,0 );
_
Patches currently in -mm which might be from [email protected] are