[-next,2/2] blk-iocost: change div64_u64 to DIV64_U64_ROUND_UP in ioc_refresh_params()
| Message ID | 20221124140635.695205-2-linan122@huawei.com |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp3407327wrr;
Thu, 24 Nov 2022 05:50:34 -0800 (PST)
X-Google-Smtp-Source:
AA0mqf7y2+OK6z3lnbM9a9ygaQdhyk+9a3B/NkXLGSWX2hRy2PBSlB6NXDWCPB7mcso5eQoyEXOB
X-Received: by 2002:a05:6402:158f:b0:469:acc:1c1b with SMTP id
c15-20020a056402158f00b004690acc1c1bmr26455241edv.228.1669297834140;
Thu, 24 Nov 2022 05:50:34 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; t=1669297834; cv=none;
d=google.com; s=arc-20160816;
b=caqJY84Ja21ZNhyE9L4JtIyvcq/+dv12Osg0wSXz4iiuvNyQymEblSkZw6kyLfVd++
neMpt/8Ix7PTitZ25TUXexxE2jIB3Wspy4rPCXPPPPivdUnOP3rrIHkt0aJbejOGDhii
Y2BS9+yU0HrB8qR/9qywnOD+QKBJdkEGDccuXl3HLc4uIYN1pq0or4U4Q1j/xgua0r/C
e3GBUYbuG7lTiCW5tHanxrFFFuI12WHQmwoBcy0U3iuZyqRS0iSv96Dw/QxNrL+mK6++
Gn5NUkBh2LzkYBAx0VyITuAoNOpnDCIytYMJ/OFNyLhcWMXcmSsjX1TbNfzcEwpdXXcq
qeEA==
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=fq4+YxkUWvUNlwBLLYUT5eTQnxEQzCL4L3q4Wm8f7dI=;
b=jEu1nxRfNRnw/mqXVc0LtJsdZyiyiyyhnoML80mcsI0iahPL0iT/TSeUc9+wk6QRie
tGuyrFa467wHk6/8NkP61YUgfxVn8/rR3DLKgRCUmtP7ZLyfDwrapbOpiv0ya7RaJVDl
1Bb5CEAUO34Dio2rpPgf0bc2MAnNNDLpg+W9k8f/mbOLJuJXGMoV+dQjTnOTqN+msFLR
KEpRcSfaun2/jTiLWDAdGOFja5hoHJ0GLYmBmaxF2uB0D9nEVZXwno1gPq0oPIaIQiOi
uxrAHWQ+dfHbylFuV86uherk711/9cUD/J2ZETo+7wth2btECcy6t7tHyiebjT1FQmmw
qIow==
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;
dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com
Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20])
by mx.google.com with ESMTP id
cw8-20020a170906478800b007ad821844fcsi1099341ejc.528.2022.11.24.05.50.10;
Thu, 24 Nov 2022 05:50:34 -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;
dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S230040AbiKXNpi (ORCPT <rfc822;fengqi706@gmail.com> + 99 others);
Thu, 24 Nov 2022 08:45:38 -0500
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36680 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S230094AbiKXNp3 (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Thu, 24 Nov 2022 08:45:29 -0500
Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DE29A1095A0;
Thu, 24 Nov 2022 05:45:23 -0800 (PST)
Received: from dggpeml500020.china.huawei.com (unknown [172.30.72.56])
by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4NHzkh4cHKzHw1P;
Thu, 24 Nov 2022 21:44:44 +0800 (CST)
Received: from dggpeml500003.china.huawei.com (7.185.36.200) by
dggpeml500020.china.huawei.com (7.185.36.88) with Microsoft SMTP Server
(version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id
15.1.2375.31; Thu, 24 Nov 2022 21:45:22 +0800
Received: from huawei.com (10.175.127.227) by dggpeml500003.china.huawei.com
(7.185.36.200) with Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Thu, 24 Nov
2022 21:45:21 +0800
From: Li Nan <linan122@huawei.com>
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>, <linan122@huawei.com>,
<yukuai3@huawei.com>, <yi.zhang@huawei.com>
Subject: [PATCH -next 2/2] blk-iocost: change div64_u64 to DIV64_U64_ROUND_UP
in ioc_refresh_params()
Date: Thu, 24 Nov 2022 22:06:35 +0800
Message-ID: <20221124140635.695205-2-linan122@huawei.com>
X-Mailer: git-send-email 2.31.1
In-Reply-To: <20221124140635.695205-1-linan122@huawei.com>
References: <20221124140635.695205-1-linan122@huawei.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 7BIT
Content-Type: text/plain; charset=US-ASCII
X-Originating-IP: [10.175.127.227]
X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To
dggpeml500003.china.huawei.com (7.185.36.200)
X-CFilter-Loop: Reflected
X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED,
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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?=
X-GMAIL-THRID: =?utf-8?q?1750385645704382096?=
X-GMAIL-MSGID: =?utf-8?q?1750385645704382096?=
|
| Series |
[-next,1/2] blk-iocost: fix divide by 0 error in calc_lcoefs()
|
|
Commit Message
Li Nan
Nov. 24, 2022, 2:06 p.m. UTC
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 <linan122@huawei.com>
---
block/blk-iocost.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Comments
On Thu, Nov 24, 2022 at 10:06:35PM +0800, Li Nan wrote: > 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 <linan122@huawei.com> > --- > block/blk-iocost.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Reviewed-by: Andreas Herrmann <aherrmann@suse.de> > diff --git a/block/blk-iocost.c b/block/blk-iocost.c > index a38a5324bf10..9030ad8672f3 100644 > --- a/block/blk-iocost.c > +++ b/block/blk-iocost.c > @@ -926,7 +926,7 @@ 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] * > + ioc->vrate_max = DIV64_U64_ROUND_UP((u64)ioc->params.qos[QOS_MAX] * > VTIME_PER_USEC, MILLION); > > return true; > -- > 2.31.1 >
diff --git a/block/blk-iocost.c b/block/blk-iocost.c index a38a5324bf10..9030ad8672f3 100644 --- a/block/blk-iocost.c +++ b/block/blk-iocost.c @@ -926,7 +926,7 @@ 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] * + ioc->vrate_max = DIV64_U64_ROUND_UP((u64)ioc->params.qos[QOS_MAX] * VTIME_PER_USEC, MILLION); return true;