Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f2f1fa78 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Enforce a minimum SG_IO timeout 



There's no point in having too short SG_IO timeouts, since if the
command does end up timing out, we'll end up through the reset sequence
that is several seconds long in order to abort the command that timed
out.

As a result, shorter timeouts than a few seconds simply do not make
sense, as the recovery would be longer than the timeout itself.

Add a BLK_MIN_SG_TIMEOUT to match the existign BLK_DEFAULT_SG_TIMEOUT.

Suggested-by: default avatarAlan Cox <alan@lxorguk.ukuu.org.uk>
Acked-by: default avatarTejun Heo <tj@kernel.org>
Acked-by: default avatarJens Axboe <jens.axboe@oracle.com>
Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 24920a79

block/bsg.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -202,6 +202,8 @@ static int blk_fill_sgv4_hdr_rq(struct request_queue *q, struct request *rq, 
		rq->timeout = q->sg_timeout;

		rq->timeout = q->sg_timeout;

	if (!rq->timeout)

	if (!rq->timeout)

		rq->timeout = BLK_DEFAULT_SG_TIMEOUT;

		rq->timeout = BLK_DEFAULT_SG_TIMEOUT;

	if (rq->timeout < BLK_MIN_SG_TIMEOUT)

		rq->timeout = BLK_MIN_SG_TIMEOUT;





	return 0;

	return 0;

}

}

block/scsi_ioctl.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -208,6 +208,8 @@ static int blk_fill_sghdr_rq(struct request_queue *q, struct request *rq, 
		rq->timeout = q->sg_timeout;

		rq->timeout = q->sg_timeout;

	if (!rq->timeout)

	if (!rq->timeout)

		rq->timeout = BLK_DEFAULT_SG_TIMEOUT;

		rq->timeout = BLK_DEFAULT_SG_TIMEOUT;

	if (rq->timeout < BLK_MIN_SG_TIMEOUT)

		rq->timeout = BLK_MIN_SG_TIMEOUT;





	return 0;

	return 0;

}

}

include/linux/blkdev.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -662,6 +662,7 @@ extern unsigned long blk_max_low_pfn, blk_max_pfn; 
 * default timeout for SG_IO if none specified

 * default timeout for SG_IO if none specified

 */

 */

#define BLK_DEFAULT_SG_TIMEOUT	(60 * HZ)

#define BLK_DEFAULT_SG_TIMEOUT	(60 * HZ)

#define BLK_MIN_SG_TIMEOUT	(7 * HZ)





#ifdef CONFIG_BOUNCE

#ifdef CONFIG_BOUNCE

extern int init_emergency_isa_pool(void);

extern int init_emergency_isa_pool(void);