[linux] 01/01: bcache: Add upstream fixes marked for stable
debian-kernel at lists.debian.org
debian-kernel at lists.debian.org
Sun Jan 17 22:00:32 UTC 2016
This is an automated email from the git hooks/post-receive script.
benh pushed a commit to branch sid
in repository linux.
commit e90dec2a0e7ec5abd38a474075ab0e1333c45ac1
Author: Ben Hutchings <ben at decadent.org.uk>
Date: Sun Jan 17 21:59:33 2016 +0000
bcache: Add upstream fixes marked for stable
- fix a livelock when we cause a huge number of cache misses
- Add a cond_resched() call to gc
- clear BCACHE_DEV_UNLINK_DONE flag when attaching a backing device
- fix a leak in bch_cached_dev_run()
- unregister reboot notifier if bcache fails to unregister device
- allows use of register in udev to avoid "device_busy" error.
- prevent crash on changing writeback_running
- Change refill_dirty() to always scan entire disk if necessary
As requested in
https://lists.debian.org/debian-backports/2016/01/msg00067.html
---
debian/changelog | 9 ++
.../all/bcache-add-a-cond_resched-call-to-gc.patch | 26 +++++
...ws-use-of-register-in-udev-to-avoid-devic.patch | 46 +++++++++
...ge-refill_dirty-to-always-scan-entire-dis.patch | 91 +++++++++++++++++
...r-bcache_dev_unlink_done-flag-when-attach.patch | 109 +++++++++++++++++++++
.../bcache-fix-a-leak-in-bch_cached_dev_run.patch | 32 ++++++
...a-livelock-when-we-cause-a-huge-number-of.patch | 67 +++++++++++++
...event-crash-on-changing-writeback_running.patch | 32 ++++++
...gister-reboot-notifier-if-bcache-fails-to.patch | 35 +++++++
debian/patches/series | 8 ++
10 files changed, 455 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 804725b..c0be2e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,15 @@ linux (4.3.3-6) UNRELEASED; urgency=medium
(CVE-2015-7566)
* tty: Fix unsafe ldisc reference via ioctl(TIOCGETD) (CVE-2016-0723)
* [x86] drm/vmwgfx: Fix a width / pitch mismatch on framebuffer updates
+ * bcache: Add upstream fixes marked for stable:
+ - fix a livelock when we cause a huge number of cache misses
+ - Add a cond_resched() call to gc
+ - clear BCACHE_DEV_UNLINK_DONE flag when attaching a backing device
+ - fix a leak in bch_cached_dev_run()
+ - unregister reboot notifier if bcache fails to unregister device
+ - allows use of register in udev to avoid "device_busy" error.
+ - prevent crash on changing writeback_running
+ - Change refill_dirty() to always scan entire disk if necessary
[ Salvatore Bonaccorso ]
* unix: properly account for FDs passed over unix sockets (CVE-2013-4312)
diff --git a/debian/patches/bugfix/all/bcache-add-a-cond_resched-call-to-gc.patch b/debian/patches/bugfix/all/bcache-add-a-cond_resched-call-to-gc.patch
new file mode 100644
index 0000000..0580e61
--- /dev/null
+++ b/debian/patches/bugfix/all/bcache-add-a-cond_resched-call-to-gc.patch
@@ -0,0 +1,26 @@
+From: Kent Overstreet <kmo at daterainc.com>
+Date: Sun, 29 Nov 2015 17:18:33 -0800
+Subject: [2/8] bcache: Add a cond_resched() call to gc
+Origin: https://git.kernel.org/cgit/linux/kernel/git/axboe/linux-block.git/commit?id=c5f1e5adf956e3ba82d204c7c141a75da9fa449a
+
+Signed-off-by: Takashi Iwai <tiwai at suse.de>
+Tested-by: Eric Wheeler <bcache at linux.ewheeler.net>
+Cc: Kent Overstreet <kmo at daterainc.com>
+Cc: stable at vger.kernel.org
+Signed-off-by: Jens Axboe <axboe at fb.com>
+---
+ drivers/md/bcache/btree.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/drivers/md/bcache/btree.c b/drivers/md/bcache/btree.c
+index 4a1179c..22b9e34 100644
+--- a/drivers/md/bcache/btree.c
++++ b/drivers/md/bcache/btree.c
+@@ -1741,6 +1741,7 @@ static void bch_btree_gc(struct cache_set *c)
+ do {
+ ret = btree_root(gc_root, c, &op, &writes, &stats);
+ closure_sync(&writes);
++ cond_resched();
+
+ if (ret && ret != -EAGAIN)
+ pr_warn("gc failed!");
diff --git a/debian/patches/bugfix/all/bcache-allows-use-of-register-in-udev-to-avoid-devic.patch b/debian/patches/bugfix/all/bcache-allows-use-of-register-in-udev-to-avoid-devic.patch
new file mode 100644
index 0000000..7829797
--- /dev/null
+++ b/debian/patches/bugfix/all/bcache-allows-use-of-register-in-udev-to-avoid-devic.patch
@@ -0,0 +1,46 @@
+From: Gabriel de Perthuis <g2p.code at gmail.com>
+Date: Sun, 29 Nov 2015 18:40:23 -0800
+Subject: [6/8] bcache: allows use of register in udev to avoid "device_busy"
+ error.
+Origin: https://git.kernel.org/cgit/linux/kernel/git/axboe/linux-block.git/commit?id=d7076f21629f8f329bca4a44dc408d94670f49e2
+
+Allows to use register, not register_quiet in udev to avoid "device_busy" error.
+The initial patch proposed at https://lkml.org/lkml/2013/8/26/549 by Gabriel de Perthuis
+<g2p.code at gmail.com> does not unlock the mutex and hangs the kernel.
+
+See http://thread.gmane.org/gmane.linux.kernel.bcache.devel/2594 for the discussion.
+
+Cc: Denis Bychkov <manover at gmail.com>
+Cc: Kent Overstreet <kent.overstreet at gmail.com>
+Cc: Eric Wheeler <bcache at linux.ewheeler.net>
+Cc: Gabriel de Perthuis <g2p.code at gmail.com>
+Cc: stable at vger.kernel.org
+
+Signed-off-by: Jens Axboe <axboe at fb.com>
+---
+ drivers/md/bcache/super.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c
+index 18f14a2..8d0ead9 100644
+--- a/drivers/md/bcache/super.c
++++ b/drivers/md/bcache/super.c
+@@ -1938,6 +1938,8 @@ static ssize_t register_bcache(struct kobject *k, struct kobj_attribute *attr,
+ else
+ err = "device busy";
+ mutex_unlock(&bch_register_lock);
++ if (attr == &ksysfs_register_quiet)
++ goto out;
+ }
+ goto err;
+ }
+@@ -1976,8 +1978,7 @@ out:
+ err_close:
+ blkdev_put(bdev, FMODE_READ|FMODE_WRITE|FMODE_EXCL);
+ err:
+- if (attr != &ksysfs_register_quiet)
+- pr_info("error opening %s: %s", path, err);
++ pr_info("error opening %s: %s", path, err);
+ ret = -EINVAL;
+ goto out;
+ }
diff --git a/debian/patches/bugfix/all/bcache-change-refill_dirty-to-always-scan-entire-dis.patch b/debian/patches/bugfix/all/bcache-change-refill_dirty-to-always-scan-entire-dis.patch
new file mode 100644
index 0000000..7dae0c8
--- /dev/null
+++ b/debian/patches/bugfix/all/bcache-change-refill_dirty-to-always-scan-entire-dis.patch
@@ -0,0 +1,91 @@
+From: Kent Overstreet <kent.overstreet at gmail.com>
+Date: Sun, 29 Nov 2015 18:47:01 -0800
+Subject: [8/8] bcache: Change refill_dirty() to always scan entire disk if
+ necessary
+Origin: https://git.kernel.org/cgit/linux/kernel/git/axboe/linux-block.git/commit?id=627ccd20b4ad3ba836472468208e2ac4dfadbf03
+
+Previously, it would only scan the entire disk if it was starting from
+the very start of the disk - i.e. if the previous scan got to the end.
+
+This was broken by refill_full_stripes(), which updates last_scanned so
+that refill_dirty was never triggering the searched_from_start path.
+
+But if we change refill_dirty() to always scan the entire disk if
+necessary, regardless of what last_scanned was, the code gets cleaner
+and we fix that bug too.
+
+Signed-off-by: Kent Overstreet <kent.overstreet at gmail.com>
+Cc: stable at vger.kernel.org
+Signed-off-by: Jens Axboe <axboe at fb.com>
+---
+ drivers/md/bcache/writeback.c | 37 ++++++++++++++++++++++++++++++-------
+ 1 file changed, 30 insertions(+), 7 deletions(-)
+
+diff --git a/drivers/md/bcache/writeback.c b/drivers/md/bcache/writeback.c
+index b23f88d..b9346cd 100644
+--- a/drivers/md/bcache/writeback.c
++++ b/drivers/md/bcache/writeback.c
+@@ -323,6 +323,10 @@ void bcache_dev_sectors_dirty_add(struct cache_set *c, unsigned inode,
+
+ static bool dirty_pred(struct keybuf *buf, struct bkey *k)
+ {
++ struct cached_dev *dc = container_of(buf, struct cached_dev, writeback_keys);
++
++ BUG_ON(KEY_INODE(k) != dc->disk.id);
++
+ return KEY_DIRTY(k);
+ }
+
+@@ -372,11 +376,24 @@ next:
+ }
+ }
+
++/*
++ * Returns true if we scanned the entire disk
++ */
+ static bool refill_dirty(struct cached_dev *dc)
+ {
+ struct keybuf *buf = &dc->writeback_keys;
++ struct bkey start = KEY(dc->disk.id, 0, 0);
+ struct bkey end = KEY(dc->disk.id, MAX_KEY_OFFSET, 0);
+- bool searched_from_start = false;
++ 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;
+
+ if (dc->partial_stripes_expensive) {
+ refill_full_stripes(dc);
+@@ -384,14 +401,20 @@ static bool refill_dirty(struct cached_dev *dc)
+ return false;
+ }
+
+- if (bkey_cmp(&buf->last_scanned, &end) >= 0) {
+- buf->last_scanned = KEY(dc->disk.id, 0, 0);
+- searched_from_start = true;
+- }
+-
++ start_pos = buf->last_scanned;
+ bch_refill_keybuf(dc->disk.c, buf, &end, dirty_pred);
+
+- return bkey_cmp(&buf->last_scanned, &end) >= 0 && searched_from_start;
++ 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;
+ }
+
+ static int bch_writeback_thread(void *arg)
diff --git a/debian/patches/bugfix/all/bcache-clear-bcache_dev_unlink_done-flag-when-attach.patch b/debian/patches/bugfix/all/bcache-clear-bcache_dev_unlink_done-flag-when-attach.patch
new file mode 100644
index 0000000..83e0bf8
--- /dev/null
+++ b/debian/patches/bugfix/all/bcache-clear-bcache_dev_unlink_done-flag-when-attach.patch
@@ -0,0 +1,109 @@
+From: Zheng Liu <wenqing.lz at taobao.com>
+Date: Sun, 29 Nov 2015 17:19:32 -0800
+Subject: [3/8] bcache: clear BCACHE_DEV_UNLINK_DONE flag when attaching a
+ backing device
+Origin: https://git.kernel.org/cgit/linux/kernel/git/axboe/linux-block.git/commit?id=fecaee6f20ee122ad75402c53d8278f9bb142ddc
+
+This bug can be reproduced by the following script:
+
+ #!/bin/bash
+
+ bcache_sysfs="/sys/fs/bcache"
+
+ function clear_cache()
+ {
+ if [ ! -e $bcache_sysfs ]; then
+ echo "no bcache sysfs"
+ exit
+ fi
+
+ cset_uuid=$(ls -l $bcache_sysfs|head -n 2|tail -n 1|awk '{print $9}')
+ sudo sh -c "echo $cset_uuid > /sys/block/sdb/sdb1/bcache/detach"
+ sleep 5
+ sudo sh -c "echo $cset_uuid > /sys/block/sdb/sdb1/bcache/attach"
+ }
+
+ for ((i=0;i<10;i++)); do
+ clear_cache
+ done
+
+The warning messages look like below:
+[ 275.948611] ------------[ cut here ]------------
+[ 275.963840] WARNING: at fs/sysfs/dir.c:512 sysfs_add_one+0xb8/0xd0() (Tainted: P W
+--------------- )
+[ 275.979253] Hardware name: Tecal RH2285
+[ 275.994106] sysfs: cannot create duplicate filename '/devices/pci0000:00/0000:00:09.0/0000:08:00.0/host4/target4:2:1/4:2:1:0/block/sdb/sdb1/bcache/cache'
+[ 276.024105] Modules linked in: bcache tcp_diag inet_diag ipmi_devintf ipmi_si ipmi_msghandler
+bonding 8021q garp stp llc ipv6 ext3 jbd loop sg iomemory_vsl(P) bnx2 microcode serio_raw i2c_i801
+i2c_core iTCO_wdt iTCO_vendor_support i7core_edac edac_core shpchp ext4 jbd2 mbcache megaraid_sas
+pata_acpi ata_generic ata_piix dm_mod [last unloaded: scsi_wait_scan]
+[ 276.072643] Pid: 2765, comm: sh Tainted: P W --------------- 2.6.32 #1
+[ 276.089315] Call Trace:
+[ 276.105801] [<ffffffff81070fe7>] ? warn_slowpath_common+0x87/0xc0
+[ 276.122650] [<ffffffff810710d6>] ? warn_slowpath_fmt+0x46/0x50
+[ 276.139361] [<ffffffff81205c08>] ? sysfs_add_one+0xb8/0xd0
+[ 276.156012] [<ffffffff8120609b>] ? sysfs_do_create_link+0x12b/0x170
+[ 276.172682] [<ffffffff81206113>] ? sysfs_create_link+0x13/0x20
+[ 276.189282] [<ffffffffa03bda21>] ? bcache_device_link+0xc1/0x110 [bcache]
+[ 276.205993] [<ffffffffa03bfa08>] ? bch_cached_dev_attach+0x478/0x4f0 [bcache]
+[ 276.222794] [<ffffffffa03c4a17>] ? bch_cached_dev_store+0x627/0x780 [bcache]
+[ 276.239680] [<ffffffff8116783a>] ? alloc_pages_current+0xaa/0x110
+[ 276.256594] [<ffffffff81203b15>] ? sysfs_write_file+0xe5/0x170
+[ 276.273364] [<ffffffff811887b8>] ? vfs_write+0xb8/0x1a0
+[ 276.290133] [<ffffffff811890b1>] ? sys_write+0x51/0x90
+[ 276.306368] [<ffffffff8100c072>] ? system_call_fastpath+0x16/0x1b
+[ 276.322301] ---[ end trace 9f5d4fcdd0c3edfb ]---
+[ 276.338241] ------------[ cut here ]------------
+[ 276.354109] WARNING: at /home/wenqing.lz/bcache/bcache/super.c:720
+bcache_device_link+0xdf/0x110 [bcache]() (Tainted: P W --------------- )
+[ 276.386017] Hardware name: Tecal RH2285
+[ 276.401430] Couldn't create device <-> cache set symlinks
+[ 276.401759] Modules linked in: bcache tcp_diag inet_diag ipmi_devintf ipmi_si ipmi_msghandler
+bonding 8021q garp stp llc ipv6 ext3 jbd loop sg iomemory_vsl(P) bnx2 microcode serio_raw i2c_i801
+i2c_core iTCO_wdt iTCO_vendor_support i7core_edac edac_core shpchp ext4 jbd2 mbcache megaraid_sas
+pata_acpi ata_generic ata_piix dm_mod [last unloaded: scsi_wait_scan]
+[ 276.465477] Pid: 2765, comm: sh Tainted: P W --------------- 2.6.32 #1
+[ 276.482169] Call Trace:
+[ 276.498610] [<ffffffff81070fe7>] ? warn_slowpath_common+0x87/0xc0
+[ 276.515405] [<ffffffff810710d6>] ? warn_slowpath_fmt+0x46/0x50
+[ 276.532059] [<ffffffffa03bda3f>] ? bcache_device_link+0xdf/0x110 [bcache]
+[ 276.548808] [<ffffffffa03bfa08>] ? bch_cached_dev_attach+0x478/0x4f0 [bcache]
+[ 276.565569] [<ffffffffa03c4a17>] ? bch_cached_dev_store+0x627/0x780 [bcache]
+[ 276.582418] [<ffffffff8116783a>] ? alloc_pages_current+0xaa/0x110
+[ 276.599341] [<ffffffff81203b15>] ? sysfs_write_file+0xe5/0x170
+[ 276.616142] [<ffffffff811887b8>] ? vfs_write+0xb8/0x1a0
+[ 276.632607] [<ffffffff811890b1>] ? sys_write+0x51/0x90
+[ 276.648671] [<ffffffff8100c072>] ? system_call_fastpath+0x16/0x1b
+[ 276.664756] ---[ end trace 9f5d4fcdd0c3edfc ]---
+
+We forget to clear BCACHE_DEV_UNLINK_DONE flag in bcache_device_attach()
+function when we attach a backing device first time. After detaching this
+backing device, this flag will be true and sysfs_remove_link() isn't called in
+bcache_device_unlink(). Then when we attach this backing device again,
+sysfs_create_link() will return EEXIST error in bcache_device_link().
+
+So the fix is trival and we clear this flag in bcache_device_link().
+
+Signed-off-by: Zheng Liu <wenqing.lz at taobao.com>
+Tested-by: Joshua Schmid <jschmid at suse.com>
+Tested-by: Eric Wheeler <bcache at linux.ewheeler.net>
+Cc: Kent Overstreet <kmo at daterainc.com>
+Cc: stable at vger.kernel.org
+Signed-off-by: Jens Axboe <axboe at fb.com>
+---
+ drivers/md/bcache/super.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c
+index 679a093..383f060 100644
+--- a/drivers/md/bcache/super.c
++++ b/drivers/md/bcache/super.c
+@@ -685,6 +685,8 @@ static void bcache_device_link(struct bcache_device *d, struct cache_set *c,
+ WARN(sysfs_create_link(&d->kobj, &c->kobj, "cache") ||
+ sysfs_create_link(&c->kobj, &d->kobj, d->name),
+ "Couldn't create device <-> cache set symlinks");
++
++ clear_bit(BCACHE_DEV_UNLINK_DONE, &d->flags);
+ }
+
+ static void bcache_device_detach(struct bcache_device *d)
diff --git a/debian/patches/bugfix/all/bcache-fix-a-leak-in-bch_cached_dev_run.patch b/debian/patches/bugfix/all/bcache-fix-a-leak-in-bch_cached_dev_run.patch
new file mode 100644
index 0000000..b287e32
--- /dev/null
+++ b/debian/patches/bugfix/all/bcache-fix-a-leak-in-bch_cached_dev_run.patch
@@ -0,0 +1,32 @@
+From: Al Viro <viro at ZenIV.linux.org.uk>
+Date: Sun, 29 Nov 2015 17:20:59 -0800
+Subject: [4/8] bcache: fix a leak in bch_cached_dev_run()
+Origin: https://git.kernel.org/cgit/linux/kernel/git/axboe/linux-block.git/commit?id=4d4d8573a8451acc9f01cbea24b7e55f04a252fe
+
+Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
+Tested-by: Joshua Schmid <jschmid at suse.com>
+Tested-by: Eric Wheeler <bcache at linux.ewheeler.net>
+Cc: Kent Overstreet <kmo at daterainc.com>
+Cc: stable at vger.kernel.org
+Signed-off-by: Jens Axboe <axboe at fb.com>
+---
+ drivers/md/bcache/super.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c
+index 383f060..43e911e 100644
+--- a/drivers/md/bcache/super.c
++++ b/drivers/md/bcache/super.c
+@@ -849,8 +849,11 @@ void bch_cached_dev_run(struct cached_dev *dc)
+ buf[SB_LABEL_SIZE] = '\0';
+ env[2] = kasprintf(GFP_KERNEL, "CACHED_LABEL=%s", buf);
+
+- if (atomic_xchg(&dc->running, 1))
++ if (atomic_xchg(&dc->running, 1)) {
++ kfree(env[1]);
++ kfree(env[2]);
+ return;
++ }
+
+ if (!d->c &&
+ BDEV_STATE(&dc->sb) != BDEV_STATE_NONE) {
diff --git a/debian/patches/bugfix/all/bcache-fix-a-livelock-when-we-cause-a-huge-number-of.patch b/debian/patches/bugfix/all/bcache-fix-a-livelock-when-we-cause-a-huge-number-of.patch
new file mode 100644
index 0000000..88a52f7
--- /dev/null
+++ b/debian/patches/bugfix/all/bcache-fix-a-livelock-when-we-cause-a-huge-number-of.patch
@@ -0,0 +1,67 @@
+From: Zheng Liu <gnehzuil.liu at gmail.com>
+Date: Sun, 29 Nov 2015 17:17:05 -0800
+Subject: [1/8] bcache: fix a livelock when we cause a huge number of cache
+ misses
+Origin: https://git.kernel.org/cgit/linux/kernel/git/axboe/linux-block.git/commit?id=2ef9ccbfcb90cf84bdba320a571b18b05c41101b
+
+Subject : [PATCH v2] bcache: fix a livelock in btree lock
+Date : Wed, 25 Feb 2015 20:32:09 +0800 (02/25/2015 04:32:09 AM)
+
+This commit tries to fix a livelock in bcache. This livelock might
+happen when we causes a huge number of cache misses simultaneously.
+
+When we get a cache miss, bcache will execute the following path.
+
+->cached_dev_make_request()
+ ->cached_dev_read()
+ ->cached_lookup()
+ ->bch->btree_map_keys()
+ ->btree_root() <------------------------
+ ->bch_btree_map_keys_recurse() |
+ ->cache_lookup_fn() |
+ ->cached_dev_cache_miss() |
+ ->bch_btree_insert_check_key() -|
+ [If btree->seq is not equal to seq + 1, we should return
+ EINTR and traverse btree again.]
+
+In bch_btree_insert_check_key() function we first need to check upgrade
+flag (op->lock == -1), and when this flag is true we need to release
+read btree->lock and try to take write btree->lock. During taking and
+releasing this write lock, btree->seq will be monotone increased in
+order to prevent other threads modify this in cache miss (see btree.h:74).
+But if there are some cache misses caused by some requested, we could
+meet a livelock because btree->seq is always changed by others. Thus no
+one can make progress.
+
+This commit will try to take write btree->lock if it encounters a race
+when we traverse btree. Although it sacrifice the scalability but we
+can ensure that only one can modify the btree.
+
+Signed-off-by: Zheng Liu <wenqing.lz at taobao.com>
+Tested-by: Joshua Schmid <jschmid at suse.com>
+Tested-by: Eric Wheeler <bcache at linux.ewheeler.net>
+Cc: Joshua Schmid <jschmid at suse.com>
+Cc: Zhu Yanhai <zhu.yanhai at gmail.com>
+Cc: Kent Overstreet <kmo at daterainc.com>
+Cc: stable at vger.kernel.org
+Signed-off-by: Jens Axboe <axboe at fb.com>
+---
+ drivers/md/bcache/btree.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/md/bcache/btree.c b/drivers/md/bcache/btree.c
+index 83392f8..4a1179c 100644
+--- a/drivers/md/bcache/btree.c
++++ b/drivers/md/bcache/btree.c
+@@ -2162,8 +2162,10 @@ int bch_btree_insert_check_key(struct btree *b, struct btree_op *op,
+ rw_lock(true, b, b->level);
+
+ if (b->key.ptr[0] != btree_ptr ||
+- b->seq != seq + 1)
++ b->seq != seq + 1) {
++ op->lock = b->level;
+ goto out;
++ }
+ }
+
+ SET_KEY_PTRS(check_key, 1);
diff --git a/debian/patches/bugfix/all/bcache-prevent-crash-on-changing-writeback_running.patch b/debian/patches/bugfix/all/bcache-prevent-crash-on-changing-writeback_running.patch
new file mode 100644
index 0000000..5d4736f
--- /dev/null
+++ b/debian/patches/bugfix/all/bcache-prevent-crash-on-changing-writeback_running.patch
@@ -0,0 +1,32 @@
+From: Stefan Bader <stefan.bader at canonical.com>
+Date: Sun, 29 Nov 2015 18:44:49 -0800
+Subject: [7/8] bcache: prevent crash on changing writeback_running
+Origin: https://git.kernel.org/cgit/linux/kernel/git/axboe/linux-block.git/commit?id=8d16ce540c94c9d366eb36fc91b7154d92d6397b
+
+Added a safeguard in the shutdown case. At least while not being
+attached it is also possible to trigger a kernel bug by writing into
+writeback_running. This change adds the same check before trying to
+wake up the thread for that case.
+
+Signed-off-by: Stefan Bader <stefan.bader at canonical.com>
+Cc: Kent Overstreet <kent.overstreet at gmail.com>
+Cc: stable at vger.kernel.org
+Signed-off-by: Jens Axboe <axboe at fb.com>
+---
+ drivers/md/bcache/writeback.h | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/md/bcache/writeback.h b/drivers/md/bcache/writeback.h
+index 0a9dab1..073a042 100644
+--- a/drivers/md/bcache/writeback.h
++++ b/drivers/md/bcache/writeback.h
+@@ -63,7 +63,8 @@ static inline bool should_writeback(struct cached_dev *dc, struct bio *bio,
+
+ static inline void bch_writeback_queue(struct cached_dev *dc)
+ {
+- wake_up_process(dc->writeback_thread);
++ if (!IS_ERR_OR_NULL(dc->writeback_thread))
++ wake_up_process(dc->writeback_thread);
+ }
+
+ static inline void bch_writeback_add(struct cached_dev *dc)
diff --git a/debian/patches/bugfix/all/bcache-unregister-reboot-notifier-if-bcache-fails-to.patch b/debian/patches/bugfix/all/bcache-unregister-reboot-notifier-if-bcache-fails-to.patch
new file mode 100644
index 0000000..538f34b
--- /dev/null
+++ b/debian/patches/bugfix/all/bcache-unregister-reboot-notifier-if-bcache-fails-to.patch
@@ -0,0 +1,35 @@
+From: Zheng Liu <wenqing.lz at taobao.com>
+Date: Sun, 29 Nov 2015 17:21:57 -0800
+Subject: [5/8] bcache: unregister reboot notifier if bcache fails to
+ unregister device
+Origin: https://git.kernel.org/cgit/linux/kernel/git/axboe/linux-block.git/commit?id=2ecf0cdb2b437402110ab57546e02abfa68a716b
+
+In bcache_init() function it forgot to unregister reboot notifier if
+bcache fails to unregister a block device. This commit fixes this.
+
+Signed-off-by: Zheng Liu <wenqing.lz at taobao.com>
+Tested-by: Joshua Schmid <jschmid at suse.com>
+Tested-by: Eric Wheeler <bcache at linux.ewheeler.net>
+Cc: Kent Overstreet <kmo at daterainc.com>
+Cc: stable at vger.kernel.org
+Signed-off-by: Jens Axboe <axboe at fb.com>
+---
+ drivers/md/bcache/super.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c
+index 43e911e..18f14a2 100644
+--- a/drivers/md/bcache/super.c
++++ b/drivers/md/bcache/super.c
+@@ -2071,8 +2071,10 @@ static int __init bcache_init(void)
+ closure_debug_init();
+
+ bcache_major = register_blkdev(0, "bcache");
+- if (bcache_major < 0)
++ if (bcache_major < 0) {
++ unregister_reboot_notifier(&reboot);
+ return bcache_major;
++ }
+
+ if (!(bcache_wq = create_workqueue("bcache")) ||
+ !(bcache_kobj = kobject_create_and_add("bcache", fs_kobj)) ||
diff --git a/debian/patches/series b/debian/patches/series
index cbe23ec..70ca0b0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -139,3 +139,11 @@ bugfix/all/tty-fix-unsafe-ldisc-reference-via-ioctl-tiocgetd.patch
bugfix/x86/drm-vmwgfx-fix-a-width-pitch-mismatch-on-framebuffer.patch
bugfix/all/unix-properly-account-for-FDs-passed-over-unix-socke.patch
debian/unix-fix-abi-change-for-cve-2013-4312-fix.patch
+bugfix/all/bcache-fix-a-livelock-when-we-cause-a-huge-number-of.patch
+bugfix/all/bcache-add-a-cond_resched-call-to-gc.patch
+bugfix/all/bcache-clear-bcache_dev_unlink_done-flag-when-attach.patch
+bugfix/all/bcache-fix-a-leak-in-bch_cached_dev_run.patch
+bugfix/all/bcache-unregister-reboot-notifier-if-bcache-fails-to.patch
+bugfix/all/bcache-allows-use-of-register-in-udev-to-avoid-devic.patch
+bugfix/all/bcache-prevent-crash-on-changing-writeback_running.patch
+bugfix/all/bcache-change-refill_dirty-to-always-scan-entire-dis.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git
More information about the Kernel-svn-changes
mailing list