elv_former_request reversion
PATCH 1/1 elv_former_request reversion
This morning's fix for elv_former_request() is causing oopses all over the place in the IO scheduler.
Jens, remember that I did try that fix a while ago, and the same happened.
I believe it has exposed a new problem at the __make_request/attempt_front_merge
level: if attempt_front_merge() actually succeeds, the wrong request gets freed up in elv_merged_request().
It may be best to back this change out until it can be fixed up for real.
drivers/block/elevator.c renamed from drivers/block/elevator.c~deadline-hack +1 -1
@@ -399,7 +399,7 @@ struct request *elv_former_request(requeelevator_t *e = &q->elevator;if (e->elevator_former_req_fn) -return e->elevator_former_req_fn (q, rq); +return e->elevator_latter_req_fn (q, rq); prev = rq->queuelist.prev;if (prev != &q->queue_head && prev != &rq->queuelist)
_
Quoted 6 lines · Andrew Morton
This morning's fix for
elv_former_request()is causing oopses all over the place in the IO scheduler.Jens, remember that I did try that fix a while ago, and the same happened.
Quoted 7 lines
I believe it has exposed a new problem at the __make_request/attempt_front_merge level: if
attempt_front_merge()actually succeeds, the wrong request gets freed up inelv_merged_request().It may be best to back this change out until it can be fixed up for real.
Yes agreed, I had forgotten about that point... Will fix.
Signature · 1 line
Jens Axboe
Quoted 12 lines · Jens Axboe
Quoted 11 lines · Andrew Morton
This morning's fix for
elv_former_request()is causing oopses all over the place in the IO scheduler.Jens, remember that I did try that fix a while ago, and the same happened.
I believe it has exposed a new problem at the __make_request/attempt_front_merge level: if
attempt_front_merge()actually succeeds, the wrong request gets freed up inelv_merged_request().
Quoted 4 lines
Quoted 2 lines
It may be best to back this change out until it can be fixed up for real.
Yes agreed, I had forgotten about that point... Will fix.
Andrew, does this work for you?
===== drivers/block/deadline-iosched.c 1.14 vs edited =====
drivers/block/deadline-iosched.c +4 -6
@@ -297,6 +297,9 @@deadline_del_drq_rb (dd, drq); } +if (q->last_merge == &rq->queuelist) + q->last_merge =NULL ; +list_del_init (&rq->queuelist); }
@@ -424,12 +427,7 @@ {request_queue_t *q = drq->request->q; -if (q->last_merge == &drq->request->queuelist) - q->last_merge =NULL ; - -deadline_del_drq_hash (drq); -deadline_del_drq_rb (dd, drq); -list_del_init (&drq->fifo); +deadline_remove_request (q, drq->request);list_add_tail (&drq->request->queuelist, dd->dispatch); }
===== drivers/block/elevator.c 1.39 vs edited =====
drivers/block/elevator.c +1 -1
@@ -399,7 +399,7 @@elevator_t *e = &q->elevator;if (e->elevator_former_req_fn) -return e->elevator_latter_req_fn (q, rq); +return e->elevator_former_req_fn (q, rq); prev = rq->queuelist.prev;if (prev != &q->queue_head && prev != &rq->queuelist)
Signature · 1 line
Jens Axboe
Quoted 2 lines · Jens Axboe
Andrew, does this work for you?
Yes. I threw a bunch of nastiness at that on IDE and SCSI, 2-way and 4-way. No problems. Thanks.
Quoted 2 lines
Andrew, does this work for you?
Looks good on my ppc64 box too, it was hitting the BUG() when running SDET before.
Anton