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 22:07:57 +08:00
|
|
|
// SPDX-License-Identifier: GPL-2.0
|
2022-02-22 20:23:24 +08:00
|
|
|
|
2013-03-29 14:36:31 +08:00
|
|
|
/*
|
|
|
|
* CPU accounting code for task groups.
|
|
|
|
*
|
|
|
|
* Based on the work by Paul Menage (menage@google.com) and Balbir Singh
|
|
|
|
* (balbir@in.ibm.com).
|
|
|
|
*/
|
|
|
|
|
sched: Clean up and harmonize the coding style of the scheduler code base
A good number of small style inconsistencies have accumulated
in the scheduler core, so do a pass over them to harmonize
all these details:
- fix speling in comments,
- use curly braces for multi-line statements,
- remove unnecessary parentheses from integer literals,
- capitalize consistently,
- remove stray newlines,
- add comments where necessary,
- remove invalid/unnecessary comments,
- align structure definitions and other data types vertically,
- add missing newlines for increased readability,
- fix vertical tabulation where it's misaligned,
- harmonize preprocessor conditional block labeling
and vertical alignment,
- remove line-breaks where they uglify the code,
- add newline after local variable definitions,
No change in functionality:
md5:
1191fa0a890cfa8132156d2959d7e9e2 built-in.o.before.asm
1191fa0a890cfa8132156d2959d7e9e2 built-in.o.after.asm
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2018-03-03 21:01:12 +08:00
|
|
|
/* Time spent by the tasks of the CPU accounting group executing in ... */
|
2013-03-29 14:38:13 +08:00
|
|
|
enum cpuacct_stat_index {
|
|
|
|
CPUACCT_STAT_USER, /* ... user mode */
|
|
|
|
CPUACCT_STAT_SYSTEM, /* ... kernel mode */
|
|
|
|
|
|
|
|
CPUACCT_STAT_NSTATS,
|
|
|
|
};
|
|
|
|
|
2016-06-20 17:37:18 +08:00
|
|
|
static const char * const cpuacct_stat_desc[] = {
|
|
|
|
[CPUACCT_STAT_USER] = "user",
|
|
|
|
[CPUACCT_STAT_SYSTEM] = "system",
|
2016-03-22 16:37:08 +08:00
|
|
|
};
|
|
|
|
|
sched: Clean up and harmonize the coding style of the scheduler code base
A good number of small style inconsistencies have accumulated
in the scheduler core, so do a pass over them to harmonize
all these details:
- fix speling in comments,
- use curly braces for multi-line statements,
- remove unnecessary parentheses from integer literals,
- capitalize consistently,
- remove stray newlines,
- add comments where necessary,
- remove invalid/unnecessary comments,
- align structure definitions and other data types vertically,
- add missing newlines for increased readability,
- fix vertical tabulation where it's misaligned,
- harmonize preprocessor conditional block labeling
and vertical alignment,
- remove line-breaks where they uglify the code,
- add newline after local variable definitions,
No change in functionality:
md5:
1191fa0a890cfa8132156d2959d7e9e2 built-in.o.before.asm
1191fa0a890cfa8132156d2959d7e9e2 built-in.o.after.asm
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2018-03-03 21:01:12 +08:00
|
|
|
/* track CPU usage of a group of tasks and its child groups */
|
2013-03-29 14:38:13 +08:00
|
|
|
struct cpuacct {
|
sched: Clean up and harmonize the coding style of the scheduler code base
A good number of small style inconsistencies have accumulated
in the scheduler core, so do a pass over them to harmonize
all these details:
- fix speling in comments,
- use curly braces for multi-line statements,
- remove unnecessary parentheses from integer literals,
- capitalize consistently,
- remove stray newlines,
- add comments where necessary,
- remove invalid/unnecessary comments,
- align structure definitions and other data types vertically,
- add missing newlines for increased readability,
- fix vertical tabulation where it's misaligned,
- harmonize preprocessor conditional block labeling
and vertical alignment,
- remove line-breaks where they uglify the code,
- add newline after local variable definitions,
No change in functionality:
md5:
1191fa0a890cfa8132156d2959d7e9e2 built-in.o.before.asm
1191fa0a890cfa8132156d2959d7e9e2 built-in.o.after.asm
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2018-03-03 21:01:12 +08:00
|
|
|
struct cgroup_subsys_state css;
|
|
|
|
/* cpuusage holds pointer to a u64-type object on every CPU */
|
2021-11-16 00:46:06 +08:00
|
|
|
u64 __percpu *cpuusage;
|
sched: Clean up and harmonize the coding style of the scheduler code base
A good number of small style inconsistencies have accumulated
in the scheduler core, so do a pass over them to harmonize
all these details:
- fix speling in comments,
- use curly braces for multi-line statements,
- remove unnecessary parentheses from integer literals,
- capitalize consistently,
- remove stray newlines,
- add comments where necessary,
- remove invalid/unnecessary comments,
- align structure definitions and other data types vertically,
- add missing newlines for increased readability,
- fix vertical tabulation where it's misaligned,
- harmonize preprocessor conditional block labeling
and vertical alignment,
- remove line-breaks where they uglify the code,
- add newline after local variable definitions,
No change in functionality:
md5:
1191fa0a890cfa8132156d2959d7e9e2 built-in.o.before.asm
1191fa0a890cfa8132156d2959d7e9e2 built-in.o.after.asm
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2018-03-03 21:01:12 +08:00
|
|
|
struct kernel_cpustat __percpu *cpustat;
|
2013-03-29 14:38:13 +08:00
|
|
|
};
|
|
|
|
|
2013-08-09 08:11:23 +08:00
|
|
|
static inline struct cpuacct *css_ca(struct cgroup_subsys_state *css)
|
|
|
|
{
|
|
|
|
return css ? container_of(css, struct cpuacct, css) : NULL;
|
|
|
|
}
|
|
|
|
|
sched: Clean up and harmonize the coding style of the scheduler code base
A good number of small style inconsistencies have accumulated
in the scheduler core, so do a pass over them to harmonize
all these details:
- fix speling in comments,
- use curly braces for multi-line statements,
- remove unnecessary parentheses from integer literals,
- capitalize consistently,
- remove stray newlines,
- add comments where necessary,
- remove invalid/unnecessary comments,
- align structure definitions and other data types vertically,
- add missing newlines for increased readability,
- fix vertical tabulation where it's misaligned,
- harmonize preprocessor conditional block labeling
and vertical alignment,
- remove line-breaks where they uglify the code,
- add newline after local variable definitions,
No change in functionality:
md5:
1191fa0a890cfa8132156d2959d7e9e2 built-in.o.before.asm
1191fa0a890cfa8132156d2959d7e9e2 built-in.o.after.asm
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2018-03-03 21:01:12 +08:00
|
|
|
/* Return CPU accounting group to which this task belongs */
|
2013-03-29 14:38:13 +08:00
|
|
|
static inline struct cpuacct *task_ca(struct task_struct *tsk)
|
|
|
|
{
|
2014-02-08 23:36:58 +08:00
|
|
|
return css_ca(task_css(tsk, cpuacct_cgrp_id));
|
2013-03-29 14:38:13 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static inline struct cpuacct *parent_ca(struct cpuacct *ca)
|
|
|
|
{
|
2014-05-17 01:22:48 +08:00
|
|
|
return css_ca(ca->css.parent);
|
2013-03-29 14:38:13 +08:00
|
|
|
}
|
|
|
|
|
2021-11-16 00:46:06 +08:00
|
|
|
static DEFINE_PER_CPU(u64, root_cpuacct_cpuusage);
|
2013-03-29 14:44:04 +08:00
|
|
|
static struct cpuacct root_cpuacct = {
|
|
|
|
.cpustat = &kernel_cpustat,
|
|
|
|
.cpuusage = &root_cpuacct_cpuusage,
|
|
|
|
};
|
2013-03-29 14:36:31 +08:00
|
|
|
|
sched: Clean up and harmonize the coding style of the scheduler code base
A good number of small style inconsistencies have accumulated
in the scheduler core, so do a pass over them to harmonize
all these details:
- fix speling in comments,
- use curly braces for multi-line statements,
- remove unnecessary parentheses from integer literals,
- capitalize consistently,
- remove stray newlines,
- add comments where necessary,
- remove invalid/unnecessary comments,
- align structure definitions and other data types vertically,
- add missing newlines for increased readability,
- fix vertical tabulation where it's misaligned,
- harmonize preprocessor conditional block labeling
and vertical alignment,
- remove line-breaks where they uglify the code,
- add newline after local variable definitions,
No change in functionality:
md5:
1191fa0a890cfa8132156d2959d7e9e2 built-in.o.before.asm
1191fa0a890cfa8132156d2959d7e9e2 built-in.o.after.asm
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2018-03-03 21:01:12 +08:00
|
|
|
/* Create a new CPU accounting group */
|
2013-08-09 08:11:23 +08:00
|
|
|
static struct cgroup_subsys_state *
|
|
|
|
cpuacct_css_alloc(struct cgroup_subsys_state *parent_css)
|
2013-03-29 14:36:31 +08:00
|
|
|
{
|
|
|
|
struct cpuacct *ca;
|
|
|
|
|
2013-08-09 08:11:23 +08:00
|
|
|
if (!parent_css)
|
2013-03-29 14:36:31 +08:00
|
|
|
return &root_cpuacct.css;
|
|
|
|
|
|
|
|
ca = kzalloc(sizeof(*ca), GFP_KERNEL);
|
|
|
|
if (!ca)
|
|
|
|
goto out;
|
|
|
|
|
2021-11-16 00:46:06 +08:00
|
|
|
ca->cpuusage = alloc_percpu(u64);
|
2013-03-29 14:36:31 +08:00
|
|
|
if (!ca->cpuusage)
|
|
|
|
goto out_free_ca;
|
|
|
|
|
|
|
|
ca->cpustat = alloc_percpu(struct kernel_cpustat);
|
|
|
|
if (!ca->cpustat)
|
|
|
|
goto out_free_cpuusage;
|
|
|
|
|
|
|
|
return &ca->css;
|
|
|
|
|
|
|
|
out_free_cpuusage:
|
|
|
|
free_percpu(ca->cpuusage);
|
|
|
|
out_free_ca:
|
|
|
|
kfree(ca);
|
|
|
|
out:
|
|
|
|
return ERR_PTR(-ENOMEM);
|
|
|
|
}
|
|
|
|
|
sched: Clean up and harmonize the coding style of the scheduler code base
A good number of small style inconsistencies have accumulated
in the scheduler core, so do a pass over them to harmonize
all these details:
- fix speling in comments,
- use curly braces for multi-line statements,
- remove unnecessary parentheses from integer literals,
- capitalize consistently,
- remove stray newlines,
- add comments where necessary,
- remove invalid/unnecessary comments,
- align structure definitions and other data types vertically,
- add missing newlines for increased readability,
- fix vertical tabulation where it's misaligned,
- harmonize preprocessor conditional block labeling
and vertical alignment,
- remove line-breaks where they uglify the code,
- add newline after local variable definitions,
No change in functionality:
md5:
1191fa0a890cfa8132156d2959d7e9e2 built-in.o.before.asm
1191fa0a890cfa8132156d2959d7e9e2 built-in.o.after.asm
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2018-03-03 21:01:12 +08:00
|
|
|
/* Destroy an existing CPU accounting group */
|
2013-08-09 08:11:23 +08:00
|
|
|
static void cpuacct_css_free(struct cgroup_subsys_state *css)
|
2013-03-29 14:36:31 +08:00
|
|
|
{
|
2013-08-09 08:11:23 +08:00
|
|
|
struct cpuacct *ca = css_ca(css);
|
2013-03-29 14:36:31 +08:00
|
|
|
|
|
|
|
free_percpu(ca->cpustat);
|
|
|
|
free_percpu(ca->cpuusage);
|
|
|
|
kfree(ca);
|
|
|
|
}
|
|
|
|
|
2016-03-22 16:37:08 +08:00
|
|
|
static u64 cpuacct_cpuusage_read(struct cpuacct *ca, int cpu,
|
2016-06-20 17:37:18 +08:00
|
|
|
enum cpuacct_stat_index index)
|
2013-03-29 14:36:31 +08:00
|
|
|
{
|
2021-11-16 00:46:06 +08:00
|
|
|
u64 *cpuusage = per_cpu_ptr(ca->cpuusage, cpu);
|
|
|
|
u64 *cpustat = per_cpu_ptr(ca->cpustat, cpu)->cpustat;
|
2013-03-29 14:36:31 +08:00
|
|
|
u64 data;
|
|
|
|
|
2016-03-22 16:37:08 +08:00
|
|
|
/*
|
2016-06-20 17:37:18 +08:00
|
|
|
* We allow index == CPUACCT_STAT_NSTATS here to read
|
2021-03-18 20:38:50 +08:00
|
|
|
* the sum of usages.
|
2016-03-22 16:37:08 +08:00
|
|
|
*/
|
2021-11-16 00:46:05 +08:00
|
|
|
if (WARN_ON_ONCE(index > CPUACCT_STAT_NSTATS))
|
|
|
|
return 0;
|
2016-03-22 16:37:08 +08:00
|
|
|
|
2013-03-29 14:36:31 +08:00
|
|
|
#ifndef CONFIG_64BIT
|
|
|
|
/*
|
|
|
|
* Take rq->lock to make 64-bit read safe on 32-bit platforms.
|
|
|
|
*/
|
2020-11-18 07:19:31 +08:00
|
|
|
raw_spin_rq_lock_irq(cpu_rq(cpu));
|
2016-03-22 16:37:08 +08:00
|
|
|
#endif
|
|
|
|
|
2021-11-16 00:46:06 +08:00
|
|
|
switch (index) {
|
|
|
|
case CPUACCT_STAT_USER:
|
|
|
|
data = cpustat[CPUTIME_USER] + cpustat[CPUTIME_NICE];
|
|
|
|
break;
|
|
|
|
case CPUACCT_STAT_SYSTEM:
|
|
|
|
data = cpustat[CPUTIME_SYSTEM] + cpustat[CPUTIME_IRQ] +
|
|
|
|
cpustat[CPUTIME_SOFTIRQ];
|
|
|
|
break;
|
|
|
|
case CPUACCT_STAT_NSTATS:
|
|
|
|
data = *cpuusage;
|
|
|
|
break;
|
2016-03-22 16:37:08 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
#ifndef CONFIG_64BIT
|
2020-11-18 07:19:31 +08:00
|
|
|
raw_spin_rq_unlock_irq(cpu_rq(cpu));
|
2013-03-29 14:36:31 +08:00
|
|
|
#endif
|
|
|
|
|
|
|
|
return data;
|
|
|
|
}
|
|
|
|
|
2021-11-16 00:46:06 +08:00
|
|
|
static void cpuacct_cpuusage_write(struct cpuacct *ca, int cpu)
|
2013-03-29 14:36:31 +08:00
|
|
|
{
|
2021-11-16 00:46:06 +08:00
|
|
|
u64 *cpuusage = per_cpu_ptr(ca->cpuusage, cpu);
|
|
|
|
u64 *cpustat = per_cpu_ptr(ca->cpustat, cpu)->cpustat;
|
|
|
|
|
|
|
|
/* Don't allow to reset global kernel_cpustat */
|
|
|
|
if (ca == &root_cpuacct)
|
|
|
|
return;
|
2013-03-29 14:36:31 +08:00
|
|
|
|
|
|
|
#ifndef CONFIG_64BIT
|
|
|
|
/*
|
|
|
|
* Take rq->lock to make 64-bit write safe on 32-bit platforms.
|
|
|
|
*/
|
2020-11-18 07:19:31 +08:00
|
|
|
raw_spin_rq_lock_irq(cpu_rq(cpu));
|
2016-03-22 16:37:08 +08:00
|
|
|
#endif
|
2021-11-16 00:46:06 +08:00
|
|
|
*cpuusage = 0;
|
|
|
|
cpustat[CPUTIME_USER] = cpustat[CPUTIME_NICE] = 0;
|
|
|
|
cpustat[CPUTIME_SYSTEM] = cpustat[CPUTIME_IRQ] = 0;
|
|
|
|
cpustat[CPUTIME_SOFTIRQ] = 0;
|
2016-03-22 16:37:08 +08:00
|
|
|
|
|
|
|
#ifndef CONFIG_64BIT
|
2020-11-18 07:19:31 +08:00
|
|
|
raw_spin_rq_unlock_irq(cpu_rq(cpu));
|
2013-03-29 14:36:31 +08:00
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
sched: Clean up and harmonize the coding style of the scheduler code base
A good number of small style inconsistencies have accumulated
in the scheduler core, so do a pass over them to harmonize
all these details:
- fix speling in comments,
- use curly braces for multi-line statements,
- remove unnecessary parentheses from integer literals,
- capitalize consistently,
- remove stray newlines,
- add comments where necessary,
- remove invalid/unnecessary comments,
- align structure definitions and other data types vertically,
- add missing newlines for increased readability,
- fix vertical tabulation where it's misaligned,
- harmonize preprocessor conditional block labeling
and vertical alignment,
- remove line-breaks where they uglify the code,
- add newline after local variable definitions,
No change in functionality:
md5:
1191fa0a890cfa8132156d2959d7e9e2 built-in.o.before.asm
1191fa0a890cfa8132156d2959d7e9e2 built-in.o.after.asm
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2018-03-03 21:01:12 +08:00
|
|
|
/* Return total CPU usage (in nanoseconds) of a group */
|
2016-03-22 16:37:08 +08:00
|
|
|
static u64 __cpuusage_read(struct cgroup_subsys_state *css,
|
2016-06-20 17:37:18 +08:00
|
|
|
enum cpuacct_stat_index index)
|
2013-03-29 14:36:31 +08:00
|
|
|
{
|
2013-08-09 08:11:24 +08:00
|
|
|
struct cpuacct *ca = css_ca(css);
|
2013-03-29 14:36:31 +08:00
|
|
|
u64 totalcpuusage = 0;
|
|
|
|
int i;
|
|
|
|
|
2016-03-22 16:37:07 +08:00
|
|
|
for_each_possible_cpu(i)
|
2016-03-22 16:37:08 +08:00
|
|
|
totalcpuusage += cpuacct_cpuusage_read(ca, i, index);
|
2013-03-29 14:36:31 +08:00
|
|
|
|
|
|
|
return totalcpuusage;
|
|
|
|
}
|
|
|
|
|
2016-03-22 16:37:08 +08:00
|
|
|
static u64 cpuusage_user_read(struct cgroup_subsys_state *css,
|
|
|
|
struct cftype *cft)
|
|
|
|
{
|
2016-06-20 17:37:18 +08:00
|
|
|
return __cpuusage_read(css, CPUACCT_STAT_USER);
|
2016-03-22 16:37:08 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static u64 cpuusage_sys_read(struct cgroup_subsys_state *css,
|
|
|
|
struct cftype *cft)
|
|
|
|
{
|
2016-06-20 17:37:18 +08:00
|
|
|
return __cpuusage_read(css, CPUACCT_STAT_SYSTEM);
|
2016-03-22 16:37:08 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static u64 cpuusage_read(struct cgroup_subsys_state *css, struct cftype *cft)
|
|
|
|
{
|
2016-06-20 17:37:18 +08:00
|
|
|
return __cpuusage_read(css, CPUACCT_STAT_NSTATS);
|
2016-03-22 16:37:08 +08:00
|
|
|
}
|
|
|
|
|
2013-08-09 08:11:24 +08:00
|
|
|
static int cpuusage_write(struct cgroup_subsys_state *css, struct cftype *cft,
|
2015-12-21 19:14:42 +08:00
|
|
|
u64 val)
|
2013-03-29 14:36:31 +08:00
|
|
|
{
|
2013-08-09 08:11:24 +08:00
|
|
|
struct cpuacct *ca = css_ca(css);
|
2016-03-22 16:37:08 +08:00
|
|
|
int cpu;
|
2013-03-29 14:36:31 +08:00
|
|
|
|
2015-12-21 19:14:42 +08:00
|
|
|
/*
|
|
|
|
* Only allow '0' here to do a reset.
|
|
|
|
*/
|
2016-03-22 16:37:08 +08:00
|
|
|
if (val)
|
|
|
|
return -EINVAL;
|
2013-03-29 14:36:31 +08:00
|
|
|
|
2016-03-22 16:37:08 +08:00
|
|
|
for_each_possible_cpu(cpu)
|
2021-11-16 00:46:06 +08:00
|
|
|
cpuacct_cpuusage_write(ca, cpu);
|
2013-03-29 14:36:31 +08:00
|
|
|
|
2016-03-22 16:37:08 +08:00
|
|
|
return 0;
|
2013-03-29 14:36:31 +08:00
|
|
|
}
|
|
|
|
|
2016-03-22 16:37:08 +08:00
|
|
|
static int __cpuacct_percpu_seq_show(struct seq_file *m,
|
2016-06-20 17:37:18 +08:00
|
|
|
enum cpuacct_stat_index index)
|
2013-03-29 14:36:31 +08:00
|
|
|
{
|
2013-12-06 01:28:04 +08:00
|
|
|
struct cpuacct *ca = css_ca(seq_css(m));
|
2013-03-29 14:36:31 +08:00
|
|
|
u64 percpu;
|
|
|
|
int i;
|
|
|
|
|
2016-03-22 16:37:07 +08:00
|
|
|
for_each_possible_cpu(i) {
|
2016-03-22 16:37:08 +08:00
|
|
|
percpu = cpuacct_cpuusage_read(ca, i, index);
|
2013-03-29 14:36:31 +08:00
|
|
|
seq_printf(m, "%llu ", (unsigned long long) percpu);
|
|
|
|
}
|
|
|
|
seq_printf(m, "\n");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2016-03-22 16:37:08 +08:00
|
|
|
static int cpuacct_percpu_user_seq_show(struct seq_file *m, void *V)
|
|
|
|
{
|
2016-06-20 17:37:18 +08:00
|
|
|
return __cpuacct_percpu_seq_show(m, CPUACCT_STAT_USER);
|
2016-03-22 16:37:08 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static int cpuacct_percpu_sys_seq_show(struct seq_file *m, void *V)
|
|
|
|
{
|
2016-06-20 17:37:18 +08:00
|
|
|
return __cpuacct_percpu_seq_show(m, CPUACCT_STAT_SYSTEM);
|
2016-03-22 16:37:08 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static int cpuacct_percpu_seq_show(struct seq_file *m, void *V)
|
|
|
|
{
|
2016-06-20 17:37:18 +08:00
|
|
|
return __cpuacct_percpu_seq_show(m, CPUACCT_STAT_NSTATS);
|
2016-03-22 16:37:08 +08:00
|
|
|
}
|
|
|
|
|
2016-06-20 17:37:20 +08:00
|
|
|
static int cpuacct_all_seq_show(struct seq_file *m, void *V)
|
|
|
|
{
|
|
|
|
struct cpuacct *ca = css_ca(seq_css(m));
|
|
|
|
int index;
|
|
|
|
int cpu;
|
|
|
|
|
|
|
|
seq_puts(m, "cpu");
|
|
|
|
for (index = 0; index < CPUACCT_STAT_NSTATS; index++)
|
|
|
|
seq_printf(m, " %s", cpuacct_stat_desc[index]);
|
|
|
|
seq_puts(m, "\n");
|
|
|
|
|
|
|
|
for_each_possible_cpu(cpu) {
|
|
|
|
seq_printf(m, "%d", cpu);
|
2021-11-16 00:46:06 +08:00
|
|
|
for (index = 0; index < CPUACCT_STAT_NSTATS; index++)
|
|
|
|
seq_printf(m, " %llu",
|
|
|
|
cpuacct_cpuusage_read(ca, cpu, index));
|
2016-06-20 17:37:20 +08:00
|
|
|
seq_puts(m, "\n");
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2013-12-06 01:28:04 +08:00
|
|
|
static int cpuacct_stats_show(struct seq_file *sf, void *v)
|
2013-03-29 14:36:31 +08:00
|
|
|
{
|
2013-12-06 01:28:04 +08:00
|
|
|
struct cpuacct *ca = css_ca(seq_css(sf));
|
2021-11-16 00:46:07 +08:00
|
|
|
struct task_cputime cputime;
|
|
|
|
u64 val[CPUACCT_STAT_NSTATS];
|
2013-03-29 14:36:31 +08:00
|
|
|
int cpu;
|
2016-06-20 17:37:19 +08:00
|
|
|
int stat;
|
2013-03-29 14:36:31 +08:00
|
|
|
|
2021-11-16 00:46:07 +08:00
|
|
|
memset(&cputime, 0, sizeof(cputime));
|
2016-03-22 16:37:07 +08:00
|
|
|
for_each_possible_cpu(cpu) {
|
2016-06-20 17:37:19 +08:00
|
|
|
u64 *cpustat = per_cpu_ptr(ca->cpustat, cpu)->cpustat;
|
2013-03-29 14:36:31 +08:00
|
|
|
|
2021-11-16 00:46:07 +08:00
|
|
|
cputime.utime += cpustat[CPUTIME_USER];
|
|
|
|
cputime.utime += cpustat[CPUTIME_NICE];
|
|
|
|
cputime.stime += cpustat[CPUTIME_SYSTEM];
|
|
|
|
cputime.stime += cpustat[CPUTIME_IRQ];
|
|
|
|
cputime.stime += cpustat[CPUTIME_SOFTIRQ];
|
|
|
|
|
|
|
|
cputime.sum_exec_runtime += *per_cpu_ptr(ca->cpuusage, cpu);
|
2013-03-29 14:36:31 +08:00
|
|
|
}
|
|
|
|
|
2021-11-16 00:46:07 +08:00
|
|
|
cputime_adjust(&cputime, &seq_css(sf)->cgroup->prev_cputime,
|
|
|
|
&val[CPUACCT_STAT_USER], &val[CPUACCT_STAT_SYSTEM]);
|
|
|
|
|
2016-06-20 17:37:19 +08:00
|
|
|
for (stat = 0; stat < CPUACCT_STAT_NSTATS; stat++) {
|
2021-11-16 00:46:07 +08:00
|
|
|
seq_printf(sf, "%s %llu\n", cpuacct_stat_desc[stat],
|
|
|
|
nsec_to_clock_t(val[stat]));
|
2016-06-20 17:37:19 +08:00
|
|
|
}
|
2013-03-29 14:36:31 +08:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct cftype files[] = {
|
|
|
|
{
|
|
|
|
.name = "usage",
|
|
|
|
.read_u64 = cpuusage_read,
|
|
|
|
.write_u64 = cpuusage_write,
|
|
|
|
},
|
2016-03-22 16:37:08 +08:00
|
|
|
{
|
|
|
|
.name = "usage_user",
|
|
|
|
.read_u64 = cpuusage_user_read,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
.name = "usage_sys",
|
|
|
|
.read_u64 = cpuusage_sys_read,
|
|
|
|
},
|
2013-03-29 14:36:31 +08:00
|
|
|
{
|
|
|
|
.name = "usage_percpu",
|
2013-12-06 01:28:04 +08:00
|
|
|
.seq_show = cpuacct_percpu_seq_show,
|
2013-03-29 14:36:31 +08:00
|
|
|
},
|
2016-03-22 16:37:08 +08:00
|
|
|
{
|
|
|
|
.name = "usage_percpu_user",
|
|
|
|
.seq_show = cpuacct_percpu_user_seq_show,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
.name = "usage_percpu_sys",
|
|
|
|
.seq_show = cpuacct_percpu_sys_seq_show,
|
|
|
|
},
|
2016-06-20 17:37:20 +08:00
|
|
|
{
|
|
|
|
.name = "usage_all",
|
|
|
|
.seq_show = cpuacct_all_seq_show,
|
|
|
|
},
|
2013-03-29 14:36:31 +08:00
|
|
|
{
|
|
|
|
.name = "stat",
|
2013-12-06 01:28:04 +08:00
|
|
|
.seq_show = cpuacct_stats_show,
|
2013-03-29 14:36:31 +08:00
|
|
|
},
|
|
|
|
{ } /* terminate */
|
|
|
|
};
|
|
|
|
|
|
|
|
/*
|
|
|
|
* charge this task's execution time to its accounting group.
|
|
|
|
*
|
|
|
|
* called with rq->lock held.
|
|
|
|
*/
|
|
|
|
void cpuacct_charge(struct task_struct *tsk, u64 cputime)
|
|
|
|
{
|
2022-02-20 13:14:24 +08:00
|
|
|
unsigned int cpu = task_cpu(tsk);
|
2013-03-29 14:36:31 +08:00
|
|
|
struct cpuacct *ca;
|
|
|
|
|
2022-02-20 13:14:25 +08:00
|
|
|
lockdep_assert_rq_held(cpu_rq(cpu));
|
2016-03-22 16:37:08 +08:00
|
|
|
|
2016-03-17 12:19:43 +08:00
|
|
|
for (ca = task_ca(tsk); ca; ca = parent_ca(ca))
|
2022-02-20 13:14:24 +08:00
|
|
|
*per_cpu_ptr(ca->cpuusage, cpu) += cputime;
|
2013-03-29 14:36:31 +08:00
|
|
|
}
|
|
|
|
|
2013-03-29 14:37:06 +08:00
|
|
|
/*
|
|
|
|
* Add user/system time to cpuacct.
|
|
|
|
*
|
|
|
|
* Note: it's the caller that updates the account of the root cgroup.
|
|
|
|
*/
|
2016-03-17 12:19:43 +08:00
|
|
|
void cpuacct_account_field(struct task_struct *tsk, int index, u64 val)
|
2013-03-29 14:37:06 +08:00
|
|
|
{
|
|
|
|
struct cpuacct *ca;
|
|
|
|
|
2016-03-17 12:19:43 +08:00
|
|
|
for (ca = task_ca(tsk); ca != &root_cpuacct; ca = parent_ca(ca))
|
2020-05-07 11:10:39 +08:00
|
|
|
__this_cpu_add(ca->cpustat->cpustat[index], val);
|
2013-03-29 14:37:06 +08:00
|
|
|
}
|
|
|
|
|
2014-02-08 23:36:58 +08:00
|
|
|
struct cgroup_subsys cpuacct_cgrp_subsys = {
|
2013-03-29 14:44:15 +08:00
|
|
|
.css_alloc = cpuacct_css_alloc,
|
|
|
|
.css_free = cpuacct_css_free,
|
2014-07-15 23:05:09 +08:00
|
|
|
.legacy_cftypes = files,
|
2016-02-23 23:00:50 +08:00
|
|
|
.early_init = true,
|
2013-03-29 14:36:31 +08:00
|
|
|
};
|