From: Keith Busch <kbusch@kernel.org>
To: Christoph Hellwig <hch@lst.de>
Cc: Jens Axboe <axboe@kernel.dk>,
Chandan Babu R <chandanbabu@kernel.org>,
linux-block@vger.kernel.org, linux-nvme@lists.infradead.org,
linux-xfs@vger.kernel.org
Subject: Re: [PATCH 1/5] block: move discard checks into the ioctl handler
Date: Wed, 13 Mar 2024 09:40:21 -0600 [thread overview]
Message-ID: <ZfHI5Vr7BOU6__rv@kbusch-mbp> (raw)
In-Reply-To: <20240312144532.1044427-2-hch@lst.de>
On Tue, Mar 12, 2024 at 08:45:27AM -0600, Christoph Hellwig wrote:
> @@ -95,6 +95,8 @@ static int compat_blkpg_ioctl(struct block_device *bdev,
> static int blk_ioctl_discard(struct block_device *bdev, blk_mode_t mode,
> unsigned long arg)
> {
> + sector_t bs_mask = (bdev_logical_block_size(bdev) >> SECTOR_SHIFT) - 1;
> + sector_t sector, nr_sects;
> uint64_t range[2];
> uint64_t start, len;
> struct inode *inode = bdev->bd_inode;
> @@ -105,18 +107,21 @@ static int blk_ioctl_discard(struct block_device *bdev, blk_mode_t mode,
>
> 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];
> + sector = start >> SECTOR_SHIFT;
> + nr_sects = len >> SECTOR_SHIFT;
>
> - if (start & 511)
> + if (!nr_sects)
> return -EINVAL;
> - if (len & 511)
> + if ((sector | nr_sects) & bs_mask)
> return -EINVAL;
> -
> if (start + len > bdev_nr_bytes(bdev))
> return -EINVAL;
>
> @@ -124,7 +129,7 @@ static int blk_ioctl_discard(struct block_device *bdev, blk_mode_t mode,
> err = truncate_bdev_range(bdev, mode, start, start + len - 1);
> if (err)
> goto fail;
> - err = blkdev_issue_discard(bdev, start >> 9, len >> 9, GFP_KERNEL);
> + err = blkdev_issue_discard(bdev, sector, nr_sects, GFP_KERNEL);
> fail:
> filemap_invalidate_unlock(inode->i_mapping);
> return err;
> --
The incremental change I think you want atop this patch to keep the
previous behavior:
-- >8 --
diff --git b/block/ioctl.c a/block/ioctl.c
index 57c8171fda93c..e14388548ab97 100644
--- b/block/ioctl.c
+++ a/block/ioctl.c
@@ -95,7 +95,7 @@ static int compat_blkpg_ioctl(struct block_device *bdev,
static int blk_ioctl_discard(struct block_device *bdev, blk_mode_t mode,
unsigned long arg)
{
- sector_t bs_mask = (bdev_logical_block_size(bdev) >> SECTOR_SHIFT) - 1;
+ sector_t mask = bdev_logical_block_size(bdev) - 1;
sector_t sector, nr_sects;
uint64_t range[2];
uint64_t start, len;
@@ -120,7 +120,7 @@ static int blk_ioctl_discard(struct block_device *bdev, blk_mode_t mode,
if (!nr_sects)
return -EINVAL;
- if ((sector | nr_sects) & bs_mask)
+ if ((start | len) & mask)
return -EINVAL;
if (start + len > bdev_nr_bytes(bdev))
return -EINVAL;
next prev parent reply other threads:[~2024-03-13 15:40 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-12 14:45 RFCv2: fix fatal signal handling in __blkdev_issue_discard Christoph Hellwig
2024-03-12 14:45 ` [PATCH 1/5] block: move discard checks into the ioctl handler Christoph Hellwig
2024-03-12 22:12 ` Keith Busch
2024-03-12 22:31 ` Christoph Hellwig
2024-03-13 1:22 ` Keith Busch
2024-03-13 15:40 ` Keith Busch [this message]
2024-03-13 20:06 ` Christoph Hellwig
2024-03-13 20:08 ` Jens Axboe
2024-03-12 14:45 ` [PATCH 2/5] block: add a bio_chain_and_submit helper Christoph Hellwig
2024-03-12 14:51 ` Keith Busch
2024-03-12 21:06 ` Christoph Hellwig
2024-03-12 14:45 ` [PATCH 3/5] block: add a blk_alloc_discard_bio helper Christoph Hellwig
2024-03-12 14:48 RFCv2: fix fatal signal handling in __blkdev_issue_discard Christoph Hellwig
2024-03-12 14:48 ` [PATCH 1/5] block: move discard checks into the ioctl handler 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=ZfHI5Vr7BOU6__rv@kbusch-mbp \
--to=kbusch@kernel.org \
--cc=axboe@kernel.dk \
--cc=chandanbabu@kernel.org \
--cc=hch@lst.de \
--cc=linux-block@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=linux-xfs@vger.kernel.org \
/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).