block: warn once for each partition in bio_check_ro()

[ Upstream commit 67d995e069535c32829f5d368d919063492cec6e ]

Commit 1b0a151c10a6 ("blk-core: use pr_warn_ratelimited() in
bio_check_ro()") fix message storm by limit the rate, however, there
will still be lots of message in the long term. Fix it better by warn
once for each partition.

Signed-off-by: Yu Kuai <yukuai3@huawei.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20231128123027.971610-3-yukuai1@huaweicloud.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/block/blk-core.c b/block/blk-core.c
index fdf25b8..2eca76c 100644 (file)
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -501,9 +501,17 @@ static inline void bio_check_ro(struct bio *bio)
        if (op_is_write(bio_op(bio)) && bdev_read_only(bio->bi_bdev)) {
                if (op_is_flush(bio->bi_opf) && !bio_sectors(bio))
                        return;
-               pr_warn_ratelimited("Trying to write to read-only block-device %pg\n",
-                                   bio->bi_bdev);
-               /* Older lvm-tools actually trigger this */
+
+               if (bio->bi_bdev->bd_ro_warned)
+                       return;
+
+               bio->bi_bdev->bd_ro_warned = true;
+               /*
+                * Use ioctl to set underlying disk of raid/dm to read-only
+                * will trigger this.
+                */
+               pr_warn("Trying to write to read-only block-device %pg\n",
+                       bio->bi_bdev);
        }
 }
 

diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h
index d5c5e59..92c8997 100644 (file)
--- a/include/linux/blk_types.h
+++ b/include/linux/blk_types.h
@@ -69,6 +69,7 @@ struct block_device {
 #ifdef CONFIG_FAIL_MAKE_REQUEST
        bool                    bd_make_it_fail;
 #endif
+       bool                    bd_ro_warned;
        /*
         * keep this out-of-line as it's both big and not needed in the fast
         * path