From patchwork Thu Mar 7 15:11:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 13585847 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E24A112D754; Thu, 7 Mar 2024 15:12:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.137.202.133 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709824324; cv=none; b=NwwSuud8lDHD1HGfnB5gB3PVJhaQ6qX3peJKyfvCcZMRyeTaVxsQQ8vyBDA86m9rDnxb7jxTnJaqiYLURPKWLsNPozX93DA9gQWlkr9Zn2qiVnNKp93u9eSsa+arZX6Ho2yy5EBkn94blrnHSVVOxgMCFOKp9A6ceqKyjswvK2Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709824324; c=relaxed/simple; bh=5j/8sbbwmsIGUTaid4wZisGmjeOMxRtrzYUrsaK1Cck=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=VUaE9w92i4B/OYOmQXoOi8HZt19cJK6xRZczeILGsuX/dsozHK+hz3h/L4kj9x2SEUREuX0/G2v75e+RvfJ1Md6S8yfUyZYRd2w8saEQnG3XniXe7ydeScqQpedVNOOGUjzO5Ho7Js5wqIZvk5EXbkdLdKtHvD6dYd+1tEEJ9FE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de; spf=none smtp.mailfrom=bombadil.srs.infradead.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b=MRMaDje1; arc=none smtp.client-ip=198.137.202.133 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=bombadil.srs.infradead.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="MRMaDje1" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=4jdyG4CszBpyuc/2KWIWtUkGflIk46hmyZR40KPZHew=; b=MRMaDje10vfg8i3wtj6CHQshJx o+Bp0JaEP98NWOM0uRA5zUnllPbjVkMpZse+6r4sNljem35UrJhDf9/TGNlwSZu97fsZ6WTe1sQwP CXx+fdx2ZHHWfMroopIBE4FWPWzqBkeqIR5KFOrBGA5LJFbFxucOtZzgkc3N1YRMn5Lj38qERG48g z02qg70FUPdPVLWL00jAL0s/S9pXJ0xJYDq2CDdmz5K09n04GtXew8Xogb8ajS8bxA0pT4uTyaEnk OIcsKCS9CJcT/hJiBzhjfEAV0x0lcPqrjsQc7znZDoWo7x7SdupFIV6eVo1cberFrWQ0pEHuwYMhO C5qoAnkA==; Received: from [66.60.99.14] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.97.1 #2 (Red Hat Linux)) id 1riFPe-00000005D7a-0Pty; Thu, 07 Mar 2024 15:12:02 +0000 From: Christoph Hellwig To: Jens Axboe , Chandan Babu R , Keith Busch Cc: linux-block@vger.kernel.org, linux-nvme@lists.infradead.org, linux-xfs@vger.kernel.org Subject: [PATCH 02/10] block: move discard checks into the ioctl handler Date: Thu, 7 Mar 2024 08:11:49 -0700 Message-Id: <20240307151157.466013-3-hch@lst.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240307151157.466013-1-hch@lst.de> References: <20240307151157.466013-1-hch@lst.de> Precedence: bulk X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Most bio operations get basic sanity checking in submit_bio and anything more complicated than that is done in the callers. Discards are a bit different from that in that a lot of checking is done in __blkdev_issue_discard, and the specific errnos for that are returned to userspace. Move the checks that require specific errnos to the ioctl handler instead, and just leave the basic sanity checking in submit_bio for the other handlers. This introduces two changes in behavior: 1) the logical block size alignment check of the start and len is lost for non-ioctl callers. This matches what is done for other operations including reads and writes. We should probably verify this for all bios, but for now make discards match the normal flow. 2) for non-ioctl callers all errors are reported on I/O completion now instead of synchronously. Callers in general mostly ignore or log errors so this will actually simplify the code once cleaned up Signed-off-by: Christoph Hellwig --- block/blk-lib.c | 13 ------------- block/ioctl.c | 13 +++++++++---- 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/block/blk-lib.c b/block/blk-lib.c index f873eb9a886f63..50923508a32466 100644 --- a/block/blk-lib.c +++ b/block/blk-lib.c @@ -59,19 +59,6 @@ int __blkdev_issue_discard(struct block_device *bdev, sector_t sector, sector_t nr_sects, gfp_t gfp_mask, struct bio **biop) { struct bio *bio = *biop; - sector_t bs_mask; - - if (bdev_read_only(bdev)) - return -EPERM; - if (!bdev_max_discard_sectors(bdev)) - return -EOPNOTSUPP; - - bs_mask = (bdev_logical_block_size(bdev) >> 9) - 1; - if ((sector | nr_sects) & bs_mask) - return -EINVAL; - - if (!nr_sects) - return -EINVAL; while (nr_sects) { sector_t req_sects = diff --git a/block/ioctl.c b/block/ioctl.c index de0cc0d215c633..1d5de0a890c5e8 100644 --- a/block/ioctl.c +++ b/block/ioctl.c @@ -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;