From patchwork Wed Nov 22 10:31:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu Kuai X-Patchwork-Id: 168069 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2b07:b0:403:3b70:6f57 with SMTP id io7csp1055894vqb; Tue, 21 Nov 2023 18:37:55 -0800 (PST) X-Google-Smtp-Source: AGHT+IF95Kvor9Sd+FW8sqnsRkKTHIrmgvgPCXZoGJ1eRx0ubAHjqHkbEOOigb8qngDjKrRKtFQ5 X-Received: by 2002:a17:903:2292:b0:1cf:65e1:b754 with SMTP id b18-20020a170903229200b001cf65e1b754mr1220804plh.16.1700620675692; Tue, 21 Nov 2023 18:37:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700620675; cv=none; d=google.com; s=arc-20160816; b=uZqLkQrK5r0/QUkpVkHSjxXLVOP8APXo5Bxu4CJZgvsLjj1ZJbIfIB6LyrAS3cvEHj CUVv1KjM8BAzU8sRKN7Z/0bHm9uOeWcPQy8Cy1bMMu7pg/OgsYvlDIBKS4BBud10L7xP H7jhsVYOMBHlJK7TvwfGCGR0YFjPb+RZHFD1/ZHy0/YP90LYSt9Z2SO8Trc/mc28t+5E VUyr7MTmYoFyZMKN2Yb37jBLZYPNdHzOIsrx+jtOJ+WFBfq11m0jqIBbiqzVAgPwxFsC 1ElxQop4qyj6KfQuyvVebdsvSD5dZo63q8e1wjhC4Sou9bxRI3gJmX/+hssWvzMq7tgW 3/6A== 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=6mzjyo8oCZvFj9oE5Wl2UKlEcB4lRWLk0li6e/0/GNQ=; fh=+aPRztbKCBcYYBe1z1e9lnAT8RWJ2WYlO7mGAj5wSt0=; b=rVCnzGSR8+JiWygnyf4fBEciy01t1OZIDf0Ds8ZvvMPdWgTnthPH1A5Ng8gSx1iWAB ebdMy5oEVhZ2HYKP/OONTlL16hmZwmkTARDllZRJ7Ijt+EjScldM8D4HbZZ89Z1J2Z6r O5RGLMaCQE8OZWCRfEqgg9lstcrcn+IlThGv/U0UL/HfU9GTja9qm70/GxyEp19XqnEL DQwR/xUSRSUk5Y8Un9/dcMOfmzv3DzobnqK8+agg+3gjhh1qQeA5KBZU7FTLhrH868Wj pOELhVKz4KDMzBImhx4uSXzg+gWCHqpD4NJdMHhxnbd/wGPf34ilBbzTU9a5u5CdfdBB kvUA== 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:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from lipwig.vger.email (lipwig.vger.email. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id ja14-20020a170902efce00b001b8c824e826si1082389plb.533.2023.11.21.18.37.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Nov 2023 18:37:55 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 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 9AF928183F3C; Tue, 21 Nov 2023 18:37:53 -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 S1343530AbjKVChV (ORCPT + 99 others); Tue, 21 Nov 2023 21:37:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58232 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343537AbjKVChR (ORCPT ); Tue, 21 Nov 2023 21:37:17 -0500 Received: from dggsgout12.his.huawei.com (unknown [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A258E19E; Tue, 21 Nov 2023 18:37:13 -0800 (PST) Received: from mail.maildlp.com (unknown [172.19.93.142]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4SZlkq3JFwz4f3jMc; Wed, 22 Nov 2023 10:37:07 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.112]) by mail.maildlp.com (Postfix) with ESMTP id 1AE901A01AB; Wed, 22 Nov 2023 10:37:09 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.104.67]) by APP1 (Coremail) with SMTP id cCh0CgBXWhBSaV1lNClcBg--.32716S5; Wed, 22 Nov 2023 10:37:08 +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 v3 1/3] block: move .bd_inode into 1st cacheline of block_device Date: Wed, 22 Nov 2023 18:31:01 +0800 Message-Id: <20231122103103.1104589-2-yukuai1@huaweicloud.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231122103103.1104589-1-yukuai1@huaweicloud.com> References: <20231122103103.1104589-1-yukuai1@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: cCh0CgBXWhBSaV1lNClcBg--.32716S5 X-Coremail-Antispam: 1UD129KBjvJXoW7Gr48ZFy3tryDJw4rCFWDXFb_yoW8Jr4rpF srur48CrWkXrW0grykK3WfZryfWayDCr1xX3y3Ka4FkFyaqr1vg3ZYyr13AFW8CFZayrWa yF9rurWrC34UArJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUBE14x267AKxVW5JVWrJwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2jI8I6cxK62vIxIIY0VWUZVW8XwA2048vs2IY02 0E87I2jVAFwI0_Jr4l82xGYIkIc2x26xkF7I0E14v26r1I6r4UM28lY4IEw2IIxxk0rwA2 F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_tr0E3s1l84ACjcxK6xIIjx 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]); Tue, 21 Nov 2023 18:37:53 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783230025531703162 X-GMAIL-MSGID: 1783230025531703162 From: Ming Lei The .bd_inode field of block_device is used in IO fast path of blkdev_write_iter() and blkdev_llseek(), so it is more efficient to keep it into the 1st cacheline. .bd_openers is only touched in open()/close(), and .bd_size_lock is only for updating bdev capacity, which is in slow path too. So swap .bd_inode layout with .bd_openers & .bd_size_lock to move .bd_inode into the 1st cache line. Cc: Yu Kuai Signed-off-by: Ming Lei Signed-off-by: Yu Kuai Reviewed-by: Christoph Hellwig --- include/linux/blk_types.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h index d5c5e59ddbd2..f7d40692dd94 100644 --- a/include/linux/blk_types.h +++ b/include/linux/blk_types.h @@ -49,9 +49,10 @@ struct block_device { bool bd_write_holder; bool bd_has_submit_bio; dev_t bd_dev; + struct inode *bd_inode; /* will die */ + atomic_t bd_openers; spinlock_t bd_size_lock; /* for bd_inode->i_size updates */ - struct inode * bd_inode; /* will die */ void * bd_claiming; void * bd_holder; const struct blk_holder_ops *bd_holder_ops; From patchwork Wed Nov 22 10:31:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu Kuai X-Patchwork-Id: 168068 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2b07:b0:403:3b70:6f57 with SMTP id io7csp1055761vqb; Tue, 21 Nov 2023 18:37:31 -0800 (PST) X-Google-Smtp-Source: AGHT+IF5naD8OtqxGhuiSOTShMWZ53St+xKCRAVGchDhKP6QknsR814Fsd+6FOyOm8EaHU1kpAP8 X-Received: by 2002:a05:6a00:1d8c:b0:6cb:ba8d:96a7 with SMTP id z12-20020a056a001d8c00b006cbba8d96a7mr7078333pfw.14.1700620650801; Tue, 21 Nov 2023 18:37:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700620650; cv=none; d=google.com; s=arc-20160816; b=Jc9j6EJTD7Y/Jy3tqViU6lwUTfQspzMB+klUPtl84UWENzzdqlXBurkEyeLBrTDeQ5 osZZeYTaeYQC3qMQ7jN4ZMJfF/thP+8uu3im6nanoLQGaFXcy8wXel6Xkj7s+xbr+Z4D EDQQWJOj3TjYIxAXXsqDHBeaRphcDAmdzgAACUnDzil3nXC7kJtr647/QJk/VtH1uk+E CEGfFFj/ps45Ggk0cXN7Bc55RLAUdZ/DRnxHoUijvMbBkb/Z0Feyu/wr41FMnmynLGMw 3ibPckc6fUSUK+P0o0wCL61eAWeZgxZDLw7p+hpsvvRXhwRpGbQpaWpkFgD0VhQF7ZFk T/ZA== 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=POGtPvq5ah0xH/oVXG65yzWENrLyqJURFsp2ERLcGXw=; fh=+aPRztbKCBcYYBe1z1e9lnAT8RWJ2WYlO7mGAj5wSt0=; b=dRolfl4slRx7UYVXTXggs7iRpvb+aCRZ3ocpjyTkyo8mNDQERK0Ph/Xr8/Ejrcsu0u ucTFu2iU8JolD0C3YRhyaUazaTzt2O6fOd87Wyy7/tvDSydmlDci2YDNyknntPahtlNn 2Owp93M/U/CSEMwDtUv+Y5lpflRJ+RxOFtUd0UejU9CMwsiGIO4nAHeMJLlOKAxAFUVH rNsiiQfw2mwdNs8wTTevOHI/JswJGPj93beVlAfbkUWUUN6IYvvtLZt6oWuG31T6pEEF I9QBDeZxohrc1aOEnjUYHiUexJeidpAUwzkcyNtVtvlJfIrFjeDhuPaCqP/R1qpKZVfO iA7g== 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:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from lipwig.vger.email (lipwig.vger.email. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id f9-20020a056a001ac900b006cb93f13d52si6041061pfv.120.2023.11.21.18.37.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Nov 2023 18:37:30 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 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 316D38183F38; Tue, 21 Nov 2023 18:37:27 -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 S1343545AbjKVChT (ORCPT + 99 others); Tue, 21 Nov 2023 21:37:19 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58216 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343530AbjKVChQ (ORCPT ); Tue, 21 Nov 2023 21:37:16 -0500 Received: from dggsgout11.his.huawei.com (unknown [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 290DB195; Tue, 21 Nov 2023 18:37:12 -0800 (PST) Received: from mail.maildlp.com (unknown [172.19.93.142]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4SZlkp5X9Dz4f3kk1; Wed, 22 Nov 2023 10:37:06 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.112]) by mail.maildlp.com (Postfix) with ESMTP id 74DB21A01AB; Wed, 22 Nov 2023 10:37:09 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.104.67]) by APP1 (Coremail) with SMTP id cCh0CgBXWhBSaV1lNClcBg--.32716S6; Wed, 22 Nov 2023 10:37:09 +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 v3 2/3] block: introduce new field bd_flags in block_device Date: Wed, 22 Nov 2023 18:31:02 +0800 Message-Id: <20231122103103.1104589-3-yukuai1@huaweicloud.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231122103103.1104589-1-yukuai1@huaweicloud.com> References: <20231122103103.1104589-1-yukuai1@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: cCh0CgBXWhBSaV1lNClcBg--.32716S6 X-Coremail-Antispam: 1UD129KBjvJXoW3GrykGrW8KF1rAr4rArW5Wrg_yoW3uF4kpF Z8GFyYk3yUWr4fWan7Ka17J3WSgw10yw1xA3y3C34akrW3trn2vF1kJryjv39a9rW8CFW7 XFn8CFW5CFyUua7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPab4IE77IF4wAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M2 8IrcIa0xkI8VA2jI8067AKxVWUXwA2048vs2IY020Ec7CjxVAFwI0_Gr0_Xr1l8cAvFVAK 0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3wA2z4 x0Y4vE2Ix0cI8IcVCY1x0267AKxVWxJr0_GcWl84ACjcxK6I8E87Iv67AKxVW0oVCq3wA2 z4x0Y4vEx4A2jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4 xG64xvF2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE14v2 6r1j6r4UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwACjI8F5VA0II8E6I AqYI8I648v4I1l42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAq x4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r1q6r 43MIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF 7I0E14v26r4j6F4UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxV WUJVW8JwCI42IY6I8E87Iv6xkF7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjTR QNVDUUUUU 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]); Tue, 21 Nov 2023 18:37:27 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783229999498120341 X-GMAIL-MSGID: 1783229999498120341 From: Yu Kuai There are multiple switches in struct block_device, use separate bool fields for them is not gracefully. Add a new field bd_flags and replace swithes to a bit, there are no functional changes, and prepare to add a new switch in the next patch. In order to keep bd_flags in the first cacheline and prevent layout to be affected, define it as u16. Also add new helpers to set/clear/test each bit like 'bio->bi_flags'. Signed-off-by: Yu Kuai --- 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 e4cfb7adb645..10f524a7416c 100644 --- a/block/bdev.c +++ b/block/bdev.c @@ -402,10 +402,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); @@ -606,7 +606,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) @@ -619,7 +619,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); } } @@ -805,9 +805,10 @@ struct block_device *blkdev_get_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 f7d40692dd94..de652045111b 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 short bd_flags; u8 bd_partno; - bool bd_write_holder; - bool bd_has_submit_bio; dev_t bd_dev; struct inode *bd_inode; /* will die */ @@ -67,9 +70,6 @@ struct block_device { struct super_block *bd_fsfreeze_sb; struct partition_meta_info *bd_meta_info; -#ifdef CONFIG_FAIL_MAKE_REQUEST - bool bd_make_it_fail; -#endif /* * keep this out-of-line as it's both big and not needed in the fast * path @@ -86,6 +86,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 51fa7ffdee83..fc1d55ef5107 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -741,13 +741,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 Wed Nov 22 10:31:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu Kuai X-Patchwork-Id: 168070 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2b07:b0:403:3b70:6f57 with SMTP id io7csp1056476vqb; Tue, 21 Nov 2023 18:39:39 -0800 (PST) X-Google-Smtp-Source: AGHT+IHtYZiqECt/F5/72W01m378nRrWEReETRbh6XGIioNj5IAqbtUAYvfp0TEjfvpRj6veSKCm X-Received: by 2002:a05:6358:60cd:b0:16d:bbf2:57ac with SMTP id i13-20020a05635860cd00b0016dbbf257acmr1232056rwi.14.1700620779471; Tue, 21 Nov 2023 18:39:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700620779; cv=none; d=google.com; s=arc-20160816; b=Jttoh7Lb7T+FRkBy0fJs5ojnukDkW9MUj0JL1w7BlIDKclA3WGpQ+y7VyjRth189OK kIBBdYZLYFJiTWgqRqHRsbrP+rSN2PEXWRmKKjL9YmhvYLE+sNC2rDvdhbJipqTJwbOc wOwpBINXBhGr81nTw0yX3flOHb+GexmttgAyHypVmIsOJZCRFfSO6/3H4Geof7DRPIwY m0ldeN1iEKBDsb8v6APqfx0ORDzNk5/nIBsG4OTCKxn29mEobvKDKknkj7PU3Gljw0o5 SpaRcG3ar7zX4ARqwHq1Oe2fqRDQ5rio2PS62E9x69U/CJR6q5ztpYUE2U7cwkBavqQR mhDw== 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=tVCHUusNbSE0X20gfd6RDidw2Bp2Xh7TuLH4WRU5edE=; fh=+aPRztbKCBcYYBe1z1e9lnAT8RWJ2WYlO7mGAj5wSt0=; b=vcku0iazQwx40EavRoDUk0eflcQrD+2xQcBuFcfGQvd2EQbNWPfpvieY+awNZhzM/c uSm6s9aInsKJ7to1bzD4iFTgB6VA/Fv/hxMR/8px0YN//+T5ra30etrxxNYHufhqo9Ae m3AsQd8fYlKa4ky73ocj8v/yB25juDkGPq0Vh/ZH2ZQWqxdmoo8JuDe5b/WOS3zfz8Tc +eXAZoKk5ANZmvp1FUnMbkTpJJiBiWSizPNihjvTMkrhPLeR9CdZoAsFC9fglYKMxh0R 2L33P1RUeY2guMtNCbMJITsYL3Np28mIQzwK2NAkWoNjHaba+5TjaMgCOp4yfqOhJROh G0ag== 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 w185-20020a6362c2000000b005b966a6960csi7541142pgb.786.2023.11.21.18.39.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Nov 2023 18:39:39 -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 E6FC5807C575; Tue, 21 Nov 2023 18:38:05 -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 S1343570AbjKVCh0 (ORCPT + 99 others); Tue, 21 Nov 2023 21:37:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58246 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343541AbjKVChR (ORCPT ); Tue, 21 Nov 2023 21:37:17 -0500 Received: from dggsgout12.his.huawei.com (unknown [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A2AC41A2; Tue, 21 Nov 2023 18:37:13 -0800 (PST) Received: from mail.maildlp.com (unknown [172.19.163.235]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4SZlkr1NJdz4f3jMX; Wed, 22 Nov 2023 10:37:08 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.112]) by mail.maildlp.com (Postfix) with ESMTP id CC8E71A01D0; Wed, 22 Nov 2023 10:37:09 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.104.67]) by APP1 (Coremail) with SMTP id cCh0CgBXWhBSaV1lNClcBg--.32716S7; Wed, 22 Nov 2023 10:37:09 +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 v3 3/3] block: warn once for each partition in bio_check_ro() Date: Wed, 22 Nov 2023 18:31:03 +0800 Message-Id: <20231122103103.1104589-4-yukuai1@huaweicloud.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231122103103.1104589-1-yukuai1@huaweicloud.com> References: <20231122103103.1104589-1-yukuai1@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: cCh0CgBXWhBSaV1lNClcBg--.32716S7 X-Coremail-Antispam: 1UD129KBjvJXoW7CF1kXr15WF4xJF47ZrWDJwb_yoW8Ww1fpF nxKFyrGryjgrWxuan7GF13Aa4rGa1kWrW5ArWfZw1Yyay3K34Iq3Z2qr13Jr48uFWSkrW3 Xr1jkrWrCFyDWrJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUBK14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2jI8I6cxK62vIxIIY0VWUZVW8XwA2048vs2IY02 0E87I2jVAFwI0_JrWl82xGYIkIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0rwA2 F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_tr0E3s1l84ACjcxK6xIIjx v20xvEc7CjxVAFwI0_Cr1j6rxdM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I8E 87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64 kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm 72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20VAGYx C7MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_ Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUtVW8ZwCIc40Y0x 0EwIxGrwCI42IY6xIIjxv20xvE14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVW8 JVWxJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIx AIcVC2z280aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7sRiyCJDUUUUU= = 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]); Tue, 21 Nov 2023 18:38:06 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783230065368191112 X-GMAIL-MSGID: 1783230134337846829 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 de652045111b..a2185d2f02d9 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;