aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJens Axboe <axboe@kernel.dk>2018-12-04 22:06:48 -0500
committerJens Axboe <axboe@kernel.dk>2018-12-04 22:06:48 -0500
commitffe81d45322cc3cb140f0db080a4727ea284661e (patch)
treefe3625f3578ff929ad395d2b41e8a1fce937c6ed
parentfd6f32f78645db32b6b95a42e45da2ddd6de0e67 (diff)
blk-mq: fix corruption with direct issue
If we attempt a direct issue to a SCSI device, and it returns BUSY, then we queue the request up normally. However, the SCSI layer may have already setup SG tables etc for this particular command. If we later merge with this request, then the old tables are no longer valid. Once we issue the IO, we only read/write the original part of the request, not the new state of it. This causes data corruption, and is most often noticed with the file system complaining about the just read data being invalid: [ 235.934465] EXT4-fs error (device sda1): ext4_iget:4831: inode #7142: comm dpkg-query: bad extra_isize 24937 (inode size 256) because most of it is garbage... This doesn't happen from the normal issue path, as we will simply defer the request to the hardware queue dispatch list if we fail. Once it's on the dispatch list, we never merge with it. Fix this from the direct issue path by flagging the request as REQ_NOMERGE so we don't change the size of it before issue. See also: https://bugzilla.kernel.org/show_bug.cgi?id=201685 Tested-by: Guenter Roeck <linux@roeck-us.net> Fixes: 6ce3dd6eec1 ("blk-mq: issue directly if hw queue isn't busy in case of 'none'") Cc: stable@vger.kernel.org Signed-off-by: Jens Axboe <axboe@kernel.dk>
-rw-r--r--block/blk-mq.c26
1 files changed, 25 insertions, 1 deletions
diff --git a/block/blk-mq.c b/block/blk-mq.c
index 3f91c6e5b17a..3262d83b9e07 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -1715,6 +1715,15 @@ static blk_status_t __blk_mq_issue_directly(struct blk_mq_hw_ctx *hctx,
1715 break; 1715 break;
1716 case BLK_STS_RESOURCE: 1716 case BLK_STS_RESOURCE:
1717 case BLK_STS_DEV_RESOURCE: 1717 case BLK_STS_DEV_RESOURCE:
1718 /*
1719 * If direct dispatch fails, we cannot allow any merging on
1720 * this IO. Drivers (like SCSI) may have set up permanent state
1721 * for this request, like SG tables and mappings, and if we
1722 * merge to it later on then we'll still only do IO to the
1723 * original part.
1724 */
1725 rq->cmd_flags |= REQ_NOMERGE;
1726
1718 blk_mq_update_dispatch_busy(hctx, true); 1727 blk_mq_update_dispatch_busy(hctx, true);
1719 __blk_mq_requeue_request(rq); 1728 __blk_mq_requeue_request(rq);
1720 break; 1729 break;
@@ -1727,6 +1736,18 @@ static blk_status_t __blk_mq_issue_directly(struct blk_mq_hw_ctx *hctx,
1727 return ret; 1736 return ret;
1728} 1737}
1729 1738
1739/*
1740 * Don't allow direct dispatch of anything but regular reads/writes,
1741 * as some of the other commands can potentially share request space
1742 * with data we need for the IO scheduler. If we attempt a direct dispatch
1743 * on those and fail, we can't safely add it to the scheduler afterwards
1744 * without potentially overwriting data that the driver has already written.
1745 */
1746static bool blk_rq_can_direct_dispatch(struct request *rq)
1747{
1748 return req_op(rq) == REQ_OP_READ || req_op(rq) == REQ_OP_WRITE;
1749}
1750
1730static blk_status_t __blk_mq_try_issue_directly(struct blk_mq_hw_ctx *hctx, 1751static blk_status_t __blk_mq_try_issue_directly(struct blk_mq_hw_ctx *hctx,
1731 struct request *rq, 1752 struct request *rq,
1732 blk_qc_t *cookie, 1753 blk_qc_t *cookie,
@@ -1748,7 +1769,7 @@ static blk_status_t __blk_mq_try_issue_directly(struct blk_mq_hw_ctx *hctx,
1748 goto insert; 1769 goto insert;
1749 } 1770 }
1750 1771
1751 if (q->elevator && !bypass_insert) 1772 if (!blk_rq_can_direct_dispatch(rq) || (q->elevator && !bypass_insert))
1752 goto insert; 1773 goto insert;
1753 1774
1754 if (!blk_mq_get_dispatch_budget(hctx)) 1775 if (!blk_mq_get_dispatch_budget(hctx))
@@ -1810,6 +1831,9 @@ void blk_mq_try_issue_list_directly(struct blk_mq_hw_ctx *hctx,
1810 struct request *rq = list_first_entry(list, struct request, 1831 struct request *rq = list_first_entry(list, struct request,
1811 queuelist); 1832 queuelist);
1812 1833
1834 if (!blk_rq_can_direct_dispatch(rq))
1835 break;
1836
1813 list_del_init(&rq->queuelist); 1837 list_del_init(&rq->queuelist);
1814 ret = blk_mq_request_issue_directly(rq); 1838 ret = blk_mq_request_issue_directly(rq);
1815 if (ret != BLK_STS_OK) { 1839 if (ret != BLK_STS_OK) {