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 */
|
2005-04-17 02:20:36 +04:00
|
|
|
#ifndef __LINUX_SEQLOCK_H
|
|
|
|
#define __LINUX_SEQLOCK_H
|
|
|
|
/*
|
|
|
|
* Reader/writer consistent mechanism without starving writers. This type of
|
2007-02-17 21:07:33 +03:00
|
|
|
* lock for data where the reader wants a consistent set of information
|
2013-09-12 18:55:34 +04:00
|
|
|
* and is willing to retry if the information changes. There are two types
|
|
|
|
* of readers:
|
|
|
|
* 1. Sequence readers which never block a writer but they may have to retry
|
|
|
|
* if a writer is in progress by detecting change in sequence number.
|
|
|
|
* Writers do not wait for a sequence reader.
|
|
|
|
* 2. Locking readers which will wait if a writer or another locking reader
|
|
|
|
* is in progress. A locking reader in progress will also block a writer
|
|
|
|
* from going forward. Unlike the regular rwlock, the read lock here is
|
|
|
|
* exclusive so that only one locking reader can get it.
|
2005-04-17 02:20:36 +04:00
|
|
|
*
|
2013-09-12 18:55:34 +04:00
|
|
|
* This is not as cache friendly as brlock. Also, this may not work well
|
2005-04-17 02:20:36 +04:00
|
|
|
* for data that contains pointers, because any writer could
|
|
|
|
* invalidate a pointer that a reader was following.
|
|
|
|
*
|
2013-09-12 18:55:34 +04:00
|
|
|
* Expected non-blocking reader usage:
|
2005-04-17 02:20:36 +04:00
|
|
|
* do {
|
|
|
|
* seq = read_seqbegin(&foo);
|
|
|
|
* ...
|
|
|
|
* } while (read_seqretry(&foo, seq));
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* On non-SMP the spin locks disappear but the writer still needs
|
|
|
|
* to increment the sequence variables because an interrupt routine could
|
|
|
|
* change the state of the data.
|
|
|
|
*
|
|
|
|
* Based on x86_64 vsyscall gettimeofday
|
|
|
|
* by Keith Owens and Andrea Arcangeli
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/spinlock.h>
|
|
|
|
#include <linux/preempt.h>
|
2013-10-08 02:51:59 +04:00
|
|
|
#include <linux/lockdep.h>
|
2015-05-27 04:39:36 +03:00
|
|
|
#include <linux/compiler.h>
|
2011-06-11 15:29:58 +04:00
|
|
|
#include <asm/processor.h>
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Version using sequence counter only.
|
|
|
|
* This can be used when code has its own mutex protecting the
|
|
|
|
* updating starting before the write_seqcountbeqin() and ending
|
|
|
|
* after the write_seqcount_end().
|
|
|
|
*/
|
|
|
|
typedef struct seqcount {
|
|
|
|
unsigned sequence;
|
2013-10-08 02:51:59 +04:00
|
|
|
#ifdef CONFIG_DEBUG_LOCK_ALLOC
|
|
|
|
struct lockdep_map dep_map;
|
|
|
|
#endif
|
2005-04-17 02:20:36 +04:00
|
|
|
} seqcount_t;
|
|
|
|
|
2013-10-08 02:51:59 +04:00
|
|
|
static inline void __seqcount_init(seqcount_t *s, const char *name,
|
|
|
|
struct lock_class_key *key)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
* Make sure we are not reinitializing a held lock:
|
|
|
|
*/
|
|
|
|
lockdep_init_map(&s->dep_map, name, key, 0);
|
|
|
|
s->sequence = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef CONFIG_DEBUG_LOCK_ALLOC
|
|
|
|
# define SEQCOUNT_DEP_MAP_INIT(lockname) \
|
|
|
|
.dep_map = { .name = #lockname } \
|
|
|
|
|
|
|
|
# define seqcount_init(s) \
|
|
|
|
do { \
|
|
|
|
static struct lock_class_key __key; \
|
|
|
|
__seqcount_init((s), #s, &__key); \
|
|
|
|
} while (0)
|
|
|
|
|
|
|
|
static inline void seqcount_lockdep_reader_access(const seqcount_t *s)
|
|
|
|
{
|
|
|
|
seqcount_t *l = (seqcount_t *)s;
|
|
|
|
unsigned long flags;
|
|
|
|
|
|
|
|
local_irq_save(flags);
|
|
|
|
seqcount_acquire_read(&l->dep_map, 0, 0, _RET_IP_);
|
2019-09-19 19:09:40 +03:00
|
|
|
seqcount_release(&l->dep_map, _RET_IP_);
|
2013-10-08 02:51:59 +04:00
|
|
|
local_irq_restore(flags);
|
|
|
|
}
|
|
|
|
|
|
|
|
#else
|
|
|
|
# define SEQCOUNT_DEP_MAP_INIT(lockname)
|
|
|
|
# define seqcount_init(s) __seqcount_init(s, NULL, NULL)
|
|
|
|
# define seqcount_lockdep_reader_access(x)
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#define SEQCNT_ZERO(lockname) { .sequence = 0, SEQCOUNT_DEP_MAP_INIT(lockname)}
|
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2011-01-07 09:49:51 +03:00
|
|
|
/**
|
|
|
|
* __read_seqcount_begin - begin a seq-read critical section (without barrier)
|
|
|
|
* @s: pointer to seqcount_t
|
|
|
|
* Returns: count to be passed to read_seqcount_retry
|
|
|
|
*
|
|
|
|
* __read_seqcount_begin is like read_seqcount_begin, but has no smp_rmb()
|
|
|
|
* barrier. Callers should ensure that smp_rmb() or equivalent ordering is
|
|
|
|
* provided before actually loading any of the variables that are to be
|
|
|
|
* protected in this critical section.
|
|
|
|
*
|
|
|
|
* Use carefully, only in critical code, and comment how the barrier is
|
|
|
|
* provided.
|
|
|
|
*/
|
|
|
|
static inline unsigned __read_seqcount_begin(const seqcount_t *s)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
2008-04-03 11:06:13 +04:00
|
|
|
unsigned ret;
|
|
|
|
|
|
|
|
repeat:
|
2015-02-23 06:31:41 +03:00
|
|
|
ret = READ_ONCE(s->sequence);
|
2008-04-03 11:06:13 +04:00
|
|
|
if (unlikely(ret & 1)) {
|
|
|
|
cpu_relax();
|
|
|
|
goto repeat;
|
|
|
|
}
|
2005-04-17 02:20:36 +04:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2014-07-17 01:05:20 +04:00
|
|
|
/**
|
|
|
|
* raw_read_seqcount - Read the raw seqcount
|
|
|
|
* @s: pointer to seqcount_t
|
|
|
|
* Returns: count to be passed to read_seqcount_retry
|
|
|
|
*
|
|
|
|
* raw_read_seqcount opens a read critical section of the given
|
|
|
|
* seqcount without any lockdep checking and without checking or
|
|
|
|
* masking the LSB. Calling code is responsible for handling that.
|
|
|
|
*/
|
|
|
|
static inline unsigned raw_read_seqcount(const seqcount_t *s)
|
|
|
|
{
|
2015-02-23 06:31:41 +03:00
|
|
|
unsigned ret = READ_ONCE(s->sequence);
|
2014-07-17 01:05:20 +04:00
|
|
|
smp_rmb();
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2013-10-08 02:51:59 +04:00
|
|
|
/**
|
2014-01-03 03:11:13 +04:00
|
|
|
* raw_read_seqcount_begin - start seq-read critical section w/o lockdep
|
2013-10-08 02:51:59 +04:00
|
|
|
* @s: pointer to seqcount_t
|
|
|
|
* Returns: count to be passed to read_seqcount_retry
|
|
|
|
*
|
2014-01-03 03:11:13 +04:00
|
|
|
* raw_read_seqcount_begin opens a read critical section of the given
|
2013-10-08 02:51:59 +04:00
|
|
|
* seqcount, but without any lockdep checking. Validity of the critical
|
|
|
|
* section is tested by checking read_seqcount_retry function.
|
|
|
|
*/
|
2014-01-03 03:11:13 +04:00
|
|
|
static inline unsigned raw_read_seqcount_begin(const seqcount_t *s)
|
2013-10-08 02:51:59 +04:00
|
|
|
{
|
|
|
|
unsigned ret = __read_seqcount_begin(s);
|
|
|
|
smp_rmb();
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2011-01-07 09:49:51 +03:00
|
|
|
/**
|
|
|
|
* read_seqcount_begin - begin a seq-read critical section
|
|
|
|
* @s: pointer to seqcount_t
|
|
|
|
* Returns: count to be passed to read_seqcount_retry
|
|
|
|
*
|
|
|
|
* read_seqcount_begin opens a read critical section of the given seqcount.
|
|
|
|
* Validity of the critical section is tested by checking read_seqcount_retry
|
|
|
|
* function.
|
|
|
|
*/
|
|
|
|
static inline unsigned read_seqcount_begin(const seqcount_t *s)
|
|
|
|
{
|
2013-10-08 02:51:59 +04:00
|
|
|
seqcount_lockdep_reader_access(s);
|
2014-01-03 03:11:13 +04:00
|
|
|
return raw_read_seqcount_begin(s);
|
2011-01-07 09:49:51 +03:00
|
|
|
}
|
|
|
|
|
2012-05-05 02:13:54 +04:00
|
|
|
/**
|
|
|
|
* raw_seqcount_begin - begin a seq-read critical section
|
|
|
|
* @s: pointer to seqcount_t
|
|
|
|
* Returns: count to be passed to read_seqcount_retry
|
|
|
|
*
|
|
|
|
* raw_seqcount_begin opens a read critical section of the given seqcount.
|
|
|
|
* Validity of the critical section is tested by checking read_seqcount_retry
|
|
|
|
* function.
|
|
|
|
*
|
|
|
|
* Unlike read_seqcount_begin(), this function will not wait for the count
|
|
|
|
* to stabilize. If a writer is active when we begin, we will fail the
|
|
|
|
* read_seqcount_retry() instead of stabilizing at the beginning of the
|
|
|
|
* critical section.
|
|
|
|
*/
|
|
|
|
static inline unsigned raw_seqcount_begin(const seqcount_t *s)
|
|
|
|
{
|
2015-02-23 06:31:41 +03:00
|
|
|
unsigned ret = READ_ONCE(s->sequence);
|
2012-05-05 02:13:54 +04:00
|
|
|
smp_rmb();
|
|
|
|
return ret & ~1;
|
|
|
|
}
|
|
|
|
|
2011-01-07 09:49:51 +03:00
|
|
|
/**
|
|
|
|
* __read_seqcount_retry - end a seq-read critical section (without barrier)
|
|
|
|
* @s: pointer to seqcount_t
|
|
|
|
* @start: count, from read_seqcount_begin
|
|
|
|
* Returns: 1 if retry is required, else 0
|
|
|
|
*
|
|
|
|
* __read_seqcount_retry is like read_seqcount_retry, but has no smp_rmb()
|
|
|
|
* barrier. Callers should ensure that smp_rmb() or equivalent ordering is
|
|
|
|
* provided before actually loading any of the variables that are to be
|
|
|
|
* protected in this critical section.
|
|
|
|
*
|
|
|
|
* Use carefully, only in critical code, and comment how the barrier is
|
|
|
|
* provided.
|
|
|
|
*/
|
|
|
|
static inline int __read_seqcount_retry(const seqcount_t *s, unsigned start)
|
|
|
|
{
|
|
|
|
return unlikely(s->sequence != start);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* read_seqcount_retry - end a seq-read critical section
|
|
|
|
* @s: pointer to seqcount_t
|
|
|
|
* @start: count, from read_seqcount_begin
|
|
|
|
* Returns: 1 if retry is required, else 0
|
|
|
|
*
|
|
|
|
* read_seqcount_retry closes a read critical section of the given seqcount.
|
|
|
|
* If the critical section was invalid, it must be ignored (and typically
|
|
|
|
* retried).
|
2005-04-17 02:20:36 +04:00
|
|
|
*/
|
2008-04-03 11:06:13 +04:00
|
|
|
static inline int read_seqcount_retry(const seqcount_t *s, unsigned start)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
|
|
|
smp_rmb();
|
2011-01-07 09:49:51 +03:00
|
|
|
return __read_seqcount_retry(s, start);
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2014-01-03 03:11:13 +04:00
|
|
|
|
|
|
|
static inline void raw_write_seqcount_begin(seqcount_t *s)
|
|
|
|
{
|
|
|
|
s->sequence++;
|
|
|
|
smp_wmb();
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void raw_write_seqcount_end(seqcount_t *s)
|
|
|
|
{
|
|
|
|
smp_wmb();
|
|
|
|
s->sequence++;
|
|
|
|
}
|
|
|
|
|
2015-06-17 15:29:24 +03:00
|
|
|
/**
|
|
|
|
* raw_write_seqcount_barrier - do a seq write barrier
|
|
|
|
* @s: pointer to seqcount_t
|
|
|
|
*
|
|
|
|
* This can be used to provide an ordering guarantee instead of the
|
|
|
|
* usual consistency guarantee. It is one wmb cheaper, because we can
|
|
|
|
* collapse the two back-to-back wmb()s.
|
|
|
|
*
|
|
|
|
* seqcount_t seq;
|
|
|
|
* bool X = true, Y = false;
|
|
|
|
*
|
|
|
|
* void read(void)
|
|
|
|
* {
|
|
|
|
* bool x, y;
|
|
|
|
*
|
|
|
|
* do {
|
|
|
|
* int s = read_seqcount_begin(&seq);
|
|
|
|
*
|
|
|
|
* x = X; y = Y;
|
|
|
|
*
|
|
|
|
* } while (read_seqcount_retry(&seq, s));
|
|
|
|
*
|
|
|
|
* BUG_ON(!x && !y);
|
|
|
|
* }
|
|
|
|
*
|
|
|
|
* void write(void)
|
|
|
|
* {
|
|
|
|
* Y = true;
|
|
|
|
*
|
|
|
|
* raw_write_seqcount_barrier(seq);
|
|
|
|
*
|
|
|
|
* X = false;
|
|
|
|
* }
|
|
|
|
*/
|
|
|
|
static inline void raw_write_seqcount_barrier(seqcount_t *s)
|
|
|
|
{
|
|
|
|
s->sequence++;
|
|
|
|
smp_wmb();
|
|
|
|
s->sequence++;
|
|
|
|
}
|
|
|
|
|
2015-05-27 04:39:36 +03:00
|
|
|
static inline int raw_read_seqcount_latch(seqcount_t *s)
|
|
|
|
{
|
locking/seqcount: Re-fix raw_read_seqcount_latch()
Commit 50755bc1c305 ("seqlock: fix raw_read_seqcount_latch()") broke
raw_read_seqcount_latch().
If you look at the comment that was modified; the thing that changes is
the seq count, not the latch pointer.
* void latch_modify(struct latch_struct *latch, ...)
* {
* smp_wmb(); <- Ensure that the last data[1] update is visible
* latch->seq++;
* smp_wmb(); <- Ensure that the seqcount update is visible
*
* modify(latch->data[0], ...);
*
* smp_wmb(); <- Ensure that the data[0] update is visible
* latch->seq++;
* smp_wmb(); <- Ensure that the seqcount update is visible
*
* modify(latch->data[1], ...);
* }
*
* The query will have a form like:
*
* struct entry *latch_query(struct latch_struct *latch, ...)
* {
* struct entry *entry;
* unsigned seq, idx;
*
* do {
* seq = lockless_dereference(latch->seq);
So here we have:
seq = READ_ONCE(latch->seq);
smp_read_barrier_depends();
Which is exactly what we want; the new code:
seq = ({ p = READ_ONCE(latch);
smp_read_barrier_depends(); p })->seq;
is just wrong; because it looses the volatile read on seq, which can now
be torn or worse 'optimized'. And the read_depend barrier is also placed
wrong, we want it after the load of seq, to match the above data[]
up-to-date wmb()s.
Such that when we dereference latch->data[] below, we're guaranteed to
observe the right data.
*
* idx = seq & 0x01;
* entry = data_query(latch->data[idx], ...);
*
* smp_rmb();
* } while (seq != latch->seq);
*
* return entry;
* }
So yes, not passing a pointer is not pretty, but the code was correct,
and isn't anymore now.
Change to explicit READ_ONCE()+smp_read_barrier_depends() to avoid
confusion and allow strict lockless_dereference() checking.
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Alexey Dobriyan <adobriyan@gmail.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Paul McKenney <paulmck@linux.vnet.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Fixes: 50755bc1c305 ("seqlock: fix raw_read_seqcount_latch()")
Link: http://lkml.kernel.org/r/20160527111117.GL3192@twins.programming.kicks-ass.net
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2016-05-27 14:11:17 +03:00
|
|
|
/* Pairs with the first smp_wmb() in raw_write_seqcount_latch() */
|
2017-10-09 21:00:32 +03:00
|
|
|
int seq = READ_ONCE(s->sequence); /* ^^^ */
|
locking/seqcount: Re-fix raw_read_seqcount_latch()
Commit 50755bc1c305 ("seqlock: fix raw_read_seqcount_latch()") broke
raw_read_seqcount_latch().
If you look at the comment that was modified; the thing that changes is
the seq count, not the latch pointer.
* void latch_modify(struct latch_struct *latch, ...)
* {
* smp_wmb(); <- Ensure that the last data[1] update is visible
* latch->seq++;
* smp_wmb(); <- Ensure that the seqcount update is visible
*
* modify(latch->data[0], ...);
*
* smp_wmb(); <- Ensure that the data[0] update is visible
* latch->seq++;
* smp_wmb(); <- Ensure that the seqcount update is visible
*
* modify(latch->data[1], ...);
* }
*
* The query will have a form like:
*
* struct entry *latch_query(struct latch_struct *latch, ...)
* {
* struct entry *entry;
* unsigned seq, idx;
*
* do {
* seq = lockless_dereference(latch->seq);
So here we have:
seq = READ_ONCE(latch->seq);
smp_read_barrier_depends();
Which is exactly what we want; the new code:
seq = ({ p = READ_ONCE(latch);
smp_read_barrier_depends(); p })->seq;
is just wrong; because it looses the volatile read on seq, which can now
be torn or worse 'optimized'. And the read_depend barrier is also placed
wrong, we want it after the load of seq, to match the above data[]
up-to-date wmb()s.
Such that when we dereference latch->data[] below, we're guaranteed to
observe the right data.
*
* idx = seq & 0x01;
* entry = data_query(latch->data[idx], ...);
*
* smp_rmb();
* } while (seq != latch->seq);
*
* return entry;
* }
So yes, not passing a pointer is not pretty, but the code was correct,
and isn't anymore now.
Change to explicit READ_ONCE()+smp_read_barrier_depends() to avoid
confusion and allow strict lockless_dereference() checking.
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Alexey Dobriyan <adobriyan@gmail.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Paul McKenney <paulmck@linux.vnet.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Fixes: 50755bc1c305 ("seqlock: fix raw_read_seqcount_latch()")
Link: http://lkml.kernel.org/r/20160527111117.GL3192@twins.programming.kicks-ass.net
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2016-05-27 14:11:17 +03:00
|
|
|
return seq;
|
2015-05-27 04:39:36 +03:00
|
|
|
}
|
|
|
|
|
2015-05-27 04:39:36 +03:00
|
|
|
/**
|
2014-07-17 01:05:21 +04:00
|
|
|
* raw_write_seqcount_latch - redirect readers to even/odd copy
|
|
|
|
* @s: pointer to seqcount_t
|
2015-05-27 04:39:36 +03:00
|
|
|
*
|
|
|
|
* The latch technique is a multiversion concurrency control method that allows
|
|
|
|
* queries during non-atomic modifications. If you can guarantee queries never
|
|
|
|
* interrupt the modification -- e.g. the concurrency is strictly between CPUs
|
|
|
|
* -- you most likely do not need this.
|
|
|
|
*
|
|
|
|
* Where the traditional RCU/lockless data structures rely on atomic
|
|
|
|
* modifications to ensure queries observe either the old or the new state the
|
|
|
|
* latch allows the same for non-atomic updates. The trade-off is doubling the
|
|
|
|
* cost of storage; we have to maintain two copies of the entire data
|
|
|
|
* structure.
|
|
|
|
*
|
|
|
|
* Very simply put: we first modify one copy and then the other. This ensures
|
|
|
|
* there is always one copy in a stable state, ready to give us an answer.
|
|
|
|
*
|
|
|
|
* The basic form is a data structure like:
|
|
|
|
*
|
|
|
|
* struct latch_struct {
|
|
|
|
* seqcount_t seq;
|
|
|
|
* struct data_struct data[2];
|
|
|
|
* };
|
|
|
|
*
|
|
|
|
* Where a modification, which is assumed to be externally serialized, does the
|
|
|
|
* following:
|
|
|
|
*
|
|
|
|
* void latch_modify(struct latch_struct *latch, ...)
|
|
|
|
* {
|
|
|
|
* smp_wmb(); <- Ensure that the last data[1] update is visible
|
|
|
|
* latch->seq++;
|
|
|
|
* smp_wmb(); <- Ensure that the seqcount update is visible
|
|
|
|
*
|
|
|
|
* modify(latch->data[0], ...);
|
|
|
|
*
|
|
|
|
* smp_wmb(); <- Ensure that the data[0] update is visible
|
|
|
|
* latch->seq++;
|
|
|
|
* smp_wmb(); <- Ensure that the seqcount update is visible
|
|
|
|
*
|
|
|
|
* modify(latch->data[1], ...);
|
|
|
|
* }
|
|
|
|
*
|
|
|
|
* The query will have a form like:
|
|
|
|
*
|
|
|
|
* struct entry *latch_query(struct latch_struct *latch, ...)
|
|
|
|
* {
|
|
|
|
* struct entry *entry;
|
|
|
|
* unsigned seq, idx;
|
|
|
|
*
|
|
|
|
* do {
|
locking/seqcount: Re-fix raw_read_seqcount_latch()
Commit 50755bc1c305 ("seqlock: fix raw_read_seqcount_latch()") broke
raw_read_seqcount_latch().
If you look at the comment that was modified; the thing that changes is
the seq count, not the latch pointer.
* void latch_modify(struct latch_struct *latch, ...)
* {
* smp_wmb(); <- Ensure that the last data[1] update is visible
* latch->seq++;
* smp_wmb(); <- Ensure that the seqcount update is visible
*
* modify(latch->data[0], ...);
*
* smp_wmb(); <- Ensure that the data[0] update is visible
* latch->seq++;
* smp_wmb(); <- Ensure that the seqcount update is visible
*
* modify(latch->data[1], ...);
* }
*
* The query will have a form like:
*
* struct entry *latch_query(struct latch_struct *latch, ...)
* {
* struct entry *entry;
* unsigned seq, idx;
*
* do {
* seq = lockless_dereference(latch->seq);
So here we have:
seq = READ_ONCE(latch->seq);
smp_read_barrier_depends();
Which is exactly what we want; the new code:
seq = ({ p = READ_ONCE(latch);
smp_read_barrier_depends(); p })->seq;
is just wrong; because it looses the volatile read on seq, which can now
be torn or worse 'optimized'. And the read_depend barrier is also placed
wrong, we want it after the load of seq, to match the above data[]
up-to-date wmb()s.
Such that when we dereference latch->data[] below, we're guaranteed to
observe the right data.
*
* idx = seq & 0x01;
* entry = data_query(latch->data[idx], ...);
*
* smp_rmb();
* } while (seq != latch->seq);
*
* return entry;
* }
So yes, not passing a pointer is not pretty, but the code was correct,
and isn't anymore now.
Change to explicit READ_ONCE()+smp_read_barrier_depends() to avoid
confusion and allow strict lockless_dereference() checking.
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Alexey Dobriyan <adobriyan@gmail.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Paul McKenney <paulmck@linux.vnet.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Fixes: 50755bc1c305 ("seqlock: fix raw_read_seqcount_latch()")
Link: http://lkml.kernel.org/r/20160527111117.GL3192@twins.programming.kicks-ass.net
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2016-05-27 14:11:17 +03:00
|
|
|
* seq = raw_read_seqcount_latch(&latch->seq);
|
2015-05-27 04:39:36 +03:00
|
|
|
*
|
|
|
|
* idx = seq & 0x01;
|
|
|
|
* entry = data_query(latch->data[idx], ...);
|
|
|
|
*
|
|
|
|
* smp_rmb();
|
|
|
|
* } while (seq != latch->seq);
|
|
|
|
*
|
|
|
|
* return entry;
|
|
|
|
* }
|
|
|
|
*
|
|
|
|
* So during the modification, queries are first redirected to data[1]. Then we
|
|
|
|
* modify data[0]. When that is complete, we redirect queries back to data[0]
|
|
|
|
* and we can modify data[1].
|
|
|
|
*
|
|
|
|
* NOTE: The non-requirement for atomic modifications does _NOT_ include
|
|
|
|
* the publishing of new entries in the case where data is a dynamic
|
|
|
|
* data structure.
|
|
|
|
*
|
|
|
|
* An iteration might start in data[0] and get suspended long enough
|
|
|
|
* to miss an entire modification sequence, once it resumes it might
|
|
|
|
* observe the new entry.
|
|
|
|
*
|
|
|
|
* NOTE: When data is a dynamic data structure; one should use regular RCU
|
|
|
|
* patterns to manage the lifetimes of the objects within.
|
2014-07-17 01:05:21 +04:00
|
|
|
*/
|
|
|
|
static inline void raw_write_seqcount_latch(seqcount_t *s)
|
|
|
|
{
|
|
|
|
smp_wmb(); /* prior stores before incrementing "sequence" */
|
|
|
|
s->sequence++;
|
|
|
|
smp_wmb(); /* increment "sequence" before following stores */
|
|
|
|
}
|
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
/*
|
|
|
|
* Sequence counter only version assumes that callers are using their
|
|
|
|
* own mutexing.
|
|
|
|
*/
|
2013-10-08 02:51:59 +04:00
|
|
|
static inline void write_seqcount_begin_nested(seqcount_t *s, int subclass)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
2014-01-03 03:11:13 +04:00
|
|
|
raw_write_seqcount_begin(s);
|
2013-10-08 02:51:59 +04:00
|
|
|
seqcount_acquire(&s->dep_map, subclass, 0, _RET_IP_);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void write_seqcount_begin(seqcount_t *s)
|
|
|
|
{
|
|
|
|
write_seqcount_begin_nested(s, 0);
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
static inline void write_seqcount_end(seqcount_t *s)
|
|
|
|
{
|
2019-09-19 19:09:40 +03:00
|
|
|
seqcount_release(&s->dep_map, _RET_IP_);
|
2014-01-03 03:11:13 +04:00
|
|
|
raw_write_seqcount_end(s);
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
|
2011-01-07 09:49:51 +03:00
|
|
|
/**
|
2015-06-11 15:46:46 +03:00
|
|
|
* write_seqcount_invalidate - invalidate in-progress read-side seq operations
|
2011-01-07 09:49:51 +03:00
|
|
|
* @s: pointer to seqcount_t
|
|
|
|
*
|
2015-06-11 15:46:46 +03:00
|
|
|
* After write_seqcount_invalidate, no read-side seq operations will complete
|
2011-01-07 09:49:51 +03:00
|
|
|
* successfully and see data older than this.
|
|
|
|
*/
|
2015-06-11 15:46:46 +03:00
|
|
|
static inline void write_seqcount_invalidate(seqcount_t *s)
|
2011-01-07 09:49:51 +03:00
|
|
|
{
|
|
|
|
smp_wmb();
|
|
|
|
s->sequence+=2;
|
|
|
|
}
|
|
|
|
|
2011-07-16 20:40:26 +04:00
|
|
|
typedef struct {
|
|
|
|
struct seqcount seqcount;
|
|
|
|
spinlock_t lock;
|
|
|
|
} seqlock_t;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* These macros triggered gcc-3.x compile-time problems. We think these are
|
|
|
|
* OK now. Be cautious.
|
|
|
|
*/
|
|
|
|
#define __SEQLOCK_UNLOCKED(lockname) \
|
|
|
|
{ \
|
2013-10-08 02:51:59 +04:00
|
|
|
.seqcount = SEQCNT_ZERO(lockname), \
|
2011-07-16 20:40:26 +04:00
|
|
|
.lock = __SPIN_LOCK_UNLOCKED(lockname) \
|
|
|
|
}
|
|
|
|
|
|
|
|
#define seqlock_init(x) \
|
|
|
|
do { \
|
|
|
|
seqcount_init(&(x)->seqcount); \
|
|
|
|
spin_lock_init(&(x)->lock); \
|
|
|
|
} while (0)
|
|
|
|
|
|
|
|
#define DEFINE_SEQLOCK(x) \
|
|
|
|
seqlock_t x = __SEQLOCK_UNLOCKED(x)
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Read side functions for starting and finalizing a read side section.
|
|
|
|
*/
|
|
|
|
static inline unsigned read_seqbegin(const seqlock_t *sl)
|
|
|
|
{
|
|
|
|
return read_seqcount_begin(&sl->seqcount);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline unsigned read_seqretry(const seqlock_t *sl, unsigned start)
|
|
|
|
{
|
|
|
|
return read_seqcount_retry(&sl->seqcount, start);
|
|
|
|
}
|
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
/*
|
2011-07-16 20:40:26 +04:00
|
|
|
* Lock out other writers and update the count.
|
|
|
|
* Acts like a normal spin_lock/unlock.
|
|
|
|
* Don't need preempt_disable() because that is in the spin_lock already.
|
2005-04-17 02:20:36 +04:00
|
|
|
*/
|
2011-07-16 20:40:26 +04:00
|
|
|
static inline void write_seqlock(seqlock_t *sl)
|
|
|
|
{
|
|
|
|
spin_lock(&sl->lock);
|
|
|
|
write_seqcount_begin(&sl->seqcount);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void write_sequnlock(seqlock_t *sl)
|
|
|
|
{
|
|
|
|
write_seqcount_end(&sl->seqcount);
|
|
|
|
spin_unlock(&sl->lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void write_seqlock_bh(seqlock_t *sl)
|
|
|
|
{
|
|
|
|
spin_lock_bh(&sl->lock);
|
|
|
|
write_seqcount_begin(&sl->seqcount);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void write_sequnlock_bh(seqlock_t *sl)
|
|
|
|
{
|
|
|
|
write_seqcount_end(&sl->seqcount);
|
|
|
|
spin_unlock_bh(&sl->lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void write_seqlock_irq(seqlock_t *sl)
|
|
|
|
{
|
|
|
|
spin_lock_irq(&sl->lock);
|
|
|
|
write_seqcount_begin(&sl->seqcount);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void write_sequnlock_irq(seqlock_t *sl)
|
|
|
|
{
|
|
|
|
write_seqcount_end(&sl->seqcount);
|
|
|
|
spin_unlock_irq(&sl->lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline unsigned long __write_seqlock_irqsave(seqlock_t *sl)
|
|
|
|
{
|
|
|
|
unsigned long flags;
|
|
|
|
|
|
|
|
spin_lock_irqsave(&sl->lock, flags);
|
|
|
|
write_seqcount_begin(&sl->seqcount);
|
|
|
|
return flags;
|
|
|
|
}
|
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
#define write_seqlock_irqsave(lock, flags) \
|
2011-07-16 20:40:26 +04:00
|
|
|
do { flags = __write_seqlock_irqsave(lock); } while (0)
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2011-07-16 20:40:26 +04:00
|
|
|
static inline void
|
|
|
|
write_sequnlock_irqrestore(seqlock_t *sl, unsigned long flags)
|
|
|
|
{
|
|
|
|
write_seqcount_end(&sl->seqcount);
|
|
|
|
spin_unlock_irqrestore(&sl->lock, flags);
|
|
|
|
}
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2013-09-12 18:55:34 +04:00
|
|
|
/*
|
|
|
|
* A locking reader exclusively locks out other writers and locking readers,
|
|
|
|
* but doesn't update the sequence number. Acts like a normal spin_lock/unlock.
|
|
|
|
* Don't need preempt_disable() because that is in the spin_lock already.
|
|
|
|
*/
|
|
|
|
static inline void read_seqlock_excl(seqlock_t *sl)
|
|
|
|
{
|
|
|
|
spin_lock(&sl->lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void read_sequnlock_excl(seqlock_t *sl)
|
|
|
|
{
|
|
|
|
spin_unlock(&sl->lock);
|
|
|
|
}
|
|
|
|
|
2013-10-26 00:39:14 +04:00
|
|
|
/**
|
|
|
|
* read_seqbegin_or_lock - begin a sequence number check or locking block
|
|
|
|
* @lock: sequence lock
|
|
|
|
* @seq : sequence number to be checked
|
|
|
|
*
|
|
|
|
* First try it once optimistically without taking the lock. If that fails,
|
|
|
|
* take the lock. The sequence number is also used as a marker for deciding
|
|
|
|
* whether to be a reader (even) or writer (odd).
|
|
|
|
* N.B. seq must be initialized to an even number to begin with.
|
|
|
|
*/
|
|
|
|
static inline void read_seqbegin_or_lock(seqlock_t *lock, int *seq)
|
|
|
|
{
|
|
|
|
if (!(*seq & 1)) /* Even */
|
|
|
|
*seq = read_seqbegin(lock);
|
|
|
|
else /* Odd */
|
|
|
|
read_seqlock_excl(lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline int need_seqretry(seqlock_t *lock, int seq)
|
|
|
|
{
|
|
|
|
return !(seq & 1) && read_seqretry(lock, seq);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void done_seqretry(seqlock_t *lock, int seq)
|
|
|
|
{
|
|
|
|
if (seq & 1)
|
|
|
|
read_sequnlock_excl(lock);
|
|
|
|
}
|
|
|
|
|
2013-09-12 18:55:34 +04:00
|
|
|
static inline void read_seqlock_excl_bh(seqlock_t *sl)
|
|
|
|
{
|
|
|
|
spin_lock_bh(&sl->lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void read_sequnlock_excl_bh(seqlock_t *sl)
|
|
|
|
{
|
|
|
|
spin_unlock_bh(&sl->lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void read_seqlock_excl_irq(seqlock_t *sl)
|
|
|
|
{
|
|
|
|
spin_lock_irq(&sl->lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void read_sequnlock_excl_irq(seqlock_t *sl)
|
|
|
|
{
|
|
|
|
spin_unlock_irq(&sl->lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline unsigned long __read_seqlock_excl_irqsave(seqlock_t *sl)
|
|
|
|
{
|
|
|
|
unsigned long flags;
|
|
|
|
|
|
|
|
spin_lock_irqsave(&sl->lock, flags);
|
|
|
|
return flags;
|
|
|
|
}
|
|
|
|
|
|
|
|
#define read_seqlock_excl_irqsave(lock, flags) \
|
|
|
|
do { flags = __read_seqlock_excl_irqsave(lock); } while (0)
|
|
|
|
|
|
|
|
static inline void
|
|
|
|
read_sequnlock_excl_irqrestore(seqlock_t *sl, unsigned long flags)
|
|
|
|
{
|
|
|
|
spin_unlock_irqrestore(&sl->lock, flags);
|
|
|
|
}
|
|
|
|
|
2014-09-12 17:12:14 +04:00
|
|
|
static inline unsigned long
|
|
|
|
read_seqbegin_or_lock_irqsave(seqlock_t *lock, int *seq)
|
|
|
|
{
|
|
|
|
unsigned long flags = 0;
|
|
|
|
|
|
|
|
if (!(*seq & 1)) /* Even */
|
|
|
|
*seq = read_seqbegin(lock);
|
|
|
|
else /* Odd */
|
|
|
|
read_seqlock_excl_irqsave(lock, flags);
|
|
|
|
|
|
|
|
return flags;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void
|
|
|
|
done_seqretry_irqrestore(seqlock_t *lock, int seq, unsigned long flags)
|
|
|
|
{
|
|
|
|
if (seq & 1)
|
|
|
|
read_sequnlock_excl_irqrestore(lock, flags);
|
|
|
|
}
|
2005-04-17 02:20:36 +04:00
|
|
|
#endif /* __LINUX_SEQLOCK_H */
|