Commit 5d317b2b authored by Naoya Horiguchi's avatar Naoya Horiguchi Committed by Linus Torvalds
Browse files

mm: hugetlb: proc: add HugetlbPages field to /proc/PID/status 



Currently there's no easy way to get per-process usage of hugetlb pages,
which is inconvenient because userspace applications which use hugetlb
typically want to control their processes on the basis of how much memory
(including hugetlb) they use.  So this patch simply provides easy access
to the info via /proc/PID/status.

Signed-off-by: default avatarNaoya Horiguchi <n-horiguchi@ah.jp.nec.com>
Acked-by: default avatarJoern Engel <joern@logfs.org>
Acked-by: default avatarDavid Rientjes <rientjes@google.com>
Acked-by: default avatarMichal Hocko <mhocko@suse.com>
Cc: Mike Kravetz <mike.kravetz@oracle.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 25ee01a2

Documentation/filesystems/proc.txt

+2 −0
Original line number Diff line number Diff line
@@ -175,6 +175,7 @@ read the file /proc/PID/status: 
  VmLib:      1412 kB

  VmPTE:        20 kb

  VmSwap:        0 kB

  HugetlbPages:          0 kB

  Threads:        1

  SigQ:   0/28578

  SigPnd: 0000000000000000
@@ -238,6 +239,7 @@ Table 1-2: Contents of the status files (as of 4.1) 
 VmPTE                       size of page table entries

 VmPMD                       size of second level page tables

 VmSwap                      size of swap usage (the number of referred swapents)

 HugetlbPages                size of hugetlb memory portions

 Threads                     number of threads

 SigQ                        number of signals queued/max. number for queue

 SigPnd                      bitmap of pending signals for the thread

fs/proc/task_mmu.c

+1 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ void task_mem(struct seq_file *m, struct mm_struct *mm) 
		ptes >> 10,

		pmds >> 10,

		swap << (PAGE_SHIFT-10));

	hugetlb_report_usage(m, mm);

}



unsigned long task_vsize(struct mm_struct *mm)

include/linux/hugetlb.h

+19 −0
Original line number Diff line number Diff line
@@ -483,6 +483,17 @@ static inline spinlock_t *huge_pte_lockptr(struct hstate *h, 
#define hugepages_supported() (HPAGE_SHIFT != 0)

#endif



void hugetlb_report_usage(struct seq_file *m, struct mm_struct *mm);



static inline void hugetlb_count_add(long l, struct mm_struct *mm)

{

	atomic_long_add(l, &mm->hugetlb_usage);

}



static inline void hugetlb_count_sub(long l, struct mm_struct *mm)

{

	atomic_long_sub(l, &mm->hugetlb_usage);

}

#else	/* CONFIG_HUGETLB_PAGE */

struct hstate {};

#define alloc_huge_page(v, a, r) NULL
@@ -519,6 +530,14 @@ static inline spinlock_t *huge_pte_lockptr(struct hstate *h, 
{

	return &mm->page_table_lock;

}



static inline void hugetlb_report_usage(struct seq_file *f, struct mm_struct *m)

{

}



static inline void hugetlb_count_sub(long l, struct mm_struct *mm)

{

}

#endif	/* CONFIG_HUGETLB_PAGE */



static inline spinlock_t *huge_pte_lock(struct hstate *h,

include/linux/mm_types.h

+3 −0
Original line number Diff line number Diff line
@@ -486,6 +486,9 @@ struct mm_struct { 
	/* address of the bounds directory */

	void __user *bd_addr;

#endif

#ifdef CONFIG_HUGETLB_PAGE

	atomic_long_t hugetlb_usage;

#endif

};



static inline void mm_init_cpumask(struct mm_struct *mm)

mm/hugetlb.c

+9 −0
Original line number Diff line number Diff line
@@ -2790,6 +2790,12 @@ void hugetlb_show_meminfo(void) 
				1UL << (huge_page_order(h) + PAGE_SHIFT - 10));

}



void hugetlb_report_usage(struct seq_file *m, struct mm_struct *mm)

{

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

		   atomic_long_read(&mm->hugetlb_usage) << (PAGE_SHIFT - 10));

}



/* Return the number pages of memory we physically have, in PAGE_SIZE units. */

unsigned long hugetlb_total_pages(void)

{
@@ -3025,6 +3031,7 @@ int copy_hugetlb_page_range(struct mm_struct *dst, struct mm_struct *src, 
			get_page(ptepage);

			page_dup_rmap(ptepage);

			set_huge_pte_at(dst, addr, dst_pte, entry);

			hugetlb_count_add(pages_per_huge_page(h), dst);

		}

		spin_unlock(src_ptl);

		spin_unlock(dst_ptl);
@@ -3105,6 +3112,7 @@ again: 
		if (huge_pte_dirty(pte))

			set_page_dirty(page);



		hugetlb_count_sub(pages_per_huge_page(h), mm);

		page_remove_rmap(page);

		force_flush = !__tlb_remove_page(tlb, page);

		if (force_flush) {
@@ -3509,6 +3517,7 @@ retry: 
				&& (vma->vm_flags & VM_SHARED)));

	set_huge_pte_at(mm, address, ptep, new_pte);



	hugetlb_count_add(pages_per_huge_page(h), mm);

	if ((flags & FAULT_FLAG_WRITE) && !(vma->vm_flags & VM_SHARED)) {

		/* Optimization, do the COW without a second fault */

		ret = hugetlb_cow(mm, vma, address, ptep, new_pte, page, ptl);

CRA Git | Maintained and supported by SUSTech CRA and CCSE