diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-11 21:23:28 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-11 21:23:28 -0500 |
commit | 59d53737a8640482995fea13c6e2c0fd016115d6 (patch) | |
tree | 3423eb92315865d76cb8d488513bfef6ab9251d0 /Documentation/filesystems | |
parent | d3f180ea1a44aecba1b0dab2a253428e77f906bf (diff) | |
parent | 8138a67a5557ffea3a21dfd6f037842d4e748513 (diff) |
Merge branch 'akpm' (patches from Andrew)
Merge second set of updates from Andrew Morton:
"More of MM"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (83 commits)
mm/nommu.c: fix arithmetic overflow in __vm_enough_memory()
mm/mmap.c: fix arithmetic overflow in __vm_enough_memory()
vmstat: Reduce time interval to stat update on idle cpu
mm/page_owner.c: remove unnecessary stack_trace field
Documentation/filesystems/proc.txt: describe /proc/<pid>/map_files
mm: incorporate read-only pages into transparent huge pages
vmstat: do not use deferrable delayed work for vmstat_update
mm: more aggressive page stealing for UNMOVABLE allocations
mm: always steal split buddies in fallback allocations
mm: when stealing freepages, also take pages created by splitting buddy page
mincore: apply page table walker on do_mincore()
mm: /proc/pid/clear_refs: avoid split_huge_page()
mm: pagewalk: fix misbehavior of walk_page_range for vma(VM_PFNMAP)
mempolicy: apply page table walker on queue_pages_range()
arch/powerpc/mm/subpage-prot.c: use walk->vma and walk_page_vma()
memcg: cleanup preparation for page table walk
numa_maps: remove numa_maps->vma
numa_maps: fix typo in gather_hugetbl_stats
pagemap: use walk->vma instead of calling find_vma()
clear_refs: remove clear_refs_private->vma and introduce clear_refs_test_walk()
...
Diffstat (limited to 'Documentation/filesystems')
-rw-r--r-- | Documentation/filesystems/proc.txt | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/Documentation/filesystems/proc.txt b/Documentation/filesystems/proc.txt index 79b3cc821e7b..cf8fc2f0b34b 100644 --- a/Documentation/filesystems/proc.txt +++ b/Documentation/filesystems/proc.txt | |||
@@ -42,6 +42,7 @@ Table of Contents | |||
42 | 3.6 /proc/<pid>/comm & /proc/<pid>/task/<tid>/comm | 42 | 3.6 /proc/<pid>/comm & /proc/<pid>/task/<tid>/comm |
43 | 3.7 /proc/<pid>/task/<tid>/children - Information about task children | 43 | 3.7 /proc/<pid>/task/<tid>/children - Information about task children |
44 | 3.8 /proc/<pid>/fdinfo/<fd> - Information about opened file | 44 | 3.8 /proc/<pid>/fdinfo/<fd> - Information about opened file |
45 | 3.9 /proc/<pid>/map_files - Information about memory mapped files | ||
45 | 46 | ||
46 | 4 Configuring procfs | 47 | 4 Configuring procfs |
47 | 4.1 Mount options | 48 | 4.1 Mount options |
@@ -1763,6 +1764,28 @@ pair provide additional information particular to the objects they represent. | |||
1763 | with TIMER_ABSTIME option which will be shown in 'settime flags', but 'it_value' | 1764 | with TIMER_ABSTIME option which will be shown in 'settime flags', but 'it_value' |
1764 | still exhibits timer's remaining time. | 1765 | still exhibits timer's remaining time. |
1765 | 1766 | ||
1767 | 3.9 /proc/<pid>/map_files - Information about memory mapped files | ||
1768 | --------------------------------------------------------------------- | ||
1769 | This directory contains symbolic links which represent memory mapped files | ||
1770 | the process is maintaining. Example output: | ||
1771 | |||
1772 | | lr-------- 1 root root 64 Jan 27 11:24 333c600000-333c620000 -> /usr/lib64/ld-2.18.so | ||
1773 | | lr-------- 1 root root 64 Jan 27 11:24 333c81f000-333c820000 -> /usr/lib64/ld-2.18.so | ||
1774 | | lr-------- 1 root root 64 Jan 27 11:24 333c820000-333c821000 -> /usr/lib64/ld-2.18.so | ||
1775 | | ... | ||
1776 | | lr-------- 1 root root 64 Jan 27 11:24 35d0421000-35d0422000 -> /usr/lib64/libselinux.so.1 | ||
1777 | | lr-------- 1 root root 64 Jan 27 11:24 400000-41a000 -> /usr/bin/ls | ||
1778 | |||
1779 | The name of a link represents the virtual memory bounds of a mapping, i.e. | ||
1780 | vm_area_struct::vm_start-vm_area_struct::vm_end. | ||
1781 | |||
1782 | The main purpose of the map_files is to retrieve a set of memory mapped | ||
1783 | files in a fast way instead of parsing /proc/<pid>/maps or | ||
1784 | /proc/<pid>/smaps, both of which contain many more records. At the same | ||
1785 | time one can open(2) mappings from the listings of two processes and | ||
1786 | comparing their inode numbers to figure out which anonymous memory areas | ||
1787 | are actually shared. | ||
1788 | |||
1766 | ------------------------------------------------------------------------------ | 1789 | ------------------------------------------------------------------------------ |
1767 | Configuring procfs | 1790 | Configuring procfs |
1768 | ------------------------------------------------------------------------------ | 1791 | ------------------------------------------------------------------------------ |