Skip to contentSkip to conversation

make nbd working in 2.5.x

PATCH Petr Vandrovec 2 participants 2 messages Mar 3, 2003 – Mar 5, 2003

lore
Share & tools
lore
#0 lore raw
Quoted 14 lines · Pavel Machek
Quoted 4 lines

we use nbd for our diskless systems, and it looks to me like that
it has some serious problems in 2.5.x... Can you apply this patch and forward it to Linus?

Quoted 9 lines

There were:
* Missing disk's queue initialization
* Driver should use list_del_init: put_request now verifies that req->queuelist is empty, and list_del was incompatible with this.
* I converted nbd_end_request back to end_that_request_{first,last} as I saw no reason why driver should do it itself... and blk_put_request has no place under queue_lock, so apparently when semantic changed nobody went through drivers...

Quoted 2 lines

I do not think this is good idea. I am not sure who converted it to bio, but he surely had good reason to do that.

I think that at the beginning of 2.5.x series there was some thinking about removing end_that_request* completely from the API. As it never happened, and __end_that_request_first()/end_that_request_last() has definitely better quality (like that it does not ignore req->waiting...) than opencoded nbd loop, I prefer using end_that_request* over opencoding bio traversal.

If you want, then just replace blk_put_request() with __blk_put_request(), instead of first change. But I personally will not trust such code, as next time something in bio changes nbd will miss this change again.
Petr Vandrovec

Quoted 28 lines
Quoted 28 lines

diff -urdN linux/drivers/block/nbd.c linux/drivers/block/nbd.c

drivers/block/nbd.c 2003-03-01 22:53:36.000000000 +0100 renamed from drivers/block/nbd.c 2003-02-28 20:56:05.000000000 +0100 +2 -9
@@ -76,22 +76,15 @@
 {
  int uptodate = (req->errors == 0) ? 1 : 0;
  request_queue_t *q = req->q;
- struct bio *bio;
- unsigned nsect;
  unsigned long flags;
 
 #ifdef PARANOIA
  requests_out++;
 #endif
  spin_lock_irqsave(q->queue_lock, flags);
- while((bio = req->bio) != NULL) {
-     nsect = bio_sectors(bio);
-     blk_finished_io(nsect);
-     req->bio = bio->bi_next;
-     bio->bi_next = NULL;
-     bio_endio(bio, nsect << 9, uptodate ? 0 : -EIO);
+ if (!end_that_request_first(req, uptodate, req->nr_sectors)) {
+     end_that_request_last(req);
  }
- blk_put_request(req);
  spin_unlock_irqrestore(q->queue_lock, flags);
 }
 
#1 lore raw
Quoted 25 lines · Petr Vandrovec
Quoted 14 lines · Pavel Machek
Quoted 4 lines

we use nbd for our diskless systems, and it looks to me like that
it has some serious problems in 2.5.x... Can you apply this patch and forward it to Linus?

Quoted 9 lines

There were:
* Missing disk's queue initialization
* Driver should use list_del_init: put_request now verifies that req->queuelist is empty, and list_del was incompatible with this.
* I converted nbd_end_request back to end_that_request_{first,last} as I saw no reason why driver should do it itself... and blk_put_request has no place under queue_lock, so apparently when semantic changed nobody went through drivers...

Quoted 2 lines

I do not think this is good idea. I am not sure who converted it to bio, but he surely had good reason to do that.

I think that at the beginning of 2.5.x series there was some thinking about removing end_that_request* completely from the API. As it never happened, and __end_that_request_first()/end_that_request_last() has definitely better quality (like that it does not ignore req->waiting...) than opencoded nbd loop, I prefer using end_that_request* over opencoding bio traversal.

Quoted 3 lines

If you want, then just replace blk_put_request() with __blk_put_request(), instead of first change. But I personally will not trust such code, as next time something in bio changes nbd will miss this change again.

I agree with the change, there's no reason for nbd to implement its own end_request handling. I was the one to do the bio conversion, doing XXX drivers at one time...

A small correction to your patch, you need not hold queue_lock when calling end_that_request_first() (which is the costly part of ending a request), so

	if (!end_that_request_first(req, uptodate, req->nr_sectors)) {
		unsigned long flags;

		spin_lock_irqsave(q->queue_lock, flags);
		end_that_request_last(req);
		spin_unlock_irqrestore(q->queue_lock, flags);
	}

would be enough. That depends on the driver having pulled the request off the list in the first place, which nbd has.

Also, it looks like it would be much better to simply let the queue lock for a nbd_device be inherited from ndb_device->lo_lock.

Signature · 1 line
Jens Axboe