From: "Darrick J. Wong" <darrick.wong@oracle.com> To: axboe@kernel.dk, darrick.wong@oracle.com Cc: linux-block@vger.kernel.org, tytso@mit.edu, martin.petersen@oracle.com, snitzer@redhat.com, linux-api@vger.kernel.org, bfoster@redhat.com, xfs@oss.sgi.com, hch@infradead.org, dm-devel@redhat.com, linux-fsdevel@vger.kernel.org, Christoph Hellwig <hch@lst.de> Subject: [PATCH 1/3] block: invalidate the page cache when issuing BLKZEROOUT. Date: Thu, 16 Jun 2016 18:17:34 -0700 [thread overview] Message-ID: <146612625412.12764.6647932282740152837.stgit@birch.djwong.org> (raw) In-Reply-To: <146612624734.12764.4316680863289411106.stgit@birch.djwong.org> Invalidate the page cache (as a regular O_DIRECT write would do) to avoid returning stale cache contents at a later time. v5: Refactor the 4.4 refactoring of the ioctl code into separate functions. Split the page invalidation and the new ioctl into separate patches. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Reviewed-by: Christoph Hellwig <hch@lst.de> --- block/ioctl.c | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/block/ioctl.c b/block/ioctl.c index ed2397f..d001f52 100644 --- a/block/ioctl.c +++ b/block/ioctl.c @@ -225,7 +225,9 @@ static int blk_ioctl_zeroout(struct block_device *bdev, fmode_t mode, unsigned long arg) { uint64_t range[2]; - uint64_t start, len; + struct address_space *mapping; + uint64_t start, end, len; + int ret; if (!(mode & FMODE_WRITE)) return -EBADF; @@ -235,18 +237,33 @@ static int blk_ioctl_zeroout(struct block_device *bdev, fmode_t mode, start = range[0]; len = range[1]; + end = start + len - 1; if (start & 511) return -EINVAL; if (len & 511) return -EINVAL; - start >>= 9; - len >>= 9; - - if (start + len > (i_size_read(bdev->bd_inode) >> 9)) + if (end >= (uint64_t)i_size_read(bdev->bd_inode)) + return -EINVAL; + if (end < start) return -EINVAL; - return blkdev_issue_zeroout(bdev, start, len, GFP_KERNEL, false); + /* Invalidate the page cache, including dirty pages */ + mapping = bdev->bd_inode->i_mapping; + truncate_inode_pages_range(mapping, start, end); + + ret = blkdev_issue_zeroout(bdev, start >> 9, len >> 9, GFP_KERNEL, + false); + if (ret) + return ret; + + /* + * Invalidate again; if someone wandered in and dirtied a page, + * the caller will be given -EBUSY. + */ + return invalidate_inode_pages2_range(mapping, + start >> PAGE_SHIFT, + end >> PAGE_SHIFT); } static int put_ushort(unsigned long arg, unsigned short val)
WARNING: multiple messages have this Message-ID (diff)
From: "Darrick J. Wong" <darrick.wong@oracle.com> To: axboe@kernel.dk, darrick.wong@oracle.com Cc: hch@infradead.org, tytso@mit.edu, martin.petersen@oracle.com, snitzer@redhat.com, linux-api@vger.kernel.org, bfoster@redhat.com, xfs@oss.sgi.com, linux-block@vger.kernel.org, dm-devel@redhat.com, linux-fsdevel@vger.kernel.org, Christoph Hellwig <hch@lst.de> Subject: [PATCH 1/3] block: invalidate the page cache when issuing BLKZEROOUT. Date: Thu, 16 Jun 2016 18:17:34 -0700 [thread overview] Message-ID: <146612625412.12764.6647932282740152837.stgit@birch.djwong.org> (raw) In-Reply-To: <146612624734.12764.4316680863289411106.stgit@birch.djwong.org> Invalidate the page cache (as a regular O_DIRECT write would do) to avoid returning stale cache contents at a later time. v5: Refactor the 4.4 refactoring of the ioctl code into separate functions. Split the page invalidation and the new ioctl into separate patches. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Reviewed-by: Christoph Hellwig <hch@lst.de> --- block/ioctl.c | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/block/ioctl.c b/block/ioctl.c index ed2397f..d001f52 100644 --- a/block/ioctl.c +++ b/block/ioctl.c @@ -225,7 +225,9 @@ static int blk_ioctl_zeroout(struct block_device *bdev, fmode_t mode, unsigned long arg) { uint64_t range[2]; - uint64_t start, len; + struct address_space *mapping; + uint64_t start, end, len; + int ret; if (!(mode & FMODE_WRITE)) return -EBADF; @@ -235,18 +237,33 @@ static int blk_ioctl_zeroout(struct block_device *bdev, fmode_t mode, start = range[0]; len = range[1]; + end = start + len - 1; if (start & 511) return -EINVAL; if (len & 511) return -EINVAL; - start >>= 9; - len >>= 9; - - if (start + len > (i_size_read(bdev->bd_inode) >> 9)) + if (end >= (uint64_t)i_size_read(bdev->bd_inode)) + return -EINVAL; + if (end < start) return -EINVAL; - return blkdev_issue_zeroout(bdev, start, len, GFP_KERNEL, false); + /* Invalidate the page cache, including dirty pages */ + mapping = bdev->bd_inode->i_mapping; + truncate_inode_pages_range(mapping, start, end); + + ret = blkdev_issue_zeroout(bdev, start >> 9, len >> 9, GFP_KERNEL, + false); + if (ret) + return ret; + + /* + * Invalidate again; if someone wandered in and dirtied a page, + * the caller will be given -EBUSY. + */ + return invalidate_inode_pages2_range(mapping, + start >> PAGE_SHIFT, + end >> PAGE_SHIFT); } static int put_ushort(unsigned long arg, unsigned short val) _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs
next prev parent reply other threads:[~2016-06-17 1:17 UTC|newest] Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-06-17 1:17 [PATCH v9 0/3] fallocate for block devices Darrick J. Wong 2016-06-17 1:17 ` Darrick J. Wong 2016-06-17 1:17 ` Darrick J. Wong 2016-06-17 1:17 ` Darrick J. Wong [this message] 2016-06-17 1:17 ` [PATCH 1/3] block: invalidate the page cache when issuing BLKZEROOUT Darrick J. Wong 2016-06-20 12:35 ` Bart Van Assche 2016-06-20 12:35 ` Bart Van Assche 2016-06-28 19:13 ` Darrick J. Wong 2016-06-28 19:13 ` Darrick J. Wong 2016-06-28 19:13 ` Darrick J. Wong 2016-06-29 4:57 ` Martin K. Petersen 2016-06-29 4:57 ` Martin K. Petersen 2016-06-17 1:17 ` [PATCH 2/3] block: require write_same and discard requests align to logical block size Darrick J. Wong 2016-06-17 1:17 ` Darrick J. Wong 2016-06-17 1:17 ` Darrick J. Wong 2016-06-20 12:37 ` Bart Van Assche 2016-06-20 12:37 ` Bart Van Assche 2016-06-29 4:58 ` Martin K. Petersen 2016-06-29 4:58 ` Martin K. Petersen 2016-06-17 1:17 ` [PATCH 3/3] block: implement (some of) fallocate for block devices Darrick J. Wong 2016-06-17 1:17 ` Darrick J. Wong 2016-06-17 1:17 ` Darrick J. Wong -- strict thread matches above, loose matches on Subject: below -- 2016-09-29 21:16 [PATCH v11 0/3] " Darrick J. Wong 2016-09-29 21:16 ` [PATCH 1/3] block: invalidate the page cache when issuing BLKZEROOUT Darrick J. Wong 2016-09-29 21:16 ` Darrick J. Wong 2016-09-29 0:39 [PATCH v10 0/3] fallocate for block devices Darrick J. Wong 2016-09-29 0:39 ` [PATCH 1/3] block: invalidate the page cache when issuing BLKZEROOUT Darrick J. Wong 2016-09-29 0:39 ` Darrick J. Wong 2016-09-29 0:39 ` Darrick J. Wong 2016-09-29 1:16 ` Bart Van Assche 2016-09-29 1:16 ` Bart Van Assche 2016-09-29 5:56 ` Hannes Reinecke 2016-09-29 5:56 ` Hannes Reinecke 2016-08-26 0:02 [PATCH v10 0/3] fallocate for block devices Darrick J. Wong 2016-08-26 0:02 ` [PATCH 1/3] block: invalidate the page cache when issuing BLKZEROOUT Darrick J. Wong 2016-08-26 0:02 ` Darrick J. Wong 2016-04-13 4:01 [RFC DONOTMERGE v8 0/3] fallocate for block devices Darrick J. Wong 2016-04-13 4:01 ` [PATCH 1/3] block: invalidate the page cache when issuing BLKZEROOUT Darrick J. Wong 2016-04-13 4:01 ` Darrick J. Wong 2016-04-13 4:01 ` Darrick J. Wong 2016-03-15 19:42 [PATCH v7 0/3] fallocate for block devices to provide zero-out Darrick J. Wong 2016-03-15 19:42 ` [PATCH 1/3] block: invalidate the page cache when issuing BLKZEROOUT Darrick J. Wong 2016-03-15 19:42 ` Darrick J. Wong 2016-03-05 0:55 [PATCH v6 0/3] fallocate for block devices to provide zero-out Darrick J. Wong 2016-03-05 0:56 ` [PATCH 1/3] block: invalidate the page cache when issuing BLKZEROOUT Darrick J. Wong 2016-03-05 0:56 ` Darrick J. Wong 2016-03-15 7:35 ` Christoph Hellwig 2016-03-15 7:35 ` 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=146612625412.12764.6647932282740152837.stgit@birch.djwong.org \ --to=darrick.wong@oracle.com \ --cc=axboe@kernel.dk \ --cc=bfoster@redhat.com \ --cc=dm-devel@redhat.com \ --cc=hch@infradead.org \ --cc=hch@lst.de \ --cc=linux-api@vger.kernel.org \ --cc=linux-block@vger.kernel.org \ --cc=linux-fsdevel@vger.kernel.org \ --cc=martin.petersen@oracle.com \ --cc=snitzer@redhat.com \ --cc=tytso@mit.edu \ --cc=xfs@oss.sgi.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.