From patchwork Tue Mar 12 14:48:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 13590120 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 0D1E47B3C0; Tue, 12 Mar 2024 14:48:28 +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=1710254910; cv=none; b=KolRkpphvRT04aoB7MlOs4ZKInjzGDczFftfPo8ocRPGJPCoaSmBcAyZYuCRmJrwTcHCn5swGMUHOxy+VDmmRFc60kNBOuEr1O/u+OXNuiFWlFQ/qhv5AoWwHyIJGD2KjBAzTYlk705NPbLXplNrDh5RHPd+vFbIfDeZtgHPkgo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710254910; c=relaxed/simple; bh=Ls2beDqT1fpA9RDS0rEL8fsnufcoewqU2agFzA3pmos=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=TG6Aj68pqjoS/umFc3frVIgRmxRk1LFd2Q0UOWVg9wdfqj5UfvvxBQialBlh/ApKU0lZJ44+f1Ng4HvtHija7Isw9UgCAa34T5bMNaNgbr3iWyM4HpW8IgvzzjbtqUjahhjiDqbZHt0RAIzPa/sSpHzgXKJfruljbjbYpSf95B8= 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=GP7KfXhu; 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="GP7KfXhu" 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=vSsMfJD3f2N5FqYGaSXx227O7Ol0Kb1Bq+IO61l8gLU=; b=GP7KfXhuYu50XSBcjDjHIpU1Wf QTFo5/z9RFdSUpR5o61JEinnHZztIx4Yj7BxaWaaiKmzsWIbyexWAJx5Oi7I9P6EvPa5VyQEgqrIz cisxHw0Zw6LIZLL7vk5dInlS4VxSoV+bAbRHkXwMchCouVm7mUustw1wTrOM7Qpk2cmh+SD5SR6ai 4OhkdkgDnonW7ELUnxmU5DSB3I1GSH/15Mb5KX9z54lzCYvEYU8C5V+5L/8cYSqwWm3oOBICdneE8 BYeun4xbITws2HT/TzkPt3doXY7GFH5Kfm5f7dZv/Ca3Sey4xRasXdVKzs00GowEGXyNYLxVBS364 okZQZWag==; Received: from [50.226.187.238] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.97.1 #2 (Red Hat Linux)) id 1rk3Qa-00000006D6j-0e89; Tue, 12 Mar 2024 14:48:28 +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 1/5] block: move discard checks into the ioctl handler Date: Tue, 12 Mar 2024 08:48:22 -0600 Message-Id: <20240312144826.1045212-2-hch@lst.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240312144826.1045212-1-hch@lst.de> References: <20240312144826.1045212-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 replace the existing kernel sector alignment check with the actual alignment check based on the logical block size. This leaves jut the basic sanity checking in submit_bio for the other submitters of discards and 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 | 20 -------------------- block/ioctl.c | 13 +++++++++---- 2 files changed, 9 insertions(+), 24 deletions(-) diff --git a/block/blk-lib.c b/block/blk-lib.c index dc8e35d0a51d6d..50923508a32466 100644 --- a/block/blk-lib.c +++ b/block/blk-lib.c @@ -59,26 +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; - - /* In case the discard granularity isn't set by buggy device driver */ - if (WARN_ON_ONCE(!bdev_discard_granularity(bdev))) { - pr_err_ratelimited("%pg: Error: discard_granularity is 0.\n", - 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 0c76137adcaaa5..57c8171fda93c5 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; From patchwork Tue Mar 12 14:48:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 13590121 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 9AEDE7B3E2; Tue, 12 Mar 2024 14:48:29 +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=1710254911; cv=none; b=t6fdzH50q83fPcs+ZEk/iu3U8xzls7IcGveZC6LYomirN75Si2uWV5fEhGMRS7RlLDAfLekPc5QLGmYJ0oQDCWln83+GfS+pAoVPXb8gM+7qFAGzAR+1Q56z7g7AZSySG1x14D49Pj8k2v3/jb9+79M+qn03pOMjZ8fkZcE97hM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710254911; c=relaxed/simple; bh=FFZqfCHe8EOWrtjltKtUPNRMjR8dRujOCh/4VjaeESk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=IgK7tK8/6aa37Q4ZY1eid1vxIQrUVNEA4xePl5xnzY59FVGmGzFqU5TZNmH9YwnFk9YHPjZebD3i0V46FSlFHPxacWPJkWAF/XEZaCVOdT/QSnSqS55oFwXcgApX8cOCZgNNjuu0n2fotoDdXJFqaUIz15wuROVAtudxeJGQl1o= 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=VUSpUFUR; 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="VUSpUFUR" 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=VjiNJMj6lv6xSOzWYTzvr2i2M7boMMC6hKAnN+ZZj6M=; b=VUSpUFURSltV0X1volJriQF9H8 U/raCC77HN3UzHiSq63Pi1t7Kf+zm9Nf/kwOV5uZQpXU1foulod7T/dkNgVMrcaVcMrxeEXQSDn2p qO6ALRev224Q5FkIyxEqAZIFf9Azoc8yc5f+Q9aQVE4bddcTvgdQjvAVUnpzwWXMpQyBC5ExnUXWC agDIn4AW/lpmUHrVt4WPgAh/we1z8qGSeG/jWEo2w7t9tEk4wg0jrPuZFP4zHcB9/sv6iWs30vb/i ZnC2M6qrdty1RJXXAPYzjoULG6WpNaDzsJylJYOcgQqLbybgq14b+ZK2Nw2KaikIAPkud6j9YgZoL QxGJ80ow==; Received: from [50.226.187.238] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.97.1 #2 (Red Hat Linux)) id 1rk3Qa-00000006D70-3Udu; Tue, 12 Mar 2024 14:48:28 +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 2/5] block: add a bio_chain_and_submit helper Date: Tue, 12 Mar 2024 08:48:23 -0600 Message-Id: <20240312144826.1045212-3-hch@lst.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240312144826.1045212-1-hch@lst.de> References: <20240312144826.1045212-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 This is basically blk_next_bio just with the bio allocation moved to the caller to allow for more flexible bio handling in the caller. Signed-off-by: Christoph Hellwig --- block/bio.c | 28 ++++++++++++++++++++-------- include/linux/bio.h | 1 + 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/block/bio.c b/block/bio.c index d24420ed1c4c6f..32ff538b29e564 100644 --- a/block/bio.c +++ b/block/bio.c @@ -345,18 +345,30 @@ void bio_chain(struct bio *bio, struct bio *parent) } EXPORT_SYMBOL(bio_chain); -struct bio *blk_next_bio(struct bio *bio, struct block_device *bdev, - unsigned int nr_pages, blk_opf_t opf, gfp_t gfp) +/** + * bio_chain_and_submit - submit a bio after chaining it to another one + * @prev: bio to chain and submit + * @new: bio to chain to + * + * If @prev is non-NULL, chain it to @new and submit it. + * + * Return: @new. + */ +struct bio *bio_chain_and_submit(struct bio *prev, struct bio *new) { - struct bio *new = bio_alloc(bdev, nr_pages, opf, gfp); - - if (bio) { - bio_chain(bio, new); - submit_bio(bio); + if (prev) { + bio_chain(prev, new); + submit_bio(prev); } - return new; } +EXPORT_SYMBOL_GPL(bio_chain_and_submit); + +struct bio *blk_next_bio(struct bio *bio, struct block_device *bdev, + unsigned int nr_pages, blk_opf_t opf, gfp_t gfp) +{ + return bio_chain_and_submit(bio, bio_alloc(bdev, nr_pages, opf, gfp)); +} EXPORT_SYMBOL_GPL(blk_next_bio); static void bio_alloc_rescue(struct work_struct *work) diff --git a/include/linux/bio.h b/include/linux/bio.h index 875d792bffff82..643d61b7cb82f7 100644 --- a/include/linux/bio.h +++ b/include/linux/bio.h @@ -824,5 +824,6 @@ static inline void bio_clear_polled(struct bio *bio) struct bio *blk_next_bio(struct bio *bio, struct block_device *bdev, unsigned int nr_pages, blk_opf_t opf, gfp_t gfp); +struct bio *bio_chain_and_submit(struct bio *prev, struct bio *new); #endif /* __LINUX_BIO_H */ From patchwork Tue Mar 12 14:48:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 13590122 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 D31107B3F5; Tue, 12 Mar 2024 14:48:30 +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=1710254912; cv=none; b=cFc61k5IopPUy2YD5KrZSyin62KSOrieRX6zWj5SHQm+IuWnqLmV6aNYSediLsbZENw5wZmF+GTWGGnWQ+JuYAmAPye1YoQmKqafFRxePnmV17UlEHY7mJrEblIZc6B1c9XY8c6nYJ/OElEOaxldAGCNnFp1u9Gf1toOeiDj5KE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710254912; c=relaxed/simple; bh=/Zv+Ufy9VDvIabahDOh3hEnN/W+K4UKzQDGq9mpwqHI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=aGyoD5gCiadZZ60ZvjYw/2XwaIzOZQeSFi75T1ySflXBxYobxVDxDL1aOFEG/DezBlOSnmcr8aIg/ZZdMdngwvZ4IH5P9Pz8swx0KJSnjMP1x9lvu2mEkabfP7zwcoul1Z08NyQ0oj2Lxr2pACfVDOEQr1I3J23SWRs34nrSlsU= 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=z5fgdPHX; 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="z5fgdPHX" 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=0Naseq0Wthv0thDdBSJ3JbI1Kt4lTFJ0xfpQrsvbeLw=; b=z5fgdPHXJtLzU7Ku1IoPHHBD5h OBQgWZcg9uWGdxOHR5QT3knjTF7kD1zr8+1h92m9fVQsOcuhXK1E/nNy6HKRHfnK+Sn4Eo074lLXe prhHK48T9iBfYQy1vwh0NTwHHH2d5AJSUlqCfG+r/cRvIeRq31txuKbwvQlOH9aN7K9vNmYQpJ50y Z0eZIBGewNUJQ8m3wg7ymEzEWy2OWpoEihaZa4dKueA+makTsCx3YzrowDsoz45jUURCDgauf2vkM ZvxFLT4LEcJWJ2bRBCvJQVrWF2vHOjcVolFIpmFuiiqPXOcj2DISDkJLlRSIBJrD9ctmE0Mm/2r0q LVkqPDjA==; Received: from [50.226.187.238] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.97.1 #2 (Red Hat Linux)) id 1rk3Qb-00000006D7b-2DRa; Tue, 12 Mar 2024 14:48:29 +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 3/5] block: add a blk_alloc_discard_bio helper Date: Tue, 12 Mar 2024 08:48:24 -0600 Message-Id: <20240312144826.1045212-4-hch@lst.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240312144826.1045212-1-hch@lst.de> References: <20240312144826.1045212-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 Factor out a helper from __blkdev_issue_discard that chews off as much as possible from a discard range and allocates a bio for it. Signed-off-by: Christoph Hellwig --- block/blk-lib.c | 58 ++++++++++++++++++++++++++------------------- include/linux/bio.h | 3 +++ 2 files changed, 37 insertions(+), 24 deletions(-) diff --git a/block/blk-lib.c b/block/blk-lib.c index 50923508a32466..fd97f4dd34e7f4 100644 --- a/block/blk-lib.c +++ b/block/blk-lib.c @@ -55,36 +55,46 @@ static void await_bio_chain(struct bio *bio) blk_wait_io(&done); } +struct bio *blk_alloc_discard_bio(struct block_device *bdev, + sector_t *sector, sector_t *nr_sects, gfp_t gfp_mask) +{ + sector_t bio_sects = min(*nr_sects, bio_discard_limit(bdev, *sector)); + struct bio *bio; + + if (WARN_ON_ONCE(!(gfp_mask & __GFP_RECLAIM))) + return NULL; + if (!bio_sects) + return NULL; + + bio = bio_alloc(bdev, 0, REQ_OP_DISCARD, gfp_mask); + bio->bi_iter.bi_sector = *sector; + bio->bi_iter.bi_size = bio_sects << SECTOR_SHIFT; + *sector += bio_sects; + *nr_sects -= bio_sects; + /* + * We can loop for a long time in here if someone does full device + * discards (like mkfs). Be nice and allow us to schedule out to avoid + * softlocking if preempt is disabled. + */ + cond_resched(); + return bio; +} + 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; - - while (nr_sects) { - sector_t req_sects = - min(nr_sects, bio_discard_limit(bdev, sector)); + struct bio *bio; - bio = blk_next_bio(bio, bdev, 0, REQ_OP_DISCARD, gfp_mask); - bio->bi_iter.bi_sector = sector; - bio->bi_iter.bi_size = req_sects << 9; - sector += req_sects; - nr_sects -= req_sects; - - /* - * We can loop for a long time in here, if someone does - * full device discards (like mkfs). Be nice and allow - * us to schedule out to avoid softlocking if preempt - * is disabled. - */ - cond_resched(); - if (fatal_signal_pending(current)) { - await_bio_chain(bio); - return -EINTR; - } + while (!fatal_signal_pending(current)) { + bio = blk_alloc_discard_bio(bdev, §or, &nr_sects, gfp_mask); + if (!bio) + return 0; + *biop = bio_chain_and_submit(*biop, bio); } - *biop = bio; - return 0; + if (*biop) + await_bio_chain(*biop); + return -EINTR; } EXPORT_SYMBOL(__blkdev_issue_discard); diff --git a/include/linux/bio.h b/include/linux/bio.h index 643d61b7cb82f7..74138c815657fd 100644 --- a/include/linux/bio.h +++ b/include/linux/bio.h @@ -826,4 +826,7 @@ struct bio *blk_next_bio(struct bio *bio, struct block_device *bdev, unsigned int nr_pages, blk_opf_t opf, gfp_t gfp); struct bio *bio_chain_and_submit(struct bio *prev, struct bio *new); +struct bio *blk_alloc_discard_bio(struct block_device *bdev, + sector_t *sector, sector_t *nr_sects, gfp_t gfp_mask); + #endif /* __LINUX_BIO_H */ From patchwork Tue Mar 12 14:48:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 13590123 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 7C0B57BAEC; Tue, 12 Mar 2024 14:48:31 +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=1710254912; cv=none; b=CIz2NjoAQnKoPDDexQgBhm5PARc/HjPqq/zyQDI5GQ7rVUL5kkkqM8oiWf2Up0Ls57w3FURRv/Ajw+HDn7whRvEE5/Bx1RZU0iZcnlxhVjJEvFpMpty74Asiu4w0VxuJHa6+jxAOsf/jNsS7klOSE06VFEdAUSuWZqvtKx7R2So= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710254912; c=relaxed/simple; bh=MfrVblUDCrrLmiUNkfH67L683bKvRsnfpprjSZo/TI8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=tkBQnp8AYXN+q69FBv/BbYjFkA3BtvA1Zg4prrhaUpJ6BuNfAdiEzFHjeGnsW0acLz4HzztrZp32Iqu0pPtwIzTuU+qlzZXQPtyVuqhkvnUntiSv3GEbnSoUsUxubivoufcKS3+V+BAr+h5BqxjpnC7dUWr6jmphyR6wlXFo3B0= 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=Arxqcpws; 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="Arxqcpws" 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=hrCyrsnBfOo+yPYfkugdSsWlzoyaaYdrCNbfvGS6+ZU=; b=ArxqcpwshAy8cBVbnng99n/ghN HI4ES8qm24v8uGgkINbchiUmIHLfh5ct1JTFPTh9GiSfShr8WjZkNkPZX9PI/SGh6dSVMAjTtvIhj ZhgWywa21ZGGYh3Xz/ismG0Z8fJ+BUTdP5IqreC3IKSqqfPUHms3my1QsMhdmzeb1b+Wd7cUUTqOR tuD5DjaiTzJKXWN05cqCym2wch7hMRXLcd0XXMu3+5y82iCb5bF5Sci6lKqiAHs2EkekYsnCDyvfw Joh8uHXjdq0b467cOVgV6lLm+4u5CuV5zJN3OlJJcHrL3591AJT5FkkzEXWrLGhqKiYtu0WHhu0Y4 6P3nlpFA==; Received: from [50.226.187.238] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.97.1 #2 (Red Hat Linux)) id 1rk3Qc-00000006D87-2mRe; Tue, 12 Mar 2024 14:48:30 +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 4/5] block: move await_bio_chain to bio.c Date: Tue, 12 Mar 2024 08:48:25 -0600 Message-Id: <20240312144826.1045212-5-hch@lst.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240312144826.1045212-1-hch@lst.de> References: <20240312144826.1045212-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 we'll want to use it from more than blk-lib.c, so this seems like the better place. Also rename it so that the name starts with bio_. Signed-off-by: Christoph Hellwig --- block/bio.c | 20 ++++++++++++++++++++ block/blk-lib.c | 28 ++++------------------------ block/blk.h | 1 + 3 files changed, 25 insertions(+), 24 deletions(-) diff --git a/block/bio.c b/block/bio.c index 32ff538b29e564..33972deed87fb3 100644 --- a/block/bio.c +++ b/block/bio.c @@ -1396,6 +1396,26 @@ int submit_bio_wait(struct bio *bio) } EXPORT_SYMBOL(submit_bio_wait); +static void bio_wait_end_io(struct bio *bio) +{ + complete(bio->bi_private); + bio_put(bio); +} + +/* + * bio_await_chain - ends @bio and waits for every chained bio to complete + */ +void bio_await_chain(struct bio *bio) +{ + DECLARE_COMPLETION_ONSTACK_MAP(done, + bio->bi_bdev->bd_disk->lockdep_map); + + bio->bi_private = &done; + bio->bi_end_io = bio_wait_end_io; + bio_endio(bio); + blk_wait_io(&done); +} + void __bio_advance(struct bio *bio, unsigned bytes) { if (bio_integrity(bio)) diff --git a/block/blk-lib.c b/block/blk-lib.c index fd97f4dd34e7f4..8021bc3831d56a 100644 --- a/block/blk-lib.c +++ b/block/blk-lib.c @@ -35,26 +35,6 @@ static sector_t bio_discard_limit(struct block_device *bdev, sector_t sector) return round_down(UINT_MAX, discard_granularity) >> SECTOR_SHIFT; } -static void await_bio_endio(struct bio *bio) -{ - complete(bio->bi_private); - bio_put(bio); -} - -/* - * await_bio_chain - ends @bio and waits for every chained bio to complete - */ -static void await_bio_chain(struct bio *bio) -{ - DECLARE_COMPLETION_ONSTACK_MAP(done, - bio->bi_bdev->bd_disk->lockdep_map); - - bio->bi_private = &done; - bio->bi_end_io = await_bio_endio; - bio_endio(bio); - blk_wait_io(&done); -} - struct bio *blk_alloc_discard_bio(struct block_device *bdev, sector_t *sector, sector_t *nr_sects, gfp_t gfp_mask) { @@ -93,7 +73,7 @@ int __blkdev_issue_discard(struct block_device *bdev, sector_t sector, } if (*biop) - await_bio_chain(*biop); + bio_await_chain(*biop); return -EINTR; } EXPORT_SYMBOL(__blkdev_issue_discard); @@ -158,7 +138,7 @@ static int __blkdev_issue_write_zeroes(struct block_device *bdev, sector += len; cond_resched(); if (fatal_signal_pending(current)) { - await_bio_chain(bio); + bio_await_chain(bio); return -EINTR; } } @@ -206,7 +186,7 @@ static int __blkdev_issue_zero_pages(struct block_device *bdev, } cond_resched(); if (fatal_signal_pending(current)) { - await_bio_chain(bio); + bio_await_chain(bio); return -EINTR; } } @@ -352,7 +332,7 @@ int blkdev_issue_secure_erase(struct block_device *bdev, sector_t sector, nr_sects -= len; cond_resched(); if (fatal_signal_pending(current)) { - await_bio_chain(bio); + bio_await_chain(bio); ret = -EINTR; bio = NULL; break; diff --git a/block/blk.h b/block/blk.h index a19b7b42e6503c..78528bfbd58c37 100644 --- a/block/blk.h +++ b/block/blk.h @@ -38,6 +38,7 @@ void __blk_mq_unfreeze_queue(struct request_queue *q, bool force_atomic); void blk_queue_start_drain(struct request_queue *q); int __bio_queue_enter(struct request_queue *q, struct bio *bio); void submit_bio_noacct_nocheck(struct bio *bio); +void bio_await_chain(struct bio *bio); static inline bool blk_try_enter_queue(struct request_queue *q, bool pm) { From patchwork Tue Mar 12 14:48:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 13590124 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 464807BAF7; Tue, 12 Mar 2024 14:48:32 +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=1710254913; cv=none; b=eXuVV7kMfBtx3oH7Z99BbN139OyXY2tY9xZTqYeIG83Ys/lhxRNIJ0ut29cbV5yYQ6/PV+0rO0GQBuk04PehGU7yCrzgiNlH07GHIffCYqCDA86WdM8aSX+QJqXhyhavdJp9GMcYDRjQuTs8CYOOhfzsc/mwE2S17ZYj86aa7bk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710254913; c=relaxed/simple; bh=MSww3kpy0EZ8nEuqmbXvVluyWuBKE2iKhaRsT3sJ7Jc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=UuLGPgqkg+LlVlSBcT7LOk7/UOqKuwMvNWY4UMjCLLoMQW9W6Fba16b9dS4zz+c53UVAte60BHYwO0y24nd+ebZ7ZHWATwMvRav+lTw55hGewucVgC4rr+NFbXIoRVxeVq7HMWKrRWEoOtnhOWsO0cSfMAR3d1EOtnZMXmM0MN0= 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=x4VS3bdv; 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="x4VS3bdv" 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=YKaX8ERHDTkcm1Gf7rZWF74jjMOwqQulL6zhqTnYplQ=; b=x4VS3bdvDZlyCYWgoJS+r34lxK wVLpCzCbaWJ3gP70PWAfPpPZpfft0VD1IsWyyTuTVeLQgRX4QAfQFKQn1mWM6HAXChOSE5YToazMr ocPhtoJuK7ziZ55K0cdwjZhskVayKU1Kh7+ewq56u0GKxKkrwmjn+oXLS/dKRMjkCabcpRRGWwMNa FPfjOaq1jOaly01ofqXo89/3xOrdUxTmfms/3dbFy3mzLvu1/368KWbh6qIW3lENJrFlQ4eokpIJ5 rL8RAjEdHX6Zhm3hb+hJqUlg68XayTzKW/dLukM8wwP/eUp8dE7X3FFG2vYOl3bfhbCNa7XZg3dYV 7Hc64Z2A==; Received: from [50.226.187.238] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.97.1 #2 (Red Hat Linux)) id 1rk3Qd-00000006D8j-1sNb; Tue, 12 Mar 2024 14:48:31 +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 5/5] block: don't allow fatal signals to interrupt (__)blkdev_issue_discard Date: Tue, 12 Mar 2024 08:48:26 -0600 Message-Id: <20240312144826.1045212-6-hch@lst.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240312144826.1045212-1-hch@lst.de> References: <20240312144826.1045212-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 File system won't to handle fatal signals themselves and are generally not prepared for EINTR errors from (__)blkdev_issue_discard. Remove the logic from the generic helpers and instead open code the discard bio submission in the ioctl handler that wants it. Fixes: 8a08c5fd89b4 ("blk-lib: check for kill signal") Signed-off-by: Christoph Hellwig --- block/blk-lib.c | 12 +++--------- block/ioctl.c | 24 ++++++++++++++++++++++-- 2 files changed, 25 insertions(+), 11 deletions(-) diff --git a/block/blk-lib.c b/block/blk-lib.c index 8021bc3831d56a..90b75605299b9c 100644 --- a/block/blk-lib.c +++ b/block/blk-lib.c @@ -65,16 +65,10 @@ int __blkdev_issue_discard(struct block_device *bdev, sector_t sector, { struct bio *bio; - while (!fatal_signal_pending(current)) { - bio = blk_alloc_discard_bio(bdev, §or, &nr_sects, gfp_mask); - if (!bio) - return 0; + while ((bio = blk_alloc_discard_bio(bdev, §or, &nr_sects, + gfp_mask))) *biop = bio_chain_and_submit(*biop, bio); - } - - if (*biop) - bio_await_chain(*biop); - return -EINTR; + return 0; } EXPORT_SYMBOL(__blkdev_issue_discard); diff --git a/block/ioctl.c b/block/ioctl.c index 57c8171fda93c5..32bbdba77d6941 100644 --- a/block/ioctl.c +++ b/block/ioctl.c @@ -96,10 +96,12 @@ 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; + struct inode *inode = bdev->bd_inode; sector_t sector, nr_sects; + struct bio *bio = NULL, *new; + struct blk_plug plug; uint64_t range[2]; uint64_t start, len; - struct inode *inode = bdev->bd_inode; int err; if (!(mode & BLK_OPEN_WRITE)) @@ -129,7 +131,25 @@ 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, sector, nr_sects, GFP_KERNEL); + blk_start_plug(&plug); + while (!fatal_signal_pending(current)) { + new = blk_alloc_discard_bio(bdev, §or, &nr_sects, + GFP_KERNEL); + if (!new) + break; + bio = bio_chain_and_submit(bio, new); + } + if (fatal_signal_pending(current)) { + if (bio) + bio_await_chain(bio); + err = -EINTR; + } else if (bio) { + err = submit_bio_wait(bio); + if (err == -EOPNOTSUPP) + err = 0; + bio_put(bio); + } + blk_finish_plug(&plug); fail: filemap_invalidate_unlock(inode->i_mapping); return err;