From patchwork Tue Nov 8 04:52:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 16864 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2485110wru; Mon, 7 Nov 2022 20:55:08 -0800 (PST) X-Google-Smtp-Source: AMsMyM7+4jTWDmsUYICW7FlK8BjOC+2OPUuyTpxoYnC979iTj71si+KLzEwQdCz7vL0JrOU72Yn2 X-Received: by 2002:a50:9fae:0:b0:464:472e:cbc4 with SMTP id c43-20020a509fae000000b00464472ecbc4mr25433107edf.143.1667883308114; Mon, 07 Nov 2022 20:55:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1667883308; cv=none; d=google.com; s=arc-20160816; b=lY++JJ0kwHE7kz4LJPL1M+nFmFRVY7aOQrcqjTb7GJ3u0qxI13GD6vzcyXFosIv1RE ghjUjeb2pEQ6/7DSK3C5VV4EVitnmKGXj7WBLccGCpN4m102MSjN/6uoqzVMm9RlH9tr TsaDfIh7g/teVOYt+aAlLH2fkQLpJnooUPf8YD1M4iQyCsaI36iXs2BdyvMwsW8lSsv+ Kjx90l6bCf+YEZxXwo3kRMBQO6879YP7/o+3t5S5DULXJeL+RsIRYCNvirvhu5ktRanL j0BN4DyHfZWnegTuVhtL1NmPc6kmsmb259EyL4lwm6YgcXxBkitHo7kK5vT3c93Z3iVU TIyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from; bh=dC/F2o7WbwN0l/inK0Pvrbg3OBsf8DF/1CKz1y8CArA=; b=TtaGhe5OjDX2Co7dkQdhdayIwLepsK7cClS2/TTDppiXjVVk1M/sM7OBpbJ4xwb/aY iLPMh4tLX9Ozg0lRx46ZKkdL1TrGH7bKxHbJJ485xcoCZIiK3/KE20tWVg3xh/ypK7/l chWdQPljja7ZF+1tDL2lMQ4QYtlEJNRRqqc6OSfCYAv3nX4W137wBuAvEoeE6ZPMzpBt 9l0f4uGydp+KScdE9Xp+XOlZM5SnYMX1XQ+f7m3nFfPqGNyhlMvSeJ8ax2ibT/GVluJ8 w87GW4UUHsI8BH6t2Q80r2HIfugz165ECmgmVfw1a7dl+7O/IljUFmHkCh4DXbUPzEXa Ih0A== 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 hr15-20020a1709073f8f00b007ae64410b4bsi872521ejc.741.2022.11.07.20.54.43; Mon, 07 Nov 2022 20:55:08 -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 S233352AbiKHExb (ORCPT + 99 others); Mon, 7 Nov 2022 23:53:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57036 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233140AbiKHEwn (ORCPT ); Mon, 7 Nov 2022 23:52:43 -0500 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8A5121B1F2; Mon, 7 Nov 2022 20:52:35 -0800 (PST) Received: from kwepemi500016.china.huawei.com (unknown [172.30.72.55]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4N5wgs6vr6zRp5b; Tue, 8 Nov 2022 12:52:25 +0800 (CST) Received: from huawei.com (10.174.178.129) by kwepemi500016.china.huawei.com (7.221.188.220) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Tue, 8 Nov 2022 12:52:32 +0800 From: Kemeng Shi To: , CC: , , Subject: [PATCH 09/10] block, bfq: remove unused bfq_wr_max_time in struct bfq_data Date: Tue, 8 Nov 2022 12:52:23 +0800 Message-ID: <20221108045224.19092-10-shikemeng@huawei.com> X-Mailer: git-send-email 2.14.1.windows.1 In-Reply-To: <20221108045224.19092-1-shikemeng@huawei.com> References: <20221108045224.19092-1-shikemeng@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.174.178.129] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To kwepemi500016.china.huawei.com (7.221.188.220) 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?1748902407604037424?= X-GMAIL-MSGID: =?utf-8?q?1748902407604037424?= bfqd->bfq_wr_max_time is set to 0 in bfq_init_queue and is never changed. It is only used in bfq_wr_duration when bfq_wr_max_time > 0 which never meets, so bfqd->bfq_wr_max_time is not used actually. Just remove it. Signed-off-by: Kemeng Shi --- block/bfq-iosched.c | 4 ---- block/bfq-iosched.h | 2 -- 2 files changed, 6 deletions(-) diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index 64c1249d8eda..40ac219b2d8f 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -1120,9 +1120,6 @@ static unsigned int bfq_wr_duration(struct bfq_data *bfqd) { u64 dur; - if (bfqd->bfq_wr_max_time > 0) - return bfqd->bfq_wr_max_time; - dur = bfqd->rate_dur_prod; do_div(dur, bfqd->peak_rate); @@ -7138,7 +7135,6 @@ static int bfq_init_queue(struct request_queue *q, struct elevator_type *e) */ bfqd->bfq_wr_coeff = 30; bfqd->bfq_wr_rt_max_time = msecs_to_jiffies(300); - bfqd->bfq_wr_max_time = 0; bfqd->bfq_wr_min_idle_time = msecs_to_jiffies(2000); bfqd->bfq_wr_min_inter_arr_async = msecs_to_jiffies(500); bfqd->bfq_wr_max_softrt_rate = 7000; /* diff --git a/block/bfq-iosched.h b/block/bfq-iosched.h index 71f721670ab6..48c147e5f9e0 100644 --- a/block/bfq-iosched.h +++ b/block/bfq-iosched.h @@ -719,8 +719,6 @@ struct bfq_data { * is multiplied. */ unsigned int bfq_wr_coeff; - /* maximum duration of a weight-raising period (jiffies) */ - unsigned int bfq_wr_max_time; /* Maximum weight-raising duration for soft real-time processes */ unsigned int bfq_wr_rt_max_time;