From patchwork Mon Dec 26 08:58:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu Kuai X-Patchwork-Id: 36562 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp810001wrt; Mon, 26 Dec 2022 00:42:05 -0800 (PST) X-Google-Smtp-Source: AMrXdXvBL63pEyY85iqpzLfGjUx3QJDL4Z+v7v9GU32MU0RyrqYSyb4O0tozzhzny1qVWWoQn5Vt X-Received: by 2002:a17:907:8c81:b0:7c1:962e:cf28 with SMTP id td1-20020a1709078c8100b007c1962ecf28mr15920793ejc.23.1672044125752; Mon, 26 Dec 2022 00:42:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672044125; cv=none; d=google.com; s=arc-20160816; b=QJN5IbIEGhcyCnYRKUlYsrUS0/S0ji5xDO2jWk71WfC9K0136wL/VgHuebIx5RAN3T rRo9vuRHRZEyiW4f2q4HGHJhwwmM2PL+laKRhzUTFXhe4+0UL3RRil+SPMTKMbTYmR6s dAtk25VEY3UACIhyo8H7BPN5XrzczrAlCw/RU7hPdbW/jlphz+6aWnFmWjKlBNvBYYQl 3C6n22NfmUVfi40/kahvIJvG79vhUNhM0XqOC1O7R8C1qhcwgMKJ6yEL3+wCZr3EObKW X60AODAqivrrrCEnhoo4R2pUaxG2q83kQCoUmzrTLThdO6Dw56V3Cx/kVdhruFi+82F1 7H0w== 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=G+XmaomHOloNTHAlNXidYO/UJtRyy5EiCT6PiSCBwXg=; b=la271zrn1K6AYdaPiiR5rhrsTZvGj8WUheUbl5Gph6sbIZd2Owrw2tFpkFzlNmtPu1 ygLWaJSIrV1wl8cnygBq6c9u32Aej80CZkAo6ITSMz2v0ZQTA57UQZ5A951rJrtD0lmh BE+XdqpV+AiuyAf+cgVoDzNVKOHhhtC2ZqoageDOMUG8plp4HxrFuPvQkec4mSKwc8TH 5fv59gJQS0c6n7tVA3OcJN2OpRaAYLWNcQI6eZ5xQUggimrPp1wxXx6WM6+NhXmZERg/ SwnkAaYbP4KiyBmb1rFDTVpaDli9KVhRHGudBzPdmg5kBPNX4USUafpLw9bJnDuYebB7 iqSQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id qq18-20020a17090720d200b007882936242fsi6615398ejb.769.2022.12.26.00.41.42; Mon, 26 Dec 2022 00:42:05 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231882AbiLZIjI (ORCPT + 99 others); Mon, 26 Dec 2022 03:39:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44650 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231534AbiLZIiq (ORCPT ); Mon, 26 Dec 2022 03:38:46 -0500 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B9EE825F8; Mon, 26 Dec 2022 00:38:43 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.169]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4NgWQj5WpGz4f3mSQ; Mon, 26 Dec 2022 16:38:37 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.127.227]) by APP2 (Coremail) with SMTP id Syh0CgBH7eqEXaljOrUjAg--.30907S5; Mon, 26 Dec 2022 16:38:40 +0800 (CST) From: Yu Kuai To: tj@kernel.org, josef@toxicpanda.com, axboe@kernel.dk Cc: cgroups@vger.kernel.org, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, yukuai3@huawei.com, yukuai1@huaweicloud.com, yi.zhang@huawei.com Subject: [PATCH v3 1/5] blk-iocost: check return value of match_u64() Date: Mon, 26 Dec 2022 16:58:55 +0800 Message-Id: <20221226085859.2701195-2-yukuai1@huaweicloud.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20221226085859.2701195-1-yukuai1@huaweicloud.com> References: <20221226085859.2701195-1-yukuai1@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgBH7eqEXaljOrUjAg--.30907S5 X-Coremail-Antispam: 1UD129KBjvdXoW7GF4kXr15AryDtF4xur1rJFb_yoWxtwb_ZF Z3Ga4fZrn7Ga95Z3WkCF1YqrWIkwn5JF4j9340yryUX3W3X3Z5Aw47Xr18Xa15WFW8G34r CFWDZr4qyr1IgjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUb-kFF20E14v26ryj6rWUM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI8067AKxVWUGwA2048vs2IY02 0Ec7CjxVAFwI0_JFI_Gr1l8cAvFVAK0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xv wVC0I7IYx2IY67AKxVWDJVCq3wA2z4x0Y4vE2Ix0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM2 8EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AI xVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20x vE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xv r2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20VAGYxC7MxAIw28IcxkI7VAKI48JMxC20s 026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_ JrI_JrWlx4CE17CEb7AF67AKxVWUtVW8ZwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14 v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVW8JVWxJwCI42IY6xAIw20EY4v20xva j40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxVW8JV W8JrUvcSsGvfC2KfnxnUUI43ZEXa7VUbec_DUUUUU== X-CM-SenderInfo: 51xn3trlr6x35dzhxuhorxvhhfrp/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_PASS 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1753265341487115451?= X-GMAIL-MSGID: =?utf-8?q?1753265341487115451?= From: Yu Kuai This patch fixs that the return value of match_u64() from ioc_qos_write() is not checked, Signed-off-by: Yu Kuai Acked-by: Tejun Heo --- block/blk-iocost.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/block/blk-iocost.c b/block/blk-iocost.c index 549ddc9e0c6f..93b938517be3 100644 --- a/block/blk-iocost.c +++ b/block/blk-iocost.c @@ -3212,7 +3212,8 @@ static ssize_t ioc_qos_write(struct kernfs_open_file *of, char *input, switch (match_token(p, qos_ctrl_tokens, args)) { case QOS_ENABLE: - match_u64(&args[0], &v); + if (match_u64(&args[0], &v)) + goto einval; enable = v; continue; case QOS_CTRL: From patchwork Mon Dec 26 08:58:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu Kuai X-Patchwork-Id: 36558 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp809474wrt; Mon, 26 Dec 2022 00:40:15 -0800 (PST) X-Google-Smtp-Source: AMrXdXsQAYydsZCi1+UHEn5g8Y30Inpq5D9NoPX9+Pb81wQ3wgq9NzvXHFiFCRE3fexU6XiKJv9T X-Received: by 2002:a17:907:8b09:b0:7c1:6e82:35fc with SMTP id sz9-20020a1709078b0900b007c16e8235fcmr19511066ejc.40.1672044014993; Mon, 26 Dec 2022 00:40:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672044014; cv=none; d=google.com; s=arc-20160816; b=Dw6+BjhZoJyKBKiPSGqhSf5F9iRVK0jbppuH/BmaoiiR4yVSH1L6Jhb9A2tzjaOMvG M8Yj5Qi8DYuPYMBJgMxI1oQKQphABEBJu9LANFSgmG3rPXKH2kCQ0dQjoTzxUIid1cQj 4cdr9TMJrBQU6xIe/4LyFX00MBxOBy+ibIqco3DhSiBKaKR5ntKiyHO08Quty3lcJw7X weBj/qr/pbBMtgqEem9yzFg/NvaOSUlZF7KfOCGdoDl4qqQ1I7k5ojOIZyqALlJPJjTa mWK+QmQ1tr9y52ZGDI/uGly/9pe+RykbyiD/C6QWUcKLrzAVBRC7Y0WCBw7AIQJhtHsL WTtQ== 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=a6zIY/F+ABfnXULLgtdPpuPQ9QLdE1+ADkpj4G+TUXU=; b=pI1elh+R57/tLGslZLLRbE4MKNA6PfWpjKIAD0x7vzHkPZqMDZf4+LtTuPBQAJsWlC zBlkoiyaEa5+w9TriFnZmvg8yJF72zrFDAUYJDxTZWOod+nKISc2nS23KeEMN9p5BoGJ gcbmZyOZJ3t4IigAv6nMglQtpQ+GHlj3ZhmpNdopJiEf+9tE854E9H31b2hg57yRSgs7 EEZOgy55pbyq//9VJaluz/Hzy8mO6ED+v7euzGOjLMlZQ1gdAZVhzAIajqHhHnkJKI2a CcanrMg9eASUtc6TQRH73X+1s0aTrwc6QbpC0JwjqviTLiDSSJNqqLOKbLCbGyQp6zl5 3QdA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id go15-20020a1709070d8f00b00836ecced351si8559145ejc.380.2022.12.26.00.39.51; Mon, 26 Dec 2022 00:40:14 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231853AbiLZIit (ORCPT + 99 others); Mon, 26 Dec 2022 03:38:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44644 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229999AbiLZIip (ORCPT ); Mon, 26 Dec 2022 03:38:45 -0500 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AA0591109; Mon, 26 Dec 2022 00:38:43 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.169]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4NgWQk27hLz4f3jZ5; Mon, 26 Dec 2022 16:38:38 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.127.227]) by APP2 (Coremail) with SMTP id Syh0CgBH7eqEXaljOrUjAg--.30907S6; Mon, 26 Dec 2022 16:38:41 +0800 (CST) From: Yu Kuai To: tj@kernel.org, josef@toxicpanda.com, axboe@kernel.dk Cc: cgroups@vger.kernel.org, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, yukuai3@huawei.com, yukuai1@huaweicloud.com, yi.zhang@huawei.com Subject: [PATCH v3 2/5] blk-iocost: don't allow to configure bio based device Date: Mon, 26 Dec 2022 16:58:56 +0800 Message-Id: <20221226085859.2701195-3-yukuai1@huaweicloud.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20221226085859.2701195-1-yukuai1@huaweicloud.com> References: <20221226085859.2701195-1-yukuai1@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgBH7eqEXaljOrUjAg--.30907S6 X-Coremail-Antispam: 1UD129KBjvdXoWrKryxur13Zr1rCr4xJw1fWFg_yoWkAwb_Ca yI9r90gFs5Gay8XF1SyF90vrWfKw4FqFW0vFy7Ja43JFn8Xas0yan3Xryktr45uayq9a45 Ca9ruw1DJFs7WjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUb-kFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI8067AKxVWUXwA2048vs2IY02 0Ec7CjxVAFwI0_Gr0_Xr1l8cAvFVAK0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xv wVC0I7IYx2IY67AKxVWDJVCq3wA2z4x0Y4vE2Ix0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM2 8EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AI xVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20x vE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xv r2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20VAGYxC7MxAIw28IcxkI7VAKI48JMxC20s 026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_ JrI_JrWlx4CE17CEb7AF67AKxVWUtVW8ZwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14 v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVW8JVWxJwCI42IY6xAIw20EY4v20xva j40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxVW8JV W8JrUvcSsGvfC2KfnxnUUI43ZEXa7VUjYiiDUUUUU== X-CM-SenderInfo: 51xn3trlr6x35dzhxuhorxvhhfrp/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_PASS 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1753265224933598984?= X-GMAIL-MSGID: =?utf-8?q?1753265224933598984?= From: Yu Kuai iocost is based on rq_qos, which can only work for request based device, thus it doesn't make sense to configure iocost for bio based device. Signed-off-by: Yu Kuai Reviewed-by: Christoph Hellwig Acked-by: Tejun Heo --- block/blk-iocost.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/block/blk-iocost.c b/block/blk-iocost.c index 93b938517be3..ce4eafbada56 100644 --- a/block/blk-iocost.c +++ b/block/blk-iocost.c @@ -3185,6 +3185,11 @@ static ssize_t ioc_qos_write(struct kernfs_open_file *of, char *input, return PTR_ERR(bdev); disk = bdev->bd_disk; + if (!queue_is_mq(disk->queue)) { + ret = -EOPNOTSUPP; + goto err; + } + ioc = q_to_ioc(disk->queue); if (!ioc) { ret = blk_iocost_init(disk); @@ -3365,6 +3370,11 @@ static ssize_t ioc_cost_model_write(struct kernfs_open_file *of, char *input, return PTR_ERR(bdev); q = bdev_get_queue(bdev); + if (!queue_is_mq(q)) { + ret = -EOPNOTSUPP; + goto err; + } + ioc = q_to_ioc(q); if (!ioc) { ret = blk_iocost_init(bdev->bd_disk); From patchwork Mon Dec 26 08:58:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu Kuai X-Patchwork-Id: 36559 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp809639wrt; Mon, 26 Dec 2022 00:40:49 -0800 (PST) X-Google-Smtp-Source: AMrXdXuYrnUhKLTIKao7MM3X8hg9+IXcjltSnWTzYJoJO2j4Q+b42YfGOiB6BV7FEJlVz/1Jh26m X-Received: by 2002:a17:906:4e48:b0:7c1:8f78:9562 with SMTP id g8-20020a1709064e4800b007c18f789562mr13765562ejw.50.1672044049594; Mon, 26 Dec 2022 00:40:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672044049; cv=none; d=google.com; s=arc-20160816; b=OkskxVu3fSC8di0t4BjUFY1QLRfncdUWf08Sm3CKCtJxPfuiPIg0pr+RHDNmzBt/hQ SekZHXCzPozoJAbzFl1nVhramt9nW4SYtjoD2032QN+RqEy3vAyvJnefUFP1CZoWtcLj QOYxLWr2QK24nQgfv2bLHjaBHfBiD+hokby+G/iW72pEuJzVfMO6VWCtlnrrHKCqCSxJ 4BxBE8bUqSE377cgj4KdcXus/Fy6gYQMlQfJxb5JPCPAKuYxiYm1mtde2xhFhoMCULuX 49wtWtzcFzRX/gw5oGrQDFNonxTrH/FXpKmj2MT17mkaM7iTJMz29b8+PftfvEGVA83N losw== 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=Znf8/EwhdH2wXfigi0qq/Bum8CjmXjuNXvqNorpKGzM=; b=yCZLqMXqKmUDWqbSNN8qpH7md+RoE9uWUQBRT9HCbuC0jQ382ATG1pV1QBaHyAtyKN 0ofAd2STJ5gXhUMXsKhBel+co6zqOdB4cYiwdqGpuSOgT5C3cHxZY9LA3dj2r61BUDj6 A3Cnst5UGV2camxmN7/Sq04mKoLS1whVj+WIGh665RogyrFNqD2YgAzDUEXOSIoysG1J YICYgThpcwLLUvi5rHmicD3LYNFPxQ++xv7hEdhhQ9TpOwHK2Web1Zz+zp02ZLiFhCMu Yy7LD+Ksb8z22ycAXTOPa0Y7EZO6UBbLx02tbSY8diCjuOlztkFaDkI1eECc2DcMXL6D n9Ag== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w22-20020a056402269600b0046a8fe6d173si9194772edd.456.2022.12.26.00.40.26; Mon, 26 Dec 2022 00:40:49 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231738AbiLZIjC (ORCPT + 99 others); Mon, 26 Dec 2022 03:39:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44652 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230003AbiLZIip (ORCPT ); Mon, 26 Dec 2022 03:38:45 -0500 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EE91325FB; Mon, 26 Dec 2022 00:38:43 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.169]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4NgWQk4wY9z4f3jqX; Mon, 26 Dec 2022 16:38:38 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.127.227]) by APP2 (Coremail) with SMTP id Syh0CgBH7eqEXaljOrUjAg--.30907S7; Mon, 26 Dec 2022 16:38:41 +0800 (CST) From: Yu Kuai To: tj@kernel.org, josef@toxicpanda.com, axboe@kernel.dk Cc: cgroups@vger.kernel.org, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, yukuai3@huawei.com, yukuai1@huaweicloud.com, yi.zhang@huawei.com Subject: [PATCH v3 3/5] blk-iocost: read params inside lock in sysfs apis Date: Mon, 26 Dec 2022 16:58:57 +0800 Message-Id: <20221226085859.2701195-4-yukuai1@huaweicloud.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20221226085859.2701195-1-yukuai1@huaweicloud.com> References: <20221226085859.2701195-1-yukuai1@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgBH7eqEXaljOrUjAg--.30907S7 X-Coremail-Antispam: 1UD129KBjvJXoW7Zr4UGr18JrWDXrWrtF1UZFb_yoW8WryfpF Z0g397K3yFvr1xWFnxtF40q3Z5Wa1qqr4fXr47Cr93Aryaqr12qFsrCr40vw48ZFWxu390 gFWagrW0yr15C37anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUU9m14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2048vs2IY020E87I2jVAFwI0_JrWl82xGYIkIc2 x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0 Y4vE2Ix0cI8IcVAFwI0_tr0E3s1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Gr1j6F4UJw A2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2z280aVCY1x0267AKxVW0oVCq3wAS 0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2 IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0 Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2IErcIFxwCF04k20xvY0x0EwIxGrwCFx2 IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480Y4vE14v2 6r106r1rMI8E67AF67kF1VAFwI0_Jw0_GFylIxkGc2Ij64vIr41lIxAIcVC0I7IYx2IY67 AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Gr0_Cr1lIxAIcVCF04k26cxKx2IY s7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Gr 0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x0JUd8n5UUUUU= X-CM-SenderInfo: 51xn3trlr6x35dzhxuhorxvhhfrp/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_PASS 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1753265261190715002?= X-GMAIL-MSGID: =?utf-8?q?1753265261190715002?= From: Yu Kuai Otherwise, user might get abnormal values if params is updated concurrently. Signed-off-by: Yu Kuai Acked-by: Tejun Heo --- block/blk-iocost.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/block/blk-iocost.c b/block/blk-iocost.c index ce4eafbada56..f8726e20da20 100644 --- a/block/blk-iocost.c +++ b/block/blk-iocost.c @@ -3129,6 +3129,7 @@ static u64 ioc_qos_prfill(struct seq_file *sf, struct blkg_policy_data *pd, if (!dname) return 0; + spin_lock_irq(&ioc->lock); seq_printf(sf, "%s enable=%d ctrl=%s rpct=%u.%02u rlat=%u wpct=%u.%02u wlat=%u min=%u.%02u max=%u.%02u\n", dname, ioc->enabled, ioc->user_qos_params ? "user" : "auto", ioc->params.qos[QOS_RPPM] / 10000, @@ -3141,6 +3142,7 @@ static u64 ioc_qos_prfill(struct seq_file *sf, struct blkg_policy_data *pd, ioc->params.qos[QOS_MIN] % 10000 / 100, ioc->params.qos[QOS_MAX] / 10000, ioc->params.qos[QOS_MAX] % 10000 / 100); + spin_unlock_irq(&ioc->lock); return 0; } @@ -3320,12 +3322,14 @@ static u64 ioc_cost_model_prfill(struct seq_file *sf, if (!dname) return 0; + spin_lock_irq(&ioc->lock); seq_printf(sf, "%s ctrl=%s model=linear " "rbps=%llu rseqiops=%llu rrandiops=%llu " "wbps=%llu wseqiops=%llu wrandiops=%llu\n", dname, ioc->user_cost_model ? "user" : "auto", u[I_LCOEF_RBPS], u[I_LCOEF_RSEQIOPS], u[I_LCOEF_RRANDIOPS], u[I_LCOEF_WBPS], u[I_LCOEF_WSEQIOPS], u[I_LCOEF_WRANDIOPS]); + spin_unlock_irq(&ioc->lock); return 0; } From patchwork Mon Dec 26 08:58:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu Kuai X-Patchwork-Id: 36561 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp809916wrt; Mon, 26 Dec 2022 00:41:48 -0800 (PST) X-Google-Smtp-Source: AMrXdXv6ati5+LWr2pDVKwkbQjN+AQcFFF50dOLvjSa9kKN+iWautHvmnSv2fEf4S0DxxziUWprr X-Received: by 2002:aa7:c69a:0:b0:461:aeeb:9ce1 with SMTP id n26-20020aa7c69a000000b00461aeeb9ce1mr14398659edq.32.1672044108093; Mon, 26 Dec 2022 00:41:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672044108; cv=none; d=google.com; s=arc-20160816; b=IzUmme2wD6ohPeVapW+6Fi8X97P22dETaOAiv53TQ46asbzOp8etpqelGacWnwwhAQ j/rHks5zhvV+W5ipkCxs4OZ6s2WOjIV0kdxszHWBLpQsn0vA1+EC7oc9Us4Gg1ySDQz0 mgHo7rM9DwIhmzXwQnTH2jnwZdK3aOO6fNqcRGXKsiHOanHlUEUX32vPrnNhJdLga4rw CaeuIhr9kWRlGqUiy1oNoEvcR+J1lckPT4nBOyl8PUbbWGrFFXyAy0sEYmUVlfXWWvM/ Ub1L6yVuKgkOhr6h5pJx6UkFk3bzRrP9Zla+fBs0/rCKuHqNY06MoYLoqDYCKjicK18C i7Ug== 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=grsLeOgC8Fh9Kwi2elTyUBBUO4hWgRmy7WGk1jvVRKM=; b=N9n3XZFDqpyNw9Q+bzzZehyR/6YgSqT5tdgkkEWuzqNKlgGghsgFcKMtjdg3HSgvhU Hb1eWTuplLffyv1KEQzy02EieJa902KA/ZIQjmbfksv/8cYuwhy7jv2A+IH9PoZSstzf nSOv+pe7g8cx0/vXU1NOQUcqSp1wimwBnFquqgLsrkh6SdkS2xeRF/ILCTtvlvxexvPC g6I6GaWxz05Rwg+T864C7xG2BUjmbunwEYa8RocHNtzhivzUNW2cuaIzVode7AKBG30R wqitKT805HId8W6jKpRLNxYTWmOjur27CQB+t+1CavLAhbLq2Sg9bEEeSM7LbW6pxiLM Gi1w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ga30-20020a1709070c1e00b00803fd8f08e5si9298088ejc.71.2022.12.26.00.41.25; Mon, 26 Dec 2022 00:41:48 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231916AbiLZIjQ (ORCPT + 99 others); Mon, 26 Dec 2022 03:39:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44654 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231394AbiLZIiq (ORCPT ); Mon, 26 Dec 2022 03:38:46 -0500 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 56A1126D1; Mon, 26 Dec 2022 00:38:44 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.169]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4NgWQl0dMrz4f3kKY; Mon, 26 Dec 2022 16:38:39 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.127.227]) by APP2 (Coremail) with SMTP id Syh0CgBH7eqEXaljOrUjAg--.30907S8; Mon, 26 Dec 2022 16:38:41 +0800 (CST) From: Yu Kuai To: tj@kernel.org, josef@toxicpanda.com, axboe@kernel.dk Cc: cgroups@vger.kernel.org, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, yukuai3@huawei.com, yukuai1@huaweicloud.com, yi.zhang@huawei.com Subject: [PATCH v3 4/5] blk-iocost: fix divide by 0 error in calc_lcoefs() Date: Mon, 26 Dec 2022 16:58:58 +0800 Message-Id: <20221226085859.2701195-5-yukuai1@huaweicloud.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20221226085859.2701195-1-yukuai1@huaweicloud.com> References: <20221226085859.2701195-1-yukuai1@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgBH7eqEXaljOrUjAg--.30907S8 X-Coremail-Antispam: 1UD129KBjvJXoW7Ar48AF47Kry5Zr1kKryUJrb_yoW8WFWrpF yfuw15uF1agrnrAFWxXF1IqFyrZFsFqF1xX3Z7ArsI9FW7AwnxK3Wq9r12grWkAFWfJFWF vayIvFy5uw1Yk37anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUU9C14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2048vs2IY020E87I2jVAFwI0_JF0E3s1l82xGYI kIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2 z4x0Y4vE2Ix0cI8IcVAFwI0_tr0E3s1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Gr1j6F 4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2z280aVCY1x0267AKxVW0oVCq 3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7 IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r4U M4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2IErcIFxwCF04k20xvY0x0EwIxGrw CFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480Y4vE 14v26r106r1rMI8E67AF67kF1VAFwI0_Jw0_GFylIxkGc2Ij64vIr41lIxAIcVC0I7IYx2 IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Gr0_Cr1lIxAIcVCF04k26cxK x2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7CjxVAFwI 0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x0JUQSdkUUUUU= X-CM-SenderInfo: 51xn3trlr6x35dzhxuhorxvhhfrp/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_PASS 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1753265322445335427?= X-GMAIL-MSGID: =?utf-8?q?1753265322445335427?= From: Li Nan echo max of u64 to cost.model can cause divide by 0 error. # echo 8:0 rbps=18446744073709551615 > /sys/fs/cgroup/io.cost.model divide error: 0000 [#1] PREEMPT SMP RIP: 0010:calc_lcoefs+0x4c/0xc0 Call Trace: ioc_refresh_params+0x2b3/0x4f0 ioc_cost_model_write+0x3cb/0x4c0 ? _copy_from_iter+0x6d/0x6c0 ? kernfs_fop_write_iter+0xfc/0x270 cgroup_file_write+0xa0/0x200 kernfs_fop_write_iter+0x17d/0x270 vfs_write+0x414/0x620 ksys_write+0x73/0x160 __x64_sys_write+0x1e/0x30 do_syscall_64+0x35/0x80 entry_SYSCALL_64_after_hwframe+0x63/0xcd calc_lcoefs() uses the input value of cost.model in DIV_ROUND_UP_ULL, overflow would happen if bps plus IOC_PAGE_SIZE is greater than ULLONG_MAX, it can cause divide by 0 error. Fix the problem by setting basecost Signed-off-by: Li Nan Signed-off-by: Yu Kuai --- block/blk-iocost.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/block/blk-iocost.c b/block/blk-iocost.c index f8726e20da20..c6b39024117b 100644 --- a/block/blk-iocost.c +++ b/block/blk-iocost.c @@ -866,9 +866,13 @@ static void calc_lcoefs(u64 bps, u64 seqiops, u64 randiops, *page = *seqio = *randio = 0; - if (bps) - *page = DIV64_U64_ROUND_UP(VTIME_PER_SEC, - DIV_ROUND_UP_ULL(bps, IOC_PAGE_SIZE)); + if (bps) { + if (bps >= U64_MAX - IOC_PAGE_SIZE) + *page = 1; + else + *page = DIV64_U64_ROUND_UP(VTIME_PER_SEC, + DIV_ROUND_UP_ULL(bps, IOC_PAGE_SIZE)); + } if (seqiops) { v = DIV64_U64_ROUND_UP(VTIME_PER_SEC, seqiops); From patchwork Mon Dec 26 08:58:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu Kuai X-Patchwork-Id: 36560 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp809781wrt; Mon, 26 Dec 2022 00:41:17 -0800 (PST) X-Google-Smtp-Source: AMrXdXs+axx2AupA5MN9Pw8a9KTgAdd0udr4maWj7kATdu/pvSmvsPm8aAfZH7SZJlhI9AXj/FyF X-Received: by 2002:a17:907:c084:b0:7c1:22a6:818f with SMTP id st4-20020a170907c08400b007c122a6818fmr14924976ejc.25.1672044077438; Mon, 26 Dec 2022 00:41:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672044077; cv=none; d=google.com; s=arc-20160816; b=FL7w7VHLXtcvwjniIpDVapgVYH6Nd2JYPXDKzyPTHaaJijdoDnQWkKtbwpk3RQcWKF rpV6zlOmTEGIWUuCilyo7uv1liVh1F4jPBhy7/TW4I8agU4VyaVOLnuAFdOi2WdanMJ7 DQWN+OkInYGvYlkRqiE+Gpu0kp5ueqS1BgboU05+W4A7xpzrmDG2zERE/rZ1pSv2JKuj be75hyZ725Cs1Xr/1TbkuyydIzbJ0mVVySmqsVoGJw8v2XBXTgnW6aDZ9EX6az/65qSf w5vHmuOCqPDhV1yN+qe4fnUZFlCn9/cceH1zkVVOZK+i24Dd7XrobFwzYi/adteNBYf7 jQPw== 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=c3JJSCbS0YyewAbynfpPAQy38EEF8iQBiRuu9pqGO38=; b=RTOze+SSP0tI8RtLbErcRuVo9r1ypcgOICTS01zHAB3dNgu1lPGa3RgiiRCp7X98OC L4lDvbpFd9HDElNLcbV15RlTKzAHyrDKucKOngrDq6yjox9VSlZgjaod1i7c2cuUVtXy EB/h64vbzqZ7SxhWklA6VoC67dE1eoLZ258UOs1EBbICx8qGeN52uWt3fYnvD+uV/oBm ZYt4qMCXNwlVgq+12+QM/tPLT7j0GN3BMzJkGW/NI7HWi+CR+a08fBl/fCP77At7JTER /OoWTfhPYomhWIZf/ehXlI7WuB/2Afpzh1WnXS1ZI6cKr8BsjpqnIbjRYAUTOx5kOJsX mi/w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id cs18-20020a170906dc9200b007aedb84056csi9054987ejc.718.2022.12.26.00.40.53; Mon, 26 Dec 2022 00:41:17 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231904AbiLZIjM (ORCPT + 99 others); Mon, 26 Dec 2022 03:39:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44656 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231583AbiLZIiq (ORCPT ); Mon, 26 Dec 2022 03:38:46 -0500 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DC2B126D6; Mon, 26 Dec 2022 00:38:44 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.169]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4NgWQl2ZNvz4f3mSB; Mon, 26 Dec 2022 16:38:39 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.127.227]) by APP2 (Coremail) with SMTP id Syh0CgBH7eqEXaljOrUjAg--.30907S9; Mon, 26 Dec 2022 16:38:42 +0800 (CST) From: Yu Kuai To: tj@kernel.org, josef@toxicpanda.com, axboe@kernel.dk Cc: cgroups@vger.kernel.org, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, yukuai3@huawei.com, yukuai1@huaweicloud.com, yi.zhang@huawei.com Subject: [PATCH v3 5/5] blk-iocost: change div64_u64 to DIV64_U64_ROUND_UP in ioc_refresh_params() Date: Mon, 26 Dec 2022 16:58:59 +0800 Message-Id: <20221226085859.2701195-6-yukuai1@huaweicloud.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20221226085859.2701195-1-yukuai1@huaweicloud.com> References: <20221226085859.2701195-1-yukuai1@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgBH7eqEXaljOrUjAg--.30907S9 X-Coremail-Antispam: 1UD129KBjvdXoWruw1DtF4DCw47Aw15WFyxAFb_yoWDGFg_AF yFqw10v348AF17uFsY9Fs0vrW29an8JF4ku3sxt3y5A3W7JFWkAws7K3s7ZrsxAFW5W3y5 tF1DWrs2vrs2qjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbTkFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI8067AKxVWUAVCq3wA2048vs2 IY020Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28E F7xvwVC0I7IYx2IY67AKxVWDJVCq3wA2z4x0Y4vE2Ix0cI8IcVCY1x0267AKxVW8Jr0_Cr 1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0D M2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjx v20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1l F7xvr2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20VAGYxC7MxAIw28IcxkI7VAKI48JMx C20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAF wI0_JrI_JrWlx4CE17CEb7AF67AKxVWUtVW8ZwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20x vE14v26r1I6r4UMIIF0xvE2Ix0cI8IcVCY1x0267AKxVWxJVW8Jr1lIxAIcVCF04k26cxK x2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7CjxVAFwI 0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x0JUQSdkUUUUU= X-CM-SenderInfo: 51xn3trlr6x35dzhxuhorxvhhfrp/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_PASS 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1753265290378725299?= X-GMAIL-MSGID: =?utf-8?q?1753265290378725299?= From: Li Nan vrate_min is calculated by DIV64_U64_ROUND_UP, but vrate_max is calculated by div64_u64. Vrate_min may be 1 greater than vrate_max if the input values min and max of cost.qos are equal. Signed-off-by: Li Nan Signed-off-by: Yu Kuai Acked-by: Tejun Heo --- block/blk-iocost.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/block/blk-iocost.c b/block/blk-iocost.c index c6b39024117b..7a0d754b9eb2 100644 --- a/block/blk-iocost.c +++ b/block/blk-iocost.c @@ -930,8 +930,8 @@ static bool ioc_refresh_params(struct ioc *ioc, bool force) ioc->vrate_min = DIV64_U64_ROUND_UP((u64)ioc->params.qos[QOS_MIN] * VTIME_PER_USEC, MILLION); - ioc->vrate_max = div64_u64((u64)ioc->params.qos[QOS_MAX] * - VTIME_PER_USEC, MILLION); + ioc->vrate_max = DIV64_U64_ROUND_UP((u64)ioc->params.qos[QOS_MAX] * + VTIME_PER_USEC, MILLION); return true; }