From patchwork Wed Nov 2 11:43:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yuwei Guan X-Patchwork-Id: 13028007 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D716CC43217 for ; Wed, 2 Nov 2022 11:44:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230197AbiKBLoU (ORCPT ); Wed, 2 Nov 2022 07:44:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42444 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230214AbiKBLoQ (ORCPT ); Wed, 2 Nov 2022 07:44:16 -0400 Received: from mail-pl1-x62e.google.com (mail-pl1-x62e.google.com [IPv6:2607:f8b0:4864:20::62e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 98F10286D6; Wed, 2 Nov 2022 04:44:15 -0700 (PDT) Received: by mail-pl1-x62e.google.com with SMTP id y4so16335508plb.2; Wed, 02 Nov 2022 04:44:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=nr/6LyMOPEwxJWN/wHZi4iuPELnrmgBJGmSjXSuSoPo=; b=aA8awJ74lgAvHubnmrEfljUkZTWxL9nKaIQG6X23rQv3SwxY0cPT5ZVsr77SFLHIl7 PvqY5kn7vI4fwVcxp5/moG8HQ6MlpYSp7u8CB62Yp8vkMKcEx6wKehhTpOHrUUuTtAWL KqtJwpozyk4g6mqZkargiKK7jqbgSnIEkdbHBD0gnKC99Yylc7eiFYu1uBde7w27ZneI nnQTIrpzCJTtP8gDKEppoet7dWZSIcK83cZ+x8Op2/RVKFdTAzFabF1hP7z9GKKKCb/a YSGziNerbAA0giKC4LgwV9yph0ScKgNh0uB8/qV0vckktyRgnckFbTFNt1I7D/9BgnQV Q3qA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=nr/6LyMOPEwxJWN/wHZi4iuPELnrmgBJGmSjXSuSoPo=; b=dBfQuhsfw7xIdcmt5q0G28u5lUj3ViqDHjfQi7pD5XBwixXuY+NQEGx+L+lqrIxtSf jq9iCCSXfngesj7UwTuljeDDV4YRWy34Qdp7Q4QB5QLAaEu+S81RPjFBDDwYBr6b7IoN UG2GeVpZvh3LiUsfbcX0o6mE9GiC882Kd1RSIW+oGeEf0/Yv52KCRocQ/3CFoU3QccUd iGvahj0aZvSfGAvDyfSMEecuauOnF3ialmLYqrkNFlXjmmTWsXVU9LhIQsvmcSSDUPmB LL7kvBntIHPMoJ0pLwdLxqZL2wwNaEutjwr7yQl2JfX9BVMtN+s4y5wiqDBoATCsLdeL wyYQ== X-Gm-Message-State: ACrzQf3D5A1Fw8JG7vzc90v+ECpxM6CFMXeW57BUxuzw4SbyvNHePfM+ emKyfCIe7pny3U0dLVnXf4c= X-Google-Smtp-Source: AMsMyM5eypjgDOyTLx4f20GKAATRVw3+5TAXvMP1JaBhRMd9g9ZBdQ1cqJKBlTGVBEfXYGd35g5X4A== X-Received: by 2002:a17:902:6906:b0:186:d8d7:1d1e with SMTP id j6-20020a170902690600b00186d8d71d1emr23991188plk.30.1667389455171; Wed, 02 Nov 2022 04:44:15 -0700 (PDT) Received: from Zbook.localdomain ([129.227.152.6]) by smtp.gmail.com with ESMTPSA id a11-20020a170902eccb00b00172e19c5f8bsm8169978plh.168.2022.11.02.04.44.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Nov 2022 04:44:14 -0700 (PDT) From: Yuwei Guan X-Google-Original-From: Yuwei Guan To: paolo.valente@linaro.org, axboe@kernel.dk, tj@kernel.org, josef@toxicpanda.com Cc: linux-block@vger.kernel.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, Yuwei.Guan@zeekrlife.com Subject: [PATCH 1/5] block, bfq: remove unnecessary meta_pending count Date: Wed, 2 Nov 2022 19:43:50 +0800 Message-Id: <20221102114354.162-2-Yuwei.Guan@zeekrlife.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221102114354.162-1-Yuwei.Guan@zeekrlife.com> References: <20221102114354.162-1-Yuwei.Guan@zeekrlife.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org The meta_pending is counted only, but no one use it, so remove it. Signed-off-by: Yuwei Guan --- block/bfq-iosched.c | 7 ------- block/bfq-iosched.h | 2 -- 2 files changed, 9 deletions(-) diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index 7ea427817f7f..74b87694105f 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -2448,10 +2448,6 @@ static void bfq_remove_request(struct request_queue *q, if (unlikely(!bfqd->nonrot_with_queueing)) bfq_pos_tree_add_move(bfqd, bfqq); } - - if (rq->cmd_flags & REQ_META) - bfqq->meta_pending--; - } static bool bfq_bio_merge(struct request_queue *q, struct bio *bio, @@ -5975,9 +5971,6 @@ static void bfq_update_has_short_ttime(struct bfq_data *bfqd, static void bfq_rq_enqueued(struct bfq_data *bfqd, struct bfq_queue *bfqq, struct request *rq) { - if (rq->cmd_flags & REQ_META) - bfqq->meta_pending++; - bfqq->last_request_pos = blk_rq_pos(rq) + blk_rq_sectors(rq); if (bfqq == bfqd->in_service_queue && bfq_bfqq_wait_request(bfqq)) { diff --git a/block/bfq-iosched.h b/block/bfq-iosched.h index 71f721670ab6..3de849e97e4e 100644 --- a/block/bfq-iosched.h +++ b/block/bfq-iosched.h @@ -268,8 +268,6 @@ struct bfq_queue { struct request *next_rq; /* number of sync and async requests queued */ int queued[2]; - /* number of pending metadata requests */ - int meta_pending; /* fifo list of requests in sort_list */ struct list_head fifo; From patchwork Wed Nov 2 11:43:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yuwei Guan X-Patchwork-Id: 13028008 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DA700C433FE for ; Wed, 2 Nov 2022 11:44:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230188AbiKBLoZ (ORCPT ); Wed, 2 Nov 2022 07:44:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42436 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230256AbiKBLoW (ORCPT ); Wed, 2 Nov 2022 07:44:22 -0400 Received: from mail-pg1-x536.google.com (mail-pg1-x536.google.com [IPv6:2607:f8b0:4864:20::536]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E8FF328701; Wed, 2 Nov 2022 04:44:20 -0700 (PDT) Received: by mail-pg1-x536.google.com with SMTP id b62so5634092pgc.0; Wed, 02 Nov 2022 04:44:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=OL88kv80oEtPFlhgWDeAL7//i16MAHkHlHkRbfyZx1Q=; b=FOPNzZy38c/VAGwXAxbK8HSyAK8zPJuDMlM+oR1AmBZx207mlxlXpuUbYs0Sm6zN0I FDZH8eBGDg2obX+2T3dbYTpgJlOqIMFI1y9Sa1Fej4zAOOb5BtprFj/hvqjcCcWcNDLd bhE++hmOrDAw8Qhjp26M2xX+pmgpFZ6l4TXVgkM82ov2t6F4nhwSqsU44JSZQulA06Vn sg4H9s34WmpH8s2GwyoHGWRBH/yhsbEg55TY6UTHaP6SYgH9tvuyXwUS76+WgwfH87DK +NHcjOJrhWFy/oF5nsITm20Hve7ACJzLz1Iw3aj3z0OM7gpgJVAlWpdRmKk7F5PxmGMY 4Ktw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=OL88kv80oEtPFlhgWDeAL7//i16MAHkHlHkRbfyZx1Q=; b=KiXGhjDSqjkaFSaruwAU0jot9Y8ycpIQTmvlXy7LRcN3xT/hOTT5/JioVSAfFLoXJ+ 90edT8FEq1+dMaays3fUlnjEUkjUXAD6yqDo122MTcU/haioNWeYSZc/ns/XzNmBgEjP ExQLzo15w0RUn1ZP00bcozNYO0ME29UpUMPLoYzc0sdALSZILN/XYY8UbLpkhYyEeKhl peewy2L5TAveIYAI4IMm5xKOSYwlH9Xd20V/AxJ4YZrMNernyfjJM2Ll7XrZQZG/6DBH +mmqIksLptjFhB1hEGv43AK2/pX5GYZO9W7SLIiusmukUL4hCEye1NCiI0boL2oaDRob 8rjw== X-Gm-Message-State: ACrzQf2mHfJJBt9Oz8Mds5mZYN7yIJLUS7H6fZnHZe2tOjxn91LY4L/C xJvmgU9Cc5qSLxz8lmWszhelzwspsJNG7UZg X-Google-Smtp-Source: AMsMyM4TRsZoI1U0sewXvT9hys4AtWg5QqxRaDxehzu5j5l6Yc8tpizC6U8Jl4zOL2sLILzAu8+3IQ== X-Received: by 2002:a63:1849:0:b0:43c:8346:57f7 with SMTP id 9-20020a631849000000b0043c834657f7mr21160618pgy.222.1667389460480; Wed, 02 Nov 2022 04:44:20 -0700 (PDT) Received: from Zbook.localdomain ([129.227.152.6]) by smtp.gmail.com with ESMTPSA id a11-20020a170902eccb00b00172e19c5f8bsm8169978plh.168.2022.11.02.04.44.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Nov 2022 04:44:20 -0700 (PDT) From: Yuwei Guan X-Google-Original-From: Yuwei Guan To: paolo.valente@linaro.org, axboe@kernel.dk, tj@kernel.org, josef@toxicpanda.com Cc: linux-block@vger.kernel.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, Yuwei.Guan@zeekrlife.com Subject: [PATCH 2/5] block, bfq: remove unused bfq_log_bfqg Date: Wed, 2 Nov 2022 19:43:51 +0800 Message-Id: <20221102114354.162-3-Yuwei.Guan@zeekrlife.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221102114354.162-1-Yuwei.Guan@zeekrlife.com> References: <20221102114354.162-1-Yuwei.Guan@zeekrlife.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org No callers left of bfq_log_bfqg, so remove it. Signed-off-by: Yuwei Guan --- block/bfq-iosched.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/block/bfq-iosched.h b/block/bfq-iosched.h index 3de849e97e4e..256a9d267204 100644 --- a/block/bfq-iosched.h +++ b/block/bfq-iosched.h @@ -1103,11 +1103,6 @@ struct bfq_group *bfqq_group(struct bfq_queue *bfqq); "%s " fmt, pid_str, ##args); \ } while (0) -#define bfq_log_bfqg(bfqd, bfqg, fmt, args...) do { \ - blk_add_cgroup_trace_msg((bfqd)->queue, \ - &bfqg_to_blkg(bfqg)->blkcg->css, fmt, ##args); \ -} while (0) - #else /* CONFIG_BFQ_GROUP_IOSCHED */ #define bfq_log_bfqq(bfqd, bfqq, fmt, args...) do { \ @@ -1117,7 +1112,6 @@ struct bfq_group *bfqq_group(struct bfq_queue *bfqq); bfq_bfqq_name((bfqq), pid_str, MAX_BFQQ_NAME_LENGTH); \ blk_add_trace_msg((bfqd)->queue, "%s " fmt, pid_str, ##args); \ } while (0) -#define bfq_log_bfqg(bfqd, bfqg, fmt, args...) do {} while (0) #endif /* CONFIG_BFQ_GROUP_IOSCHED */ From patchwork Wed Nov 2 11:43:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yuwei Guan X-Patchwork-Id: 13028009 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D4F11C433FE for ; Wed, 2 Nov 2022 11:44:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230307AbiKBLoi (ORCPT ); Wed, 2 Nov 2022 07:44:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42826 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230298AbiKBLo2 (ORCPT ); Wed, 2 Nov 2022 07:44:28 -0400 Received: from mail-pl1-x62f.google.com (mail-pl1-x62f.google.com [IPv6:2607:f8b0:4864:20::62f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CC33328716; Wed, 2 Nov 2022 04:44:24 -0700 (PDT) Received: by mail-pl1-x62f.google.com with SMTP id k7so6600473pll.6; Wed, 02 Nov 2022 04:44:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=0TO3AKUnGTYlpFDHE0inxQ4G6Kp5byNURiimvggoLdA=; b=Dfn45f8qMlZMxWk8SdtU4g1j/0dksy4HKNil57zO838ijzFZAvF94pr0JzkIJqBfCE xRyWpDyx0dwfOBqGQBnN4T1c1KjR16kBL0CPPaQccxbmDPbREWvCI+XI4fRhGvv7RusC F9j2/nqV0l/9FY/LuHNolayQKAOZtO9YGsBPBP5NjJaP7FcQyszh47B80tpIEdxJSqZ/ sp5vKwNEjQ8ZmoNyX3LEfvcSAyfioYKKnp0aDtbdWjAL7s6Cw9Y7sK8Kx/Q9MPIjhmbM ofpi6YBJHwpGYdcd7pccfr1BaG1HjobH03lbzFrTutIYM0d7qUkML8/YrBM+7f5j7AIo iPnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0TO3AKUnGTYlpFDHE0inxQ4G6Kp5byNURiimvggoLdA=; b=YZxUg2bDjxPRnWJxZhRDbUp2fGONIPpMiggTlwVJn38QynjGbrlC0fxASN4+ohguCJ bS4j+jXBn39xUdfVzcHpJjXhKY5U+bl0ax6a03UKZbU15pBJQaGHtxyAhgL8mWHStDBW hTJlwRJe1Q+xycU1zKQkcut5+eJpc5p4cVFlgeJKAD4ruw6UrjYan0Kn8YsgbtG8fcCV 1LKxqLqGvHN0tonmXL5eoHG/qFEDAAKGWpc+CLQXUTL0oRjFQph0aDMs5A29E59iZelL r+csJr9HMY6i27s637vrWOt1T52ZRgM91wOusj/uYdRkuadcXsSlG8rQXwJKcLxfXh7I 1ZwA== X-Gm-Message-State: ACrzQf1on3w2AA6QpvhdTOIfI56RpOcG+k5xQs85dsfkvehtWVhUDMzh rmTx0pAsrPHpwukJ5vDEsBClWMw3hTRerBup X-Google-Smtp-Source: AMsMyM6Vhpl383YXRdKXBDbatOJModzSMTkR7qLQrvoINEDGoty8TKOnEKR7Mae5fu6qqJVeG3EBDg== X-Received: by 2002:a17:90b:1d90:b0:213:d0a2:72ab with SMTP id pf16-20020a17090b1d9000b00213d0a272abmr18587259pjb.221.1667389464293; Wed, 02 Nov 2022 04:44:24 -0700 (PDT) Received: from Zbook.localdomain ([129.227.152.6]) by smtp.gmail.com with ESMTPSA id a11-20020a170902eccb00b00172e19c5f8bsm8169978plh.168.2022.11.02.04.44.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Nov 2022 04:44:23 -0700 (PDT) From: Yuwei Guan X-Google-Original-From: Yuwei Guan To: paolo.valente@linaro.org, axboe@kernel.dk, tj@kernel.org, josef@toxicpanda.com Cc: linux-block@vger.kernel.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, Yuwei.Guan@zeekrlife.com Subject: [PATCH 3/5] block, bfq: remove redundant max_t() in bfq_bfqq_charge_time() Date: Wed, 2 Nov 2022 19:43:52 +0800 Message-Id: <20221102114354.162-4-Yuwei.Guan@zeekrlife.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221102114354.162-1-Yuwei.Guan@zeekrlife.com> References: <20221102114354.162-1-Yuwei.Guan@zeekrlife.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org The "tot_serv_to_charge" is great than or equal to "entity->service", so no need to do max_t() again. Signed-off-by: Yuwei Guan --- block/bfq-wf2q.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/block/bfq-wf2q.c b/block/bfq-wf2q.c index 8fc3da4c23bb..3da08f4be633 100644 --- a/block/bfq-wf2q.c +++ b/block/bfq-wf2q.c @@ -867,8 +867,7 @@ void bfq_bfqq_charge_time(struct bfq_data *bfqd, struct bfq_queue *bfqq, if (tot_serv_to_charge > entity->budget) entity->budget = tot_serv_to_charge; - bfq_bfqq_served(bfqq, - max_t(int, 0, tot_serv_to_charge - entity->service)); + bfq_bfqq_served(bfqq, tot_serv_to_charge - entity->service); } static void bfq_update_fin_time_enqueue(struct bfq_entity *entity, From patchwork Wed Nov 2 11:43:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yuwei Guan X-Patchwork-Id: 13028010 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 69B4EC433FE for ; Wed, 2 Nov 2022 11:44:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230273AbiKBLok (ORCPT ); Wed, 2 Nov 2022 07:44:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42778 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230262AbiKBLob (ORCPT ); Wed, 2 Nov 2022 07:44:31 -0400 Received: from mail-pl1-x636.google.com (mail-pl1-x636.google.com [IPv6:2607:f8b0:4864:20::636]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EA400286FA; Wed, 2 Nov 2022 04:44:28 -0700 (PDT) Received: by mail-pl1-x636.google.com with SMTP id p3so16313161pld.10; Wed, 02 Nov 2022 04:44:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=zTeNkRAzXSEVLoL3Lhip7sQ1RKcNrqLgbC54eCLx1tw=; b=HDp9lWuenSozaRzjerT1H0dZlQhufG/Pzy+6qbGUuQROkQ8ydTkNedBSkovOwbR2Qo cb4AOFtQs3G5G27oFv8KLihh9/LjmdELUsdNSXD8x51ZYESdNoSvnWerP5ifneF2Angs DUUx6R8MUL788RpABcGiGAWTwq6SY7IwizGMNnrRGHqPRpXBqV2G2SFvE9oezxAwF2MW 0PToDCekpr574VXcUiycmuX6caumO8BZ9E4pnLjkFEJu1+3dWtkPyhYDIablEcZU75sW 53xi29g1iBbjJjUBi8vTccGJxC/tTfOpRVWmXV/x3jTzC/UyVFkPsfCoVeSvjaje9sGh NeOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=zTeNkRAzXSEVLoL3Lhip7sQ1RKcNrqLgbC54eCLx1tw=; b=yDEm74Z2W0mun7sHoRn4uXam6QkBceM2F2If0jBCSlHhbzR3XjOJOYop+d17pJ6Wk1 JMoNAYsN8acb9/J0HIRH6ipICLeb6kP5k1TDFQNQ8Fif4D9aSAgllwXfFJvsoB60U0rl UdXtQtcmUV2zE1zP2ba+MmX5jrmzoJxvT7MA3CKnU/LTzU4IvzHMFeNARAdUU2eljwJg Igq4YWhWbrYICvXN/rXXys4htZKcAbEcPy6rXgf0XWK9zif8UvqoSgwMvT+OFMnO8uef NbtcX1t528eZE/uREboAgva+FgTDIuxJqk1IfpobIAGXBDt8P6WinIzJk6/h/BKnr25K JQOw== X-Gm-Message-State: ACrzQf3ojEJlS5D8wEKEKuhuSdDrrbw4IObKcxVuD8j6ubjz1hbGsTVj PfOjP56tSxRNrzcdt2WhSoA= X-Google-Smtp-Source: AMsMyM5RkCwt5CxI4t4m7DqzSAgVMK5xL1W8zRs5CMeSCUTjpkusJgdhTJVBKjV0f47XIdRkKg/dag== X-Received: by 2002:a17:902:db12:b0:187:4736:f780 with SMTP id m18-20020a170902db1200b001874736f780mr3026987plx.145.1667389468355; Wed, 02 Nov 2022 04:44:28 -0700 (PDT) Received: from Zbook.localdomain ([129.227.152.6]) by smtp.gmail.com with ESMTPSA id a11-20020a170902eccb00b00172e19c5f8bsm8169978plh.168.2022.11.02.04.44.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Nov 2022 04:44:27 -0700 (PDT) From: Yuwei Guan X-Google-Original-From: Yuwei Guan To: paolo.valente@linaro.org, axboe@kernel.dk, tj@kernel.org, josef@toxicpanda.com Cc: linux-block@vger.kernel.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, Yuwei.Guan@zeekrlife.com Subject: [PATCH 4/5] block, bfq: change type for "prio_changed" Date: Wed, 2 Nov 2022 19:43:53 +0800 Message-Id: <20221102114354.162-5-Yuwei.Guan@zeekrlife.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221102114354.162-1-Yuwei.Guan@zeekrlife.com> References: <20221102114354.162-1-Yuwei.Guan@zeekrlife.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org "bool" type is more suitable for "prio_changed", so change it from int to bool. Signed-off-by: Yuwei Guan --- block/bfq-cgroup.c | 2 +- block/bfq-iosched.c | 20 ++++++++++---------- block/bfq-iosched.h | 2 +- block/bfq-wf2q.c | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/block/bfq-cgroup.c b/block/bfq-cgroup.c index 144bca006463..0eaa709995a9 100644 --- a/block/bfq-cgroup.c +++ b/block/bfq-cgroup.c @@ -1056,7 +1056,7 @@ static void bfq_group_set_weight(struct bfq_group *bfqg, u64 weight, u64 dev_wei * seen in that code. */ smp_wmb(); - bfqg->entity.prio_changed = 1; + bfqg->entity.prio_changed = true; } } diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index 74b87694105f..48fdad88aa48 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -1211,7 +1211,7 @@ bfq_bfqq_resume_state(struct bfq_queue *bfqq, struct bfq_data *bfqd, } /* make sure weight will be updated, however we got here */ - bfqq->entity.prio_changed = 1; + bfqq->entity.prio_changed = true; if (likely(!busy)) return; @@ -1917,7 +1917,7 @@ static void bfq_bfqq_handle_idle_busy_switch(struct bfq_data *bfqd, soft_rt); if (old_wr_coeff != bfqq->wr_coeff) - bfqq->entity.prio_changed = 1; + bfqq->entity.prio_changed = true; } } @@ -2315,7 +2315,7 @@ static void bfq_add_request(struct request *rq) bfqq->wr_cur_max_time = bfq_wr_duration(bfqd); bfqd->wr_busy_queues++; - bfqq->entity.prio_changed = 1; + bfqq->entity.prio_changed = true; } if (prev != bfqq->next_rq) bfq_updated_next_req(bfqd, bfqq); @@ -2634,7 +2634,7 @@ static void bfq_bfqq_end_wr(struct bfq_queue *bfqq) * Trigger a weight change on the next invocation of * __bfq_entity_update_weight_prio. */ - bfqq->entity.prio_changed = 1; + bfqq->entity.prio_changed = true; } void bfq_end_wr_async_queues(struct bfq_data *bfqd, @@ -3154,12 +3154,12 @@ bfq_merge_bfqqs(struct bfq_data *bfqd, struct bfq_io_cq *bic, bfqq->wr_start_at_switch_to_srt; if (bfq_bfqq_busy(new_bfqq)) bfqd->wr_busy_queues++; - new_bfqq->entity.prio_changed = 1; + new_bfqq->entity.prio_changed = true; } if (bfqq->wr_coeff > 1) { /* bfqq has given its wr to new_bfqq */ bfqq->wr_coeff = 1; - bfqq->entity.prio_changed = 1; + bfqq->entity.prio_changed = true; if (bfq_bfqq_busy(bfqq)) bfqd->wr_busy_queues--; } @@ -4987,7 +4987,7 @@ static void bfq_update_wr_data(struct bfq_data *bfqd, struct bfq_queue *bfqq) * interactive weight raising */ switch_back_to_interactive_wr(bfqq, bfqd); - bfqq->entity.prio_changed = 1; + bfqq->entity.prio_changed = true; } } if (bfqq->wr_coeff > 1 && @@ -5457,7 +5457,7 @@ bfq_set_next_ioprio_data(struct bfq_queue *bfqq, struct bfq_io_cq *bic) bfqq->entity.new_weight = bfq_ioprio_to_weight(bfqq->new_ioprio); bfq_log_bfqq(bfqd, bfqq, "new_ioprio %d new_weight %d", bfqq->new_ioprio, bfqq->entity.new_weight); - bfqq->entity.prio_changed = 1; + bfqq->entity.prio_changed = true; } static struct bfq_queue *bfq_get_queue(struct bfq_data *bfqd, @@ -5831,7 +5831,7 @@ bfq_update_io_seektime(struct bfq_data *bfqd, struct bfq_queue *bfqq, * raising */ switch_back_to_interactive_wr(bfqq, bfqd); - bfqq->entity.prio_changed = 1; + bfqq->entity.prio_changed = true; } } } @@ -7099,7 +7099,7 @@ static int bfq_init_queue(struct request_queue *q, struct elevator_type *e) * oom_bfqq's first activation. The oom_bfqq's ioprio and ioprio * class won't be changed any more. */ - bfqd->oom_bfqq.entity.prio_changed = 1; + bfqd->oom_bfqq.entity.prio_changed = true; bfqd->queue = q; diff --git a/block/bfq-iosched.h b/block/bfq-iosched.h index 256a9d267204..b022e5ec0871 100644 --- a/block/bfq-iosched.h +++ b/block/bfq-iosched.h @@ -195,7 +195,7 @@ struct bfq_entity { struct bfq_sched_data *sched_data; /* flag, set to request a weight, ioprio or ioprio_class change */ - int prio_changed; + bool prio_changed; /* flag, set if the entity is counted in groups_with_pending_reqs */ bool in_groups_with_pending_reqs; diff --git a/block/bfq-wf2q.c b/block/bfq-wf2q.c index 3da08f4be633..d9cef0f68d5a 100644 --- a/block/bfq-wf2q.c +++ b/block/bfq-wf2q.c @@ -751,7 +751,7 @@ __bfq_entity_update_weight_prio(struct bfq_service_tree *old_st, * is not pending any longer. */ if (!bfqq || bfqq->ioprio_class == bfqq->new_ioprio_class) - entity->prio_changed = 0; + entity->prio_changed = false; /* * NOTE: here we may be changing the weight too early, From patchwork Wed Nov 2 11:43:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yuwei Guan X-Patchwork-Id: 13028011 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 34178C4332F for ; Wed, 2 Nov 2022 11:44:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230502AbiKBLor (ORCPT ); Wed, 2 Nov 2022 07:44:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43072 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230306AbiKBLoi (ORCPT ); Wed, 2 Nov 2022 07:44:38 -0400 Received: from mail-pg1-x52b.google.com (mail-pg1-x52b.google.com [IPv6:2607:f8b0:4864:20::52b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D682128E01; Wed, 2 Nov 2022 04:44:32 -0700 (PDT) Received: by mail-pg1-x52b.google.com with SMTP id 128so16037056pga.1; Wed, 02 Nov 2022 04:44:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=KcGv5Q7FeBS6XrUIkFhAj+jX0IyfzopjVBjybBsLOts=; b=NIRcuK4gA8z2XwxCgqp9Dx/4mNr7Muhwf3kBaLGGNGk+uTXlEPN4veC+ztIPfZcDpG dPce3bE+p52PIK48GF4y5SLT6SZn+6d+4DZWr0NDfyVRVCpSttxyUsnr1Cugrz24zEh5 ZNu9CBU0pkTqFBoa7OV7kseKNU3xeoIijtz595GAaIIAFqWKGkjRnedDDj67q4YoaKrs p6IybNn6dYnYMv7z8y25J6SCMTzqlPt62Ee869kVbfuxQX/WTEeT1SOx3oRxeglKhBDy vQkitQenfhlIOV4Xn4qrwOaUKeDYwWQplKnaI+hJXuQW6sj+z1SWNwQDDXomw7mgCldf xU4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=KcGv5Q7FeBS6XrUIkFhAj+jX0IyfzopjVBjybBsLOts=; b=3j8JLB1Pg8xQ7T9epvUDcopgNwm4RsgnfhPzEMYdZe+P4bMxxJ+u+W5iVUDLPmggn2 zIA69qj6tqrzo/zSIafpxh5oNoAGW7edk1iGZqjMy1YhYJ83pqF+/K8r4VWAiTTOZG2P wWX+F/acS2cKju1pZaLpMI8F9EQb5ydtitTGdHEhaqj5OhTCOcLWP32HlXq27gWQYaTA HiIX6HBSZHmCr88GzJ6NAeX+60uPhEGQ6vkIOfvXl+uIQ1t7cBwf8e/bakRgp7VrqC5s tzZHHI6/64Dndfw1g2jw47SPrTBCQCzEmCebWG7watJTjMGPCytmFa0MWjlqsaPzlGt+ /sow== X-Gm-Message-State: ACrzQf04oKX/HPoLa089K/7vg0dqZSWWyiSGMyJeRVOCuFb6+NihMfwo MbYeDL5rtPYoDoQZezaxq/LAPEOBbFu3/FQK X-Google-Smtp-Source: AMsMyM5O4vlXZIVegdrEV7nsF6V+3nEid7nYAMcHEv2iar9n+VNzQrOtoJjE40XkUwLaO3K87P0AwA== X-Received: by 2002:a62:32c2:0:b0:56b:2cce:d46a with SMTP id y185-20020a6232c2000000b0056b2cced46amr24448117pfy.36.1667389472415; Wed, 02 Nov 2022 04:44:32 -0700 (PDT) Received: from Zbook.localdomain ([129.227.152.6]) by smtp.gmail.com with ESMTPSA id a11-20020a170902eccb00b00172e19c5f8bsm8169978plh.168.2022.11.02.04.44.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Nov 2022 04:44:32 -0700 (PDT) From: Yuwei Guan X-Google-Original-From: Yuwei Guan To: paolo.valente@linaro.org, axboe@kernel.dk, tj@kernel.org, josef@toxicpanda.com Cc: linux-block@vger.kernel.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, Yuwei.Guan@zeekrlife.com Subject: [PATCH 5/5] block, bfq: change type for "bfq_large_burst_thresh" Date: Wed, 2 Nov 2022 19:43:54 +0800 Message-Id: <20221102114354.162-6-Yuwei.Guan@zeekrlife.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221102114354.162-1-Yuwei.Guan@zeekrlife.com> References: <20221102114354.162-1-Yuwei.Guan@zeekrlife.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org "int" type is more suitable for "bfq_large_burst_thresh", so change it from "unsigned long" to "int". Signed-off-by: Yuwei Guan --- block/bfq-iosched.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block/bfq-iosched.h b/block/bfq-iosched.h index b022e5ec0871..df866936380e 100644 --- a/block/bfq-iosched.h +++ b/block/bfq-iosched.h @@ -701,7 +701,7 @@ struct bfq_data { /* Maximum burst size above which the current queue-activation * burst is deemed as 'large'. */ - unsigned long bfq_large_burst_thresh; + int bfq_large_burst_thresh; /* true if a large queue-activation burst is in progress */ bool large_burst; /*