public inbox for [email protected]
 help / color / mirror / Atom feed
From: Pavel Begunkov <[email protected]>
To: [email protected]
Cc: Jens Axboe <[email protected]>,
	[email protected], [email protected],
	[email protected], Christoph Hellwig <[email protected]>
Subject: [PATCH v5 4/8] block: introduce blk_validate_byte_range()
Date: Wed, 11 Sep 2024 17:34:40 +0100	[thread overview]
Message-ID: <19a7779323c71e742a2f511e4cf49efcfd68cfd4.1726072086.git.asml.silence@gmail.com> (raw)
In-Reply-To: <[email protected]>

In preparation to further changes extract a helper function out of
blk_ioctl_discard() that validates if we can do IO against the given
range of disk byte addresses.

Signed-off-by: Pavel Begunkov <[email protected]>
---
 block/ioctl.c | 49 +++++++++++++++++++++++++++++++------------------
 1 file changed, 31 insertions(+), 18 deletions(-)

diff --git a/block/ioctl.c b/block/ioctl.c
index e8e4a4190f18..6d663d6ae036 100644
--- a/block/ioctl.c
+++ b/block/ioctl.c
@@ -92,38 +92,51 @@ static int compat_blkpg_ioctl(struct block_device *bdev,
 }
 #endif
 
+/*
+ * Check that [start, start + len) is a valid range from the block device's
+ * perspective, including verifying that it can be correctly translated into
+ * logical block addresses.
+ */
+static int blk_validate_byte_range(struct block_device *bdev,
+				   uint64_t start, uint64_t len)
+{
+	unsigned int bs_mask = bdev_logical_block_size(bdev) - 1;
+	uint64_t end;
+
+	if ((start | len) & bs_mask)
+		return -EINVAL;
+	if (!len)
+		return -EINVAL;
+	if (check_add_overflow(start, len, &end) || end > bdev_nr_bytes(bdev))
+		return -EINVAL;
+
+	return 0;
+}
+
 static int blk_ioctl_discard(struct block_device *bdev, blk_mode_t mode,
 		unsigned long arg)
 {
-	unsigned int bs_mask = bdev_logical_block_size(bdev) - 1;
-	uint64_t range[2], start, len, end;
+	uint64_t range[2], start, len;
 	struct bio *prev = NULL, *bio;
 	sector_t sector, nr_sects;
 	struct blk_plug plug;
 	int err;
 
-	if (!(mode & BLK_OPEN_WRITE))
-		return -EBADF;
-
-	if (!bdev_max_discard_sectors(bdev))
-		return -EOPNOTSUPP;
-	if (bdev_read_only(bdev))
-		return -EPERM;
-
 	if (copy_from_user(range, (void __user *)arg, sizeof(range)))
 		return -EFAULT;
-
 	start = range[0];
 	len = range[1];
 
-	if (!len)
-		return -EINVAL;
-	if ((start | len) & bs_mask)
-		return -EINVAL;
+	if (!bdev_max_discard_sectors(bdev))
+		return -EOPNOTSUPP;
 
-	if (check_add_overflow(start, len, &end) ||
-	    end > bdev_nr_bytes(bdev))
-		return -EINVAL;
+	if (!(mode & BLK_OPEN_WRITE))
+		return -EBADF;
+	if (bdev_read_only(bdev))
+		return -EPERM;
+	err = blk_validate_byte_range(bdev, start, len);
+	if (err)
+		return err;
 
 	filemap_invalidate_lock(bdev->bd_mapping);
 	err = truncate_bdev_range(bdev, mode, start, start + len - 1);
-- 
2.45.2


  parent reply	other threads:[~2024-09-11 16:34 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-09-11 16:34 [PATCH v5 0/8] implement async block discards and other ops via io_uring Pavel Begunkov
2024-09-11 16:34 ` [PATCH v5 1/8] io_uring/cmd: expose iowq to cmds Pavel Begunkov
2024-09-11 16:34 ` [PATCH v5 2/8] io_uring/cmd: give inline space in request " Pavel Begunkov
2024-09-11 16:34 ` [PATCH v5 3/8] filemap: introduce filemap_invalidate_pages Pavel Begunkov
2024-09-11 16:34 ` Pavel Begunkov [this message]
2024-09-12  9:29   ` [PATCH v5 4/8] block: introduce blk_validate_byte_range() Christoph Hellwig
2024-09-11 16:34 ` [PATCH v5 5/8] block: implement async io_uring discard cmd Pavel Begunkov
2024-09-12  9:31   ` Christoph Hellwig
2024-09-12 16:19     ` Pavel Begunkov
2024-09-11 16:34 ` [PATCH v5 6/8] block: implement write zeroes io_uring cmd Pavel Begunkov
2024-09-12  9:32   ` Christoph Hellwig
2024-09-12 16:25     ` Pavel Begunkov
2024-09-12 16:32       ` Jens Axboe
2024-09-12 16:53         ` Pavel Begunkov
2024-09-12 16:59           ` Jens Axboe
2024-09-13  7:45         ` Christoph Hellwig
2024-09-11 16:34 ` [PATCH v5 7/8] block: add nowait flag for __blkdev_issue_zero_pages Pavel Begunkov
2024-09-11 16:34 ` [PATCH v5 8/8] block: implement write zero pages cmd Pavel Begunkov
2024-09-11 20:56 ` [PATCH v5 0/8] implement async block discards and other ops via io_uring 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=19a7779323c71e742a2f511e4cf49efcfd68cfd4.1726072086.git.asml.silence@gmail.com \
    [email protected] \
    [email protected] \
    [email protected] \
    [email protected] \
    [email protected] \
    [email protected] \
    /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