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

Commit 58d8e26b authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mm: show number of vmalloc pages in /proc/meminfo"

parents 5dc9b0b9 fd7f993e

fs/proc/meminfo.c

+1 −1
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v) 
	show_val_kb(m, "Committed_AS:   ", committed);

	seq_printf(m, "VmallocTotal:   %8lu kB\n",

		   (unsigned long)VMALLOC_TOTAL >> 10);

	show_val_kb(m, "VmallocUsed:    ", 0ul);

	show_val_kb(m, "VmallocUsed:    ", vmalloc_nr_pages());

	show_val_kb(m, "VmallocChunk:   ", 0ul);



#ifdef CONFIG_MEMORY_FAILURE

include/linux/vmalloc.h

+2 −0
Original line number Diff line number Diff line
@@ -62,10 +62,12 @@ extern void vm_unmap_aliases(void); 


#ifdef CONFIG_MMU

extern void __init vmalloc_init(void);

extern unsigned long vmalloc_nr_pages(void);

#else

static inline void vmalloc_init(void)

{

}

static inline unsigned long vmalloc_nr_pages(void) { return 0; }

#endif



extern void *vmalloc(unsigned long size);

mm/vmalloc.c

+10 −0
Original line number Diff line number Diff line
@@ -340,6 +340,13 @@ static unsigned long cached_align; 


static unsigned long vmap_area_pcpu_hole;



static atomic_long_t nr_vmalloc_pages;



unsigned long vmalloc_nr_pages(void)

{

	return atomic_long_read(&nr_vmalloc_pages);

}



static struct vmap_area *__find_vmap_area(unsigned long addr)

{

	struct rb_node *n = vmap_area_root.rb_node;
@@ -1539,6 +1546,7 @@ static void __vunmap(const void *addr, int deallocate_pages) 
			BUG_ON(!page);

			__free_pages(page, 0);

		}

		atomic_long_sub(area->nr_pages, &nr_vmalloc_pages);



		kvfree(area->pages);

	}
@@ -1704,12 +1712,14 @@ static void *__vmalloc_area_node(struct vm_struct *area, gfp_t gfp_mask, 
		if (unlikely(!page)) {

			/* Successfully allocated i pages, free them in __vunmap() */

			area->nr_pages = i;

			atomic_long_add(area->nr_pages, &nr_vmalloc_pages);

			goto fail;

		}

		area->pages[i] = page;

		if (gfpflags_allow_blocking(gfp_mask|highmem_mask))

			cond_resched();

	}

	atomic_long_add(area->nr_pages, &nr_vmalloc_pages);



	if (map_vm_area(area, prot, pages))

		goto fail;