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
|
2013-03-24 07:11:31 +08:00
|
|
|
/*
|
|
|
|
* background writeback - scan btree for dirty data and write it to the backing
|
|
|
|
* device
|
|
|
|
*
|
|
|
|
* Copyright 2010, 2011 Kent Overstreet <kent.overstreet@gmail.com>
|
|
|
|
* Copyright 2012 Google, Inc.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "bcache.h"
|
|
|
|
#include "btree.h"
|
|
|
|
#include "debug.h"
|
2013-06-05 21:21:07 +08:00
|
|
|
#include "writeback.h"
|
2013-03-24 07:11:31 +08:00
|
|
|
|
2013-07-25 08:50:06 +08:00
|
|
|
#include <linux/delay.h>
|
|
|
|
#include <linux/kthread.h>
|
2017-02-01 23:36:40 +08:00
|
|
|
#include <linux/sched/clock.h>
|
2013-04-27 06:39:55 +08:00
|
|
|
#include <trace/events/bcache.h>
|
|
|
|
|
2013-03-24 07:11:31 +08:00
|
|
|
/* Rate limiting */
|
|
|
|
|
|
|
|
static void __update_writeback_rate(struct cached_dev *dc)
|
|
|
|
{
|
|
|
|
struct cache_set *c = dc->disk.c;
|
2017-09-06 14:25:56 +08:00
|
|
|
uint64_t cache_sectors = c->nbuckets * c->sb.bucket_size -
|
|
|
|
bcache_flash_devs_sectors_dirty(c);
|
2013-03-24 07:11:31 +08:00
|
|
|
uint64_t cache_dirty_target =
|
|
|
|
div_u64(cache_sectors * dc->writeback_percent, 100);
|
|
|
|
int64_t target = div64_u64(cache_dirty_target * bdev_sectors(dc->bdev),
|
|
|
|
c->cached_dev_sectors);
|
|
|
|
|
bcache: implement PI controller for writeback rate
bcache uses a control system to attempt to keep the amount of dirty data
in cache at a user-configured level, while not responding excessively to
transients and variations in write rate. Previously, the system was a
PD controller; but the output from it was integrated, turning the
Proportional term into an Integral term, and turning the Derivative term
into a crude Proportional term. Performance of the controller has been
uneven in production, and it has tended to respond slowly, oscillate,
and overshoot.
This patch set replaces the current control system with an explicit PI
controller and tuning that should be correct for most hardware. By
default, it attempts to write at a rate that would retire 1/40th of the
current excess blocks per second. An integral term in turn works to
remove steady state errors.
IMO, this yields benefits in simplicity (removing weighted average
filtering, etc) and system performance.
Another small change is a tunable parameter is introduced to allow the
user to specify a minimum rate at which dirty blocks are retired.
There is a slight difference from earlier versions of the patch in
integral handling to prevent excessive negative integral windup.
Signed-off-by: Michael Lyle <mlyle@lyle.org>
Reviewed-by: Coly Li <colyli@suse.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
2017-10-14 07:35:36 +08:00
|
|
|
/*
|
|
|
|
* PI controller:
|
|
|
|
* Figures out the amount that should be written per second.
|
|
|
|
*
|
|
|
|
* First, the error (number of sectors that are dirty beyond our
|
|
|
|
* target) is calculated. The error is accumulated (numerically
|
|
|
|
* integrated).
|
|
|
|
*
|
|
|
|
* Then, the proportional value and integral value are scaled
|
|
|
|
* based on configured values. These are stored as inverses to
|
|
|
|
* avoid fixed point math and to make configuration easy-- e.g.
|
|
|
|
* the default value of 40 for writeback_rate_p_term_inverse
|
|
|
|
* attempts to write at a rate that would retire all the dirty
|
|
|
|
* blocks in 40 seconds.
|
|
|
|
*
|
|
|
|
* The writeback_rate_i_inverse value of 10000 means that 1/10000th
|
|
|
|
* of the error is accumulated in the integral term per second.
|
|
|
|
* This acts as a slow, long-term average that is not subject to
|
|
|
|
* variations in usage like the p term.
|
|
|
|
*/
|
2013-06-05 21:21:07 +08:00
|
|
|
int64_t dirty = bcache_dev_sectors_dirty(&dc->disk);
|
bcache: implement PI controller for writeback rate
bcache uses a control system to attempt to keep the amount of dirty data
in cache at a user-configured level, while not responding excessively to
transients and variations in write rate. Previously, the system was a
PD controller; but the output from it was integrated, turning the
Proportional term into an Integral term, and turning the Derivative term
into a crude Proportional term. Performance of the controller has been
uneven in production, and it has tended to respond slowly, oscillate,
and overshoot.
This patch set replaces the current control system with an explicit PI
controller and tuning that should be correct for most hardware. By
default, it attempts to write at a rate that would retire 1/40th of the
current excess blocks per second. An integral term in turn works to
remove steady state errors.
IMO, this yields benefits in simplicity (removing weighted average
filtering, etc) and system performance.
Another small change is a tunable parameter is introduced to allow the
user to specify a minimum rate at which dirty blocks are retired.
There is a slight difference from earlier versions of the patch in
integral handling to prevent excessive negative integral windup.
Signed-off-by: Michael Lyle <mlyle@lyle.org>
Reviewed-by: Coly Li <colyli@suse.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
2017-10-14 07:35:36 +08:00
|
|
|
int64_t error = dirty - target;
|
|
|
|
int64_t proportional_scaled =
|
|
|
|
div_s64(error, dc->writeback_rate_p_term_inverse);
|
2017-10-14 07:35:38 +08:00
|
|
|
int64_t integral_scaled;
|
|
|
|
uint32_t new_rate;
|
bcache: implement PI controller for writeback rate
bcache uses a control system to attempt to keep the amount of dirty data
in cache at a user-configured level, while not responding excessively to
transients and variations in write rate. Previously, the system was a
PD controller; but the output from it was integrated, turning the
Proportional term into an Integral term, and turning the Derivative term
into a crude Proportional term. Performance of the controller has been
uneven in production, and it has tended to respond slowly, oscillate,
and overshoot.
This patch set replaces the current control system with an explicit PI
controller and tuning that should be correct for most hardware. By
default, it attempts to write at a rate that would retire 1/40th of the
current excess blocks per second. An integral term in turn works to
remove steady state errors.
IMO, this yields benefits in simplicity (removing weighted average
filtering, etc) and system performance.
Another small change is a tunable parameter is introduced to allow the
user to specify a minimum rate at which dirty blocks are retired.
There is a slight difference from earlier versions of the patch in
integral handling to prevent excessive negative integral windup.
Signed-off-by: Michael Lyle <mlyle@lyle.org>
Reviewed-by: Coly Li <colyli@suse.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
2017-10-14 07:35:36 +08:00
|
|
|
|
|
|
|
if ((error < 0 && dc->writeback_rate_integral > 0) ||
|
|
|
|
(error > 0 && time_before64(local_clock(),
|
|
|
|
dc->writeback_rate.next + NSEC_PER_MSEC))) {
|
|
|
|
/*
|
|
|
|
* Only decrease the integral term if it's more than
|
|
|
|
* zero. Only increase the integral term if the device
|
|
|
|
* is keeping up. (Don't wind up the integral
|
|
|
|
* ineffectively in either case).
|
|
|
|
*
|
|
|
|
* It's necessary to scale this by
|
|
|
|
* writeback_rate_update_seconds to keep the integral
|
|
|
|
* term dimensioned properly.
|
|
|
|
*/
|
|
|
|
dc->writeback_rate_integral += error *
|
|
|
|
dc->writeback_rate_update_seconds;
|
|
|
|
}
|
2013-03-24 07:11:31 +08:00
|
|
|
|
bcache: implement PI controller for writeback rate
bcache uses a control system to attempt to keep the amount of dirty data
in cache at a user-configured level, while not responding excessively to
transients and variations in write rate. Previously, the system was a
PD controller; but the output from it was integrated, turning the
Proportional term into an Integral term, and turning the Derivative term
into a crude Proportional term. Performance of the controller has been
uneven in production, and it has tended to respond slowly, oscillate,
and overshoot.
This patch set replaces the current control system with an explicit PI
controller and tuning that should be correct for most hardware. By
default, it attempts to write at a rate that would retire 1/40th of the
current excess blocks per second. An integral term in turn works to
remove steady state errors.
IMO, this yields benefits in simplicity (removing weighted average
filtering, etc) and system performance.
Another small change is a tunable parameter is introduced to allow the
user to specify a minimum rate at which dirty blocks are retired.
There is a slight difference from earlier versions of the patch in
integral handling to prevent excessive negative integral windup.
Signed-off-by: Michael Lyle <mlyle@lyle.org>
Reviewed-by: Coly Li <colyli@suse.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
2017-10-14 07:35:36 +08:00
|
|
|
integral_scaled = div_s64(dc->writeback_rate_integral,
|
|
|
|
dc->writeback_rate_i_term_inverse);
|
2013-03-24 07:11:31 +08:00
|
|
|
|
2017-10-14 07:35:38 +08:00
|
|
|
new_rate = clamp_t(int32_t, (proportional_scaled + integral_scaled),
|
|
|
|
dc->writeback_rate_minimum, NSEC_PER_SEC);
|
2013-11-12 05:58:34 +08:00
|
|
|
|
bcache: implement PI controller for writeback rate
bcache uses a control system to attempt to keep the amount of dirty data
in cache at a user-configured level, while not responding excessively to
transients and variations in write rate. Previously, the system was a
PD controller; but the output from it was integrated, turning the
Proportional term into an Integral term, and turning the Derivative term
into a crude Proportional term. Performance of the controller has been
uneven in production, and it has tended to respond slowly, oscillate,
and overshoot.
This patch set replaces the current control system with an explicit PI
controller and tuning that should be correct for most hardware. By
default, it attempts to write at a rate that would retire 1/40th of the
current excess blocks per second. An integral term in turn works to
remove steady state errors.
IMO, this yields benefits in simplicity (removing weighted average
filtering, etc) and system performance.
Another small change is a tunable parameter is introduced to allow the
user to specify a minimum rate at which dirty blocks are retired.
There is a slight difference from earlier versions of the patch in
integral handling to prevent excessive negative integral windup.
Signed-off-by: Michael Lyle <mlyle@lyle.org>
Reviewed-by: Coly Li <colyli@suse.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
2017-10-14 07:35:36 +08:00
|
|
|
dc->writeback_rate_proportional = proportional_scaled;
|
|
|
|
dc->writeback_rate_integral_scaled = integral_scaled;
|
|
|
|
dc->writeback_rate_change = new_rate - dc->writeback_rate.rate;
|
|
|
|
dc->writeback_rate.rate = new_rate;
|
2013-03-24 07:11:31 +08:00
|
|
|
dc->writeback_rate_target = target;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void update_writeback_rate(struct work_struct *work)
|
|
|
|
{
|
|
|
|
struct cached_dev *dc = container_of(to_delayed_work(work),
|
|
|
|
struct cached_dev,
|
|
|
|
writeback_rate_update);
|
|
|
|
|
|
|
|
down_read(&dc->writeback_lock);
|
|
|
|
|
|
|
|
if (atomic_read(&dc->has_dirty) &&
|
|
|
|
dc->writeback_percent)
|
|
|
|
__update_writeback_rate(dc);
|
|
|
|
|
|
|
|
up_read(&dc->writeback_lock);
|
2013-07-25 08:50:06 +08:00
|
|
|
|
|
|
|
schedule_delayed_work(&dc->writeback_rate_update,
|
|
|
|
dc->writeback_rate_update_seconds * HZ);
|
2013-03-24 07:11:31 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static unsigned writeback_delay(struct cached_dev *dc, unsigned sectors)
|
|
|
|
{
|
2013-08-22 08:49:09 +08:00
|
|
|
if (test_bit(BCACHE_DEV_DETACHING, &dc->disk.flags) ||
|
2013-03-24 07:11:31 +08:00
|
|
|
!dc->writeback_percent)
|
|
|
|
return 0;
|
|
|
|
|
2013-11-12 05:58:34 +08:00
|
|
|
return bch_next_delay(&dc->writeback_rate, sectors);
|
2013-03-24 07:11:31 +08:00
|
|
|
}
|
|
|
|
|
2013-07-25 08:50:06 +08:00
|
|
|
struct dirty_io {
|
|
|
|
struct closure cl;
|
|
|
|
struct cached_dev *dc;
|
|
|
|
struct bio bio;
|
|
|
|
};
|
2013-06-05 21:24:39 +08:00
|
|
|
|
2013-03-24 07:11:31 +08:00
|
|
|
static void dirty_init(struct keybuf_key *w)
|
|
|
|
{
|
|
|
|
struct dirty_io *io = w->private;
|
|
|
|
struct bio *bio = &io->bio;
|
|
|
|
|
2016-11-22 23:57:21 +08:00
|
|
|
bio_init(bio, bio->bi_inline_vecs,
|
|
|
|
DIV_ROUND_UP(KEY_SIZE(&w->key), PAGE_SECTORS));
|
2013-03-24 07:11:31 +08:00
|
|
|
if (!io->dc->writeback_percent)
|
|
|
|
bio_set_prio(bio, IOPRIO_PRIO_VALUE(IOPRIO_CLASS_IDLE, 0));
|
|
|
|
|
2013-10-12 06:44:27 +08:00
|
|
|
bio->bi_iter.bi_size = KEY_SIZE(&w->key) << 9;
|
2013-03-24 07:11:31 +08:00
|
|
|
bio->bi_private = w;
|
2013-03-29 02:50:55 +08:00
|
|
|
bch_bio_map(bio, NULL);
|
2013-03-24 07:11:31 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static void dirty_io_destructor(struct closure *cl)
|
|
|
|
{
|
|
|
|
struct dirty_io *io = container_of(cl, struct dirty_io, cl);
|
|
|
|
kfree(io);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void write_dirty_finish(struct closure *cl)
|
|
|
|
{
|
|
|
|
struct dirty_io *io = container_of(cl, struct dirty_io, cl);
|
|
|
|
struct keybuf_key *w = io->bio.bi_private;
|
|
|
|
struct cached_dev *dc = io->dc;
|
|
|
|
|
2016-09-22 15:10:01 +08:00
|
|
|
bio_free_pages(&io->bio);
|
2013-03-24 07:11:31 +08:00
|
|
|
|
|
|
|
/* This is kind of a dumb way of signalling errors. */
|
|
|
|
if (KEY_DIRTY(&w->key)) {
|
2013-07-25 09:07:22 +08:00
|
|
|
int ret;
|
2013-03-24 07:11:31 +08:00
|
|
|
unsigned i;
|
2013-07-25 08:26:51 +08:00
|
|
|
struct keylist keys;
|
|
|
|
|
|
|
|
bch_keylist_init(&keys);
|
2013-03-24 07:11:31 +08:00
|
|
|
|
2013-09-11 09:52:54 +08:00
|
|
|
bkey_copy(keys.top, &w->key);
|
|
|
|
SET_KEY_DIRTY(keys.top, false);
|
|
|
|
bch_keylist_push(&keys);
|
2013-03-24 07:11:31 +08:00
|
|
|
|
|
|
|
for (i = 0; i < KEY_PTRS(&w->key); i++)
|
|
|
|
atomic_inc(&PTR_BUCKET(dc->disk.c, &w->key, i)->pin);
|
|
|
|
|
2013-07-25 09:07:22 +08:00
|
|
|
ret = bch_btree_insert(dc->disk.c, &keys, NULL, &w->key);
|
2013-03-24 07:11:31 +08:00
|
|
|
|
2013-07-25 09:06:22 +08:00
|
|
|
if (ret)
|
2013-04-27 06:39:55 +08:00
|
|
|
trace_bcache_writeback_collision(&w->key);
|
|
|
|
|
2013-07-25 09:06:22 +08:00
|
|
|
atomic_long_inc(ret
|
2013-03-24 07:11:31 +08:00
|
|
|
? &dc->disk.c->writeback_keys_failed
|
|
|
|
: &dc->disk.c->writeback_keys_done);
|
|
|
|
}
|
|
|
|
|
|
|
|
bch_keybuf_del(&dc->writeback_keys, w);
|
2013-09-24 14:17:31 +08:00
|
|
|
up(&dc->in_flight);
|
2013-03-24 07:11:31 +08:00
|
|
|
|
|
|
|
closure_return_with_destructor(cl, dirty_io_destructor);
|
|
|
|
}
|
|
|
|
|
2015-07-20 21:29:37 +08:00
|
|
|
static void dirty_endio(struct bio *bio)
|
2013-03-24 07:11:31 +08:00
|
|
|
{
|
|
|
|
struct keybuf_key *w = bio->bi_private;
|
|
|
|
struct dirty_io *io = w->private;
|
|
|
|
|
2017-06-03 15:38:06 +08:00
|
|
|
if (bio->bi_status)
|
2013-03-24 07:11:31 +08:00
|
|
|
SET_KEY_DIRTY(&w->key, false);
|
|
|
|
|
|
|
|
closure_put(&io->cl);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void write_dirty(struct closure *cl)
|
|
|
|
{
|
|
|
|
struct dirty_io *io = container_of(cl, struct dirty_io, cl);
|
|
|
|
struct keybuf_key *w = io->bio.bi_private;
|
|
|
|
|
2017-10-14 07:35:35 +08:00
|
|
|
/*
|
|
|
|
* IO errors are signalled using the dirty bit on the key.
|
|
|
|
* If we failed to read, we should not attempt to write to the
|
|
|
|
* backing device. Instead, immediately go to write_dirty_finish
|
|
|
|
* to clean up.
|
|
|
|
*/
|
|
|
|
if (KEY_DIRTY(&w->key)) {
|
|
|
|
dirty_init(w);
|
|
|
|
bio_set_op_attrs(&io->bio, REQ_OP_WRITE, 0);
|
|
|
|
io->bio.bi_iter.bi_sector = KEY_START(&w->key);
|
|
|
|
bio_set_dev(&io->bio, io->dc->bdev);
|
|
|
|
io->bio.bi_end_io = dirty_endio;
|
2013-03-24 07:11:31 +08:00
|
|
|
|
2017-10-14 07:35:35 +08:00
|
|
|
closure_bio_submit(&io->bio, cl);
|
|
|
|
}
|
2013-03-24 07:11:31 +08:00
|
|
|
|
2017-09-06 14:25:59 +08:00
|
|
|
continue_at(cl, write_dirty_finish, io->dc->writeback_write_wq);
|
2013-03-24 07:11:31 +08:00
|
|
|
}
|
|
|
|
|
2015-07-20 21:29:37 +08:00
|
|
|
static void read_dirty_endio(struct bio *bio)
|
2013-03-24 07:11:31 +08:00
|
|
|
{
|
|
|
|
struct keybuf_key *w = bio->bi_private;
|
|
|
|
struct dirty_io *io = w->private;
|
|
|
|
|
|
|
|
bch_count_io_errors(PTR_CACHE(io->dc->disk.c, &w->key, 0),
|
2017-06-03 15:38:06 +08:00
|
|
|
bio->bi_status, "reading dirty data from cache");
|
2013-03-24 07:11:31 +08:00
|
|
|
|
2015-07-20 21:29:37 +08:00
|
|
|
dirty_endio(bio);
|
2013-03-24 07:11:31 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static void read_dirty_submit(struct closure *cl)
|
|
|
|
{
|
|
|
|
struct dirty_io *io = container_of(cl, struct dirty_io, cl);
|
|
|
|
|
2013-11-24 15:11:25 +08:00
|
|
|
closure_bio_submit(&io->bio, cl);
|
2013-03-24 07:11:31 +08:00
|
|
|
|
2017-09-06 14:25:59 +08:00
|
|
|
continue_at(cl, write_dirty, io->dc->writeback_write_wq);
|
2013-03-24 07:11:31 +08:00
|
|
|
}
|
|
|
|
|
2013-07-25 08:50:06 +08:00
|
|
|
static void read_dirty(struct cached_dev *dc)
|
2013-03-24 07:11:31 +08:00
|
|
|
{
|
2013-07-25 08:50:06 +08:00
|
|
|
unsigned delay = 0;
|
2013-03-24 07:11:31 +08:00
|
|
|
struct keybuf_key *w;
|
|
|
|
struct dirty_io *io;
|
2013-07-25 08:50:06 +08:00
|
|
|
struct closure cl;
|
|
|
|
|
|
|
|
closure_init_stack(&cl);
|
2013-03-24 07:11:31 +08:00
|
|
|
|
|
|
|
/*
|
|
|
|
* XXX: if we error, background writeback just spins. Should use some
|
|
|
|
* mempools.
|
|
|
|
*/
|
|
|
|
|
2013-07-25 08:50:06 +08:00
|
|
|
while (!kthread_should_stop()) {
|
|
|
|
|
2013-03-24 07:11:31 +08:00
|
|
|
w = bch_keybuf_next(&dc->writeback_keys);
|
|
|
|
if (!w)
|
|
|
|
break;
|
|
|
|
|
|
|
|
BUG_ON(ptr_stale(dc->disk.c, &w->key, 0));
|
|
|
|
|
2013-07-25 08:50:06 +08:00
|
|
|
if (KEY_START(&w->key) != dc->last_read ||
|
|
|
|
jiffies_to_msecs(delay) > 50)
|
|
|
|
while (!kthread_should_stop() && delay)
|
2014-05-02 04:48:57 +08:00
|
|
|
delay = schedule_timeout_interruptible(delay);
|
2013-03-24 07:11:31 +08:00
|
|
|
|
|
|
|
dc->last_read = KEY_OFFSET(&w->key);
|
|
|
|
|
|
|
|
io = kzalloc(sizeof(struct dirty_io) + sizeof(struct bio_vec)
|
|
|
|
* DIV_ROUND_UP(KEY_SIZE(&w->key), PAGE_SECTORS),
|
|
|
|
GFP_KERNEL);
|
|
|
|
if (!io)
|
|
|
|
goto err;
|
|
|
|
|
|
|
|
w->private = io;
|
|
|
|
io->dc = dc;
|
|
|
|
|
|
|
|
dirty_init(w);
|
2016-06-06 03:32:05 +08:00
|
|
|
bio_set_op_attrs(&io->bio, REQ_OP_READ, 0);
|
2013-10-12 06:44:27 +08:00
|
|
|
io->bio.bi_iter.bi_sector = PTR_OFFSET(&w->key, 0);
|
2017-08-24 01:10:32 +08:00
|
|
|
bio_set_dev(&io->bio, PTR_CACHE(dc->disk.c, &w->key, 0)->bdev);
|
2013-03-24 07:11:31 +08:00
|
|
|
io->bio.bi_end_io = read_dirty_endio;
|
|
|
|
|
2017-12-18 20:22:10 +08:00
|
|
|
if (bch_bio_alloc_pages(&io->bio, GFP_KERNEL))
|
2013-03-24 07:11:31 +08:00
|
|
|
goto err_free;
|
|
|
|
|
2013-04-27 06:39:55 +08:00
|
|
|
trace_bcache_writeback(&w->key);
|
2013-03-24 07:11:31 +08:00
|
|
|
|
2013-09-24 14:17:31 +08:00
|
|
|
down(&dc->in_flight);
|
2013-07-25 08:50:06 +08:00
|
|
|
closure_call(&io->cl, read_dirty_submit, NULL, &cl);
|
2013-03-24 07:11:31 +08:00
|
|
|
|
|
|
|
delay = writeback_delay(dc, KEY_SIZE(&w->key));
|
|
|
|
}
|
|
|
|
|
|
|
|
if (0) {
|
|
|
|
err_free:
|
|
|
|
kfree(w->private);
|
|
|
|
err:
|
|
|
|
bch_keybuf_del(&dc->writeback_keys, w);
|
|
|
|
}
|
|
|
|
|
2013-09-24 14:17:31 +08:00
|
|
|
/*
|
|
|
|
* Wait for outstanding writeback IOs to finish (and keybuf slots to be
|
|
|
|
* freed) before refilling again
|
|
|
|
*/
|
2013-07-25 08:50:06 +08:00
|
|
|
closure_sync(&cl);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Scan for dirty data */
|
|
|
|
|
|
|
|
void bcache_dev_sectors_dirty_add(struct cache_set *c, unsigned inode,
|
|
|
|
uint64_t offset, int nr_sectors)
|
|
|
|
{
|
|
|
|
struct bcache_device *d = c->devices[inode];
|
2013-11-01 06:43:22 +08:00
|
|
|
unsigned stripe_offset, stripe, sectors_dirty;
|
2013-07-25 08:50:06 +08:00
|
|
|
|
|
|
|
if (!d)
|
|
|
|
return;
|
|
|
|
|
2013-11-01 06:43:22 +08:00
|
|
|
stripe = offset_to_stripe(d, offset);
|
2013-07-25 08:50:06 +08:00
|
|
|
stripe_offset = offset & (d->stripe_size - 1);
|
|
|
|
|
|
|
|
while (nr_sectors) {
|
|
|
|
int s = min_t(unsigned, abs(nr_sectors),
|
|
|
|
d->stripe_size - stripe_offset);
|
|
|
|
|
|
|
|
if (nr_sectors < 0)
|
|
|
|
s = -s;
|
|
|
|
|
2013-11-01 06:43:22 +08:00
|
|
|
if (stripe >= d->nr_stripes)
|
|
|
|
return;
|
|
|
|
|
|
|
|
sectors_dirty = atomic_add_return(s,
|
|
|
|
d->stripe_sectors_dirty + stripe);
|
|
|
|
if (sectors_dirty == d->stripe_size)
|
|
|
|
set_bit(stripe, d->full_dirty_stripes);
|
|
|
|
else
|
|
|
|
clear_bit(stripe, d->full_dirty_stripes);
|
|
|
|
|
2013-07-25 08:50:06 +08:00
|
|
|
nr_sectors -= s;
|
|
|
|
stripe_offset = 0;
|
|
|
|
stripe++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool dirty_pred(struct keybuf *buf, struct bkey *k)
|
|
|
|
{
|
2015-11-30 10:47:01 +08:00
|
|
|
struct cached_dev *dc = container_of(buf, struct cached_dev, writeback_keys);
|
|
|
|
|
|
|
|
BUG_ON(KEY_INODE(k) != dc->disk.id);
|
|
|
|
|
2013-07-25 08:50:06 +08:00
|
|
|
return KEY_DIRTY(k);
|
|
|
|
}
|
|
|
|
|
2013-11-01 06:43:22 +08:00
|
|
|
static void refill_full_stripes(struct cached_dev *dc)
|
2013-07-25 08:50:06 +08:00
|
|
|
{
|
2013-11-01 06:43:22 +08:00
|
|
|
struct keybuf *buf = &dc->writeback_keys;
|
|
|
|
unsigned start_stripe, stripe, next_stripe;
|
|
|
|
bool wrapped = false;
|
|
|
|
|
|
|
|
stripe = offset_to_stripe(&dc->disk, KEY_OFFSET(&buf->last_scanned));
|
2013-07-25 08:50:06 +08:00
|
|
|
|
2013-11-01 06:43:22 +08:00
|
|
|
if (stripe >= dc->disk.nr_stripes)
|
|
|
|
stripe = 0;
|
2013-07-25 08:50:06 +08:00
|
|
|
|
2013-11-01 06:43:22 +08:00
|
|
|
start_stripe = stripe;
|
2013-07-25 08:50:06 +08:00
|
|
|
|
|
|
|
while (1) {
|
2013-11-01 06:43:22 +08:00
|
|
|
stripe = find_next_bit(dc->disk.full_dirty_stripes,
|
|
|
|
dc->disk.nr_stripes, stripe);
|
2013-07-25 08:50:06 +08:00
|
|
|
|
2013-11-01 06:43:22 +08:00
|
|
|
if (stripe == dc->disk.nr_stripes)
|
|
|
|
goto next;
|
2013-07-25 08:50:06 +08:00
|
|
|
|
2013-11-01 06:43:22 +08:00
|
|
|
next_stripe = find_next_zero_bit(dc->disk.full_dirty_stripes,
|
|
|
|
dc->disk.nr_stripes, stripe);
|
|
|
|
|
|
|
|
buf->last_scanned = KEY(dc->disk.id,
|
|
|
|
stripe * dc->disk.stripe_size, 0);
|
|
|
|
|
|
|
|
bch_refill_keybuf(dc->disk.c, buf,
|
|
|
|
&KEY(dc->disk.id,
|
|
|
|
next_stripe * dc->disk.stripe_size, 0),
|
|
|
|
dirty_pred);
|
|
|
|
|
|
|
|
if (array_freelist_empty(&buf->freelist))
|
|
|
|
return;
|
|
|
|
|
|
|
|
stripe = next_stripe;
|
|
|
|
next:
|
|
|
|
if (wrapped && stripe > start_stripe)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (stripe == dc->disk.nr_stripes) {
|
|
|
|
stripe = 0;
|
|
|
|
wrapped = true;
|
|
|
|
}
|
2013-07-25 08:50:06 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-11-30 10:47:01 +08:00
|
|
|
/*
|
|
|
|
* Returns true if we scanned the entire disk
|
|
|
|
*/
|
2013-07-25 08:50:06 +08:00
|
|
|
static bool refill_dirty(struct cached_dev *dc)
|
|
|
|
{
|
|
|
|
struct keybuf *buf = &dc->writeback_keys;
|
2015-11-30 10:47:01 +08:00
|
|
|
struct bkey start = KEY(dc->disk.id, 0, 0);
|
2013-07-25 08:50:06 +08:00
|
|
|
struct bkey end = KEY(dc->disk.id, MAX_KEY_OFFSET, 0);
|
2015-11-30 10:47:01 +08:00
|
|
|
struct bkey start_pos;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* make sure keybuf pos is inside the range for this disk - at bringup
|
|
|
|
* we might not be attached yet so this disk's inode nr isn't
|
|
|
|
* initialized then
|
|
|
|
*/
|
|
|
|
if (bkey_cmp(&buf->last_scanned, &start) < 0 ||
|
|
|
|
bkey_cmp(&buf->last_scanned, &end) > 0)
|
|
|
|
buf->last_scanned = start;
|
2013-11-01 06:43:22 +08:00
|
|
|
|
|
|
|
if (dc->partial_stripes_expensive) {
|
|
|
|
refill_full_stripes(dc);
|
|
|
|
if (array_freelist_empty(&buf->freelist))
|
|
|
|
return false;
|
|
|
|
}
|
2013-07-25 08:50:06 +08:00
|
|
|
|
2015-11-30 10:47:01 +08:00
|
|
|
start_pos = buf->last_scanned;
|
2013-11-01 06:43:22 +08:00
|
|
|
bch_refill_keybuf(dc->disk.c, buf, &end, dirty_pred);
|
2013-07-25 08:50:06 +08:00
|
|
|
|
2015-11-30 10:47:01 +08:00
|
|
|
if (bkey_cmp(&buf->last_scanned, &end) < 0)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If we get to the end start scanning again from the beginning, and
|
|
|
|
* only scan up to where we initially started scanning from:
|
|
|
|
*/
|
|
|
|
buf->last_scanned = start;
|
|
|
|
bch_refill_keybuf(dc->disk.c, buf, &start_pos, dirty_pred);
|
|
|
|
|
|
|
|
return bkey_cmp(&buf->last_scanned, &start_pos) >= 0;
|
2013-07-25 08:50:06 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static int bch_writeback_thread(void *arg)
|
|
|
|
{
|
|
|
|
struct cached_dev *dc = arg;
|
|
|
|
bool searched_full_index;
|
|
|
|
|
2017-10-14 07:35:39 +08:00
|
|
|
bch_ratelimit_reset(&dc->writeback_rate);
|
|
|
|
|
2013-07-25 08:50:06 +08:00
|
|
|
while (!kthread_should_stop()) {
|
|
|
|
down_write(&dc->writeback_lock);
|
|
|
|
if (!atomic_read(&dc->has_dirty) ||
|
2013-08-22 08:49:09 +08:00
|
|
|
(!test_bit(BCACHE_DEV_DETACHING, &dc->disk.flags) &&
|
2013-07-25 08:50:06 +08:00
|
|
|
!dc->writeback_running)) {
|
|
|
|
up_write(&dc->writeback_lock);
|
|
|
|
set_current_state(TASK_INTERRUPTIBLE);
|
|
|
|
|
|
|
|
if (kthread_should_stop())
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
schedule();
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
searched_full_index = refill_dirty(dc);
|
|
|
|
|
|
|
|
if (searched_full_index &&
|
|
|
|
RB_EMPTY_ROOT(&dc->writeback_keys.keys)) {
|
|
|
|
atomic_set(&dc->has_dirty, 0);
|
|
|
|
cached_dev_put(dc);
|
|
|
|
SET_BDEV_STATE(&dc->sb, BDEV_STATE_CLEAN);
|
|
|
|
bch_write_bdev_super(dc, NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
up_write(&dc->writeback_lock);
|
|
|
|
|
|
|
|
read_dirty(dc);
|
|
|
|
|
|
|
|
if (searched_full_index) {
|
|
|
|
unsigned delay = dc->writeback_delay * HZ;
|
|
|
|
|
|
|
|
while (delay &&
|
|
|
|
!kthread_should_stop() &&
|
2013-08-22 08:49:09 +08:00
|
|
|
!test_bit(BCACHE_DEV_DETACHING, &dc->disk.flags))
|
2014-05-02 04:48:57 +08:00
|
|
|
delay = schedule_timeout_interruptible(delay);
|
2017-10-14 07:35:39 +08:00
|
|
|
|
|
|
|
bch_ratelimit_reset(&dc->writeback_rate);
|
2013-07-25 08:50:06 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
2013-03-24 07:11:31 +08:00
|
|
|
}
|
|
|
|
|
2013-05-12 08:07:26 +08:00
|
|
|
/* Init */
|
|
|
|
|
2013-07-25 08:44:17 +08:00
|
|
|
struct sectors_dirty_init {
|
|
|
|
struct btree_op op;
|
|
|
|
unsigned inode;
|
|
|
|
};
|
|
|
|
|
|
|
|
static int sectors_dirty_init_fn(struct btree_op *_op, struct btree *b,
|
2013-09-11 09:48:51 +08:00
|
|
|
struct bkey *k)
|
2013-05-12 08:07:26 +08:00
|
|
|
{
|
2013-07-25 08:44:17 +08:00
|
|
|
struct sectors_dirty_init *op = container_of(_op,
|
|
|
|
struct sectors_dirty_init, op);
|
2013-09-11 09:48:51 +08:00
|
|
|
if (KEY_INODE(k) > op->inode)
|
|
|
|
return MAP_DONE;
|
2013-05-12 08:07:26 +08:00
|
|
|
|
2013-09-11 09:48:51 +08:00
|
|
|
if (KEY_DIRTY(k))
|
|
|
|
bcache_dev_sectors_dirty_add(b->c, KEY_INODE(k),
|
|
|
|
KEY_START(k), KEY_SIZE(k));
|
|
|
|
|
|
|
|
return MAP_CONTINUE;
|
2013-05-12 08:07:26 +08:00
|
|
|
}
|
|
|
|
|
2017-09-07 01:28:53 +08:00
|
|
|
void bch_sectors_dirty_init(struct bcache_device *d)
|
2013-05-12 08:07:26 +08:00
|
|
|
{
|
2013-07-25 08:44:17 +08:00
|
|
|
struct sectors_dirty_init op;
|
2013-05-12 08:07:26 +08:00
|
|
|
|
2013-07-25 09:04:18 +08:00
|
|
|
bch_btree_op_init(&op.op, -1);
|
2017-09-07 01:28:53 +08:00
|
|
|
op.inode = d->id;
|
2013-09-11 09:48:51 +08:00
|
|
|
|
2017-09-07 01:28:53 +08:00
|
|
|
bch_btree_map_keys(&op.op, d->c, &KEY(op.inode, 0, 0),
|
2013-09-11 09:48:51 +08:00
|
|
|
sectors_dirty_init_fn, 0);
|
2013-05-12 08:07:26 +08:00
|
|
|
}
|
|
|
|
|
2014-05-02 04:48:57 +08:00
|
|
|
void bch_cached_dev_writeback_init(struct cached_dev *dc)
|
2013-03-24 07:11:31 +08:00
|
|
|
{
|
2013-09-24 14:17:31 +08:00
|
|
|
sema_init(&dc->in_flight, 64);
|
2013-03-24 07:11:31 +08:00
|
|
|
init_rwsem(&dc->writeback_lock);
|
2013-06-05 21:24:39 +08:00
|
|
|
bch_keybuf_init(&dc->writeback_keys);
|
2013-03-24 07:11:31 +08:00
|
|
|
|
|
|
|
dc->writeback_metadata = true;
|
|
|
|
dc->writeback_running = true;
|
|
|
|
dc->writeback_percent = 10;
|
|
|
|
dc->writeback_delay = 30;
|
|
|
|
dc->writeback_rate.rate = 1024;
|
2017-10-14 07:35:37 +08:00
|
|
|
dc->writeback_rate_minimum = 8;
|
2013-03-24 07:11:31 +08:00
|
|
|
|
2013-11-12 05:58:34 +08:00
|
|
|
dc->writeback_rate_update_seconds = 5;
|
bcache: implement PI controller for writeback rate
bcache uses a control system to attempt to keep the amount of dirty data
in cache at a user-configured level, while not responding excessively to
transients and variations in write rate. Previously, the system was a
PD controller; but the output from it was integrated, turning the
Proportional term into an Integral term, and turning the Derivative term
into a crude Proportional term. Performance of the controller has been
uneven in production, and it has tended to respond slowly, oscillate,
and overshoot.
This patch set replaces the current control system with an explicit PI
controller and tuning that should be correct for most hardware. By
default, it attempts to write at a rate that would retire 1/40th of the
current excess blocks per second. An integral term in turn works to
remove steady state errors.
IMO, this yields benefits in simplicity (removing weighted average
filtering, etc) and system performance.
Another small change is a tunable parameter is introduced to allow the
user to specify a minimum rate at which dirty blocks are retired.
There is a slight difference from earlier versions of the patch in
integral handling to prevent excessive negative integral windup.
Signed-off-by: Michael Lyle <mlyle@lyle.org>
Reviewed-by: Coly Li <colyli@suse.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
2017-10-14 07:35:36 +08:00
|
|
|
dc->writeback_rate_p_term_inverse = 40;
|
|
|
|
dc->writeback_rate_i_term_inverse = 10000;
|
2013-03-24 07:11:31 +08:00
|
|
|
|
2014-05-02 04:48:57 +08:00
|
|
|
INIT_DELAYED_WORK(&dc->writeback_rate_update, update_writeback_rate);
|
|
|
|
}
|
|
|
|
|
|
|
|
int bch_cached_dev_writeback_start(struct cached_dev *dc)
|
|
|
|
{
|
2017-09-06 14:25:59 +08:00
|
|
|
dc->writeback_write_wq = alloc_workqueue("bcache_writeback_wq",
|
|
|
|
WQ_MEM_RECLAIM, 0);
|
|
|
|
if (!dc->writeback_write_wq)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
2013-07-25 08:50:06 +08:00
|
|
|
dc->writeback_thread = kthread_create(bch_writeback_thread, dc,
|
|
|
|
"bcache_writeback");
|
|
|
|
if (IS_ERR(dc->writeback_thread))
|
|
|
|
return PTR_ERR(dc->writeback_thread);
|
|
|
|
|
2013-03-24 07:11:31 +08:00
|
|
|
schedule_delayed_work(&dc->writeback_rate_update,
|
|
|
|
dc->writeback_rate_update_seconds * HZ);
|
|
|
|
|
2014-05-02 04:48:57 +08:00
|
|
|
bch_writeback_queue(dc);
|
|
|
|
|
2013-03-24 07:11:31 +08:00
|
|
|
return 0;
|
|
|
|
}
|