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

Merge tag 'block-5.12-2021-04-02' of git://git.kernel.dk/linux-block 

Pull block fixes from Jens Axboe:

 - Remove comment that never came to fruition in 22 years of development
   (Christoph)

 - Remove unused request flag (Christoph)

 - Fix for null_blk fake timeout handling (Damien)

 - Fix for IOCB_NOWAIT being ignored for O_DIRECT on raw bdevs (Pavel)

 - Error propagation fix for multiple split bios (Yufen)

* tag 'block-5.12-2021-04-02' of git://git.kernel.dk/linux-block:
  block: remove the unused RQF_ALLOCED flag
  block: update a few comments in uapi/linux/blkpg.h
  block: don't ignore REQ_NOWAIT for direct IO
  null_blk: fix command timeout completion handling
  block: only update parent bi_status when bio fail
parents 1faccb63 f06c6096

block/bio.c

+1 −1
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ static struct bio *__bio_chain_endio(struct bio *bio) 
{

	struct bio *parent = bio->bi_private;



	if (!parent->bi_status)

	if (bio->bi_status && !parent->bi_status)

		parent->bi_status = bio->bi_status;

	bio_put(bio);

	return parent;

block/blk-mq-debugfs.c

+0 −1
Original line number Diff line number Diff line
@@ -302,7 +302,6 @@ static const char *const rqf_name[] = { 
	RQF_NAME(QUIET),

	RQF_NAME(ELVPRIV),

	RQF_NAME(IO_STAT),

	RQF_NAME(ALLOCED),

	RQF_NAME(PM),

	RQF_NAME(HASHED),

	RQF_NAME(STATS),

drivers/block/null_blk/main.c

+21 −5
Original line number Diff line number Diff line
@@ -1369,10 +1369,13 @@ static blk_status_t null_handle_cmd(struct nullb_cmd *cmd, sector_t sector, 
	}



	if (dev->zoned)

		cmd->error = null_process_zoned_cmd(cmd, op,

						    sector, nr_sectors);

		sts = null_process_zoned_cmd(cmd, op, sector, nr_sectors);

	else

		cmd->error = null_process_cmd(cmd, op, sector, nr_sectors);

		sts = null_process_cmd(cmd, op, sector, nr_sectors);



	/* Do not overwrite errors (e.g. timeout errors) */

	if (cmd->error == BLK_STS_OK)

		cmd->error = sts;



out:

	nullb_complete_cmd(cmd);
@@ -1451,7 +1454,19 @@ static bool should_requeue_request(struct request *rq) 


static enum blk_eh_timer_return null_timeout_rq(struct request *rq, bool res)

{

	struct nullb_cmd *cmd = blk_mq_rq_to_pdu(rq);



	pr_info("rq %p timed out\n", rq);



	/*

	 * If the device is marked as blocking (i.e. memory backed or zoned

	 * device), the submission path may be blocked waiting for resources

	 * and cause real timeouts. For these real timeouts, the submission

	 * path will complete the request using blk_mq_complete_request().

	 * Only fake timeouts need to execute blk_mq_complete_request() here.

	 */

	cmd->error = BLK_STS_TIMEOUT;

	if (cmd->fake_timeout)

		blk_mq_complete_request(rq);

	return BLK_EH_DONE;

}
@@ -1473,6 +1488,7 @@ static blk_status_t null_queue_rq(struct blk_mq_hw_ctx *hctx, 
	cmd->rq = bd->rq;

	cmd->error = BLK_STS_OK;

	cmd->nq = nq;

	cmd->fake_timeout = should_timeout_request(bd->rq);



	blk_mq_start_request(bd->rq);
@@ -1489,7 +1505,7 @@ static blk_status_t null_queue_rq(struct blk_mq_hw_ctx *hctx, 
			return BLK_STS_OK;

		}

	}

	if (should_timeout_request(bd->rq))

	if (cmd->fake_timeout)

		return BLK_STS_OK;



	return null_handle_cmd(cmd, sector, nr_sectors, req_op(bd->rq));

drivers/block/null_blk/null_blk.h

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ struct nullb_cmd { 
	blk_status_t error;

	struct nullb_queue *nq;

	struct hrtimer timer;

	bool fake_timeout;

};



struct nullb_queue {

fs/block_dev.c

+4 −0
Original line number Diff line number Diff line
@@ -275,6 +275,8 @@ __blkdev_direct_IO_simple(struct kiocb *iocb, struct iov_iter *iter, 
		bio.bi_opf = dio_bio_write_op(iocb);

		task_io_account_write(ret);

	}

	if (iocb->ki_flags & IOCB_NOWAIT)

		bio.bi_opf |= REQ_NOWAIT;

	if (iocb->ki_flags & IOCB_HIPRI)

		bio_set_polled(&bio, iocb);
@@ -428,6 +430,8 @@ static ssize_t __blkdev_direct_IO(struct kiocb *iocb, struct iov_iter *iter, 
			bio->bi_opf = dio_bio_write_op(iocb);

			task_io_account_write(bio->bi_iter.bi_size);

		}

		if (iocb->ki_flags & IOCB_NOWAIT)

			bio->bi_opf |= REQ_NOWAIT;



		dio->size += bio->bi_iter.bi_size;

		pos += bio->bi_iter.bi_size;