Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-11 07:39:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

dm: fix dm_wq_work() to only use __split_and_process_bio() if appropriate

Browse Source 
Otherwise targets that don't support/expect IO splitting could resubmit
bios using code paths with unnecessary IO splitting complexity.

Depends-on: 24113d487843 ("dm: avoid indirect call in __dm_make_request")
Fixes: 978e51ba38e00 ("dm: optimize bio-based NVMe IO submission")
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
This commit is contained in:
Mike Snitzer 2019-01-17 14:33:01 -05:00
parent a1e1cb72d9
commit 6548c7c538
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/md/dm.c
View File

@ -1725,6 +1725,15 @@ out:
return ret; return ret;
} }
static blk_qc_t dm_process_bio(struct mapped_device *md,
struct dm_table *map, struct bio *bio)
{
if (dm_get_md_type(md) == DM_TYPE_NVME_BIO_BASED)
return __process_bio(md, map, bio);
else
return __split_and_process_bio(md, map, bio);
}
static blk_qc_t dm_make_request(struct request_queue *q, struct bio *bio) static blk_qc_t dm_make_request(struct request_queue *q, struct bio *bio)
{ {
struct mapped_device *md = q->queuedata; struct mapped_device *md = q->queuedata;
@ -1745,10 +1754,7 @@ static blk_qc_t dm_make_request(struct request_queue *q, struct bio *bio)
return ret; return ret;
} }
if (dm_get_md_type(md) == DM_TYPE_NVME_BIO_BASED) ret = dm_process_bio(md, map, bio);
ret = __process_bio(md, map, bio);
else
ret = __split_and_process_bio(md, map, bio);
dm_put_live_table(md, srcu_idx); dm_put_live_table(md, srcu_idx);
return ret; return ret;
@ -2427,9 +2433,9 @@ static void dm_wq_work(struct work_struct *work)
break; break;
if (dm_request_based(md)) if (dm_request_based(md))
generic_make_request(c); (void) generic_make_request(c);
else else
__split_and_process_bio(md, map, c); (void) dm_process_bio(md, map, c);
} }
dm_put_live_table(md, srcu_idx); dm_put_live_table(md, srcu_idx);