From patchwork Wed Apr 12 16:07:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chengming Zhou X-Patchwork-Id: 82566 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp465445vqo; Wed, 12 Apr 2023 09:44:48 -0700 (PDT) X-Google-Smtp-Source: AKy350aNYVCnXjx+Sfv4VkOL7rVtGqqPWJNORlM0ykLOW+zylHavm8taVSwQpPc68H2ZGx6cYPND X-Received: by 2002:a50:fc0f:0:b0:504:98ea:31e4 with SMTP id i15-20020a50fc0f000000b0050498ea31e4mr12676639edr.4.1681317888127; Wed, 12 Apr 2023 09:44:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681317888; cv=none; d=google.com; s=arc-20160816; b=Eptb7GeWT2otVOSw3iQnIzldDstNNNC46Bwby1whcEpQnvXTIHYvqRjoJLhiYyNuwG DMlcVeXrvK9A3Gp1hIG9I5amPWkI8oJGs8QgIKeYw+uEGtBYZR6SiPHJbf2qe5Cgs+gg yoN8P6seF0O4csr0SIUJKLMSmO2PNXJmkC7Fop5tS+SLrR0MpB+beN3nGXC0kgbnIwh0 tnZi1a8WL3QTEGOfnT8hEMguxXZu5OLQGOkbQLuslOFZVk5daoXAISCb5jWSNAdQZutr BtKCGoxVo+BTiIph/qdpmEr1ioAsChHdUAE14qCIKoXfp6wP83hEvvsza1EnFZHxA2xi Ej0g== 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:dkim-signature; bh=YI/qDpTMRdMgkTJuLjq2rEZXaIXEU3z1owrkp+3opps=; b=kICdgY7tCfrftoxCS8c7SFXzEWr1HkOUtmuooRn4pOjw9EtEHw4vdcVT+x7R5N3r4P kErW78GPtQZL8YhLzPIWHNvYSMoeFMehKpYF3sL5hb4VLaiORA1OnJwBNrjRrA672A/f +NicUYl9qousd2DSetS3La5Y7eEySufoO4+okgQ/Uqgpr7quOJjvNfb81E9UEOBv71Te h1uLmFS6YmA5sKtl5qznU6ug4RFkNv6CxblIulROc9EWR/8DahwbhXVDdTFBe4F6oq4i Zv3ilniymUaBVjsVkphB3BStoK4vYON9GV4JbF3UbhexqyQkZTTOiQ7xOmmitZVEdYaZ nVcg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=ou71pWVf; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t2-20020a056402020200b005049b7f3dcasi7610767edv.661.2023.04.12.09.44.23; Wed, 12 Apr 2023 09:44:48 -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; dkim=pass header.i=@linux.dev header.s=key1 header.b=ou71pWVf; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230156AbjDLQPY (ORCPT + 99 others); Wed, 12 Apr 2023 12:15:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43838 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230134AbjDLQPV (ORCPT ); Wed, 12 Apr 2023 12:15:21 -0400 X-Greylist: delayed 393 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Wed, 12 Apr 2023 09:15:10 PDT Received: from out-14.mta0.migadu.com (out-14.mta0.migadu.com [91.218.175.14]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 53FF56A5A for ; Wed, 12 Apr 2023 09:15:09 -0700 (PDT) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1681315714; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=YI/qDpTMRdMgkTJuLjq2rEZXaIXEU3z1owrkp+3opps=; b=ou71pWVf5VT9CbBBk9if3KGgvw/QwtAA4Qyb6AjKM61VVmqQPp3TudZiYdL6I9cZ0krY9u Vbv1Oz0VBiydJUZ5MpaYEe5+l3EnwB5Dh6R19Q96tBfvtqQBsT75c2SsTW9cmZsJ5x64VR 2OYkq5pZE6L72eC6MABobv5TuFFSoaE= From: chengming.zhou@linux.dev To: axboe@kernel.dk, tj@kernel.org Cc: josef@toxicpanda.com, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, cgroups@vger.kernel.org, Chengming Zhou Subject: [PATCH 1/2] blk-stat: fix QUEUE_FLAG_STATS clear Date: Thu, 13 Apr 2023 00:07:53 +0800 Message-Id: <20230412160754.1981705-1-chengming.zhou@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED 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?1762989585845621443?= X-GMAIL-MSGID: =?utf-8?q?1762989585845621443?= From: Chengming Zhou We need to set QUEUE_FLAG_STATS for two cases: 1. blk_stat_enable_accounting() 2. blk_stat_add_callback() So we should clear it only when ((q->stats->accounting == 0) && list_empty(&q->stats->callbacks)). blk_stat_disable_accounting() only check if q->stats->accounting is 0 before clear the flag, this patch fix it. Also add list_empty(&q->stats->callbacks)) check when enable, or the flag is already set. Signed-off-by: Chengming Zhou Acked-by: Tejun Heo --- block/blk-stat.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/block/blk-stat.c b/block/blk-stat.c index 74a1a8c32d86..bc7e0ed81642 100644 --- a/block/blk-stat.c +++ b/block/blk-stat.c @@ -190,7 +190,7 @@ void blk_stat_disable_accounting(struct request_queue *q) unsigned long flags; spin_lock_irqsave(&q->stats->lock, flags); - if (!--q->stats->accounting) + if (!--q->stats->accounting && list_empty(&q->stats->callbacks)) blk_queue_flag_clear(QUEUE_FLAG_STATS, q); spin_unlock_irqrestore(&q->stats->lock, flags); } @@ -201,7 +201,7 @@ void blk_stat_enable_accounting(struct request_queue *q) unsigned long flags; spin_lock_irqsave(&q->stats->lock, flags); - if (!q->stats->accounting++) + if (!q->stats->accounting++ && list_empty(&q->stats->callbacks)) blk_queue_flag_set(QUEUE_FLAG_STATS, q); spin_unlock_irqrestore(&q->stats->lock, flags); } From patchwork Wed Apr 12 16:07:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chengming Zhou X-Patchwork-Id: 82560 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp452075vqo; Wed, 12 Apr 2023 09:23:30 -0700 (PDT) X-Google-Smtp-Source: AKy350a5lnM+hGqfmNbJ+ahPlZOA4fgXuiX+zHkZDMx91vkJmc5HVfndEDM0YyZPQj9Ah+7fMK6s X-Received: by 2002:a17:907:8d17:b0:8af:2a97:91d4 with SMTP id tc23-20020a1709078d1700b008af2a9791d4mr2865149ejc.14.1681316610197; Wed, 12 Apr 2023 09:23:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681316610; cv=none; d=google.com; s=arc-20160816; b=iuFKWA29oIsZJNJwZ+hab76AameRPyXwadDD14BiZ7DJW4PpewMs8+TqKDb3WfTvdM 5CNsqDLR6lPSDxUMpD6gLPr3dIhq5BEnK+qumNPu3gFyb5RSYe4mAuu0JwGgN7MOiwYl fuYll5fqg2Iyk2HtsCBhy6sepM/sN9uLeGue+KAlolU+X62X90ScnLFgyqt/PSr6hI5d IunBma1Jgcem4axkVTiAMS6Y0FsEgsDCEGxSg5jbg/y+uvSKuwBSNXyw65wLS1PwQ9Tv X+fMXWSgOKUuqAWfPLhJFufz32F+lX6yA+jiDwcQuqeYTEzbEd99KlwOtZ3lyWN1Xwc1 HAVw== 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 :dkim-signature; bh=3bKPEl8cLlrZ/2VwDkHe7tcZKUdIgYwqtpZzpBiFHDM=; b=liMAzX+r0AxoZbmYrpKc0G3pfc6QukIHoG/dMxkvVM5oW2r18nykY/UiQlK1Nfdhdz SotlqjRvmW6xC0ifc/6WK8t1M8bFgnS2onAHxkTBRgtfqrwsUVNDRzzSYRmbVXQQR/mM pauPmvcULhCVW8wJcipmnGDYZD5LU5hkGF0HX5PAZZmEQNYDi+jG5wwGqxC8MPJnpTlV lw78PBp0Z0L+qieRJ050pFfiXtUqG9zn2+BH6eRxKC5wRNM9wDTlvJwfUrOXCG1VZzj8 aFSoYCgkQqLb61yzk2QDOjn7gjbmJ1fjcchl+DFb50+f7cicsXGku+HNpfh+glNzf2l6 JQ3Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=cnCBC4Fw; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id p5-20020aa7d305000000b005049c3517d7si1768813edq.22.2023.04.12.09.23.05; Wed, 12 Apr 2023 09:23:30 -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; dkim=pass header.i=@linux.dev header.s=key1 header.b=cnCBC4Fw; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230088AbjDLQP0 (ORCPT + 99 others); Wed, 12 Apr 2023 12:15:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43854 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229949AbjDLQPV (ORCPT ); Wed, 12 Apr 2023 12:15:21 -0400 X-Greylist: delayed 392 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Wed, 12 Apr 2023 09:15:10 PDT Received: from out-53.mta0.migadu.com (out-53.mta0.migadu.com [IPv6:2001:41d0:1004:224b::35]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 542AE6A68 for ; Wed, 12 Apr 2023 09:15:09 -0700 (PDT) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1681315717; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3bKPEl8cLlrZ/2VwDkHe7tcZKUdIgYwqtpZzpBiFHDM=; b=cnCBC4FwQKZKslE1NCHQUuxO6RB9n5wldYgPudjea9JE6Vc63s5tmmAc54YAodnGf2xIif JXRFme7vMTMpK53ZoJ/9FULSDVDyiQaQ1s5jHSz54tRERNJ7pnZ8JQnprkAtNqnicgFZyi ijnKHZEWNJ3pDH0outC5ygYPvdwfRWA= From: chengming.zhou@linux.dev To: axboe@kernel.dk, tj@kernel.org Cc: josef@toxicpanda.com, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, cgroups@vger.kernel.org, Chengming Zhou Subject: [PATCH 2/2] blk-throttle: only enable blk-stat when BLK_DEV_THROTTLING_LOW Date: Thu, 13 Apr 2023 00:07:54 +0800 Message-Id: <20230412160754.1981705-2-chengming.zhou@linux.dev> In-Reply-To: <20230412160754.1981705-1-chengming.zhou@linux.dev> References: <20230412160754.1981705-1-chengming.zhou@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=unavailable 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?1762988245779817856?= X-GMAIL-MSGID: =?utf-8?q?1762988245779817856?= From: Chengming Zhou blk_throtl_register() will unconditionally enable blk-stat for gendisk when register, even when we have no BLK_DEV_THROTTLING_LOW config. Since the kernel always has only BLK_DEV_THROTTLING config and the BLK_DEV_THROTTLING_LOW config is still in EXPERIMENTAL state, we can just skip blk-stat when !BLK_DEV_THROTTLING_LOW. Signed-off-by: Chengming Zhou Acked-by: Tejun Heo --- block/blk-throttle.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/block/blk-throttle.c b/block/blk-throttle.c index 47e9d8be68f3..3c07c9cfa70a 100644 --- a/block/blk-throttle.c +++ b/block/blk-throttle.c @@ -2439,11 +2439,12 @@ void blk_throtl_register(struct gendisk *disk) #ifndef CONFIG_BLK_DEV_THROTTLING_LOW /* if no low limit, use previous default */ td->throtl_slice = DFL_THROTL_SLICE_HD; -#endif +#else td->track_bio_latency = !queue_is_mq(q); if (!td->track_bio_latency) blk_stat_enable_accounting(q); +#endif } #ifdef CONFIG_BLK_DEV_THROTTLING_LOW