mm, vmalloc: iterate vmap_area_list in get_vmalloc_info() (f98782dd) · Commits · 戴 / test

This patch is a preparatory step for removing vmlist entirely. For above purpose, we change iterating a vmap_list codes to iterating a vmap_area_list. It is somewhat trivial change, but just one thing should be noticed. vmlist is lack of information about some areas in vmalloc address space. For example, vm_map_ram() allocate area in vmalloc address space, but it doesn't make a link with vmlist. To provide full information about vmalloc address space is better idea, so we don't use va->vm and use vmap_area directly. This makes get_vmalloc_info() more precise. Signed-off-by:

Joonsoo Kim <js1304@gmail.com> Signed-off-by:

Joonsoo Kim <iamjoonsoo.kim@lge.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: "H. Peter Anvin" <hpa@zytor.com> Cc: Atsushi Kumagai <kumagai-atsushi@mxc.nes.nec.co.jp> Cc: Chris Metcalf <cmetcalf@tilera.com> Cc: Dave Anderson <anderson@redhat.com> Cc: Eric Biederman <ebiederm@xmission.com> Cc: Guan Xuetao <gxt@mprc.pku.edu.cn> Cc: Ingo Molnar <mingo@kernel.org> Cc: Vivek Goyal <vgoyal@redhat.com> Signed-off-by:

Andrew Morton <akpm@linux-foundation.org> Signed-off-by:

Linus Torvalds <torvalds@linux-foundation.org>

mm/vmalloc.c

+30 −26

Original line number	Diff line number	Diff line
		@@ -2671,46 +2671,50 @@ module_init(proc_vmalloc_init);

		void get_vmalloc_info(struct vmalloc_info *vmi)
		{
		struct vm_struct *vma;
		struct vmap_area *va;
		unsigned long free_area_size;
		unsigned long prev_end;

		vmi->used = 0;

		if (!vmlist) {
		vmi->largest_chunk = VMALLOC_TOTAL;
		} else {
		vmi->largest_chunk = 0;

		prev_end = VMALLOC_START;

		read_lock(&vmlist_lock);
		spin_lock(&vmap_area_lock);

		for (vma = vmlist; vma; vma = vma->next) {
		unsigned long addr = (unsigned long) vma->addr;
		if (list_empty(&vmap_area_list)) {
		vmi->largest_chunk = VMALLOC_TOTAL;
		goto out;
		}

		list_for_each_entry(va, &vmap_area_list, list) {
		unsigned long addr = va->va_start;

		/*
		* Some archs keep another range for modules in vmlist
		* Some archs keep another range for modules in vmalloc space
		*/
		if (addr < VMALLOC_START)
		continue;
		if (addr >= VMALLOC_END)
		break;

		vmi->used += vma->size;
		if (va->flags & (VM_LAZY_FREE \| VM_LAZY_FREEING))
		continue;

		vmi->used += (va->va_end - va->va_start);

		free_area_size = addr - prev_end;
		if (vmi->largest_chunk < free_area_size)
		vmi->largest_chunk = free_area_size;

		prev_end = vma->size + addr;
		prev_end = va->va_end;
		}

		if (VMALLOC_END - prev_end > vmi->largest_chunk)
		vmi->largest_chunk = VMALLOC_END - prev_end;

		read_unlock(&vmlist_lock);
		}
		out:
		spin_unlock(&vmap_area_lock);
		}
		#endif

Admin message