[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <alpine.LFD.2.02.1207161216200.32033@ionos>
Date: Mon, 16 Jul 2012 12:19:39 +0200 (CEST)
From: Thomas Gleixner <tglx@...utronix.de>
To: Mike Galbraith <efault@....de>
cc: Jan Kara <jack@...e.cz>, Jeff Moyer <jmoyer@...hat.com>,
LKML <linux-kernel@...r.kernel.org>,
linux-fsdevel@...r.kernel.org, Tejun Heo <tj@...nel.org>,
Jens Axboe <jaxboe@...ionio.com>, mgalbraith@...e.com
Subject: Re: Deadlocks due to per-process plugging
On Mon, 16 Jul 2012, Mike Galbraith wrote:
> Hm, wonder how bad this sucks.. and if I should go hide under a big
> sturdy rock after I poke xmit :)
>
> ---
> block/blk-core.c | 1 +
> kernel/rtmutex.c | 11 +++++++++--
> 2 files changed, 10 insertions(+), 2 deletions(-)
>
> --- a/block/blk-core.c
> +++ b/block/blk-core.c
> @@ -2782,6 +2782,7 @@ void blk_flush_plug_list(struct blk_plug
> if (q)
> queue_unplugged(q, depth, from_schedule);
> }
> +EXPORT_SYMBOL(blk_flush_plug_list);
You don't need that one. blk-core and rtmutex are builtin
> void blk_finish_plug(struct blk_plug *plug)
> {
> --- a/kernel/rtmutex.c
> +++ b/kernel/rtmutex.c
> @@ -20,6 +20,7 @@
> #include <linux/module.h>
> #include <linux/sched.h>
> #include <linux/timer.h>
> +#include <linux/blkdev.h>
>
> #include "rtmutex_common.h"
>
> @@ -647,8 +648,11 @@ static inline void rt_spin_lock_fastlock
>
> if (likely(rt_mutex_cmpxchg(lock, NULL, current)))
> rt_mutex_deadlock_account_lock(lock, current);
> - else
> + else {
> + if (blk_needs_flush_plug(current))
> + blk_schedule_flush_plug(current);
> slowfn(lock);
> + }
That should do the trick.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists