Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ab50b8ed authored by Hugh Dickins's avatar Hugh Dickins Committed by Linus Torvalds
Browse files

[PATCH] mm: vm_stat_account unshackled 



The original vm_stat_account has fallen into disuse, with only one user, and
only one user of vm_stat_unaccount.  It's easier to keep track if we convert
them all to __vm_stat_account, then free it from its __shackles.

Signed-off-by: default avatarHugh Dickins <hugh@veritas.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 72866f6f

arch/ia64/kernel/perfmon.c

+2 −1
Original line number Diff line number Diff line
@@ -2352,7 +2352,8 @@ pfm_smpl_buffer_alloc(struct task_struct *task, pfm_context_t *ctx, unsigned lon 
	insert_vm_struct(mm, vma);



	mm->total_vm  += size >> PAGE_SHIFT;

	vm_stat_account(vma);

	vm_stat_account(vma->vm_mm, vma->vm_flags, vma->vm_file,

							vma_pages(vma));

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



	/*

arch/ia64/mm/fault.c

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ expand_backing_store (struct vm_area_struct *vma, unsigned long address) 
	vma->vm_mm->total_vm += grow;

	if (vma->vm_flags & VM_LOCKED)

		vma->vm_mm->locked_vm += grow;

	__vm_stat_account(vma->vm_mm, vma->vm_flags, vma->vm_file, grow);

	vm_stat_account(vma->vm_mm, vma->vm_flags, vma->vm_file, grow);

	return 0;

}

include/linux/mm.h

+2 −14
Original line number Diff line number Diff line
@@ -928,26 +928,14 @@ int remap_pfn_range(struct vm_area_struct *, unsigned long, 
		unsigned long, unsigned long, pgprot_t);



#ifdef CONFIG_PROC_FS

void __vm_stat_account(struct mm_struct *, unsigned long, struct file *, long);

void vm_stat_account(struct mm_struct *, unsigned long, struct file *, long);

#else

static inline void __vm_stat_account(struct mm_struct *mm,

static inline void vm_stat_account(struct mm_struct *mm,

			unsigned long flags, struct file *file, long pages)

{

}

#endif /* CONFIG_PROC_FS */



static inline void vm_stat_account(struct vm_area_struct *vma)

{

	__vm_stat_account(vma->vm_mm, vma->vm_flags, vma->vm_file,

							vma_pages(vma));

}



static inline void vm_stat_unaccount(struct vm_area_struct *vma)

{

	__vm_stat_account(vma->vm_mm, vma->vm_flags, vma->vm_file,

							-vma_pages(vma));

}



/* update per process rss and vm hiwater data */

extern void update_mem_hiwater(struct task_struct *tsk);

kernel/fork.c

+1 −1
Original line number Diff line number Diff line
@@ -212,7 +212,7 @@ static inline int dup_mmap(struct mm_struct * mm, struct mm_struct * oldmm) 
		if (mpnt->vm_flags & VM_DONTCOPY) {

			long pages = vma_pages(mpnt);

			mm->total_vm -= pages;

			__vm_stat_account(mm, mpnt->vm_flags, mpnt->vm_file,

			vm_stat_account(mm, mpnt->vm_flags, mpnt->vm_file,

								-pages);

			continue;

		}

mm/mmap.c

+10 −10
Original line number Diff line number Diff line
@@ -832,7 +832,7 @@ none: 
}



#ifdef CONFIG_PROC_FS

void __vm_stat_account(struct mm_struct *mm, unsigned long flags,

void vm_stat_account(struct mm_struct *mm, unsigned long flags,

						struct file *file, long pages)

{

	const unsigned long stack_flags
@@ -1110,7 +1110,7 @@ munmap_back: 
	}

out:	

	mm->total_vm += len >> PAGE_SHIFT;

	__vm_stat_account(mm, vm_flags, file, len >> PAGE_SHIFT);

	vm_stat_account(mm, vm_flags, file, len >> PAGE_SHIFT);

	if (vm_flags & VM_LOCKED) {

		mm->locked_vm += len >> PAGE_SHIFT;

		make_pages_present(addr, addr + len);
@@ -1475,7 +1475,7 @@ static int acct_stack_growth(struct vm_area_struct * vma, unsigned long size, un 
	mm->total_vm += grow;

	if (vma->vm_flags & VM_LOCKED)

		mm->locked_vm += grow;

	__vm_stat_account(mm, vma->vm_flags, vma->vm_file, grow);

	vm_stat_account(mm, vma->vm_flags, vma->vm_file, grow);

	return 0;

}
@@ -1610,15 +1610,15 @@ find_extend_vma(struct mm_struct * mm, unsigned long addr) 
 * By the time this function is called, the area struct has been

 * removed from the process mapping list.

 */

static void unmap_vma(struct mm_struct *mm, struct vm_area_struct *area)

static void unmap_vma(struct mm_struct *mm, struct vm_area_struct *vma)

{

	size_t len = area->vm_end - area->vm_start;

	long nrpages = vma_pages(vma);



	area->vm_mm->total_vm -= len >> PAGE_SHIFT;

	if (area->vm_flags & VM_LOCKED)

		area->vm_mm->locked_vm -= len >> PAGE_SHIFT;

	vm_stat_unaccount(area);

	remove_vm_struct(area);

	mm->total_vm -= nrpages;

	if (vma->vm_flags & VM_LOCKED)

		mm->locked_vm -= nrpages;

	vm_stat_account(mm, vma->vm_flags, vma->vm_file, -nrpages);

	remove_vm_struct(vma);

}



/*