From: Kirill Tkhai <ktkhai@virtuozzo.com>
To: martin.petersen@oracle.com, bob.liu@oracle.com, axboe@kernel.dk,
darrick.wong@oracle.com
Cc: agk@redhat.com, snitzer@redhat.com, dm-devel@redhat.com,
song@kernel.org, tytso@mit.edu, adilger.kernel@dilger.ca,
Chaitanya.Kulkarni@wdc.com, ming.lei@redhat.com, osandov@fb.com,
jthumshirn@suse.de, minwoo.im.dev@gmail.com,
damien.lemoal@wdc.com, andrea.parri@amarulasolutions.com,
hare@suse.com, tj@kernel.org, ajay.joshi@wdc.com,
sagi@grimberg.me, dsterba@suse.com, chaitanya.kulkarni@wdc.com,
bvanassche@acm.org, dhowells@redhat.com, asml.silence@gmail.com,
linux-block@vger.kernel.org, linux-kernel@vger.kernel.org,
ktkhai@virtuozzo.com
Subject: [PATCH v7 1/6] block: Add @flags argument to bdev_write_zeroes_sectors()
Date: Thu, 13 Feb 2020 10:39:07 +0300 [thread overview]
Message-ID: <158157954759.111879.10496231687886192984.stgit@localhost.localdomain> (raw)
In-Reply-To: <158157930219.111879.12072477040351921368.stgit@localhost.localdomain>
This is a preparation for next patch, which introduces
a new flag BLKDEV_ZERO_ALLOCATE for calls, which need
only allocation of blocks and don't need actual blocks
zeroing.
Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
Reviewed-by: Bob Liu <bob.liu@oracle.com>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
---
block/blk-lib.c | 6 +++---
drivers/md/dm-kcopyd.c | 2 +-
drivers/target/target_core_iblock.c | 4 ++--
include/linux/blkdev.h | 3 ++-
4 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/block/blk-lib.c b/block/blk-lib.c
index 5f2c429d4378..3e38c93cfc53 100644
--- a/block/blk-lib.c
+++ b/block/blk-lib.c
@@ -224,7 +224,7 @@ static int __blkdev_issue_write_zeroes(struct block_device *bdev,
return -EPERM;
/* Ensure that max_write_zeroes_sectors doesn't overflow bi_size */
- max_write_zeroes_sectors = bdev_write_zeroes_sectors(bdev);
+ max_write_zeroes_sectors = bdev_write_zeroes_sectors(bdev, 0);
if (max_write_zeroes_sectors == 0)
return -EOPNOTSUPP;
@@ -362,7 +362,7 @@ int blkdev_issue_zeroout(struct block_device *bdev, sector_t sector,
sector_t bs_mask;
struct bio *bio;
struct blk_plug plug;
- bool try_write_zeroes = !!bdev_write_zeroes_sectors(bdev);
+ bool try_write_zeroes = !!bdev_write_zeroes_sectors(bdev, 0);
bs_mask = (bdev_logical_block_size(bdev) >> 9) - 1;
if ((sector | nr_sects) & bs_mask)
@@ -391,7 +391,7 @@ int blkdev_issue_zeroout(struct block_device *bdev, sector_t sector,
try_write_zeroes = false;
goto retry;
}
- if (!bdev_write_zeroes_sectors(bdev)) {
+ if (!bdev_write_zeroes_sectors(bdev, 0)) {
/*
* Zeroing offload support was indicated, but the
* device reported ILLEGAL REQUEST (for some devices
diff --git a/drivers/md/dm-kcopyd.c b/drivers/md/dm-kcopyd.c
index 1bbe4a34ef4c..f1b8e7926dd4 100644
--- a/drivers/md/dm-kcopyd.c
+++ b/drivers/md/dm-kcopyd.c
@@ -831,7 +831,7 @@ void dm_kcopyd_copy(struct dm_kcopyd_client *kc, struct dm_io_region *from,
*/
job->rw = REQ_OP_WRITE_ZEROES;
for (i = 0; i < job->num_dests; i++)
- if (!bdev_write_zeroes_sectors(job->dests[i].bdev)) {
+ if (!bdev_write_zeroes_sectors(job->dests[i].bdev, 0)) {
job->rw = WRITE;
break;
}
diff --git a/drivers/target/target_core_iblock.c b/drivers/target/target_core_iblock.c
index 51ffd5c002de..73a63e197bf5 100644
--- a/drivers/target/target_core_iblock.c
+++ b/drivers/target/target_core_iblock.c
@@ -117,7 +117,7 @@ static int iblock_configure_device(struct se_device *dev)
* Enable write same emulation for IBLOCK and use 0xFFFF as
* the smaller WRITE_SAME(10) only has a two-byte block count.
*/
- max_write_zeroes_sectors = bdev_write_zeroes_sectors(bd);
+ max_write_zeroes_sectors = bdev_write_zeroes_sectors(bd, 0);
if (max_write_zeroes_sectors)
dev->dev_attrib.max_write_same_len = max_write_zeroes_sectors;
else
@@ -468,7 +468,7 @@ iblock_execute_write_same(struct se_cmd *cmd)
return TCM_INVALID_CDB_FIELD;
}
- if (bdev_write_zeroes_sectors(bdev)) {
+ if (bdev_write_zeroes_sectors(bdev, 0)) {
if (!iblock_execute_zero_out(bdev, cmd))
return 0;
}
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 053ea4b51988..1e3c08854b09 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -1417,7 +1417,8 @@ static inline unsigned int bdev_write_same(struct block_device *bdev)
return 0;
}
-static inline unsigned int bdev_write_zeroes_sectors(struct block_device *bdev)
+static inline unsigned int bdev_write_zeroes_sectors(struct block_device *bdev,
+ unsigned int flags)
{
struct request_queue *q = bdev_get_queue(bdev);
next prev parent reply other threads:[~2020-02-13 7:40 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-13 7:39 [PATCH v7 0/6] block: Introduce REQ_ALLOCATE flag for REQ_OP_WRITE_ZEROES Kirill Tkhai
2020-02-13 7:39 ` Kirill Tkhai [this message]
2020-02-13 7:39 ` [PATCH v7 2/6] block: Pass op_flags into blk_queue_get_max_sectors() Kirill Tkhai
2020-02-13 7:39 ` [PATCH v7 3/6] block: Introduce blk_queue_get_max_write_zeroes_sectors() Kirill Tkhai
2020-02-13 7:39 ` [PATCH v7 4/6] block: Add support for REQ_ALLOCATE flag Kirill Tkhai
2020-02-13 7:39 ` [PATCH v7 5/6] block: Add blk_queue_max_allocate_sectors() Kirill Tkhai
2020-02-13 7:39 ` [PATCH v7 6/6] loop: Add support for REQ_ALLOCATE Kirill Tkhai
2020-02-13 18:11 ` Darrick J. Wong
2020-02-13 20:07 ` Kirill Tkhai
2020-02-13 7:55 ` [PATCH v7 0/6] block: Introduce REQ_ALLOCATE flag for REQ_OP_WRITE_ZEROES Kirill Tkhai
2020-03-06 9:11 ` Kirill Tkhai
2020-03-13 13:08 ` Kirill Tkhai
2020-03-19 10:28 ` Christoph Hellwig
2020-03-19 10:42 ` Kirill Tkhai
2020-03-19 13:03 ` Martin K. Petersen
2020-03-25 16:26 ` Darrick J. Wong
2020-03-25 16:32 ` Christoph Hellwig
2020-03-25 17:23 ` Martin K. Petersen
2020-03-26 9:29 ` Christoph Hellwig
2020-03-26 14:34 ` Martin K. Petersen
2020-03-26 14:45 ` Christoph Hellwig
2020-03-26 16:48 ` Chaitanya Kulkarni
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=158157954759.111879.10496231687886192984.stgit@localhost.localdomain \
--to=ktkhai@virtuozzo.com \
--cc=Chaitanya.Kulkarni@wdc.com \
--cc=adilger.kernel@dilger.ca \
--cc=agk@redhat.com \
--cc=ajay.joshi@wdc.com \
--cc=andrea.parri@amarulasolutions.com \
--cc=asml.silence@gmail.com \
--cc=axboe@kernel.dk \
--cc=bob.liu@oracle.com \
--cc=bvanassche@acm.org \
--cc=damien.lemoal@wdc.com \
--cc=darrick.wong@oracle.com \
--cc=dhowells@redhat.com \
--cc=dm-devel@redhat.com \
--cc=dsterba@suse.com \
--cc=hare@suse.com \
--cc=jthumshirn@suse.de \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=ming.lei@redhat.com \
--cc=minwoo.im.dev@gmail.com \
--cc=osandov@fb.com \
--cc=sagi@grimberg.me \
--cc=snitzer@redhat.com \
--cc=song@kernel.org \
--cc=tj@kernel.org \
--cc=tytso@mit.edu \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).