From 15b48eb602e9aa7cc238e7792f8475945a96a90f Mon Sep 17 00:00:00 2001 From: Kalesh Singh Date: Thu, 17 Jul 2025 16:47:05 -0700 Subject: [PATCH] Revert "ANDROID: 16K: Use vma_area slab cache for pad VMA" This reverts aosp/I24c5f5d0eb3b06acf506f18f5eb57cd497b13d6d. Bug: 440210631 Bug: 432564748 Change-Id: I936ae92313fa32fed80efe1bb35c9b4da0afd8d2 Signed-off-by: Kalesh Singh --- kernel/fork.c | 2 +- mm/pgsize_migration.c | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/kernel/fork.c b/kernel/fork.c index baa208c1e876..3798764cb326 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -439,7 +439,7 @@ struct kmem_cache *files_cachep; struct kmem_cache *fs_cachep; /* SLAB cache for vm_area_struct structures */ -struct kmem_cache *vm_area_cachep; +static struct kmem_cache *vm_area_cachep; /* SLAB cache for mm_struct structures (tsk->mm) */ static struct kmem_cache *mm_cachep; diff --git a/mm/pgsize_migration.c b/mm/pgsize_migration.c index f72240b0de79..3b020924a7a9 100644 --- a/mm/pgsize_migration.c +++ b/mm/pgsize_migration.c @@ -270,9 +270,6 @@ static const struct vm_operations_struct pad_vma_ops = { .name = pad_vma_name, }; -/* Defined in kernel/fork.c */ -extern struct kmem_cache *vm_area_cachep; - /* * Returns a new VMA representing the padding in @vma; * returns NULL if no padding in @vma or allocation failed. @@ -284,7 +281,7 @@ static struct vm_area_struct *get_pad_vma(struct vm_area_struct *vma) if (!is_pgsize_migration_enabled() || !(vma->vm_flags & VM_PAD_MASK)) return NULL; - pad = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL); + pad = kzalloc(sizeof(struct vm_area_struct), GFP_KERNEL); if (!pad) { pr_warn("Page size migration: Failed to allocate padding VMA"); return NULL; @@ -350,7 +347,7 @@ void show_map_pad_vma(struct vm_area_struct *vma, struct seq_file *m, else ((show_pad_maps_fn)func)(m, pad); - kmem_cache_free(vm_area_cachep, pad); + kfree(pad); } /*