On 9/10/24 15:17, Christoph Hellwig wrote:
On Tue, Sep 10, 2024 at 11:58:23AM +0100, Pavel Begunkov wrote:
+
+ err = filemap_invalidate_pages(bdev->bd_mapping, start,
+ start + len - 1, nowait);
+ if (err)
+ return err;
+
+ while ((bio = blk_alloc_discard_bio(bdev, §or, &nr_sects, gfp))) {
+ if (nowait)
+ bio->bi_opf |= REQ_NOWAIT;
+ prev = bio_chain_and_submit(prev, bio);
+ }
+ if (!prev)
+ return -EAGAIN;
If a user changes the max_discard value between the check above and
the loop here this is racy.
If the driver randomly changes it, it's racy either way. What do
you want to protect against?
The discard limit shrinking and now this successfully returning while
not actually discarding the range. The fix is pretty simple in that
If it's shrinking then bios initialised and submitted with that
initial larger limit should fail, e.g. by the disk or driver, which
would be caught by bio_cmd_bio_end_io(). If nobody fails bios, then
nothing ever will help here, you can always first queue up bios
and change the limit afterwards while they're still in flight.
the nowait case should simply break out of the loop after the first bio.
while ((bio = blk_alloc_discard_bio(bdev, §or, &nr_sects, gfp))) {
if (nowait)
bio->bi_opf |= REQ_NOWAIT;
prev = bio_chain_and_submit(prev, bio);
if (nowait)
break;
}
Like this? I need to add nr_sects==0 post loop checking either way,
but I don't see how this break would be better any better than
bio_put before the submit from v2.
+sector_t bio_discard_limit(struct block_device *bdev, sector_t sector);
And to be honest, I'd really prefer to not have bio_discard_limit
exposed. Certainly not outside a header private to block/.
Which is the other reason why first versions were putting down
a bio seeing that there is more to be done for nowait, which
you didn't like. I can return back to it or narrow the scopre.
The above should also take care of that.
Also why start at 137? A comment
would generally be pretty useful as well.
There is a comment, 2 lines above the new define.
/*
* A jump here: 130-136 are reserved for zoned block devices
* (see uapi/linux/blkzoned.h)
*/
Is that your concern?
But those are ioctls, this is not an ioctl and uses a different
number space. Take a look at e.g. nvme uring cmds which also
don't try to use the same number space as the ioctl.
As far as I see nvme cmds are just dropped onto the 0x80- range. Not
continuing ioctls, right, but nevertheless random and undocumented. And
if we're arguing that IOC helps preventing people issuing ioctls to a
wrong file type, we can easily extend it to "what if someone passes BLK*
ioctl number to io_uring or vise versa? Not to mention that most of the
IOC selling points have zero sense for io_uring like struct size and
struct copy direction.
Also can we have a include/uapi/linux/blkdev.h for this instead of
bloating fs.h that gets included just about everywhere?
I don't think it belongs to this series.
How would adding a proper header instead of bloating fs.h not be
part of the series adding the first ever block layer uring_cmds?
Because, apparently, no one have ever gave a damn about it.
I'll add it for you, but with header probing instead of a simple
ifdef I'd call it a usability downgrade.
Just in case I wasn't clear - this isn't asking you to move anything
existing as we can't do that without breaking existing applications.
We can, by including blkdev.h into fs.h, but that's a different
kind of a structure.
It is about adding the new command to the proper place.
--
Pavel Begunkov
