From: Mike Snitzer <snitzer@redhat.com>
To: Jens Axboe <axboe@kernel.dk>
Cc: Ming Lei <ming.lei@redhat.com>,
Vijayendra Suman <vijayendra.suman@oracle.com>,
dm-devel@redhat.com, linux-block@vger.kernel.org
Subject: [PATCH v3 6/6] dm: change max_io_len() to use blk_max_size_offset()
Date: Mon, 21 Sep 2020 22:32:51 -0400 [thread overview]
Message-ID: <20200922023251.47712-7-snitzer@redhat.com> (raw)
In-Reply-To: <20200922023251.47712-1-snitzer@redhat.com>
Using blk_max_size_offset() enables DM core's splitting to impose
ti->max_io_len (via q->limits.chunk_sectors) and also fallback to
respecting q->limits.max_sectors if chunk_sectors isn't set.
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
---
drivers/md/dm.c | 20 ++++++++------------
1 file changed, 8 insertions(+), 12 deletions(-)
diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index 6ed05ca65a0f..3982012b1309 100644
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -1051,22 +1051,18 @@ static sector_t max_io_len_target_boundary(sector_t sector, struct dm_target *ti
static sector_t max_io_len(sector_t sector, struct dm_target *ti)
{
sector_t len = max_io_len_target_boundary(sector, ti);
- sector_t offset, max_len;
+ sector_t max_len;
/*
* Does the target need to split even further?
+ * - q->limits.chunk_sectors reflects ti->max_io_len so
+ * blk_max_size_offset() provides required splitting.
+ * - blk_max_size_offset() also respects q->limits.max_sectors
*/
- if (ti->max_io_len) {
- offset = dm_target_offset(ti, sector);
- if (unlikely(ti->max_io_len & (ti->max_io_len - 1)))
- max_len = sector_div(offset, ti->max_io_len);
- else
- max_len = offset & (ti->max_io_len - 1);
- max_len = ti->max_io_len - max_len;
-
- if (len > max_len)
- len = max_len;
- }
+ max_len = blk_max_size_offset(dm_table_get_md(ti->table)->queue,
+ dm_target_offset(ti, sector));
+ if (len > max_len)
+ len = max_len;
return len;
}
--
2.15.0
next prev parent reply other threads:[~2020-09-22 2:33 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-22 2:32 [PATCH v3 0/6] dm: fix then improve bio splitting Mike Snitzer
2020-09-22 2:32 ` [PATCH v3 1/6] dm: fix bio splitting and its bio completion order for regular IO Mike Snitzer
2020-09-22 2:32 ` [PATCH v3 2/6] dm: fix comment in dm_process_bio() Mike Snitzer
2020-09-22 2:32 ` [PATCH v3 3/6] block: use lcm_not_zero() when stacking chunk_sectors Mike Snitzer
2020-09-22 19:28 ` Martin K. Petersen
2020-09-22 2:32 ` [PATCH v3 4/6] block: allow 'chunk_sectors' to be non-power-of-2 Mike Snitzer
2020-09-22 19:30 ` Martin K. Petersen
2020-09-22 2:32 ` [PATCH v3 5/6] dm table: stack 'chunk_sectors' limit to account for target-specific splitting Mike Snitzer
2020-09-22 2:32 ` Mike Snitzer [this message]
2020-09-23 16:38 ` [PATCH v3 0/6] dm: fix then improve bio splitting Jens Axboe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200922023251.47712-7-snitzer@redhat.com \
--to=snitzer@redhat.com \
--cc=axboe@kernel.dk \
--cc=dm-devel@redhat.com \
--cc=linux-block@vger.kernel.org \
--cc=ming.lei@redhat.com \
--cc=vijayendra.suman@oracle.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.