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 17:07:57 +03:00
|
|
|
/* SPDX-License-Identifier: GPL-2.0 */
|
2010-09-17 19:09:00 +04:00
|
|
|
#ifndef _LINUX_JUMP_LABEL_H
|
|
|
|
#define _LINUX_JUMP_LABEL_H
|
|
|
|
|
2012-01-26 16:32:15 +04:00
|
|
|
/*
|
|
|
|
* Jump label support
|
|
|
|
*
|
|
|
|
* Copyright (C) 2009-2012 Jason Baron <jbaron@redhat.com>
|
2015-11-16 13:08:45 +03:00
|
|
|
* Copyright (C) 2011-2012 Red Hat, Inc., Peter Zijlstra
|
2012-01-26 16:32:15 +04:00
|
|
|
*
|
2015-07-30 06:59:48 +03:00
|
|
|
* DEPRECATED API:
|
|
|
|
*
|
|
|
|
* The use of 'struct static_key' directly, is now DEPRECATED. In addition
|
|
|
|
* static_key_{true,false}() is also DEPRECATED. IE DO NOT use the following:
|
|
|
|
*
|
|
|
|
* struct static_key false = STATIC_KEY_INIT_FALSE;
|
|
|
|
* struct static_key true = STATIC_KEY_INIT_TRUE;
|
|
|
|
* static_key_true()
|
|
|
|
* static_key_false()
|
|
|
|
*
|
|
|
|
* The updated API replacements are:
|
|
|
|
*
|
|
|
|
* DEFINE_STATIC_KEY_TRUE(key);
|
|
|
|
* DEFINE_STATIC_KEY_FALSE(key);
|
2016-09-05 20:25:47 +03:00
|
|
|
* DEFINE_STATIC_KEY_ARRAY_TRUE(keys, count);
|
|
|
|
* DEFINE_STATIC_KEY_ARRAY_FALSE(keys, count);
|
2015-09-15 02:11:05 +03:00
|
|
|
* static_branch_likely()
|
|
|
|
* static_branch_unlikely()
|
2015-07-30 06:59:48 +03:00
|
|
|
*
|
2012-01-26 16:32:15 +04:00
|
|
|
* Jump labels provide an interface to generate dynamic branches using
|
2015-07-30 06:59:48 +03:00
|
|
|
* self-modifying code. Assuming toolchain and architecture support, if we
|
|
|
|
* define a "key" that is initially false via "DEFINE_STATIC_KEY_FALSE(key)",
|
|
|
|
* an "if (static_branch_unlikely(&key))" statement is an unconditional branch
|
|
|
|
* (which defaults to false - and the true block is placed out of line).
|
|
|
|
* Similarly, we can define an initially true key via
|
|
|
|
* "DEFINE_STATIC_KEY_TRUE(key)", and use it in the same
|
|
|
|
* "if (static_branch_unlikely(&key))", in which case we will generate an
|
|
|
|
* unconditional branch to the out-of-line true branch. Keys that are
|
|
|
|
* initially true or false can be using in both static_branch_unlikely()
|
|
|
|
* and static_branch_likely() statements.
|
2012-01-26 16:32:15 +04:00
|
|
|
*
|
2015-07-30 06:59:48 +03:00
|
|
|
* At runtime we can change the branch target by setting the key
|
|
|
|
* to true via a call to static_branch_enable(), or false using
|
|
|
|
* static_branch_disable(). If the direction of the branch is switched by
|
|
|
|
* these calls then we run-time modify the branch target via a
|
|
|
|
* no-op -> jump or jump -> no-op conversion. For example, for an
|
|
|
|
* initially false key that is used in an "if (static_branch_unlikely(&key))"
|
|
|
|
* statement, setting the key to true requires us to patch in a jump
|
|
|
|
* to the out-of-line of true branch.
|
2012-01-26 16:32:15 +04:00
|
|
|
*
|
2015-09-15 02:11:05 +03:00
|
|
|
* In addition to static_branch_{enable,disable}, we can also reference count
|
2015-07-30 06:59:48 +03:00
|
|
|
* the key or branch direction via static_branch_{inc,dec}. Thus,
|
|
|
|
* static_branch_inc() can be thought of as a 'make more true' and
|
2015-09-15 02:11:05 +03:00
|
|
|
* static_branch_dec() as a 'make more false'.
|
2015-07-30 06:59:48 +03:00
|
|
|
*
|
|
|
|
* Since this relies on modifying code, the branch modifying functions
|
2012-01-26 16:32:15 +04:00
|
|
|
* must be considered absolute slow paths (machine wide synchronization etc.).
|
2014-08-10 10:53:39 +04:00
|
|
|
* OTOH, since the affected branches are unconditional, their runtime overhead
|
2012-01-26 16:32:15 +04:00
|
|
|
* will be absolutely minimal, esp. in the default (off) case where the total
|
|
|
|
* effect is a single NOP of appropriate size. The on case will patch in a jump
|
|
|
|
* to the out-of-line block.
|
|
|
|
*
|
2014-08-10 10:53:39 +04:00
|
|
|
* When the control is directly exposed to userspace, it is prudent to delay the
|
2012-01-26 16:32:15 +04:00
|
|
|
* decrement to avoid high frequency code modifications which can (and do)
|
2012-02-24 11:31:31 +04:00
|
|
|
* cause significant performance degradation. Struct static_key_deferred and
|
|
|
|
* static_key_slow_dec_deferred() provide for this.
|
2012-01-26 16:32:15 +04:00
|
|
|
*
|
2015-07-30 06:59:48 +03:00
|
|
|
* Lacking toolchain and or architecture support, static keys fall back to a
|
|
|
|
* simple conditional branch.
|
2012-02-24 11:31:31 +04:00
|
|
|
*
|
2015-07-30 06:59:48 +03:00
|
|
|
* Additional babbling in: Documentation/static-keys.txt
|
2014-08-10 10:53:39 +04:00
|
|
|
*/
|
2012-01-26 16:32:15 +04:00
|
|
|
|
2015-04-09 06:51:31 +03:00
|
|
|
#ifndef __ASSEMBLY__
|
|
|
|
|
2011-03-17 00:29:47 +03:00
|
|
|
#include <linux/types.h>
|
|
|
|
#include <linux/compiler.h>
|
2013-10-19 23:48:53 +04:00
|
|
|
|
|
|
|
extern bool static_key_initialized;
|
|
|
|
|
2017-10-18 18:24:28 +03:00
|
|
|
#define STATIC_KEY_CHECK_USE(key) WARN(!static_key_initialized, \
|
|
|
|
"%s(): static key '%pS' used before call to jump_label_init()", \
|
|
|
|
__func__, (key))
|
2011-03-17 00:29:47 +03:00
|
|
|
|
2018-12-30 18:14:15 +03:00
|
|
|
#ifdef CONFIG_JUMP_LABEL
|
2011-03-17 00:29:47 +03:00
|
|
|
|
2012-02-24 11:31:31 +04:00
|
|
|
struct static_key {
|
2011-03-17 00:29:47 +03:00
|
|
|
atomic_t enabled;
|
jump_label: Reduce the size of struct static_key
The static_key->next field goes mostly unused. The field is used for
associating module uses with a static key. Most uses of struct static_key
define a static key in the core kernel and make use of it entirely within
the core kernel, or define the static key in a module and make use of it
only from within that module. In fact, of the ~3,000 static keys defined,
I found only about 5 or so that did not fit this pattern.
Thus, we can remove the static_key->next field entirely and overload
the static_key->entries field. That is, when all the static_key uses
are contained within the same module, static_key->entries continues
to point to those uses. However, if the static_key uses are not contained
within the module where the static_key is defined, then we allocate a
struct static_key_mod, store a pointer to the uses within that
struct static_key_mod, and have the static key point at the static_key_mod.
This does incur some extra memory usage when a static_key is used in a
module that does not define it, but since there are only a handful of such
cases there is a net savings.
In order to identify if the static_key->entries pointer contains a
struct static_key_mod or a struct jump_entry pointer, bit 1 of
static_key->entries is set to 1 if it points to a struct static_key_mod and
is 0 if it points to a struct jump_entry. We were already using bit 0 in a
similar way to store the initial value of the static_key. This does mean
that allocations of struct static_key_mod and that the struct jump_entry
tables need to be at least 4-byte aligned in memory. As far as I can tell
all arches meet this criteria.
For my .config, the patch increased the text by 778 bytes, but reduced
the data + bss size by 14912, for a net savings of 14,134 bytes.
text data bss dec hex filename
8092427 5016512 790528 13899467 d416cb vmlinux.pre
8093205 5001600 790528 13885333 d3df95 vmlinux.post
Link: http://lkml.kernel.org/r/1486154544-4321-1-git-send-email-jbaron@akamai.com
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Joe Perches <joe@perches.com>
Signed-off-by: Jason Baron <jbaron@akamai.com>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
2017-02-03 23:42:24 +03:00
|
|
|
/*
|
2017-03-03 01:28:45 +03:00
|
|
|
* Note:
|
|
|
|
* To make anonymous unions work with old compilers, the static
|
|
|
|
* initialization of them requires brackets. This creates a dependency
|
|
|
|
* on the order of the struct with the initializers. If any fields
|
|
|
|
* are added, STATIC_KEY_INIT_TRUE and STATIC_KEY_INIT_FALSE may need
|
|
|
|
* to be modified.
|
|
|
|
*
|
jump_label: Reduce the size of struct static_key
The static_key->next field goes mostly unused. The field is used for
associating module uses with a static key. Most uses of struct static_key
define a static key in the core kernel and make use of it entirely within
the core kernel, or define the static key in a module and make use of it
only from within that module. In fact, of the ~3,000 static keys defined,
I found only about 5 or so that did not fit this pattern.
Thus, we can remove the static_key->next field entirely and overload
the static_key->entries field. That is, when all the static_key uses
are contained within the same module, static_key->entries continues
to point to those uses. However, if the static_key uses are not contained
within the module where the static_key is defined, then we allocate a
struct static_key_mod, store a pointer to the uses within that
struct static_key_mod, and have the static key point at the static_key_mod.
This does incur some extra memory usage when a static_key is used in a
module that does not define it, but since there are only a handful of such
cases there is a net savings.
In order to identify if the static_key->entries pointer contains a
struct static_key_mod or a struct jump_entry pointer, bit 1 of
static_key->entries is set to 1 if it points to a struct static_key_mod and
is 0 if it points to a struct jump_entry. We were already using bit 0 in a
similar way to store the initial value of the static_key. This does mean
that allocations of struct static_key_mod and that the struct jump_entry
tables need to be at least 4-byte aligned in memory. As far as I can tell
all arches meet this criteria.
For my .config, the patch increased the text by 778 bytes, but reduced
the data + bss size by 14912, for a net savings of 14,134 bytes.
text data bss dec hex filename
8092427 5016512 790528 13899467 d416cb vmlinux.pre
8093205 5001600 790528 13885333 d3df95 vmlinux.post
Link: http://lkml.kernel.org/r/1486154544-4321-1-git-send-email-jbaron@akamai.com
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Joe Perches <joe@perches.com>
Signed-off-by: Jason Baron <jbaron@akamai.com>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
2017-02-03 23:42:24 +03:00
|
|
|
* bit 0 => 1 if key is initially true
|
|
|
|
* 0 if initially false
|
|
|
|
* bit 1 => 1 if points to struct static_key_mod
|
|
|
|
* 0 if points to struct jump_entry
|
|
|
|
*/
|
|
|
|
union {
|
|
|
|
unsigned long type;
|
|
|
|
struct jump_entry *entries;
|
|
|
|
struct static_key_mod *next;
|
|
|
|
};
|
2011-03-17 00:29:47 +03:00
|
|
|
};
|
|
|
|
|
2014-06-05 03:10:07 +04:00
|
|
|
#else
|
|
|
|
struct static_key {
|
|
|
|
atomic_t enabled;
|
|
|
|
};
|
2018-12-30 18:14:15 +03:00
|
|
|
#endif /* CONFIG_JUMP_LABEL */
|
2015-04-09 06:51:31 +03:00
|
|
|
#endif /* __ASSEMBLY__ */
|
|
|
|
|
2018-12-30 18:14:15 +03:00
|
|
|
#ifdef CONFIG_JUMP_LABEL
|
2015-04-09 06:51:31 +03:00
|
|
|
#include <asm/jump_label.h>
|
2018-09-19 09:51:36 +03:00
|
|
|
|
|
|
|
#ifndef __ASSEMBLY__
|
2018-09-19 09:51:37 +03:00
|
|
|
#ifdef CONFIG_HAVE_ARCH_JUMP_LABEL_RELATIVE
|
|
|
|
|
|
|
|
struct jump_entry {
|
|
|
|
s32 code;
|
|
|
|
s32 target;
|
|
|
|
long key; // key may be far away from the core kernel under KASLR
|
|
|
|
};
|
|
|
|
|
|
|
|
static inline unsigned long jump_entry_code(const struct jump_entry *entry)
|
|
|
|
{
|
|
|
|
return (unsigned long)&entry->code + entry->code;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline unsigned long jump_entry_target(const struct jump_entry *entry)
|
|
|
|
{
|
|
|
|
return (unsigned long)&entry->target + entry->target;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline struct static_key *jump_entry_key(const struct jump_entry *entry)
|
|
|
|
{
|
2018-09-19 09:51:42 +03:00
|
|
|
long offset = entry->key & ~3L;
|
2018-09-19 09:51:37 +03:00
|
|
|
|
|
|
|
return (struct static_key *)((unsigned long)&entry->key + offset);
|
|
|
|
}
|
|
|
|
|
|
|
|
#else
|
2018-09-19 09:51:36 +03:00
|
|
|
|
|
|
|
static inline unsigned long jump_entry_code(const struct jump_entry *entry)
|
|
|
|
{
|
|
|
|
return entry->code;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline unsigned long jump_entry_target(const struct jump_entry *entry)
|
|
|
|
{
|
|
|
|
return entry->target;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline struct static_key *jump_entry_key(const struct jump_entry *entry)
|
|
|
|
{
|
2018-09-19 09:51:42 +03:00
|
|
|
return (struct static_key *)((unsigned long)entry->key & ~3UL);
|
2018-09-19 09:51:36 +03:00
|
|
|
}
|
|
|
|
|
2018-09-19 09:51:37 +03:00
|
|
|
#endif
|
|
|
|
|
2018-09-19 09:51:36 +03:00
|
|
|
static inline bool jump_entry_is_branch(const struct jump_entry *entry)
|
|
|
|
{
|
|
|
|
return (unsigned long)entry->key & 1UL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline bool jump_entry_is_init(const struct jump_entry *entry)
|
|
|
|
{
|
2018-09-19 09:51:42 +03:00
|
|
|
return (unsigned long)entry->key & 2UL;
|
2018-09-19 09:51:36 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static inline void jump_entry_set_init(struct jump_entry *entry)
|
|
|
|
{
|
2018-09-19 09:51:42 +03:00
|
|
|
entry->key |= 2;
|
2018-09-19 09:51:36 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
#endif
|
2015-04-09 06:51:31 +03:00
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifndef __ASSEMBLY__
|
2010-09-17 19:09:00 +04:00
|
|
|
|
|
|
|
enum jump_label_type {
|
2015-07-24 15:45:44 +03:00
|
|
|
JUMP_LABEL_NOP = 0,
|
|
|
|
JUMP_LABEL_JMP,
|
2010-09-17 19:09:00 +04:00
|
|
|
};
|
|
|
|
|
|
|
|
struct module;
|
|
|
|
|
2018-12-30 18:14:15 +03:00
|
|
|
#ifdef CONFIG_JUMP_LABEL
|
2016-06-21 19:52:17 +03:00
|
|
|
|
jump_label: Reduce the size of struct static_key
The static_key->next field goes mostly unused. The field is used for
associating module uses with a static key. Most uses of struct static_key
define a static key in the core kernel and make use of it entirely within
the core kernel, or define the static key in a module and make use of it
only from within that module. In fact, of the ~3,000 static keys defined,
I found only about 5 or so that did not fit this pattern.
Thus, we can remove the static_key->next field entirely and overload
the static_key->entries field. That is, when all the static_key uses
are contained within the same module, static_key->entries continues
to point to those uses. However, if the static_key uses are not contained
within the module where the static_key is defined, then we allocate a
struct static_key_mod, store a pointer to the uses within that
struct static_key_mod, and have the static key point at the static_key_mod.
This does incur some extra memory usage when a static_key is used in a
module that does not define it, but since there are only a handful of such
cases there is a net savings.
In order to identify if the static_key->entries pointer contains a
struct static_key_mod or a struct jump_entry pointer, bit 1 of
static_key->entries is set to 1 if it points to a struct static_key_mod and
is 0 if it points to a struct jump_entry. We were already using bit 0 in a
similar way to store the initial value of the static_key. This does mean
that allocations of struct static_key_mod and that the struct jump_entry
tables need to be at least 4-byte aligned in memory. As far as I can tell
all arches meet this criteria.
For my .config, the patch increased the text by 778 bytes, but reduced
the data + bss size by 14912, for a net savings of 14,134 bytes.
text data bss dec hex filename
8092427 5016512 790528 13899467 d416cb vmlinux.pre
8093205 5001600 790528 13885333 d3df95 vmlinux.post
Link: http://lkml.kernel.org/r/1486154544-4321-1-git-send-email-jbaron@akamai.com
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Joe Perches <joe@perches.com>
Signed-off-by: Jason Baron <jbaron@akamai.com>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
2017-02-03 23:42:24 +03:00
|
|
|
#define JUMP_TYPE_FALSE 0UL
|
|
|
|
#define JUMP_TYPE_TRUE 1UL
|
|
|
|
#define JUMP_TYPE_LINKED 2UL
|
|
|
|
#define JUMP_TYPE_MASK 3UL
|
2012-02-24 11:31:31 +04:00
|
|
|
|
|
|
|
static __always_inline bool static_key_false(struct static_key *key)
|
|
|
|
{
|
2015-07-24 16:09:55 +03:00
|
|
|
return arch_static_branch(key, false);
|
2012-02-24 11:31:31 +04:00
|
|
|
}
|
2011-03-17 00:29:47 +03:00
|
|
|
|
2012-02-24 11:31:31 +04:00
|
|
|
static __always_inline bool static_key_true(struct static_key *key)
|
|
|
|
{
|
2015-07-24 16:09:55 +03:00
|
|
|
return !arch_static_branch(key, true);
|
2012-02-24 11:31:31 +04:00
|
|
|
}
|
|
|
|
|
2010-09-17 19:09:00 +04:00
|
|
|
extern struct jump_entry __start___jump_table[];
|
|
|
|
extern struct jump_entry __stop___jump_table[];
|
|
|
|
|
2011-10-13 03:17:54 +04:00
|
|
|
extern void jump_label_init(void);
|
2010-10-02 01:23:48 +04:00
|
|
|
extern void jump_label_lock(void);
|
|
|
|
extern void jump_label_unlock(void);
|
2010-09-17 19:09:00 +04:00
|
|
|
extern void arch_jump_label_transform(struct jump_entry *entry,
|
2011-09-29 22:10:05 +04:00
|
|
|
enum jump_label_type type);
|
2011-10-03 22:01:46 +04:00
|
|
|
extern void arch_jump_label_transform_static(struct jump_entry *entry,
|
|
|
|
enum jump_label_type type);
|
jump_label: Batch updates if arch supports it
If the architecture supports the batching of jump label updates, use it!
An easy way to see the benefits of this patch is switching the
schedstats on and off. For instance:
-------------------------- %< ----------------------------
#!/bin/sh
while [ true ]; do
sysctl -w kernel.sched_schedstats=1
sleep 2
sysctl -w kernel.sched_schedstats=0
sleep 2
done
-------------------------- >% ----------------------------
while watching the IPI count:
-------------------------- %< ----------------------------
# watch -n1 "cat /proc/interrupts | grep Function"
-------------------------- >% ----------------------------
With the current mode, it is possible to see +- 168 IPIs each 2 seconds,
while with this patch the number of IPIs goes to 3 each 2 seconds.
Regarding the performance impact of this patch set, I made two measurements:
The time to update a key (the task that is causing the change)
The time to run the int3 handler (the side effect on a thread that
hits the code being changed)
The schedstats static key was chosen as the key to being switched on and off.
The reason being is that it is used in more than 56 places, in a hot path. The
change in the schedstats static key will be done with the following command:
while [ true ]; do
sysctl -w kernel.sched_schedstats=1
usleep 500000
sysctl -w kernel.sched_schedstats=0
usleep 500000
done
In this way, they key will be updated twice per second. To force the hit of the
int3 handler, the system will also run a kernel compilation with two jobs per
CPU. The test machine is a two nodes/24 CPUs box with an Intel Xeon processor
@2.27GHz.
Regarding the update part, on average, the regular kernel takes 57 ms to update
the schedstats key, while the kernel with the batch updates takes just 1.4 ms
on average. Although it seems to be too good to be true, it makes sense: the
schedstats key is used in 56 places, so it was expected that it would take
around 56 times to update the keys with the current implementation, as the
IPIs are the most expensive part of the update.
Regarding the int3 handler, the non-batch handler takes 45 ns on average, while
the batch version takes around 180 ns. At first glance, it seems to be a high
value. But it is not, considering that it is doing 56 updates, rather than one!
It is taking four times more, only. This gain is possible because the patch
uses a binary search in the vector: log2(56)=5.8. So, it was expected to have
an overhead within four times.
(voice of tv propaganda) But, that is not all! As the int3 handler keeps on for
a shorter period (because the update part is on for a shorter time), the number
of hits in the int3 handler decreased by 10%.
The question then is: Is it worth paying the price of "135 ns" more in the int3
handler?
Considering that, in this test case, we are saving the handling of 53 IPIs,
that takes more than these 135 ns, it seems to be a meager price to be paid.
Moreover, the test case was forcing the hit of the int3, in practice, it
does not take that often. While the IPI takes place on all CPUs, hitting
the int3 handler or not!
For instance, in an isolated CPU with a process running in user-space
(nohz_full use-case), the chances of hitting the int3 handler is barely zero,
while there is no way to avoid the IPIs. By bounding the IPIs, we are improving
a lot this scenario.
Signed-off-by: Daniel Bristot de Oliveira <bristot@redhat.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Chris von Recklinghausen <crecklin@redhat.com>
Cc: Clark Williams <williams@redhat.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Jason Baron <jbaron@akamai.com>
Cc: Jiri Kosina <jkosina@suse.cz>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Marcelo Tosatti <mtosatti@redhat.com>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Scott Wood <swood@redhat.com>
Cc: Steven Rostedt (VMware) <rostedt@goodmis.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: https://lkml.kernel.org/r/acc891dbc2dbc9fd616dd680529a2337b1d1274c.1560325897.git.bristot@redhat.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2019-06-12 12:57:30 +03:00
|
|
|
extern bool arch_jump_label_transform_queue(struct jump_entry *entry,
|
|
|
|
enum jump_label_type type);
|
|
|
|
extern void arch_jump_label_transform_apply(void);
|
2010-09-17 19:09:08 +04:00
|
|
|
extern int jump_label_text_reserved(void *start, void *end);
|
2012-02-24 11:31:31 +04:00
|
|
|
extern void static_key_slow_inc(struct static_key *key);
|
|
|
|
extern void static_key_slow_dec(struct static_key *key);
|
2018-01-23 00:53:28 +03:00
|
|
|
extern void static_key_slow_inc_cpuslocked(struct static_key *key);
|
|
|
|
extern void static_key_slow_dec_cpuslocked(struct static_key *key);
|
2011-03-17 00:29:47 +03:00
|
|
|
extern void jump_label_apply_nops(struct module *mod);
|
2016-08-03 23:46:36 +03:00
|
|
|
extern int static_key_count(struct static_key *key);
|
|
|
|
extern void static_key_enable(struct static_key *key);
|
|
|
|
extern void static_key_disable(struct static_key *key);
|
2017-08-01 11:02:56 +03:00
|
|
|
extern void static_key_enable_cpuslocked(struct static_key *key);
|
|
|
|
extern void static_key_disable_cpuslocked(struct static_key *key);
|
2012-02-24 11:31:31 +04:00
|
|
|
|
2016-08-03 23:46:36 +03:00
|
|
|
/*
|
|
|
|
* We should be using ATOMIC_INIT() for initializing .enabled, but
|
|
|
|
* the inclusion of atomic.h is problematic for inclusion of jump_label.h
|
|
|
|
* in 'low-level' headers. Thus, we are initializing .enabled with a
|
|
|
|
* raw value, but have added a BUILD_BUG_ON() to catch any issues in
|
|
|
|
* jump_label_init() see: kernel/jump_label.c.
|
|
|
|
*/
|
2015-07-24 16:09:55 +03:00
|
|
|
#define STATIC_KEY_INIT_TRUE \
|
2016-08-03 23:46:36 +03:00
|
|
|
{ .enabled = { 1 }, \
|
2017-02-28 19:32:22 +03:00
|
|
|
{ .entries = (void *)JUMP_TYPE_TRUE } }
|
2015-07-24 16:09:55 +03:00
|
|
|
#define STATIC_KEY_INIT_FALSE \
|
2016-08-03 23:46:36 +03:00
|
|
|
{ .enabled = { 0 }, \
|
2017-02-28 19:32:22 +03:00
|
|
|
{ .entries = (void *)JUMP_TYPE_FALSE } }
|
2010-09-17 19:09:00 +04:00
|
|
|
|
2018-12-30 18:14:15 +03:00
|
|
|
#else /* !CONFIG_JUMP_LABEL */
|
2010-09-17 19:09:00 +04:00
|
|
|
|
2016-08-03 23:46:36 +03:00
|
|
|
#include <linux/atomic.h>
|
|
|
|
#include <linux/bug.h>
|
|
|
|
|
2016-06-21 19:52:17 +03:00
|
|
|
static inline int static_key_count(struct static_key *key)
|
|
|
|
{
|
|
|
|
return atomic_read(&key->enabled);
|
|
|
|
}
|
|
|
|
|
2011-10-13 03:17:54 +04:00
|
|
|
static __always_inline void jump_label_init(void)
|
|
|
|
{
|
2013-10-19 23:48:53 +04:00
|
|
|
static_key_initialized = true;
|
2011-10-13 03:17:54 +04:00
|
|
|
}
|
|
|
|
|
2012-02-24 11:31:31 +04:00
|
|
|
static __always_inline bool static_key_false(struct static_key *key)
|
|
|
|
{
|
2014-06-05 03:10:07 +04:00
|
|
|
if (unlikely(static_key_count(key) > 0))
|
2012-02-24 11:31:31 +04:00
|
|
|
return true;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
static __always_inline bool static_key_true(struct static_key *key)
|
2011-03-17 00:29:47 +03:00
|
|
|
{
|
2014-06-05 03:10:07 +04:00
|
|
|
if (likely(static_key_count(key) > 0))
|
2011-03-17 00:29:47 +03:00
|
|
|
return true;
|
|
|
|
return false;
|
|
|
|
}
|
2010-09-17 19:09:00 +04:00
|
|
|
|
2012-02-24 11:31:31 +04:00
|
|
|
static inline void static_key_slow_inc(struct static_key *key)
|
2011-03-17 00:29:47 +03:00
|
|
|
{
|
2017-10-18 18:24:28 +03:00
|
|
|
STATIC_KEY_CHECK_USE(key);
|
2011-03-17 00:29:47 +03:00
|
|
|
atomic_inc(&key->enabled);
|
|
|
|
}
|
2010-09-17 19:09:00 +04:00
|
|
|
|
2012-02-24 11:31:31 +04:00
|
|
|
static inline void static_key_slow_dec(struct static_key *key)
|
2010-09-17 19:09:00 +04:00
|
|
|
{
|
2017-10-18 18:24:28 +03:00
|
|
|
STATIC_KEY_CHECK_USE(key);
|
2011-03-17 00:29:47 +03:00
|
|
|
atomic_dec(&key->enabled);
|
2010-09-17 19:09:00 +04:00
|
|
|
}
|
|
|
|
|
2018-01-23 00:53:28 +03:00
|
|
|
#define static_key_slow_inc_cpuslocked(key) static_key_slow_inc(key)
|
|
|
|
#define static_key_slow_dec_cpuslocked(key) static_key_slow_dec(key)
|
|
|
|
|
2010-09-17 19:09:08 +04:00
|
|
|
static inline int jump_label_text_reserved(void *start, void *end)
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2010-10-02 01:23:48 +04:00
|
|
|
static inline void jump_label_lock(void) {}
|
|
|
|
static inline void jump_label_unlock(void) {}
|
|
|
|
|
2011-03-17 00:29:47 +03:00
|
|
|
static inline int jump_label_apply_nops(struct module *mod)
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
2011-11-27 19:59:09 +04:00
|
|
|
|
2015-07-24 16:03:40 +03:00
|
|
|
static inline void static_key_enable(struct static_key *key)
|
|
|
|
{
|
2017-10-18 18:24:28 +03:00
|
|
|
STATIC_KEY_CHECK_USE(key);
|
2015-07-24 16:03:40 +03:00
|
|
|
|
2017-08-01 18:24:04 +03:00
|
|
|
if (atomic_read(&key->enabled) != 0) {
|
|
|
|
WARN_ON_ONCE(atomic_read(&key->enabled) != 1);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
atomic_set(&key->enabled, 1);
|
2015-07-24 16:03:40 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static inline void static_key_disable(struct static_key *key)
|
|
|
|
{
|
2017-10-18 18:24:28 +03:00
|
|
|
STATIC_KEY_CHECK_USE(key);
|
2015-07-24 16:03:40 +03:00
|
|
|
|
2017-08-01 18:24:04 +03:00
|
|
|
if (atomic_read(&key->enabled) != 1) {
|
|
|
|
WARN_ON_ONCE(atomic_read(&key->enabled) != 0);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
atomic_set(&key->enabled, 0);
|
2015-07-24 16:03:40 +03:00
|
|
|
}
|
|
|
|
|
2017-08-01 11:02:56 +03:00
|
|
|
#define static_key_enable_cpuslocked(k) static_key_enable((k))
|
|
|
|
#define static_key_disable_cpuslocked(k) static_key_disable((k))
|
|
|
|
|
2016-08-03 23:46:36 +03:00
|
|
|
#define STATIC_KEY_INIT_TRUE { .enabled = ATOMIC_INIT(1) }
|
|
|
|
#define STATIC_KEY_INIT_FALSE { .enabled = ATOMIC_INIT(0) }
|
|
|
|
|
2018-12-30 18:14:15 +03:00
|
|
|
#endif /* CONFIG_JUMP_LABEL */
|
2016-08-03 23:46:36 +03:00
|
|
|
|
|
|
|
#define STATIC_KEY_INIT STATIC_KEY_INIT_FALSE
|
|
|
|
#define jump_label_enabled static_key_enabled
|
|
|
|
|
2015-07-24 16:09:55 +03:00
|
|
|
/* -------------------------------------------------------------------------- */
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Two type wrappers around static_key, such that we can use compile time
|
|
|
|
* type differentiation to emit the right code.
|
|
|
|
*
|
|
|
|
* All the below code is macros in order to play type games.
|
|
|
|
*/
|
|
|
|
|
|
|
|
struct static_key_true {
|
|
|
|
struct static_key key;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct static_key_false {
|
|
|
|
struct static_key key;
|
|
|
|
};
|
|
|
|
|
|
|
|
#define STATIC_KEY_TRUE_INIT (struct static_key_true) { .key = STATIC_KEY_INIT_TRUE, }
|
|
|
|
#define STATIC_KEY_FALSE_INIT (struct static_key_false){ .key = STATIC_KEY_INIT_FALSE, }
|
|
|
|
|
|
|
|
#define DEFINE_STATIC_KEY_TRUE(name) \
|
|
|
|
struct static_key_true name = STATIC_KEY_TRUE_INIT
|
|
|
|
|
2018-07-03 22:43:08 +03:00
|
|
|
#define DEFINE_STATIC_KEY_TRUE_RO(name) \
|
|
|
|
struct static_key_true name __ro_after_init = STATIC_KEY_TRUE_INIT
|
|
|
|
|
2016-09-01 21:39:33 +03:00
|
|
|
#define DECLARE_STATIC_KEY_TRUE(name) \
|
|
|
|
extern struct static_key_true name
|
|
|
|
|
2015-07-24 16:09:55 +03:00
|
|
|
#define DEFINE_STATIC_KEY_FALSE(name) \
|
|
|
|
struct static_key_false name = STATIC_KEY_FALSE_INIT
|
|
|
|
|
2018-07-03 22:43:08 +03:00
|
|
|
#define DEFINE_STATIC_KEY_FALSE_RO(name) \
|
|
|
|
struct static_key_false name __ro_after_init = STATIC_KEY_FALSE_INIT
|
|
|
|
|
2016-09-01 21:39:33 +03:00
|
|
|
#define DECLARE_STATIC_KEY_FALSE(name) \
|
|
|
|
extern struct static_key_false name
|
|
|
|
|
2016-09-05 20:25:47 +03:00
|
|
|
#define DEFINE_STATIC_KEY_ARRAY_TRUE(name, count) \
|
|
|
|
struct static_key_true name[count] = { \
|
|
|
|
[0 ... (count) - 1] = STATIC_KEY_TRUE_INIT, \
|
|
|
|
}
|
|
|
|
|
|
|
|
#define DEFINE_STATIC_KEY_ARRAY_FALSE(name, count) \
|
|
|
|
struct static_key_false name[count] = { \
|
|
|
|
[0 ... (count) - 1] = STATIC_KEY_FALSE_INIT, \
|
|
|
|
}
|
|
|
|
|
2015-09-18 18:56:28 +03:00
|
|
|
extern bool ____wrong_branch_error(void);
|
|
|
|
|
|
|
|
#define static_key_enabled(x) \
|
|
|
|
({ \
|
|
|
|
if (!__builtin_types_compatible_p(typeof(*x), struct static_key) && \
|
|
|
|
!__builtin_types_compatible_p(typeof(*x), struct static_key_true) &&\
|
|
|
|
!__builtin_types_compatible_p(typeof(*x), struct static_key_false)) \
|
|
|
|
____wrong_branch_error(); \
|
|
|
|
static_key_count((struct static_key *)x) > 0; \
|
|
|
|
})
|
|
|
|
|
2018-12-30 18:14:15 +03:00
|
|
|
#ifdef CONFIG_JUMP_LABEL
|
2015-07-24 16:09:55 +03:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Combine the right initial value (type) with the right branch order
|
|
|
|
* to generate the desired result.
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* type\branch| likely (1) | unlikely (0)
|
|
|
|
* -----------+-----------------------+------------------
|
|
|
|
* | |
|
|
|
|
* true (1) | ... | ...
|
|
|
|
* | NOP | JMP L
|
|
|
|
* | <br-stmts> | 1: ...
|
|
|
|
* | L: ... |
|
|
|
|
* | |
|
|
|
|
* | | L: <br-stmts>
|
|
|
|
* | | jmp 1b
|
|
|
|
* | |
|
|
|
|
* -----------+-----------------------+------------------
|
|
|
|
* | |
|
|
|
|
* false (0) | ... | ...
|
|
|
|
* | JMP L | NOP
|
|
|
|
* | <br-stmts> | 1: ...
|
|
|
|
* | L: ... |
|
|
|
|
* | |
|
|
|
|
* | | L: <br-stmts>
|
|
|
|
* | | jmp 1b
|
|
|
|
* | |
|
|
|
|
* -----------+-----------------------+------------------
|
|
|
|
*
|
|
|
|
* The initial value is encoded in the LSB of static_key::entries,
|
|
|
|
* type: 0 = false, 1 = true.
|
|
|
|
*
|
|
|
|
* The branch type is encoded in the LSB of jump_entry::key,
|
|
|
|
* branch: 0 = unlikely, 1 = likely.
|
|
|
|
*
|
|
|
|
* This gives the following logic table:
|
|
|
|
*
|
|
|
|
* enabled type branch instuction
|
|
|
|
* -----------------------------+-----------
|
|
|
|
* 0 0 0 | NOP
|
|
|
|
* 0 0 1 | JMP
|
|
|
|
* 0 1 0 | NOP
|
|
|
|
* 0 1 1 | JMP
|
|
|
|
*
|
|
|
|
* 1 0 0 | JMP
|
|
|
|
* 1 0 1 | NOP
|
|
|
|
* 1 1 0 | JMP
|
|
|
|
* 1 1 1 | NOP
|
|
|
|
*
|
|
|
|
* Which gives the following functions:
|
|
|
|
*
|
|
|
|
* dynamic: instruction = enabled ^ branch
|
|
|
|
* static: instruction = type ^ branch
|
|
|
|
*
|
|
|
|
* See jump_label_type() / jump_label_init_type().
|
|
|
|
*/
|
|
|
|
|
|
|
|
#define static_branch_likely(x) \
|
|
|
|
({ \
|
|
|
|
bool branch; \
|
|
|
|
if (__builtin_types_compatible_p(typeof(*x), struct static_key_true)) \
|
|
|
|
branch = !arch_static_branch(&(x)->key, true); \
|
|
|
|
else if (__builtin_types_compatible_p(typeof(*x), struct static_key_false)) \
|
|
|
|
branch = !arch_static_branch_jump(&(x)->key, true); \
|
|
|
|
else \
|
|
|
|
branch = ____wrong_branch_error(); \
|
2018-01-18 16:38:11 +03:00
|
|
|
likely(branch); \
|
2015-07-24 16:09:55 +03:00
|
|
|
})
|
|
|
|
|
|
|
|
#define static_branch_unlikely(x) \
|
|
|
|
({ \
|
|
|
|
bool branch; \
|
|
|
|
if (__builtin_types_compatible_p(typeof(*x), struct static_key_true)) \
|
|
|
|
branch = arch_static_branch_jump(&(x)->key, false); \
|
|
|
|
else if (__builtin_types_compatible_p(typeof(*x), struct static_key_false)) \
|
|
|
|
branch = arch_static_branch(&(x)->key, false); \
|
|
|
|
else \
|
|
|
|
branch = ____wrong_branch_error(); \
|
2018-01-18 16:38:11 +03:00
|
|
|
unlikely(branch); \
|
2015-07-24 16:09:55 +03:00
|
|
|
})
|
|
|
|
|
2018-12-30 18:14:15 +03:00
|
|
|
#else /* !CONFIG_JUMP_LABEL */
|
2015-07-24 16:09:55 +03:00
|
|
|
|
|
|
|
#define static_branch_likely(x) likely(static_key_enabled(&(x)->key))
|
|
|
|
#define static_branch_unlikely(x) unlikely(static_key_enabled(&(x)->key))
|
|
|
|
|
2018-12-30 18:14:15 +03:00
|
|
|
#endif /* CONFIG_JUMP_LABEL */
|
2015-07-24 16:09:55 +03:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Advanced usage; refcount, branch is enabled when: count != 0
|
|
|
|
*/
|
|
|
|
|
|
|
|
#define static_branch_inc(x) static_key_slow_inc(&(x)->key)
|
|
|
|
#define static_branch_dec(x) static_key_slow_dec(&(x)->key)
|
2018-01-23 00:53:28 +03:00
|
|
|
#define static_branch_inc_cpuslocked(x) static_key_slow_inc_cpuslocked(&(x)->key)
|
|
|
|
#define static_branch_dec_cpuslocked(x) static_key_slow_dec_cpuslocked(&(x)->key)
|
2015-07-24 16:09:55 +03:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Normal usage; boolean enable/disable.
|
|
|
|
*/
|
|
|
|
|
2017-08-01 11:02:56 +03:00
|
|
|
#define static_branch_enable(x) static_key_enable(&(x)->key)
|
|
|
|
#define static_branch_disable(x) static_key_disable(&(x)->key)
|
|
|
|
#define static_branch_enable_cpuslocked(x) static_key_enable_cpuslocked(&(x)->key)
|
|
|
|
#define static_branch_disable_cpuslocked(x) static_key_disable_cpuslocked(&(x)->key)
|
2015-07-24 16:09:55 +03:00
|
|
|
|
2015-04-09 06:51:31 +03:00
|
|
|
#endif /* __ASSEMBLY__ */
|
2017-01-18 20:38:04 +03:00
|
|
|
|
|
|
|
#endif /* _LINUX_JUMP_LABEL_H */
|