License cleanup: add SPDX GPL-2.0 license identifier to files with no license
Many source files in the tree are missing licensing information, which
makes it harder for compliance tools to determine the correct license.
By default all files without license information are under the default
license of the kernel, which is GPL version 2.
Update the files which contain no license information with the 'GPL-2.0'
SPDX license identifier. The SPDX identifier is a legally binding
shorthand, which can be used instead of the full boiler plate text.
This patch is based on work done by Thomas Gleixner and Kate Stewart and
Philippe Ombredanne.
How this work was done:
Patches were generated and checked against linux-4.14-rc6 for a subset of
the use cases:
- file had no licensing information it it.
- file was a */uapi/* one with no licensing information in it,
- file was a */uapi/* one with existing licensing information,
Further patches will be generated in subsequent months to fix up cases
where non-standard license headers were used, and references to license
had to be inferred by heuristics based on keywords.
The analysis to determine which SPDX License Identifier to be applied to
a file was done in a spreadsheet of side by side results from of the
output of two independent scanners (ScanCode & Windriver) producing SPDX
tag:value files created by Philippe Ombredanne. Philippe prepared the
base worksheet, and did an initial spot review of a few 1000 files.
The 4.13 kernel was the starting point of the analysis with 60,537 files
assessed. Kate Stewart did a file by file comparison of the scanner
results in the spreadsheet to determine which SPDX license identifier(s)
to be applied to the file. She confirmed any determination that was not
immediately clear with lawyers working with the Linux Foundation.
Criteria used to select files for SPDX license identifier tagging was:
- Files considered eligible had to be source code files.
- Make and config files were included as candidates if they contained >5
lines of source
- File already had some variant of a license header in it (even if <5
lines).
All documentation files were explicitly excluded.
The following heuristics were used to determine which SPDX license
identifiers to apply.
- when both scanners couldn't find any license traces, file was
considered to have no license information in it, and the top level
COPYING file license applied.
For non */uapi/* files that summary was:
SPDX license identifier # files
---------------------------------------------------|-------
GPL-2.0 11139
and resulted in the first patch in this series.
If that file was a */uapi/* path one, it was "GPL-2.0 WITH
Linux-syscall-note" otherwise it was "GPL-2.0". Results of that was:
SPDX license identifier # files
---------------------------------------------------|-------
GPL-2.0 WITH Linux-syscall-note 930
and resulted in the second patch in this series.
- if a file had some form of licensing information in it, and was one
of the */uapi/* ones, it was denoted with the Linux-syscall-note if
any GPL family license was found in the file or had no licensing in
it (per prior point). Results summary:
SPDX license identifier # files
---------------------------------------------------|------
GPL-2.0 WITH Linux-syscall-note 270
GPL-2.0+ WITH Linux-syscall-note 169
((GPL-2.0 WITH Linux-syscall-note) OR BSD-2-Clause) 21
((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) 17
LGPL-2.1+ WITH Linux-syscall-note 15
GPL-1.0+ WITH Linux-syscall-note 14
((GPL-2.0+ WITH Linux-syscall-note) OR BSD-3-Clause) 5
LGPL-2.0+ WITH Linux-syscall-note 4
LGPL-2.1 WITH Linux-syscall-note 3
((GPL-2.0 WITH Linux-syscall-note) OR MIT) 3
((GPL-2.0 WITH Linux-syscall-note) AND MIT) 1
and that resulted in the third patch in this series.
- when the two scanners agreed on the detected license(s), that became
the concluded license(s).
- when there was disagreement between the two scanners (one detected a
license but the other didn't, or they both detected different
licenses) a manual inspection of the file occurred.
- In most cases a manual inspection of the information in the file
resulted in a clear resolution of the license that should apply (and
which scanner probably needed to revisit its heuristics).
- When it was not immediately clear, the license identifier was
confirmed with lawyers working with the Linux Foundation.
- If there was any question as to the appropriate license identifier,
the file was flagged for further research and to be revisited later
in time.
In total, over 70 hours of logged manual review was done on the
spreadsheet to determine the SPDX license identifiers to apply to the
source files by Kate, Philippe, Thomas and, in some cases, confirmation
by lawyers working with the Linux Foundation.
Kate also obtained a third independent scan of the 4.13 code base from
FOSSology, and compared selected files where the other two scanners
disagreed against that SPDX file, to see if there was new insights. The
Windriver scanner is based on an older version of FOSSology in part, so
they are related.
Thomas did random spot checks in about 500 files from the spreadsheets
for the uapi headers and agreed with SPDX license identifier in the
files he inspected. For the non-uapi files Thomas did random spot checks
in about 15000 files.
In initial set of patches against 4.14-rc6, 3 files were found to have
copy/paste license identifier errors, and have been fixed to reflect the
correct identifier.
Additionally Philippe spent 10 hours this week doing a detailed manual
inspection and review of the 12,461 patched files from the initial patch
version early this week with:
- a full scancode scan run, collecting the matched texts, detected
license ids and scores
- reviewing anything where there was a license detected (about 500+
files) to ensure that the applied SPDX license was correct
- reviewing anything where there was no detection but the patch license
was not GPL-2.0 WITH Linux-syscall-note to ensure that the applied
SPDX license was correct
This produced a worksheet with 20 files needing minor correction. This
worksheet was then exported into 3 different .csv files for the
different types of files to be modified.
These .csv files were then reviewed by Greg. Thomas wrote a script to
parse the csv files and add the proper SPDX tag to the file, in the
format that the file expected. This script was further refined by Greg
based on the output to detect more types of files automatically and to
distinguish between header and source .c files (which need different
comment types.) Finally Greg ran the script using the .csv files to
generate the patches.
Reviewed-by: Kate Stewart <kstewart@linuxfoundation.org>
Reviewed-by: Philippe Ombredanne <pombredanne@nexb.com>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-11-01 21:07:57 +07:00
|
|
|
// SPDX-License-Identifier: GPL-2.0
|
2008-10-16 02:50:22 +07:00
|
|
|
#include <linux/fs.h>
|
|
|
|
|
#include <linux/init.h>
|
|
|
|
|
#include <linux/kernel.h>
|
|
|
|
|
#include <linux/mm.h>
|
2013-11-15 05:31:02 +07:00
|
|
|
#include <linux/hugetlb.h>
|
2008-10-16 02:50:22 +07:00
|
|
|
#include <linux/mman.h>
|
|
|
|
|
#include <linux/mmzone.h>
|
|
|
|
|
#include <linux/proc_fs.h>
|
2018-08-22 11:53:58 +07:00
|
|
|
#include <linux/percpu.h>
|
2008-10-16 02:50:22 +07:00
|
|
|
#include <linux/seq_file.h>
|
|
|
|
|
#include <linux/swap.h>
|
|
|
|
|
#include <linux/vmstat.h>
|
2011-07-27 06:09:06 +07:00
|
|
|
#include <linux/atomic.h>
|
2013-04-30 05:07:28 +07:00
|
|
|
#include <linux/vmalloc.h>
|
fs/proc/meminfo.c: include cma info in proc/meminfo
This patch include CMA info (CMATotal, CMAFree) in /proc/meminfo.
Currently, in a CMA enabled system, if somebody wants to know the total
CMA size declared, there is no way to tell, other than the dmesg or
/var/log/messages logs.
With this patch we are showing the CMA info as part of meminfo, so that it
can be determined at any point of time. This will be populated only when
CMA is enabled.
Below is the sample output from a ARM based device with RAM:512MB and CMA:16MB.
MemTotal: 471172 kB
MemFree: 111712 kB
MemAvailable: 271172 kB
.
.
.
CmaTotal: 16384 kB
CmaFree: 6144 kB
This patch also fix below checkpatch errors that were found during these changes.
ERROR: space required after that ',' (ctx:ExV)
199: FILE: fs/proc/meminfo.c:199:
+ ,atomic_long_read(&num_poisoned_pages) << (PAGE_SHIFT - 10)
^
ERROR: space required after that ',' (ctx:ExV)
202: FILE: fs/proc/meminfo.c:202:
+ ,K(global_page_state(NR_ANON_TRANSPARENT_HUGEPAGES) *
^
ERROR: space required after that ',' (ctx:ExV)
206: FILE: fs/proc/meminfo.c:206:
+ ,K(totalcma_pages)
^
total: 3 errors, 0 warnings, 2 checks, 236 lines checked
Signed-off-by: Pintu Kumar <pintu.k@samsung.com>
Signed-off-by: Vishnu Pratap Singh <vishnu.ps@samsung.com>
Acked-by: Michal Nazarewicz <mina86@mina86.com>
Cc: Rafael Aquini <aquini@redhat.com>
Cc: Jerome Marchand <jmarchan@redhat.com>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2014-12-19 07:17:18 +07:00
|
|
|
#ifdef CONFIG_CMA
|
|
|
|
|
#include <linux/cma.h>
|
|
|
|
|
#endif
|
2008-10-16 02:50:22 +07:00
|
|
|
#include <asm/page.h>
|
|
|
|
|
#include "internal.h"
|
|
|
|
|
|
|
|
|
|
void __attribute__((weak)) arch_report_meminfo(struct seq_file *m)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
2016-10-08 07:02:23 +07:00
|
|
|
static void show_val_kb(struct seq_file *m, const char *s, unsigned long num)
|
|
|
|
|
{
|
2018-04-11 06:31:16 +07:00
|
|
|
seq_put_decimal_ull_width(m, s, num << (PAGE_SHIFT - 10), 8);
|
2016-10-08 07:02:23 +07:00
|
|
|
seq_write(m, " kB\n", 4);
|
|
|
|
|
}
|
|
|
|
|
|
2008-10-16 02:50:22 +07:00
|
|
|
static int meminfo_proc_show(struct seq_file *m, void *v)
|
|
|
|
|
{
|
|
|
|
|
struct sysinfo i;
|
|
|
|
|
unsigned long committed;
|
|
|
|
|
long cached;
|
/proc/meminfo: provide estimated available memory
Many load balancing and workload placing programs check /proc/meminfo to
estimate how much free memory is available. They generally do this by
adding up "free" and "cached", which was fine ten years ago, but is
pretty much guaranteed to be wrong today.
It is wrong because Cached includes memory that is not freeable as page
cache, for example shared memory segments, tmpfs, and ramfs, and it does
not include reclaimable slab memory, which can take up a large fraction
of system memory on mostly idle systems with lots of files.
Currently, the amount of memory that is available for a new workload,
without pushing the system into swap, can be estimated from MemFree,
Active(file), Inactive(file), and SReclaimable, as well as the "low"
watermarks from /proc/zoneinfo.
However, this may change in the future, and user space really should not
be expected to know kernel internals to come up with an estimate for the
amount of free memory.
It is more convenient to provide such an estimate in /proc/meminfo. If
things change in the future, we only have to change it in one place.
Signed-off-by: Rik van Riel <riel@redhat.com>
Reported-by: Erik Mouw <erik.mouw_2@nxp.com>
Acked-by: Johannes Weiner <hannes@cmpxchg.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2014-01-22 06:49:05 +07:00
|
|
|
long available;
|
2008-10-16 02:50:22 +07:00
|
|
|
unsigned long pages[NR_LRU_LISTS];
|
2018-10-27 05:05:50 +07:00
|
|
|
unsigned long sreclaimable, sunreclaim;
|
2008-10-16 02:50:22 +07:00
|
|
|
int lru;
|
|
|
|
|
|
|
|
|
|
si_meminfo(&i);
|
|
|
|
|
si_swapinfo(&i);
|
proc/meminfo: avoid open coded reading of vm_committed_as
Patch series "make vm_committed_as_batch aware of vm overcommit policy", v6.
When checking a performance change for will-it-scale scalability mmap test
[1], we found very high lock contention for spinlock of percpu counter
'vm_committed_as':
94.14% 0.35% [kernel.kallsyms] [k] _raw_spin_lock_irqsave
48.21% _raw_spin_lock_irqsave;percpu_counter_add_batch;__vm_enough_memory;mmap_region;do_mmap;
45.91% _raw_spin_lock_irqsave;percpu_counter_add_batch;__do_munmap;
Actually this heavy lock contention is not always necessary. The
'vm_committed_as' needs to be very precise when the strict
OVERCOMMIT_NEVER policy is set, which requires a rather small batch number
for the percpu counter.
So keep 'batch' number unchanged for strict OVERCOMMIT_NEVER policy, and
enlarge it for not-so-strict OVERCOMMIT_ALWAYS and OVERCOMMIT_GUESS
policies.
Benchmark with the same testcase in [1] shows 53% improvement on a 8C/16T
desktop, and 2097%(20X) on a 4S/72C/144T server. And for that case,
whether it shows improvements depends on if the test mmap size is bigger
than the batch number computed.
We tested 10+ platforms in 0day (server, desktop and laptop). If we lift
it to 64X, 80%+ platforms show improvements, and for 16X lift, 1/3 of the
platforms will show improvements.
And generally it should help the mmap/unmap usage,as Michal Hocko
mentioned:
: I believe that there are non-synthetic worklaods which would benefit
: from a larger batch. E.g. large in memory databases which do large
: mmaps during startups from multiple threads.
Note: There are some style complain from checkpatch for patch 4, as sysctl
handler declaration follows the similar format of sibling functions
[1] https://lore.kernel.org/lkml/20200305062138.GI5972@shao2-debian/
This patch (of 4):
Use the existing vm_memory_committed() instead, which is also convenient
for future change.
Signed-off-by: Feng Tang <feng.tang@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Acked-by: Michal Hocko <mhocko@suse.com>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Qian Cai <cai@lca.pw>
Cc: Kees Cook <keescook@chromium.org>
Cc: Andi Kleen <andi.kleen@intel.com>
Cc: Tim Chen <tim.c.chen@intel.com>
Cc: Dave Hansen <dave.hansen@intel.com>
Cc: Huang Ying <ying.huang@intel.com>
Cc: Christoph Lameter <cl@linux.com>
Cc: Dennis Zhou <dennis@kernel.org>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Cc: kernel test robot <rong.a.chen@intel.com>
Cc: "K. Y. Srinivasan" <kys@microsoft.com>
Cc: Tejun Heo <tj@kernel.org>
Link: http://lkml.kernel.org/r/1594389708-60781-1-git-send-email-feng.tang@intel.com
Link: http://lkml.kernel.org/r/1594389708-60781-2-git-send-email-feng.tang@intel.com
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2020-08-07 13:23:03 +07:00
|
|
|
committed = vm_memory_committed();
|
2008-10-16 02:50:22 +07:00
|
|
|
|
2016-07-29 05:46:20 +07:00
|
|
|
cached = global_node_page_state(NR_FILE_PAGES) -
|
2013-02-23 07:34:37 +07:00
|
|
|
total_swapcache_pages() - i.bufferram;
|
2008-10-16 02:50:22 +07:00
|
|
|
if (cached < 0)
|
|
|
|
|
cached = 0;
|
|
|
|
|
|
|
|
|
|
for (lru = LRU_BASE; lru < NR_LRU_LISTS; lru++)
|
2016-08-12 05:32:57 +07:00
|
|
|
pages[lru] = global_node_page_state(NR_LRU_BASE + lru);
|
2008-10-16 02:50:22 +07:00
|
|
|
|
2016-03-18 04:19:05 +07:00
|
|
|
available = si_mem_available();
|
2020-08-07 13:20:39 +07:00
|
|
|
sreclaimable = global_node_page_state_pages(NR_SLAB_RECLAIMABLE_B);
|
|
|
|
|
sunreclaim = global_node_page_state_pages(NR_SLAB_UNRECLAIMABLE_B);
|
/proc/meminfo: provide estimated available memory
Many load balancing and workload placing programs check /proc/meminfo to
estimate how much free memory is available. They generally do this by
adding up "free" and "cached", which was fine ten years ago, but is
pretty much guaranteed to be wrong today.
It is wrong because Cached includes memory that is not freeable as page
cache, for example shared memory segments, tmpfs, and ramfs, and it does
not include reclaimable slab memory, which can take up a large fraction
of system memory on mostly idle systems with lots of files.
Currently, the amount of memory that is available for a new workload,
without pushing the system into swap, can be estimated from MemFree,
Active(file), Inactive(file), and SReclaimable, as well as the "low"
watermarks from /proc/zoneinfo.
However, this may change in the future, and user space really should not
be expected to know kernel internals to come up with an estimate for the
amount of free memory.
It is more convenient to provide such an estimate in /proc/meminfo. If
things change in the future, we only have to change it in one place.
Signed-off-by: Rik van Riel <riel@redhat.com>
Reported-by: Erik Mouw <erik.mouw_2@nxp.com>
Acked-by: Johannes Weiner <hannes@cmpxchg.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2014-01-22 06:49:05 +07:00
|
|
|
|
2016-10-08 07:02:23 +07:00
|
|
|
show_val_kb(m, "MemTotal: ", i.totalram);
|
|
|
|
|
show_val_kb(m, "MemFree: ", i.freeram);
|
|
|
|
|
show_val_kb(m, "MemAvailable: ", available);
|
|
|
|
|
show_val_kb(m, "Buffers: ", i.bufferram);
|
|
|
|
|
show_val_kb(m, "Cached: ", cached);
|
|
|
|
|
show_val_kb(m, "SwapCached: ", total_swapcache_pages());
|
|
|
|
|
show_val_kb(m, "Active: ", pages[LRU_ACTIVE_ANON] +
|
|
|
|
|
pages[LRU_ACTIVE_FILE]);
|
|
|
|
|
show_val_kb(m, "Inactive: ", pages[LRU_INACTIVE_ANON] +
|
|
|
|
|
pages[LRU_INACTIVE_FILE]);
|
|
|
|
|
show_val_kb(m, "Active(anon): ", pages[LRU_ACTIVE_ANON]);
|
|
|
|
|
show_val_kb(m, "Inactive(anon): ", pages[LRU_INACTIVE_ANON]);
|
|
|
|
|
show_val_kb(m, "Active(file): ", pages[LRU_ACTIVE_FILE]);
|
|
|
|
|
show_val_kb(m, "Inactive(file): ", pages[LRU_INACTIVE_FILE]);
|
|
|
|
|
show_val_kb(m, "Unevictable: ", pages[LRU_UNEVICTABLE]);
|
2017-09-07 06:23:36 +07:00
|
|
|
show_val_kb(m, "Mlocked: ", global_zone_page_state(NR_MLOCK));
|
2016-10-08 07:02:23 +07:00
|
|
|
|
2008-10-16 02:50:22 +07:00
|
|
|
#ifdef CONFIG_HIGHMEM
|
2016-10-08 07:02:23 +07:00
|
|
|
show_val_kb(m, "HighTotal: ", i.totalhigh);
|
|
|
|
|
show_val_kb(m, "HighFree: ", i.freehigh);
|
|
|
|
|
show_val_kb(m, "LowTotal: ", i.totalram - i.totalhigh);
|
|
|
|
|
show_val_kb(m, "LowFree: ", i.freeram - i.freehigh);
|
2009-01-08 19:04:47 +07:00
|
|
|
#endif
|
2016-10-08 07:02:23 +07:00
|
|
|
|
2009-01-08 19:04:47 +07:00
|
|
|
#ifndef CONFIG_MMU
|
2016-10-08 07:02:23 +07:00
|
|
|
show_val_kb(m, "MmapCopy: ",
|
|
|
|
|
(unsigned long)atomic_long_read(&mmap_pages_allocated));
|
2008-10-16 02:50:22 +07:00
|
|
|
#endif
|
2016-10-08 07:02:23 +07:00
|
|
|
|
|
|
|
|
show_val_kb(m, "SwapTotal: ", i.totalswap);
|
|
|
|
|
show_val_kb(m, "SwapFree: ", i.freeswap);
|
|
|
|
|
show_val_kb(m, "Dirty: ",
|
|
|
|
|
global_node_page_state(NR_FILE_DIRTY));
|
|
|
|
|
show_val_kb(m, "Writeback: ",
|
|
|
|
|
global_node_page_state(NR_WRITEBACK));
|
|
|
|
|
show_val_kb(m, "AnonPages: ",
|
|
|
|
|
global_node_page_state(NR_ANON_MAPPED));
|
|
|
|
|
show_val_kb(m, "Mapped: ",
|
|
|
|
|
global_node_page_state(NR_FILE_MAPPED));
|
|
|
|
|
show_val_kb(m, "Shmem: ", i.sharedram);
|
2018-10-27 05:05:50 +07:00
|
|
|
show_val_kb(m, "KReclaimable: ", sreclaimable +
|
|
|
|
|
global_node_page_state(NR_KERNEL_MISC_RECLAIMABLE));
|
|
|
|
|
show_val_kb(m, "Slab: ", sreclaimable + sunreclaim);
|
|
|
|
|
show_val_kb(m, "SReclaimable: ", sreclaimable);
|
|
|
|
|
show_val_kb(m, "SUnreclaim: ", sunreclaim);
|
2016-10-08 07:02:23 +07:00
|
|
|
seq_printf(m, "KernelStack: %8lu kB\n",
|
2020-08-07 13:21:37 +07:00
|
|
|
global_node_page_state(NR_KERNEL_STACK_KB));
|
2020-04-27 23:00:08 +07:00
|
|
|
#ifdef CONFIG_SHADOW_CALL_STACK
|
|
|
|
|
seq_printf(m, "ShadowCallStack:%8lu kB\n",
|
2020-08-07 13:21:37 +07:00
|
|
|
global_node_page_state(NR_KERNEL_SCS_KB));
|
2020-04-27 23:00:08 +07:00
|
|
|
#endif
|
2016-10-08 07:02:23 +07:00
|
|
|
show_val_kb(m, "PageTables: ",
|
2017-09-07 06:23:36 +07:00
|
|
|
global_zone_page_state(NR_PAGETABLE));
|
2016-10-08 07:02:23 +07:00
|
|
|
|
2020-06-02 11:48:21 +07:00
|
|
|
show_val_kb(m, "NFS_Unstable: ", 0);
|
2016-10-08 07:02:23 +07:00
|
|
|
show_val_kb(m, "Bounce: ",
|
2017-09-07 06:23:36 +07:00
|
|
|
global_zone_page_state(NR_BOUNCE));
|
2016-10-08 07:02:23 +07:00
|
|
|
show_val_kb(m, "WritebackTmp: ",
|
|
|
|
|
global_node_page_state(NR_WRITEBACK_TEMP));
|
|
|
|
|
show_val_kb(m, "CommitLimit: ", vm_commit_limit());
|
|
|
|
|
show_val_kb(m, "Committed_AS: ", committed);
|
|
|
|
|
seq_printf(m, "VmallocTotal: %8lu kB\n",
|
|
|
|
|
(unsigned long)VMALLOC_TOTAL >> 10);
|
2019-07-12 11:00:13 +07:00
|
|
|
show_val_kb(m, "VmallocUsed: ", vmalloc_nr_pages());
|
2016-10-08 07:02:23 +07:00
|
|
|
show_val_kb(m, "VmallocChunk: ", 0ul);
|
2018-08-22 11:53:58 +07:00
|
|
|
show_val_kb(m, "Percpu: ", pcpu_nr_pages());
|
2016-10-08 07:02:23 +07:00
|
|
|
|
2009-09-16 16:50:15 +07:00
|
|
|
#ifdef CONFIG_MEMORY_FAILURE
|
2016-10-08 07:02:23 +07:00
|
|
|
seq_printf(m, "HardwareCorrupted: %5lu kB\n",
|
|
|
|
|
atomic_long_read(&num_poisoned_pages) << (PAGE_SHIFT - 10));
|
2011-01-14 06:46:58 +07:00
|
|
|
#endif
|
2016-10-08 07:02:23 +07:00
|
|
|
|
2011-01-14 06:46:58 +07:00
|
|
|
#ifdef CONFIG_TRANSPARENT_HUGEPAGE
|
2016-10-08 07:02:23 +07:00
|
|
|
show_val_kb(m, "AnonHugePages: ",
|
|
|
|
|
global_node_page_state(NR_ANON_THPS) * HPAGE_PMD_NR);
|
|
|
|
|
show_val_kb(m, "ShmemHugePages: ",
|
|
|
|
|
global_node_page_state(NR_SHMEM_THPS) * HPAGE_PMD_NR);
|
|
|
|
|
show_val_kb(m, "ShmemPmdMapped: ",
|
|
|
|
|
global_node_page_state(NR_SHMEM_PMDMAPPED) * HPAGE_PMD_NR);
|
2019-10-19 10:20:27 +07:00
|
|
|
show_val_kb(m, "FileHugePages: ",
|
2019-09-24 05:37:54 +07:00
|
|
|
global_node_page_state(NR_FILE_THPS) * HPAGE_PMD_NR);
|
2019-10-19 10:20:27 +07:00
|
|
|
show_val_kb(m, "FilePmdMapped: ",
|
2019-09-24 05:37:54 +07:00
|
|
|
global_node_page_state(NR_FILE_PMDMAPPED) * HPAGE_PMD_NR);
|
fs/proc/meminfo.c: include cma info in proc/meminfo
This patch include CMA info (CMATotal, CMAFree) in /proc/meminfo.
Currently, in a CMA enabled system, if somebody wants to know the total
CMA size declared, there is no way to tell, other than the dmesg or
/var/log/messages logs.
With this patch we are showing the CMA info as part of meminfo, so that it
can be determined at any point of time. This will be populated only when
CMA is enabled.
Below is the sample output from a ARM based device with RAM:512MB and CMA:16MB.
MemTotal: 471172 kB
MemFree: 111712 kB
MemAvailable: 271172 kB
.
.
.
CmaTotal: 16384 kB
CmaFree: 6144 kB
This patch also fix below checkpatch errors that were found during these changes.
ERROR: space required after that ',' (ctx:ExV)
199: FILE: fs/proc/meminfo.c:199:
+ ,atomic_long_read(&num_poisoned_pages) << (PAGE_SHIFT - 10)
^
ERROR: space required after that ',' (ctx:ExV)
202: FILE: fs/proc/meminfo.c:202:
+ ,K(global_page_state(NR_ANON_TRANSPARENT_HUGEPAGES) *
^
ERROR: space required after that ',' (ctx:ExV)
206: FILE: fs/proc/meminfo.c:206:
+ ,K(totalcma_pages)
^
total: 3 errors, 0 warnings, 2 checks, 236 lines checked
Signed-off-by: Pintu Kumar <pintu.k@samsung.com>
Signed-off-by: Vishnu Pratap Singh <vishnu.ps@samsung.com>
Acked-by: Michal Nazarewicz <mina86@mina86.com>
Cc: Rafael Aquini <aquini@redhat.com>
Cc: Jerome Marchand <jmarchan@redhat.com>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2014-12-19 07:17:18 +07:00
|
|
|
#endif
|
2016-10-08 07:02:23 +07:00
|
|
|
|
fs/proc/meminfo.c: include cma info in proc/meminfo
This patch include CMA info (CMATotal, CMAFree) in /proc/meminfo.
Currently, in a CMA enabled system, if somebody wants to know the total
CMA size declared, there is no way to tell, other than the dmesg or
/var/log/messages logs.
With this patch we are showing the CMA info as part of meminfo, so that it
can be determined at any point of time. This will be populated only when
CMA is enabled.
Below is the sample output from a ARM based device with RAM:512MB and CMA:16MB.
MemTotal: 471172 kB
MemFree: 111712 kB
MemAvailable: 271172 kB
.
.
.
CmaTotal: 16384 kB
CmaFree: 6144 kB
This patch also fix below checkpatch errors that were found during these changes.
ERROR: space required after that ',' (ctx:ExV)
199: FILE: fs/proc/meminfo.c:199:
+ ,atomic_long_read(&num_poisoned_pages) << (PAGE_SHIFT - 10)
^
ERROR: space required after that ',' (ctx:ExV)
202: FILE: fs/proc/meminfo.c:202:
+ ,K(global_page_state(NR_ANON_TRANSPARENT_HUGEPAGES) *
^
ERROR: space required after that ',' (ctx:ExV)
206: FILE: fs/proc/meminfo.c:206:
+ ,K(totalcma_pages)
^
total: 3 errors, 0 warnings, 2 checks, 236 lines checked
Signed-off-by: Pintu Kumar <pintu.k@samsung.com>
Signed-off-by: Vishnu Pratap Singh <vishnu.ps@samsung.com>
Acked-by: Michal Nazarewicz <mina86@mina86.com>
Cc: Rafael Aquini <aquini@redhat.com>
Cc: Jerome Marchand <jmarchan@redhat.com>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2014-12-19 07:17:18 +07:00
|
|
|
#ifdef CONFIG_CMA
|
2016-10-08 07:02:23 +07:00
|
|
|
show_val_kb(m, "CmaTotal: ", totalcma_pages);
|
|
|
|
|
show_val_kb(m, "CmaFree: ",
|
2017-09-07 06:23:36 +07:00
|
|
|
global_zone_page_state(NR_FREE_CMA_PAGES));
|
2009-09-16 16:50:15 +07:00
|
|
|
#endif
|
2008-10-16 02:50:22 +07:00
|
|
|
|
|
|
|
|
hugetlb_report_meminfo(m);
|
|
|
|
|
|
|
|
|
|
arch_report_meminfo(m);
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int __init proc_meminfo_init(void)
|
|
|
|
|
{
|
2018-05-15 20:57:23 +07:00
|
|
|
proc_create_single("meminfo", 0, NULL, meminfo_proc_show);
|
2008-10-16 02:50:22 +07:00
|
|
|
return 0;
|
|
|
|
|
}
|
2014-01-24 06:55:45 +07:00
|
|
|
fs_initcall(proc_meminfo_init);
|