diff mbox series

[37/45] mm/lock: Make mlock_test_walk skip hugetlb vmas

Message ID	20240704043132.28501-38-osalvador@suse.de (mailing list archive)
State	New
Headers	show Return-Path: <owner-linux-mm@kvack.org> From: Oscar Salvador <osalvador@suse.de> To: Andrew Morton <akpm@linux-foundation.org> Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, Peter Xu <peterx@redhat.com>, Muchun Song <muchun.song@linux.dev>, David Hildenbrand <david@redhat.com>, SeongJae Park <sj@kernel.org>, Miaohe Lin <linmiaohe@huawei.com>, Michal Hocko <mhocko@suse.com>, Matthew Wilcox <willy@infradead.org>, Christophe Leroy <christophe.leroy@csgroup.eu>, Oscar Salvador <osalvador@suse.de> Subject: [PATCH 37/45] mm/lock: Make mlock_test_walk skip hugetlb vmas Date: Thu, 4 Jul 2024 06:31:24 +0200 Message-ID: <20240704043132.28501-38-osalvador@suse.de> In-Reply-To: <20240704043132.28501-1-osalvador@suse.de> References: <20240704043132.28501-1-osalvador@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: owner-linux-mm@kvack.org Precedence: bulk
Series	hugetlb pagewalk unification \| expand [00/45] hugetlb pagewalk unification [01/45] arch/x86: Drop own definition of pgd,p4d_leaf [02/45] mm: Add {pmd,pud}_huge_lock helper [03/45] mm/pagewalk: Move vma_pgtable_walk_begin and vma_pgtable_walk_end upfront [04/45] mm/pagewalk: Only call pud_entry when we have a pud leaf [05/45] mm/pagewalk: Enable walk_pmd_range to handle cont-pmds [06/45] mm/pagewalk: Do not try to split non-thp pud or pmd leafs [07/45] arch/s390: Enable __s390_enable_skey_pmd to handle hugetlb vmas [08/45] fs/proc: Enable smaps_pmd_entry to handle PMD-mapped hugetlb vmas [09/45] mm: Implement pud-version functions for swap and vm_normal_page_pud [10/45] fs/proc: Create smaps_pud_range to handle PUD-mapped hugetlb vmas [11/45] fs/proc: Enable smaps_pte_entry to handle cont-pte mapped hugetlb vmas [12/45] fs/proc: Enable pagemap_pmd_range to handle hugetlb vmas [13/45] mm: Implement pud-version uffd functions [14/45] fs/proc: Create pagemap_pud_range to handle PUD-mapped hugetlb vmas [15/45] fs/proc: Adjust pte_to_pagemap_entry for hugetlb vmas [16/45] fs/proc: Enable pagemap_scan_pmd_entry to handle hugetlb vmas [17/45] mm: Implement pud-version for pud_mkinvalid and pudp_establish [18/45] fs/proc: Create pagemap_scan_pud_entry to handle PUD-mapped hugetlb vmas [19/45] fs/proc: Enable gather_pte_stats to handle hugetlb vmas [20/45] fs/proc: Enable gather_pte_stats to handle cont-pte mapped hugetlb vmas [21/45] fs/proc: Create gather_pud_stats to handle PUD-mapped hugetlb pages [22/45] mm/mempolicy: Enable queue_folios_pmd to handle hugetlb vmas [23/45] mm/mempolicy: Create queue_folios_pud to handle PUD-mapped hugetlb vmas [24/45] mm/memory_failure: Enable check_hwpoisoned_pmd_entry to handle hugetlb vmas [25/45] mm/memory-failure: Create check_hwpoisoned_pud_entry to handle PUD-mapped hugetlb vmas [26/45] mm/damon: Enable damon_young_pmd_entry to handle hugetlb vmas [27/45] mm/damon: Create damon_young_pud_entry to handle PUD-mapped hugetlb vmas [28/45] mm/damon: Enable damon_mkold_pmd_entry to handle hugetlb vmas [29/45] mm/damon: Create damon_mkold_pud_entry to handle PUD-mapped hugetlb vmas [30/45] mm,mincore: Enable mincore_pte_range to handle hugetlb vmas [31/45] mm/mincore: Create mincore_pud_range to handle PUD-mapped hugetlb vmas [32/45] mm/hmm: Enable hmm_vma_walk_pmd, to handle hugetlb vmas [33/45] mm/hmm: Enable hmm_vma_walk_pud to handle PUD-mapped hugetlb vmas [34/45] arch/powerpc: Skip hugetlb vmas in subpage_mark_vma_nohuge [35/45] arch/s390: Skip hugetlb vmas in thp_split_mm [36/45] fs/proc: Make clear_refs_test_walk skip hugetlb vmas [37/45] mm/lock: Make mlock_test_walk skip hugetlb vmas [38/45] mm/madvise: Make swapin_test_walk skip hugetlb vmas [39/45] mm/madvise: Make madvise_cold_test_walk skip hugetlb vmas [40/45] mm/madvise: Make madvise_free_test_walk skip hugetlb vmas [41/45] mm/migrate_device: Make migrate_vma_test_walk skip hugetlb vmas [42/45] mm/memcontrol: Make mem_cgroup_move_test_walk skip hugetlb vmas [43/45] mm/memcontrol: Make mem_cgroup_count_test_walk skip hugetlb vmas [44/45] mm/hugetlb_vmemmap: Make vmemmap_test_walk skip hugetlb vmas [45/45] mm: Delete all hugetlb_entry entries

Commit Message

Oscar Salvador July 4, 2024, 4:31 a.m. UTC

Skip hugetlb vmas as we are not interested in those.

Signed-off-by: Oscar Salvador <osalvador@suse.de>
---
 mm/mlock.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff mbox series

Patch

diff --git a/mm/mlock.c b/mm/mlock.c
index 52d6e401ad67..b37079b3505f 100644
--- a/mm/mlock.c
+++ b/mm/mlock.c
@@ -409,6 +409,17 @@  static int mlock_pte_range(pmd_t *pmd, unsigned long addr,
 	return 0;
 }
 
+static int mlock_test_walk(unsigned long start, unsigned long end,
+			   struct mm_walk *walk)
+{
+	struct vm_area_struct *vma = walk->vma;
+
+	if (is_vm_hugetlb_page(vma))
+		return 1;
+
+	return 0;
+}
+
 /*
  * mlock_vma_pages_range() - mlock any pages already in the range,
  *                           or munlock all pages in the range.
@@ -425,6 +436,7 @@  static void mlock_vma_pages_range(struct vm_area_struct *vma,
 {
 	static const struct mm_walk_ops mlock_walk_ops = {
 		.pmd_entry = mlock_pte_range,
+		.test_walk = mlock_test_walk,
 		.walk_lock = PGWALK_WRLOCK_VERIFY,
 	};