[opensuse-kernel] [PATCH 01/13] bcache: Fix to remove the rcu_sched stalls (bnc#908589).

Joshua Schmid

8 Dec 2014 8 Dec '14

13:49

--- ...bcache-Fix-to-remove-the-rcu_sched-stalls.patch | 35 ++++++++++++++++++++++ series.conf | 1 + 2 files changed, 36 insertions(+) create mode 100644 patches.fixes/0002-bcache-Fix-to-remove-the-rcu_sched-stalls.patch diff --git a/patches.fixes/0002-bcache-Fix-to-remove-the-rcu_sched-stalls.patch b/patches.fixes/0002-bcache-Fix-to-remove-the-rcu_sched-stalls.patch new file mode 100644 index 0000000..9292369 --- /dev/null +++ b/patches.fixes/0002-bcache-Fix-to-remove-the-rcu_sched-stalls.patch @@ -0,0 +1,35 @@ +From 9a8baefa2764b9ca62f97c34348202c5f4ce91a1 Mon Sep 17 00:00:00 2001 +From: Surbhi Palande +Date: Thu, 10 Apr 2014 16:09:51 -0700 +Subject: [PATCH 02/14] bcache: Fix to remove the rcu_sched stalls. +Git-commit: dbd810ab678d262d3772d29b65844d7b20dc47bc +Patch-mainline: v3.17 +References: bnc#908589 + +while loop was executing infinitely. +This fix ends the while loop gracefully. + +Signed-off-by: Surbhi Palande +Signed-off-by: Kent Overstreet +Signed-off-by: Joshua Schmid +--- + drivers/md/bcache/journal.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drivers/md/bcache/journal.c b/drivers/md/bcache/journal.c +index 363b881..ead001c 100644 +--- a/drivers/md/bcache/journal.c ++++ b/drivers/md/bcache/journal.c +@@ -194,7 +194,8 @@ int bch_journal_read(struct cache_set *c, struct list_head *list) + continue; + bsearch: + /* Binary search */ +- m = r = find_next_bit(bitmap, ca->sb.njournal_buckets, l + 1); ++ m = l; ++ r = find_next_bit(bitmap, ca->sb.njournal_buckets, l + 1); + pr_debug("starting binary search, l %u r %u", l, r); + + while (l + 1 < r) { +-- +2.1.2 + diff --git a/series.conf b/series.conf index 6a6bb44..f2caece 100644 --- a/series.conf +++ b/series.conf @@ -422,6 +422,7 @@ patches.fixes/blk-merge-fix-blk_recount_segments patches.fixes/0001-bcache-Fix-a-journal-replay-bug.patch + patches.fixes/0002-bcache-Fix-to-remove-the-rcu_sched-stalls.patch ######################################################## # DRM/Video -- 2.1.2 -- To unsubscribe, e-mail: opensuse-kernel+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-kernel+owner@opensuse.org

Show replies by date

Joshua Schmid

8 Dec 8 Dec

13:49

New subject: [opensuse-kernel] [PATCH 02/13] bcache allocator: send discards with correct size (bnc#908592).

--- ...allocator-send-discards-with-correct-size.patch | 30 ++++++++++++++++++++++ series.conf | 1 + 2 files changed, 31 insertions(+) create mode 100644 patches.fixes/0003-bcache-allocator-send-discards-with-correct-size.patch diff --git a/patches.fixes/0003-bcache-allocator-send-discards-with-correct-size.patch b/patches.fixes/0003-bcache-allocator-send-discards-with-correct-size.patch new file mode 100644 index 0000000..302b471 --- /dev/null +++ b/patches.fixes/0003-bcache-allocator-send-discards-with-correct-size.patch @@ -0,0 +1,30 @@ +From 4726094cf5a43ad36c724ec7098dee5af37814fc Mon Sep 17 00:00:00 2001 +From: Slava Pestov +Date: Mon, 21 Apr 2014 18:22:35 -0700 +Subject: [PATCH 03/14] bcache allocator: send discards with correct size +Git-commit: 8b326d3a2a76912dfed2f0ab937d59fae9512ca2 +Patch-mainline: v3.17 +References: bnc#908592 + +Signed-off-by: Joshua Schmid + +--- + drivers/md/bcache/alloc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/md/bcache/alloc.c b/drivers/md/bcache/alloc.c +index 443d03f..8eeab72 100644 +--- a/drivers/md/bcache/alloc.c ++++ b/drivers/md/bcache/alloc.c +@@ -331,7 +331,7 @@ static int bch_allocator_thread(void *arg) + mutex_unlock(&ca->set->bucket_lock); + blkdev_issue_discard(ca->bdev, + bucket_to_sector(ca->set, bucket), +- ca->sb.block_size, GFP_KERNEL, 0); ++ ca->sb.bucket_size, GFP_KERNEL, 0); + mutex_lock(&ca->set->bucket_lock); + } + +-- +2.1.2 + diff --git a/series.conf b/series.conf index f2caece..236a7d5 100644 --- a/series.conf +++ b/series.conf @@ -423,6 +423,7 @@ patches.fixes/blk-merge-fix-blk_recount_segments patches.fixes/0001-bcache-Fix-a-journal-replay-bug.patch patches.fixes/0002-bcache-Fix-to-remove-the-rcu_sched-stalls.patch + patches.fixes/0003-bcache-allocator-send-discards-with-correct-size.patch ######################################################## # DRM/Video -- 2.1.2 -- To unsubscribe, e-mail: opensuse-kernel+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-kernel+owner@opensuse.org

Joshua Schmid

13:49

New subject: [opensuse-kernel] [PATCH 03/13] bcache: fix lockdep warnings on shutdown (bnc#908593).

--- ...4-bcache-fix-lockdep-warnings-on-shutdown.patch | 41 ++++++++++++++++++++++ series.conf | 1 + 2 files changed, 42 insertions(+) create mode 100644 patches.fixes/0004-bcache-fix-lockdep-warnings-on-shutdown.patch diff --git a/patches.fixes/0004-bcache-fix-lockdep-warnings-on-shutdown.patch b/patches.fixes/0004-bcache-fix-lockdep-warnings-on-shutdown.patch new file mode 100644 index 0000000..4dac154 --- /dev/null +++ b/patches.fixes/0004-bcache-fix-lockdep-warnings-on-shutdown.patch @@ -0,0 +1,41 @@ +From bc0db49537f4e304e9d4d98d1894a8c165ae6064 Mon Sep 17 00:00:00 2001 +From: Slava Pestov +Date: Tue, 29 Apr 2014 15:39:27 -0700 +Subject: [PATCH 04/14] bcache: fix lockdep warnings on shutdown +Git-commit: e5112201c1285841f8b565ece5d6ae7e0d7947a2 +Patch-mainline: v3.17 +References: bnc#908593 + +Signed-off-by: Joshua Schmid + +--- + drivers/md/bcache/super.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c +index 1ea9fa2..09573c2 100644 +--- a/drivers/md/bcache/super.c ++++ b/drivers/md/bcache/super.c +@@ -1214,7 +1214,9 @@ void bch_flash_dev_release(struct kobject *kobj) + static void flash_dev_free(struct closure *cl) + { + struct bcache_device *d = container_of(cl, struct bcache_device, cl); ++ mutex_lock(&bch_register_lock); + bcache_device_free(d); ++ mutex_unlock(&bch_register_lock); + kobject_put(&d->kobj); + } + +@@ -1222,7 +1224,9 @@ static void flash_dev_flush(struct closure *cl) + { + struct bcache_device *d = container_of(cl, struct bcache_device, cl); + ++ mutex_lock(&bch_register_lock); + bcache_device_unlink(d); ++ mutex_unlock(&bch_register_lock); + kobject_del(&d->kobj); + continue_at(cl, flash_dev_free, system_wq); + } +-- +2.1.2 + diff --git a/series.conf b/series.conf index 236a7d5..03d9a33 100644 --- a/series.conf +++ b/series.conf @@ -424,6 +424,7 @@ patches.fixes/0001-bcache-Fix-a-journal-replay-bug.patch patches.fixes/0002-bcache-Fix-to-remove-the-rcu_sched-stalls.patch patches.fixes/0003-bcache-allocator-send-discards-with-correct-size.patch + patches.fixes/0004-bcache-fix-lockdep-warnings-on-shutdown.patch ######################################################## # DRM/Video -- 2.1.2 -- To unsubscribe, e-mail: opensuse-kernel+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-kernel+owner@opensuse.org

Joshua Schmid

13:49

New subject: [opensuse-kernel] [PATCH 04/13] bcache: fix crash on shutdown in passthrough mode (bnc#908594).

--- ...fix-crash-on-shutdown-in-passthrough-mode.patch | 34 ++++++++++++++++++++++ series.conf | 1 + 2 files changed, 35 insertions(+) create mode 100644 patches.fixes/0005-bcache-fix-crash-on-shutdown-in-passthrough-mode.patch diff --git a/patches.fixes/0005-bcache-fix-crash-on-shutdown-in-passthrough-mode.patch b/patches.fixes/0005-bcache-fix-crash-on-shutdown-in-passthrough-mode.patch new file mode 100644 index 0000000..b9dfe0f --- /dev/null +++ b/patches.fixes/0005-bcache-fix-crash-on-shutdown-in-passthrough-mode.patch @@ -0,0 +1,34 @@ +From 671e45c3cdddfe3ce9bb3ebe36f9eff583c826b2 Mon Sep 17 00:00:00 2001 +From: Slava Pestov +Date: Tue, 20 May 2014 12:20:28 -0700 +Subject: [PATCH 05/14] bcache: fix crash on shutdown in passthrough mode +Git-commit: a664d0f05a2ec02c8f042db536d84d15d6e19e81 +Patch-mainline: v3.17 +References: bnc#908594 + +We never started the writeback thread in this case, so don't stop it. + + +Signed-off-by: Joshua Schmid + +--- + drivers/md/bcache/super.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c +index 09573c2..6ceaec3 100644 +--- a/drivers/md/bcache/super.c ++++ b/drivers/md/bcache/super.c +@@ -1071,7 +1071,8 @@ static void cached_dev_free(struct closure *cl) + struct cached_dev *dc = container_of(cl, struct cached_dev, disk.cl); + + cancel_delayed_work_sync(&dc->writeback_rate_update); +- kthread_stop(dc->writeback_thread); ++ if (!IS_ERR_OR_NULL(dc->writeback_thread)) ++ kthread_stop(dc->writeback_thread); + + mutex_lock(&bch_register_lock); + +-- +2.1.2 + diff --git a/series.conf b/series.conf index 03d9a33..deeb38c 100644 --- a/series.conf +++ b/series.conf @@ -425,6 +425,7 @@ patches.fixes/0002-bcache-Fix-to-remove-the-rcu_sched-stalls.patch patches.fixes/0003-bcache-allocator-send-discards-with-correct-size.patch patches.fixes/0004-bcache-fix-lockdep-warnings-on-shutdown.patch + patches.fixes/0005-bcache-fix-crash-on-shutdown-in-passthrough-mode.patch ######################################################## # DRM/Video -- 2.1.2 -- To unsubscribe, e-mail: opensuse-kernel+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-kernel+owner@opensuse.org

Joshua Schmid

13:49

New subject: [opensuse-kernel] [PATCH 05/13] bcache: Make sure to pass GFP_WAIT to mempool_alloc() (bnc#908596).

--- ...ke-sure-to-pass-GFP_WAIT-to-mempool_alloc.patch | 34 ++++++++++++++++++++++ series.conf | 1 + 2 files changed, 35 insertions(+) create mode 100644 patches.fixes/0006-bcache-Make-sure-to-pass-GFP_WAIT-to-mempool_alloc.patch diff --git a/patches.fixes/0006-bcache-Make-sure-to-pass-GFP_WAIT-to-mempool_alloc.patch b/patches.fixes/0006-bcache-Make-sure-to-pass-GFP_WAIT-to-mempool_alloc.patch new file mode 100644 index 0000000..dde29f8 --- /dev/null +++ b/patches.fixes/0006-bcache-Make-sure-to-pass-GFP_WAIT-to-mempool_alloc.patch @@ -0,0 +1,34 @@ +From 30c91721e9acc026719d14cf69277b767da60a73 Mon Sep 17 00:00:00 2001 +From: Kent Overstreet +Date: Mon, 19 May 2014 08:57:55 -0700 +Subject: [PATCH 06/14] bcache: Make sure to pass GFP_WAIT to mempool_alloc() +Git-commit: bcf090e0040e30f8409e6a535a01e6473afb096f +Patch-mainline: v3.17 +References: bnc#908596 + +this was very wrong - mempool_alloc() only guarantees success with GFP_WAIT. +bcache uses GFP_NOWAIT in various other places where we have a fallback, +circuits must've gotten crossed when writing this code or something. + +Signed-off-by: Kent Overstreet +Signed-off-by: Joshua Schmid +--- + drivers/md/bcache/btree.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/md/bcache/btree.c b/drivers/md/bcache/btree.c +index 7347b61..5ef445d 100644 +--- a/drivers/md/bcache/btree.c ++++ b/drivers/md/bcache/btree.c +@@ -202,7 +202,7 @@ void bch_btree_node_read_done(struct btree *b) + struct bset *i = btree_bset_first(b); + struct btree_iter *iter; + +- iter = mempool_alloc(b->c->fill_iter, GFP_NOWAIT); ++ iter = mempool_alloc(b->c->fill_iter, GFP_NOIO); + iter->size = b->c->sb.bucket_size / b->c->sb.block_size; + iter->used = 0; + +-- +2.1.2 + diff --git a/series.conf b/series.conf index deeb38c..1be0531 100644 --- a/series.conf +++ b/series.conf @@ -426,6 +426,7 @@ patches.fixes/0003-bcache-allocator-send-discards-with-correct-size.patch patches.fixes/0004-bcache-fix-lockdep-warnings-on-shutdown.patch patches.fixes/0005-bcache-fix-crash-on-shutdown-in-passthrough-mode.patch + patches.fixes/0006-bcache-Make-sure-to-pass-GFP_WAIT-to-mempool_alloc.patch ######################################################## # DRM/Video -- 2.1.2 -- To unsubscribe, e-mail: opensuse-kernel+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-kernel+owner@opensuse.org

Joshua Schmid

13:49

New subject: [opensuse-kernel] [PATCH 06/13] bcache: fix typo in bch_bkey_equal_header (bnc#908598).

--- ...-bcache-fix-typo-in-bch_bkey_equal_header.patch | 30 ++++++++++++++++++++++ series.conf | 1 + 2 files changed, 31 insertions(+) create mode 100644 patches.fixes/0007-bcache-fix-typo-in-bch_bkey_equal_header.patch diff --git a/patches.fixes/0007-bcache-fix-typo-in-bch_bkey_equal_header.patch b/patches.fixes/0007-bcache-fix-typo-in-bch_bkey_equal_header.patch new file mode 100644 index 0000000..a6cae1d --- /dev/null +++ b/patches.fixes/0007-bcache-fix-typo-in-bch_bkey_equal_header.patch @@ -0,0 +1,30 @@ +From 84539086d933094baaaebd4bdd7d24cfe892b9a7 Mon Sep 17 00:00:00 2001 +From: Slava Pestov +Date: Mon, 30 Jun 2014 22:31:20 -0700 +Subject: [PATCH 07/14] bcache: fix typo in bch_bkey_equal_header +Git-commit: 8e0948080670f6330229718b15a6a1a011d441ce +Patch-mainline: v3.17 +References: bnc#908598 + +Signed-off-by: Kent Overstreet +Signed-off-by: Joshua Schmid +--- + drivers/md/bcache/bset.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/md/bcache/bset.h b/drivers/md/bcache/bset.h +index 5f6728d..ae96462 100644 +--- a/drivers/md/bcache/bset.h ++++ b/drivers/md/bcache/bset.h +@@ -453,7 +453,7 @@ static inline bool bch_bkey_equal_header(const struct bkey *l, + { + return (KEY_DIRTY(l) == KEY_DIRTY(r) && + KEY_PTRS(l) == KEY_PTRS(r) && +- KEY_CSUM(l) == KEY_CSUM(l)); ++ KEY_CSUM(l) == KEY_CSUM(r)); + } + + /* Keylists */ +-- +2.1.2 + diff --git a/series.conf b/series.conf index 1be0531..0101241 100644 --- a/series.conf +++ b/series.conf @@ -427,6 +427,7 @@ patches.fixes/0004-bcache-fix-lockdep-warnings-on-shutdown.patch patches.fixes/0005-bcache-fix-crash-on-shutdown-in-passthrough-mode.patch patches.fixes/0006-bcache-Make-sure-to-pass-GFP_WAIT-to-mempool_alloc.patch + patches.fixes/0007-bcache-fix-typo-in-bch_bkey_equal_header.patch ######################################################## # DRM/Video -- 2.1.2 -- To unsubscribe, e-mail: opensuse-kernel+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-kernel+owner@opensuse.org

Joshua Schmid

13:49

New subject: [opensuse-kernel] [PATCH 07/13] bcache: Fix an infinite loop in journal replay (bnc#908603).

--- ...he-Fix-an-infinite-loop-in-journal-replay.patch | 40 ++++++++++++++++++++++ series.conf | 1 + 2 files changed, 41 insertions(+) create mode 100644 patches.fixes/0008-bcache-Fix-an-infinite-loop-in-journal-replay.patch diff --git a/patches.fixes/0008-bcache-Fix-an-infinite-loop-in-journal-replay.patch b/patches.fixes/0008-bcache-Fix-an-infinite-loop-in-journal-replay.patch new file mode 100644 index 0000000..4369af5 --- /dev/null +++ b/patches.fixes/0008-bcache-Fix-an-infinite-loop-in-journal-replay.patch @@ -0,0 +1,40 @@ +From 16ed6ee968e78f94e15d23062cfc1c55f38d2eca Mon Sep 17 00:00:00 2001 +From: Kent Overstreet +Date: Mon, 2 Jun 2014 15:39:44 -0700 +Subject: [PATCH 08/14] bcache: Fix an infinite loop in journal replay +Git-commit: 6b708de64adb6dc8319e7aeac922b46904fbeeec +Patch-mainline: v3.17 +References: bnc#908603 + +When running with multiple cache devices, if one of the devices has a completely +empty journal but we'd already found some journal entries on a previosu device +we'd go into an infinite loop. + +Change-Id: I1dcdc0d738192746de28f40e8b08825b0dea5e2b +Signed-off-by: Kent Overstreet +Signed-off-by: Joshua Schmid +--- + drivers/md/bcache/journal.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/drivers/md/bcache/journal.c b/drivers/md/bcache/journal.c +index ead001c..fe080ad 100644 +--- a/drivers/md/bcache/journal.c ++++ b/drivers/md/bcache/journal.c +@@ -190,9 +190,12 @@ int bch_journal_read(struct cache_set *c, struct list_head *list) + if (read_bucket(l)) + goto bsearch; + +- if (list_empty(list)) ++ /* no journal entries on this device? */ ++ if (l == ca->sb.njournal_buckets) + continue; + bsearch: ++ BUG_ON(list_empty(list)); ++ + /* Binary search */ + m = l; + r = find_next_bit(bitmap, ca->sb.njournal_buckets, l + 1); +-- +2.1.2 + diff --git a/series.conf b/series.conf index 0101241..dfca269 100644 --- a/series.conf +++ b/series.conf @@ -428,6 +428,7 @@ patches.fixes/0005-bcache-fix-crash-on-shutdown-in-passthrough-mode.patch patches.fixes/0006-bcache-Make-sure-to-pass-GFP_WAIT-to-mempool_alloc.patch patches.fixes/0007-bcache-fix-typo-in-bch_bkey_equal_header.patch + patches.fixes/0008-bcache-Fix-an-infinite-loop-in-journal-replay.patch ######################################################## # DRM/Video -- 2.1.2 -- To unsubscribe, e-mail: opensuse-kernel+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-kernel+owner@opensuse.org

Joshua Schmid

13:49

New subject: [opensuse-kernel] [PATCH 08/13] bcache: fix use-after-free in btree_gc_coalesce() (bnc#908604).

--- ...e-fix-use-after-free-in-btree_gc_coalesce.patch | 36 ++++++++++++++++++++++ series.conf | 1 + 2 files changed, 37 insertions(+) create mode 100644 patches.fixes/0009-bcache-fix-use-after-free-in-btree_gc_coalesce.patch diff --git a/patches.fixes/0009-bcache-fix-use-after-free-in-btree_gc_coalesce.patch b/patches.fixes/0009-bcache-fix-use-after-free-in-btree_gc_coalesce.patch new file mode 100644 index 0000000..f9f451f --- /dev/null +++ b/patches.fixes/0009-bcache-fix-use-after-free-in-btree_gc_coalesce.patch @@ -0,0 +1,36 @@ +From 9133a31a0a23dd6ec0c02a3d21a2667892677b9d Mon Sep 17 00:00:00 2001 +From: Slava Pestov +Date: Sat, 12 Jul 2014 21:53:11 -0700 +Subject: [PATCH 09/14] bcache: fix use-after-free in btree_gc_coalesce() +Git-commit: 400ffaa2acd72274e2c7293a9724382383bebf3e +Patch-mainline: v3.17 +References: bnc#908604 + +If we goto out_nocoalesce after we free new_nodes[0], we end up freeing +new_nodes[0] again. This was generating a lockdep warning. The fix is +to set new_nodes[0] to NULL, since the out_nocoalesce path safely +ignores NULL entries in the new_nodes array. + +This regression was introduced in 2d7f9531. + +Change-Id: I76564d7257800583214376b4bacf236cda90c89c +Signed-off-by: Joshua Schmid +--- + 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 5ef445d..e3aece2 100644 +--- a/drivers/md/bcache/btree.c ++++ b/drivers/md/bcache/btree.c +@@ -1403,6 +1403,7 @@ static int btree_gc_coalesce(struct btree *b, struct btree_op *op, + BUG_ON(btree_bset_first(new_nodes[0])->keys); + btree_node_free(new_nodes[0]); + rw_unlock(true, new_nodes[0]); ++ new_nodes[0] = NULL; + + for (i = 0; i < nodes; i++) { + if (__bch_keylist_realloc(&keylist, bkey_u64s(&r[i].b->key))) +-- +2.1.2 + diff --git a/series.conf b/series.conf index dfca269..fbce3cb 100644 --- a/series.conf +++ b/series.conf @@ -429,6 +429,7 @@ patches.fixes/0006-bcache-Make-sure-to-pass-GFP_WAIT-to-mempool_alloc.patch patches.fixes/0007-bcache-fix-typo-in-bch_bkey_equal_header.patch patches.fixes/0008-bcache-Fix-an-infinite-loop-in-journal-replay.patch + patches.fixes/0009-bcache-fix-use-after-free-in-btree_gc_coalesce.patch ######################################################## # DRM/Video -- 2.1.2 -- To unsubscribe, e-mail: opensuse-kernel+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-kernel+owner@opensuse.org

Joshua Schmid

13:49

New subject: [opensuse-kernel] [PATCH 09/13] bcache: Fix more early shutdown bugs (bnc#908605).

--- .../0010-bcache-Fix-more-early-shutdown-bugs.patch | 52 ++++++++++++++++++++++ series.conf | 1 + 2 files changed, 53 insertions(+) create mode 100644 patches.fixes/0010-bcache-Fix-more-early-shutdown-bugs.patch diff --git a/patches.fixes/0010-bcache-Fix-more-early-shutdown-bugs.patch b/patches.fixes/0010-bcache-Fix-more-early-shutdown-bugs.patch new file mode 100644 index 0000000..e0460e2 --- /dev/null +++ b/patches.fixes/0010-bcache-Fix-more-early-shutdown-bugs.patch @@ -0,0 +1,52 @@ +From 20ba715003e80469ada02f5a43621e1d11e80142 Mon Sep 17 00:00:00 2001 +From: Kent Overstreet +Date: Wed, 11 Jun 2014 19:44:49 -0700 +Subject: [PATCH 10/14] bcache: Fix more early shutdown bugs +Git-commit: d83353b319d47ef8cce82467da6a25c2d558253f +Patch-mainline: v3.17 +References: bnc#908605 + +Signed-off-by: Kent Overstreet +Signed-off-by: Joshua Schmid +--- + drivers/md/bcache/super.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c +index 6ceaec3..124e422 100644 +--- a/drivers/md/bcache/super.c ++++ b/drivers/md/bcache/super.c +@@ -733,8 +733,6 @@ static void bcache_device_detach(struct bcache_device *d) + static void bcache_device_attach(struct bcache_device *d, struct cache_set *c, + unsigned id) + { +- BUG_ON(test_bit(CACHE_SET_STOPPING, &c->flags)); +- + d->id = id; + d->c = c; + c->devices[id] = d; +@@ -1768,6 +1766,7 @@ found: + pr_debug("set version = %llu", c->sb.version); + } + ++ kobject_get(&ca->kobj); + ca->set = c; + ca->set->cache[ca->sb.nr_this_dev] = ca; + c->cache_by_alloc[c->caches_loaded++] = ca; +@@ -1885,10 +1884,12 @@ static void register_cache(struct cache_sb *sb, struct page *sb_page, + goto err; + + pr_info("registered cache device %s", bdevname(bdev, name)); ++out: ++ kobject_put(&ca->kobj); + return; + err: + pr_notice("error opening %s: %s", bdevname(bdev, name), err); +- kobject_put(&ca->kobj); ++ goto out; + } + + /* Global interfaces/init */ +-- +2.1.2 + diff --git a/series.conf b/series.conf index fbce3cb..de583ce 100644 --- a/series.conf +++ b/series.conf @@ -430,6 +430,7 @@ patches.fixes/0007-bcache-fix-typo-in-bch_bkey_equal_header.patch patches.fixes/0008-bcache-Fix-an-infinite-loop-in-journal-replay.patch patches.fixes/0009-bcache-fix-use-after-free-in-btree_gc_coalesce.patch + patches.fixes/0010-bcache-Fix-more-early-shutdown-bugs.patch ######################################################## # DRM/Video -- 2.1.2 -- To unsubscribe, e-mail: opensuse-kernel+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-kernel+owner@opensuse.org

Joshua Schmid

13:49

New subject: [opensuse-kernel] [PATCH 10/13] bcache: fix memory corruption in init error path (bnc#908606).

--- ...-fix-memory-corruption-in-init-error-path.patch | 59 ++++++++++++++++++++++ series.conf | 1 + 2 files changed, 60 insertions(+) create mode 100644 patches.fixes/0011-bcache-fix-memory-corruption-in-init-error-path.patch diff --git a/patches.fixes/0011-bcache-fix-memory-corruption-in-init-error-path.patch b/patches.fixes/0011-bcache-fix-memory-corruption-in-init-error-path.patch new file mode 100644 index 0000000..d65a924 --- /dev/null +++ b/patches.fixes/0011-bcache-fix-memory-corruption-in-init-error-path.patch @@ -0,0 +1,59 @@ +From b4e77d4227684cdabbcace64251a30dabf36d06c Mon Sep 17 00:00:00 2001 +From: Slava Pestov +Date: Thu, 19 Jun 2014 15:05:59 -0700 +Subject: [PATCH 11/14] bcache: fix memory corruption in init error path +Git-commit: c9a78332b42cbdcdd386a95192a716b67d1711a4 +Patch-mainline: v3.17 +References: bnc#908606 + +If register_cache_set() failed, we would touch ca->set after +it had already been freed. Also, fix an assertion to catch +this. + +Change-Id: I748e5f5b223e2d9b2602075dec2f997cced2394d +Signed-off-by: Joshua Schmid +--- + drivers/md/bcache/super.c | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c +index 124e422..85887d0 100644 +--- a/drivers/md/bcache/super.c ++++ b/drivers/md/bcache/super.c +@@ -1350,8 +1350,11 @@ static void cache_set_free(struct closure *cl) + bch_journal_free(c); + + for_each_cache(ca, c, i) +- if (ca) ++ if (ca) { ++ ca->set = NULL; ++ c->cache[ca->sb.nr_this_dev] = NULL; + kobject_put(&ca->kobj); ++ } + + bch_bset_sort_state_free(&c->sort); + free_pages((unsigned long) c->uuids, ilog2(bucket_pages(c))); +@@ -1787,8 +1790,10 @@ void bch_cache_release(struct kobject *kobj) + struct cache *ca = container_of(kobj, struct cache, kobj); + unsigned i; + +- if (ca->set) ++ if (ca->set) { ++ BUG_ON(ca->set->cache[ca->sb.nr_this_dev] != ca); + ca->set->cache[ca->sb.nr_this_dev] = NULL; ++ } + + bio_split_pool_free(&ca->bio_split_hook); + +@@ -1851,7 +1856,7 @@ static int cache_alloc(struct cache_sb *sb, struct cache *ca) + } + + static void register_cache(struct cache_sb *sb, struct page *sb_page, +- struct block_device *bdev, struct cache *ca) ++ struct block_device *bdev, struct cache *ca) + { + char name[BDEVNAME_SIZE]; + const char *err = "cannot allocate memory"; +-- +2.1.2 + diff --git a/series.conf b/series.conf index de583ce..dda80d4 100644 --- a/series.conf +++ b/series.conf @@ -431,6 +431,7 @@ patches.fixes/0008-bcache-Fix-an-infinite-loop-in-journal-replay.patch patches.fixes/0009-bcache-fix-use-after-free-in-btree_gc_coalesce.patch patches.fixes/0010-bcache-Fix-more-early-shutdown-bugs.patch + patches.fixes/0011-bcache-fix-memory-corruption-in-init-error-path.patch ######################################################## # DRM/Video -- 2.1.2 -- To unsubscribe, e-mail: opensuse-kernel+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-kernel+owner@opensuse.org

Joshua Schmid

13:49

New subject: [opensuse-kernel] [PATCH 11/13] bcache: fix crash with incomplete cache set (bnc#908608).

--- ...cache-fix-crash-with-incomplete-cache-set.patch | 59 ++++++++++++++++++++++ series.conf | 1 + 2 files changed, 60 insertions(+) create mode 100644 patches.fixes/0012-bcache-fix-crash-with-incomplete-cache-set.patch diff --git a/patches.fixes/0012-bcache-fix-crash-with-incomplete-cache-set.patch b/patches.fixes/0012-bcache-fix-crash-with-incomplete-cache-set.patch new file mode 100644 index 0000000..a9c5c6b --- /dev/null +++ b/patches.fixes/0012-bcache-fix-crash-with-incomplete-cache-set.patch @@ -0,0 +1,59 @@ +From 310943d41b6ca0af7bc3781bf794f9b3ef0653ec Mon Sep 17 00:00:00 2001 +From: Slava Pestov +Date: Fri, 11 Jul 2014 12:17:41 -0700 +Subject: [PATCH 12/14] bcache: fix crash with incomplete cache set +Git-commit: bf0c55c986540483c34ca640f2eef4c3314388b1 +Patch-mainline: v3.17 +References: bnc#908608 + + +Change-Id: I6abde52afe917633480caaf4e2518f42a816d886 +Signed-off-by: Joshua Schmid +--- + drivers/md/bcache/bcache.h | 4 ++++ + drivers/md/bcache/super.c | 4 ++++ + 2 files changed, 8 insertions(+) + +diff --git a/drivers/md/bcache/bcache.h b/drivers/md/bcache/bcache.h +index d2ebcf3..04f7bc2 100644 +--- a/drivers/md/bcache/bcache.h ++++ b/drivers/md/bcache/bcache.h +@@ -477,9 +477,13 @@ struct gc_stat { + * CACHE_SET_STOPPING always gets set first when we're closing down a cache set; + * we'll continue to run normally for awhile with CACHE_SET_STOPPING set (i.e. + * flushing dirty data). ++ * ++ * CACHE_SET_RUNNING means all cache devices have been registered and journal ++ * replay is complete. + */ + #define CACHE_SET_UNREGISTERING 0 + #define CACHE_SET_STOPPING 1 ++#define CACHE_SET_RUNNING 2 + + struct cache_set { + struct closure cl; +diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c +index 85887d0..f83b491 100644 +--- a/drivers/md/bcache/super.c ++++ b/drivers/md/bcache/super.c +@@ -1281,6 +1281,9 @@ int bch_flash_dev_create(struct cache_set *c, uint64_t size) + if (test_bit(CACHE_SET_STOPPING, &c->flags)) + return -EINTR; + ++ if (!test_bit(CACHE_SET_RUNNING, &c->flags)) ++ return -EPERM; ++ + u = uuid_find_empty(c); + if (!u) { + pr_err("Can't create volume, no room for UUID"); +@@ -1706,6 +1709,7 @@ static void run_cache_set(struct cache_set *c) + + flash_devs_run(c); + ++ set_bit(CACHE_SET_RUNNING, &c->flags); + return; + err: + closure_sync(&cl); +-- +2.1.2 + diff --git a/series.conf b/series.conf index dda80d4..03de4c3 100644 --- a/series.conf +++ b/series.conf @@ -432,6 +432,7 @@ patches.fixes/0009-bcache-fix-use-after-free-in-btree_gc_coalesce.patch patches.fixes/0010-bcache-Fix-more-early-shutdown-bugs.patch patches.fixes/0011-bcache-fix-memory-corruption-in-init-error-path.patch + patches.fixes/0012-bcache-fix-crash-with-incomplete-cache-set.patch ######################################################## # DRM/Video -- 2.1.2 -- To unsubscribe, e-mail: opensuse-kernel+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-kernel+owner@opensuse.org

Joshua Schmid

13:49

New subject: [opensuse-kernel] [PATCH 12/13] bcache: Correct printing of btree_gc_max_duration_ms (bnc#908610).

--- ...rect-printing-of-btree_gc_max_duration_ms.patch | 37 ++++++++++++++++++++++ series.conf | 1 + 2 files changed, 38 insertions(+) create mode 100644 patches.fixes/0013-bcache-Correct-printing-of-btree_gc_max_duration_ms.patch diff --git a/patches.fixes/0013-bcache-Correct-printing-of-btree_gc_max_duration_ms.patch b/patches.fixes/0013-bcache-Correct-printing-of-btree_gc_max_duration_ms.patch new file mode 100644 index 0000000..247a3e2 --- /dev/null +++ b/patches.fixes/0013-bcache-Correct-printing-of-btree_gc_max_duration_ms.patch @@ -0,0 +1,37 @@ +From e954aa6243653fb11d28df7d23ed3af19aaeb881 Mon Sep 17 00:00:00 2001 +From: Surbhi Palande +Date: Thu, 17 Apr 2014 12:07:04 -0700 +Subject: [PATCH 13/14] bcache: Correct printing of btree_gc_max_duration_ms +Git-commit: 5b25abade29616d42d60f9bd5e6a5ad07f7314e3 +Patch-mainline: v3.17 +References: bnc#908610 + +time_stats::btree_gc_max_duration_mc is not bit shifted by 8 + +Fixes BUG #138 + +Change-Id: I44fc6e1d0579674016acc533f1a546b080e5371a +Signed-off-by: Surbhi Palande +Signed-off-by: Joshua Schmid +--- + drivers/md/bcache/util.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/md/bcache/util.h b/drivers/md/bcache/util.h +index ac7d0d1..98df757 100644 +--- a/drivers/md/bcache/util.h ++++ b/drivers/md/bcache/util.h +@@ -416,8 +416,8 @@ do { \ + average_frequency, frequency_units); \ + __print_time_stat(stats, name, \ + average_duration, duration_units); \ +- __print_time_stat(stats, name, \ +- max_duration, duration_units); \ ++ sysfs_print(name ## _ ##max_duration ## _ ## duration_units, \ ++ div_u64((stats)->max_duration, NSEC_PER_ ## duration_units));\ + \ + sysfs_print(name ## _last_ ## frequency_units, (stats)->last \ + ? div_s64(local_clock() - (stats)->last, \ +-- +2.1.2 + diff --git a/series.conf b/series.conf index 03de4c3..5bdc098 100644 --- a/series.conf +++ b/series.conf @@ -433,6 +433,7 @@ patches.fixes/0010-bcache-Fix-more-early-shutdown-bugs.patch patches.fixes/0011-bcache-fix-memory-corruption-in-init-error-path.patch patches.fixes/0012-bcache-fix-crash-with-incomplete-cache-set.patch + patches.fixes/0013-bcache-Correct-printing-of-btree_gc_max_duration_ms.patch ######################################################## # DRM/Video -- 2.1.2 -- To unsubscribe, e-mail: opensuse-kernel+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-kernel+owner@opensuse.org

Joshua Schmid

13:49

New subject: [opensuse-kernel] [PATCH 13/13] bcache: add mutex lock for bch_is_open (bnc#908612).

--- ...014-bcache-add-mutex-lock-for-bch_is_open.patch | 37 ++++++++++++++++++++++ series.conf | 1 + 2 files changed, 38 insertions(+) create mode 100644 patches.fixes/0014-bcache-add-mutex-lock-for-bch_is_open.patch diff --git a/patches.fixes/0014-bcache-add-mutex-lock-for-bch_is_open.patch b/patches.fixes/0014-bcache-add-mutex-lock-for-bch_is_open.patch new file mode 100644 index 0000000..fc8c7a4 --- /dev/null +++ b/patches.fixes/0014-bcache-add-mutex-lock-for-bch_is_open.patch @@ -0,0 +1,37 @@ +From 4b43ea96a4f87ed7d8b331939b869d3cceb65459 Mon Sep 17 00:00:00 2001 +From: Jianjian Huo +Date: Sun, 13 Jul 2014 09:08:59 -0700 +Subject: [PATCH 14/14] bcache: add mutex lock for bch_is_open +Git-commit: 789d21dbd9d8889e62c79ec19585fcc97e42ef07 +Patch-mainline: v3.17 +References: bnc#908612 + +Since bch_is_open will iterate linked list bch_cache_sets and +uncached_devices, it needs bch_register_lock. + +Signed-off-by: Jianjian Huo +Signed-off-by: Joshua Schmid +--- + 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 f83b491..e752ea0 100644 +--- a/drivers/md/bcache/super.c ++++ b/drivers/md/bcache/super.c +@@ -1963,10 +1963,12 @@ static ssize_t register_bcache(struct kobject *k, struct kobj_attribute *attr, + if (IS_ERR(bdev)) { + if (bdev == ERR_PTR(-EBUSY)) { + bdev = lookup_bdev(strim(path)); ++ mutex_lock(&bch_register_lock); + if (!IS_ERR(bdev) && bch_is_open(bdev)) + err = "device already registered"; + else + err = "device busy"; ++ mutex_unlock(&bch_register_lock); + } + goto err; + } +-- +2.1.2 + diff --git a/series.conf b/series.conf index 5bdc098..7f49d19 100644 --- a/series.conf +++ b/series.conf @@ -434,6 +434,7 @@ patches.fixes/0011-bcache-fix-memory-corruption-in-init-error-path.patch patches.fixes/0012-bcache-fix-crash-with-incomplete-cache-set.patch patches.fixes/0013-bcache-Correct-printing-of-btree_gc_max_duration_ms.patch + patches.fixes/0014-bcache-add-mutex-lock-for-bch_is_open.patch ######################################################## # DRM/Video -- 2.1.2 -- To unsubscribe, e-mail: opensuse-kernel+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-kernel+owner@opensuse.org

3434

Age (days ago)

3434

Last active (days ago)

List overview

Download

12 comments

1 participants

participants (1)

Joshua Schmid