Re: [bug] as_merged_requests(): possible recursive locking detected

[Nick Piggin <nickpiggin@yahoo.com.au>]

On Friday 01 February 2008 21:31, Jens Axboe wrote:
> On Fri, Feb 01 2008, Jens Axboe wrote:

> > I think the right solution is to remove swap_io_context() and fix the io
> > context referencing in as-iosched.c instead.
>
> IOW, the below. I don't know why Nick originally wanted to swap io
> contexts for a rq <-> rq merge, there seems little (if any) benefit to
> doing so.

Yeah, I guess this patch is fine. Simpler is better.

>
> diff --git a/block/as-iosched.c b/block/as-iosched.c
> index 9603684..852803e 100644
> --- a/block/as-iosched.c
> +++ b/block/as-iosched.c
> @@ -1266,22 +1266,8 @@ static void as_merged_requests(struct request_queue
> *q, struct request *req, */
>  	if (!list_empty(&req->queuelist) && !list_empty(&next->queuelist)) {
>  		if (time_before(rq_fifo_time(next), rq_fifo_time(req))) {
> -			struct io_context *rioc = RQ_IOC(req);
> -			struct io_context *nioc = RQ_IOC(next);
> -
>  			list_move(&req->queuelist, &next->queuelist);
>  			rq_set_fifo_time(req, rq_fifo_time(next));
> -			/*
> -			 * Don't copy here but swap, because when anext is
> -			 * removed below, it must contain the unused context
> -			 */
> -			if (rioc != nioc) {
> -				double_spin_lock(&rioc->lock, &nioc->lock,
> -								rioc < nioc);
> -				swap_io_context(&rioc, &nioc);
> -				double_spin_unlock(&rioc->lock, &nioc->lock,
> -								rioc < nioc);
> -			}
>  		}
>  	}
>
> diff --git a/block/blk-ioc.c b/block/blk-ioc.c
> index 6d16755..80245dc 100644
> --- a/block/blk-ioc.c
> +++ b/block/blk-ioc.c
> @@ -176,15 +176,6 @@ void copy_io_context(struct io_context **pdst, struct
> io_context **psrc) }
>  EXPORT_SYMBOL(copy_io_context);
>
> -void swap_io_context(struct io_context **ioc1, struct io_context **ioc2)
> -{
> -	struct io_context *temp;
> -	temp = *ioc1;
> -	*ioc1 = *ioc2;
> -	*ioc2 = temp;
> -}
> -EXPORT_SYMBOL(swap_io_context);
> -
>  int __init blk_ioc_init(void)
>  {
>  	iocontext_cachep = kmem_cache_create("blkdev_ioc",
> diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
> index baba233..bbe3cf4 100644
> --- a/include/linux/blkdev.h
> +++ b/include/linux/blkdev.h
> @@ -39,7 +39,6 @@ void exit_io_context(void);
>  struct io_context *get_io_context(gfp_t gfp_flags, int node);
>  struct io_context *alloc_io_context(gfp_t gfp_flags, int node);
>  void copy_io_context(struct io_context **pdst, struct io_context **psrc);
> -void swap_io_context(struct io_context **ioc1, struct io_context **ioc2);
>
>  struct request;
>  typedef void (rq_end_io_fn)(struct request *, int);