Commit 208a3120 authored by Keith Busch's avatar Keith Busch Committed by Zheng Zengkai
Browse files

block: return errors from blk_execute_rq() 

mainline inclusion
from mainline-v5.14-rc1
commit  fb9b16e1
category: bugfix
bugzilla: 185778 https://gitee.com/openeuler/kernel/issues/I4LM14


CVE: NA

-----------------------------------------

The synchronous blk_execute_rq() had not provided a way for its callers
to know if its request was successful or not. Return the blk_status_t
result of the request.

Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarMing Lei <ming.lei@redhat.com>
Signed-off-by: default avatarKeith Busch <kbusch@kernel.org>
Reviewed-by: default avatarChaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Link: https://lore.kernel.org/r/20210610214437.641245-4-kbusch@kernel.org


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>

conflict: 1. in blkdev.h and blk-exec, blk_execute_rq return value
change;
	  2. input parameter in blk_execute_rq is not the same as
	     mainline;
Signed-off-by: default avatarzhangwensheng <zhangwensheng5@huawei.com>
Reviewed-by: default avatarqiulaibin <qiulaibin@huawei.com>
Reviewed-by: default avatarJason Yan <yanaijie@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent 6876de0e

block/blk-exec.c

+5 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ static void blk_end_sync_rq(struct request *rq, blk_status_t error) 
{

	struct completion *waiting = rq->end_io_data;



	rq->end_io_data = NULL;

	rq->end_io_data = (void *)(uintptr_t)error;



	/*

	 * complete last, if this is a stack request the process (and thus
@@ -75,8 +75,9 @@ EXPORT_SYMBOL_GPL(blk_execute_rq_nowait); 
 * Description:

 *    Insert a fully prepared request at the back of the I/O scheduler queue

 *    for execution and wait for completion.

 *    Return: The blk_status_t result provided to blk_mq_end_request().

 */

void blk_execute_rq(struct request_queue *q, struct gendisk *bd_disk,

blk_status_t blk_execute_rq(struct request_queue *q, struct gendisk *bd_disk,

		   struct request *rq, int at_head)

{

	DECLARE_COMPLETION_ONSTACK(wait);
@@ -91,5 +92,7 @@ void blk_execute_rq(struct request_queue *q, struct gendisk *bd_disk, 
		while (!wait_for_completion_io_timeout(&wait, hang_check * (HZ/2)));

	else

		wait_for_completion_io(&wait);



	return (blk_status_t)(uintptr_t)rq->end_io_data;

}

EXPORT_SYMBOL(blk_execute_rq);

include/linux/blkdev.h

+2 −2
Original line number Diff line number Diff line
@@ -959,10 +959,10 @@ extern int blk_rq_map_kern(struct request_queue *, struct request *, void *, uns 
extern int blk_rq_map_user_iov(struct request_queue *, struct request *,

			       struct rq_map_data *, const struct iov_iter *,

			       gfp_t);

extern void blk_execute_rq(struct request_queue *, struct gendisk *,

			  struct request *, int);

extern void blk_execute_rq_nowait(struct request_queue *, struct gendisk *,

				  struct request *, int, rq_end_io_fn *);

blk_status_t blk_execute_rq(struct request_queue *, struct gendisk *,

			    struct request *, int);



/* Helper to convert REQ_OP_XXX to its string format XXX */

extern const char *blk_op_str(unsigned int op);