Commit 6000a368 authored by Mike Christie's avatar Mike Christie Committed by James Bottomley
Browse files

[SCSI] block: separate failfast into multiple bits. 



Multipath is best at handling transport errors. If it gets a device
error then there is not much the multipath layer can do. It will just
access the same device but from a different path.

This patch breaks up failfast into device, transport and driver errors.
The multipath layers (md and dm mutlipath) only ask the lower levels to
fast fail transport errors. The user of failfast, read ahead, will ask
to fast fail on all errors.

Note that blk_noretry_request will return true if any failfast bit
is set. This allows drivers that do not support the multipath failfast
bits to continue to fail on any failfast error like before. Drivers
like scsi that are able to fail fast specific errors can check
for the specific fail fast type. In the next patch I will convert
scsi.

Signed-off-by: default avatarMike Christie <michaelc@cs.wisc.edu>
Cc: Jens Axboe <jens.axboe@oracle.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent 056a4483

block/blk-core.c

+9 −2
Original line number Diff line number Diff line
@@ -1075,8 +1075,15 @@ void init_request_from_bio(struct request *req, struct bio *bio) 
	/*

	 * inherit FAILFAST from bio (for read-ahead, and explicit FAILFAST)

	 */

	if (bio_rw_ahead(bio) || bio_failfast(bio))

		req->cmd_flags |= REQ_FAILFAST;

	if (bio_rw_ahead(bio))

		req->cmd_flags |= (REQ_FAILFAST_DEV | REQ_FAILFAST_TRANSPORT |

				   REQ_FAILFAST_DRIVER);

	if (bio_failfast_dev(bio))

		req->cmd_flags |= REQ_FAILFAST_DEV;

	if (bio_failfast_transport(bio))

		req->cmd_flags |= REQ_FAILFAST_TRANSPORT;

	if (bio_failfast_driver(bio))

		req->cmd_flags |= REQ_FAILFAST_DRIVER;



	/*

	 * REQ_BARRIER implies no merging, but lets make it explicit

drivers/md/dm-mpath.c

+1 −1
Original line number Diff line number Diff line
@@ -849,7 +849,7 @@ static int multipath_map(struct dm_target *ti, struct bio *bio, 
	dm_bio_record(&mpio->details, bio);



	map_context->ptr = mpio;

	bio->bi_rw |= (1 << BIO_RW_FAILFAST);

	bio->bi_rw |= (1 << BIO_RW_FAILFAST_TRANSPORT);

	r = map_io(m, bio, mpio, 0);

	if (r < 0 || r == DM_MAPIO_REQUEUE)

		mempool_free(mpio, m->mpio_pool);

drivers/md/multipath.c

+2 −2
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ static int multipath_make_request (struct request_queue *q, struct bio * bio) 
	mp_bh->bio = *bio;

	mp_bh->bio.bi_sector += multipath->rdev->data_offset;

	mp_bh->bio.bi_bdev = multipath->rdev->bdev;

	mp_bh->bio.bi_rw |= (1 << BIO_RW_FAILFAST);

	mp_bh->bio.bi_rw |= (1 << BIO_RW_FAILFAST_TRANSPORT);

	mp_bh->bio.bi_end_io = multipath_end_request;

	mp_bh->bio.bi_private = mp_bh;

	generic_make_request(&mp_bh->bio);
@@ -402,7 +402,7 @@ static void multipathd (mddev_t *mddev) 
			*bio = *(mp_bh->master_bio);

			bio->bi_sector += conf->multipaths[mp_bh->path].rdev->data_offset;

			bio->bi_bdev = conf->multipaths[mp_bh->path].rdev->bdev;

			bio->bi_rw |= (1 << BIO_RW_FAILFAST);

			bio->bi_rw |= (1 << BIO_RW_FAILFAST_TRANSPORT);

			bio->bi_end_io = multipath_end_request;

			bio->bi_private = mp_bh;

			generic_make_request(bio);

drivers/s390/block/dasd_diag.c

+1 −1
Original line number Diff line number Diff line
@@ -544,7 +544,7 @@ static struct dasd_ccw_req *dasd_diag_build_cp(struct dasd_device *memdev, 
	}

	cqr->retries = DIAG_MAX_RETRIES;

	cqr->buildclk = get_clock();

	if (req->cmd_flags & REQ_FAILFAST)

	if (blk_noretry_request(req))

		set_bit(DASD_CQR_FLAGS_FAILFAST, &cqr->flags);

	cqr->startdev = memdev;

	cqr->memdev = memdev;

drivers/s390/block/dasd_eckd.c

+1 −1
Original line number Diff line number Diff line
@@ -1700,7 +1700,7 @@ static struct dasd_ccw_req *dasd_eckd_build_cp(struct dasd_device *startdev, 
			recid++;

		}

	}

	if (req->cmd_flags & REQ_FAILFAST)

	if (blk_noretry_request(req))

		set_bit(DASD_CQR_FLAGS_FAILFAST, &cqr->flags);

	cqr->startdev = startdev;

	cqr->memdev = startdev;

CRA Git | Maintained and supported by SUSTech CRA and CCSE