From patchwork Sun Feb 19 10:42:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 59064 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp656338wrn; Sat, 18 Feb 2023 18:43:11 -0800 (PST) X-Google-Smtp-Source: AK7set/kGI5uezFNAlNHqRhvUHhw6J2v2Wns5Pay9nyBPI/ebmCUlgsjV+QCNpsQ5Xnvl46naq6G X-Received: by 2002:a17:902:dac6:b0:19a:9055:6658 with SMTP id q6-20020a170902dac600b0019a90556658mr2013419plx.18.1676774591012; Sat, 18 Feb 2023 18:43:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676774590; cv=none; d=google.com; s=arc-20160816; b=gYEBkfnbWTsn8Thm6b8ue5Ur6tEvl21Y3YRCrSLoo8j8Wzj4D3kZ97mYXVc/Ms9l1Q j+3S/65InUYn91V/3qxcmIjAwpPw7NkQrEwc0R8Eat3PcDNaErvkjgIxHf4qKpIhXXEN i94LEOUxNWV/Jyb0PWx9b9bxTj+ewKkbredWt6OiBMAODjAYG6ICw4VWLb/Q2jrTag1e jezS7FPBo/zh+rfvZ3C6ROKwKNgq5MA4Xsc6oG+WBQRHMGTKBicRUMux1cmRdlVzoocJ DNRdVWzerEHDd5Bpf1960gVM7Y3o/EPw6kh7IfyRuiUtrlsgViVhYeshb42WIpWclBtz RmkQ== 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=/Dl81Or8XSvLPHtAQacI2mZ//xzxqYXq/756N95rS8g=; b=s6iCqVZeIC94kyFCuBkkIeFhoBdL4U1X7GmD0+nOkkHEqGWIHI+A5d39nxVztRLa21 8mq+5EDDoN2S2FIePzr2lJAWh0KGla4i1BkHcJ1YwfEOPpz2i1hycuVWKOxUIJ5+csk3 QA1mJT9MkQsO7KwJ9Gy2vjhHbVM+MwWbL2cwMatP+AXw/uvgb5M95wxsaCdYlvvD4kJ8 6aeTowag5k5XfJBABlO9KSE4e6r6u6L8/vlKndo+cU9i/tjlnxBhARKJBiYJZ2ANEpRW 5MDRlodCrSM+VUnDzqtCup9Plcr3OVLqHgLl6MFC2pc1eK2mE0TJEYLOM76c81w280+d BOVw== 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g18-20020a633752000000b00491ad1ca2f2si10141237pgn.835.2023.02.18.18.42.58; Sat, 18 Feb 2023 18:43:10 -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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229723AbjBSCln (ORCPT + 99 others); Sat, 18 Feb 2023 21:41:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42264 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229591AbjBSCl2 (ORCPT ); Sat, 18 Feb 2023 21:41:28 -0500 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 33E6311EB2; Sat, 18 Feb 2023 18:41:26 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4PK8v42lPhz4f3mLg; Sun, 19 Feb 2023 10:41:20 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP2 (Coremail) with SMTP id Syh0CgBH7utQjPFjPmleDw--.7604S3; Sun, 19 Feb 2023 10:41:22 +0800 (CST) From: Kemeng Shi To: paolo.valente@linaro.org, axboe@kernel.dk, jack@suse.cz Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, shikemeng@huaweicloud.com Subject: [PATCH 01/17] block, bfq: properly mark bfqq remained idle Date: Sun, 19 Feb 2023 18:42:53 +0800 Message-Id: <20230219104309.1511562-2-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230219104309.1511562-1-shikemeng@huaweicloud.com> References: <20230219104309.1511562-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgBH7utQjPFjPmleDw--.7604S3 X-Coremail-Antispam: 1UD129KBjvJXoW7Ww48Kr1xtrWrKF4kAFy7KFg_yoW8GrWUpa srGr4vqryrKrWrtF48Wa1rXF18K3s7Gr17XF15uw4UZ3yjqFn7tFsayw4FqryFvrWIkwsx ZwnrWr9xWr90kw7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUBE14x267AKxVW8JVW5JwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2jI8I6cxK62vIxIIY0VWUZVW8XwA2048vs2IY02 0E87I2jVAFwI0_Jr4l82xGYIkIc2x26xkF7I0E14v26r1I6r4UM28lY4IEw2IIxxk0rwA2 F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjcxK6xIIjx v20xvEc7CjxVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2 z280aVCY1x0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0V AKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1l Ox8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2IErc IFxwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v2 6r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIxkGc2 Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI0_ Gr0_Cr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMI IF0xvEx4A2jsIEc7CjxVAFwI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x0pR3PE3UUUUU = X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, SPF_HELO_NONE,SPF_NONE 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?1758225593834812474?= X-GMAIL-MSGID: =?utf-8?q?1758225593834812474?= Bfqq activation will try to recover the "service hole" of bfqq which may issues requests greedily while remained idle for other reasons: CPU high load, bfqq not enjoying idling, I/O throttling somewhere in the path from the process to the I/O scheduler. So we should mark bfqq remained idle when expired for two reasons: BFQQE_NO_MORE_REQUESTS or BFQQE_TOO_IDLE. More details can be found in comment of bfq_bfqq_update_budg_for_activation. So we should mark bfqq remained idle expired for BFQQE_NO_MORE_REQUESTS or BFQQE_TOO_IDLE instead of (reason != BFQQE_BUDGET_TIMEOUT && reason != BFQQE_BUDGET_EXHAUSTED). Signed-off-by: Kemeng Shi --- block/bfq-iosched.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index 777dcab73c8e..3f5c740664ce 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -4420,8 +4420,8 @@ void bfq_bfqq_expire(struct bfq_data *bfqd, /* mark bfqq as waiting a request only if a bic still points to it */ if (!bfq_bfqq_busy(bfqq) && - reason != BFQQE_BUDGET_TIMEOUT && - reason != BFQQE_BUDGET_EXHAUSTED) { + reason == BFQQE_NO_MORE_REQUESTS && + reason == BFQQE_TOO_IDLE) { bfq_mark_bfqq_non_blocking_wait_rq(bfqq); /* * Not setting service to 0, because, if the next rq From patchwork Sun Feb 19 10:42:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 59057 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp655983wrn; Sat, 18 Feb 2023 18:41:58 -0800 (PST) X-Google-Smtp-Source: AK7set8K7Ht09DyVA6K1mXiTojB6T0os/McpipXDF6ETZxRoy4RhnRggLvFlv7SUuS+7ywqZT/sU X-Received: by 2002:a17:902:ce91:b0:19a:9434:af30 with SMTP id f17-20020a170902ce9100b0019a9434af30mr1795798plg.18.1676774517982; Sat, 18 Feb 2023 18:41:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676774517; cv=none; d=google.com; s=arc-20160816; b=cijazuGLt5q1fjrsIeGDGhzexSEfez98rgPCWgq7HcAtyBQgKEha2442VGDwgWrFqa EIUW5Ubc9ARUeGi1XoqvqYeMQu9iicj0UMnbJiHLFhthUdWHeGXuTIenOFGQ+gcQUcgl ToM9GALFtTqObtmmdFRd22l0WsitRNRCeCbc4MAHyR9rPOpDM2w2ITSYdVBvOna5Twtc IKL1hga7pNCKG8i5uaCSA5IPEfFJLjap/gwSsK6sdOxNJpsb6DEB4CjuADOCMvqHeaxM zMBnv29sWTvAyAebbtQHKTTOWLf5ETejXEOAo+6dZ6tqp0r/4tGQAB+myXHGJ8UtiCsC LdLw== 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=GoZb2UlXcIh5hUBATCtk/ubPxaFqt8r+1lWBmYYu1yg=; b=FloMzzJCPhAS5/9X2AVF7ARSA3eNoUOAzyKofDP31L/+dwxvVzWpBqSrHB3sIUJbxE LB1a/5HBjYhWRQe9imLcpRIUVJFHVbGywJgpjMNAT6HKUdRyKVcCuFkFL3pEOvo5GP4/ LXVGwZuzsJuOAxnOOUW01KnXpREaDdR7jTAuAuyaBywKQC15IqGKLFkwsgq8COTbGZ6X 5KRH/aYHkBERoqWI0WQyGU/W0I1eDj7BwjCu/FOOK8+ATCsiKzdFk/ylOTVM18sF/uaI fc58rlWRxusijLQRIgicJ0S4rrI73icc9KLfJr09GQIqbzUxv2HPvy6W/bFty30k4T1D ASSg== 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id p18-20020a170902ebd200b0019c33d387ddsi4614972plg.154.2023.02.18.18.41.36; Sat, 18 Feb 2023 18:41:57 -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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229664AbjBSClc (ORCPT + 99 others); Sat, 18 Feb 2023 21:41:32 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42248 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229441AbjBSCl2 (ORCPT ); Sat, 18 Feb 2023 21:41:28 -0500 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 27F4411EA1; Sat, 18 Feb 2023 18:41:26 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4PK8v456gdz4f3lbQ; Sun, 19 Feb 2023 10:41:20 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP2 (Coremail) with SMTP id Syh0CgBH7utQjPFjPmleDw--.7604S4; Sun, 19 Feb 2023 10:41:22 +0800 (CST) From: Kemeng Shi To: paolo.valente@linaro.org, axboe@kernel.dk, jack@suse.cz Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, shikemeng@huaweicloud.com Subject: [PATCH 02/17] block, bfq: try preemption if bfqq has higher weight and the same priority class Date: Sun, 19 Feb 2023 18:42:54 +0800 Message-Id: <20230219104309.1511562-3-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230219104309.1511562-1-shikemeng@huaweicloud.com> References: <20230219104309.1511562-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgBH7utQjPFjPmleDw--.7604S4 X-Coremail-Antispam: 1UD129KBjvJXoW7AF4xWF43Cw4fZFW7Wr13CFg_yoW8GrykpF 9rG3yUWr17CF4ru3WUJFnavrWrWas3GrnrJrs3ua18CrWUZrnruF9Ik3s3ZF4Igr1IqF4a qr10qr9rX3W5Xw7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPSb4IE77IF4wAFF20E14v26ryj6rWUM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M2 8IrcIa0xkI8VA2jI8067AKxVWUXwA2048vs2IY020Ec7CjxVAFwI0_Gr0_Xr1l8cAvFVAK 0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJwA2z4 x0Y4vE2Ix0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l 84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I 8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AK xVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lF7I21c0EjII2zV CS5cI20VAGYxC7MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E 5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUAV WUtwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY 1x0267AKxVW8JVWxJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI 0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7s RNVbyUUUUUU== X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, SPF_HELO_NONE,SPF_NONE 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?1758225516844483468?= X-GMAIL-MSGID: =?utf-8?q?1758225516844483468?= We will compare priority class and weight of current bfqq with in_service_queue to check if bfqq could preempt in_service_queue. Currently we will try to preempt in_service_queue if bfqq has higher weight than in_service_queue even with lower priority class. Actually, we will only serve bfqq with higher priority class (see bfq_lookup_next_entity), so bfqq with higher weight and lower priority class will not be a candidate to preempt in_service_queue. Compare weight of bfqqs with the same priority in bfq_bfqq_higher_class_or_weight to make preemption check more reasonable. Signed-off-by: Kemeng Shi --- block/bfq-iosched.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index 3f5c740664ce..4868538c9745 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -1768,6 +1768,10 @@ static bool bfq_bfqq_higher_class_or_weight(struct bfq_queue *bfqq, if (bfqq->ioprio_class < in_serv_bfqq->ioprio_class) return true; + /* only try weight comparison with same priority class */ + if (bfqq->ioprio_class != in_serv_bfqq->ioprio_class) + return false; + if (in_serv_bfqq->entity.parent == bfqq->entity.parent) { bfqq_weight = bfqq->entity.weight; in_serv_weight = in_serv_bfqq->entity.weight; From patchwork Sun Feb 19 10:42:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 59058 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp655981wrn; Sat, 18 Feb 2023 18:41:58 -0800 (PST) X-Google-Smtp-Source: AK7set+v44l4An5rWyJtm/Kc627pt67GPKwDdzHn2oVmBu2x9ULp2HoQ5dtduDz4WoIoMiHS8OcH X-Received: by 2002:a17:902:d2c3:b0:19a:80e6:2a21 with SMTP id n3-20020a170902d2c300b0019a80e62a21mr2201790plc.33.1676774517954; Sat, 18 Feb 2023 18:41:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676774517; cv=none; d=google.com; s=arc-20160816; b=03dZBdAuW6lSk2YYOf0qXatogp1a0zOoQqstlQZoL0lpQOE51Ze89IjT/R5ggTA8X4 WYTo1Gq/n2SxNqH7fHFoxOURQ30TaeWlhiIwH8YDUv80lEurEZSRfRYplKpSKizlQ3+f qJNEzlGGzboFn5D8IzLyQVP0XFMf6pkNkYYBtlw9LpXQNY7d/gAsMBUMLcRJHo/pleQJ NWX+X58w7xZSdwp77obiqgFAFhNxee0DAi/F5RFlW87FozKZDkcyq3JUhsi6s4C/qNoY b/0MZOAR6VH9SO4Pf+gxv/ZVtDpnaNGXY6tGGsVUxGFOmDGMeOo7AS2ABUMaxVv2nl/t dJLA== 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=SbRPtdGBC3Lon7O74OiiwH4QymrrSvGM3JDqyf+54LU=; b=Mf6oPqgaDl6nbQn4y1f3SQvlvxhNf4plE57maM8njT5zvVdiXVhson8yjpS2zAQzmn C5DuyLjwlPIrDp0nIbqGNh7L89FLLOO7pBDW6VMU5xad7NCoWlM0orFRqob7HHX1XlWT pQiHwqdY3kgAYJ90E77z5Z4Bq5qFZG2wJ/263oZqubDgtEkez7fVzwTUKOLfwSAGKW2M /4C6NJ5XVbVmRz+2CXBhA1Vv3zrfK6AfD1WcuqrSt+TG0b9UpU9Wke/VllFeOSQ8mY8Y ljz5uRowysYOTSs7RiA7XHYIqjuwUx1X2lyBdNgSy53nvNS/Vpsj+2vZ0lERFLJJwC6m Y7AA== 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q16-20020a170902dad000b0019acbf1dc4asi5467078plx.181.2023.02.18.18.41.38; Sat, 18 Feb 2023 18:41:57 -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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229623AbjBSCl3 (ORCPT + 99 others); Sat, 18 Feb 2023 21:41:29 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42268 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229580AbjBSCl2 (ORCPT ); Sat, 18 Feb 2023 21:41:28 -0500 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5E9E011EB8; Sat, 18 Feb 2023 18:41:26 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4PK8v50zc2z4f3pBt; Sun, 19 Feb 2023 10:41:21 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP2 (Coremail) with SMTP id Syh0CgBH7utQjPFjPmleDw--.7604S5; Sun, 19 Feb 2023 10:41:23 +0800 (CST) From: Kemeng Shi To: paolo.valente@linaro.org, axboe@kernel.dk, jack@suse.cz Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, shikemeng@huaweicloud.com Subject: [PATCH 03/17] block, bfq: only preempt plugged in_service_queue if bfq_better_to_idle say no Date: Sun, 19 Feb 2023 18:42:55 +0800 Message-Id: <20230219104309.1511562-4-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230219104309.1511562-1-shikemeng@huaweicloud.com> References: <20230219104309.1511562-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgBH7utQjPFjPmleDw--.7604S5 X-Coremail-Antispam: 1UD129KBjvJXoW7WrW3Gr15GFy7ZFWfuw4rXwb_yoW8WrWfpF WqkryfXw1xta15Zry7X3yUJFy3uF93G3saqr4xZF4Yq34xAr97C3ZIy34Yqr48Wrs7Aw43 XFyrC3sIgw1UAw7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPSb4IE77IF4wAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M2 8IrcIa0xkI8VA2jI8067AKxVWUWwA2048vs2IY020Ec7CjxVAFwI0_Gr0_Xr1l8cAvFVAK 0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJwA2z4 x0Y4vE2Ix0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l 84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I 8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AK xVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lF7I21c0EjII2zV CS5cI20VAGYxC7MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E 5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUAV WUtwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY 1x0267AKxVW8JVWxJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI 0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7s RNiiSUUUUUU== X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, SPF_HELO_NONE,SPF_NONE 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?1758225517246249299?= X-GMAIL-MSGID: =?utf-8?q?1758225517246249299?= Why we preempt in_service_queue when bfq_better_to_idle say no is (from comment above the preemption expiration): As for throughput, we ask bfq_better_to_idle() whether we still need to plug I/O dispatching. If bfq_better_to_idle() says no, then plugging is not needed any longer, either to boost throughput or to perserve service guarantees. Then the best option is to stop plugging I/O, as not doing so would certainly lower throughput. This preemption only makes sense that IO of in_service_queue is currently plugged and then there is a need to stop plugging. Make sure bfqq is plugged before bfq_better_to_idle check to improve this. Signed-off-by: Kemeng Shi --- block/bfq-iosched.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index 4868538c9745..7b416f9471b3 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -1978,8 +1978,9 @@ static void bfq_bfqq_handle_idle_busy_switch(struct bfq_data *bfqd, if (bfqd->in_service_queue && ((bfqq_wants_to_preempt && bfqq->wr_coeff >= bfqd->in_service_queue->wr_coeff) || - bfq_bfqq_higher_class_or_weight(bfqq, bfqd->in_service_queue) || - !bfq_better_to_idle(bfqd->in_service_queue)) && + bfq_bfqq_higher_class_or_weight(bfqq, bfqd->in_service_queue) || + (bfq_bfqq_wait_request(bfqq) && + !bfq_better_to_idle(bfqd->in_service_queue))) && next_queue_may_preempt(bfqd)) bfq_bfqq_expire(bfqd, bfqd->in_service_queue, false, BFQQE_PREEMPTED); From patchwork Sun Feb 19 10:42:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 59061 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp656104wrn; Sat, 18 Feb 2023 18:42:20 -0800 (PST) X-Google-Smtp-Source: AK7set+Cz13SKN1SEewXWfCHGoHZsP0cjHgVG/ewnIYlDIMcJQ6tBQUAqVYczxaSty21VqRjOvSc X-Received: by 2002:a17:902:e805:b0:19a:59d1:389e with SMTP id u5-20020a170902e80500b0019a59d1389emr3092896plg.23.1676774540363; Sat, 18 Feb 2023 18:42:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676774540; cv=none; d=google.com; s=arc-20160816; b=RuvWJvYlHFYq5uoW4L+VOh+P+3bypFDyPGkIk6cMiX9O35WQF9LJKbGTvmGJrOQGjc JSPOhYybbH3BRUbMDMqohkcQS/nnE7BWSPEhMr7rfbvVxzgkfljo6Bz4fKmMrf/BobDG +P4Cnu8aVs2t+zlEjRsvz69WtFWjsEyCpzfjyJ6QiEUkbDg1qnUZ2QhnLlUweq78Br3h naz1gLbIg6WmDkbcAFXBtBwJI/zg7MVwzaf1+GPU14lcXzTjQThNil1KeyMIelwE2/gv KCr7hKk3wvkgMmIbTI+4E4+yeh4UJfrCMo1cYEXlQU8CkfjxD2h/ziiRIVEkKQXnLOSW TlAA== 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=VpBdr6Mk/az1ylrvx6ouQQWLf2bFekrRUDt23dNMt+o=; b=rXJdgBov1k5n8D6U6irvSMXOZNO4bitb95sLMK3V222QTWolEhKawmU6a/0myYYPTc rIEMAJohBX5PyX5kIAEA7w1E9kdRDKWtD/JoeJywbpWjOYSbnCXFHep8pbC/8ScPFNKP 78a78/Zc3TKRdwajhCC+4FgH7BgvgNjKrrY37+Zxup/cv4utMqPW/37cgAJRjgo/G9YW xhdJaEAk3a5BuoUaYXlEXShClO+4++xGjs3OtDJ4ehr8Czl661lFz36Ntu1AR6b0r8t/ zPC5DkmmNv5Sl2I9E8tuCymVPTDwwQrR9dxSZ11E8nesnerqLOMBtVk1zRqYrLAMDMhP ESuQ== 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 8-20020a630008000000b004fd51160160si93930pga.130.2023.02.18.18.42.07; Sat, 18 Feb 2023 18:42:20 -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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229582AbjBSCli (ORCPT + 99 others); Sat, 18 Feb 2023 21:41:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42274 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229588AbjBSCl2 (ORCPT ); Sat, 18 Feb 2023 21:41:28 -0500 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 67EC212043; Sat, 18 Feb 2023 18:41:26 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4PK8v53SpCz4f3p1G; Sun, 19 Feb 2023 10:41:21 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP2 (Coremail) with SMTP id Syh0CgBH7utQjPFjPmleDw--.7604S6; Sun, 19 Feb 2023 10:41:23 +0800 (CST) From: Kemeng Shi To: paolo.valente@linaro.org, axboe@kernel.dk, jack@suse.cz Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, shikemeng@huaweicloud.com Subject: [PATCH 04/17] block, bfq: recover the "service hole" if enough budget is left Date: Sun, 19 Feb 2023 18:42:56 +0800 Message-Id: <20230219104309.1511562-5-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230219104309.1511562-1-shikemeng@huaweicloud.com> References: <20230219104309.1511562-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgBH7utQjPFjPmleDw--.7604S6 X-Coremail-Antispam: 1UD129KBjvJXoW7ZF48ury5Kw18CFWfAF4kXrb_yoW8XF18pa 9rKryS9rn5WFn8Xa1Iv3W3X34rX3Wfury7t3yFv3yrJa9xZw129F4ay345tayIqFZ7trWa vr1DXryUWw4UZrJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPY14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2jI8I6cxK62vIxIIY0VWUZVW8XwA2048vs2IY02 0E87I2jVAFwI0_JF0E3s1l82xGYIkIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0 rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjcxK6x IIjxv20xvEc7CjxVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xv wVC2z280aVCY1x0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFc xC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_ Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2 IErcIFxwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E 14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIx kGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAF wI0_Gr0_Cr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r 4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x0pRvJPtU UUUU= X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, SPF_HELO_NONE,SPF_NONE 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?1758225540632074916?= X-GMAIL-MSGID: =?utf-8?q?1758225540632074916?= If budget left is less than budget need by next request, the activated bfqq will be expired if it preempts the in-service queue. Avoid to cause useless overhead to check budget left is enough for next request. Signed-off-by: Kemeng Shi --- block/bfq-iosched.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index 7b416f9471b3..edbf5c9aeb47 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -1588,13 +1588,15 @@ static bool bfq_bfqq_update_budg_for_activation(struct bfq_data *bfqd, /* * In the next compound condition, we check also whether there - * is some budget left, because otherwise there is no point in - * trying to go on serving bfqq with this same budget: bfqq - * would be expired immediately after being selected for - * service. This would only cause useless overhead. + * is some budget left for next request to serve, because + * otherwise there is no point in trying to go on serving bfqq + * with this same budget: bfqq would be expired immediately + * after being selected for service. This would only cause + * useless overhead. */ if (bfq_bfqq_non_blocking_wait_rq(bfqq) && arrived_in_time && - bfq_bfqq_budget_left(bfqq) > 0) { + bfq_bfqq_budget_left(bfqq) >= + bfq_serv_to_charge(bfqq->next_rq, bfqq)) { /* * We do not clear the flag non_blocking_wait_rq here, as * the latter is used in bfq_activate_bfqq to signal From patchwork Sun Feb 19 10:42:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 59059 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp656059wrn; Sat, 18 Feb 2023 18:42:11 -0800 (PST) X-Google-Smtp-Source: AK7set++U2aTqdwHtERhvdf380QxsK0mF748NM16Oh9hBn+z77rUV6gYEIgmskBd53RD6ROQQfkV X-Received: by 2002:a17:903:2411:b0:199:49fc:610d with SMTP id e17-20020a170903241100b0019949fc610dmr3147329plo.15.1676774531139; Sat, 18 Feb 2023 18:42:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676774531; cv=none; d=google.com; s=arc-20160816; b=oryTJQcx4hg1ZNJXnkrEAGZhboLho6lteyiLRLZ1TvPeuOcmPIqO2o+j+3kxDzkScV DjITPBt5g4AM6ql5h84Nwe+4tf3zCf+pbdLlY2B/2h3IsrR7hiTDlLWgfoQ71YK9k9m4 +U2aWjED+6roIZkOROjHpYPRX0glcm8o20Lwig0NJ12kZDgJgaQJbmn16VGblBksSKb1 DxdmNpG0Ou05i0CyvpiPkQz7xetuXUiDvZAoQs6AZo5FS+d1i+Pj1vf/E19zfCuX9jM6 E39hJdRKwTw0Qsh1ZrKbWnRL7OnJ9GvhCcLHydLVr+BKXIh2fWO8D+pDyV+ecs46Y9sa Bd1A== 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=zU8IYhUzJlyJaiKDSMXWY2YtfaRuDCHwAlrgju/pw+o=; b=vGysfsn7yizrtXb9aibntHwBBhT6XQP8FKflOfJgS2Ezz1BqC+x+WN1tpS1YIKFjlR 63cXBAmjqPv0eCwJwXaGcSqFWmmJ+uJGT9BI6OzRbq0o2hRv79W238dgw9JoLl5+3ziJ Fz+zt7nMEp8dDWTKLxo1R5v/izgKpSFTM7UK0Q+De+EjQ+l8BtKT+LZ9b7cxlkSLqMz4 7PdvTmh0mINoOaXXTXFe7CcDb/+obcahdSa1SyZO6haHeAP7LB/BFJp4FJo2X+yHXT3d Zjh3jK7cPfeY/c+4R29kgiRxBe7iMoTLd3TFgF7W2Zg2UY4Vy4arJahr5juLHpPXmxh9 zCjA== 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a2-20020a170902710200b00198cc7d0ef4si4607130pll.457.2023.02.18.18.41.58; Sat, 18 Feb 2023 18:42:11 -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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229681AbjBSCld (ORCPT + 99 others); Sat, 18 Feb 2023 21:41:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42282 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229582AbjBSCl2 (ORCPT ); Sat, 18 Feb 2023 21:41:28 -0500 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B2A5B1204D; Sat, 18 Feb 2023 18:41:26 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4PK8v54774z4f3npn; Sun, 19 Feb 2023 10:41:21 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP2 (Coremail) with SMTP id Syh0CgBH7utQjPFjPmleDw--.7604S7; Sun, 19 Feb 2023 10:41:23 +0800 (CST) From: Kemeng Shi To: paolo.valente@linaro.org, axboe@kernel.dk, jack@suse.cz Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, shikemeng@huaweicloud.com Subject: [PATCH 05/17] block, bfq: Update bfqd->max_budget with bfqd->lock held Date: Sun, 19 Feb 2023 18:42:57 +0800 Message-Id: <20230219104309.1511562-6-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230219104309.1511562-1-shikemeng@huaweicloud.com> References: <20230219104309.1511562-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgBH7utQjPFjPmleDw--.7604S7 X-Coremail-Antispam: 1UD129KBjvJXoW7WF17Gr47JFy8XF1rurW5Awb_yoW8AF18pa sFq34Sqr1UJ39aqrsrGa18X3WagwsxWrZrKw4Fqw17JF92yF1Iy3Wjq3WagF4rJF4fAwsr Z3Wvga9Yqa42yrJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPY14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2jI8I6cxK62vIxIIY0VWUZVW8XwA2048vs2IY02 0E87I2jVAFwI0_JF0E3s1l82xGYIkIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0 rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjcxK6x IIjxv20xvEc7CjxVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xv wVC2z280aVCY1x0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFc xC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_ Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2 IErcIFxwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E 14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIx kGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUCVW8JwCI42IY6xIIjxv20xvEc7CjxVAF wI0_Gr0_Cr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r 4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x0pRvJPtU UUUU= X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, SPF_HELO_NONE,SPF_NONE 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?1758225531131810278?= X-GMAIL-MSGID: =?utf-8?q?1758225531131810278?= bfq_max_budget and bfq_user_max_budget maybe be in inconsisten state if bfq_max_budget configuration and bfq_max_budget auto-update happen concurrently. Example sequence: config auto-update bfqd->bfq_max_budget = __data if (bfqd->bfq_user_max_budget == 0) bfqd->bfq_max_budget = bfq_calc_max_budget(bfqd); bfqd->bfq_user_max_budget = __data; Users may set bfq_max_budget successfully while read a different value from they set. bfq_max_budget is only update in update_thr_responsiveness_params and configuration code. As update_thr_responsiveness_params is always called under bfqd->lock, fix this by holding lock in configuration code. Signed-off-by: Kemeng Shi --- block/bfq-iosched.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index edbf5c9aeb47..5b08711cbaf6 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -7489,6 +7489,7 @@ static ssize_t bfq_max_budget_store(struct elevator_queue *e, if (ret) return ret; + spin_lock_irq(&bfqd->lock); if (__data == 0) bfqd->bfq_max_budget = bfq_calc_max_budget(bfqd); else { @@ -7498,6 +7499,7 @@ static ssize_t bfq_max_budget_store(struct elevator_queue *e, } bfqd->bfq_user_max_budget = __data; + spin_unlock_irq(&bfqd->lock); return count; } @@ -7523,8 +7525,11 @@ static ssize_t bfq_timeout_sync_store(struct elevator_queue *e, __data = INT_MAX; bfqd->bfq_timeout = msecs_to_jiffies(__data); + + spin_lock_irq(&bfqd->lock); if (bfqd->bfq_user_max_budget == 0) bfqd->bfq_max_budget = bfq_calc_max_budget(bfqd); + spin_unlock_irq(&bfqd->lock); return count; } From patchwork Sun Feb 19 10:42:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 59060 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp656091wrn; Sat, 18 Feb 2023 18:42:18 -0800 (PST) X-Google-Smtp-Source: AK7set+B6WcDJz0/uswx6RuBVR3x1ZNpUJ7dQwUqkZV9LRZ9DdMtujmoWEuOvl02H0XRlpeF4etU X-Received: by 2002:a17:90b:384d:b0:234:7ccf:3c7c with SMTP id nl13-20020a17090b384d00b002347ccf3c7cmr228500pjb.9.1676774538084; Sat, 18 Feb 2023 18:42:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676774538; cv=none; d=google.com; s=arc-20160816; b=DjY5t/4eXW0roxjAsgk8/8a3SeiKHVFFFc26bvYHIwmkhTjvOrZNPwGS8vRbtgaesv u2MnQs/I11Pjujk4bEt+rJA2jgQvZ6TCUntcFzAjvJ9uuhgQQe1bDGKOjdFC5uGm5Kmu WFqoOQOeNNFyUy9tr7nwFAPNkDB1MnVo/GXyXyoKtiNkI1ShNwoHKsKVijv/3o8hh1I0 dtTjV+vO0VS7LrlIX6rR0i8+8DxjZ0hrWO9C2hpPxyEqO92oQgUfD7rgzAVj3h1eBPEU gl63wunYmUPIWwTyAJXtCj/FANwdfojycAew8Jnvwi2yK2MrjGKEWIWh34F4i1AnstTP U0uw== 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=WUUVtcBWD1UKWzCgK6z9CSscUqpczI4PLgfRIdOMQXw=; b=b5BmW9rZNjSNxB5IH89e6dck7/OXjRBKoMUzvHZysiykuqyd515jL1EIwIoUnhGWsA Y+nm8w5CKk2W5TWCytjrkT3ieBFJ/4J4o3mzvmdBvn8RTpkP4WntQ6WFc5QipjOAn7SI eOh4yttPlNXnMYsZ9zWUZe/7c6kbNpKr6vXdnxlNIf0mlSDgPt0SKhe7OJolAlviBcp0 rtgoHC80CxIviqHCTzZcr8k7HgfSzIrSReQM5pQmpAe13J4MtMseMnF6+2BjE1cQfd6o 6YlAT77HF7geJTnEzIUIg1BpLL8j5Ry4/1YVr6es3LF0o5XPBpBIoW0Ez8zaQLXoErbu wU0w== 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b2-20020a655782000000b004faeaac4dacsi9795285pgr.753.2023.02.18.18.42.04; Sat, 18 Feb 2023 18:42:18 -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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229710AbjBSClg (ORCPT + 99 others); Sat, 18 Feb 2023 21:41:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42284 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229586AbjBSCl2 (ORCPT ); Sat, 18 Feb 2023 21:41:28 -0500 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BA67112051; Sat, 18 Feb 2023 18:41:26 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4PK8v60GP2z4f3pBy; Sun, 19 Feb 2023 10:41:22 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP2 (Coremail) with SMTP id Syh0CgBH7utQjPFjPmleDw--.7604S8; Sun, 19 Feb 2023 10:41:24 +0800 (CST) From: Kemeng Shi To: paolo.valente@linaro.org, axboe@kernel.dk, jack@suse.cz Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, shikemeng@huaweicloud.com Subject: [PATCH 06/17] block, bfq: correct bfq_max_budget and bfq_min_budget Date: Sun, 19 Feb 2023 18:42:58 +0800 Message-Id: <20230219104309.1511562-7-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230219104309.1511562-1-shikemeng@huaweicloud.com> References: <20230219104309.1511562-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgBH7utQjPFjPmleDw--.7604S8 X-Coremail-Antispam: 1UD129KBjvJXoW7Jry5Zw15WF1UWrW3tr47Jwb_yoW8JrW5pa 4qqw10gF17JrZxXrs7K3WUX3W5twsxZF4kKr1YqrWjyF4IyF1ayF18Zw18X3WfKrWIyry5 X3sru34DXa12kaDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPY14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2jI8I6cxK62vIxIIY0VWUZVW8XwA2048vs2IY02 0E87I2jVAFwI0_JF0E3s1l82xGYIkIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0 rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjcxK6x IIjxv20xvEc7CjxVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xv wVC2z280aVCY1x0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFc xC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_ Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2 IErcIFxwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E 14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIx kGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUCVW8JwCI42IY6xIIjxv20xvEc7CjxVAF wI0_Gr0_Cr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r 4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x0pRvJPtU UUUU= X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, SPF_HELO_NONE,SPF_NONE 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?1758225537736894661?= X-GMAIL-MSGID: =?utf-8?q?1758225537736894661?= For case that user set a max_budget, we should use bfq_max_budget set by user instead of bfq_default_max_budget when budgets_assigned is not enough to compulte auto-tuning max_budget. Signed-off-by: Kemeng Shi --- block/bfq-iosched.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index 5b08711cbaf6..b32bae5259d5 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -1458,7 +1458,8 @@ static int bfq_bfqq_budget_left(struct bfq_queue *bfqq) */ static int bfq_max_budget(struct bfq_data *bfqd) { - if (bfqd->budgets_assigned < bfq_stats_min_budgets) + if (bfqd->budgets_assigned < bfq_stats_min_budgets && + bfqd->bfq_user_max_budget == 0) return bfq_default_max_budget; else return bfqd->bfq_max_budget; @@ -1470,7 +1471,8 @@ static int bfq_max_budget(struct bfq_data *bfqd) */ static int bfq_min_budget(struct bfq_data *bfqd) { - if (bfqd->budgets_assigned < bfq_stats_min_budgets) + if (bfqd->budgets_assigned < bfq_stats_min_budgets && + bfqd->bfq_user_max_budget == 0) return bfq_default_max_budget / 32; else return bfqd->bfq_max_budget / 32; From patchwork Sun Feb 19 10:42:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 59063 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp656178wrn; Sat, 18 Feb 2023 18:42:36 -0800 (PST) X-Google-Smtp-Source: AK7set8LCLMy5HiJaK5CoK/MWrWeoDMOeX2dTpFH7f888DBSRzLVfAoDc6wi+/7/Yn3HKC6vaR8E X-Received: by 2002:a17:90b:390f:b0:234:9fa0:300c with SMTP id ob15-20020a17090b390f00b002349fa0300cmr3222980pjb.22.1676774556191; Sat, 18 Feb 2023 18:42:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676774556; cv=none; d=google.com; s=arc-20160816; b=X6I9cUjsVOgtPtJgoW42GqqRXs4QZcNycBLPdd/awhnmKAPjNnGgGfqB/JJF5mAbAV sQX8E152wzwnyWFLGeaygghf0YgoqKQfXUZxUaUmlB1ZvakIRlCyBdNdUplxoOtBdpYp IVKyg82+fKTva4S90EJ4ggEj9b0WPRw597+Wt4I1jm2gIwYXmHQGw3F/6GestbFwVcHx nEBfKNwnOdkVqtINagFuOnPe8kfWEpSWx5xcH/eVG5b+SHskUG4+OIDpu8r8FsAYfMZn GiZ9YiZx2T3mcCS8w8lYhyxD5xU1mOuOFoBZOyB0BcXK6M6Lmi8UB24/uM5goSHwmcnb aVzw== 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=FK30+cxL73kfuGD1AlgwGOkqHcJXiIJxMYhfrWmLaLw=; b=SPxjA8oZL5CW/P5x9/Lmf1CxKvet/drLnNdCX3gSRZXDaXaackEK7OAE7KlPtOyL3w QtM+gFf2uFWOXaWW+jcofmt46QPaAqLeB8HuKjMts9AOOhloMcI9wU0RDQ986bv5Fp9g ElfM9SgGJS71eLnNbCBX6nxBcn8pYyyOuW/WYhP4oBW5mrYtyl7vNEP/Bm7BKd6dmPSn ltzPx+n6qK7oQpsb5e41b8NFhr/RjdDJGFpR+SNjVPccQvkKqG6x3wTxkGEsu7+cGVMa VFlCvN0D7wszsA4tGuIy8GH75H8gasqgYk8X6KVVBgR3dRaTS5HBrtqIV+lqo8Pk+zHZ r2hw== 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y65-20020a638a44000000b005021cf73d48si3703802pgd.190.2023.02.18.18.42.23; Sat, 18 Feb 2023 18:42:36 -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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229743AbjBSClq (ORCPT + 99 others); Sat, 18 Feb 2023 21:41:46 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42288 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229597AbjBSCl2 (ORCPT ); Sat, 18 Feb 2023 21:41:28 -0500 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 079E912057; Sat, 18 Feb 2023 18:41:26 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4PK8v635HWz4f3p1D; Sun, 19 Feb 2023 10:41:22 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP2 (Coremail) with SMTP id Syh0CgBH7utQjPFjPmleDw--.7604S9; Sun, 19 Feb 2023 10:41:24 +0800 (CST) From: Kemeng Shi To: paolo.valente@linaro.org, axboe@kernel.dk, jack@suse.cz Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, shikemeng@huaweicloud.com Subject: [PATCH 07/17] block, bfq: correct interactive weight-raise check in bfq_set_budget_timeout Date: Sun, 19 Feb 2023 18:42:59 +0800 Message-Id: <20230219104309.1511562-8-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230219104309.1511562-1-shikemeng@huaweicloud.com> References: <20230219104309.1511562-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgBH7utQjPFjPmleDw--.7604S9 X-Coremail-Antispam: 1UD129KBjvdXoWrtF17AF1UJFyUZF47AFW3trb_yoWkWFb_C3 Z5tr1rJF1kGr93CFsrt34rAryDKw18J3WkC34xKrnFgr42yFs2k34qgr90yFZ8Za9F9Fy3 JFsYqF1UJrsrZjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbDkFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M28IrcIa0xkI8V A2jI8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK0II2c7xJ M28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJwA2z4x0Y4vE2I x0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK 6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4 xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8 JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20V AGYxC7MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAF wI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUAVWUtwCIc4 0Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1I6r4UMIIF0xvE2Ix0cI8IcVCY1x0267AK xVW8JVWxJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr 1lIxAIcVC2z280aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7sRiVbyDUU UUU== X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, SPF_HELO_NONE,SPF_NONE 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?1758225557484343083?= X-GMAIL-MSGID: =?utf-8?q?1758225557484343083?= After weight-raise finished, bfqq->wr_coeff is reset to 1 while bfqq->wr_cur_max_time may not be reset. For example, Function bfq_update_bfqq_wr_on_rq_arrival will only reset wr_coeff to 1 if bfqq is created in burst creation. Function bfq_set_budget_timeout will be called when bfqq is selected while it's wr_cur_max_time is set and wr_coeff is 1. Fix this by check wr_coeff > 1 along with check wr_cur_max_time check like other code do. Signed-off-by: Kemeng Shi --- block/bfq-iosched.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index b32bae5259d5..5610a7dcacdf 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -3297,7 +3297,8 @@ static void bfq_set_budget_timeout(struct bfq_data *bfqd, { unsigned int timeout_coeff; - if (bfqq->wr_cur_max_time == bfqd->bfq_wr_rt_max_time) + if (bfqq->wr_coeff > 1 && + bfqq->wr_cur_max_time == bfqd->bfq_wr_rt_max_time) timeout_coeff = 1; else timeout_coeff = bfqq->entity.weight / bfqq->entity.orig_weight; From patchwork Sun Feb 19 10:43:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 59062 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp656131wrn; Sat, 18 Feb 2023 18:42:25 -0800 (PST) X-Google-Smtp-Source: AK7set/29/u1znHu684bx+gozhNfpMA7mXHb86LfucyO7o9PsPje8IJtFv7GkkSZfLdi0WFKOcJT X-Received: by 2002:a05:6a20:1608:b0:bf:4296:80fa with SMTP id l8-20020a056a20160800b000bf429680famr5955350pzj.62.1676774545043; Sat, 18 Feb 2023 18:42:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676774545; cv=none; d=google.com; s=arc-20160816; b=TS/Q6TAHVFYXtkZzvnYYAfQhQTVNUgp7Z86c/eeYIVBSd6HcCQufmqoC6T02banheZ q2fdwi82fvSyByoAIUsRIgiRcHi/patMaGzvqnTk4YUAa5KvA0wuva/4YxR7abmMe8UZ yO8n1/v/6vjw4olNLFugErgMrLpKanfnSFXX0aEgQXiehdPDYIWjqglarew1Eid5dZSR jXXvHfpvVG54gZUzRLtVuHULt5UZitgZ8pWDsk8r/ywWGj+M6h0egnpnvnj7a2qdovkH Xnm8jBYdexqVveNhRSXeTysvBMIOQ9SN+S+HYdEM9/D4vd+66BjqhE+otyZwSPQQ0ojo I6MA== 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=iu7aN9ZkRhiOBZ5q8IoRWnm8tfASa6RHYwap/j71TEc=; b=bCuNqozY4M8UmQS0MleirPzTbjWO4AubDBxnG4SzSUwxZFMoEuvBXrloOZ6gXQQs1O k3wIL4+hhYNEqQ691t/L3z6PjH9iRhqsxOiElrdyWkaLgd8z8ECUvsYHxlPC1wKfq0VD xwjRFSjf2wVNkWqEg4hL/qV+nBNszzhefYA9e+urDBc7wu6sP1dFXHBS6kJISF4Vkd5w Q+8cI2jaQKQAZ8REaT4KZm9hTlbRfwa1QcB30ZY4NfedIQJwvfOag1lAnwQzS8dI4ips vzMjObB8A0Q2AR75NVhgHndJAAkx6uaURTG9xT3L50HJ/Q8PdH7fnAfvLEBLtJv7URLt oXqA== 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q9-20020a654949000000b004f2bbbca525si10647129pgs.435.2023.02.18.18.42.11; Sat, 18 Feb 2023 18:42:25 -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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229733AbjBSCll (ORCPT + 99 others); Sat, 18 Feb 2023 21:41:41 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42286 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229593AbjBSCl2 (ORCPT ); Sat, 18 Feb 2023 21:41:28 -0500 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6C9EB12849; Sat, 18 Feb 2023 18:41:27 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4PK8v65Q1jz4f3pFW; Sun, 19 Feb 2023 10:41:22 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP2 (Coremail) with SMTP id Syh0CgBH7utQjPFjPmleDw--.7604S10; Sun, 19 Feb 2023 10:41:24 +0800 (CST) From: Kemeng Shi To: paolo.valente@linaro.org, axboe@kernel.dk, jack@suse.cz Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, shikemeng@huaweicloud.com Subject: [PATCH 08/17] block, bfq: start service_from_wr accumulating of async queues correctly Date: Sun, 19 Feb 2023 18:43:00 +0800 Message-Id: <20230219104309.1511562-9-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230219104309.1511562-1-shikemeng@huaweicloud.com> References: <20230219104309.1511562-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgBH7utQjPFjPmleDw--.7604S10 X-Coremail-Antispam: 1UD129KBjvdXoW7Wr1fXw13uF17Ar43Xw47Arb_yoWftFX_Gw s5Gr1DCFWkGr4rCrsayFW5XFZ5KayrZF1qyFnxKr1UXF1Sq3ZakFyqqFWDtFZrAa17GFnx twnYv345tr40gjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbDAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M28IrcIa0xkI8V A2jI8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK0II2c7xJ M28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJwA2z4x0Y4vE2I x0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK 6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4 xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8 JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20V AGYxC7MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAF wI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUAVWUtwCIc4 0Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1I6r4UMIIF0xvE2Ix0cI8IcVCY1x0267AK xVWxJVW8Jr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r 4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x0pRvJPtU UUUU= X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, SPF_HELO_NONE,SPF_NONE 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?1758225545212446892?= X-GMAIL-MSGID: =?utf-8?q?1758225545212446892?= Start accumulating service_from_wr when async queues are weight raised. The service_from_wr for async queues is accumulated and checked to finish weight-raise as sync queues. We need charge service_from_wr for async queues or service_from_wr will keep accumulating and async queues will finish weight-raise soon after weight-raise starts. Signed-off-by: Kemeng Shi --- block/bfq-iosched.c | 1 + 1 file changed, 1 insertion(+) diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index 5610a7dcacdf..7a0283f08aed 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -2323,6 +2323,7 @@ static void bfq_add_request(struct request *rq) time_is_before_jiffies( bfqq->last_wr_start_finish + bfqd->bfq_wr_min_inter_arr_async)) { + bfqq->service_from_wr = 0; bfqq->wr_coeff = bfqd->bfq_wr_coeff; bfqq->wr_cur_max_time = bfq_wr_duration(bfqd); From patchwork Sun Feb 19 10:43:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 59065 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp656445wrn; Sat, 18 Feb 2023 18:43:29 -0800 (PST) X-Google-Smtp-Source: AK7set8ZQcIqHYG3vYGBqsyXpCuSW9hmkNAfEWf7kTNKVFgfdZ4Z5/BggQcqQIQkKT7qS+isLM59 X-Received: by 2002:a17:903:22c8:b0:198:fded:3b69 with SMTP id y8-20020a17090322c800b00198fded3b69mr1775469plg.53.1676774609184; Sat, 18 Feb 2023 18:43:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676774609; cv=none; d=google.com; s=arc-20160816; b=Ef9f3uDE0WokB1B6jA3ZOI/6oS8hkChIBGL9InxR0pitwRc43lhCLOuv5aN7avKHhu rSaA22wACHZD2rGt49j96H32+aftsoAhpqwOCfjuMJbaUHK4EUm5QD1aL1xob50wfoR7 3uG5KccGNk2ShghC2f2s60DtfzLXeYgBuhXlCvsxjw8X1LY62zgipLOoiVduBAmwCk/b 4aDKeJQWmqYpnYDnWAjK4pOW8kAZIodRmcCtDs9d2Vs442KA8sCp2b1LoYzBMaXPbRiI lyJ74aMKaVWzWIfcDvvbn/wJcTADohOynVecU1kDLzP1+NvS4a/K341lyjnQurlqz/M9 maeA== 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=h7iZB96o4gyhEX1MqOk3He7DiPBn6dm5xCkbPPgfAnE=; b=BplQ9xpjhj/6QYJ7aqZHaaS28/g5mLkpIz/DKkvWz+OSQ7jSFuKcVPb3FVfAKcyzBS 4Qk6PXH8LjM4YsRY6OPJBXXqSk+leBpTx/lcXqHfKmfmpKSG9gZbQxzLYOLFObAtahdr Cz8SmvgKz8O+/3/GAHD0BqBzKjxjV4DqtVW+ZmYTQmJoFFiJqezL264QVMuXtsF3gy9R AaPZVtWkbVTN8UjBYzKdIbY+us6uYrxIBS8SIkgBPiQo9YQSC/jGtQj/rWLzGCnY6L9B fmH6nUFSzM6ga29u4VzZ0WLfM1Df8JJAacc4+20DTSQELCiJzh10qSlMwZrIEplpowEC 459Q== 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l15-20020a170903120f00b001989ca6cec8si5917479plh.149.2023.02.18.18.43.16; Sat, 18 Feb 2023 18:43:29 -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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229775AbjBSCls (ORCPT + 99 others); Sat, 18 Feb 2023 21:41:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42290 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229599AbjBSCl2 (ORCPT ); Sat, 18 Feb 2023 21:41:28 -0500 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9F95512863; Sat, 18 Feb 2023 18:41:27 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4PK8v70DGSz4f3pBv; Sun, 19 Feb 2023 10:41:23 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP2 (Coremail) with SMTP id Syh0CgBH7utQjPFjPmleDw--.7604S11; Sun, 19 Feb 2023 10:41:25 +0800 (CST) From: Kemeng Shi To: paolo.valente@linaro.org, axboe@kernel.dk, jack@suse.cz Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, shikemeng@huaweicloud.com Subject: [PATCH 09/17] block, bfq: stop to detect queue as waker queue if it already is now Date: Sun, 19 Feb 2023 18:43:01 +0800 Message-Id: <20230219104309.1511562-10-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230219104309.1511562-1-shikemeng@huaweicloud.com> References: <20230219104309.1511562-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgBH7utQjPFjPmleDw--.7604S11 X-Coremail-Antispam: 1UD129KBjvdXoW7Xry5Ar18Gw13Cr1fJF4kXrb_yoWfXrbEya yFgr18Aan8Jay5Cr1YvryUtwnrua18Xw1kJFs8tFnrWFn8J3Z5C3sFqrW3AFs8WayxWFya yrsaq3Z8tr4IyjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbDAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M28IrcIa0xkI8V A2jI8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK0II2c7xJ M28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJwA2z4x0Y4vE2I x0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK 6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4 xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8 JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20V AGYxC7MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAF wI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUAVWUtwCIc4 0Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1I6r4UMIIF0xvE2Ix0cI8IcVCY1x0267AK xVWxJVW8Jr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r 4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x0pRvJPtU UUUU= X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, SPF_HELO_NONE,SPF_NONE 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?1758225612353631044?= X-GMAIL-MSGID: =?utf-8?q?1758225612353631044?= If last_completed_rq_bfqq is the current waker queue of bfqq, it's no meaning to execute the detection logic as nothing will change whether detection successes or fails. Signed-off-by: Kemeng Shi --- block/bfq-iosched.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index 7a0283f08aed..0a11a381ee7d 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -2147,7 +2147,8 @@ static void bfq_check_waker(struct bfq_data *bfqd, struct bfq_queue *bfqq, bfq_bfqq_has_short_ttime(bfqq) || now_ns - bfqd->last_completion >= 4 * NSEC_PER_MSEC || bfqd->last_completed_rq_bfqq == &bfqd->oom_bfqq || - bfqq == &bfqd->oom_bfqq) + bfqq == &bfqd->oom_bfqq || + bfqd->last_completed_rq_bfqq == bfqq->waker_bfqq) return; /* From patchwork Sun Feb 19 10:43:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 59066 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp656470wrn; Sat, 18 Feb 2023 18:43:33 -0800 (PST) X-Google-Smtp-Source: AK7set8w4D3K/vUb/S1FX0tJyBdtr/1OXx9GmXrPIzjfnwVDxfMDWUR1nl36V8xOfzrtwXeLCLVg X-Received: by 2002:a62:1c44:0:b0:5a8:b55f:540e with SMTP id c65-20020a621c44000000b005a8b55f540emr6387326pfc.6.1676774612765; Sat, 18 Feb 2023 18:43:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676774612; cv=none; d=google.com; s=arc-20160816; b=A277SyC2Yk1CKNylt5QdZ15hhwSFwohR0/8Q+UTyzz6PxLTaTjWTUMkkZwPwH5uhiG omfHI6E7b38Q4gGWRAnIyWboB208ajTs+uN2JYfSC7EDcH7i4c6NpjwlJE3oTmH+zvg6 ZVD7WHx/6M+iVx7610SW1TxmiLWiW6RV1iR0JzKDMEiJZYbW3U1AEAegQJpn9P7jUxB8 gZyJts2stoMkQAW4MgQYy21L59RYMGBH+f4HA32Ic7gI2xVe+kfL8q9S/EPUzfy9pMNx hsSaI9DQ95hje/7OdmXmw08R3hSyH4FnMDtzx83FIzNQywrjVd9NBauieNqZOv071bV2 d4PQ== 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=sOOsxNXQSMljF6IrRp8YSSh3YgXc+dG/pNsO8tB/754=; b=FF6pdonMQEvJS2l7ZJt0YLdyKOdTM36zQpXbWfgVCDKZNwKMg35D/fsOBjpmRSITru Ggj7kAYAzI8kWlhWWfsChYHyKKb94Nv/DYTcxMbzLbTx7s2bk3SMaEJDHijsW0rEvd6w VXk4JMNURl+NwyqvzYhBd01HtvwigXd3RzWzxt8XSpIG+Qn8jbFgQ1tiUhei5iJBjl2N SMyzT7OVReFyYYPJ/6EJjM4QO5fCuwXTsqdsDPUEZKzvNuNkxhoK4lnNEjRP/sggVzqR LXQ8JDvCJpFeUgMSUXdxTTX28RyUi8YdsBxObiH5yICTTsP/Wrx4mWzp3KonEWwS1FUw ibMw== 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g3-20020a056a0023c300b005a890f9b412si10878416pfc.341.2023.02.18.18.43.20; Sat, 18 Feb 2023 18:43:32 -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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229781AbjBSClv (ORCPT + 99 others); Sat, 18 Feb 2023 21:41:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42282 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229601AbjBSCl2 (ORCPT ); Sat, 18 Feb 2023 21:41:28 -0500 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F2F0612864; Sat, 18 Feb 2023 18:41:27 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4PK8v719P1z4f3npw; Sun, 19 Feb 2023 10:41:23 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP2 (Coremail) with SMTP id Syh0CgBH7utQjPFjPmleDw--.7604S12; Sun, 19 Feb 2023 10:41:25 +0800 (CST) From: Kemeng Shi To: paolo.valente@linaro.org, axboe@kernel.dk, jack@suse.cz Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, shikemeng@huaweicloud.com Subject: [PATCH 10/17] block, bfq: fix typo in comment Date: Sun, 19 Feb 2023 18:43:02 +0800 Message-Id: <20230219104309.1511562-11-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230219104309.1511562-1-shikemeng@huaweicloud.com> References: <20230219104309.1511562-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgBH7utQjPFjPmleDw--.7604S12 X-Coremail-Antispam: 1UD129KBjvJXoW7tw4fuw1fGr13KF18Wr45Jrb_yoW8Xr1rpa srKF1fZr4xKF45XFW8Wa15Xr93Aan5Cr9rJFZFvw4jvrW7u3Z2qanIk348XF1Iqr93CF4D ZwnFqryDZr4xGr7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPF14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2jI8I6cxK62vIxIIY0VWUZVW8XwA2048vs2IY02 0E87I2jVAFwI0_JF0E3s1l82xGYIkIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0 rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjcxK6x IIjxv20xvEc7CjxVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xv wVC2z280aVCY1x0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFc xC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_ Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2 IErcIFxwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E 14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIx kGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVW8JVW5JwCI42IY6xIIjxv20xvEc7CjxVAF wI0_Cr0_Gr1UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVW8JV WxJwCI42IY6I8E87Iv6xkF7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjTRKfOw UUUUU X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, SPF_HELO_NONE,SPF_NONE 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?1758225616076300006?= X-GMAIL-MSGID: =?utf-8?q?1758225616076300006?= IO/ -> I/O bfq_fqq_update_budg_for_activation -> bfq_bfqq_update_budg_for_activation Signed-off-by: Kemeng Shi --- block/bfq-iosched.c | 2 +- block/bfq-wf2q.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index 0a11a381ee7d..2559343593bb 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -5734,7 +5734,7 @@ bfq_do_early_stable_merge(struct bfq_data *bfqd, struct bfq_queue *bfqq, * * Putting these two facts together, this commits merges stably the * bfq_queues associated with these I/O flows, i.e., with the - * processes that generate these IO/ flows, regardless of how many the + * processes that generate these I/O flows, regardless of how many the * involved processes are. * * To decide whether a set of bfq_queues is actually associated with diff --git a/block/bfq-wf2q.c b/block/bfq-wf2q.c index 7941b6f07391..1b8d05bae116 100644 --- a/block/bfq-wf2q.c +++ b/block/bfq-wf2q.c @@ -931,7 +931,7 @@ static void __bfq_activate_entity(struct bfq_entity *entity, bool backshifted = false; unsigned long long min_vstart; - /* See comments on bfq_fqq_update_budg_for_activation */ + /* See comments on bfq_bfqq_update_budg_for_activation */ if (non_blocking_wait_rq && bfq_gt(st->vtime, entity->finish)) { backshifted = true; min_vstart = entity->finish; From patchwork Sun Feb 19 10:43:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 59068 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp656572wrn; Sat, 18 Feb 2023 18:44:02 -0800 (PST) X-Google-Smtp-Source: AK7set+q1BCitLgTHRmEPs1nJ5m3nGn8Si65wJo9COUPy8IzAcp7o2j6Hui5W7ecn0WPOMAMXLhx X-Received: by 2002:a17:902:d2cd:b0:19a:98e8:50d1 with SMTP id n13-20020a170902d2cd00b0019a98e850d1mr3969570plc.34.1676774641912; Sat, 18 Feb 2023 18:44:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676774641; cv=none; d=google.com; s=arc-20160816; b=SLO4HXp/SLyf8EmgZ4Bcbt6LClvm5jUW33+rjbWU3KUU8ohMjlAy1fs4tWPi1flO3B CNEWiQHNAzw/cc7ONUU9CchrhkNCk+zqNoHdgLX2RsStaCEvRkgTBL1WuqZC9PUtpFTp gEUpaTLE24mDlE5Jkf8MHMYB0IaETzVV+3JMXVq8XU5z1mOmJQTi7bpdBNVri1qa78J4 +UghjHE5gNm6YdRkxIbCpGvAxiTiS6gxpJJ5OS+3IcWVgYGhzgRfMn1z393faaOoc1eO 9XR94mJvKQuyyy7g6bwaetcXJ6nU4vQxP+fbPom0woJY7FWNQK1Fqdgs5YCNycYekq76 NypA== 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=O7vdEK+86orzbHchQId1JvbHBuNmJb2zls1eSOVkg0M=; b=CuVV+KXFYeDE9SZi99OAmz/XHg9WCRV2lNrhspSCdmpofH61IG85XLULYGrOzCg+lB gRC5Dwu1pDdshfj3MAqiF1j9IC1OkIMyC4XCcy2VQzqNI6Dd79d6+k2NePZuo/ZZUajH /4Qix5bmZiZjTdOxy/L0dDryGHs9WO4me1MPVOZe1FOxbDcPIr0aXtOTn8M7odWVL+6f K2Qd69bt7hZ7zKiEqn+7FBEnO8UrhLgVYiuYye7JgwHKMHoudwz3jThz3VUzd+O6qz06 VGwm3IP5E9laeim+s18WDwwojCyfHcSTfnlQCL+qrqpJkX+i8TNk3Xsahd++I1fI3kgh iD1g== 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z15-20020a1709027e8f00b00196cfe1ca6dsi4206325pla.551.2023.02.18.18.43.49; Sat, 18 Feb 2023 18:44:01 -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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229574AbjBSCly (ORCPT + 99 others); Sat, 18 Feb 2023 21:41:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42284 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229602AbjBSCl2 (ORCPT ); Sat, 18 Feb 2023 21:41:28 -0500 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4309912865; Sat, 18 Feb 2023 18:41:28 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4PK8v74QlLz4f3pBn; Sun, 19 Feb 2023 10:41:23 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP2 (Coremail) with SMTP id Syh0CgBH7utQjPFjPmleDw--.7604S13; Sun, 19 Feb 2023 10:41:25 +0800 (CST) From: Kemeng Shi To: paolo.valente@linaro.org, axboe@kernel.dk, jack@suse.cz Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, shikemeng@huaweicloud.com Subject: [PATCH 11/17] block, bfq: simpfy computation of bfqd->budgets_assigned Date: Sun, 19 Feb 2023 18:43:03 +0800 Message-Id: <20230219104309.1511562-12-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230219104309.1511562-1-shikemeng@huaweicloud.com> References: <20230219104309.1511562-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgBH7utQjPFjPmleDw--.7604S13 X-Coremail-Antispam: 1UD129KBjvJXoWrtw17JrW7ZrWktw13AFW7XFb_yoW8Jr4xpr 9Fgw4j9F47tF15ZFWxGwn0g3Z8KanxXr97tr4aq392yFWDZrnFqFsay34rJFySgr97Aw13 Xa9rWFy7Xw4akaDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPF14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2jI8I6cxK62vIxIIY0VWUZVW8XwA2048vs2IY02 0E87I2jVAFwI0_JF0E3s1l82xGYIkIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0 rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjcxK6x IIjxv20xvEc7CjxVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xv wVC2z280aVCY1x0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFc xC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_ Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2 IErcIFxwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E 14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIx kGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVW8JVW5JwCI42IY6xIIjxv20xvEc7CjxVAF wI0_Cr0_Gr1UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVW8JV WxJwCI42IY6I8E87Iv6xkF7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjTRKfOw UUUUU X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, SPF_HELO_NONE,SPF_NONE 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?1758225647150026690?= X-GMAIL-MSGID: =?utf-8?q?1758225647150026690?= The computation of budgets_assigned is a little confusing as we only need to check if it's updated more than 10 times. Simpfy the computation to improve readability. Signed-off-by: Kemeng Shi --- block/bfq-iosched.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index 2559343593bb..a8cb0a0d36f3 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -175,7 +175,7 @@ static const int bfq_back_penalty = 2; static u64 bfq_slice_idle = NSEC_PER_SEC / 125; /* Minimum number of assigned budgets for which stats are safe to compute. */ -static const int bfq_stats_min_budgets = 194; +static const int bfq_stats_min_budgets = 11; /* Default maximum budget values, in sectors and number of requests. */ static const int bfq_default_max_budget = 16 * 1024; @@ -3317,7 +3317,7 @@ static void __bfq_set_in_service_queue(struct bfq_data *bfqd, if (bfqq) { bfq_clear_bfqq_fifo_expire(bfqq); - bfqd->budgets_assigned = (bfqd->budgets_assigned * 7 + 256) / 8; + bfqd->budgets_assigned++; if (time_is_before_jiffies(bfqq->last_wr_start_finish) && bfqq->wr_coeff > 1 && From patchwork Sun Feb 19 10:43:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 59067 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp656563wrn; Sat, 18 Feb 2023 18:44:00 -0800 (PST) X-Google-Smtp-Source: AK7set8dn/It3Shispcapgdfa11eR3jk8Yft99OUetZQN8KNNjepj5ztL9KwBN1A67SdOr0YFNbe X-Received: by 2002:a17:902:c404:b0:19b:c3e:6e61 with SMTP id k4-20020a170902c40400b0019b0c3e6e61mr2554182plk.68.1676774639778; Sat, 18 Feb 2023 18:43:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676774639; cv=none; d=google.com; s=arc-20160816; b=TpRg6cVKqpg9BjgjxVrrbnDwvdqJbHeASCYqIctiN8DvB5Valc08AIqDp+oamP70aY Qt7L0unxHj5dV9cYrB9ead4yksOgZmIk/UtEckM9kJ5+KlNzRR6zK2vFqPqakmkUF6C6 zrZJHqyu3naf33ZZiBBgThMjxJPKI0JVmbU2Ea0mQY2yNC3ASBYf/TvsS+sawmf06WGT 8LNKK4ENvTcMMa+kPNap9cswvbosshZRYms85/TFvkYuQNPU631PvWVJs95DcylVe625 N+hQNFsyd7u25XblY/ZpTcO0pA8a8laSZN9n2PjvqzFsGwGPk0pWyre+DY3vKc4VpYxx Kn+w== 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=uaqUMwE9XFJhs7K4SklYcK1UfSFA6FliksPjjB+MwFY=; b=SAeVFqxcrDozIDNrR6vTnA0Lrf3AqpJuwQmV1oHSUTR9eYv/5AXmfXca6HYXlmw7hX hAQfOgYTO0FA5BZ/TDfYuoZfcStS/KBOJH2bbYbUtSuMAc+sxpIgvZvxVpglUczdR9/A +LMVfglSWlp+JnAvr5o5N2+pEpJbPKHJtEqfgn4XGy0DCFaLLyq5Y+SR6xHxTykYD/cH RZ7fB+PyIDgmys2ilpIbQpcw8Kfis1U5xcsKPGR5tKUku8NiZUuti14CCNaWif5ob829 +Qe+gtc3OSfnZj9SQHsUPi8u2OBUg0fsPJlFhnzptkUHMwBpVaZX/W48Sn/dkHjcZnE7 9fhg== 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u189-20020a6385c6000000b004fb92d4ad34si8923630pgd.222.2023.02.18.18.43.47; Sat, 18 Feb 2023 18:43:59 -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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229731AbjBSCl4 (ORCPT + 99 others); Sat, 18 Feb 2023 21:41:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42304 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229630AbjBSCl3 (ORCPT ); Sat, 18 Feb 2023 21:41:29 -0500 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 887BA11EA1; Sat, 18 Feb 2023 18:41:28 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4PK8v76Vpwz4f3pC9; Sun, 19 Feb 2023 10:41:23 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP2 (Coremail) with SMTP id Syh0CgBH7utQjPFjPmleDw--.7604S14; Sun, 19 Feb 2023 10:41:25 +0800 (CST) From: Kemeng Shi To: paolo.valente@linaro.org, axboe@kernel.dk, jack@suse.cz Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, shikemeng@huaweicloud.com Subject: [PATCH 12/17] block, bfq: define and use soft_rt, in_burst and wr_or_deserves_wr only low_latency is enable Date: Sun, 19 Feb 2023 18:43:04 +0800 Message-Id: <20230219104309.1511562-13-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230219104309.1511562-1-shikemeng@huaweicloud.com> References: <20230219104309.1511562-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgBH7utQjPFjPmleDw--.7604S14 X-Coremail-Antispam: 1UD129KBjvJXoW3WrW7CFW7Cw18ZF4DWry8Krg_yoW7XrWDpF WagFy3tr43JF4fZrW3Kw48Xr1Sv3WfGFWIkFZ0q34kAF1UCrn2qFyqyr1Fvas7ur9xCr43 XrWqqa97CF1kAF7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPF14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2jI8I6cxK62vIxIIY0VWUZVW8XwA2048vs2IY02 0E87I2jVAFwI0_JF0E3s1l82xGYIkIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0 rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjcxK6x IIjxv20xvEc7CjxVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xv wVC2z280aVCY1x0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFc xC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_ Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2 IErcIFxwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E 14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIx kGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVW8JVW5JwCI42IY6xIIjxv20xvEc7CjxVAF wI0_Cr0_Gr1UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVW8JV WxJwCI42IY6I8E87Iv6xkF7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjTRKfOw UUUUU X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, SPF_HELO_NONE,SPF_NONE 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?1758225644970670926?= X-GMAIL-MSGID: =?utf-8?q?1758225644970670926?= The soft_rt, in_burst and wr_or_deserves_wr are only used when low_latency is enable. Currently, these variables are computed even low_latency is disable. Define these variables in successful branch of bfqd->low_latency check and compute them if needed to remove redundant computation and improve readability. The interactive parameter will be used only if low_latency is enabled outside bfq_bfqq_handle_idle_busy_switch, so it's safe to move interactive assignment inside branch where low_latency is true. Signed-off-by: Kemeng Shi --- block/bfq-iosched.c | 81 +++++++++++++++++++++++---------------------- 1 file changed, 42 insertions(+), 39 deletions(-) diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index a8cb0a0d36f3..eda6669d0571 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -1828,8 +1828,7 @@ static void bfq_bfqq_handle_idle_busy_switch(struct bfq_data *bfqd, struct request *rq, bool *interactive) { - bool soft_rt, in_burst, wr_or_deserves_wr, - bfqq_wants_to_preempt, + bool bfqq_wants_to_preempt, idle_for_long_time = bfq_bfqq_idle_for_long_time(bfqd, bfqq), /* * See the comments on @@ -1840,43 +1839,6 @@ static void bfq_bfqq_handle_idle_busy_switch(struct bfq_data *bfqd, bfqq->ttime.last_end_request + bfqd->bfq_slice_idle * 3; unsigned int act_idx = bfq_actuator_index(bfqd, rq->bio); - bool bfqq_non_merged_or_stably_merged = - bfqq->bic || RQ_BIC(rq)->bfqq_data[act_idx].stably_merged; - - /* - * bfqq deserves to be weight-raised if: - * - it is sync, - * - it does not belong to a large burst, - * - it has been idle for enough time or is soft real-time, - * - is linked to a bfq_io_cq (it is not shared in any sense), - * - has a default weight (otherwise we assume the user wanted - * to control its weight explicitly) - */ - in_burst = bfq_bfqq_in_large_burst(bfqq); - soft_rt = bfqd->bfq_wr_max_softrt_rate > 0 && - !BFQQ_TOTALLY_SEEKY(bfqq) && - !in_burst && - time_is_before_jiffies(bfqq->soft_rt_next_start) && - bfqq->dispatched == 0 && - bfqq->entity.new_weight == 40; - *interactive = !in_burst && idle_for_long_time && - bfqq->entity.new_weight == 40; - /* - * Merged bfq_queues are kept out of weight-raising - * (low-latency) mechanisms. The reason is that these queues - * are usually created for non-interactive and - * non-soft-real-time tasks. Yet this is not the case for - * stably-merged queues. These queues are merged just because - * they are created shortly after each other. So they may - * easily serve the I/O of an interactive or soft-real time - * application, if the application happens to spawn multiple - * processes. So let also stably-merged queued enjoy weight - * raising. - */ - wr_or_deserves_wr = bfqd->low_latency && - (bfqq->wr_coeff > 1 || - (bfq_bfqq_sync(bfqq) && bfqq_non_merged_or_stably_merged && - (*interactive || soft_rt))); /* * Using the last flag, update budget and check whether bfqq @@ -1911,6 +1873,24 @@ static void bfq_bfqq_handle_idle_busy_switch(struct bfq_data *bfqd, bfq_clear_bfqq_just_created(bfqq); if (bfqd->low_latency) { + bool soft_rt, in_burst, wr_or_deserves_wr; + bool bfqq_non_merged_or_stably_merged = + bfqq->bic || + RQ_BIC(rq)->bfqq_data[act_idx].stably_merged; + + /* + * bfqq deserves to be weight-raised if: + * - it is sync, + * - it does not belong to a large burst, + * - it has been idle for enough time or is soft real-time, + * - is linked to a bfq_io_cq (it is not shared in any sense), + * - has a default weight (otherwise we assume the user wanted + * to control its weight explicitly) + */ + in_burst = bfq_bfqq_in_large_burst(bfqq); + *interactive = !in_burst && idle_for_long_time && + bfqq->entity.new_weight == 40; + if (unlikely(time_is_after_jiffies(bfqq->split_time))) /* wraparound */ bfqq->split_time = @@ -1918,6 +1898,29 @@ static void bfq_bfqq_handle_idle_busy_switch(struct bfq_data *bfqd, if (time_is_before_jiffies(bfqq->split_time + bfqd->bfq_wr_min_idle_time)) { + soft_rt = bfqd->bfq_wr_max_softrt_rate > 0 && + !BFQQ_TOTALLY_SEEKY(bfqq) && + !in_burst && + time_is_before_jiffies(bfqq->soft_rt_next_start) && + bfqq->dispatched == 0 && + bfqq->entity.new_weight == 40; + /* + * Merged bfq_queues are kept out of weight-raising + * (low-latency) mechanisms. The reason is that these queues + * are usually created for non-interactive and + * non-soft-real-time tasks. Yet this is not the case for + * stably-merged queues. These queues are merged just because + * they are created shortly after each other. So they may + * easily serve the I/O of an interactive or soft-real time + * application, if the application happens to spawn multiple + * processes. So let also stably-merged queued enjoy weight + * raising. + */ + wr_or_deserves_wr = (bfqq->wr_coeff > 1 || + (bfq_bfqq_sync(bfqq) && + bfqq_non_merged_or_stably_merged && + (*interactive || soft_rt))); + bfq_update_bfqq_wr_on_rq_arrival(bfqd, bfqq, old_wr_coeff, wr_or_deserves_wr, From patchwork Sun Feb 19 10:43:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 59072 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp662470wrn; Sat, 18 Feb 2023 19:04:20 -0800 (PST) X-Google-Smtp-Source: AK7set9gv/nGCrda34kPG4Gy/9KduLuT1JNnzsAthaspwA2ElOchzs6KOXOQ9HYDrkIkNzUZndqR X-Received: by 2002:a17:90b:1d05:b0:234:1cb0:5e9f with SMTP id on5-20020a17090b1d0500b002341cb05e9fmr2733214pjb.0.1676775860541; Sat, 18 Feb 2023 19:04:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676775860; cv=none; d=google.com; s=arc-20160816; b=0YXy1PClk5+IW7AOSUdLioh6rWbj+dBl2bkR5wwApEdgVUM/XvsE8YVLweDF8qlEXE 4Mu78YvrWZj6tah0xWyBFwiYbvbPmf5xBBfSdaS9R+2vHNj9akuSJZEvFpdQ6mRn5GCV Lj7KQKGRDtIlnEOda0FBI3SfHpN2gY9PTS/wBI6TvadaCjWFykosbziXymZpUWqK39TE 2KkvcsVT8m2/Oljn6GZ7I/EOaNPYJ6M75f5FOBJI4BoKcyvAqi8PuJYqH3PygnodZ6ot IBTawbC7x+0y+DAdCZQsrhk/+ovtNdi+spjF3bSyif8Woz+5KjvSEOvYF3HI7UnWVFyd M14Q== 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=Gnr3D7mTG8U1ee4zKmlzZpLPR1MXQiAflawrAo7AddY=; b=oV6FZjCroUFhFvL9+58hpyJk4OQgXN48b5TYvF2TO9fgx86mCDYrJII2eEEfFRvu6x QTZMmKbVEjtdKO1LUsmfMi8ki9f6LqR9d1EKDsSO4mSWZl1ZTPwjbjTWLtwUuJTbwLZc PsbE4gSwi4L/xuyR/oXDWid6hgATnNopsPyaHsdTLBsyU19ROAWt9uGmjWsQ66DRvpZ0 7MtLW6c8PlRA4pALULUgh0mOo7tRP6xL8uWE+MU60vDgV5KgW0D2kPt3hSRGtgYt3wJq AuRSBXHQcdeBYcarj07e9xTzLjdTvenzLRZoCmDey436LUDlhbrypTGiqKftEpEbLFW8 kuhw== 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n89-20020a17090a5ae200b00233d6c12ca0si2588220pji.106.2023.02.18.19.04.07; Sat, 18 Feb 2023 19:04:20 -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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229847AbjBSCmK (ORCPT + 99 others); Sat, 18 Feb 2023 21:42:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42320 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229641AbjBSCla (ORCPT ); Sat, 18 Feb 2023 21:41:30 -0500 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E6EB211EA6; Sat, 18 Feb 2023 18:41:28 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4PK8v80V46z4f3mLw; Sun, 19 Feb 2023 10:41:24 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP2 (Coremail) with SMTP id Syh0CgBH7utQjPFjPmleDw--.7604S15; Sun, 19 Feb 2023 10:41:26 +0800 (CST) From: Kemeng Shi To: paolo.valente@linaro.org, axboe@kernel.dk, jack@suse.cz Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, shikemeng@huaweicloud.com Subject: [PATCH 13/17] block, bfq: remove unnecessary "wr" part of wr_or_deserves_wr Date: Sun, 19 Feb 2023 18:43:05 +0800 Message-Id: <20230219104309.1511562-14-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230219104309.1511562-1-shikemeng@huaweicloud.com> References: <20230219104309.1511562-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgBH7utQjPFjPmleDw--.7604S15 X-Coremail-Antispam: 1UD129KBjvJXoW7Aw1rCFW7Xr47Aw4kKFy5twb_yoW8tr13pr WrK3W2qry5Jr15ZFWrta18XF1av3WfXFW7tanIqr95Xr4UJr92qa4qyw1rtF93WrZ3Kr47 Z34DW3y8ZF1kAaUanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPF14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2jI8I6cxK62vIxIIY0VWUZVW8XwA2048vs2IY02 0E87I2jVAFwI0_JF0E3s1l82xGYIkIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0 rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjcxK6x IIjxv20xvEc7CjxVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xv wVC2z280aVCY1x0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFc xC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_ Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2 IErcIFxwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E 14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIx kGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVW8JVW5JwCI42IY6xIIjxv20xvEc7CjxVAF wI0_Cr0_Gr1UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVW8JV WxJwCI42IY6I8E87Iv6xkF7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjTRKfOw UUUUU X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, SPF_HELO_NONE,SPF_NONE 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?1758226924559170117?= X-GMAIL-MSGID: =?utf-8?q?1758226924559170117?= Before commit 96a291c38c3299 ("block, bfq: preempt lower-weight or lower-priority queues"), wr_or_deserves_wr is used to check if preempt is wanted. Currently, wr_or_deserves_wr is only used in bfq_update_bfqq_wr_on_rq_arrival to check if weight raising is needed, so the "wr" part of wr_or_deserves_wr is not needed anymore. Rename wr_or_deserves_wr to deserves_wr and remove unnecessary bfqq->wr_coeff > 1 for original wr_or_deserves_wr. Signed-off-by: Kemeng Shi --- block/bfq-iosched.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index eda6669d0571..6a8ea9a451cc 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -1656,12 +1656,12 @@ static unsigned long bfq_smallest_from_now(void) static void bfq_update_bfqq_wr_on_rq_arrival(struct bfq_data *bfqd, struct bfq_queue *bfqq, unsigned int old_wr_coeff, - bool wr_or_deserves_wr, + bool deserves_wr, bool interactive, bool in_burst, bool soft_rt) { - if (old_wr_coeff == 1 && wr_or_deserves_wr) { + if (old_wr_coeff == 1 && deserves_wr) { /* start a weight-raising period */ if (interactive) { bfqq->service_from_wr = 0; @@ -1873,7 +1873,7 @@ static void bfq_bfqq_handle_idle_busy_switch(struct bfq_data *bfqd, bfq_clear_bfqq_just_created(bfqq); if (bfqd->low_latency) { - bool soft_rt, in_burst, wr_or_deserves_wr; + bool soft_rt, in_burst, deserves_wr; bool bfqq_non_merged_or_stably_merged = bfqq->bic || RQ_BIC(rq)->bfqq_data[act_idx].stably_merged; @@ -1916,14 +1916,13 @@ static void bfq_bfqq_handle_idle_busy_switch(struct bfq_data *bfqd, * processes. So let also stably-merged queued enjoy weight * raising. */ - wr_or_deserves_wr = (bfqq->wr_coeff > 1 || - (bfq_bfqq_sync(bfqq) && + deserves_wr = (bfq_bfqq_sync(bfqq) && bfqq_non_merged_or_stably_merged && - (*interactive || soft_rt))); + (*interactive || soft_rt)); bfq_update_bfqq_wr_on_rq_arrival(bfqd, bfqq, old_wr_coeff, - wr_or_deserves_wr, + deserves_wr, *interactive, in_burst, soft_rt); From patchwork Sun Feb 19 10:43:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 59069 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp656734wrn; Sat, 18 Feb 2023 18:44:34 -0800 (PST) X-Google-Smtp-Source: AK7set/Ap0slMuAIUac2UMI4/RsSC5hQXFUlU69p3T/C97uvXBdHD+a0MnUaw3CB0vSydrK2706F X-Received: by 2002:a05:6a20:a10b:b0:be:db40:634f with SMTP id q11-20020a056a20a10b00b000bedb40634fmr7244748pzk.55.1676774674559; Sat, 18 Feb 2023 18:44:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676774674; cv=none; d=google.com; s=arc-20160816; b=fEwj0nhXFYNUR26oK7lw+P10OiNrYp/X2oE6XeT8Fe5TW9f3U6YGwlN1kkgQBiH5nb PAXFcoPpxW6ohg4p+TKwF6wRO/puVAr3dejuYmgSjGYCKJplBvGvRDogDzwLhkzwUmzh jfZZ6S8zDRqW+uHOZzTjvIdCkCr7jKgR4EGwgxd5W96j1U0q0OCiPEqI7T70T7yHi1D8 3xgqRI5HrkTiVev3fPCe2Vwtmkfi9VcexQAPBimawb6HP1Rh4SQ2LV/gIUOJ2S4VG/4R 74yAEjq4L3t9gUEsHJYWwEQE+SH4UK40i4TPb4Fic8RWnfGVOyxkCQKjJ2KQsEhL0zKV rkVQ== 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=VmN3ZKly04nrpt/pNywC9aA3YWBmQezfsoO+Sj03p0c=; b=vj1SWHExLq/bY3xG1FEcaHevrMRwcoSznQfAlkB9/3mz5xAGYfdar+dHqDnpNAnk9L 6kcQEvVY1FQ6oj9VYOQoVipmo3wgSQfKSY42AUJiSHS8Tw5+NSFKN4mKq4YZbuRwggIj mgPSfINqyjI1EL8hJtyBCdMGa3xG9HE8IRB+6LX7ny816A81GC+LXShxu8k6brPHIBVb vSEdWiFvc083IOoea6A4xYsPmv1zm0fhCnTnwwJO1X1O4MPtaVlJjO+7s7osNWHYGQeD 3A2a6Vw14ilLvkfdwiX3GvAwXGKFtbqGErdJFATQ8ALDyVK3tiE2YR9ziYL2EEL2y6PI RNVQ== 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v11-20020a655c4b000000b0046ae2a8ea9csi9083821pgr.733.2023.02.18.18.44.21; Sat, 18 Feb 2023 18:44: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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229630AbjBSCl6 (ORCPT + 99 others); Sat, 18 Feb 2023 21:41:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42306 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229632AbjBSCl3 (ORCPT ); Sat, 18 Feb 2023 21:41:29 -0500 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1935511EB2; Sat, 18 Feb 2023 18:41:29 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4PK8v84Blqz4f3nTp; Sun, 19 Feb 2023 10:41:24 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP2 (Coremail) with SMTP id Syh0CgBH7utQjPFjPmleDw--.7604S16; Sun, 19 Feb 2023 10:41:26 +0800 (CST) From: Kemeng Shi To: paolo.valente@linaro.org, axboe@kernel.dk, jack@suse.cz Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, shikemeng@huaweicloud.com Subject: [PATCH 14/17] block, bfq: remove redundant oom_bfqq check for bfqq from bfq_find_close_cooperator Date: Sun, 19 Feb 2023 18:43:06 +0800 Message-Id: <20230219104309.1511562-15-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230219104309.1511562-1-shikemeng@huaweicloud.com> References: <20230219104309.1511562-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgBH7utQjPFjPmleDw--.7604S16 X-Coremail-Antispam: 1UD129KBjvdXoW7GrWUCw4Utr4DCr4UXFy7Wrg_yoWfCrg_Aw 4vgrZrJFW8JFW5tw4akr4jyF4YyFW3Xw1DXryFqr13G3W3JFn5C3srKrZxZFZ8CayIya43 Ja1qqr4UJw1xCjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbDAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M28IrcIa0xkI8V A2jI8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK0II2c7xJ M28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJwA2z4x0Y4vE2I x0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK 6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4 xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8 JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20V AGYxC7MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAF wI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUAVWUtwCIc4 0Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r4j6ryUMIIF0xvE2Ix0cI8IcVCY1x0267AK xVWxJVW8Jr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r4j6F 4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x0pRvJPtU UUUU= X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, SPF_HELO_NONE,SPF_NONE 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?1758225681130599307?= X-GMAIL-MSGID: =?utf-8?q?1758225681130599307?= The oom_bfqq is never added to tree in bfq_pos_tree_add_move, so bfqq returned from bfq_find_close_cooperator is no need to be checked if it's oom_bfqq. Signed-off-by: Kemeng Shi --- block/bfq-iosched.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index 6a8ea9a451cc..ee02c7502394 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -3038,8 +3038,7 @@ bfq_setup_cooperator(struct bfq_data *bfqd, struct bfq_queue *bfqq, new_bfqq = bfq_find_close_cooperator(bfqd, bfqq, bfq_io_struct_pos(io_struct, request)); - if (new_bfqq && likely(new_bfqq != &bfqd->oom_bfqq) && - bfq_may_be_close_cooperator(bfqq, new_bfqq)) + if (new_bfqq && bfq_may_be_close_cooperator(bfqq, new_bfqq)) return bfq_setup_merge(bfqq, new_bfqq); return NULL; From patchwork Sun Feb 19 10:43:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 59070 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp660634wrn; Sat, 18 Feb 2023 18:59:16 -0800 (PST) X-Google-Smtp-Source: AK7set8Gh+fdMWRXkzQH/jpTX6SUQgABYdZXRwTOW5OGGSM7tIABSkzOBVTjhKepcLzywooSNVvl X-Received: by 2002:a17:90b:4c0c:b0:233:f3c2:a86d with SMTP id na12-20020a17090b4c0c00b00233f3c2a86dmr1620964pjb.47.1676775555961; Sat, 18 Feb 2023 18:59:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676775555; cv=none; d=google.com; s=arc-20160816; b=gm9zMITOwP1/EtYVhxwTKPokitsUPo+RWhrha4Ot7khqPYj9txphwr42zJv+fldZVA f+ZgYQCFTsd/l7oAFnWdS2Dnrv/sE3dC3X+JkR7BZ+hsOrAQ49G+dBSjwLNLzZzws307 vbWLS8+Faay0xI8PJ4lj+f2pPZaYJQjZST5cvQ4BGpOaJLoAOx1+NSXoiJ0XLSSfaHhh 2vbOPMjzrClB+iS8NhiEJ/3AuAsuIlvHqLlhCXcBe3wOCGMXSyohhTRSPvf8KHhtf9SN yM5EsWGm4Dj6RXtVmDZ24spw98TuxEpCtHu0jnT10KwxFEvOXidY261iF8Z1r0K1Tqfx uJSw== 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=dwKBAV31Z03sPKgMU8LEnktt4Rg3QTWBxlPWBoFkMpw=; b=VCl0ZVEPwkt0N8qdl3YncRTov9gv1ZTU15qtfCregKP/CK3PX10BJlvtWbBOumqwHu 57LnOcKxKs1TShgoKm+nKtI5LtPyOuj1Eczy/apgLfPQXwKtDm8QJz0yBnKg60tRPtnP W9rUUuBRExZIWE2RiniyrQWyBxyHdyRNiuYPZDpeFHUUcLxH1D3pb1SzkBAoqXIdllfg lNx/VwNtQ6c+Prj0E1qAVE+M+geUMLpAT/qcd+jvkwG3+fzLGuRTqKAW4rQTf3mm4ESm OGI4H0NzVvfxmiZJ6+z/HWlEdjAuCG1X/+9LwT3EP01wb3KJC1euzRMfKGgs7/972Wfi CCpQ== 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m32-20020a635820000000b004fb27746031si9287817pgb.829.2023.02.18.18.59.00; Sat, 18 Feb 2023 18:59:15 -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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229842AbjBSCmI (ORCPT + 99 others); Sat, 18 Feb 2023 21:42:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42322 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229647AbjBSCla (ORCPT ); Sat, 18 Feb 2023 21:41:30 -0500 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 60D0B11EB8; Sat, 18 Feb 2023 18:41:29 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4PK8v86GY0z4f3t7T; Sun, 19 Feb 2023 10:41:24 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP2 (Coremail) with SMTP id Syh0CgBH7utQjPFjPmleDw--.7604S17; Sun, 19 Feb 2023 10:41:26 +0800 (CST) From: Kemeng Shi To: paolo.valente@linaro.org, axboe@kernel.dk, jack@suse.cz Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, shikemeng@huaweicloud.com Subject: [PATCH 15/17] block, bfq: some cleanups for function bfq_pos_tree_add_move Date: Sun, 19 Feb 2023 18:43:07 +0800 Message-Id: <20230219104309.1511562-16-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230219104309.1511562-1-shikemeng@huaweicloud.com> References: <20230219104309.1511562-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgBH7utQjPFjPmleDw--.7604S17 X-Coremail-Antispam: 1UD129KBjvJXoW7WrW5Xw4rAF4UtF13Cw4kZwb_yoW8ur4xpF 13KFWFy348Xrn8WryrZ3WUZw1Syw1fWr97GrZxZw1rJr47ArnFqFnIvwnYqFyfZFZ7C3W3 Xr4Yq34kAr1Uua7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPF14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2jI8I6cxK62vIxIIY0VWUZVW8XwA2048vs2IY02 0E87I2jVAFwI0_JF0E3s1l82xGYIkIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0 rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjcxK6x IIjxv20xvEc7CjxVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xv wVC2z280aVCY1x0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFc xC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_ Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2 IErcIFxwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E 14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIx kGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVW8JVW5JwCI42IY6xIIjxv20xvEc7CjxVAF wI0_Cr0_Gr1UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVW8JV WxJwCI42IY6I8E87Iv6xkF7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjTRKfOw UUUUU X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, SPF_HELO_NONE,SPF_NONE 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?1758226605032941367?= X-GMAIL-MSGID: =?utf-8?q?1758226605032941367?= There are three cleanups in this patch: 1. The oom_bfqq is never inserted to tree, so return immediately for oom_bfqq before unnecessary NULL check of bfqq->pos_root. 2. Only set bfqq->pos_root after bfq_rq_pos_tree_lookup successes rather than set bfqq->pos_root unconditionally and reset to NULL if bfq_rq_pos_tree_lookup fails. 3. Remove unnecessary local variable __bfqq which is only used to check return value of bfq_rq_pos_tree_lookup. Signed-off-by: Kemeng Shi --- block/bfq-iosched.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index ee02c7502394..6ba096e9aec6 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -783,17 +783,16 @@ void __cold bfq_pos_tree_add_move(struct bfq_data *bfqd, struct bfq_queue *bfqq) { struct rb_node **p, *parent; - struct bfq_queue *__bfqq; + + /* oom_bfqq does not participate in queue merging */ + if (bfqq == &bfqd->oom_bfqq) + return; if (bfqq->pos_root) { rb_erase(&bfqq->pos_node, bfqq->pos_root); bfqq->pos_root = NULL; } - /* oom_bfqq does not participate in queue merging */ - if (bfqq == &bfqd->oom_bfqq) - return; - /* * bfqq cannot be merged any longer (see comments in * bfq_setup_cooperator): no point in adding bfqq into the @@ -807,14 +806,13 @@ bfq_pos_tree_add_move(struct bfq_data *bfqd, struct bfq_queue *bfqq) if (!bfqq->next_rq) return; + if (bfq_rq_pos_tree_lookup(bfqd, &bfqq_group(bfqq)->rq_pos_tree, + blk_rq_pos(bfqq->next_rq), &parent, &p)) + return; + bfqq->pos_root = &bfqq_group(bfqq)->rq_pos_tree; - __bfqq = bfq_rq_pos_tree_lookup(bfqd, bfqq->pos_root, - blk_rq_pos(bfqq->next_rq), &parent, &p); - if (!__bfqq) { - rb_link_node(&bfqq->pos_node, parent, p); - rb_insert_color(&bfqq->pos_node, bfqq->pos_root); - } else - bfqq->pos_root = NULL; + rb_link_node(&bfqq->pos_node, parent, p); + rb_insert_color(&bfqq->pos_node, bfqq->pos_root); } /* From patchwork Sun Feb 19 10:43:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 59071 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp662045wrn; Sat, 18 Feb 2023 19:02:59 -0800 (PST) X-Google-Smtp-Source: AK7set+8DX6bSi8FUuBif75TCBcxhiJsMeqBrhMIASY0EYtXHczHyHzAjXczKCfazkuvB8vFvL8z X-Received: by 2002:a05:6a20:1585:b0:c3:18f8:6c53 with SMTP id h5-20020a056a20158500b000c318f86c53mr4918144pzj.38.1676775779454; Sat, 18 Feb 2023 19:02:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676775779; cv=none; d=google.com; s=arc-20160816; b=OGLrDCVMhrXb3qihi64dfyArmKuUzHmWASBbO+B9QxC5zxflaHI8fIhZQg4TTqpNCc Rqk5vGQWaVHktBlWj9DXIXjzTRWx75oVbvYFOtb00f09nbMYwDlERPZSrNunrHvR5wnD gcLN/6xw0Ib9wyp7Pvdh5eCEGXkibxAa5l7u/LhSBtVgdr3MQ9JPvhi/I5a/AtNHv8wR hDKF0K7vJ+WsTujdKVxHBawsCHt0C92s2SJOFfWx/8UJJ6tSDTyFlb/rUREAVRLH/UnD Ruk8yMEMf3JHWkaeEbAR3F+vdUhVpwWnP1edmMDE7pHH9gpSnL3XXwQoOlAW0kUiHyRf mccw== 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=WSGRZQOO0a+/0MODMKbvC6I9NQcX+PyF4lEt2xRRMOs=; b=iudo1WudCF4DFNtMj8CifIpxgUY2ecs7Q10dNY+cZ4WWtK8flkFDR4NuDqcJtp3bX3 pF10Kq7aWYFz/MjiMip4qNJPubzgBTqQS2mSpCRYgnsRe+yv7ZwStkLQMqQOOkGQi4Zp Pwa6zr7n6X0C10aQ5tu3e8oAroxi3eP5tsUKWAUzhBaGLSKQOQZ96uaMNYbL96KudecF lb4PUkopoO6dmuCJMq0OD97MUKiSkwkiTv3rPjZpY2wUUid+cqkHwJ4nVmP1V0WFPpyK ZUCy3lfn4n7s8e1EAivrERjEQsQrbyJAh/0xPWqdV6TJFcOINjWot1F2kjWXpXkegm5b QzVQ== 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id p14-20020a056a000b4e00b005941664b506si10713785pfo.224.2023.02.18.19.02.44; Sat, 18 Feb 2023 19:02:59 -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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229759AbjBSCmB (ORCPT + 99 others); Sat, 18 Feb 2023 21:42:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42324 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229648AbjBSCla (ORCPT ); Sat, 18 Feb 2023 21:41:30 -0500 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B6AFE12043; Sat, 18 Feb 2023 18:41:29 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4PK8v911Lsz4f3pBV; Sun, 19 Feb 2023 10:41:25 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP2 (Coremail) with SMTP id Syh0CgBH7utQjPFjPmleDw--.7604S18; Sun, 19 Feb 2023 10:41:27 +0800 (CST) From: Kemeng Shi To: paolo.valente@linaro.org, axboe@kernel.dk, jack@suse.cz Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, shikemeng@huaweicloud.com Subject: [PATCH 16/17] block, bfq: remove unnecessary goto tag in __bfq_weights_tree_remove Date: Sun, 19 Feb 2023 18:43:08 +0800 Message-Id: <20230219104309.1511562-17-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230219104309.1511562-1-shikemeng@huaweicloud.com> References: <20230219104309.1511562-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgBH7utQjPFjPmleDw--.7604S18 X-Coremail-Antispam: 1UD129KBjvdXoWrtw4UCw15KryUJw17Kw13twb_yoWDWrg_C3 WvvrykKr4DC398Cr4xtrWaqw1DA393ZFy8GFsxGF1fuw17JasIk3s2qrZ8Jan5Xan2gFZx GrZ5tw13ZF1jkjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbqxFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M28IrcIa0xkI8V A2jI8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK0II2c7xJ M28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJwA2z4x0Y4vE2I x0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK 6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4 xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8 JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20V AGYxC7MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAF wI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUAVWUtwCIc4 0Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r4j6ryUMIIF0xvE2Ix0cI8IcVCY1x0267AK xVW8Jr0_Cr1UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVW8JV WxJwCI42IY6I8E87Iv6xkF7I0E14v26r4UJVWxJrUvcSsGvfC2KfnxnUUI43ZEXa7sRiVb yDUUUUU== X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, SPF_HELO_NONE,SPF_NONE 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?1758226839943814238?= X-GMAIL-MSGID: =?utf-8?q?1758226839943814238?= Do free work if num_active == 0 and remove unnecessary tag reset_entity_pointer. Signed-off-by: Kemeng Shi --- block/bfq-iosched.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index 6ba096e9aec6..2705a24ab146 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -976,13 +976,11 @@ void bfq_weights_tree_remove(struct bfq_queue *bfqq) root = &bfqq->bfqd->queue_weights_tree; bfqq->weight_counter->num_active--; - if (bfqq->weight_counter->num_active > 0) - goto reset_entity_pointer; - - rb_erase_cached(&bfqq->weight_counter->weights_node, root); - kfree(bfqq->weight_counter); + if (bfqq->weight_counter->num_active == 0) { + rb_erase_cached(&bfqq->weight_counter->weights_node, root); + kfree(bfqq->weight_counter); + } -reset_entity_pointer: bfqq->weight_counter = NULL; bfq_put_queue(bfqq); } From patchwork Sun Feb 19 10:43:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 59073 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp662634wrn; Sat, 18 Feb 2023 19:04:54 -0800 (PST) X-Google-Smtp-Source: AK7set/DsGvqDl2EhS20EMyMbjABY02YxV5YLhRqw90I+oA4ojW+72jfER8UwWeEJVAXMzVFuy7J X-Received: by 2002:a05:6a20:728c:b0:bc:3290:5759 with SMTP id o12-20020a056a20728c00b000bc32905759mr6591093pzk.34.1676775893703; Sat, 18 Feb 2023 19:04:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676775893; cv=none; d=google.com; s=arc-20160816; b=sPZuur4YjkmIHO/rteOe9zLtgth30cv1Nvp7heV4yLsSz+vqkWuPgL8jHbmK4LqWN8 AqdbLE6fbT9fSkksBinXkSjXvQ6pGYhTuDfbZU4QeyyYlO0Q/lnwbeWaK9rtXtiTgrSf BporK0sC9BDHfia+i8p/LE9lKuHrIiahpN0ySnWDQqSsoyigvhCn2gLeAoYiRxgwjq8D 1BKzZvS+LZYmTxgcqQLmNjneFxqRqjO+iX4aiOr4rzpdxR1Qnp/z3JSVhewkHit5WZ63 //AxxnrfToW8Xg420cEl2hDa3cTPGxAVqihNtAiJdiLvt8h13a8c6xj3Neix3i8IngnT 16SA== 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=118sen3eHVkNEhkuZvZO0dMHB4tJfIA6Jx2rNW/icds=; b=qKh0G7ApdNf+f7/VJUo5hfj2WXL3WleLeg8TGzKtwN8aWtM8iaUuMZ1uHNIoTpx3fP ynJr4ln4lT4EAysLvtvFGh0ZmxdBRSDbJ7OO/5PcStDK778qTdE9XgJjeartJyE0ESxI QXKj0WHP+cZ32PilvgAG7oKy1lFFTKLjQQq5574r2KNNYNidTDXqNnjOmc/AoShJphzi LOV0vwwHM1mM/vEiAYbMzA8uvh80FW/V4/16xFS8nr+z6peBYE+w4KPWUrrtEWpYI5ox vj9xa+Lp5iBgMzDBN+ltPizHeTLJVtrCZfskMt9cQp6Cdr6b/mIPaP5zBARW4mMNFWNh teFA== 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m32-20020a635820000000b004fb27746031si9287817pgb.829.2023.02.18.19.04.39; Sat, 18 Feb 2023 19:04:53 -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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229840AbjBSCmF (ORCPT + 99 others); Sat, 18 Feb 2023 21:42:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42326 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229656AbjBSCla (ORCPT ); Sat, 18 Feb 2023 21:41:30 -0500 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 14A2611EB2; Sat, 18 Feb 2023 18:41:30 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4PK8v92Pnxz4f3jHn; Sun, 19 Feb 2023 10:41:25 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP2 (Coremail) with SMTP id Syh0CgBH7utQjPFjPmleDw--.7604S19; Sun, 19 Feb 2023 10:41:27 +0800 (CST) From: Kemeng Shi To: paolo.valente@linaro.org, axboe@kernel.dk, jack@suse.cz Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, shikemeng@huaweicloud.com Subject: [PATCH 17/17] block, bfq: remove unnecessary local variable __bfqq in bfq_setup_merge Date: Sun, 19 Feb 2023 18:43:09 +0800 Message-Id: <20230219104309.1511562-18-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230219104309.1511562-1-shikemeng@huaweicloud.com> References: <20230219104309.1511562-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgBH7utQjPFjPmleDw--.7604S19 X-Coremail-Antispam: 1UD129KBjvdXoW7GFykWr4fKFyruF1xXF47Arb_yoWkGrb_tF ykKa4xtr4UGry5Xw1Yyr4xJ3ZxJFW8XF18ZF4qg34DJF17XFn5CasFgrs0yFZ8Ga1IkFy3 G397Wwn8GF1kWjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbqxFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M28IrcIa0xkI8V A2jI8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK0II2c7xJ M28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJwA2z4x0Y4vE2I x0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK 6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4 xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8 JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20V AGYxC7MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAF wI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUAVWUtwCIc4 0Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r4j6ryUMIIF0xvE2Ix0cI8IcVCY1x0267AK xVW8Jr0_Cr1UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVW8JV WxJwCI42IY6I8E87Iv6xkF7I0E14v26r4UJVWxJrUvcSsGvfC2KfnxnUUI43ZEXa7sRiVb yDUUUUU== X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, SPF_HELO_NONE,SPF_NONE 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?1758226959635774131?= X-GMAIL-MSGID: =?utf-8?q?1758226959635774131?= We could traversal bfqq->new_bfqq list without a local variable easily and intuitively. So remove unnecessary local variable __bfqq. Signed-off-by: Kemeng Shi --- block/bfq-iosched.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index 2705a24ab146..037f73a25567 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -2752,7 +2752,6 @@ static struct bfq_queue * bfq_setup_merge(struct bfq_queue *bfqq, struct bfq_queue *new_bfqq) { int process_refs, new_process_refs; - struct bfq_queue *__bfqq; /* * If there are no process references on the new_bfqq, then it is @@ -2764,10 +2763,9 @@ bfq_setup_merge(struct bfq_queue *bfqq, struct bfq_queue *new_bfqq) return NULL; /* Avoid a circular list and skip interim queue merges. */ - while ((__bfqq = new_bfqq->new_bfqq)) { - if (__bfqq == bfqq) + while ((new_bfqq = new_bfqq->new_bfqq)) { + if (new_bfqq == bfqq) return NULL; - new_bfqq = __bfqq; } process_refs = bfqq_process_refs(bfqq);