Attachment 56341 Details for Bug 132104

[patch] Add debug catches and dumps for this bug in CFQ

cfq-debug-sl10 (text/plain), 1.61 KB, created by Jens Axboe on 2005-11-03 10:33:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jens Axboe

Created: 2005-11-03 10:33:49 UTC

Size: 1.61 KB

patch

obsolete

>--- linux-2.6.13/drivers/block/cfq-iosched.c~	2005-11-03 11:25:11.000000000 +0100
>+++ linux-2.6.13/drivers/block/cfq-iosched.c	2005-11-03 11:33:54.000000000 +0100
>@@ -792,6 +792,8 @@
> __cfq_set_active_queue(struct cfq_data *cfqd, struct cfq_queue *cfqq)
> {
> 	if (cfqq) {
>+		WARN_ON(RB_EMPTY(&cfqq->sort_list));
>+
> 		/*
> 		 * stop potential idle class queues waiting service
> 		 */
>@@ -882,8 +884,10 @@
> 	 * if current list is non-empty, grab first entry. if it is empty,
> 	 * get next prio level and grab first entry then if any are spliced
> 	 */
>-	if (!list_empty(&cfqd->cur_rr) || cfq_get_next_prio_level(cfqd) != -1)
>+	if (!list_empty(&cfqd->cur_rr) || cfq_get_next_prio_level(cfqd) != -1) {
> 		cfqq = list_entry_cfqq(cfqd->cur_rr.next);
>+		WARN_ON(RB_EMPTY(&cfqq->sort_list));
>+	}
> 
> 	/*
> 	 * if we have idle queues and no rt or be queues had pending
>@@ -893,9 +897,10 @@
> 	if (!cfqq && !list_empty(&cfqd->idle_rr)) {
> 		unsigned long end = cfqd->last_end_request + CFQ_IDLE_GRACE;
> 
>-		if (time_after_eq(jiffies, end))
>+		if (time_after_eq(jiffies, end)) {
> 			cfqq = list_entry_cfqq(cfqd->idle_rr.next);
>-		else
>+			WARN_ON(RB_EMPTY(&cfqq->sort_list));
>+		} else
> 			mod_timer(&cfqd->idle_class_timer, end);
> 	}
> 
>@@ -1145,7 +1150,10 @@
> {
> 	int dispatched = 0;
> 
>-	BUG_ON(RB_EMPTY(&cfqq->sort_list));
>+	if (RB_EMPTY(&cfqq->sort_list)) {
>+		printk("rb empty on dispatch: q=%d/%d, a=%d/%d, d=%d/%d, rr=%d, f=%x, k=%d\n", cfqq->queued[0], cfqq->queued[1], cfqq->allocated[0], cfqq->allocated[1], cfqq->on_dispatch[0], cfqq->on_dispatch[1], list_empty(&cfqq->cfq_list), cfqq->flags, cfqq->key);
>+		return 0;
>+	}
> 
> 	do {
> 		struct cfq_rq *crq;

Actions: View | Diff

Attachments on bug 132104: 56324 | 56326 | 56341 | 56740