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 */
|
2008-10-23 13:26:29 +08:00
|
|
|
#ifndef _ASM_X86_ALTERNATIVE_H
|
|
|
|
|
#define _ASM_X86_ALTERNATIVE_H
|
2008-01-30 20:30:30 +08:00
|
|
|
|
2016-04-27 03:23:25 +08:00
|
|
|
#ifndef __ASSEMBLY__
|
|
|
|
|
|
2008-01-30 20:30:30 +08:00
|
|
|
#include <linux/types.h>
|
|
|
|
|
#include <linux/stddef.h>
|
2009-04-28 23:13:46 +08:00
|
|
|
#include <linux/stringify.h>
|
2008-01-30 20:30:30 +08:00
|
|
|
#include <asm/asm.h>
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Alternative inline assembly for SMP.
|
|
|
|
|
*
|
|
|
|
|
* The LOCK_PREFIX macro defined here replaces the LOCK and
|
|
|
|
|
* LOCK_PREFIX macros used everywhere in the source tree.
|
|
|
|
|
*
|
|
|
|
|
* SMP alternatives use the same data structures as the other
|
|
|
|
|
* alternatives and the X86_FEATURE_UP flag to indicate the case of a
|
|
|
|
|
* UP system running a SMP kernel. The existing apply_alternatives()
|
|
|
|
|
* works fine for patching a SMP kernel for UP.
|
|
|
|
|
*
|
|
|
|
|
* The SMP alternative tables can be kept after boot and contain both
|
|
|
|
|
* UP and SMP versions of the instructions to allow switching back to
|
|
|
|
|
* SMP at runtime, when hotplugging in a new CPU, which is especially
|
|
|
|
|
* useful in virtualized environments.
|
|
|
|
|
*
|
|
|
|
|
* The very common lock prefix is handled as special case in a
|
|
|
|
|
* separate table which is a pure address list without replacement ptr
|
|
|
|
|
* and size information. That keeps the table sizes small.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#ifdef CONFIG_SMP
|
2010-02-24 17:54:22 +08:00
|
|
|
#define LOCK_PREFIX_HERE \
|
2012-09-22 03:43:08 +08:00
|
|
|
".pushsection .smp_locks,\"a\"\n" \
|
|
|
|
|
".balign 4\n" \
|
|
|
|
|
".long 671f - .\n" /* offset */ \
|
|
|
|
|
".popsection\n" \
|
2010-02-24 17:54:22 +08:00
|
|
|
"671:"
|
|
|
|
|
|
|
|
|
|
#define LOCK_PREFIX LOCK_PREFIX_HERE "\n\tlock; "
|
2008-01-30 20:30:30 +08:00
|
|
|
|
|
|
|
|
#else /* ! CONFIG_SMP */
|
2010-04-30 07:03:57 +08:00
|
|
|
#define LOCK_PREFIX_HERE ""
|
2008-01-30 20:30:30 +08:00
|
|
|
#define LOCK_PREFIX ""
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
struct alt_instr {
|
2011-07-13 21:24:10 +08:00
|
|
|
s32 instr_offset; /* original instruction */
|
|
|
|
|
s32 repl_offset; /* offset to replacement instruction */
|
2010-06-10 08:10:43 +08:00
|
|
|
u16 cpuid; /* cpuid bit set for replacement */
|
2008-01-30 20:30:30 +08:00
|
|
|
u8 instrlen; /* length of original instruction */
|
2014-12-27 17:41:52 +08:00
|
|
|
u8 replacementlen; /* length of new instruction */
|
|
|
|
|
u8 padlen; /* length of build-time padding */
|
|
|
|
|
} __packed;
|
2008-01-30 20:30:30 +08:00
|
|
|
|
2015-04-30 15:09:26 +08:00
|
|
|
/*
|
|
|
|
|
* Debug flag that can be tested to see whether alternative
|
|
|
|
|
* instructions were patched in already:
|
|
|
|
|
*/
|
|
|
|
|
extern int alternatives_patched;
|
|
|
|
|
|
2008-01-30 20:30:30 +08:00
|
|
|
extern void alternative_instructions(void);
|
|
|
|
|
extern void apply_alternatives(struct alt_instr *start, struct alt_instr *end);
|
|
|
|
|
|
|
|
|
|
struct module;
|
|
|
|
|
|
|
|
|
|
#ifdef CONFIG_SMP
|
|
|
|
|
extern void alternatives_smp_module_add(struct module *mod, char *name,
|
|
|
|
|
void *locks, void *locks_end,
|
|
|
|
|
void *text, void *text_end);
|
|
|
|
|
extern void alternatives_smp_module_del(struct module *mod);
|
2012-08-06 15:59:49 +08:00
|
|
|
extern void alternatives_enable_smp(void);
|
2010-02-03 05:49:11 +08:00
|
|
|
extern int alternatives_text_reserved(void *start, void *end);
|
2010-11-24 08:11:40 +08:00
|
|
|
extern bool skip_smp_alternatives;
|
2008-01-30 20:30:30 +08:00
|
|
|
#else
|
|
|
|
|
static inline void alternatives_smp_module_add(struct module *mod, char *name,
|
2008-03-23 16:01:37 +08:00
|
|
|
void *locks, void *locks_end,
|
|
|
|
|
void *text, void *text_end) {}
|
2008-01-30 20:30:30 +08:00
|
|
|
static inline void alternatives_smp_module_del(struct module *mod) {}
|
2012-08-06 15:59:49 +08:00
|
|
|
static inline void alternatives_enable_smp(void) {}
|
2010-02-03 05:49:11 +08:00
|
|
|
static inline int alternatives_text_reserved(void *start, void *end)
|
|
|
|
|
{
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
2008-01-30 20:30:30 +08:00
|
|
|
#endif /* CONFIG_SMP */
|
|
|
|
|
|
2014-12-27 17:41:52 +08:00
|
|
|
#define b_replacement(num) "664"#num
|
|
|
|
|
#define e_replacement(num) "665"#num
|
2012-05-25 09:19:45 +08:00
|
|
|
|
2014-12-27 17:41:52 +08:00
|
|
|
#define alt_end_marker "663"
|
|
|
|
|
#define alt_slen "662b-661b"
|
|
|
|
|
#define alt_pad_len alt_end_marker"b-662b"
|
|
|
|
|
#define alt_total_slen alt_end_marker"b-661b"
|
|
|
|
|
#define alt_rlen(num) e_replacement(num)"f-"b_replacement(num)"f"
|
2012-05-25 09:19:45 +08:00
|
|
|
|
2014-12-27 17:41:52 +08:00
|
|
|
#define __OLDINSTR(oldinstr, num) \
|
|
|
|
|
"661:\n\t" oldinstr "\n662:\n" \
|
|
|
|
|
".skip -(((" alt_rlen(num) ")-(" alt_slen ")) > 0) * " \
|
|
|
|
|
"((" alt_rlen(num) ")-(" alt_slen ")),0x90\n"
|
2012-05-25 09:19:45 +08:00
|
|
|
|
2014-12-27 17:41:52 +08:00
|
|
|
#define OLDINSTR(oldinstr, num) \
|
|
|
|
|
__OLDINSTR(oldinstr, num) \
|
|
|
|
|
alt_end_marker ":\n"
|
|
|
|
|
|
x86/alternatives: Fix ALTERNATIVE_2 padding generation properly
Quentin caught a corner case with the generation of instruction
padding in the ALTERNATIVE_2 macro: if len(orig_insn) <
len(alt1) < len(alt2), then not enough padding gets added and
that is not good(tm) as we could overwrite the beginning of the
next instruction.
Luckily, at the time of this writing, we don't have
ALTERNATIVE_2() invocations which have that problem and even if
we did, a simple fix would be to prepend the instructions with
enough prefixes so that that corner case doesn't happen.
However, best it would be if we fixed it properly. See below for
a simple, abstracted example of what we're doing.
So what we ended up doing is, we compute the
max(len(alt1), len(alt2)) - len(orig_insn)
and feed that value to the .skip gas directive. The max() cannot
have conditionals due to gas limitations, thus the fancy integer
math.
With this patch, all ALTERNATIVE_2 sites get padded correctly;
generating obscure test cases pass too:
#define alt_max_short(a, b) ((a) ^ (((a) ^ (b)) & -(-((a) < (b)))))
#define gen_skip(orig, alt1, alt2, marker) \
.skip -((alt_max_short(alt1, alt2) - (orig)) > 0) * \
(alt_max_short(alt1, alt2) - (orig)),marker
.pushsection .text, "ax"
.globl main
main:
gen_skip(1, 2, 4, 0x09)
gen_skip(4, 1, 2, 0x10)
...
.popsection
Thanks to Quentin for catching it and double-checking the fix!
Reported-by: Quentin Casasnovas <quentin.casasnovas@oracle.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/20150404133443.GE21152@pd.tnic
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2015-04-04 21:34:43 +08:00
|
|
|
/*
|
x86/alternatives: Fix alt_max_short macro to really be a max()
The alt_max_short() macro in asm/alternative.h does not work as
intended, leading to nasty bugs. E.g. alt_max_short("1", "3")
evaluates to 3, but alt_max_short("3", "1") evaluates to 1 -- not
exactly the maximum of 1 and 3.
In fact, I had to learn it the hard way by crashing my kernel in not
so funny ways by attempting to make use of the ALTENATIVE_2 macro
with alternatives where the first one was larger than the second
one.
According to [1] and commit dbe4058a6a44 ("x86/alternatives: Fix
ALTERNATIVE_2 padding generation properly") the right handed side
should read "-(-(a < b))" not "-(-(a - b))". Fix that, to make the
macro work as intended.
While at it, fix up the comments regarding the additional "-", too.
It's not about gas' usage of s32 but brain dead logic of having a
"true" value of -1 for the < operator ... *sigh*
Btw., the one in asm/alternative-asm.h is correct. And, apparently,
all current users of ALTERNATIVE_2() pass same sized alternatives,
avoiding to hit the bug.
[1] http://graphics.stanford.edu/~seander/bithacks.html#IntegerMinOrMax
Reviewed-and-tested-by: Borislav Petkov <bp@suse.de>
Fixes: dbe4058a6a44 ("x86/alternatives: Fix ALTERNATIVE_2 padding generation properly")
Signed-off-by: Mathias Krause <minipli@googlemail.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Borislav Petkov <bp@suse.de>
Cc: stable@vger.kernel.org
Link: https://lkml.kernel.org/r/1507228213-13095-1-git-send-email-minipli@googlemail.com
2017-10-06 02:30:12 +08:00
|
|
|
* gas compatible max based on the idea from:
|
x86/alternatives: Fix ALTERNATIVE_2 padding generation properly
Quentin caught a corner case with the generation of instruction
padding in the ALTERNATIVE_2 macro: if len(orig_insn) <
len(alt1) < len(alt2), then not enough padding gets added and
that is not good(tm) as we could overwrite the beginning of the
next instruction.
Luckily, at the time of this writing, we don't have
ALTERNATIVE_2() invocations which have that problem and even if
we did, a simple fix would be to prepend the instructions with
enough prefixes so that that corner case doesn't happen.
However, best it would be if we fixed it properly. See below for
a simple, abstracted example of what we're doing.
So what we ended up doing is, we compute the
max(len(alt1), len(alt2)) - len(orig_insn)
and feed that value to the .skip gas directive. The max() cannot
have conditionals due to gas limitations, thus the fancy integer
math.
With this patch, all ALTERNATIVE_2 sites get padded correctly;
generating obscure test cases pass too:
#define alt_max_short(a, b) ((a) ^ (((a) ^ (b)) & -(-((a) < (b)))))
#define gen_skip(orig, alt1, alt2, marker) \
.skip -((alt_max_short(alt1, alt2) - (orig)) > 0) * \
(alt_max_short(alt1, alt2) - (orig)),marker
.pushsection .text, "ax"
.globl main
main:
gen_skip(1, 2, 4, 0x09)
gen_skip(4, 1, 2, 0x10)
...
.popsection
Thanks to Quentin for catching it and double-checking the fix!
Reported-by: Quentin Casasnovas <quentin.casasnovas@oracle.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/20150404133443.GE21152@pd.tnic
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2015-04-04 21:34:43 +08:00
|
|
|
* http://graphics.stanford.edu/~seander/bithacks.html#IntegerMinOrMax
|
|
|
|
|
*
|
x86/alternatives: Fix alt_max_short macro to really be a max()
The alt_max_short() macro in asm/alternative.h does not work as
intended, leading to nasty bugs. E.g. alt_max_short("1", "3")
evaluates to 3, but alt_max_short("3", "1") evaluates to 1 -- not
exactly the maximum of 1 and 3.
In fact, I had to learn it the hard way by crashing my kernel in not
so funny ways by attempting to make use of the ALTENATIVE_2 macro
with alternatives where the first one was larger than the second
one.
According to [1] and commit dbe4058a6a44 ("x86/alternatives: Fix
ALTERNATIVE_2 padding generation properly") the right handed side
should read "-(-(a < b))" not "-(-(a - b))". Fix that, to make the
macro work as intended.
While at it, fix up the comments regarding the additional "-", too.
It's not about gas' usage of s32 but brain dead logic of having a
"true" value of -1 for the < operator ... *sigh*
Btw., the one in asm/alternative-asm.h is correct. And, apparently,
all current users of ALTERNATIVE_2() pass same sized alternatives,
avoiding to hit the bug.
[1] http://graphics.stanford.edu/~seander/bithacks.html#IntegerMinOrMax
Reviewed-and-tested-by: Borislav Petkov <bp@suse.de>
Fixes: dbe4058a6a44 ("x86/alternatives: Fix ALTERNATIVE_2 padding generation properly")
Signed-off-by: Mathias Krause <minipli@googlemail.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Borislav Petkov <bp@suse.de>
Cc: stable@vger.kernel.org
Link: https://lkml.kernel.org/r/1507228213-13095-1-git-send-email-minipli@googlemail.com
2017-10-06 02:30:12 +08:00
|
|
|
* The additional "-" is needed because gas uses a "true" value of -1.
|
x86/alternatives: Fix ALTERNATIVE_2 padding generation properly
Quentin caught a corner case with the generation of instruction
padding in the ALTERNATIVE_2 macro: if len(orig_insn) <
len(alt1) < len(alt2), then not enough padding gets added and
that is not good(tm) as we could overwrite the beginning of the
next instruction.
Luckily, at the time of this writing, we don't have
ALTERNATIVE_2() invocations which have that problem and even if
we did, a simple fix would be to prepend the instructions with
enough prefixes so that that corner case doesn't happen.
However, best it would be if we fixed it properly. See below for
a simple, abstracted example of what we're doing.
So what we ended up doing is, we compute the
max(len(alt1), len(alt2)) - len(orig_insn)
and feed that value to the .skip gas directive. The max() cannot
have conditionals due to gas limitations, thus the fancy integer
math.
With this patch, all ALTERNATIVE_2 sites get padded correctly;
generating obscure test cases pass too:
#define alt_max_short(a, b) ((a) ^ (((a) ^ (b)) & -(-((a) < (b)))))
#define gen_skip(orig, alt1, alt2, marker) \
.skip -((alt_max_short(alt1, alt2) - (orig)) > 0) * \
(alt_max_short(alt1, alt2) - (orig)),marker
.pushsection .text, "ax"
.globl main
main:
gen_skip(1, 2, 4, 0x09)
gen_skip(4, 1, 2, 0x10)
...
.popsection
Thanks to Quentin for catching it and double-checking the fix!
Reported-by: Quentin Casasnovas <quentin.casasnovas@oracle.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/20150404133443.GE21152@pd.tnic
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2015-04-04 21:34:43 +08:00
|
|
|
*/
|
x86/alternatives: Fix alt_max_short macro to really be a max()
The alt_max_short() macro in asm/alternative.h does not work as
intended, leading to nasty bugs. E.g. alt_max_short("1", "3")
evaluates to 3, but alt_max_short("3", "1") evaluates to 1 -- not
exactly the maximum of 1 and 3.
In fact, I had to learn it the hard way by crashing my kernel in not
so funny ways by attempting to make use of the ALTENATIVE_2 macro
with alternatives where the first one was larger than the second
one.
According to [1] and commit dbe4058a6a44 ("x86/alternatives: Fix
ALTERNATIVE_2 padding generation properly") the right handed side
should read "-(-(a < b))" not "-(-(a - b))". Fix that, to make the
macro work as intended.
While at it, fix up the comments regarding the additional "-", too.
It's not about gas' usage of s32 but brain dead logic of having a
"true" value of -1 for the < operator ... *sigh*
Btw., the one in asm/alternative-asm.h is correct. And, apparently,
all current users of ALTERNATIVE_2() pass same sized alternatives,
avoiding to hit the bug.
[1] http://graphics.stanford.edu/~seander/bithacks.html#IntegerMinOrMax
Reviewed-and-tested-by: Borislav Petkov <bp@suse.de>
Fixes: dbe4058a6a44 ("x86/alternatives: Fix ALTERNATIVE_2 padding generation properly")
Signed-off-by: Mathias Krause <minipli@googlemail.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Borislav Petkov <bp@suse.de>
Cc: stable@vger.kernel.org
Link: https://lkml.kernel.org/r/1507228213-13095-1-git-send-email-minipli@googlemail.com
2017-10-06 02:30:12 +08:00
|
|
|
#define alt_max_short(a, b) "((" a ") ^ (((" a ") ^ (" b ")) & -(-((" a ") < (" b ")))))"
|
x86/alternatives: Fix ALTERNATIVE_2 padding generation properly
Quentin caught a corner case with the generation of instruction
padding in the ALTERNATIVE_2 macro: if len(orig_insn) <
len(alt1) < len(alt2), then not enough padding gets added and
that is not good(tm) as we could overwrite the beginning of the
next instruction.
Luckily, at the time of this writing, we don't have
ALTERNATIVE_2() invocations which have that problem and even if
we did, a simple fix would be to prepend the instructions with
enough prefixes so that that corner case doesn't happen.
However, best it would be if we fixed it properly. See below for
a simple, abstracted example of what we're doing.
So what we ended up doing is, we compute the
max(len(alt1), len(alt2)) - len(orig_insn)
and feed that value to the .skip gas directive. The max() cannot
have conditionals due to gas limitations, thus the fancy integer
math.
With this patch, all ALTERNATIVE_2 sites get padded correctly;
generating obscure test cases pass too:
#define alt_max_short(a, b) ((a) ^ (((a) ^ (b)) & -(-((a) < (b)))))
#define gen_skip(orig, alt1, alt2, marker) \
.skip -((alt_max_short(alt1, alt2) - (orig)) > 0) * \
(alt_max_short(alt1, alt2) - (orig)),marker
.pushsection .text, "ax"
.globl main
main:
gen_skip(1, 2, 4, 0x09)
gen_skip(4, 1, 2, 0x10)
...
.popsection
Thanks to Quentin for catching it and double-checking the fix!
Reported-by: Quentin Casasnovas <quentin.casasnovas@oracle.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/20150404133443.GE21152@pd.tnic
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2015-04-04 21:34:43 +08:00
|
|
|
|
2014-12-27 17:41:52 +08:00
|
|
|
/*
|
|
|
|
|
* Pad the second replacement alternative with additional NOPs if it is
|
|
|
|
|
* additionally longer than the first replacement alternative.
|
|
|
|
|
*/
|
x86/alternatives: Fix ALTERNATIVE_2 padding generation properly
Quentin caught a corner case with the generation of instruction
padding in the ALTERNATIVE_2 macro: if len(orig_insn) <
len(alt1) < len(alt2), then not enough padding gets added and
that is not good(tm) as we could overwrite the beginning of the
next instruction.
Luckily, at the time of this writing, we don't have
ALTERNATIVE_2() invocations which have that problem and even if
we did, a simple fix would be to prepend the instructions with
enough prefixes so that that corner case doesn't happen.
However, best it would be if we fixed it properly. See below for
a simple, abstracted example of what we're doing.
So what we ended up doing is, we compute the
max(len(alt1), len(alt2)) - len(orig_insn)
and feed that value to the .skip gas directive. The max() cannot
have conditionals due to gas limitations, thus the fancy integer
math.
With this patch, all ALTERNATIVE_2 sites get padded correctly;
generating obscure test cases pass too:
#define alt_max_short(a, b) ((a) ^ (((a) ^ (b)) & -(-((a) < (b)))))
#define gen_skip(orig, alt1, alt2, marker) \
.skip -((alt_max_short(alt1, alt2) - (orig)) > 0) * \
(alt_max_short(alt1, alt2) - (orig)),marker
.pushsection .text, "ax"
.globl main
main:
gen_skip(1, 2, 4, 0x09)
gen_skip(4, 1, 2, 0x10)
...
.popsection
Thanks to Quentin for catching it and double-checking the fix!
Reported-by: Quentin Casasnovas <quentin.casasnovas@oracle.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/20150404133443.GE21152@pd.tnic
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2015-04-04 21:34:43 +08:00
|
|
|
#define OLDINSTR_2(oldinstr, num1, num2) \
|
|
|
|
|
"661:\n\t" oldinstr "\n662:\n" \
|
|
|
|
|
".skip -((" alt_max_short(alt_rlen(num1), alt_rlen(num2)) " - (" alt_slen ")) > 0) * " \
|
|
|
|
|
"(" alt_max_short(alt_rlen(num1), alt_rlen(num2)) " - (" alt_slen ")), 0x90\n" \
|
2014-12-27 17:41:52 +08:00
|
|
|
alt_end_marker ":\n"
|
|
|
|
|
|
|
|
|
|
#define ALTINSTR_ENTRY(feature, num) \
|
2012-05-25 09:19:45 +08:00
|
|
|
" .long 661b - .\n" /* label */ \
|
2014-12-27 17:41:52 +08:00
|
|
|
" .long " b_replacement(num)"f - .\n" /* new instruction */ \
|
2012-05-25 09:19:45 +08:00
|
|
|
" .word " __stringify(feature) "\n" /* feature bit */ \
|
2014-12-27 17:41:52 +08:00
|
|
|
" .byte " alt_total_slen "\n" /* source len */ \
|
|
|
|
|
" .byte " alt_rlen(num) "\n" /* replacement len */ \
|
|
|
|
|
" .byte " alt_pad_len "\n" /* pad len */
|
2012-05-25 09:19:45 +08:00
|
|
|
|
2014-12-27 17:41:52 +08:00
|
|
|
#define ALTINSTR_REPLACEMENT(newinstr, feature, num) /* replacement */ \
|
|
|
|
|
b_replacement(num)":\n\t" newinstr "\n" e_replacement(num) ":\n\t"
|
2012-05-25 09:19:45 +08:00
|
|
|
|
2009-04-28 23:13:46 +08:00
|
|
|
/* alternative assembly primitive: */
|
|
|
|
|
#define ALTERNATIVE(oldinstr, newinstr, feature) \
|
2014-12-27 17:41:52 +08:00
|
|
|
OLDINSTR(oldinstr, 1) \
|
2012-09-22 03:43:08 +08:00
|
|
|
".pushsection .altinstructions,\"a\"\n" \
|
2012-05-25 09:19:45 +08:00
|
|
|
ALTINSTR_ENTRY(feature, 1) \
|
2012-09-22 03:43:08 +08:00
|
|
|
".popsection\n" \
|
|
|
|
|
".pushsection .altinstr_replacement, \"ax\"\n" \
|
2012-05-25 09:19:45 +08:00
|
|
|
ALTINSTR_REPLACEMENT(newinstr, feature, 1) \
|
2018-01-04 22:37:05 +08:00
|
|
|
".popsection\n"
|
2012-05-25 09:19:45 +08:00
|
|
|
|
|
|
|
|
#define ALTERNATIVE_2(oldinstr, newinstr1, feature1, newinstr2, feature2)\
|
2014-12-27 17:41:52 +08:00
|
|
|
OLDINSTR_2(oldinstr, 1, 2) \
|
2012-09-22 03:43:08 +08:00
|
|
|
".pushsection .altinstructions,\"a\"\n" \
|
2012-05-25 09:19:45 +08:00
|
|
|
ALTINSTR_ENTRY(feature1, 1) \
|
|
|
|
|
ALTINSTR_ENTRY(feature2, 2) \
|
2012-09-22 03:43:08 +08:00
|
|
|
".popsection\n" \
|
|
|
|
|
".pushsection .altinstr_replacement, \"ax\"\n" \
|
2012-05-25 09:19:45 +08:00
|
|
|
ALTINSTR_REPLACEMENT(newinstr1, feature1, 1) \
|
|
|
|
|
ALTINSTR_REPLACEMENT(newinstr2, feature2, 2) \
|
2018-01-04 22:37:05 +08:00
|
|
|
".popsection\n"
|
2009-04-28 23:13:46 +08:00
|
|
|
|
2008-01-30 20:30:30 +08:00
|
|
|
/*
|
|
|
|
|
* Alternative instructions for different CPU types or capabilities.
|
|
|
|
|
*
|
|
|
|
|
* This allows to use optimized instructions even on generic binary
|
|
|
|
|
* kernels.
|
|
|
|
|
*
|
|
|
|
|
* length of oldinstr must be longer or equal the length of newinstr
|
|
|
|
|
* It can be padded with nops as needed.
|
|
|
|
|
*
|
|
|
|
|
* For non barrier like inlines please define new variants
|
|
|
|
|
* without volatile and memory clobber.
|
|
|
|
|
*/
|
|
|
|
|
#define alternative(oldinstr, newinstr, feature) \
|
2009-04-28 23:13:46 +08:00
|
|
|
asm volatile (ALTERNATIVE(oldinstr, newinstr, feature) : : : "memory")
|
2008-01-30 20:30:30 +08:00
|
|
|
|
2014-12-27 17:41:52 +08:00
|
|
|
#define alternative_2(oldinstr, newinstr1, feature1, newinstr2, feature2) \
|
|
|
|
|
asm volatile(ALTERNATIVE_2(oldinstr, newinstr1, feature1, newinstr2, feature2) ::: "memory")
|
|
|
|
|
|
2008-01-30 20:30:30 +08:00
|
|
|
/*
|
|
|
|
|
* Alternative inline assembly with input.
|
|
|
|
|
*
|
|
|
|
|
* Pecularities:
|
|
|
|
|
* No memory clobber here.
|
|
|
|
|
* Argument numbers start with 1.
|
|
|
|
|
* Best is to use constraints that are fixed size (like (%1) ... "r")
|
|
|
|
|
* If you use variable sized constraints like "m" or "g" in the
|
|
|
|
|
* replacement make sure to pad to the worst case length.
|
2009-04-28 23:13:46 +08:00
|
|
|
* Leaving an unused argument 0 to keep API compatibility.
|
2008-01-30 20:30:30 +08:00
|
|
|
*/
|
|
|
|
|
#define alternative_input(oldinstr, newinstr, feature, input...) \
|
2009-04-28 23:13:46 +08:00
|
|
|
asm volatile (ALTERNATIVE(oldinstr, newinstr, feature) \
|
|
|
|
|
: : "i" (0), ## input)
|
2008-01-30 20:30:30 +08:00
|
|
|
|
x86/alternative: Add alternative_input_2 to support alternative with two features and input
alternative_input_2() replaces old instruction with new instructions with
input based on two features.
In alternative_input_2(oldinstr, newinstr1, feature1, newinstr2, feature2,
input...),
feature2 has higher priority to replace oldinstr than feature1.
If CPU has feature2, newinstr2 replaces oldinstr and newinstr2 is
executed during run time.
If CPU doesn't have feature2, but it has feature1, newinstr1 replaces oldinstr
and newinstr1 is executed during run time.
If CPU doesn't have feature2 and feature1, oldinstr is executed during run
time.
Signed-off-by: Fenghua Yu <fenghua.yu@intel.com>
Link: http://lkml.kernel.org/r/1401387164-43416-5-git-send-email-fenghua.yu@intel.com
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
2014-05-30 02:12:32 +08:00
|
|
|
/*
|
|
|
|
|
* This is similar to alternative_input. But it has two features and
|
|
|
|
|
* respective instructions.
|
|
|
|
|
*
|
|
|
|
|
* If CPU has feature2, newinstr2 is used.
|
|
|
|
|
* Otherwise, if CPU has feature1, newinstr1 is used.
|
|
|
|
|
* Otherwise, oldinstr is used.
|
|
|
|
|
*/
|
|
|
|
|
#define alternative_input_2(oldinstr, newinstr1, feature1, newinstr2, \
|
|
|
|
|
feature2, input...) \
|
|
|
|
|
asm volatile(ALTERNATIVE_2(oldinstr, newinstr1, feature1, \
|
|
|
|
|
newinstr2, feature2) \
|
|
|
|
|
: : "i" (0), ## input)
|
|
|
|
|
|
2008-01-30 20:30:30 +08:00
|
|
|
/* Like alternative_input, but with a single output argument */
|
|
|
|
|
#define alternative_io(oldinstr, newinstr, feature, output, input...) \
|
2009-04-28 23:13:46 +08:00
|
|
|
asm volatile (ALTERNATIVE(oldinstr, newinstr, feature) \
|
|
|
|
|
: output : "i" (0), ## input)
|
2008-01-30 20:30:30 +08:00
|
|
|
|
2009-12-19 00:12:56 +08:00
|
|
|
/* Like alternative_io, but for replacing a direct call with another one. */
|
|
|
|
|
#define alternative_call(oldfunc, newfunc, feature, output, input...) \
|
|
|
|
|
asm volatile (ALTERNATIVE("call %P[old]", "call %P[new]", feature) \
|
|
|
|
|
: output : [old] "i" (oldfunc), [new] "i" (newfunc), ## input)
|
|
|
|
|
|
2012-05-25 09:19:45 +08:00
|
|
|
/*
|
|
|
|
|
* Like alternative_call, but there are two features and respective functions.
|
|
|
|
|
* If CPU has feature2, function2 is used.
|
|
|
|
|
* Otherwise, if CPU has feature1, function1 is used.
|
|
|
|
|
* Otherwise, old function is used.
|
|
|
|
|
*/
|
|
|
|
|
#define alternative_call_2(oldfunc, newfunc1, feature1, newfunc2, feature2, \
|
|
|
|
|
output, input...) \
|
|
|
|
|
asm volatile (ALTERNATIVE_2("call %P[old]", "call %P[new1]", feature1,\
|
|
|
|
|
"call %P[new2]", feature2) \
|
x86/asm: Fix inline asm call constraints for Clang
For inline asm statements which have a CALL instruction, we list the
stack pointer as a constraint to convince GCC to ensure the frame
pointer is set up first:
static inline void foo()
{
register void *__sp asm(_ASM_SP);
asm("call bar" : "+r" (__sp))
}
Unfortunately, that pattern causes Clang to corrupt the stack pointer.
The fix is easy: convert the stack pointer register variable to a global
variable.
It should be noted that the end result is different based on the GCC
version. With GCC 6.4, this patch has exactly the same result as
before:
defconfig defconfig-nofp distro distro-nofp
before 9820389 9491555 8816046 8516940
after 9820389 9491555 8816046 8516940
With GCC 7.2, however, GCC's behavior has changed. It now changes its
behavior based on the conversion of the register variable to a global.
That somehow convinces it to *always* set up the frame pointer before
inserting *any* inline asm. (Therefore, listing the variable as an
output constraint is a no-op and is no longer necessary.) It's a bit
overkill, but the performance impact should be negligible. And in fact,
there's a nice improvement with frame pointers disabled:
defconfig defconfig-nofp distro distro-nofp
before 9796316 9468236 9076191 8790305
after 9796957 9464267 9076381 8785949
So in summary, while listing the stack pointer as an output constraint
is no longer necessary for newer versions of GCC, it's still needed for
older versions.
Suggested-by: Andrey Ryabinin <aryabinin@virtuozzo.com>
Reported-by: Matthias Kaehlcke <mka@chromium.org>
Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Alexander Potapenko <glider@google.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Dmitriy Vyukov <dvyukov@google.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Miguel Bernal Marin <miguel.bernal.marin@linux.intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/3db862e970c432ae823cf515c52b54fec8270e0e.1505942196.git.jpoimboe@redhat.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2017-09-21 05:24:33 +08:00
|
|
|
: output, ASM_CALL_CONSTRAINT \
|
2016-09-24 05:49:39 +08:00
|
|
|
: [old] "i" (oldfunc), [new1] "i" (newfunc1), \
|
2018-01-14 20:05:04 +08:00
|
|
|
[new2] "i" (newfunc2), ## input)
|
2012-05-25 09:19:45 +08:00
|
|
|
|
2008-01-30 20:30:30 +08:00
|
|
|
/*
|
|
|
|
|
* use this macro(s) if you need more than one output parameter
|
|
|
|
|
* in alternative_io
|
|
|
|
|
*/
|
2009-12-19 00:12:56 +08:00
|
|
|
#define ASM_OUTPUT2(a...) a
|
2008-01-30 20:30:30 +08:00
|
|
|
|
2012-01-21 00:21:41 +08:00
|
|
|
/*
|
|
|
|
|
* use this macro if you need clobbers but no inputs in
|
|
|
|
|
* alternative_{input,io,call}()
|
|
|
|
|
*/
|
|
|
|
|
#define ASM_NO_INPUT_CLOBBER(clbr...) "i" (0) : clbr
|
|
|
|
|
|
2016-04-27 03:23:25 +08:00
|
|
|
#endif /* __ASSEMBLY__ */
|
|
|
|
|
|
2008-10-23 13:26:29 +08:00
|
|
|
#endif /* _ASM_X86_ALTERNATIVE_H */
|