From: Christoph Hellwig <hch@lst.de> To: axboe@kernel.dk, martin.petersen@oracle.com, agk@redhat.com, snitzer@redhat.com, shli@kernel.org, philipp.reisner@linbit.com, lars.ellenberg@linbit.com Cc: linux-block@vger.kernel.org, linux-raid@vger.kernel.org, dm-devel@redhat.com, linux-scsi@vger.kernel.org, drbd-dev@lists.linbit.com Subject: [PATCH 12/27] block: add a new BLKDEV_ZERO_NOFALLBACK flag Date: Wed, 5 Apr 2017 19:21:10 +0200 [thread overview] Message-ID: <20170405172125.22600-13-hch@lst.de> (raw) In-Reply-To: <20170405172125.22600-1-hch@lst.de> This avoids fallbacks to explicit zeroing in (__)blkdev_issue_zeroout if the caller doesn't want them. Also clean up the convoluted check for the return condition that this new flag is added to. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com> Reviewed-by: Hannes Reinecke <hare@suse.com> --- block/blk-lib.c | 5 ++++- include/linux/blkdev.h | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/block/blk-lib.c b/block/blk-lib.c index 2f6d2cb2e1a2..2f882e22890b 100644 --- a/block/blk-lib.c +++ b/block/blk-lib.c @@ -281,6 +281,9 @@ static int __blkdev_issue_write_zeroes(struct block_device *bdev, * * If a device is using logical block provisioning, the underlying space will * not be released if %flags contains BLKDEV_ZERO_NOUNMAP. + * + * If %flags contains BLKDEV_ZERO_NOFALLBACK, the function will return + * -EOPNOTSUPP if no explicit hardware offload for zeroing is provided. */ int __blkdev_issue_zeroout(struct block_device *bdev, sector_t sector, sector_t nr_sects, gfp_t gfp_mask, struct bio **biop, @@ -298,7 +301,7 @@ int __blkdev_issue_zeroout(struct block_device *bdev, sector_t sector, ret = __blkdev_issue_write_zeroes(bdev, sector, nr_sects, gfp_mask, biop, flags); - if (ret == 0 || (ret && ret != -EOPNOTSUPP)) + if (ret != -EOPNOTSUPP || (flags & BLKDEV_ZERO_NOFALLBACK)) goto out; ret = 0; diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index e7513ce3dbde..a5055d760661 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -1351,6 +1351,7 @@ extern int __blkdev_issue_discard(struct block_device *bdev, sector_t sector, struct bio **biop); #define BLKDEV_ZERO_NOUNMAP (1 << 0) /* do not free blocks */ +#define BLKDEV_ZERO_NOFALLBACK (1 << 1) /* don't write explicit zeroes */ extern int __blkdev_issue_zeroout(struct block_device *bdev, sector_t sector, sector_t nr_sects, gfp_t gfp_mask, struct bio **biop, -- 2.11.0
WARNING: multiple messages have this Message-ID (diff)
From: Christoph Hellwig <hch@lst.de> To: axboe@kernel.dk, martin.petersen@oracle.com, agk@redhat.com, snitzer@redhat.com, shli@kernel.org, philipp.reisner@linbit.com, lars.ellenberg@linbit.com Cc: linux-block@vger.kernel.org, linux-scsi@vger.kernel.org, drbd-dev@lists.linbit.com, dm-devel@redhat.com, linux-raid@vger.kernel.org Subject: [PATCH 12/27] block: add a new BLKDEV_ZERO_NOFALLBACK flag Date: Wed, 5 Apr 2017 19:21:10 +0200 [thread overview] Message-ID: <20170405172125.22600-13-hch@lst.de> (raw) In-Reply-To: <20170405172125.22600-1-hch@lst.de> This avoids fallbacks to explicit zeroing in (__)blkdev_issue_zeroout if the caller doesn't want them. Also clean up the convoluted check for the return condition that this new flag is added to. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com> Reviewed-by: Hannes Reinecke <hare@suse.com> --- block/blk-lib.c | 5 ++++- include/linux/blkdev.h | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/block/blk-lib.c b/block/blk-lib.c index 2f6d2cb2e1a2..2f882e22890b 100644 --- a/block/blk-lib.c +++ b/block/blk-lib.c @@ -281,6 +281,9 @@ static int __blkdev_issue_write_zeroes(struct block_device *bdev, * * If a device is using logical block provisioning, the underlying space will * not be released if %flags contains BLKDEV_ZERO_NOUNMAP. + * + * If %flags contains BLKDEV_ZERO_NOFALLBACK, the function will return + * -EOPNOTSUPP if no explicit hardware offload for zeroing is provided. */ int __blkdev_issue_zeroout(struct block_device *bdev, sector_t sector, sector_t nr_sects, gfp_t gfp_mask, struct bio **biop, @@ -298,7 +301,7 @@ int __blkdev_issue_zeroout(struct block_device *bdev, sector_t sector, ret = __blkdev_issue_write_zeroes(bdev, sector, nr_sects, gfp_mask, biop, flags); - if (ret == 0 || (ret && ret != -EOPNOTSUPP)) + if (ret != -EOPNOTSUPP || (flags & BLKDEV_ZERO_NOFALLBACK)) goto out; ret = 0; diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index e7513ce3dbde..a5055d760661 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -1351,6 +1351,7 @@ extern int __blkdev_issue_discard(struct block_device *bdev, sector_t sector, struct bio **biop); #define BLKDEV_ZERO_NOUNMAP (1 << 0) /* do not free blocks */ +#define BLKDEV_ZERO_NOFALLBACK (1 << 1) /* don't write explicit zeroes */ extern int __blkdev_issue_zeroout(struct block_device *bdev, sector_t sector, sector_t nr_sects, gfp_t gfp_mask, struct bio **biop, -- 2.11.0
next prev parent reply other threads:[~2017-04-05 17:21 UTC|newest] Thread overview: 92+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-04-05 17:20 always use REQ_OP_WRITE_ZEROES for zeroing offload V2 Christoph Hellwig 2017-04-05 17:20 ` Christoph Hellwig 2017-04-05 17:20 ` [PATCH 01/27] sd: split sd_setup_discard_cmnd Christoph Hellwig 2017-04-05 17:20 ` Christoph Hellwig 2017-04-05 17:21 ` [PATCH 02/27] block: renumber REQ_OP_WRITE_ZEROES Christoph Hellwig 2017-04-05 17:21 ` Christoph Hellwig 2017-04-05 17:21 ` [PATCH 03/27] block: implement splitting of REQ_OP_WRITE_ZEROES bios Christoph Hellwig 2017-04-05 17:21 ` Christoph Hellwig 2017-04-05 17:21 ` [PATCH 04/27] sd: implement REQ_OP_WRITE_ZEROES Christoph Hellwig 2017-04-05 17:21 ` Christoph Hellwig 2017-04-05 17:21 ` [PATCH 05/27] md: support REQ_OP_WRITE_ZEROES Christoph Hellwig 2017-04-05 17:21 ` Christoph Hellwig 2017-04-05 17:21 ` [PATCH 06/27] dm io: discards don't take a payload Christoph Hellwig 2017-04-05 17:21 ` Christoph Hellwig 2017-04-05 17:21 ` [PATCH 07/27] dm: support REQ_OP_WRITE_ZEROES Christoph Hellwig 2017-04-05 17:21 ` Christoph Hellwig 2017-04-05 17:21 ` [PATCH 08/27] dm kcopyd: switch to use REQ_OP_WRITE_ZEROES Christoph Hellwig 2017-04-05 17:21 ` Christoph Hellwig 2017-04-05 17:21 ` [PATCH 09/27] block: stop using blkdev_issue_write_same for zeroing Christoph Hellwig 2017-04-05 17:21 ` Christoph Hellwig 2017-04-05 17:21 ` [PATCH 10/27] block: add a flags argument to (__)blkdev_issue_zeroout Christoph Hellwig 2017-04-05 17:21 ` Christoph Hellwig 2017-04-05 17:21 ` [PATCH 11/27] block: add a REQ_NOUNMAP flag for REQ_OP_WRITE_ZEROES Christoph Hellwig 2017-04-05 17:21 ` Christoph Hellwig 2017-04-05 17:21 ` Christoph Hellwig [this message] 2017-04-05 17:21 ` [PATCH 12/27] block: add a new BLKDEV_ZERO_NOFALLBACK flag Christoph Hellwig 2017-04-05 17:21 ` [PATCH 13/27] block_dev: use blkdev_issue_zerout for hole punches Christoph Hellwig 2017-04-05 17:21 ` Christoph Hellwig 2017-04-05 17:21 ` [PATCH 14/27] sd: implement unmapping Write Zeroes Christoph Hellwig 2017-04-05 17:21 ` Christoph Hellwig 2017-04-05 17:21 ` [PATCH 15/27] nvme: implement REQ_OP_WRITE_ZEROES Christoph Hellwig 2017-04-05 17:21 ` Christoph Hellwig 2017-04-05 17:21 ` [PATCH 16/27] zram: " Christoph Hellwig 2017-04-05 17:21 ` Christoph Hellwig 2017-04-05 17:21 ` [PATCH 17/27] loop: " Christoph Hellwig 2017-04-05 17:21 ` Christoph Hellwig 2017-04-05 17:21 ` [PATCH 18/27] brd: remove discard support Christoph Hellwig 2017-04-05 17:21 ` Christoph Hellwig 2017-04-05 17:21 ` [PATCH 19/27] rbd: remove the discard_zeroes_data flag Christoph Hellwig 2017-04-05 17:21 ` Christoph Hellwig 2017-04-05 17:21 ` [PATCH 20/27] rsxx: " Christoph Hellwig 2017-04-05 17:21 ` Christoph Hellwig 2017-04-05 17:21 ` [PATCH 21/27] mmc: " Christoph Hellwig 2017-04-05 17:21 ` Christoph Hellwig 2017-04-05 17:21 ` [PATCH 22/27] block: stop using discards for zeroing Christoph Hellwig 2017-04-05 17:21 ` Christoph Hellwig 2017-04-05 17:21 ` [PATCH 23/27] drbd: make intelligent use of blkdev_issue_zeroout Christoph Hellwig 2017-04-05 17:21 ` Christoph Hellwig 2018-01-13 0:46 ` [Drbd-dev] " Eric Wheeler 2018-01-15 12:46 ` Lars Ellenberg 2018-01-15 12:46 ` Lars Ellenberg [not found] ` <20180115124635.GA4107-w1SgEEioFePxa46PmUWvFg@public.gmane.org> 2018-01-15 15:07 ` Mike Snitzer 2018-01-15 15:07 ` Mike Snitzer 2018-01-16 8:55 ` [Drbd-dev] " Lars Ellenberg 2017-04-05 17:21 ` [PATCH 24/27] drbd: implement REQ_OP_WRITE_ZEROES Christoph Hellwig 2017-04-05 17:21 ` Christoph Hellwig 2017-04-05 17:21 ` [PATCH 25/27] block: remove the discard_zeroes_data flag Christoph Hellwig 2017-05-01 20:45 ` Bart Van Assche 2017-05-01 20:45 ` Bart Van Assche [not found] ` <1493671519.2665.15.camel-XdAiOPVOjttBDgjK7y7TUQ@public.gmane.org> 2017-05-02 6:43 ` Nicholas A. Bellinger 2017-05-02 6:43 ` Nicholas A. Bellinger [not found] ` <1493707425.23202.77.camel-XoQW25Eq2zviZyQQd+hFbcojREIfoBdhmpATvIKMPHk@public.gmane.org> 2017-05-02 7:16 ` Nicholas A. Bellinger 2017-05-02 7:16 ` Nicholas A. Bellinger [not found] ` <1493709373.23202.79.camel-XoQW25Eq2zviZyQQd+hFbcojREIfoBdhmpATvIKMPHk@public.gmane.org> 2017-05-02 7:23 ` hch-jcswGhMUV9g 2017-05-02 7:23 ` hch 2017-05-03 3:33 ` Nicholas A. Bellinger 2017-05-03 3:33 ` Nicholas A. Bellinger 2017-05-03 14:33 ` Mike Snitzer 2017-05-05 3:10 ` Nicholas A. Bellinger 2017-05-05 3:10 ` Nicholas A. Bellinger [not found] ` <1493782395.23202.84.camel-XoQW25Eq2zviZyQQd+hFbcojREIfoBdhmpATvIKMPHk@public.gmane.org> 2017-05-07 9:22 ` hch-jcswGhMUV9g 2017-05-07 9:22 ` hch [not found] ` <20170507092209.GA27370-jcswGhMUV9g@public.gmane.org> 2017-05-09 6:46 ` Nicholas A. Bellinger 2017-05-09 6:46 ` Nicholas A. Bellinger 2017-05-10 14:06 ` hch [not found] ` <20170510140627.GA23759-jcswGhMUV9g@public.gmane.org> 2017-05-11 4:50 ` Nicholas A. Bellinger 2017-05-11 4:50 ` Nicholas A. Bellinger [not found] ` <1494478235.16894.115.camel-XoQW25Eq2zviZyQQd+hFbcojREIfoBdhmpATvIKMPHk@public.gmane.org> 2017-05-11 6:26 ` hch-jcswGhMUV9g 2017-05-11 6:26 ` hch [not found] ` <20170511062630.GA18517-jcswGhMUV9g@public.gmane.org> 2017-05-11 6:36 ` Nicholas A. Bellinger 2017-05-11 6:36 ` Nicholas A. Bellinger 2017-04-05 17:21 ` [PATCH 26/27] scsi: sd: Separate zeroout and discard command choices Christoph Hellwig 2017-04-06 6:17 ` Hannes Reinecke 2017-04-06 6:17 ` Hannes Reinecke 2017-04-19 14:56 ` Paolo Bonzini [not found] ` <58c3d6a6-924e-cc86-1907-a9fd02a39c0e-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> 2017-04-20 1:34 ` Martin K. Petersen 2017-04-20 1:34 ` Martin K. Petersen 2017-04-05 17:21 ` [PATCH 27/27] scsi: sd: Remove LBPRZ dependency for discards Christoph Hellwig 2017-04-06 6:18 ` Hannes Reinecke 2017-04-06 6:18 ` Hannes Reinecke 2017-04-08 17:26 ` always use REQ_OP_WRITE_ZEROES for zeroing offload V2 Jens Axboe -- strict thread matches above, loose matches on Subject: below -- 2017-04-05 14:21 Christoph Hellwig 2017-04-05 14:21 ` [PATCH 12/27] block: add a new BLKDEV_ZERO_NOFALLBACK flag Christoph Hellwig
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=20170405172125.22600-13-hch@lst.de \ --to=hch@lst.de \ --cc=agk@redhat.com \ --cc=axboe@kernel.dk \ --cc=dm-devel@redhat.com \ --cc=drbd-dev@lists.linbit.com \ --cc=lars.ellenberg@linbit.com \ --cc=linux-block@vger.kernel.org \ --cc=linux-raid@vger.kernel.org \ --cc=linux-scsi@vger.kernel.org \ --cc=martin.petersen@oracle.com \ --cc=philipp.reisner@linbit.com \ --cc=shli@kernel.org \ --cc=snitzer@redhat.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: linkBe 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.