The patch titled
Subject: Documentation/filesystems: describe the shared memory usage/accounting
has been added to the -mm tree. Its filename is
documentation-describe-the-shared-memory-usage-accounting.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/documentation-describe-the-shared-memory-usage-accounting.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/documentation-describe-the-shared-memory-usage-accounting.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Rodrigo Freire <rfreire@xxxxxxxxxx>
Subject: Documentation/filesystems: describe the shared memory usage/accounting
The Shared Memory accounting support is present in Kernel since commit
4b02108ac1b3 ("mm: oom analysis: add shmem vmstat") and in userland
free(1) since 2014. This patch updates the Documentation to reflect this
change.
Signed-off-by: Rodrigo Freire <rfreire@xxxxxxxxxx>
Cc: Vlastimil Babka <vbabka@xxxxxxx>
Cc: Hugh Dickins <hughd@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
Documentation/filesystems/proc.txt | 2 ++
Documentation/filesystems/tmpfs.txt | 8 ++++----
2 files changed, 6 insertions(+), 4 deletions(-)
diff -puN Documentation/filesystems/proc.txt~documentation-describe-the-shared-memory-usage-accounting Documentation/filesystems/proc.txt
--- a/Documentation/filesystems/proc.txt~documentation-describe-the-shared-memory-usage-accounting
+++ a/Documentation/filesystems/proc.txt
@@ -855,6 +855,7 @@ Dirty: 968 kB
Writeback: 0 kB
AnonPages: 861800 kB
Mapped: 280372 kB
+Shmem: 644 kB
Slab: 284364 kB
SReclaimable: 159856 kB
SUnreclaim: 124508 kB
@@ -911,6 +912,7 @@ MemAvailable: An estimate of how much me
AnonPages: Non-file backed pages mapped into userspace page tables
AnonHugePages: Non-file backed huge pages mapped into userspace page tables
Mapped: files which have been mmaped, such as libraries
+ Shmem: Total memory used by shared memory (shmem) and tmpfs
Slab: in-kernel data structures cache
SReclaimable: Part of Slab, that might be reclaimed, such as caches
SUnreclaim: Part of Slab, that cannot be reclaimed on memory pressure
diff -puN Documentation/filesystems/tmpfs.txt~documentation-describe-the-shared-memory-usage-accounting Documentation/filesystems/tmpfs.txt
--- a/Documentation/filesystems/tmpfs.txt~documentation-describe-the-shared-memory-usage-accounting
+++ a/Documentation/filesystems/tmpfs.txt
@@ -17,10 +17,10 @@ RAM, where you have to create an ordinar
cannot swap and you do not have the possibility to resize them.
Since tmpfs lives completely in the page cache and on swap, all tmpfs
-pages currently in memory will show up as cached. It will not show up
-as shared or something like that. Further on you can check the actual
-RAM+swap use of a tmpfs instance with df(1) and du(1).
-
+pages will be shown as "Shmem" in /proc/meminfo and "Shared" in
+free(1). Notice that these counters also include shared memory
+(shmem, see ipcs(1)). The most reliable way to get the count is
+using df(1) and du(1).
tmpfs has the following uses:
_
Patches currently in -mm which might be from rfreire@xxxxxxxxxx are
documentation-describe-the-shared-memory-usage-accounting.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
