From patchwork Tue Nov 21 11:19:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu Kuai X-Patchwork-Id: 167488 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2b07:b0:403:3b70:6f57 with SMTP id io7csp377610vqb; Mon, 20 Nov 2023 19:37:55 -0800 (PST) X-Google-Smtp-Source: AGHT+IGamkRwUo9lg5ipHHqhaqdC5YMsRA9T4d2ud5LFXMO1YmQzumyjSK+i7oz6ts0m1d5RxovD X-Received: by 2002:a05:6358:c8d:b0:16d:bba2:e365 with SMTP id o13-20020a0563580c8d00b0016dbba2e365mr10279041rwj.12.1700537875638; Mon, 20 Nov 2023 19:37:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700537875; cv=none; d=google.com; s=arc-20160816; b=IuoqF2Bkxn/3uFzFuN5hIRmk9+i86rm8ihutmNl9IEuPlR2zExry5Zyk4c92Bi7VkL mri0v1vOEeELL4l9Y6MpepUlWJbiU9mq0J+ZLYcvXUparrBDu21FYMgHTpVJXu9Xh/s5 65NwiaOyQppVlD3iUGV8wUsmJtQwmTMrmli2eGbxZcJMikkXDpvKVxUAAAT3pSHmPq2X 3Qf4vAJqxvIgyv8zP8So2OhTV7nqJpQmGIwJYUv82pIrGcgouiJhJjPYwTJN3rzMj0YO l5Zqzeur/JShiPK5WJegh387YpD7N6uxoT0H1A063uF2cDXaj0JnymBE045ITMlMJeWm 0/Kw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=SUt0CnIDS89gkRBULjxn8RWMbn+G5VdArDbdwg6mtxk=; fh=+aPRztbKCBcYYBe1z1e9lnAT8RWJ2WYlO7mGAj5wSt0=; b=Lvq3fS1KqffrrQX5vKYEtuvYjkSnVMvUOMODHeC4FL8BSmNQfriurlE7VO0Lehiva6 Dwol4aZ9WLXeyhMf/RAWqmI5mr4vP9SOcG2v4jVybCNxGxIOedTosdwkpsHUSmo63Yf5 q7F+PuVuwXA4bJNiEuPt8h/5wxSXsk+565yK07ycZunRRCzFE8ZGFW/Uv6j/UyMdvjQx eEDSRTKN4fwY1SWaPPnDC9dtUkaLKed3jP5ZNo+F2/KmpTOtWLiJjfWFO6VYHJk4Bqby lihCoVA1rEQcYzGqkOJ0ltDQsDbYe3fVgnVTJifz+uvVHzs4O0zLKs1aVkQmnEno8PIg qjcw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from lipwig.vger.email (lipwig.vger.email. [23.128.96.33]) by mx.google.com with ESMTPS id p19-20020a63c153000000b005b9022ddeaasi9222298pgi.516.2023.11.20.19.37.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Nov 2023 19:37:55 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id 4F5B380B0250; Mon, 20 Nov 2023 19:36:58 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233327AbjKUDZk (ORCPT + 99 others); Mon, 20 Nov 2023 22:25:40 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33390 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229618AbjKUDZg (ORCPT ); Mon, 20 Nov 2023 22:25:36 -0500 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8FB40D9; Mon, 20 Nov 2023 19:25:31 -0800 (PST) Received: from mail.maildlp.com (unknown [172.19.163.216]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4SZ8s04Trmz4f3m7b; Tue, 21 Nov 2023 11:25:24 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.112]) by mail.maildlp.com (Postfix) with ESMTP id D0E441A07AC; Tue, 21 Nov 2023 11:25:28 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.104.67]) by APP1 (Coremail) with SMTP id cCh0CgDX2xEmI1xlv3EABg--.26174S5; Tue, 21 Nov 2023 11:25:28 +0800 (CST) From: Yu Kuai To: ming.lei@redhat.com, axboe@kernel.dk Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, yukuai3@huawei.com, yukuai1@huaweicloud.com, yi.zhang@huawei.com, yangerkun@huawei.com Subject: [PATCH v2 1/2] block: introduce new field flags in block_device Date: Tue, 21 Nov 2023 19:19:26 +0800 Message-Id: <20231121111927.2021846-2-yukuai1@huaweicloud.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231121111927.2021846-1-yukuai1@huaweicloud.com> References: <20231121111927.2021846-1-yukuai1@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: cCh0CgDX2xEmI1xlv3EABg--.26174S5 X-Coremail-Antispam: 1UD129KBjvJXoW3GryDCFy5trW8Gw18try7Jrb_yoW3uw1fpF Z8JFy5K3yUWr4fWan7Ga17JF1Sgw10kw1xA3y3C34akrW3trn2vF1kJryjy39a9rWxCFW7 XFn8CFW5CFy7ua7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUBE14x267AKxVW5JVWrJwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2jI8I6cxK62vIxIIY0VWUZVW8XwA2048vs2IY02 0E87I2jVAFwI0_Jr4l82xGYIkIc2x26xkF7I0E14v26r1I6r4UM28lY4IEw2IIxxk0rwA2 F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjcxK6xIIjx v20xvEc7CjxVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2 z280aVCY1x0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0V AKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1l Ox8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2IErc IFxwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v2 6r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_Jw0_GFylIxkGc2 Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI0_ Gr0_Cr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMI IF0xvEx4A2jsIEc7CjxVAFwI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x0pRxhLUUUUUU = X-CM-SenderInfo: 51xn3trlr6x35dzhxuhorxvhhfrp/ X-Spam-Status: No, score=-0.8 required=5.0 tests=DATE_IN_FUTURE_06_12, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Mon, 20 Nov 2023 19:36:58 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783143203759735004 X-GMAIL-MSGID: 1783143203759735004 From: Yu Kuai There are multiple switches in struct block_device, use separate bool fields for them is not gracefully. Add a new field flags and replace swithes to a bit, there are no functional changes, and preare to add a new switch in the next patch. In order to keep flags in the first cacheline, define it as u32 and add new helpers to set/clear/test each bit like 'bio->bi_flags'. Signed-off-by: Yu Kuai Reviewed-by: Ming Lei --- block/bdev.c | 15 ++++++++------- block/blk-core.c | 7 ++++--- block/genhd.c | 15 +++++++++++---- block/ioctl.c | 6 +++++- include/linux/blk_types.h | 27 +++++++++++++++++++++------ include/linux/blkdev.h | 5 +++-- 6 files changed, 52 insertions(+), 23 deletions(-) diff --git a/block/bdev.c b/block/bdev.c index fc8d28d77495..6b420cbd4f3d 100644 --- a/block/bdev.c +++ b/block/bdev.c @@ -408,10 +408,10 @@ struct block_device *bdev_alloc(struct gendisk *disk, u8 partno) bdev->bd_partno = partno; bdev->bd_inode = inode; bdev->bd_queue = disk->queue; - if (partno) - bdev->bd_has_submit_bio = disk->part0->bd_has_submit_bio; + if (partno && bdev_flagged(disk->part0, BD_FLAG_HAS_SUBMIT_BIO)) + bdev_set_flag(bdev, BD_FLAG_HAS_SUBMIT_BIO); else - bdev->bd_has_submit_bio = false; + bdev_clear_flag(bdev, BD_FLAG_HAS_SUBMIT_BIO); bdev->bd_stats = alloc_percpu(struct disk_stats); if (!bdev->bd_stats) { iput(inode); @@ -612,7 +612,7 @@ static void bd_end_claim(struct block_device *bdev, void *holder) bdev->bd_holder = NULL; bdev->bd_holder_ops = NULL; mutex_unlock(&bdev->bd_holder_lock); - if (bdev->bd_write_holder) + if (bdev_flagged(bdev, BD_FLAG_WRITE_HOLDER)) unblock = true; } if (!whole->bd_holders) @@ -625,7 +625,7 @@ static void bd_end_claim(struct block_device *bdev, void *holder) */ if (unblock) { disk_unblock_events(bdev->bd_disk); - bdev->bd_write_holder = false; + bdev_clear_flag(bdev, BD_FLAG_WRITE_HOLDER); } } @@ -878,9 +878,10 @@ struct bdev_handle *bdev_open_by_dev(dev_t dev, blk_mode_t mode, void *holder, * writeable reference is too fragile given the way @mode is * used in blkdev_get/put(). */ - if ((mode & BLK_OPEN_WRITE) && !bdev->bd_write_holder && + if ((mode & BLK_OPEN_WRITE) && + !bdev_flagged(bdev, BD_FLAG_WRITE_HOLDER) && (disk->event_flags & DISK_EVENT_FLAG_BLOCK_ON_EXCL_WRITE)) { - bdev->bd_write_holder = true; + bdev_set_flag(bdev, BD_FLAG_WRITE_HOLDER); unblock_events = false; } } diff --git a/block/blk-core.c b/block/blk-core.c index fdf25b8d6e78..f9f8b12ba626 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -482,7 +482,8 @@ __setup("fail_make_request=", setup_fail_make_request); bool should_fail_request(struct block_device *part, unsigned int bytes) { - return part->bd_make_it_fail && should_fail(&fail_make_request, bytes); + return bdev_flagged(part, BD_FLAG_MAKE_IT_FAIL) && + should_fail(&fail_make_request, bytes); } static int __init fail_make_request_debugfs(void) @@ -595,7 +596,7 @@ static void __submit_bio(struct bio *bio) if (unlikely(!blk_crypto_bio_prep(&bio))) return; - if (!bio->bi_bdev->bd_has_submit_bio) { + if (!bdev_flagged(bio->bi_bdev, BD_FLAG_HAS_SUBMIT_BIO)) { blk_mq_submit_bio(bio); } else if (likely(bio_queue_enter(bio) == 0)) { struct gendisk *disk = bio->bi_bdev->bd_disk; @@ -703,7 +704,7 @@ void submit_bio_noacct_nocheck(struct bio *bio) */ if (current->bio_list) bio_list_add(¤t->bio_list[0], bio); - else if (!bio->bi_bdev->bd_has_submit_bio) + else if (!bdev_flagged(bio->bi_bdev, BD_FLAG_HAS_SUBMIT_BIO)) __submit_bio_noacct_mq(bio); else __submit_bio_noacct(bio); diff --git a/block/genhd.c b/block/genhd.c index c9d06f72c587..57f96c0c8da0 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -413,7 +413,8 @@ int __must_check device_add_disk(struct device *parent, struct gendisk *disk, elevator_init_mq(disk->queue); /* Mark bdev as having a submit_bio, if needed */ - disk->part0->bd_has_submit_bio = disk->fops->submit_bio != NULL; + if (disk->fops->submit_bio) + bdev_set_flag(disk->part0, BD_FLAG_HAS_SUBMIT_BIO); /* * If the driver provides an explicit major number it also must provide @@ -1062,7 +1063,8 @@ static DEVICE_ATTR(diskseq, 0444, diskseq_show, NULL); ssize_t part_fail_show(struct device *dev, struct device_attribute *attr, char *buf) { - return sprintf(buf, "%d\n", dev_to_bdev(dev)->bd_make_it_fail); + return sprintf(buf, "%d\n", + bdev_flagged(dev_to_bdev(dev), BD_FLAG_MAKE_IT_FAIL)); } ssize_t part_fail_store(struct device *dev, @@ -1071,8 +1073,13 @@ ssize_t part_fail_store(struct device *dev, { int i; - if (count > 0 && sscanf(buf, "%d", &i) > 0) - dev_to_bdev(dev)->bd_make_it_fail = i; + if (count > 0 && sscanf(buf, "%d", &i) > 0) { + if (!i) + bdev_clear_flag(dev_to_bdev(dev), BD_FLAG_MAKE_IT_FAIL); + else + bdev_set_flag(dev_to_bdev(dev), BD_FLAG_MAKE_IT_FAIL); + + } return count; } diff --git a/block/ioctl.c b/block/ioctl.c index 4160f4e6bd5b..a64440f4c96b 100644 --- a/block/ioctl.c +++ b/block/ioctl.c @@ -394,7 +394,11 @@ static int blkdev_roset(struct block_device *bdev, unsigned cmd, if (ret) return ret; } - bdev->bd_read_only = n; + + if (!n) + bdev_clear_flag(bdev, BD_FLAG_READ_ONLY); + else + bdev_set_flag(bdev, BD_FLAG_READ_ONLY); return 0; } diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h index 52e264d5a830..f7a7965eeb25 100644 --- a/include/linux/blk_types.h +++ b/include/linux/blk_types.h @@ -37,6 +37,11 @@ struct bio_crypt_ctx; #define PAGE_SECTORS (1 << PAGE_SECTORS_SHIFT) #define SECTOR_MASK (PAGE_SECTORS - 1) +#define BD_FLAG_READ_ONLY 0 /* read-only-policy */ +#define BD_FLAG_WRITE_HOLDER 1 +#define BD_FLAG_HAS_SUBMIT_BIO 2 +#define BD_FLAG_MAKE_IT_FAIL 3 + struct block_device { sector_t bd_start_sect; sector_t bd_nr_sectors; @@ -44,10 +49,8 @@ struct block_device { struct request_queue * bd_queue; struct disk_stats __percpu *bd_stats; unsigned long bd_stamp; - bool bd_read_only; /* read-only policy */ + unsigned int bd_flags; u8 bd_partno; - bool bd_write_holder; - bool bd_has_submit_bio; dev_t bd_dev; atomic_t bd_openers; spinlock_t bd_size_lock; /* for bd_inode->i_size updates */ @@ -63,9 +66,6 @@ struct block_device { struct mutex bd_fsfreeze_mutex; /* serialize freeze/thaw */ struct partition_meta_info *bd_meta_info; -#ifdef CONFIG_FAIL_MAKE_REQUEST - bool bd_make_it_fail; -#endif int bd_writers; /* * keep this out-of-line as it's both big and not needed in the fast @@ -83,6 +83,21 @@ struct block_device { #define bdev_kobj(_bdev) \ (&((_bdev)->bd_device.kobj)) +static inline bool bdev_flagged(struct block_device *bdev, unsigned int bit) +{ + return bdev->bd_flags & (1U << bit); +} + +static inline void bdev_set_flag(struct block_device *bdev, unsigned int bit) +{ + bdev->bd_flags |= (1U << bit); +} + +static inline void bdev_clear_flag(struct block_device *bdev, unsigned int bit) +{ + bdev->bd_flags &= ~(1U << bit); +} + /* * Block error status values. See block/blk-core:blk_errors for the details. * Alpha cannot write a byte atomically, so we need to use 32-bit value. diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 9f6c3373f9fc..be1a39c0f8db 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -743,13 +743,14 @@ void disk_uevent(struct gendisk *disk, enum kobject_action action); static inline int get_disk_ro(struct gendisk *disk) { - return disk->part0->bd_read_only || + return bdev_flagged(disk->part0, BD_FLAG_READ_ONLY) || test_bit(GD_READ_ONLY, &disk->state); } static inline int bdev_read_only(struct block_device *bdev) { - return bdev->bd_read_only || get_disk_ro(bdev->bd_disk); + return bdev_flagged(bdev, BD_FLAG_READ_ONLY) || + get_disk_ro(bdev->bd_disk); } bool set_capacity_and_notify(struct gendisk *disk, sector_t size); From patchwork Tue Nov 21 11:19:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu Kuai X-Patchwork-Id: 167486 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2b07:b0:403:3b70:6f57 with SMTP id io7csp373865vqb; Mon, 20 Nov 2023 19:25:47 -0800 (PST) X-Google-Smtp-Source: AGHT+IH1lO7T9rknw+sYR8QlL0nwj68iRqSCrtfv89b0fQLIJrnxZEMKpnxqqiOQ0/HxNnyfiXrp X-Received: by 2002:a05:6870:d10b:b0:1f9:4db2:ff43 with SMTP id e11-20020a056870d10b00b001f94db2ff43mr3958469oac.22.1700537147449; Mon, 20 Nov 2023 19:25:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700537147; cv=none; d=google.com; s=arc-20160816; b=0Q9LZdVlom9i6Xo8aRLwNwqpUiCVPSqrdIo1e4C/jzFSaAPTpXO7/bRkbT7NrwEPp6 CfzWwW+YR/bUlPacZgPGEz/GRvs3E14icv/PVoA19RTaLomzP93tWSkWaww+vM9C55l8 d83/Mqlth76thh8WT7e/rP5uSpwlBfwUYPKjvVbliERnduow/1WpsL6o7dLVQMORH+TR QLKqCNOK4H5NKuiMPsjze16kWky30PGXwiyic5noy13/B19121R78gTtSR/GL/IOU9N7 AX8msp4m5vwF6D4EKPuwtdCwbEfxRQeEPZUtblc0T0dWK80dTJrMHHqQA+UXGkCQMNrt WbqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=80khW8NzIs5pGkTXMyC8AFjEo9H0QVR88xThwExfYaw=; fh=+aPRztbKCBcYYBe1z1e9lnAT8RWJ2WYlO7mGAj5wSt0=; b=WCfDsReXFV7iJ8iE5ZwU/VPPkYdY9wSgQkr/PdUAshL7xCW9T0QjuJ+UEvirmmf8zY Mli11CVNFjmWibDuCebJDUR3sia5/dhZhbSco1xqOc+p2qamxc26t5vq3Sn5+JBRYV/h 7ExL2zwmZdxscrK51wSPv0Ah410TKWwtRPMP9nO0OIZCi7KzKqFgCZSIuOj7G8bltKn5 OHnM3Ac/XpYdCmX/TZcKOVaQRzn5eroJ0xD+t4Ghfq4dkk6wxbgh3YPvTXRI0d5gKdUz Np7If+A7WxYD5fEQcgcxv6funXWLo9fqzgiihuDpa5jWN9W34S9kjjZWoRgTuGLEuNoT w3qw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id n186-20020a6327c3000000b005b8f24e6526si9410660pgn.234.2023.11.20.19.25.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Nov 2023 19:25:47 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 20514801E862; Mon, 20 Nov 2023 19:25:46 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233284AbjKUDZj (ORCPT + 99 others); Mon, 20 Nov 2023 22:25:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33376 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229539AbjKUDZf (ORCPT ); Mon, 20 Nov 2023 22:25:35 -0500 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D965CE7; Mon, 20 Nov 2023 19:25:31 -0800 (PST) Received: from mail.maildlp.com (unknown [172.19.93.142]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4SZ8s23tnnz4f3kpd; Tue, 21 Nov 2023 11:25:26 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.112]) by mail.maildlp.com (Postfix) with ESMTP id 374FE1A0513; Tue, 21 Nov 2023 11:25:29 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.104.67]) by APP1 (Coremail) with SMTP id cCh0CgDX2xEmI1xlv3EABg--.26174S6; Tue, 21 Nov 2023 11:25:29 +0800 (CST) From: Yu Kuai To: ming.lei@redhat.com, axboe@kernel.dk Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, yukuai3@huawei.com, yukuai1@huaweicloud.com, yi.zhang@huawei.com, yangerkun@huawei.com Subject: [PATCH v2 2/2] block: warn once for each partition in bio_check_ro() Date: Tue, 21 Nov 2023 19:19:27 +0800 Message-Id: <20231121111927.2021846-3-yukuai1@huaweicloud.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231121111927.2021846-1-yukuai1@huaweicloud.com> References: <20231121111927.2021846-1-yukuai1@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: cCh0CgDX2xEmI1xlv3EABg--.26174S6 X-Coremail-Antispam: 1UD129KBjvJXoW7CF1kXr15WF4xJF47ZrWDJwb_yoW8Ww1fpr nxKFyrGryjgrWxuan7GF13Aa4rGa1kWrW5ArWfZw1Yyay3Kry0q3Zaqr13Jr48uF4SkrW3 Xr1jkrWrCa4DurJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPSb4IE77IF4wAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M2 8IrcIa0xkI8VA2jI8067AKxVWUXwA2048vs2IY020Ec7CjxVAFwI0_Gr0_Xr1l8cAvFVAK 0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJwA2z4 x0Y4vE2Ix0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l 84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I 8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AK xVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lF7I21c0EjII2zV CS5cI20VAGYxC7MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E 5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUtV W8ZwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY 1x0267AKxVW8JVWxJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI 0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7s RNLvtUUUUUU== X-CM-SenderInfo: 51xn3trlr6x35dzhxuhorxvhhfrp/ X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Mon, 20 Nov 2023 19:25:46 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783142437384639547 X-GMAIL-MSGID: 1783142440251427527 From: Yu Kuai 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 --- block/blk-core.c | 14 +++++++++++--- include/linux/blk_types.h | 1 + 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/block/blk-core.c b/block/blk-core.c index f9f8b12ba626..6575f684d41e 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -502,9 +502,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 (bdev_flagged(bio->bi_bdev, BD_FLAG_RO_WARNED)) + return; + + bdev_set_flag(bio->bi_bdev, BD_FLAG_RO_WARNED); + /* + * 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 f7a7965eeb25..07abd0165226 100644 --- a/include/linux/blk_types.h +++ b/include/linux/blk_types.h @@ -41,6 +41,7 @@ struct bio_crypt_ctx; #define BD_FLAG_WRITE_HOLDER 1 #define BD_FLAG_HAS_SUBMIT_BIO 2 #define BD_FLAG_MAKE_IT_FAIL 3 +#define BD_FLAG_RO_WARNED 4 struct block_device { sector_t bd_start_sect;