From patchwork Tue Oct 18 12:19:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 4144 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp1929528wrs; Tue, 18 Oct 2022 05:22:16 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5OifXtnz/Ms137irEjncLS/+2TmpbUEE6NC9yy+CIo0XP1WWaZl9nfZlJGqfQhbhBv7MQV X-Received: by 2002:a05:6402:5193:b0:45c:e2c6:6f0e with SMTP id q19-20020a056402519300b0045ce2c66f0emr2379984edd.29.1666095736521; Tue, 18 Oct 2022 05:22:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666095736; cv=none; d=google.com; s=arc-20160816; b=AFWEE8UkTBFre5JkkNTHxQbbCUQFqqHNDgpxMoEYLsWP1mfDey7+R+33WiABA79JGa kwZhV12T77RUqzadqilNk04zmQgEUWGfYVFMF2kSFqcmtGPpxHLymsinH5pCjplnMbpN 8MeCKEfjb0Hm3qSeJ5RfKVHZENSFphqSeHbKYUt60znugusy2E1LCh1oXdotnX96fV6C +/V6qH8zUu2Du109EDZANq7q/kWKdh3uRm7kNkQa9J7YyRlkHpdwEkml2oysmz5Lr2LX i87ZACrXKXG7ND/hyMzd58DAKIW51VuHEB6LsX/JW3I5LtBd3zowWBswPBsKOZfV6w/T IFfA== 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=cwWCBQIF3+st5iG3n4QMKEKWBNBtQWL6U+vXzhvKQtw=; b=PHI7IBbINmu+eusiV/yDmtMBOD/9GCPgXyVBBfzG0/5E1dOSp5Q2w1TtfAh6EulxAq Q7YQBGiluqZgTcbYJrjw2KfVa0nn5Oan4B47TYyhFOfpCnyJo7Fr9wOM557pGvZyLiIO KK0vCxfZa4WNDLVB4jMHKbNPUz7Gf/u4W+IzIe9zTrLJdYtrevypa3yZG+rzg3bsKuu9 NCu67wGmP3TcpylUoa5eB0p1S7ZSaURvrmhLUnOyRwqT988DvbhVjqQxy5N5+UPqqdVR 54cEy6QbKyzTtangscE2UpXomig3pUzx2Hx1jN7Mx8mfMxieIAI0vz5eJn+IX9vcxp68 tsvQ== 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 y12-20020a056402270c00b0045d636ca148si8474167edd.575.2022.10.18.05.21.51; Tue, 18 Oct 2022 05:22:16 -0700 (PDT) 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 S229862AbiJRMTl (ORCPT + 99 others); Tue, 18 Oct 2022 08:19:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55382 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229660AbiJRMTi (ORCPT ); Tue, 18 Oct 2022 08:19:38 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4B6DA11478; Tue, 18 Oct 2022 05:19:37 -0700 (PDT) Received: from kwepemi500016.china.huawei.com (unknown [172.30.72.56]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4MsCWk0YdYzpVjT; Tue, 18 Oct 2022 20:16:18 +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, 18 Oct 2022 20:19:34 +0800 From: Kemeng Shi To: , , CC: , , , Subject: [PATCH v2 1/5] blk-iocost: Fix typo in comment Date: Tue, 18 Oct 2022 20:19:28 +0800 Message-ID: <20221018121932.10792-2-shikemeng@huawei.com> X-Mailer: git-send-email 2.14.1.windows.1 In-Reply-To: <20221018121932.10792-1-shikemeng@huawei.com> References: <20221018121932.10792-1-shikemeng@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.174.178.129] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) 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?1747028002844996318?= X-GMAIL-MSGID: =?utf-8?q?1747028002844996318?= soley -> solely Signed-off-by: Kemeng Shi Acked-by: Tejun Heo --- 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 495396425bad..be4bc38821e2 100644 --- a/block/blk-iocost.c +++ b/block/blk-iocost.c @@ -111,7 +111,7 @@ * busy signal. * * As devices can have deep queues and be unfair in how the queued commands - * are executed, soley depending on rq wait may not result in satisfactory + * are executed, solely depending on rq wait may not result in satisfactory * control quality. For a better control quality, completion latency QoS * parameters can be configured so that the device is considered saturated * if N'th percentile completion latency rises above the set point. From patchwork Tue Oct 18 12:19:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 4145 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp1930084wrs; Tue, 18 Oct 2022 05:23:26 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7crKAonBq88L6GO3/ybzv5RloSi6tf+Bok88UbveZgX0LlVebX9BVf5fck2WFNgffQ9vt6 X-Received: by 2002:a17:907:7632:b0:78d:b5ba:87db with SMTP id jy18-20020a170907763200b0078db5ba87dbmr2159923ejc.661.1666095805849; Tue, 18 Oct 2022 05:23:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666095805; cv=none; d=google.com; s=arc-20160816; b=ufGA8QI411UXfQhS0/vg48oMoaCjmNbQwthDlzAF2CcpJ5Qf84lQCedvgypmIKc3Z/ LIz/ajdUXohpf83fcd5toB/fS0N8k74FF6pXKeOHnC4ygRTdLn6voGJvfd3vS5GfT8bU 7GfNjPsJkycu7iLzTLj52NptHAeLO445VB/+K6yt/EUxmiO9MZIzFz/VUlgZfsv5/bET 7U4YLebIJ0r7JTp3fTqCXGsBhQlJucuy8SpSWrzABJ+yyn5TeO7D8ijUzX8BV3opILkV DV6PkbhWW1R1YWsJBn2gncI7mdZc10vQOgEq1xkxzrVTDxI5/2cZr9AGytgMqBacmbMT vjvg== 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=nOnSqj4i6hWGqcxuGP1U1QHsspOlohll2Voy5RQSWfI=; b=rPIvaOlqoBT0G5xqXvKqQqaq+F8Vcup+pepMq0sqcr+XC99XxFE1tW1LjO4omeUDWO EgvnxecbkwhhJDjKzTUR2qRZ1PzIIjY8kviifWOho1K+8OzVRGvX8/x9Cx/9L+IUkJJF Nsjsk3VJFD79WqYtsKmZrBxvb9VRuKB4gG8sWxjos94qmL6MnD+nA87eJywTwc41I2Et 5jVZAQGTc2YqYiIx7bUSY/cZTrrFV7PY/npWai9m4l7maEizET/qINy1x19RG3n2TmDD +oMfZ0owGDZ64t1w8OoV8pQ9r19r8EX5NdWBsexqd8S3zDP+N2Os9zMiSc84mVhWo7h2 by6w== 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 s21-20020a056402015500b00458a650f3fasi10217628edu.409.2022.10.18.05.22.57; Tue, 18 Oct 2022 05:23:25 -0700 (PDT) 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 S229773AbiJRMTt (ORCPT + 99 others); Tue, 18 Oct 2022 08:19:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57214 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229942AbiJRMTn (ORCPT ); Tue, 18 Oct 2022 08:19:43 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A4F242E6; Tue, 18 Oct 2022 05:19:38 -0700 (PDT) Received: from kwepemi500016.china.huawei.com (unknown [172.30.72.55]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4MsCbQ0hRbzHtx3; Tue, 18 Oct 2022 20:19:30 +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, 18 Oct 2022 20:19:35 +0800 From: Kemeng Shi To: , , CC: , , , Subject: [PATCH v2 2/5] blk-iocost: Reset vtime_base_rate in ioc_refresh_params Date: Tue, 18 Oct 2022 20:19:29 +0800 Message-ID: <20221018121932.10792-3-shikemeng@huawei.com> X-Mailer: git-send-email 2.14.1.windows.1 In-Reply-To: <20221018121932.10792-1-shikemeng@huawei.com> References: <20221018121932.10792-1-shikemeng@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.174.178.129] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) 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?1747028075799939131?= X-GMAIL-MSGID: =?utf-8?q?1747028075799939131?= Since commit ac33e91e2daca("blk-iocost: implement vtime loss compensation") split vtime_rate into vtime_rate and vtime_base_rate, we need reset both vtime_base_rate and vtime_rate when device parameters are refreshed. If vtime_base_rate is no reset here, vtime_rate will be overwritten with old vtime_base_rate soon in ioc_refresh_vrate. Signed-off-by: Kemeng Shi Acked-by: Tejun Heo --- block/blk-iocost.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/block/blk-iocost.c b/block/blk-iocost.c index be4bc38821e2..9214733bbc14 100644 --- a/block/blk-iocost.c +++ b/block/blk-iocost.c @@ -906,8 +906,10 @@ static bool ioc_refresh_params(struct ioc *ioc, bool force) if (idx == ioc->autop_idx && !force) return false; - if (idx != ioc->autop_idx) + if (idx != ioc->autop_idx) { atomic64_set(&ioc->vtime_rate, VTIME_PER_USEC); + ioc->vtime_base_rate = VTIME_PER_USEC; + } ioc->autop_idx = idx; ioc->autop_too_fast_at = 0; From patchwork Tue Oct 18 12:19:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 4148 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp1930973wrs; Tue, 18 Oct 2022 05:25:14 -0700 (PDT) X-Google-Smtp-Source: AMsMyM59qYgdSl4Mxdjx1TeBNbev4tUl/FUlN2MWhMW4WDlgDYEjSVB88FfdCNqXBijFCPXsS4Fz X-Received: by 2002:a17:906:844f:b0:78d:8bd1:ee8c with SMTP id e15-20020a170906844f00b0078d8bd1ee8cmr2266787ejy.262.1666095914542; Tue, 18 Oct 2022 05:25:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666095914; cv=none; d=google.com; s=arc-20160816; b=zAqzbqrg7xn/WXXlm0YZmZ8TxHFh1jvsivbTp/Eaz5cF4IM8Mlk6UNjDT58tRui/Nk T4lVeaS0WvOdR/9nZz3iFV8oj6DM1gx7W/R3lK6Zh77us+FHf5sxH7cajYa9QbfypN6H qUcvXr0YEoBiwUloNE3YCbCxFyqe0sRhv1N84SG91VqbMLMA7R+qdgh2c6x1w9TxD6pi RnVa0dQplCbcETDWPQ1b1owDjSGyuYc/uP1hJW9nEUuVuYxI6sNAMr2w6Eof1PWlzAxc nqyMFfjwZak2i5SV2zCVxAni8CtoEaN6MU1D/n8/Cx6MPjdUJcHutKwnkb97ngGuVBb6 1stQ== 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=GgrEhbec/30XJXyI4hr9L/8aZkBJgJAZzamD25UANTQ=; b=0UOgWeM28KMaD1sMv9pQfwnlXsjounVYz1Tf9sZ+YKQxgsWoEf4jzjV+ZOwOkbpsjg W/kDa52Xd5Dn0hG/e5xlnng4mTW6sKPAS8I4P6WC6KL86Lx3rUI10ltSngrEZXp9P0Vz lTUzAkspp3ysTNhlORZaEhWAD7fe/++8T4VF/6Za5AfaeX4742hBsxsoXQwdWrhSG+VM w1goYiZtftEGsE41WF9YzYDe23AOxHV2vccpKWH244ld+C2VHGGLHjzsvrM+QrXsKJg7 +DG9tC2ZJ4n20SEO+CKg3fCST2ok8Y6V+ppL0RFu8gBOj+hPrvWbFQ6CnR1zNme7lcae lNFw== 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 sh36-20020a1709076ea400b0078209ff9896si10821739ejc.509.2022.10.18.05.24.48; Tue, 18 Oct 2022 05:25:14 -0700 (PDT) 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 S230016AbiJRMTw (ORCPT + 99 others); Tue, 18 Oct 2022 08:19:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57222 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229955AbiJRMTn (ORCPT ); Tue, 18 Oct 2022 08:19:43 -0400 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A55D412AC8; Tue, 18 Oct 2022 05:19:38 -0700 (PDT) Received: from kwepemi500016.china.huawei.com (unknown [172.30.72.53]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4MsCXV5c7RzJn2j; Tue, 18 Oct 2022 20:16:58 +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, 18 Oct 2022 20:19:36 +0800 From: Kemeng Shi To: , , CC: , , , Subject: [PATCH v2 3/5] blk-iocost: Trace vtime_base_rate instead of vtime_rate Date: Tue, 18 Oct 2022 20:19:30 +0800 Message-ID: <20221018121932.10792-4-shikemeng@huawei.com> X-Mailer: git-send-email 2.14.1.windows.1 In-Reply-To: <20221018121932.10792-1-shikemeng@huawei.com> References: <20221018121932.10792-1-shikemeng@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.174.178.129] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) 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?1747028189737813995?= X-GMAIL-MSGID: =?utf-8?q?1747028189737813995?= Since commit ac33e91e2daca ("blk-iocost: implement vtime loss compensation") rename original vtime_rate to vtime_base_rate and current vtime_rate is original vtime_rate with compensation. The current rate showed in tracepoint is mixed with vtime_rate and vtime_base_rate: 1) In function ioc_adjust_base_vrate, the first trace_iocost_ioc_vrate_adj shows vtime_rate, the second trace_iocost_ioc_vrate_adj shows vtime_base_rate. 2) In function iocg_activate shows vtime_rate by calling TRACE_IOCG_PATH(iocg_activate... 3) In function ioc_check_iocgs shows vtime_rate by calling TRACE_IOCG_PATH(iocg_idle... Trace vtime_base_rate instead of vtime_rate as: 1) Before commit ac33e91e2daca ("blk-iocost: implement vtime loss compensation"), the traced rate is without compensation, so still show rate without compensation. 2) The vtime_base_rate is more stable while vtime_rate heavily depends on excess budeget on current period which may change abruptly in next period. Signed-off-by: Kemeng Shi Acked-by: Tejun Heo --- block/blk-iocost.c | 2 +- include/trace/events/iocost.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/block/blk-iocost.c b/block/blk-iocost.c index 9214733bbc14..b0991b52e3dd 100644 --- a/block/blk-iocost.c +++ b/block/blk-iocost.c @@ -977,7 +977,7 @@ static void ioc_adjust_base_vrate(struct ioc *ioc, u32 rq_wait_pct, if (!ioc->busy_level || (ioc->busy_level < 0 && nr_lagging)) { if (ioc->busy_level != prev_busy_level || nr_lagging) - trace_iocost_ioc_vrate_adj(ioc, atomic64_read(&ioc->vtime_rate), + trace_iocost_ioc_vrate_adj(ioc, vrate, missed_ppm, rq_wait_pct, nr_lagging, nr_shortages); diff --git a/include/trace/events/iocost.h b/include/trace/events/iocost.h index 6d1626e7a4ce..af8bfed528fc 100644 --- a/include/trace/events/iocost.h +++ b/include/trace/events/iocost.h @@ -38,7 +38,7 @@ DECLARE_EVENT_CLASS(iocost_iocg_state, __assign_str(cgroup, path); __entry->now = now->now; __entry->vnow = now->vnow; - __entry->vrate = now->vrate; + __entry->vrate = iocg->ioc->vtime_base_rate; __entry->last_period = last_period; __entry->cur_period = cur_period; __entry->vtime = vtime; @@ -160,7 +160,7 @@ TRACE_EVENT(iocost_ioc_vrate_adj, TP_fast_assign( __assign_str(devname, ioc_name(ioc)); - __entry->old_vrate = atomic64_read(&ioc->vtime_rate); + __entry->old_vrate = ioc->vtime_base_rate; __entry->new_vrate = new_vrate; __entry->busy_level = ioc->busy_level; __entry->read_missed_ppm = missed_ppm[READ]; From patchwork Tue Oct 18 12:19:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 4149 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp1931162wrs; Tue, 18 Oct 2022 05:25:38 -0700 (PDT) X-Google-Smtp-Source: AMsMyM629XV+4O1kIzGTc2MhfGZHqhqNM/pDf4peGnhRP9kCoqGNwRUvOUu9N9Fvvq/jLBX7cKhx X-Received: by 2002:a17:907:7704:b0:780:da38:4480 with SMTP id kw4-20020a170907770400b00780da384480mr2259749ejc.64.1666095938055; Tue, 18 Oct 2022 05:25:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666095938; cv=none; d=google.com; s=arc-20160816; b=vDytUCDooAqd9b5171RWbmCXqgBIMlxdJzLC+RETbclkBVpnNUjwzzTiMdGiy9BXEV e+IUWpdCKbc268tQWRFBL8cIFj0WwVm4uHUfU65WDj/OW0J1Wh5lQwKIMsSpQI4ye20H hfsqz7c2SwebQE3jiW4lLHx/kMJdHlbgKrkcPKlYR0JUX5PwkOMg3ziSke5CBKxzvL9+ XB5FimMNUFOdcK7cNbxyIDOecghjubWAMK/GFMI2FzRQ7G3E+uVXf+BQVfRhiRVPpVqT K6VIay6bDmeLNFP1mSJnfpADqjwkhlGqcnllKCFs2syrmrGXxF/xXpz63annCeJhxvaN fa5A== 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=y82gj6jFxwSOLT4evzGCtMtiCxWOCmmM05nq/FBHXDg=; b=z+Nr15leX4dG+K6M+djj3wpI4fQFtDYhOweqKGPVEcoeS7Yo1j5bUoDledXicm5Ykf OqSoVBe3MfZuL++Vgcfddzubppg5zlBmq78zvbu7ZoUk8liCy9YbjlzOXMCXwV9a1Uqb zAioyyBtJzHh5lakib89RjMfO1BeuETlfb/icCT8RHmqpuBypc0xtwQvKMUy7NFmdGL6 9PUho0IpBuo/Dtrs/RULPCkS2QAkjPI14JuqjpDx7c59IeLVaJqegiljLexVO6z6INDk iajVrKlIFaK43xsgPRvJQ6c6mHP55EvEnH2ynn3So51a+DyPi876a66jq7WWk8C2K3J1 qEdQ== 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 dz13-20020a0564021d4d00b00458db439f07si13569858edb.14.2022.10.18.05.25.10; Tue, 18 Oct 2022 05:25:38 -0700 (PDT) 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 S230062AbiJRMT7 (ORCPT + 99 others); Tue, 18 Oct 2022 08:19:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57226 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229964AbiJRMTn (ORCPT ); Tue, 18 Oct 2022 08:19:43 -0400 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A5DDC13E3B; Tue, 18 Oct 2022 05:19:39 -0700 (PDT) Received: from kwepemi500016.china.huawei.com (unknown [172.30.72.54]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4MsCXW3M71zJn2y; Tue, 18 Oct 2022 20:16:59 +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, 18 Oct 2022 20:19:37 +0800 From: Kemeng Shi To: , , CC: , , , Subject: [PATCH v2 4/5] blk-iocost: Remove vrate member in struct ioc_now Date: Tue, 18 Oct 2022 20:19:31 +0800 Message-ID: <20221018121932.10792-5-shikemeng@huawei.com> X-Mailer: git-send-email 2.14.1.windows.1 In-Reply-To: <20221018121932.10792-1-shikemeng@huawei.com> References: <20221018121932.10792-1-shikemeng@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.174.178.129] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) 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?1747028214023651179?= X-GMAIL-MSGID: =?utf-8?q?1747028214023651179?= If we trace vtime_base_rate instead of vtime_rate, there is nowhere which accesses now->vrate except function ioc_now using now->vrate locally. Just remove it. Signed-off-by: Kemeng Shi Acked-by: Tejun Heo --- block/blk-iocost.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/block/blk-iocost.c b/block/blk-iocost.c index b0991b52e3dd..761295ed9c5a 100644 --- a/block/blk-iocost.c +++ b/block/blk-iocost.c @@ -556,7 +556,6 @@ struct ioc_now { u64 now_ns; u64 now; u64 vnow; - u64 vrate; }; struct iocg_wait { @@ -1020,10 +1019,11 @@ static void ioc_adjust_base_vrate(struct ioc *ioc, u32 rq_wait_pct, static void ioc_now(struct ioc *ioc, struct ioc_now *now) { unsigned seq; + u64 vrate; now->now_ns = ktime_get(); now->now = ktime_to_us(now->now_ns); - now->vrate = atomic64_read(&ioc->vtime_rate); + vrate = atomic64_read(&ioc->vtime_rate); /* * The current vtime is @@ -1036,7 +1036,7 @@ static void ioc_now(struct ioc *ioc, struct ioc_now *now) do { seq = read_seqcount_begin(&ioc->period_seqcount); now->vnow = ioc->period_at_vtime + - (now->now - ioc->period_at) * now->vrate; + (now->now - ioc->period_at) * vrate; } while (read_seqcount_retry(&ioc->period_seqcount, seq)); } From patchwork Tue Oct 18 12:19:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 4147 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp1930698wrs; Tue, 18 Oct 2022 05:24:44 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7wUWTtl4d8jeizCTlYLiSiWoWMQNBcLkqCnehm7aJeUVBiOXndcQYLxZY0KQklcPr1Eg2e X-Received: by 2002:aa7:d392:0:b0:458:800a:c47 with SMTP id x18-20020aa7d392000000b00458800a0c47mr2329495edq.5.1666095883834; Tue, 18 Oct 2022 05:24:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666095883; cv=none; d=google.com; s=arc-20160816; b=FJtzRkuqwlRfX5OICs0jqUnGOiVoPEFIfPB+sRWHgxdDwf1amhHvgIJejm7LxUvRjI xQ7saLguDGeiUqakAcfxCMHSkn39z8VlGe4sykgdKb/k0+7TbkGHDakGJEt2huNVopU8 mG7GU+iLFRQ8gpnLVDz8zOF4YCOYB/f5mM7AeM15bG71oeq3sPZexl/VN8+4k1hV345m rQH+ifOA+vxSqWCF4OvgieFkCGFEn0+BsTptZVqNvTnuF8NmtteUz672h69/CKSVi9/z 2UzWboSrff7wn/vlDNe94P876+kZacFPV2KuBzCXVAYpjnYbmppJ9d9THNKyqzz2R6xf tFJg== 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=KZI+xF2v45TYGNY11GhjRI7Bm4OESA+H1oD8ggmtTNE=; b=stkQYdCzigatLhL2UhVI0E9rtXMvNX4111paowmxfpkjAOfrgZm49QdXC+enC8ZNO6 zvd6m+aH+TMMrSrkdIP+N4zCV/8c9P1b9krhQmMs5bdEoGhepGFgBzO+HEm7YS04Szt+ X091wtAvqeLcB1dXA1w0/euormXLenJwmQw2rzT6ZIxD/yT6/fvqr0JhRAhJIyUd3Evo /y+7dgSz85Ger/hAPAQvyR4b9BSk6aEpGZhaMUeudD7ilFORdZ5bIBMbupBlJfvaMmDJ KzUzA4p17oAQwaqSv/5ppCnv5YqZYTxzbknlYgK+hHjLf7Kif57TBpkw5YlQ7h8ETN4r 8+cw== 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 h16-20020a170906261000b0077156c9124esi10321497ejc.1001.2022.10.18.05.23.52; Tue, 18 Oct 2022 05:24:43 -0700 (PDT) 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 S230053AbiJRMT4 (ORCPT + 99 others); Tue, 18 Oct 2022 08:19:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57228 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229966AbiJRMTn (ORCPT ); Tue, 18 Oct 2022 08:19:43 -0400 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A600613E8C; Tue, 18 Oct 2022 05:19:40 -0700 (PDT) Received: from kwepemi500016.china.huawei.com (unknown [172.30.72.56]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4MsCXX1Ps9zJn3H; Tue, 18 Oct 2022 20:17:00 +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, 18 Oct 2022 20:19:37 +0800 From: Kemeng Shi To: , , CC: , , , Subject: [PATCH v2 5/5] blk-iocost: Correct comment in blk_iocost_init Date: Tue, 18 Oct 2022 20:19:32 +0800 Message-ID: <20221018121932.10792-6-shikemeng@huawei.com> X-Mailer: git-send-email 2.14.1.windows.1 In-Reply-To: <20221018121932.10792-1-shikemeng@huawei.com> References: <20221018121932.10792-1-shikemeng@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.174.178.129] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) 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?1747028157571363443?= X-GMAIL-MSGID: =?utf-8?q?1747028157571363443?= There is no iocg_pd_init function. The pd_alloc_fn function pointer of iocost policy is set with ioc_pd_init. Just correct it. Signed-off-by: Kemeng Shi Acked-by: Tejun Heo --- 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 761295ed9c5a..96c1571a8a1d 100644 --- a/block/blk-iocost.c +++ b/block/blk-iocost.c @@ -2880,7 +2880,7 @@ static int blk_iocost_init(struct gendisk *disk) spin_unlock_irq(&ioc->lock); /* - * rqos must be added before activation to allow iocg_pd_init() to + * rqos must be added before activation to allow ioc_pd_init() to * lookup the ioc from q. This means that the rqos methods may get * called before policy activation completion, can't assume that the * target bio has an iocg associated and need to test for NULL iocg.