Re: [RFC][PATCH 3/3] Do not use rqhash when merges disabled

[Aaron Carroll]

Hi Alan,

Alan D. Brunelle wrote:
> --- a/block/elevator.c
> +++ b/block/elevator.c
> @@ -313,7 +313,7 @@ static inline void __elv_rqhash_del(struct request *rq)
>  
>  static void elv_rqhash_del(struct request_queue *q, struct request *rq)
>  {
> -	if (ELV_ON_HASH(rq))
> +	if (!blk_queue_nomerges(q) && ELV_ON_HASH(rq))
>  		__elv_rqhash_del(rq);
>  }

If you switch the nomerges tunable while requests are in flight, it is possible that
a request is put into the rqhash table but not removed here, leading to the BUG_ON
in elv_dequeue_request() triggering.  ELV_ON_HASH needs to be checked regardless of
the nomerges state.


-- Aaron

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/