From patchwork Thu Nov 24 14:06:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Li Nan X-Patchwork-Id: 25533 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp3407162wrr; Thu, 24 Nov 2022 05:50:13 -0800 (PST) X-Google-Smtp-Source: AA0mqf4z5gKdJaIKbMgCFtjVDsb3++yXJLEkIMgkOBBhFy1BEowkkJ6JMXday2Y77fCmAnnl6mXb X-Received: by 2002:a05:6402:4284:b0:461:8156:e0ca with SMTP id g4-20020a056402428400b004618156e0camr5405635edc.271.1669297812930; Thu, 24 Nov 2022 05:50:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669297812; cv=none; d=google.com; s=arc-20160816; b=o0+I0D0Lv0WjcHBEVJfpB+CSEd9XQvwPHTm7sz+IgY+GC+594LU0aPKLiFI4U1ScaC HTHhGif0ZrQrjdlgufXqaADjz/Lun5I0eIK14vajpHhNHWKlpakImb6pMBS/vpfQMHg+ X64tTisxPhM93hi7qUJdPWapbjDzPHZK1F2uc7rxoioA1L4i1H775yy//kwkiA2tsLON buHXYuGCqsEjeL02IEJtKiX1IDrNnY4BfU/BjpB+NwiGU/ayuIrrK4dT23/jKKFXntNO 3XwN9H6cVereohk9i36U9eU0bt3Z2AAxgage47prpISCrd8Ti0NztJX/QK36ZfKJ4wKi G4ew== 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 :message-id:date:subject:cc:to:from; bh=DpP9WTFL+WHSl1+jh3OTLLQiNmjgV0nkoLKKbZrBT4Y=; b=jeglXdOO3stgPCTBjCYP99o3E6FY+nqaZ/AXhv1+Qgfpqke6Mi7picrGkZ7Y91gjha ZP4eWZ8dpueuAuLPdGlatKI9GkMBEFhANyjY6DvRnvg1ZTaqTpqcd2NBVPydW7DWR93U 5NTaeWNcwV/8Hcg7G//Felbrb7NWExdZg6DDrh3E8qKSIii9Vgy/mPtkUbMMwCyzDDza l9Bm0WqgEoHbdRnSHoLzElH7SidKI+TkL8P6cpJQ0mZm1z8X2qHsScv7ggoBNUEu+Ug9 itwGGcgCnyrDS8IP4AnWnN3SuSOmWvphlsitu9Oj3dK1sXyNXbyr1Bf8YDD6nOQf5EnQ cJAw== 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 gn25-20020a1709070d1900b007b874abc9b6si448853ejc.790.2022.11.24.05.49.48; Thu, 24 Nov 2022 05:50:12 -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 S229898AbiKXNpf (ORCPT + 99 others); Thu, 24 Nov 2022 08:45:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36648 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230090AbiKXNp2 (ORCPT ); Thu, 24 Nov 2022 08:45:28 -0500 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8B336109581; Thu, 24 Nov 2022 05:45:23 -0800 (PST) Received: from dggpeml500025.china.huawei.com (unknown [172.30.72.54]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4NHzkm5pWJzmW6p; Thu, 24 Nov 2022 21:44:48 +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; Thu, 24 Nov 2022 21:45:21 +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 To: , , CC: , , , , , Subject: [PATCH -next 1/2] blk-iocost: fix divide by 0 error in calc_lcoefs() Date: Thu, 24 Nov 2022 22:06:34 +0800 Message-ID: <20221124140635.695205-1-linan122@huawei.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1750385623498599037?= X-GMAIL-MSGID: =?utf-8?q?1750385623498599037?= 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.I_LCOEF_MAX is introduced to prevent it. Signed-off-by: Li Nan Reviewed-by: Andreas Herrmann --- block/blk-iocost.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/block/blk-iocost.c b/block/blk-iocost.c index f01359906c83..a38a5324bf10 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, }; @@ -3406,6 +3409,8 @@ static ssize_t ioc_cost_model_write(struct kernfs_open_file *of, char *input, goto einval; if (match_u64(&args[0], &v)) goto einval; + if (v > I_LCOEF_MAX) + goto einval; u[tok] = v; user = true; } From patchwork Thu Nov 24 14:06:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Li Nan X-Patchwork-Id: 25535 Return-Path: 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 + 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 ); 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 To: , , CC: , , , , , 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 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: 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?= 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 Reviewed-by: Andreas Herrmann --- block/blk-iocost.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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;