Message ID | 20221130132156.2836184-6-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 q4csp909437wrr; Wed, 30 Nov 2022 05:02:24 -0800 (PST) X-Google-Smtp-Source: AA0mqf4me+NaEM7t89W3e2+lxNLlkkwzZmJ0c+CfIj7OMghkcD+2euwGPPvGPhf0VceQ96TeYVNm X-Received: by 2002:a17:90b:350:b0:219:58c4:ccc9 with SMTP id fh16-20020a17090b035000b0021958c4ccc9mr6057316pjb.181.1669813343823; Wed, 30 Nov 2022 05:02:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669813343; cv=none; d=google.com; s=arc-20160816; b=jPmA3Gc28PBuwDPh0OcRMbrxO0+cuGfYz0mYRLO68csAo8jkqR4iLgfAa76yxBjA9y gszVrbd+t+/gRZm802zgwieU3Kt7kRBgHm3pdVCrRl2c7DhLLXb11FIwzMnF9+npRevJ YkoXUm3VugnG091SY53wnGpqjVKJJ8DXvFxtnt9PoL2JBXnt9hoyWsqbdAFaA/bUkIM/ kVW5NAT+Sdfwhj9xCAjEmkP2oa8dDCxhg7cpxnTeNExcK+Z1/13fhFY/ty4ZWbodt4po n2Q09rVYbE6bObWW8BiU60Kfia0QUku6JHY/I8/HG5OXQc2JBfcb+Y5UP8TLRA/Q0ZnN oZgQ== 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=Gpmgj9GinjtbELh55WCgT2HTG/KLFvxWoYTFVUTNFaA=; b=BtPL6DdKJ5j8p4uolLiXWUAkA2nxfRZBKuTXdGj8fetURM93bC8F7GvL4lGre/Gh5W XAKDx9bEm1hA/ILrDbPQtXNQ9sTcxrEQ1WmuQNiO5cFDqAFMfbbtf+3TnlRNfjieblC9 yucHXWyzwUuunKSEZJGl832BYC4ib9pb+m11+zZmjvzcMLtu9qTlda1KfAxX5MPet/Gx NeLjQVmGbpQlZLwvo3rP0bf6AFryMxp7B1aXfPPWviFLjc/wif678IPDzIZeK1U402IJ mjh3lFLb7rMF1khUxD8VnXB9obeDtgQBC9f+B/pZtGXEliuyXiEAxSn19godm6Ec0DhA M1Cw== 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 u22-20020a056a00099600b00575deb1844asi1480853pfg.381.2022.11.30.05.02.08; Wed, 30 Nov 2022 05:02:23 -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 S235584AbiK3NBW (ORCPT <rfc822;heyuhang3455@gmail.com> + 99 others); Wed, 30 Nov 2022 08:01:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41436 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229929AbiK3NA5 (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Wed, 30 Nov 2022 08:00:57 -0500 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 665EF4AF34; Wed, 30 Nov 2022 05:00:56 -0800 (PST) Received: from dggpeml500025.china.huawei.com (unknown [172.30.72.54]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4NMfSY2Z9Gz15N01; Wed, 30 Nov 2022 21:00:13 +0800 (CST) Received: from dggpeml500003.china.huawei.com (7.185.36.200) by dggpeml500025.china.huawei.com (7.185.36.35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Wed, 30 Nov 2022 21:00:53 +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; Wed, 30 Nov 2022 21:00:52 +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 v2 5/9] blk-iocost: fix divide by 0 error in calc_lcoefs() Date: Wed, 30 Nov 2022 21:21:52 +0800 Message-ID: <20221130132156.2836184-6-linan122@huawei.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20221130132156.2836184-1-linan122@huawei.com> References: <20221130132156.2836184-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?1750926196952948002?= X-GMAIL-MSGID: =?utf-8?q?1750926196952948002?= |
Series |
iocost bugfix
|
|
Commit Message
Li Nan
Nov. 30, 2022, 1:21 p.m. UTC
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:
<TASK>
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.I_LCOEF_MAX is introduced to
prevent it.
Signed-off-by: Li Nan <linan122@huawei.com>
---
block/blk-iocost.c | 5 +++++
1 file changed, 5 insertions(+)
Comments
On Wed, Nov 30, 2022 at 09:21:52PM +0800, Li Nan wrote: > 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: > <TASK> > 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.I_LCOEF_MAX is introduced to > prevent it. > > Signed-off-by: Li Nan <linan122@huawei.com> > --- > block/blk-iocost.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/block/blk-iocost.c b/block/blk-iocost.c > index 3a96cd557c47..f4a754b9d10f 100644 > --- a/block/blk-iocost.c > +++ b/block/blk-iocost.c > @@ -306,6 +306,9 @@ enum { > IOC_PAGE_SIZE = 1 << IOC_PAGE_SHIFT, > IOC_SECT_TO_PAGE_SHIFT = IOC_PAGE_SHIFT - SECTOR_SHIFT, > > + /* avoid overflow */ > + I_LCOEF_MAX = ULLONG_MAX - IOC_PAGE_SIZE, > + > /* if apart further than 16M, consider randio for linear model */ > LCOEF_RANDIO_PAGES = 4096, > }; > @@ -3431,6 +3434,8 @@ static ssize_t ioc_cost_model_write(struct kernfs_open_file *of, char *input, > goto out_unlock; > } > > + if (v > I_LCOEF_MAX) > + goto out_unlock; This is kinda round-about. Can you just make calc_lcoefs to not divide by zero (e.g. just make it 1 if zero)? Thanks.
diff --git a/block/blk-iocost.c b/block/blk-iocost.c index 3a96cd557c47..f4a754b9d10f 100644 --- a/block/blk-iocost.c +++ b/block/blk-iocost.c @@ -306,6 +306,9 @@ enum { IOC_PAGE_SIZE = 1 << IOC_PAGE_SHIFT, IOC_SECT_TO_PAGE_SHIFT = IOC_PAGE_SHIFT - SECTOR_SHIFT, + /* avoid overflow */ + I_LCOEF_MAX = ULLONG_MAX - IOC_PAGE_SIZE, + /* if apart further than 16M, consider randio for linear model */ LCOEF_RANDIO_PAGES = 4096, }; @@ -3431,6 +3434,8 @@ static ssize_t ioc_cost_model_write(struct kernfs_open_file *of, char *input, goto out_unlock; } + if (v > I_LCOEF_MAX) + goto out_unlock; u[tok] = v; user = true; }