Commit 3928d4f5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

mm: use helper functions for allocating and freeing vm_area structs 



The vm_area_struct is one of the most fundamental memory management
objects, but the management of it is entirely open-coded evertwhere,
ranging from allocation and freeing (using kmem_cache_[z]alloc and
kmem_cache_free) to initializing all the fields.

We want to unify this in order to end up having some unified
initialization of the vmas, and the first step to this is to at least
have basic allocation functions.

Right now those functions are literally just wrappers around the
kmem_cache_*() calls.  This is a purely mechanical conversion:

    # new vma:
    kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL) -> vm_area_alloc()

    # copy old vma
    kmem_cache_alloc(vm_area_cachep, GFP_KERNEL) -> vm_area_dup(old)

    # free vma
    kmem_cache_free(vm_area_cachep, vma) -> vm_area_free(vma)

to the point where the old vma passed in to the vm_area_dup() function
isn't even used yet (because I've left all the old manual initialization
alone).

Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 191a3afa

arch/ia64/kernel/perfmon.c

+2 −2
Original line number Diff line number Diff line
@@ -2278,7 +2278,7 @@ pfm_smpl_buffer_alloc(struct task_struct *task, struct file *filp, pfm_context_t 
	DPRINT(("smpl_buf @%p\n", smpl_buf));



	/* allocate vma */

	vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);

	vma = vm_area_alloc();

	if (!vma) {

		DPRINT(("Cannot allocate vma\n"));

		goto error_kmem;
@@ -2346,7 +2346,7 @@ pfm_smpl_buffer_alloc(struct task_struct *task, struct file *filp, pfm_context_t 
	return 0;



error:

	kmem_cache_free(vm_area_cachep, vma);

	vm_area_free(vma);

error_kmem:

	pfm_rvfree(smpl_buf, size);

arch/ia64/mm/init.c

+4 −4
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ ia64_init_addr_space (void) 
	 * the problem.  When the process attempts to write to the register backing store

	 * for the first time, it will get a SEGFAULT in this case.

	 */

	vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);

	vma = vm_area_alloc();

	if (vma) {

		INIT_LIST_HEAD(&vma->anon_vma_chain);

		vma->vm_mm = current->mm;
@@ -125,7 +125,7 @@ ia64_init_addr_space (void) 
		down_write(&current->mm->mmap_sem);

		if (insert_vm_struct(current->mm, vma)) {

			up_write(&current->mm->mmap_sem);

			kmem_cache_free(vm_area_cachep, vma);

			vm_area_free(vma);

			return;

		}

		up_write(&current->mm->mmap_sem);
@@ -133,7 +133,7 @@ ia64_init_addr_space (void) 


	/* map NaT-page at address zero to speed up speculative dereferencing of NULL: */

	if (!(current->personality & MMAP_PAGE_ZERO)) {

		vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);

		vma = vm_area_alloc();

		if (vma) {

			INIT_LIST_HEAD(&vma->anon_vma_chain);

			vma->vm_mm = current->mm;
@@ -144,7 +144,7 @@ ia64_init_addr_space (void) 
			down_write(&current->mm->mmap_sem);

			if (insert_vm_struct(current->mm, vma)) {

				up_write(&current->mm->mmap_sem);

				kmem_cache_free(vm_area_cachep, vma);

				vm_area_free(vma);

				return;

			}

			up_write(&current->mm->mmap_sem);

fs/exec.c

+2 −2
Original line number Diff line number Diff line
@@ -290,7 +290,7 @@ static int __bprm_mm_init(struct linux_binprm *bprm) 
	struct vm_area_struct *vma = NULL;

	struct mm_struct *mm = bprm->mm;



	bprm->vma = vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);

	bprm->vma = vma = vm_area_alloc();

	if (!vma)

		return -ENOMEM;
@@ -326,7 +326,7 @@ err: 
	up_write(&mm->mmap_sem);

err_free:

	bprm->vma = NULL;

	kmem_cache_free(vm_area_cachep, vma);

	vm_area_free(vma);

	return err;

}

include/linux/mm.h

+3 −1
Original line number Diff line number Diff line
@@ -155,7 +155,9 @@ extern int overcommit_kbytes_handler(struct ctl_table *, int, void __user *, 
 * mmap() functions).

 */



extern struct kmem_cache *vm_area_cachep;

struct vm_area_struct *vm_area_alloc(void);

struct vm_area_struct *vm_area_dup(struct vm_area_struct *);

void vm_area_free(struct vm_area_struct *);



#ifndef CONFIG_MMU

extern struct rb_root nommu_region_tree;

kernel/fork.c

+18 −3
Original line number Diff line number Diff line
@@ -303,11 +303,26 @@ 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;



struct vm_area_struct *vm_area_alloc(void)

{

	return kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);

}



struct vm_area_struct *vm_area_dup(struct vm_area_struct *orig)

{

	return kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);

}



void vm_area_free(struct vm_area_struct *vma)

{

	kmem_cache_free(vm_area_cachep, vma);

}



static void account_kernel_stack(struct task_struct *tsk, int account)

{

	void *stack = task_stack_page(tsk);
@@ -455,7 +470,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm, 
				goto fail_nomem;

			charge = len;

		}

		tmp = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);

		tmp = vm_area_dup(mpnt);

		if (!tmp)

			goto fail_nomem;

		*tmp = *mpnt;
@@ -539,7 +554,7 @@ fail_uprobe_end: 
fail_nomem_anon_vma_fork:

	mpol_put(vma_policy(tmp));

fail_nomem_policy:

	kmem_cache_free(vm_area_cachep, tmp);

	vm_area_free(tmp);

fail_nomem:

	retval = -ENOMEM;

	vm_unacct_memory(charge);

CRA Git | Maintained and supported by SUSTech CRA and CCSE