From 74f5c02455677fd4be38440c472e546b87ec399f Mon Sep 17 00:00:00 2001 From: Josh Boyer Date: Wed, 28 Sep 2011 19:07:14 -0400 Subject: [PATCH] Add patch from upstream to ix the USB drive removal oopses we've been seeing --- ...queue-resources-at-blk_release_queue.patch | 71 +++++++++++++++++++ kernel.spec | 8 +++ 2 files changed, 79 insertions(+) create mode 100644 block-Free-queue-resources-at-blk_release_queue.patch diff --git a/block-Free-queue-resources-at-blk_release_queue.patch b/block-Free-queue-resources-at-blk_release_queue.patch new file mode 100644 index 000000000..9c3049778 --- /dev/null +++ b/block-Free-queue-resources-at-blk_release_queue.patch @@ -0,0 +1,71 @@ +From 3a527bb7e00bb9650f28d273f56c872db03452c5 Mon Sep 17 00:00:00 2001 +From: Hannes Reinecke +Date: Wed, 28 Sep 2011 08:07:01 -0600 +Subject: [PATCH] block: Free queue resources at blk_release_queue() + +A kernel crash is observed when a mounted ext3/ext4 filesystem is +physically removed. The problem is that blk_cleanup_queue() frees up +some resources eg by calling elevator_exit(), which are not checked for +in normal operation. So we should rather move these calls to the +destructor function blk_release_queue() as at that point all remaining +references are gone. However, in doing so we have to ensure that any +externally supplied queue_lock is disconnected as the driver might free +up the lock after the call of blk_cleanup_queue(), + +Signed-off-by: Hannes Reinecke +Signed-off-by: Jens Axboe +--- + block/blk-core.c | 13 ++++++------- + block/blk-sysfs.c | 5 +++++ + 2 files changed, 11 insertions(+), 7 deletions(-) + +diff --git a/block/blk-core.c b/block/blk-core.c +index 1d49e1c..847d04e 100644 +--- a/block/blk-core.c ++++ b/block/blk-core.c +@@ -348,9 +348,10 @@ void blk_put_queue(struct request_queue *q) + EXPORT_SYMBOL(blk_put_queue); + + /* +- * Note: If a driver supplied the queue lock, it should not zap that lock +- * unexpectedly as some queue cleanup components like elevator_exit() and +- * blk_throtl_exit() need queue lock. ++ * Note: If a driver supplied the queue lock, it is disconnected ++ * by this function. The actual state of the lock doesn't matter ++ * here as the request_queue isn't accessible after this point ++ * (QUEUE_FLAG_DEAD is set) and no other requests will be queued. + */ + void blk_cleanup_queue(struct request_queue *q) + { +@@ -367,10 +368,8 @@ void blk_cleanup_queue(struct request_queue *q) + queue_flag_set_unlocked(QUEUE_FLAG_DEAD, q); + mutex_unlock(&q->sysfs_lock); + +- if (q->elevator) +- elevator_exit(q->elevator); +- +- blk_throtl_exit(q); ++ if (q->queue_lock != &q->__queue_lock) ++ q->queue_lock = &q->__queue_lock; + + blk_put_queue(q); + } +diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c +index d935bd8..45c56d8 100644 +--- a/block/blk-sysfs.c ++++ b/block/blk-sysfs.c +@@ -472,6 +472,11 @@ static void blk_release_queue(struct kobject *kobj) + + blk_sync_queue(q); + ++ if (q->elevator) ++ elevator_exit(q->elevator); ++ ++ blk_throtl_exit(q); ++ + if (rl->rq_pool) + mempool_destroy(rl->rq_pool); + +-- +1.7.6 + diff --git a/kernel.spec b/kernel.spec index 35dd29681..7b92f4f8d 100644 --- a/kernel.spec +++ b/kernel.spec @@ -703,6 +703,8 @@ Patch21012: hid-magicmouse-ignore-ivalid-report-id-while-switching-modes-v2.patc # rhbz #496975 Patch21013: Platform-fix-samsung-laptop-DMI-identification-for-N.patch +Patch21014: block-Free-queue-resources-at-blk_release_queue.patch + %endif BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root @@ -1275,6 +1277,8 @@ ApplyPatch hid-magicmouse-ignore-ivalid-report-id-while-switching-modes-v2.patch # rhbz #496675 ApplyPatch Platform-fix-samsung-laptop-DMI-identification-for-N.patch +ApplyPatch block-Free-queue-resources-at-blk_release_queue.patch + # END OF PATCH APPLICATIONS %endif @@ -1895,6 +1899,10 @@ fi # and build. %changelog +* Wed Sep 28 2011 Josh Boyer +- Backport upstream block patch to try and fix a number of oopses we're seeing + with USB drive removals + * Tue Sep 27 2011 Josh Boyer - Backport support for Samsung n150 class machines (rhbz 496975)