From: Yu Kuai yukuai3@huawei.com
stable inclusion from stable-v6.6.13 commit da29e4012f4133a68dca8012b38970ea9212e9f0 bugzilla: https://gitee.com/openeuler/kernel/issues/I99TJK
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=...
--------------------------------
[ 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
Conflicts: include/linux/blk_types.h
Signed-off-by: ZhangPeng zhangpeng362@huawei.com --- block/blk-core.c | 14 +++++++++++--- include/linux/blk_types.h | 2 ++ 2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/block/blk-core.c b/block/blk-core.c index 3ea271135a6c..8234e368c862 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -518,9 +518,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 4630a89653a3..ad92611a85f8 100644 --- a/include/linux/blk_types.h +++ b/include/linux/blk_types.h @@ -73,6 +73,8 @@ struct block_device { bool bd_mounted; /* The counter of write opened */ int bd_writers; + + bool bd_ro_warned; /* * keep this out-of-line as it's both big and not needed in the fast * path