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 */
|
2010-01-08 00:53:33 +08:00
|
|
|
#ifndef _ASM_X86_ATOMIC64_64_H
|
|
|
|
#define _ASM_X86_ATOMIC64_64_H
|
|
|
|
|
|
|
|
#include <linux/types.h>
|
|
|
|
#include <asm/alternative.h>
|
|
|
|
#include <asm/cmpxchg.h>
|
|
|
|
|
|
|
|
/* The 64-bit atomic type */
|
|
|
|
|
|
|
|
#define ATOMIC64_INIT(i) { (i) }
|
|
|
|
|
|
|
|
/**
|
2018-01-30 01:26:05 +08:00
|
|
|
* arch_atomic64_read - read atomic64 variable
|
2010-01-08 00:53:33 +08:00
|
|
|
* @v: pointer of type atomic64_t
|
|
|
|
*
|
|
|
|
* Atomically reads the value of @v.
|
|
|
|
* Doesn't imply a read memory barrier.
|
|
|
|
*/
|
2019-05-22 21:22:47 +08:00
|
|
|
static inline s64 arch_atomic64_read(const atomic64_t *v)
|
2010-01-08 00:53:33 +08:00
|
|
|
{
|
2015-09-18 17:13:10 +08:00
|
|
|
return READ_ONCE((v)->counter);
|
2010-01-08 00:53:33 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2018-01-30 01:26:05 +08:00
|
|
|
* arch_atomic64_set - set atomic64 variable
|
2010-01-08 00:53:33 +08:00
|
|
|
* @v: pointer to type atomic64_t
|
|
|
|
* @i: required value
|
|
|
|
*
|
|
|
|
* Atomically sets the value of @v to @i.
|
|
|
|
*/
|
2019-05-22 21:22:47 +08:00
|
|
|
static inline void arch_atomic64_set(atomic64_t *v, s64 i)
|
2010-01-08 00:53:33 +08:00
|
|
|
{
|
2015-09-18 17:13:10 +08:00
|
|
|
WRITE_ONCE(v->counter, i);
|
2010-01-08 00:53:33 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2018-01-30 01:26:05 +08:00
|
|
|
* arch_atomic64_add - add integer to atomic64 variable
|
2010-01-08 00:53:33 +08:00
|
|
|
* @i: integer value to add
|
|
|
|
* @v: pointer to type atomic64_t
|
|
|
|
*
|
|
|
|
* Atomically adds @i to @v.
|
|
|
|
*/
|
2019-05-22 21:22:47 +08:00
|
|
|
static __always_inline void arch_atomic64_add(s64 i, atomic64_t *v)
|
2010-01-08 00:53:33 +08:00
|
|
|
{
|
|
|
|
asm volatile(LOCK_PREFIX "addq %1,%0"
|
|
|
|
: "=m" (v->counter)
|
2019-04-24 19:38:23 +08:00
|
|
|
: "er" (i), "m" (v->counter) : "memory");
|
2010-01-08 00:53:33 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2018-01-30 01:26:05 +08:00
|
|
|
* arch_atomic64_sub - subtract the atomic64 variable
|
2010-01-08 00:53:33 +08:00
|
|
|
* @i: integer value to subtract
|
|
|
|
* @v: pointer to type atomic64_t
|
|
|
|
*
|
|
|
|
* Atomically subtracts @i from @v.
|
|
|
|
*/
|
2019-05-22 21:22:47 +08:00
|
|
|
static inline void arch_atomic64_sub(s64 i, atomic64_t *v)
|
2010-01-08 00:53:33 +08:00
|
|
|
{
|
|
|
|
asm volatile(LOCK_PREFIX "subq %1,%0"
|
|
|
|
: "=m" (v->counter)
|
2019-04-24 19:38:23 +08:00
|
|
|
: "er" (i), "m" (v->counter) : "memory");
|
2010-01-08 00:53:33 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2018-01-30 01:26:05 +08:00
|
|
|
* arch_atomic64_sub_and_test - subtract value from variable and test result
|
2010-01-08 00:53:33 +08:00
|
|
|
* @i: integer value to subtract
|
|
|
|
* @v: pointer to type atomic64_t
|
|
|
|
*
|
|
|
|
* Atomically subtracts @i from @v and returns
|
|
|
|
* true if the result is zero, or false for all
|
|
|
|
* other cases.
|
|
|
|
*/
|
2019-05-22 21:22:47 +08:00
|
|
|
static inline bool arch_atomic64_sub_and_test(s64 i, atomic64_t *v)
|
2010-01-08 00:53:33 +08:00
|
|
|
{
|
x86/asm: 'Simplify' GEN_*_RMWcc() macros
Currently the GEN_*_RMWcc() macros include a return statement, which
pretty much mandates we directly wrap them in a (inline) function.
Macros with return statements are tricky and, as per the above, limit
use, so remove the return statement and make them
statement-expressions. This allows them to be used more widely.
Also, shuffle the arguments a bit. Place the @cc argument as 3rd, this
makes it consistent between UNARY and BINARY, but more importantly, it
makes the @arg0 argument last.
Since the @arg0 argument is now last, we can do CPP trickery and make
it an optional argument, simplifying the users; 17 out of 18
occurences do not need this argument.
Finally, change to asm symbolic names, instead of the numeric ordering
of operands, which allows us to get rid of __BINARY_RMWcc_ARG and get
cleaner code overall.
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: JBeulich@suse.com
Cc: Linus Torvalds <torvalds@linux-foundation.org>
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: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: bp@alien8.de
Cc: hpa@linux.intel.com
Link: https://lkml.kernel.org/r/20181003130957.108960094@infradead.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2018-10-03 18:34:10 +08:00
|
|
|
return GEN_BINARY_RMWcc(LOCK_PREFIX "subq", v->counter, e, "er", i);
|
2010-01-08 00:53:33 +08:00
|
|
|
}
|
2018-09-03 10:30:53 +08:00
|
|
|
#define arch_atomic64_sub_and_test arch_atomic64_sub_and_test
|
2010-01-08 00:53:33 +08:00
|
|
|
|
|
|
|
/**
|
2018-01-30 01:26:05 +08:00
|
|
|
* arch_atomic64_inc - increment atomic64 variable
|
2010-01-08 00:53:33 +08:00
|
|
|
* @v: pointer to type atomic64_t
|
|
|
|
*
|
|
|
|
* Atomically increments @v by 1.
|
|
|
|
*/
|
2018-01-30 01:26:05 +08:00
|
|
|
static __always_inline void arch_atomic64_inc(atomic64_t *v)
|
2010-01-08 00:53:33 +08:00
|
|
|
{
|
|
|
|
asm volatile(LOCK_PREFIX "incq %0"
|
|
|
|
: "=m" (v->counter)
|
2019-04-24 19:38:23 +08:00
|
|
|
: "m" (v->counter) : "memory");
|
2010-01-08 00:53:33 +08:00
|
|
|
}
|
2018-09-03 10:30:53 +08:00
|
|
|
#define arch_atomic64_inc arch_atomic64_inc
|
2010-01-08 00:53:33 +08:00
|
|
|
|
|
|
|
/**
|
2018-01-30 01:26:05 +08:00
|
|
|
* arch_atomic64_dec - decrement atomic64 variable
|
2010-01-08 00:53:33 +08:00
|
|
|
* @v: pointer to type atomic64_t
|
|
|
|
*
|
|
|
|
* Atomically decrements @v by 1.
|
|
|
|
*/
|
2018-01-30 01:26:05 +08:00
|
|
|
static __always_inline void arch_atomic64_dec(atomic64_t *v)
|
2010-01-08 00:53:33 +08:00
|
|
|
{
|
|
|
|
asm volatile(LOCK_PREFIX "decq %0"
|
|
|
|
: "=m" (v->counter)
|
2019-04-24 19:38:23 +08:00
|
|
|
: "m" (v->counter) : "memory");
|
2010-01-08 00:53:33 +08:00
|
|
|
}
|
2018-09-03 10:30:53 +08:00
|
|
|
#define arch_atomic64_dec arch_atomic64_dec
|
2010-01-08 00:53:33 +08:00
|
|
|
|
|
|
|
/**
|
2018-01-30 01:26:05 +08:00
|
|
|
* arch_atomic64_dec_and_test - decrement and test
|
2010-01-08 00:53:33 +08:00
|
|
|
* @v: pointer to type atomic64_t
|
|
|
|
*
|
|
|
|
* Atomically decrements @v by 1 and
|
|
|
|
* returns true if the result is 0, or false for all other
|
|
|
|
* cases.
|
|
|
|
*/
|
2018-01-30 01:26:05 +08:00
|
|
|
static inline bool arch_atomic64_dec_and_test(atomic64_t *v)
|
2010-01-08 00:53:33 +08:00
|
|
|
{
|
x86/asm: 'Simplify' GEN_*_RMWcc() macros
Currently the GEN_*_RMWcc() macros include a return statement, which
pretty much mandates we directly wrap them in a (inline) function.
Macros with return statements are tricky and, as per the above, limit
use, so remove the return statement and make them
statement-expressions. This allows them to be used more widely.
Also, shuffle the arguments a bit. Place the @cc argument as 3rd, this
makes it consistent between UNARY and BINARY, but more importantly, it
makes the @arg0 argument last.
Since the @arg0 argument is now last, we can do CPP trickery and make
it an optional argument, simplifying the users; 17 out of 18
occurences do not need this argument.
Finally, change to asm symbolic names, instead of the numeric ordering
of operands, which allows us to get rid of __BINARY_RMWcc_ARG and get
cleaner code overall.
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: JBeulich@suse.com
Cc: Linus Torvalds <torvalds@linux-foundation.org>
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: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: bp@alien8.de
Cc: hpa@linux.intel.com
Link: https://lkml.kernel.org/r/20181003130957.108960094@infradead.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2018-10-03 18:34:10 +08:00
|
|
|
return GEN_UNARY_RMWcc(LOCK_PREFIX "decq", v->counter, e);
|
2010-01-08 00:53:33 +08:00
|
|
|
}
|
2018-09-03 10:30:53 +08:00
|
|
|
#define arch_atomic64_dec_and_test arch_atomic64_dec_and_test
|
2010-01-08 00:53:33 +08:00
|
|
|
|
|
|
|
/**
|
2018-01-30 01:26:05 +08:00
|
|
|
* arch_atomic64_inc_and_test - increment and test
|
2010-01-08 00:53:33 +08:00
|
|
|
* @v: pointer to type atomic64_t
|
|
|
|
*
|
|
|
|
* Atomically increments @v by 1
|
|
|
|
* and returns true if the result is zero, or false for all
|
|
|
|
* other cases.
|
|
|
|
*/
|
2018-01-30 01:26:05 +08:00
|
|
|
static inline bool arch_atomic64_inc_and_test(atomic64_t *v)
|
2010-01-08 00:53:33 +08:00
|
|
|
{
|
x86/asm: 'Simplify' GEN_*_RMWcc() macros
Currently the GEN_*_RMWcc() macros include a return statement, which
pretty much mandates we directly wrap them in a (inline) function.
Macros with return statements are tricky and, as per the above, limit
use, so remove the return statement and make them
statement-expressions. This allows them to be used more widely.
Also, shuffle the arguments a bit. Place the @cc argument as 3rd, this
makes it consistent between UNARY and BINARY, but more importantly, it
makes the @arg0 argument last.
Since the @arg0 argument is now last, we can do CPP trickery and make
it an optional argument, simplifying the users; 17 out of 18
occurences do not need this argument.
Finally, change to asm symbolic names, instead of the numeric ordering
of operands, which allows us to get rid of __BINARY_RMWcc_ARG and get
cleaner code overall.
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: JBeulich@suse.com
Cc: Linus Torvalds <torvalds@linux-foundation.org>
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: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: bp@alien8.de
Cc: hpa@linux.intel.com
Link: https://lkml.kernel.org/r/20181003130957.108960094@infradead.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2018-10-03 18:34:10 +08:00
|
|
|
return GEN_UNARY_RMWcc(LOCK_PREFIX "incq", v->counter, e);
|
2010-01-08 00:53:33 +08:00
|
|
|
}
|
2018-09-03 10:30:53 +08:00
|
|
|
#define arch_atomic64_inc_and_test arch_atomic64_inc_and_test
|
2010-01-08 00:53:33 +08:00
|
|
|
|
|
|
|
/**
|
2018-01-30 01:26:05 +08:00
|
|
|
* arch_atomic64_add_negative - add and test if negative
|
2010-01-08 00:53:33 +08:00
|
|
|
* @i: integer value to add
|
|
|
|
* @v: pointer to type atomic64_t
|
|
|
|
*
|
|
|
|
* Atomically adds @i to @v and returns true
|
|
|
|
* if the result is negative, or false when
|
|
|
|
* result is greater than or equal to zero.
|
|
|
|
*/
|
2019-05-22 21:22:47 +08:00
|
|
|
static inline bool arch_atomic64_add_negative(s64 i, atomic64_t *v)
|
2010-01-08 00:53:33 +08:00
|
|
|
{
|
x86/asm: 'Simplify' GEN_*_RMWcc() macros
Currently the GEN_*_RMWcc() macros include a return statement, which
pretty much mandates we directly wrap them in a (inline) function.
Macros with return statements are tricky and, as per the above, limit
use, so remove the return statement and make them
statement-expressions. This allows them to be used more widely.
Also, shuffle the arguments a bit. Place the @cc argument as 3rd, this
makes it consistent between UNARY and BINARY, but more importantly, it
makes the @arg0 argument last.
Since the @arg0 argument is now last, we can do CPP trickery and make
it an optional argument, simplifying the users; 17 out of 18
occurences do not need this argument.
Finally, change to asm symbolic names, instead of the numeric ordering
of operands, which allows us to get rid of __BINARY_RMWcc_ARG and get
cleaner code overall.
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: JBeulich@suse.com
Cc: Linus Torvalds <torvalds@linux-foundation.org>
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: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: bp@alien8.de
Cc: hpa@linux.intel.com
Link: https://lkml.kernel.org/r/20181003130957.108960094@infradead.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2018-10-03 18:34:10 +08:00
|
|
|
return GEN_BINARY_RMWcc(LOCK_PREFIX "addq", v->counter, s, "er", i);
|
2010-01-08 00:53:33 +08:00
|
|
|
}
|
2018-09-03 10:30:53 +08:00
|
|
|
#define arch_atomic64_add_negative arch_atomic64_add_negative
|
2010-01-08 00:53:33 +08:00
|
|
|
|
|
|
|
/**
|
2018-01-30 01:26:05 +08:00
|
|
|
* arch_atomic64_add_return - add and return
|
2010-01-08 00:53:33 +08:00
|
|
|
* @i: integer value to add
|
|
|
|
* @v: pointer to type atomic64_t
|
|
|
|
*
|
|
|
|
* Atomically adds @i to @v and returns @i + @v
|
|
|
|
*/
|
2019-05-22 21:22:47 +08:00
|
|
|
static __always_inline s64 arch_atomic64_add_return(s64 i, atomic64_t *v)
|
2010-01-08 00:53:33 +08:00
|
|
|
{
|
2011-08-24 07:59:58 +08:00
|
|
|
return i + xadd(&v->counter, i);
|
2010-01-08 00:53:33 +08:00
|
|
|
}
|
|
|
|
|
2019-05-22 21:22:47 +08:00
|
|
|
static inline s64 arch_atomic64_sub_return(s64 i, atomic64_t *v)
|
2010-01-08 00:53:33 +08:00
|
|
|
{
|
2018-01-30 01:26:05 +08:00
|
|
|
return arch_atomic64_add_return(-i, v);
|
2010-01-08 00:53:33 +08:00
|
|
|
}
|
|
|
|
|
2019-05-22 21:22:47 +08:00
|
|
|
static inline s64 arch_atomic64_fetch_add(s64 i, atomic64_t *v)
|
2016-04-18 07:16:03 +08:00
|
|
|
{
|
|
|
|
return xadd(&v->counter, i);
|
|
|
|
}
|
|
|
|
|
2019-05-22 21:22:47 +08:00
|
|
|
static inline s64 arch_atomic64_fetch_sub(s64 i, atomic64_t *v)
|
2016-04-18 07:16:03 +08:00
|
|
|
{
|
|
|
|
return xadd(&v->counter, -i);
|
|
|
|
}
|
|
|
|
|
2019-05-22 21:22:47 +08:00
|
|
|
static inline s64 arch_atomic64_cmpxchg(atomic64_t *v, s64 old, s64 new)
|
2010-01-08 00:53:33 +08:00
|
|
|
{
|
2018-01-30 01:26:05 +08:00
|
|
|
return arch_cmpxchg(&v->counter, old, new);
|
2010-01-08 00:53:33 +08:00
|
|
|
}
|
|
|
|
|
2018-01-30 01:26:05 +08:00
|
|
|
#define arch_atomic64_try_cmpxchg arch_atomic64_try_cmpxchg
|
2019-05-22 21:22:47 +08:00
|
|
|
static __always_inline bool arch_atomic64_try_cmpxchg(atomic64_t *v, s64 *old, s64 new)
|
locking/atomic: Introduce atomic_try_cmpxchg()
Add a new cmpxchg interface:
bool try_cmpxchg(u{8,16,32,64} *ptr, u{8,16,32,64} *val, u{8,16,32,64} new);
Where the boolean returns the result of the compare; and thus if the
exchange happened; and in case of failure, the new value of *ptr is
returned in *val.
This allows simplification/improvement of loops like:
for (;;) {
new = val $op $imm;
old = cmpxchg(ptr, val, new);
if (old == val)
break;
val = old;
}
into:
do {
} while (!try_cmpxchg(ptr, &val, val $op $imm));
while also generating better code (GCC6 and onwards).
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andy Lutomirski <luto@kernel.org>
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: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
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>
2017-02-01 23:39:38 +08:00
|
|
|
{
|
|
|
|
return try_cmpxchg(&v->counter, old, new);
|
|
|
|
}
|
|
|
|
|
2019-05-22 21:22:47 +08:00
|
|
|
static inline s64 arch_atomic64_xchg(atomic64_t *v, s64 new)
|
2010-01-08 00:53:33 +08:00
|
|
|
{
|
2018-07-16 19:30:09 +08:00
|
|
|
return arch_xchg(&v->counter, new);
|
2010-01-08 00:53:33 +08:00
|
|
|
}
|
|
|
|
|
2019-05-22 21:22:47 +08:00
|
|
|
static inline void arch_atomic64_and(s64 i, atomic64_t *v)
|
2017-06-17 17:15:27 +08:00
|
|
|
{
|
|
|
|
asm volatile(LOCK_PREFIX "andq %1,%0"
|
|
|
|
: "+m" (v->counter)
|
|
|
|
: "er" (i)
|
|
|
|
: "memory");
|
2014-04-24 02:28:37 +08:00
|
|
|
}
|
|
|
|
|
2019-05-22 21:22:47 +08:00
|
|
|
static inline s64 arch_atomic64_fetch_and(s64 i, atomic64_t *v)
|
2017-06-17 17:15:27 +08:00
|
|
|
{
|
2018-01-30 01:26:05 +08:00
|
|
|
s64 val = arch_atomic64_read(v);
|
2017-06-17 17:15:27 +08:00
|
|
|
|
|
|
|
do {
|
2018-01-30 01:26:05 +08:00
|
|
|
} while (!arch_atomic64_try_cmpxchg(v, &val, val & i));
|
2017-06-17 17:15:27 +08:00
|
|
|
return val;
|
2016-04-18 07:16:03 +08:00
|
|
|
}
|
|
|
|
|
2019-05-22 21:22:47 +08:00
|
|
|
static inline void arch_atomic64_or(s64 i, atomic64_t *v)
|
2017-06-17 17:15:27 +08:00
|
|
|
{
|
|
|
|
asm volatile(LOCK_PREFIX "orq %1,%0"
|
|
|
|
: "+m" (v->counter)
|
|
|
|
: "er" (i)
|
|
|
|
: "memory");
|
|
|
|
}
|
2016-04-18 07:16:03 +08:00
|
|
|
|
2019-05-22 21:22:47 +08:00
|
|
|
static inline s64 arch_atomic64_fetch_or(s64 i, atomic64_t *v)
|
2017-06-17 17:15:27 +08:00
|
|
|
{
|
2018-01-30 01:26:05 +08:00
|
|
|
s64 val = arch_atomic64_read(v);
|
2014-04-24 02:28:37 +08:00
|
|
|
|
2017-06-17 17:15:27 +08:00
|
|
|
do {
|
2018-01-30 01:26:05 +08:00
|
|
|
} while (!arch_atomic64_try_cmpxchg(v, &val, val | i));
|
2017-06-17 17:15:27 +08:00
|
|
|
return val;
|
|
|
|
}
|
|
|
|
|
2019-05-22 21:22:47 +08:00
|
|
|
static inline void arch_atomic64_xor(s64 i, atomic64_t *v)
|
2017-06-17 17:15:27 +08:00
|
|
|
{
|
|
|
|
asm volatile(LOCK_PREFIX "xorq %1,%0"
|
|
|
|
: "+m" (v->counter)
|
|
|
|
: "er" (i)
|
|
|
|
: "memory");
|
|
|
|
}
|
|
|
|
|
2019-05-22 21:22:47 +08:00
|
|
|
static inline s64 arch_atomic64_fetch_xor(s64 i, atomic64_t *v)
|
2017-06-17 17:15:27 +08:00
|
|
|
{
|
2018-01-30 01:26:05 +08:00
|
|
|
s64 val = arch_atomic64_read(v);
|
2017-06-17 17:15:27 +08:00
|
|
|
|
|
|
|
do {
|
2018-01-30 01:26:05 +08:00
|
|
|
} while (!arch_atomic64_try_cmpxchg(v, &val, val ^ i));
|
2017-06-17 17:15:27 +08:00
|
|
|
return val;
|
|
|
|
}
|
2014-04-24 02:28:37 +08:00
|
|
|
|
2010-01-08 00:53:33 +08:00
|
|
|
#endif /* _ASM_X86_ATOMIC64_64_H */
|