From nobody Thu Sep 18 13:10:46 2025 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 8BDADC3A5A7 for ; Tue, 6 Dec 2022 08:16:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232711AbiLFIQJ (ORCPT ); Tue, 6 Dec 2022 03:16:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45622 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232576AbiLFIQD (ORCPT ); Tue, 6 Dec 2022 03:16:03 -0500 Received: from mail-ej1-x632.google.com (mail-ej1-x632.google.com [IPv6:2a00:1450:4864:20::632]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D243A15FE6 for ; Tue, 6 Dec 2022 00:16:00 -0800 (PST) Received: by mail-ej1-x632.google.com with SMTP id bj12so4229693ejb.13 for ; Tue, 06 Dec 2022 00:16:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=knIBT8MTXAoSoiR82CY5BXrrj2hqOFT44HSeZ2vz088=; b=qt8aDJupR/OL09oKKspfcXI7Jj7M6vE080+nHj50byRfyYbdJt9xhNFop8QcW7gAkl /Rkm9n3E9CcLbGi/8tLrEeAByj8Blbt9IOhFkxXobk4JhLyzCX8NgNwxunZ90j1jIc8b uK3EUDDmeUaCGZocH1KVxAnK2a9Ye+8lPbLmNE/xEsmUFBpM6W5bTeCiSKPUujn2Xghy QWgUr/SPPd7uQFuGEYGinawvNjRwRyWuVwPqNewen+3EnJTAdfm3nY5dHPzg2+yEYsXA eU4MCLlbV+Sm2ngos1ORXFic6Z5C8HuiN6I+n/R6zh7JZPJQVZQgPvjctc0TjoUQD23N iIuA== 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=knIBT8MTXAoSoiR82CY5BXrrj2hqOFT44HSeZ2vz088=; b=RgffhWAbaFdkEr8B0ehzn4aGgaXUmpeScO2VSEdNCJucu6dOHP+EJ04wBOLckXvxL7 jvLcuSJ7goMy7O0CLKBEtW9EYDF7kL0dwQEFNsw0d0hBS7FBVD4lYXmrLF4KnmcocZNj pvA473hSv7BH+l/3nuoR8pXyXx0tjD/5309PLzL/PsnWlW8R0CCy0BJADUfifbAnKzGH 2Yk3L1A1VSc61OqAj63hB+gAMNN3j8l0EWVXT40pOgYS9k/ek9KPD+phbRoChjuU11wQ XHT6OJSgaNk/LGRwqvkzSbPuGUPGmgHfCsRQhKVVIZwY0a7Al/U68tm9g9BoqysFdQkr Tdeg== X-Gm-Message-State: ANoB5pn8dcETXzOxZouIpT4w3LMczq+ZbET4GiXOFoEAaGWfUqeB5f/P 8wYQpP0v9v8xwSaRHe3qmej3Nw== X-Google-Smtp-Source: AA0mqf49xZhQBMRwTL0c7nB4uiB2PxGsdlexDdqFmUz9Ok8oAhm+LUwIUh/wjBljVrV7I/JeM/i4iA== X-Received: by 2002:a17:906:2312:b0:7c0:bb4c:e792 with SMTP id l18-20020a170906231200b007c0bb4ce792mr16318109eja.618.1670314559093; Tue, 06 Dec 2022 00:15:59 -0800 (PST) Received: from MBP-di-Paolo.station (net-2-35-55-161.cust.vodafonedsl.it. [2.35.55.161]) by smtp.gmail.com with ESMTPSA id 24-20020a170906329800b007b29d292852sm7161944ejw.148.2022.12.06.00.15.58 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Dec 2022 00:15:58 -0800 (PST) From: Paolo Valente To: Jens Axboe Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, arie.vanderhoeven@seagate.com, rory.c.chen@seagate.com, glen.valante@linaro.org, Paolo Valente , Gabriele Felici , Carmine Zaccagnino Subject: [PATCH V7 1/8] block, bfq: split sync bfq_queues on a per-actuator basis Date: Tue, 6 Dec 2022 09:15:44 +0100 Message-Id: <20221206081551.28257-2-paolo.valente@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20221206081551.28257-1-paolo.valente@linaro.org> References: <20221206081551.28257-1-paolo.valente@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Single-LUN multi-actuator SCSI drives, as well as all multi-actuator SATA drives appear as a single device to the I/O subsystem [1]. Yet they address commands to different actuators internally, as a function of Logical Block Addressing (LBAs). A given sector is reachable by only one of the actuators. For example, Seagate=E2=80=99s Serial Advanced Technology Attachment (SATA) version contains two actuators and maps the lower half of the SATA LBA space to the lower actuator and the upper half to the upper actuator. Evidently, to fully utilize actuators, no actuator must be left idle or underutilized while there is pending I/O for it. The block layer must somehow control the load of each actuator individually. This commit lays the ground for allowing BFQ to provide such a per-actuator control. BFQ associates an I/O-request sync bfq_queue with each process doing synchronous I/O, or with a group of processes, in case of queue merging. Then BFQ serves one bfq_queue at a time. While in service, a bfq_queue is emptied in request-position order. Yet the same process, or group of processes, may generate I/O for different actuators. In this case, different streams of I/O (each for a different actuator) get all inserted into the same sync bfq_queue. So there is basically no individual control on when each stream is served, i.e., on when the I/O requests of the stream are picked from the bfq_queue and dispatched to the drive. This commit enables BFQ to control the service of each actuator individually for synchronous I/O, by simply splitting each sync bfq_queue into N queues, one for each actuator. In other words, a sync bfq_queue is now associated to a pair (process, actuator). As a consequence of this split, the per-queue proportional-share policy implemented by BFQ will guarantee that the sync I/O generated for each actuator, by each process, receives its fair share of service. This is just a preparatory patch. If the I/O of the same process happens to be sent to different queues, then each of these queues may undergo queue merging. To handle this event, the bfq_io_cq data structure must be properly extended. In addition, stable merging must be disabled to avoid loss of control on individual actuators. Finally, also async queues must be split. These issues are described in detail and addressed in next commits. As for this commit, although multiple per-process bfq_queues are provided, the I/O of each process or group of processes is still sent to only one queue, regardless of the actuator the I/O is for. The forwarding to distinct bfq_queues will be enabled after addressing the above issues. [1] https://www.linaro.org/blog/budget-fair-queueing-bfq-linux-io-scheduler= -optimizations-for-multi-actuator-sata-hard-drives/ Signed-off-by: Gabriele Felici Signed-off-by: Carmine Zaccagnino Signed-off-by: Paolo Valente --- block/bfq-cgroup.c | 93 ++++++++++++++------------ block/bfq-iosched.c | 158 +++++++++++++++++++++++++++++--------------- block/bfq-iosched.h | 51 +++++++++++--- 3 files changed, 196 insertions(+), 106 deletions(-) diff --git a/block/bfq-cgroup.c b/block/bfq-cgroup.c index 7d624a3a3f0f..8275cdd4573f 100644 --- a/block/bfq-cgroup.c +++ b/block/bfq-cgroup.c @@ -704,6 +704,48 @@ void bfq_bfqq_move(struct bfq_data *bfqd, struct bfq_q= ueue *bfqq, bfq_put_queue(bfqq); } =20 +static void bfq_sync_bfqq_move(struct bfq_data *bfqd, + struct bfq_queue *sync_bfqq, + struct bfq_io_cq *bic, + struct bfq_group *bfqg, + unsigned int act_idx) +{ + struct bfq_queue *bfqq; + + if (!sync_bfqq->new_bfqq && !bfq_bfqq_coop(sync_bfqq)) { + /* We are the only user of this bfqq, just move it */ + if (sync_bfqq->entity.sched_data !=3D &bfqg->sched_data) + bfq_bfqq_move(bfqd, sync_bfqq, bfqg); + return; + } + + /* + * The queue was merged to a different queue. Check + * that the merge chain still belongs to the same + * cgroup. + */ + for (bfqq =3D sync_bfqq; bfqq; bfqq =3D bfqq->new_bfqq) + if (bfqq->entity.sched_data !=3D + &bfqg->sched_data) + break; + if (bfqq) { + /* + * Some queue changed cgroup so the merge is + * not valid anymore. We cannot easily just + * cancel the merge (by clearing new_bfqq) as + * there may be other processes using this + * queue and holding refs to all queues below + * sync_bfqq->new_bfqq. Similarly if the merge + * already happened, we need to detach from + * bfqq now so that we cannot merge bio to a + * request from the old cgroup. + */ + bfq_put_cooperator(sync_bfqq); + bfq_release_process_ref(bfqd, sync_bfqq); + bic_set_bfqq(bic, NULL, 1, act_idx); + } +} + /** * __bfq_bic_change_cgroup - move @bic to @bfqg. * @bfqd: the queue descriptor. @@ -718,53 +760,20 @@ static void *__bfq_bic_change_cgroup(struct bfq_data = *bfqd, struct bfq_io_cq *bic, struct bfq_group *bfqg) { - struct bfq_queue *async_bfqq =3D bic_to_bfqq(bic, 0); - struct bfq_queue *sync_bfqq =3D bic_to_bfqq(bic, 1); - struct bfq_entity *entity; + unsigned int act_idx; =20 - if (async_bfqq) { - entity =3D &async_bfqq->entity; + for (act_idx =3D 0; act_idx < bfqd->num_actuators; act_idx++) { + struct bfq_queue *async_bfqq =3D bic_to_bfqq(bic, false, act_idx); + struct bfq_queue *sync_bfqq =3D bic_to_bfqq(bic, true, act_idx); =20 - if (entity->sched_data !=3D &bfqg->sched_data) { - bic_set_bfqq(bic, NULL, 0); + if (async_bfqq && + async_bfqq->entity.sched_data !=3D &bfqg->sched_data) { + bic_set_bfqq(bic, NULL, 0, act_idx); bfq_release_process_ref(bfqd, async_bfqq); } - } =20 - if (sync_bfqq) { - if (!sync_bfqq->new_bfqq && !bfq_bfqq_coop(sync_bfqq)) { - /* We are the only user of this bfqq, just move it */ - if (sync_bfqq->entity.sched_data !=3D &bfqg->sched_data) - bfq_bfqq_move(bfqd, sync_bfqq, bfqg); - } else { - struct bfq_queue *bfqq; - - /* - * The queue was merged to a different queue. Check - * that the merge chain still belongs to the same - * cgroup. - */ - for (bfqq =3D sync_bfqq; bfqq; bfqq =3D bfqq->new_bfqq) - if (bfqq->entity.sched_data !=3D - &bfqg->sched_data) - break; - if (bfqq) { - /* - * Some queue changed cgroup so the merge is - * not valid anymore. We cannot easily just - * cancel the merge (by clearing new_bfqq) as - * there may be other processes using this - * queue and holding refs to all queues below - * sync_bfqq->new_bfqq. Similarly if the merge - * already happened, we need to detach from - * bfqq now so that we cannot merge bio to a - * request from the old cgroup. - */ - bfq_put_cooperator(sync_bfqq); - bfq_release_process_ref(bfqd, sync_bfqq); - bic_set_bfqq(bic, NULL, 1); - } - } + if (sync_bfqq) + bfq_sync_bfqq_move(bfqd, sync_bfqq, bic, bfqg, act_idx); } =20 return bfqg; diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index 7ea427817f7f..127aeecaf903 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -377,14 +377,21 @@ static const unsigned long bfq_late_stable_merging = =3D 600; #define RQ_BIC(rq) ((struct bfq_io_cq *)((rq)->elv.priv[0])) #define RQ_BFQQ(rq) ((rq)->elv.priv[1]) =20 -struct bfq_queue *bic_to_bfqq(struct bfq_io_cq *bic, bool is_sync) +struct bfq_queue *bic_to_bfqq(struct bfq_io_cq *bic, bool is_sync, + unsigned int actuator_idx) { - return bic->bfqq[is_sync]; + if (is_sync) + return bic->bfqq[1][actuator_idx]; + + return bic->bfqq[0][actuator_idx]; } =20 static void bfq_put_stable_ref(struct bfq_queue *bfqq); =20 -void bic_set_bfqq(struct bfq_io_cq *bic, struct bfq_queue *bfqq, bool is_s= ync) +void bic_set_bfqq(struct bfq_io_cq *bic, + struct bfq_queue *bfqq, + bool is_sync, + unsigned int actuator_idx) { /* * If bfqq !=3D NULL, then a non-stable queue merge between @@ -399,7 +406,10 @@ void bic_set_bfqq(struct bfq_io_cq *bic, struct bfq_qu= eue *bfqq, bool is_sync) * we cancel the stable merge if * bic->stable_merge_bfqq =3D=3D bfqq. */ - bic->bfqq[is_sync] =3D bfqq; + if (is_sync) + bic->bfqq[1][actuator_idx] =3D bfqq; + else + bic->bfqq[0][actuator_idx] =3D bfqq; =20 if (bfqq && bic->stable_merge_bfqq =3D=3D bfqq) { /* @@ -672,9 +682,9 @@ static void bfq_limit_depth(blk_opf_t opf, struct blk_m= q_alloc_data *data) { struct bfq_data *bfqd =3D data->q->elevator->elevator_data; struct bfq_io_cq *bic =3D bfq_bic_lookup(data->q); - struct bfq_queue *bfqq =3D bic ? bic_to_bfqq(bic, op_is_sync(opf)) : NULL; int depth; unsigned limit =3D data->q->nr_requests; + unsigned int act_idx; =20 /* Sync reads have full depth available */ if (op_is_sync(opf) && !op_is_write(opf)) { @@ -684,14 +694,21 @@ static void bfq_limit_depth(blk_opf_t opf, struct blk= _mq_alloc_data *data) limit =3D (limit * depth) >> bfqd->full_depth_shift; } =20 - /* - * Does queue (or any parent entity) exceed number of requests that - * should be available to it? Heavily limit depth so that it cannot - * consume more available requests and thus starve other entities. - */ - if (bfqq && bfqq_request_over_limit(bfqq, limit)) - depth =3D 1; + for (act_idx =3D 0; act_idx < bfqd->num_actuators; act_idx++) { + struct bfq_queue *bfqq =3D + bic ? bic_to_bfqq(bic, op_is_sync(opf), act_idx) : NULL; =20 + /* + * Does queue (or any parent entity) exceed number of + * requests that should be available to it? Heavily + * limit depth so that it cannot consume more + * available requests and thus starve other entities. + */ + if (bfqq && bfqq_request_over_limit(bfqq, limit)) { + depth =3D 1; + break; + } + } bfq_log(bfqd, "[%s] wr_busy %d sync %d depth %u", __func__, bfqd->wr_busy_queues, op_is_sync(opf), depth); if (depth) @@ -1812,6 +1829,18 @@ static bool bfq_bfqq_higher_class_or_weight(struct b= fq_queue *bfqq, return bfqq_weight > in_serv_weight; } =20 +/* + * Get the index of the actuator that will serve bio. + */ +static unsigned int bfq_actuator_index(struct bfq_data *bfqd, struct bio *= bio) +{ + /* + * Multi-actuator support not complete yet, so always return 0 + * for the moment (to keep incomplete mechanisms off). + */ + return 0; +} + static bool bfq_better_to_idle(struct bfq_queue *bfqq); =20 static void bfq_bfqq_handle_idle_busy_switch(struct bfq_data *bfqd, @@ -2142,7 +2171,7 @@ static void bfq_check_waker(struct bfq_data *bfqd, st= ruct bfq_queue *bfqq, * We reset waker detection logic also if too much time has passed * since the first detection. If wakeups are rare, pointless idling * doesn't hurt throughput that much. The condition below makes sure - * we do not uselessly idle blocking waker in more than 1/64 cases.=20 + * we do not uselessly idle blocking waker in more than 1/64 cases. */ if (bfqd->last_completed_rq_bfqq !=3D bfqq->tentative_waker_bfqq || @@ -2478,7 +2507,8 @@ static bool bfq_bio_merge(struct request_queue *q, st= ruct bio *bio, */ bfq_bic_update_cgroup(bic, bio); =20 - bfqd->bio_bfqq =3D bic_to_bfqq(bic, op_is_sync(bio->bi_opf)); + bfqd->bio_bfqq =3D bic_to_bfqq(bic, op_is_sync(bio->bi_opf), + bfq_actuator_index(bfqd, bio)); } else { bfqd->bio_bfqq =3D NULL; } @@ -3174,7 +3204,7 @@ bfq_merge_bfqqs(struct bfq_data *bfqd, struct bfq_io_= cq *bic, /* * Merge queues (that is, let bic redirect its requests to new_bfqq) */ - bic_set_bfqq(bic, new_bfqq, 1); + bic_set_bfqq(bic, new_bfqq, 1, bfqq->actuator_idx); bfq_mark_bfqq_coop(new_bfqq); /* * new_bfqq now belongs to at least two bics (it is a shared queue): @@ -4808,11 +4838,8 @@ static struct bfq_queue *bfq_select_queue(struct bfq= _data *bfqd) */ if (bfq_bfqq_wait_request(bfqq) || (bfqq->dispatched !=3D 0 && bfq_better_to_idle(bfqq))) { - struct bfq_queue *async_bfqq =3D - bfqq->bic && bfqq->bic->bfqq[0] && - bfq_bfqq_busy(bfqq->bic->bfqq[0]) && - bfqq->bic->bfqq[0]->next_rq ? - bfqq->bic->bfqq[0] : NULL; + unsigned int act_idx =3D bfqq->actuator_idx; + struct bfq_queue *async_bfqq =3D NULL; struct bfq_queue *blocked_bfqq =3D !hlist_empty(&bfqq->woken_list) ? container_of(bfqq->woken_list.first, @@ -4820,6 +4847,10 @@ static struct bfq_queue *bfq_select_queue(struct bfq= _data *bfqd) woken_list_node) : NULL; =20 + if (bfqq->bic && bfqq->bic->bfqq[0][act_idx] && + bfq_bfqq_busy(bfqq->bic->bfqq[0][act_idx]) && + bfqq->bic->bfqq[0][act_idx]->next_rq) + async_bfqq =3D bfqq->bic->bfqq[0][act_idx]; /* * The next four mutually-exclusive ifs decide * whether to try injection, and choose the queue to @@ -4904,7 +4935,7 @@ static struct bfq_queue *bfq_select_queue(struct bfq_= data *bfqd) icq_to_bic(async_bfqq->next_rq->elv.icq) =3D=3D bfqq->bic && bfq_serv_to_charge(async_bfqq->next_rq, async_bfqq) <=3D bfq_bfqq_budget_left(async_bfqq)) - bfqq =3D bfqq->bic->bfqq[0]; + bfqq =3D bfqq->bic->bfqq[0][act_idx]; else if (bfqq->waker_bfqq && bfq_bfqq_busy(bfqq->waker_bfqq) && bfqq->waker_bfqq->next_rq && @@ -5365,49 +5396,55 @@ static void bfq_exit_bfqq(struct bfq_data *bfqd, st= ruct bfq_queue *bfqq) bfq_release_process_ref(bfqd, bfqq); } =20 -static void bfq_exit_icq_bfqq(struct bfq_io_cq *bic, bool is_sync) +static void bfq_exit_icq_bfqq(struct bfq_io_cq *bic, bool is_sync, + unsigned int actuator_idx) { - struct bfq_queue *bfqq =3D bic_to_bfqq(bic, is_sync); + struct bfq_queue *bfqq =3D bic_to_bfqq(bic, is_sync, actuator_idx); struct bfq_data *bfqd; =20 if (bfqq) bfqd =3D bfqq->bfqd; /* NULL if scheduler already exited */ =20 if (bfqq && bfqd) { - unsigned long flags; - - spin_lock_irqsave(&bfqd->lock, flags); bfqq->bic =3D NULL; bfq_exit_bfqq(bfqd, bfqq); - bic_set_bfqq(bic, NULL, is_sync); - spin_unlock_irqrestore(&bfqd->lock, flags); + bic_set_bfqq(bic, NULL, is_sync, actuator_idx); } } =20 static void bfq_exit_icq(struct io_cq *icq) { struct bfq_io_cq *bic =3D icq_to_bic(icq); + struct bfq_data *bfqd =3D bic_to_bfqd(bic); + unsigned long flags; + unsigned int act_idx; + /* + * If bfqd and thus bfqd->num_actuators is not available any + * longer, then cycle over all possible per-actuator bfqqs in + * next loop. We rely on bic being zeroed on creation, and + * therefore on its unused per-actuator fields being NULL. + */ + unsigned int num_actuators =3D BFQ_MAX_ACTUATORS; =20 - if (bic->stable_merge_bfqq) { - struct bfq_data *bfqd =3D bic->stable_merge_bfqq->bfqd; + /* + * bfqd is NULL if scheduler already exited, and in that case + * this is the last time these queues are accessed. + */ + if (bfqd) { + spin_lock_irqsave(&bfqd->lock, flags); + num_actuators =3D bfqd->num_actuators; + } =20 - /* - * bfqd is NULL if scheduler already exited, and in - * that case this is the last time bfqq is accessed. - */ - if (bfqd) { - unsigned long flags; + if (bic->stable_merge_bfqq) + bfq_put_stable_ref(bic->stable_merge_bfqq); =20 - spin_lock_irqsave(&bfqd->lock, flags); - bfq_put_stable_ref(bic->stable_merge_bfqq); - spin_unlock_irqrestore(&bfqd->lock, flags); - } else { - bfq_put_stable_ref(bic->stable_merge_bfqq); - } + for (act_idx =3D 0; act_idx < num_actuators; act_idx++) { + bfq_exit_icq_bfqq(bic, true, act_idx); + bfq_exit_icq_bfqq(bic, false, act_idx); } =20 - bfq_exit_icq_bfqq(bic, true); - bfq_exit_icq_bfqq(bic, false); + if (bfqd) + spin_unlock_irqrestore(&bfqd->lock, flags); } =20 /* @@ -5484,23 +5521,25 @@ static void bfq_check_ioprio_change(struct bfq_io_c= q *bic, struct bio *bio) =20 bic->ioprio =3D ioprio; =20 - bfqq =3D bic_to_bfqq(bic, false); + bfqq =3D bic_to_bfqq(bic, false, bfq_actuator_index(bfqd, bio)); if (bfqq) { bfq_release_process_ref(bfqd, bfqq); bfqq =3D bfq_get_queue(bfqd, bio, false, bic, true); - bic_set_bfqq(bic, bfqq, false); + bic_set_bfqq(bic, bfqq, false, bfq_actuator_index(bfqd, bio)); } =20 - bfqq =3D bic_to_bfqq(bic, true); + bfqq =3D bic_to_bfqq(bic, true, bfq_actuator_index(bfqd, bio)); if (bfqq) bfq_set_next_ioprio_data(bfqq, bic); } =20 static void bfq_init_bfqq(struct bfq_data *bfqd, struct bfq_queue *bfqq, - struct bfq_io_cq *bic, pid_t pid, int is_sync) + struct bfq_io_cq *bic, pid_t pid, int is_sync, + unsigned int act_idx) { u64 now_ns =3D ktime_get_ns(); =20 + bfqq->actuator_idx =3D act_idx; RB_CLEAR_NODE(&bfqq->entity.rb_node); INIT_LIST_HEAD(&bfqq->fifo); INIT_HLIST_NODE(&bfqq->burst_list_node); @@ -5753,7 +5792,7 @@ static struct bfq_queue *bfq_get_queue(struct bfq_dat= a *bfqd, =20 if (bfqq) { bfq_init_bfqq(bfqd, bfqq, bic, current->pid, - is_sync); + is_sync, bfq_actuator_index(bfqd, bio)); bfq_init_entity(&bfqq->entity, bfqg); bfq_log_bfqq(bfqd, bfqq, "allocated"); } else { @@ -6068,7 +6107,8 @@ static bool __bfq_insert_request(struct bfq_data *bfq= d, struct request *rq) * then complete the merge and redirect it to * new_bfqq. */ - if (bic_to_bfqq(RQ_BIC(rq), 1) =3D=3D bfqq) + if (bic_to_bfqq(RQ_BIC(rq), 1, + bfq_actuator_index(bfqd, rq->bio)) =3D=3D bfqq) bfq_merge_bfqqs(bfqd, RQ_BIC(rq), bfqq, new_bfqq); =20 @@ -6622,7 +6662,7 @@ bfq_split_bfqq(struct bfq_io_cq *bic, struct bfq_queu= e *bfqq) return bfqq; } =20 - bic_set_bfqq(bic, NULL, 1); + bic_set_bfqq(bic, NULL, 1, bfqq->actuator_idx); =20 bfq_put_cooperator(bfqq); =20 @@ -6636,7 +6676,8 @@ static struct bfq_queue *bfq_get_bfqq_handle_split(st= ruct bfq_data *bfqd, bool split, bool is_sync, bool *new_queue) { - struct bfq_queue *bfqq =3D bic_to_bfqq(bic, is_sync); + unsigned int act_idx =3D bfq_actuator_index(bfqd, bio); + struct bfq_queue *bfqq =3D bic_to_bfqq(bic, is_sync, act_idx); =20 if (likely(bfqq && bfqq !=3D &bfqd->oom_bfqq)) return bfqq; @@ -6648,7 +6689,7 @@ static struct bfq_queue *bfq_get_bfqq_handle_split(st= ruct bfq_data *bfqd, bfq_put_queue(bfqq); bfqq =3D bfq_get_queue(bfqd, bio, is_sync, bic, split); =20 - bic_set_bfqq(bic, bfqq, is_sync); + bic_set_bfqq(bic, bfqq, is_sync, act_idx); if (split && is_sync) { if ((bic->was_in_burst_list && bfqd->large_burst) || bic->saved_in_large_burst) @@ -7090,8 +7131,10 @@ static int bfq_init_queue(struct request_queue *q, s= truct elevator_type *e) * Our fallback bfqq if bfq_find_alloc_queue() runs into OOM issues. * Grab a permanent reference to it, so that the normal code flow * will not attempt to free it. + * Set zero as actuator index: we will pretend that + * all I/O requests are for the same actuator. */ - bfq_init_bfqq(bfqd, &bfqd->oom_bfqq, NULL, 1, 0); + bfq_init_bfqq(bfqd, &bfqd->oom_bfqq, NULL, 1, 0, 0); bfqd->oom_bfqq.ref++; bfqd->oom_bfqq.new_ioprio =3D BFQ_DEFAULT_QUEUE_IOPRIO; bfqd->oom_bfqq.new_ioprio_class =3D IOPRIO_CLASS_BE; @@ -7110,6 +7153,13 @@ static int bfq_init_queue(struct request_queue *q, s= truct elevator_type *e) =20 bfqd->queue =3D q; =20 + /* + * Multi-actuator support not complete yet, unconditionally + * set to only one actuator for the moment (to keep incomplete + * mechanisms off). + */ + bfqd->num_actuators =3D 1; + INIT_LIST_HEAD(&bfqd->dispatch); =20 hrtimer_init(&bfqd->idle_slice_timer, CLOCK_MONOTONIC, diff --git a/block/bfq-iosched.h b/block/bfq-iosched.h index 71f721670ab6..2b413ddffbb9 100644 --- a/block/bfq-iosched.h +++ b/block/bfq-iosched.h @@ -33,6 +33,14 @@ */ #define BFQ_SOFTRT_WEIGHT_FACTOR 100 =20 +/* + * Maximum number of actuators supported. This constant is used simply + * to define the size of the static array that will contain + * per-actuator data. The current value is hopefully a good upper + * bound to the possible number of actuators of any actual drive. + */ +#define BFQ_MAX_ACTUATORS 8 + struct bfq_entity; =20 /** @@ -225,12 +233,14 @@ struct bfq_ttime { * struct bfq_queue - leaf schedulable entity. * * A bfq_queue is a leaf request queue; it can be associated with an - * io_context or more, if it is async or shared between cooperating - * processes. @cgroup holds a reference to the cgroup, to be sure that it - * does not disappear while a bfqq still references it (mostly to avoid - * races between request issuing and task migration followed by cgroup - * destruction). - * All the fields are protected by the queue lock of the containing bfqd. + * io_context or more, if it is async or shared between cooperating + * processes. Besides, it contains I/O requests for only one actuator + * (an io_context is associated with a different bfq_queue for each + * actuator it generates I/O for). @cgroup holds a reference to the + * cgroup, to be sure that it does not disappear while a bfqq still + * references it (mostly to avoid races between request issuing and + * task migration followed by cgroup destruction). All the fields are + * protected by the queue lock of the containing bfqd. */ struct bfq_queue { /* reference counter */ @@ -395,6 +405,9 @@ struct bfq_queue { * the woken queues when this queue exits. */ struct hlist_head woken_list; + + /* index of the actuator this queue is associated with */ + unsigned int actuator_idx; }; =20 /** @@ -403,8 +416,17 @@ struct bfq_queue { struct bfq_io_cq { /* associated io_cq structure */ struct io_cq icq; /* must be the first member */ - /* array of two process queues, the sync and the async */ - struct bfq_queue *bfqq[2]; + /* + * Matrix of associated process queues: first row for async + * queues, second row sync queues. Each row contains one + * column for each actuator. An I/O request generated by the + * process is inserted into the queue pointed by bfqq[i][j] if + * the request is to be served by the j-th actuator of the + * drive, where i=3D=3D0 or i=3D=3D1, depending on whether the request + * is async or sync. So there is a distinct queue for each + * actuator. + */ + struct bfq_queue *bfqq[2][BFQ_MAX_ACTUATORS]; /* per (request_queue, blkcg) ioprio */ int ioprio; #ifdef CONFIG_BFQ_GROUP_IOSCHED @@ -768,6 +790,13 @@ struct bfq_data { */ unsigned int word_depths[2][2]; unsigned int full_depth_shift; + + /* + * Number of independent actuators. This is equal to 1 in + * case of single-actuator drives. + */ + unsigned int num_actuators; + }; =20 enum bfqq_state_flags { @@ -964,8 +993,10 @@ struct bfq_group { =20 extern const int bfq_timeout; =20 -struct bfq_queue *bic_to_bfqq(struct bfq_io_cq *bic, bool is_sync); -void bic_set_bfqq(struct bfq_io_cq *bic, struct bfq_queue *bfqq, bool is_s= ync); +struct bfq_queue *bic_to_bfqq(struct bfq_io_cq *bic, bool is_sync, + unsigned int actuator_idx); +void bic_set_bfqq(struct bfq_io_cq *bic, struct bfq_queue *bfqq, bool is_s= ync, + unsigned int actuator_idx); struct bfq_data *bic_to_bfqd(struct bfq_io_cq *bic); void bfq_pos_tree_add_move(struct bfq_data *bfqd, struct bfq_queue *bfqq); void bfq_weights_tree_add(struct bfq_data *bfqd, struct bfq_queue *bfqq, --=20 2.20.1 From nobody Thu Sep 18 13:10:46 2025 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 A9D05C352A1 for ; Tue, 6 Dec 2022 08:16:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232576AbiLFIQP (ORCPT ); Tue, 6 Dec 2022 03:16:15 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45634 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232616AbiLFIQE (ORCPT ); Tue, 6 Dec 2022 03:16:04 -0500 Received: from mail-ej1-x629.google.com (mail-ej1-x629.google.com [IPv6:2a00:1450:4864:20::629]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6E02117886 for ; Tue, 6 Dec 2022 00:16:01 -0800 (PST) Received: by mail-ej1-x629.google.com with SMTP id qk9so4327953ejc.3 for ; Tue, 06 Dec 2022 00:16:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=ImsIGbtS7K4eRO9+kEH+W1Wsc4a1+MpOkb6mhTvwHcY=; b=LOCPHLMXwcs4XzqQFNlU7NqgqlVH99G0Kr5CE/Anfz6qgX7QDZmp4Xx8e9DkY8B2mU IWKQ4lOfo3iABTF8w5oHOu/DBdsi/6f49J2xQhbVRAnoRMG2Lb83i4ifp5WCGzU10QrJ BU4/0xSRLUYajoSY75AnkeOATXgkvtQdFHBVmNxnZ25cEhIzDQEpZ+VfPbw0l2r7u8Oz AgdotD4+LMdAW9EQEPO6iapd40iGqFcK9St6kKJJJO5dM3DHHiXq26t5Z4YqDzBHFidj GmxkX00z2H7Kh2amWyaXZ8eRtvguEAJQonPnJtGVps6lukSKN0OVp0jxt85eJJk67anV snOQ== 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=ImsIGbtS7K4eRO9+kEH+W1Wsc4a1+MpOkb6mhTvwHcY=; b=h26Tgjt0VOHRghQQZOM5njvNMbU1I2TcrXyRVYv1q6gQ+mrfAAuLKn0zdo266FoOVS Kl1ZqqmnvMJE5RY62bmG2qkJ+TzUx8RBWUfzAxBCTVlejHUL7aiShqQTygQ+Sr8dIIKy 93GqtcG0dibRIDwQuK8lYIl48YGNNWMeZ3IjiTlKWp3VUxcwrQa4gyn1wrwhr5UMDmuq vuonzRwNF5/jHVIPgQsGTg6PD98N7/SUyTQKVNzTXtxtqQIxfedYV5aN514umooUIZ6n 53qYUhyyAN4eKZ+oCWi3CBeUwOGCbY38RaJXFd0o5XqCGu+QLxwqzHYvMSTZumbQz2gI GcxQ== X-Gm-Message-State: ANoB5pnTFwqHO0+Jgtz62FveG6fEKXe46taW1Tp2bE+1oKomSHXZcXtD f+6K1/iUXXiIywN57Vn3kBoOUw== X-Google-Smtp-Source: AA0mqf73EGwpI4LALaoGasuN4EZ88xWdgPzOnBN/80ljBrrKb3xvXwaclajqUAx1l4N8E13SJG5srQ== X-Received: by 2002:a17:906:b08b:b0:78d:e608:f064 with SMTP id x11-20020a170906b08b00b0078de608f064mr72162075ejy.34.1670314559943; Tue, 06 Dec 2022 00:15:59 -0800 (PST) Received: from MBP-di-Paolo.station (net-2-35-55-161.cust.vodafonedsl.it. [2.35.55.161]) by smtp.gmail.com with ESMTPSA id 24-20020a170906329800b007b29d292852sm7161944ejw.148.2022.12.06.00.15.59 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Dec 2022 00:15:59 -0800 (PST) From: Paolo Valente To: Jens Axboe Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, arie.vanderhoeven@seagate.com, rory.c.chen@seagate.com, glen.valante@linaro.org, Paolo Valente Subject: [PATCH V7 2/8] block, bfq: forbid stable merging of queues associated with different actuators Date: Tue, 6 Dec 2022 09:15:45 +0100 Message-Id: <20221206081551.28257-3-paolo.valente@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20221206081551.28257-1-paolo.valente@linaro.org> References: <20221206081551.28257-1-paolo.valente@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" If queues associated with different actuators are merged, then control is lost on each actuator. Therefore some actuator may be underutilized, and throughput may decrease. This problem cannot occur with basic queue merging, because the latter is triggered by spatial locality, and sectors for different actuators are not close to each other. Yet it may happen with stable merging. To address this issue, this commit prevents stable merging from occurring among queues associated with different actuators. Signed-off-by: Paolo Valente --- block/bfq-iosched.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index 127aeecaf903..03cea06fa9d4 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -5708,9 +5708,13 @@ static struct bfq_queue *bfq_do_or_sched_stable_merg= e(struct bfq_data *bfqd, * it has been set already, but too long ago, then move it * forward to bfqq. Finally, move also if bfqq belongs to a * different group than last_bfqq_created, or if bfqq has a - * different ioprio or ioprio_class. If none of these - * conditions holds true, then try an early stable merge or - * schedule a delayed stable merge. + * different ioprio, ioprio_class or actuator_idx. If none of + * these conditions holds true, then try an early stable merge + * or schedule a delayed stable merge. As for the condition on + * actuator_idx, the reason is that, if queues associated with + * different actuators are merged, then control is lost on + * each actuator. Therefore some actuator may be + * underutilized, and throughput may decrease. * * A delayed merge is scheduled (instead of performing an * early merge), in case bfqq might soon prove to be more @@ -5728,7 +5732,8 @@ static struct bfq_queue *bfq_do_or_sched_stable_merge= (struct bfq_data *bfqd, bfqq->creation_time) || bfqq->entity.parent !=3D last_bfqq_created->entity.parent || bfqq->ioprio !=3D last_bfqq_created->ioprio || - bfqq->ioprio_class !=3D last_bfqq_created->ioprio_class) + bfqq->ioprio_class !=3D last_bfqq_created->ioprio_class || + bfqq->actuator_idx !=3D last_bfqq_created->actuator_idx) *source_bfqq =3D bfqq; else if (time_after_eq(last_bfqq_created->creation_time + bfqd->bfq_burst_interval, --=20 2.20.1 From nobody Thu Sep 18 13:10:46 2025 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 75848C47090 for ; Tue, 6 Dec 2022 08:16:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231514AbiLFIQW (ORCPT ); Tue, 6 Dec 2022 03:16:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45644 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232676AbiLFIQF (ORCPT ); Tue, 6 Dec 2022 03:16:05 -0500 Received: from mail-ej1-x635.google.com (mail-ej1-x635.google.com [IPv6:2a00:1450:4864:20::635]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 863551837F for ; Tue, 6 Dec 2022 00:16:01 -0800 (PST) Received: by mail-ej1-x635.google.com with SMTP id vv4so4346304ejc.2 for ; Tue, 06 Dec 2022 00:16:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=Q6hdjUNbe/i7SFyf7ZMv1ieRJDSYbMk/nrYaBNMu2Vo=; b=rkVmiGjqfdCY/tvR8cUTTvIZRil1wUpx6AWIJEU9xNEvha95VUaL04WcUF42y46ZX/ H+0iGxXeRtIHcMUzFRaa1gvtsteXI4ee+r45ppUd8vVYxOcm2EcNyhovk6/h5BZb6eDY c2jEOnnuGA/5ipz34Q2imCXg79eOZSmfkWmz3Z+zO1aSnHI+3pJP5S2nu6PT+riHu4e3 lYK6xrMk04I3DUGHdOr23oznCU39C7L1xXeCI88dlq+Dwp3IdaKp1cGbmH3ojQxikbUt et9j7HyQajGIi2/xquMoUd//jc03UeAXHaKl3N53PpC8SuUyZncv0DHhH4Ip/hIsPFxm sxSQ== 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=Q6hdjUNbe/i7SFyf7ZMv1ieRJDSYbMk/nrYaBNMu2Vo=; b=63DXeHSeKHlEhJQZlKLaYuj+8fKAUEn0jwOj1DUGBlCJz58Kjymb8SmfDRCLXxgJaq 8XORjeLkrjyr1RhHt7CtvHV3gXiaVQOnn5gAzHgeQSzx9kZCIFQjo1TZkADgq3yFoyPc xhBkSfwdWKU1MQvvPpvpI5TSOJUxkM43QHIJdtbDfw5FsZYBv3Xzlj5Rd9q2sXMoHDvu un/WAn81dLN/d/TrbBdvgGOJJDCj2NtrD3u2Vnw8uU5JizHuvYIIeirwr0TJvOmcqaTS O1DUR77VqzguHHTGieE5VQP5ntHr+nCKG7VzSMs7rJ41MGaLl2uXMtLz/oupYM+u8J1A QBhQ== X-Gm-Message-State: ANoB5pl6r2uqUHnFCVZsCwLmQEhYEKfnjFUrrARjGsg2nOsA6KrfXNHz iSegLdGPnlq0c/zVw9VoF3ddkg== X-Google-Smtp-Source: AA0mqf5/mBF/wmtaZKuXmC5lixPzFZ0dlPIgGbx9lp8fZr5QqBFhYGmxKlqXXo6IzkerwCqSncVCdw== X-Received: by 2002:a17:906:4914:b0:7c0:93e6:9f18 with SMTP id b20-20020a170906491400b007c093e69f18mr24811075ejq.350.1670314560980; Tue, 06 Dec 2022 00:16:00 -0800 (PST) Received: from MBP-di-Paolo.station (net-2-35-55-161.cust.vodafonedsl.it. [2.35.55.161]) by smtp.gmail.com with ESMTPSA id 24-20020a170906329800b007b29d292852sm7161944ejw.148.2022.12.06.00.16.00 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Dec 2022 00:16:00 -0800 (PST) From: Paolo Valente To: Jens Axboe Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, arie.vanderhoeven@seagate.com, rory.c.chen@seagate.com, glen.valante@linaro.org, Paolo Valente , Damien Le Moal , Gianmarco Lusvardi , Giulio Barabino , Emiliano Maccaferri Subject: [PATCH V7 3/8] block, bfq: move io_cq-persistent bfqq data into a dedicated struct Date: Tue, 6 Dec 2022 09:15:46 +0100 Message-Id: <20221206081551.28257-4-paolo.valente@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20221206081551.28257-1-paolo.valente@linaro.org> References: <20221206081551.28257-1-paolo.valente@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" With a multi-actuator drive, a process may get associated with multiple bfq_queues: one queue for each of the N actuators. So, the bfq_io_cq data structure must be able to accommodate its per-queue persistent information for N queues. Currently it stores this information for just one queue, in several scalar fields. This is a preparatory commit for moving to accommodating persistent information for N queues. In particular, this commit packs all the above scalar fields into a single data structure. Then there is now only one field, in bfq_io_cq, that stores all the above information. This scalar field will then be turned into an array by a following commit. Suggested-by: Damien Le Moal Signed-off-by: Gianmarco Lusvardi Signed-off-by: Giulio Barabino Signed-off-by: Emiliano Maccaferri Signed-off-by: Paolo Valente --- block/bfq-iosched.c | 129 +++++++++++++++++++++++++------------------- block/bfq-iosched.h | 52 ++++++++++-------- 2 files changed, 105 insertions(+), 76 deletions(-) diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index 03cea06fa9d4..a8aeb324c91c 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -406,12 +406,13 @@ void bic_set_bfqq(struct bfq_io_cq *bic, * we cancel the stable merge if * bic->stable_merge_bfqq =3D=3D bfqq. */ + struct bfq_iocq_bfqq_data *bfqq_data =3D &bic->bfqq_data; if (is_sync) bic->bfqq[1][actuator_idx] =3D bfqq; else bic->bfqq[0][actuator_idx] =3D bfqq; =20 - if (bfqq && bic->stable_merge_bfqq =3D=3D bfqq) { + if (bfqq && bfqq_data->stable_merge_bfqq =3D=3D bfqq) { /* * Actually, these same instructions are executed also * in bfq_setup_cooperator, in case of abort or actual @@ -420,9 +421,9 @@ void bic_set_bfqq(struct bfq_io_cq *bic, * did so, we would nest even more complexity in this * function. */ - bfq_put_stable_ref(bic->stable_merge_bfqq); + bfq_put_stable_ref(bfqq_data->stable_merge_bfqq); =20 - bic->stable_merge_bfqq =3D NULL; + bfqq_data->stable_merge_bfqq =3D NULL; } } =20 @@ -1179,38 +1180,40 @@ static void bfq_bfqq_resume_state(struct bfq_queue *bfqq, struct bfq_data *bfqd, struct bfq_io_cq *bic, bool bfq_already_existing) { + struct bfq_iocq_bfqq_data *bfqq_data =3D &bic->bfqq_data; unsigned int old_wr_coeff =3D 1; bool busy =3D bfq_already_existing && bfq_bfqq_busy(bfqq); =20 - if (bic->saved_has_short_ttime) + if (bfqq_data->saved_has_short_ttime) bfq_mark_bfqq_has_short_ttime(bfqq); else bfq_clear_bfqq_has_short_ttime(bfqq); =20 - if (bic->saved_IO_bound) + if (bfqq_data->saved_IO_bound) bfq_mark_bfqq_IO_bound(bfqq); else bfq_clear_bfqq_IO_bound(bfqq); =20 - bfqq->last_serv_time_ns =3D bic->saved_last_serv_time_ns; - bfqq->inject_limit =3D bic->saved_inject_limit; - bfqq->decrease_time_jif =3D bic->saved_decrease_time_jif; + bfqq->last_serv_time_ns =3D bfqq_data->saved_last_serv_time_ns; + bfqq->inject_limit =3D bfqq_data->saved_inject_limit; + bfqq->decrease_time_jif =3D bfqq_data->saved_decrease_time_jif; =20 - bfqq->entity.new_weight =3D bic->saved_weight; - bfqq->ttime =3D bic->saved_ttime; - bfqq->io_start_time =3D bic->saved_io_start_time; - bfqq->tot_idle_time =3D bic->saved_tot_idle_time; + bfqq->entity.new_weight =3D bfqq_data->saved_weight; + bfqq->ttime =3D bfqq_data->saved_ttime; + bfqq->io_start_time =3D bfqq_data->saved_io_start_time; + bfqq->tot_idle_time =3D bfqq_data->saved_tot_idle_time; /* * Restore weight coefficient only if low_latency is on */ if (bfqd->low_latency) { old_wr_coeff =3D bfqq->wr_coeff; - bfqq->wr_coeff =3D bic->saved_wr_coeff; + bfqq->wr_coeff =3D bfqq_data->saved_wr_coeff; } - bfqq->service_from_wr =3D bic->saved_service_from_wr; - bfqq->wr_start_at_switch_to_srt =3D bic->saved_wr_start_at_switch_to_srt; - bfqq->last_wr_start_finish =3D bic->saved_last_wr_start_finish; - bfqq->wr_cur_max_time =3D bic->saved_wr_cur_max_time; + bfqq->service_from_wr =3D bfqq_data->saved_service_from_wr; + bfqq->wr_start_at_switch_to_srt =3D + bfqq_data->saved_wr_start_at_switch_to_srt; + bfqq->last_wr_start_finish =3D bfqq_data->saved_last_wr_start_finish; + bfqq->wr_cur_max_time =3D bfqq_data->saved_wr_cur_max_time; =20 if (bfqq->wr_coeff > 1 && (bfq_bfqq_in_large_burst(bfqq) || time_is_before_jiffies(bfqq->last_wr_start_finish + @@ -1895,7 +1898,7 @@ static void bfq_bfqq_handle_idle_busy_switch(struct b= fq_data *bfqd, wr_or_deserves_wr =3D bfqd->low_latency && (bfqq->wr_coeff > 1 || (bfq_bfqq_sync(bfqq) && - (bfqq->bic || RQ_BIC(rq)->stably_merged) && + (bfqq->bic || RQ_BIC(rq)->bfqq_data.stably_merged) && (*interactive || soft_rt))); =20 /* @@ -2909,6 +2912,7 @@ bfq_setup_cooperator(struct bfq_data *bfqd, struct bf= q_queue *bfqq, void *io_struct, bool request, struct bfq_io_cq *bic) { struct bfq_queue *in_service_bfqq, *new_bfqq; + struct bfq_iocq_bfqq_data *bfqq_data =3D &bic->bfqq_data; =20 /* if a merge has already been setup, then proceed with that first */ if (bfqq->new_bfqq) @@ -2930,21 +2934,21 @@ bfq_setup_cooperator(struct bfq_data *bfqd, struct = bfq_queue *bfqq, * stable merging) also if bic is associated with a * sync queue, but this bfqq is async */ - if (bfq_bfqq_sync(bfqq) && bic->stable_merge_bfqq && + if (bfq_bfqq_sync(bfqq) && bfqq_data->stable_merge_bfqq && !bfq_bfqq_just_created(bfqq) && time_is_before_jiffies(bfqq->split_time + msecs_to_jiffies(bfq_late_stable_merging)) && time_is_before_jiffies(bfqq->creation_time + msecs_to_jiffies(bfq_late_stable_merging))) { struct bfq_queue *stable_merge_bfqq =3D - bic->stable_merge_bfqq; + bfqq_data->stable_merge_bfqq; int proc_ref =3D min(bfqq_process_refs(bfqq), bfqq_process_refs(stable_merge_bfqq)); =20 /* deschedule stable merge, because done or aborted here */ bfq_put_stable_ref(stable_merge_bfqq); =20 - bic->stable_merge_bfqq =3D NULL; + bfqq_data->stable_merge_bfqq =3D NULL; =20 if (!idling_boosts_thr_without_issues(bfqd, bfqq) && proc_ref > 0) { @@ -2953,10 +2957,10 @@ bfq_setup_cooperator(struct bfq_data *bfqd, struct = bfq_queue *bfqq, bfq_setup_merge(bfqq, stable_merge_bfqq); =20 if (new_bfqq) { - bic->stably_merged =3D true; + bfqq_data->stably_merged =3D true; if (new_bfqq->bic) - new_bfqq->bic->stably_merged =3D - true; + new_bfqq->bic->bfqq_data.stably_merged =3D + true; } return new_bfqq; } else @@ -3055,6 +3059,7 @@ bfq_setup_cooperator(struct bfq_data *bfqd, struct bf= q_queue *bfqq, static void bfq_bfqq_save_state(struct bfq_queue *bfqq) { struct bfq_io_cq *bic =3D bfqq->bic; + struct bfq_iocq_bfqq_data *bfqq_data =3D &bic->bfqq_data; =20 /* * If !bfqq->bic, the queue is already shared or its requests @@ -3064,18 +3069,21 @@ static void bfq_bfqq_save_state(struct bfq_queue *b= fqq) if (!bic) return; =20 - bic->saved_last_serv_time_ns =3D bfqq->last_serv_time_ns; - bic->saved_inject_limit =3D bfqq->inject_limit; - bic->saved_decrease_time_jif =3D bfqq->decrease_time_jif; - - bic->saved_weight =3D bfqq->entity.orig_weight; - bic->saved_ttime =3D bfqq->ttime; - bic->saved_has_short_ttime =3D bfq_bfqq_has_short_ttime(bfqq); - bic->saved_IO_bound =3D bfq_bfqq_IO_bound(bfqq); - bic->saved_io_start_time =3D bfqq->io_start_time; - bic->saved_tot_idle_time =3D bfqq->tot_idle_time; - bic->saved_in_large_burst =3D bfq_bfqq_in_large_burst(bfqq); - bic->was_in_burst_list =3D !hlist_unhashed(&bfqq->burst_list_node); + bfqq_data->saved_last_serv_time_ns =3D bfqq->last_serv_time_ns; + bfqq_data->saved_inject_limit =3D bfqq->inject_limit; + bfqq_data->saved_decrease_time_jif =3D bfqq->decrease_time_jif; + + bfqq_data->saved_weight =3D bfqq->entity.orig_weight; + bfqq_data->saved_ttime =3D bfqq->ttime; + bfqq_data->saved_has_short_ttime =3D + bfq_bfqq_has_short_ttime(bfqq); + bfqq_data->saved_IO_bound =3D bfq_bfqq_IO_bound(bfqq); + bfqq_data->saved_io_start_time =3D bfqq->io_start_time; + bfqq_data->saved_tot_idle_time =3D bfqq->tot_idle_time; + bfqq_data->saved_in_large_burst =3D bfq_bfqq_in_large_burst(bfqq); + bfqq_data->was_in_burst_list =3D + !hlist_unhashed(&bfqq->burst_list_node); + if (unlikely(bfq_bfqq_just_created(bfqq) && !bfq_bfqq_in_large_burst(bfqq) && bfqq->bfqd->low_latency)) { @@ -3088,17 +3096,21 @@ static void bfq_bfqq_save_state(struct bfq_queue *b= fqq) * to bfqq, so that to avoid that bfqq unjustly fails * to enjoy weight raising if split soon. */ - bic->saved_wr_coeff =3D bfqq->bfqd->bfq_wr_coeff; - bic->saved_wr_start_at_switch_to_srt =3D bfq_smallest_from_now(); - bic->saved_wr_cur_max_time =3D bfq_wr_duration(bfqq->bfqd); - bic->saved_last_wr_start_finish =3D jiffies; + bfqq_data->saved_wr_coeff =3D bfqq->bfqd->bfq_wr_coeff; + bfqq_data->saved_wr_start_at_switch_to_srt =3D + bfq_smallest_from_now(); + bfqq_data->saved_wr_cur_max_time =3D + bfq_wr_duration(bfqq->bfqd); + bfqq_data->saved_last_wr_start_finish =3D jiffies; } else { - bic->saved_wr_coeff =3D bfqq->wr_coeff; - bic->saved_wr_start_at_switch_to_srt =3D + bfqq_data->saved_wr_coeff =3D bfqq->wr_coeff; + bfqq_data->saved_wr_start_at_switch_to_srt =3D bfqq->wr_start_at_switch_to_srt; - bic->saved_service_from_wr =3D bfqq->service_from_wr; - bic->saved_last_wr_start_finish =3D bfqq->last_wr_start_finish; - bic->saved_wr_cur_max_time =3D bfqq->wr_cur_max_time; + bfqq_data->saved_service_from_wr =3D + bfqq->service_from_wr; + bfqq_data->saved_last_wr_start_finish =3D + bfqq->last_wr_start_finish; + bfqq_data->saved_wr_cur_max_time =3D bfqq->wr_cur_max_time; } } =20 @@ -5425,6 +5437,7 @@ static void bfq_exit_icq(struct io_cq *icq) * therefore on its unused per-actuator fields being NULL. */ unsigned int num_actuators =3D BFQ_MAX_ACTUATORS; + struct bfq_iocq_bfqq_data *bfqq_data =3D &bic->bfqq_data; =20 /* * bfqd is NULL if scheduler already exited, and in that case @@ -5435,8 +5448,8 @@ static void bfq_exit_icq(struct io_cq *icq) num_actuators =3D bfqd->num_actuators; } =20 - if (bic->stable_merge_bfqq) - bfq_put_stable_ref(bic->stable_merge_bfqq); + if (bfqq_data->stable_merge_bfqq) + bfq_put_stable_ref(bfqq_data->stable_merge_bfqq); =20 for (act_idx =3D 0; act_idx < num_actuators; act_idx++) { bfq_exit_icq_bfqq(bic, true, act_idx); @@ -5627,13 +5640,14 @@ bfq_do_early_stable_merge(struct bfq_data *bfqd, st= ruct bfq_queue *bfqq, { struct bfq_queue *new_bfqq =3D bfq_setup_merge(bfqq, last_bfqq_created); + struct bfq_iocq_bfqq_data *bfqq_data =3D &bic->bfqq_data; =20 if (!new_bfqq) return bfqq; =20 if (new_bfqq->bic) - new_bfqq->bic->stably_merged =3D true; - bic->stably_merged =3D true; + new_bfqq->bic->bfqq_data.stably_merged =3D true; + bfqq_data->stably_merged =3D true; =20 /* * Reusing merge functions. This implies that @@ -5702,6 +5716,7 @@ static struct bfq_queue *bfq_do_or_sched_stable_merge= (struct bfq_data *bfqd, &bfqd->last_bfqq_created; =20 struct bfq_queue *last_bfqq_created =3D *source_bfqq; + struct bfq_iocq_bfqq_data *bfqq_data =3D &bic->bfqq_data; =20 /* * If last_bfqq_created has not been set yet, then init it. If @@ -5763,7 +5778,7 @@ static struct bfq_queue *bfq_do_or_sched_stable_merge= (struct bfq_data *bfqd, /* * Record the bfqq to merge to. */ - bic->stable_merge_bfqq =3D last_bfqq_created; + bfqq_data->stable_merge_bfqq =3D last_bfqq_created; } } =20 @@ -6683,6 +6698,7 @@ static struct bfq_queue *bfq_get_bfqq_handle_split(st= ruct bfq_data *bfqd, { unsigned int act_idx =3D bfq_actuator_index(bfqd, bio); struct bfq_queue *bfqq =3D bic_to_bfqq(bic, is_sync, act_idx); + struct bfq_iocq_bfqq_data *bfqq_data =3D &bic->bfqq_data; =20 if (likely(bfqq && bfqq !=3D &bfqd->oom_bfqq)) return bfqq; @@ -6696,12 +6712,12 @@ static struct bfq_queue *bfq_get_bfqq_handle_split(= struct bfq_data *bfqd, =20 bic_set_bfqq(bic, bfqq, is_sync, act_idx); if (split && is_sync) { - if ((bic->was_in_burst_list && bfqd->large_burst) || - bic->saved_in_large_burst) + if ((bfqq_data->was_in_burst_list && bfqd->large_burst) || + bfqq_data->saved_in_large_burst) bfq_mark_bfqq_in_large_burst(bfqq); else { bfq_clear_bfqq_in_large_burst(bfqq); - if (bic->was_in_burst_list) + if (bfqq_data->was_in_burst_list) /* * If bfqq was in the current * burst list before being @@ -6790,6 +6806,7 @@ static struct bfq_queue *bfq_init_rq(struct request *= rq) struct bfq_queue *bfqq; bool new_queue =3D false; bool bfqq_already_existing =3D false, split =3D false; + struct bfq_iocq_bfqq_data *bfqq_data; =20 if (unlikely(!rq->elv.icq)) return NULL; @@ -6813,15 +6830,17 @@ static struct bfq_queue *bfq_init_rq(struct request= *rq) bfqq =3D bfq_get_bfqq_handle_split(bfqd, bic, bio, false, is_sync, &new_queue); =20 + bfqq_data =3D &bic->bfqq_data; + if (likely(!new_queue)) { /* If the queue was seeky for too long, break it apart. */ if (bfq_bfqq_coop(bfqq) && bfq_bfqq_split_coop(bfqq) && - !bic->stably_merged) { + !bfqq_data->stably_merged) { struct bfq_queue *old_bfqq =3D bfqq; =20 /* Update bic before losing reference to bfqq */ if (bfq_bfqq_in_large_burst(bfqq)) - bic->saved_in_large_burst =3D true; + bfqq_data->saved_in_large_burst =3D true; =20 bfqq =3D bfq_split_bfqq(bic, bfqq); split =3D true; diff --git a/block/bfq-iosched.h b/block/bfq-iosched.h index 2b413ddffbb9..9d77d964620f 100644 --- a/block/bfq-iosched.h +++ b/block/bfq-iosched.h @@ -411,27 +411,9 @@ struct bfq_queue { }; =20 /** - * struct bfq_io_cq - per (request_queue, io_context) structure. - */ -struct bfq_io_cq { - /* associated io_cq structure */ - struct io_cq icq; /* must be the first member */ - /* - * Matrix of associated process queues: first row for async - * queues, second row sync queues. Each row contains one - * column for each actuator. An I/O request generated by the - * process is inserted into the queue pointed by bfqq[i][j] if - * the request is to be served by the j-th actuator of the - * drive, where i=3D=3D0 or i=3D=3D1, depending on whether the request - * is async or sync. So there is a distinct queue for each - * actuator. - */ - struct bfq_queue *bfqq[2][BFQ_MAX_ACTUATORS]; - /* per (request_queue, blkcg) ioprio */ - int ioprio; -#ifdef CONFIG_BFQ_GROUP_IOSCHED - uint64_t blkcg_serial_nr; /* the current blkcg serial */ -#endif +* struct bfq_data - bfqq data unique and persistent for associated bfq_io_= cq +*/ +struct bfq_iocq_bfqq_data { /* * Snapshot of the has_short_time flag before merging; taken * to remember its value while the queue is merged, so as to @@ -486,6 +468,34 @@ struct bfq_io_cq { struct bfq_queue *stable_merge_bfqq; =20 bool stably_merged; /* non splittable if true */ +}; + +/** + * struct bfq_io_cq - per (request_queue, io_context) structure. + */ +struct bfq_io_cq { + /* associated io_cq structure */ + struct io_cq icq; /* must be the first member */ + /* + * Matrix of associated process queues: first row for async + * queues, second row sync queues. Each row contains one + * column for each actuator. An I/O request generated by the + * process is inserted into the queue pointed by bfqq[i][j] if + * the request is to be served by the j-th actuator of the + * drive, where i=3D=3D0 or i=3D=3D1, depending on whether the request + * is async or sync. So there is a distinct queue for each + * actuator. + */ + struct bfq_queue *bfqq[2][BFQ_MAX_ACTUATORS]; + /* per (request_queue, blkcg) ioprio */ + int ioprio; +#ifdef CONFIG_BFQ_GROUP_IOSCHED + uint64_t blkcg_serial_nr; /* the current blkcg serial */ +#endif + + /* persistent data for associated synchronous process queue */ + struct bfq_iocq_bfqq_data bfqq_data; + unsigned int requests; /* Number of requests this process has in flight */ }; =20 --=20 2.20.1 From nobody Thu Sep 18 13:10:46 2025 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 22CF9C352A1 for ; Tue, 6 Dec 2022 08:16:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233281AbiLFIQ0 (ORCPT ); Tue, 6 Dec 2022 03:16:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45658 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232748AbiLFIQG (ORCPT ); Tue, 6 Dec 2022 03:16:06 -0500 Received: from mail-ed1-x533.google.com (mail-ed1-x533.google.com [IPv6:2a00:1450:4864:20::533]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6DF3B178BD for ; Tue, 6 Dec 2022 00:16:03 -0800 (PST) Received: by mail-ed1-x533.google.com with SMTP id a16so19165360edb.9 for ; Tue, 06 Dec 2022 00:16:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=0lmwoZ9DTJZclqZ/y0xi+2WZqtDsTNDmQVME+b1Bh8A=; b=p2Jggh/jWuVOZkJp1p6a/VqrqXfftL4Xu7/D63TTxaxlTVuL6ju21Br1pcyIFHpJ/r IZsozB3II8g508QVXep8Hycn1biFqibKH29qjVT11VMvLwIa8/+kpDVniR8hy6A40upS uAJcp7g+ENGBFbgMtSiL7xFKrtfqyyCKpKFdBst9/EUXYIVu7bV4VZcV8JSwwgWEAVtF tZgL1DrmEdUjo2t4e1iipVspr0NGpcZ7NGg+hBZV6+MJ6s0r2uhLIE9g0dj7Nd4tJqEy 5sJmzVzB2P3tggPNw7Wa7brjQZYsjkh+cjOKOtg8KX+NJ+NqQAaTZF36xeuV5fozE5Zs RFgA== 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=0lmwoZ9DTJZclqZ/y0xi+2WZqtDsTNDmQVME+b1Bh8A=; b=lhLOGPgLJLInQBVXsuY2V9p3b6Pvv22JWs7orFHqraokp6ftUMOWUj97BLjMFLejUo pVkG0FDEgk6ldVHi2feQfnfm9rEIjUWD55XI8B2OdvBNYwUZpVFdlGD6bSqEvlHljY/X k9S3n0qT/FbYmPtk0M2QA8JyqxWzwWQcC8Px8RXKnQDanu76sKmuMN8HU2SU65c6oHRY D4zM8z0TwJ6NXq25K72aY8+y50MBBiTCSg+tJb3GuX93dIKOaGEdte5CLuKmpipjRz5H q4nYYaVlACTqR8vxBgM+v2ek3RBp+iyQWPuV9qfLYBp5R5FNXOKjpqGWQJYn4TMsFQno yD+Q== X-Gm-Message-State: ANoB5pk+DqPXhEWgyV/Un45RbwQf0/BzVWpMAX6MTgM0BU6IZMQ3PFEn IjQzUaqRk47kdk1qaxgpQfbW0A== X-Google-Smtp-Source: AA0mqf5sdMiMxuZozcH/fHXD13wabbWI21xLSB30wyPJ3O7O5Mo+nG4h77HPJdFTsYomfMSNaqqeqQ== X-Received: by 2002:a05:6402:2205:b0:46b:a177:a79d with SMTP id cq5-20020a056402220500b0046ba177a79dmr24071331edb.239.1670314561873; Tue, 06 Dec 2022 00:16:01 -0800 (PST) Received: from MBP-di-Paolo.station (net-2-35-55-161.cust.vodafonedsl.it. [2.35.55.161]) by smtp.gmail.com with ESMTPSA id 24-20020a170906329800b007b29d292852sm7161944ejw.148.2022.12.06.00.16.01 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Dec 2022 00:16:01 -0800 (PST) From: Paolo Valente To: Jens Axboe Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, arie.vanderhoeven@seagate.com, rory.c.chen@seagate.com, glen.valante@linaro.org, Paolo Valente , Gabriele Felici , Gianmarco Lusvardi , Giulio Barabino , Emiliano Maccaferri Subject: [PATCH V7 4/8] block, bfq: turn bfqq_data into an array in bfq_io_cq Date: Tue, 6 Dec 2022 09:15:47 +0100 Message-Id: <20221206081551.28257-5-paolo.valente@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20221206081551.28257-1-paolo.valente@linaro.org> References: <20221206081551.28257-1-paolo.valente@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" When a bfq_queue Q is merged with another queue, several pieces of information are saved about Q. These pieces are stored in the bfqq_data field in the bfq_io_cq data structure of the process associated with Q. Yet, with a multi-actuator drive, a process may get associated with multiple bfq_queues: one queue for each of the N actuators. Each of these queues may undergo a merge. So, the bfq_io_cq data structure must be able to accommodate the above information for N queues. This commit solves this problem by turning the bfqq_data scalar field into an array of N elements (and by changing code so as to handle this array). This solution is written under the assumption that bfq_queues associated with different actuators cannot be cross-merged. This assumption holds naturally with basic queue merging: the latter is triggered by spatial locality, and sectors for different actuators are not close to each other (apart from the corner case of the last sectors served by a given actuator and the first sectors served by the next actuator). As for stable cross-merging, the assumption here is that it is disabled. Signed-off-by: Gabriele Felici Signed-off-by: Gianmarco Lusvardi Signed-off-by: Giulio Barabino Signed-off-by: Emiliano Maccaferri Signed-off-by: Paolo Valente --- block/bfq-iosched.c | 95 +++++++++++++++++++++++++++------------------ block/bfq-iosched.h | 12 ++++-- 2 files changed, 65 insertions(+), 42 deletions(-) diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index a8aeb324c91c..c5caeefba156 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -406,7 +406,7 @@ void bic_set_bfqq(struct bfq_io_cq *bic, * we cancel the stable merge if * bic->stable_merge_bfqq =3D=3D bfqq. */ - struct bfq_iocq_bfqq_data *bfqq_data =3D &bic->bfqq_data; + struct bfq_iocq_bfqq_data *bfqq_data =3D &bic->bfqq_data[actuator_idx]; if (is_sync) bic->bfqq[1][actuator_idx] =3D bfqq; else @@ -1180,9 +1180,10 @@ static void bfq_bfqq_resume_state(struct bfq_queue *bfqq, struct bfq_data *bfqd, struct bfq_io_cq *bic, bool bfq_already_existing) { - struct bfq_iocq_bfqq_data *bfqq_data =3D &bic->bfqq_data; unsigned int old_wr_coeff =3D 1; bool busy =3D bfq_already_existing && bfq_bfqq_busy(bfqq); + unsigned int a_idx =3D bfqq->actuator_idx; + struct bfq_iocq_bfqq_data *bfqq_data =3D &bic->bfqq_data[a_idx]; =20 if (bfqq_data->saved_has_short_ttime) bfq_mark_bfqq_has_short_ttime(bfqq); @@ -1898,7 +1899,9 @@ static void bfq_bfqq_handle_idle_busy_switch(struct b= fq_data *bfqd, wr_or_deserves_wr =3D bfqd->low_latency && (bfqq->wr_coeff > 1 || (bfq_bfqq_sync(bfqq) && - (bfqq->bic || RQ_BIC(rq)->bfqq_data.stably_merged) && + (bfqq->bic || + RQ_BIC(rq)->bfqq_data[bfq_actuator_index(bfqd, rq->bio)] + .stably_merged) && (*interactive || soft_rt))); =20 /* @@ -2887,6 +2890,35 @@ static bool bfq_may_be_close_cooperator(struct bfq_q= ueue *bfqq, static bool idling_boosts_thr_without_issues(struct bfq_data *bfqd, struct bfq_queue *bfqq); =20 +static struct bfq_queue * +bfq_setup_stable_merge(struct bfq_data *bfqd, struct bfq_queue *bfqq, + struct bfq_queue *stable_merge_bfqq, + struct bfq_iocq_bfqq_data *bfqq_data) +{ + int proc_ref =3D min(bfqq_process_refs(bfqq), + bfqq_process_refs(stable_merge_bfqq)); + + if (!idling_boosts_thr_without_issues(bfqd, bfqq) && + proc_ref > 0) { + /* next function will take at least one ref */ + struct bfq_queue *new_bfqq =3D + bfq_setup_merge(bfqq, stable_merge_bfqq); + + if (new_bfqq) { + bfqq_data->stably_merged =3D true; + if (new_bfqq->bic) { + unsigned int new_a_idx =3D new_bfqq->actuator_idx; + struct bfq_iocq_bfqq_data *new_bfqq_data =3D + &new_bfqq->bic->bfqq_data[new_a_idx]; + + new_bfqq_data->stably_merged =3D true; + } + } + return new_bfqq; + } else + return NULL; +} + /* * Attempt to schedule a merge of bfqq with the currently in-service * queue or with a close queue among the scheduled queues. Return @@ -2912,7 +2944,8 @@ bfq_setup_cooperator(struct bfq_data *bfqd, struct bf= q_queue *bfqq, void *io_struct, bool request, struct bfq_io_cq *bic) { struct bfq_queue *in_service_bfqq, *new_bfqq; - struct bfq_iocq_bfqq_data *bfqq_data =3D &bic->bfqq_data; + unsigned int a_idx =3D bfqq->actuator_idx; + struct bfq_iocq_bfqq_data *bfqq_data =3D &bic->bfqq_data[a_idx]; =20 /* if a merge has already been setup, then proceed with that first */ if (bfqq->new_bfqq) @@ -2942,29 +2975,15 @@ bfq_setup_cooperator(struct bfq_data *bfqd, struct = bfq_queue *bfqq, msecs_to_jiffies(bfq_late_stable_merging))) { struct bfq_queue *stable_merge_bfqq =3D bfqq_data->stable_merge_bfqq; - int proc_ref =3D min(bfqq_process_refs(bfqq), - bfqq_process_refs(stable_merge_bfqq)); =20 /* deschedule stable merge, because done or aborted here */ bfq_put_stable_ref(stable_merge_bfqq); =20 bfqq_data->stable_merge_bfqq =3D NULL; =20 - if (!idling_boosts_thr_without_issues(bfqd, bfqq) && - proc_ref > 0) { - /* next function will take at least one ref */ - struct bfq_queue *new_bfqq =3D - bfq_setup_merge(bfqq, stable_merge_bfqq); - - if (new_bfqq) { - bfqq_data->stably_merged =3D true; - if (new_bfqq->bic) - new_bfqq->bic->bfqq_data.stably_merged =3D - true; - } - return new_bfqq; - } else - return NULL; + return bfq_setup_stable_merge(bfqd, bfqq, + stable_merge_bfqq, + bfqq_data); } } =20 @@ -3059,7 +3078,8 @@ bfq_setup_cooperator(struct bfq_data *bfqd, struct bf= q_queue *bfqq, static void bfq_bfqq_save_state(struct bfq_queue *bfqq) { struct bfq_io_cq *bic =3D bfqq->bic; - struct bfq_iocq_bfqq_data *bfqq_data =3D &bic->bfqq_data; + unsigned int a_idx =3D bfqq->actuator_idx; + struct bfq_iocq_bfqq_data *bfqq_data =3D &bic->bfqq_data[a_idx]; =20 /* * If !bfqq->bic, the queue is already shared or its requests @@ -3070,7 +3090,7 @@ static void bfq_bfqq_save_state(struct bfq_queue *bfq= q) return; =20 bfqq_data->saved_last_serv_time_ns =3D bfqq->last_serv_time_ns; - bfqq_data->saved_inject_limit =3D bfqq->inject_limit; + bfqq_data->saved_inject_limit =3D bfqq->inject_limit; bfqq_data->saved_decrease_time_jif =3D bfqq->decrease_time_jif; =20 bfqq_data->saved_weight =3D bfqq->entity.orig_weight; @@ -5437,7 +5457,7 @@ static void bfq_exit_icq(struct io_cq *icq) * therefore on its unused per-actuator fields being NULL. */ unsigned int num_actuators =3D BFQ_MAX_ACTUATORS; - struct bfq_iocq_bfqq_data *bfqq_data =3D &bic->bfqq_data; + struct bfq_iocq_bfqq_data *bfqq_data =3D bic->bfqq_data; =20 /* * bfqd is NULL if scheduler already exited, and in that case @@ -5448,10 +5468,10 @@ static void bfq_exit_icq(struct io_cq *icq) num_actuators =3D bfqd->num_actuators; } =20 - if (bfqq_data->stable_merge_bfqq) - bfq_put_stable_ref(bfqq_data->stable_merge_bfqq); - for (act_idx =3D 0; act_idx < num_actuators; act_idx++) { + if (bfqq_data[act_idx].stable_merge_bfqq) + bfq_put_stable_ref(bfqq_data[act_idx].stable_merge_bfqq); + bfq_exit_icq_bfqq(bic, true, act_idx); bfq_exit_icq_bfqq(bic, false, act_idx); } @@ -5638,16 +5658,16 @@ bfq_do_early_stable_merge(struct bfq_data *bfqd, st= ruct bfq_queue *bfqq, struct bfq_io_cq *bic, struct bfq_queue *last_bfqq_created) { + unsigned int a_idx =3D last_bfqq_created->actuator_idx; struct bfq_queue *new_bfqq =3D bfq_setup_merge(bfqq, last_bfqq_created); - struct bfq_iocq_bfqq_data *bfqq_data =3D &bic->bfqq_data; =20 if (!new_bfqq) return bfqq; =20 if (new_bfqq->bic) - new_bfqq->bic->bfqq_data.stably_merged =3D true; - bfqq_data->stably_merged =3D true; + new_bfqq->bic->bfqq_data[a_idx].stably_merged =3D true; + bic->bfqq_data[a_idx].stably_merged =3D true; =20 /* * Reusing merge functions. This implies that @@ -5716,7 +5736,6 @@ static struct bfq_queue *bfq_do_or_sched_stable_merge= (struct bfq_data *bfqd, &bfqd->last_bfqq_created; =20 struct bfq_queue *last_bfqq_created =3D *source_bfqq; - struct bfq_iocq_bfqq_data *bfqq_data =3D &bic->bfqq_data; =20 /* * If last_bfqq_created has not been set yet, then init it. If @@ -5778,7 +5797,8 @@ static struct bfq_queue *bfq_do_or_sched_stable_merge= (struct bfq_data *bfqd, /* * Record the bfqq to merge to. */ - bfqq_data->stable_merge_bfqq =3D last_bfqq_created; + bic->bfqq_data[last_bfqq_created->actuator_idx].stable_merge_bfqq =3D + last_bfqq_created; } } =20 @@ -6698,7 +6718,7 @@ static struct bfq_queue *bfq_get_bfqq_handle_split(st= ruct bfq_data *bfqd, { unsigned int act_idx =3D bfq_actuator_index(bfqd, bio); struct bfq_queue *bfqq =3D bic_to_bfqq(bic, is_sync, act_idx); - struct bfq_iocq_bfqq_data *bfqq_data =3D &bic->bfqq_data; + struct bfq_iocq_bfqq_data *bfqq_data =3D &bic->bfqq_data[act_idx]; =20 if (likely(bfqq && bfqq !=3D &bfqd->oom_bfqq)) return bfqq; @@ -6806,7 +6826,7 @@ static struct bfq_queue *bfq_init_rq(struct request *= rq) struct bfq_queue *bfqq; bool new_queue =3D false; bool bfqq_already_existing =3D false, split =3D false; - struct bfq_iocq_bfqq_data *bfqq_data; + unsigned int a_idx =3D bfq_actuator_index(bfqd, bio); =20 if (unlikely(!rq->elv.icq)) return NULL; @@ -6830,17 +6850,16 @@ static struct bfq_queue *bfq_init_rq(struct request= *rq) bfqq =3D bfq_get_bfqq_handle_split(bfqd, bic, bio, false, is_sync, &new_queue); =20 - bfqq_data =3D &bic->bfqq_data; - if (likely(!new_queue)) { /* If the queue was seeky for too long, break it apart. */ if (bfq_bfqq_coop(bfqq) && bfq_bfqq_split_coop(bfqq) && - !bfqq_data->stably_merged) { + !bic->bfqq_data[a_idx].stably_merged) { struct bfq_queue *old_bfqq =3D bfqq; =20 /* Update bic before losing reference to bfqq */ if (bfq_bfqq_in_large_burst(bfqq)) - bfqq_data->saved_in_large_burst =3D true; + bic->bfqq_data[a_idx].saved_in_large_burst =3D + true; =20 bfqq =3D bfq_split_bfqq(bic, bfqq); split =3D true; diff --git a/block/bfq-iosched.h b/block/bfq-iosched.h index 9d77d964620f..a685aa32b037 100644 --- a/block/bfq-iosched.h +++ b/block/bfq-iosched.h @@ -416,7 +416,7 @@ struct bfq_queue { struct bfq_iocq_bfqq_data { /* * Snapshot of the has_short_time flag before merging; taken - * to remember its value while the queue is merged, so as to + * to remember its values while the queue is merged, so as to * be able to restore it in case of split. */ bool saved_has_short_ttime; @@ -430,7 +430,7 @@ struct bfq_iocq_bfqq_data { u64 saved_tot_idle_time; =20 /* - * Same purpose as the previous fields for the value of the + * Same purpose as the previous fields for the values of the * field keeping the queue's belonging to a large burst */ bool saved_in_large_burst; @@ -493,8 +493,12 @@ struct bfq_io_cq { uint64_t blkcg_serial_nr; /* the current blkcg serial */ #endif =20 - /* persistent data for associated synchronous process queue */ - struct bfq_iocq_bfqq_data bfqq_data; + /* + * Persistent data for associated synchronous process queues + * (one queue per actuator, see field bfqq above). In + * particular, each of these queues may undergo a merge. + */ + struct bfq_iocq_bfqq_data bfqq_data[BFQ_MAX_ACTUATORS]; =20 unsigned int requests; /* Number of requests this process has in flight */ }; --=20 2.20.1 From nobody Thu Sep 18 13:10:46 2025 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 9065DC352A1 for ; Tue, 6 Dec 2022 08:16:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233084AbiLFIQb (ORCPT ); Tue, 6 Dec 2022 03:16:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45634 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232778AbiLFIQG (ORCPT ); Tue, 6 Dec 2022 03:16:06 -0500 Received: from mail-ed1-x52f.google.com (mail-ed1-x52f.google.com [IPv6:2a00:1450:4864:20::52f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3B2CC18B3F for ; Tue, 6 Dec 2022 00:16:04 -0800 (PST) Received: by mail-ed1-x52f.google.com with SMTP id s5so19131965edc.12 for ; Tue, 06 Dec 2022 00:16:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=EvbZSEnSEzLdu7kZISISG4TIgUpixjenItLENz+8BsE=; b=PVgbkqownST6/r10EIuSEAdT/wjZjhnykquUPS+xrzqoZRgWOZJ/b2so/ZeGldvSJP 8nAzoAPeh1J7+B8x83x2f31CJv8D3xqJrucZGstQLbAMCoC/9a3NX98k5taIKZfYcbMj xKxzpoNQ0O6txtlxmWTiwdJ0WqJEP81bWAlcfRhOkOZL3/VJ/Pj4wS/oryBKFgoBZjBU R97dmBWH4oSnqeBB1+EO5DQ0BsRjrVtTTsTZRQv7DZ8nGlArlrkfFVRG5dCrmSM5x9Q0 1A01MJsO9DDUBpfmLHixM9vLTJRbtFiDbayxLZ72Q0CW59VPbdjdqP9cJdYA1zKtn5G3 9dKA== 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=EvbZSEnSEzLdu7kZISISG4TIgUpixjenItLENz+8BsE=; b=zBafkE1M7T7/+hg3fdAo/CBxEFEod1/fhZRhkXs6ZNyEyLgxBXzWZWpe/pbXmg8t7z huQid1ek5PYufWdbBWYcq7SS9WLIxR1LqSKy81c91WueZNbIaqgdsH4bXGS0+6Rq1DPb yAH+HSM6ShhqAPIkcxO11YtDw/7eb9Mtc9kB50R68JMjGU4tFMakM2oq1CpFi1dSyBln hlKg2Qo3ludwNe4KUr6+dAnt6b2EbuVxhtXhB2KfPLExS8GAradselGqcNYK0KovLFME OuJiHTURknoJXORtkuNDO/H2aMTH23Sdow6DA0502jlP3v9Dtct3f2F3J5fjwFgDkYbt W9Dg== X-Gm-Message-State: ANoB5pmGYyp51Q/JKMsL66KA1PSr5cfGDZPVV7Mj1Es21wcUw63N3W+L a602TY+h8V+GX8hSPl4M9LiVSw== X-Google-Smtp-Source: AA0mqf4Db5CvDp4j0j9msdYeia7RPZtmZzMbZ2z9Q0F9T8+Synjl4lsttVryR1nBG3A5A09qHfvA5Q== X-Received: by 2002:a05:6402:5003:b0:462:a25f:f0f2 with SMTP id p3-20020a056402500300b00462a25ff0f2mr24239475eda.156.1670314562684; Tue, 06 Dec 2022 00:16:02 -0800 (PST) Received: from MBP-di-Paolo.station (net-2-35-55-161.cust.vodafonedsl.it. [2.35.55.161]) by smtp.gmail.com with ESMTPSA id 24-20020a170906329800b007b29d292852sm7161944ejw.148.2022.12.06.00.16.01 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Dec 2022 00:16:02 -0800 (PST) From: Paolo Valente To: Jens Axboe Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, arie.vanderhoeven@seagate.com, rory.c.chen@seagate.com, glen.valante@linaro.org, Davide Zini , Paolo Valente Subject: [PATCH V7 5/8] block, bfq: split also async bfq_queues on a per-actuator basis Date: Tue, 6 Dec 2022 09:15:48 +0100 Message-Id: <20221206081551.28257-6-paolo.valente@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20221206081551.28257-1-paolo.valente@linaro.org> References: <20221206081551.28257-1-paolo.valente@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Davide Zini Similarly to sync bfq_queues, also async bfq_queues need to be split on a per-actuator basis. Signed-off-by: Paolo Valente Signed-off-by: Davide Zini --- block/bfq-iosched.c | 41 +++++++++++++++++++++++------------------ block/bfq-iosched.h | 8 ++++---- 2 files changed, 27 insertions(+), 22 deletions(-) diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index c5caeefba156..6b1376ab8980 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -2680,14 +2680,16 @@ static void bfq_bfqq_end_wr(struct bfq_queue *bfqq) void bfq_end_wr_async_queues(struct bfq_data *bfqd, struct bfq_group *bfqg) { - int i, j; - - for (i =3D 0; i < 2; i++) - for (j =3D 0; j < IOPRIO_NR_LEVELS; j++) - if (bfqg->async_bfqq[i][j]) - bfq_bfqq_end_wr(bfqg->async_bfqq[i][j]); - if (bfqg->async_idle_bfqq) - bfq_bfqq_end_wr(bfqg->async_idle_bfqq); + int i, j, k; + + for (k =3D 0; k < bfqd->num_actuators; k++) { + for (i =3D 0; i < 2; i++) + for (j =3D 0; j < IOPRIO_NR_LEVELS; j++) + if (bfqg->async_bfqq[i][j][k]) + bfq_bfqq_end_wr(bfqg->async_bfqq[i][j][k]); + if (bfqg->async_idle_bfqq[k]) + bfq_bfqq_end_wr(bfqg->async_idle_bfqq[k]); + } } =20 static void bfq_end_wr(struct bfq_data *bfqd) @@ -5636,18 +5638,18 @@ static void bfq_init_bfqq(struct bfq_data *bfqd, st= ruct bfq_queue *bfqq, =20 static struct bfq_queue **bfq_async_queue_prio(struct bfq_data *bfqd, struct bfq_group *bfqg, - int ioprio_class, int ioprio) + int ioprio_class, int ioprio, int act_idx) { switch (ioprio_class) { case IOPRIO_CLASS_RT: - return &bfqg->async_bfqq[0][ioprio]; + return &bfqg->async_bfqq[0][ioprio][act_idx]; case IOPRIO_CLASS_NONE: ioprio =3D IOPRIO_BE_NORM; fallthrough; case IOPRIO_CLASS_BE: - return &bfqg->async_bfqq[1][ioprio]; + return &bfqg->async_bfqq[1][ioprio][act_idx]; case IOPRIO_CLASS_IDLE: - return &bfqg->async_idle_bfqq; + return &bfqg->async_idle_bfqq[act_idx]; default: return NULL; } @@ -5820,7 +5822,8 @@ static struct bfq_queue *bfq_get_queue(struct bfq_dat= a *bfqd, bfqg =3D bfq_bio_bfqg(bfqd, bio); if (!is_sync) { async_bfqq =3D bfq_async_queue_prio(bfqd, bfqg, ioprio_class, - ioprio); + ioprio, + bfq_actuator_index(bfqd, bio)); bfqq =3D *async_bfqq; if (bfqq) goto out; @@ -7037,13 +7040,15 @@ static void __bfq_put_async_bfqq(struct bfq_data *b= fqd, */ void bfq_put_async_queues(struct bfq_data *bfqd, struct bfq_group *bfqg) { - int i, j; + int i, j, k; =20 - for (i =3D 0; i < 2; i++) - for (j =3D 0; j < IOPRIO_NR_LEVELS; j++) - __bfq_put_async_bfqq(bfqd, &bfqg->async_bfqq[i][j]); + for (k =3D 0; k < bfqd->num_actuators; k++) { + for (i =3D 0; i < 2; i++) + for (j =3D 0; j < IOPRIO_NR_LEVELS; j++) + __bfq_put_async_bfqq(bfqd, &bfqg->async_bfqq[i][j][k]); =20 - __bfq_put_async_bfqq(bfqd, &bfqg->async_idle_bfqq); + __bfq_put_async_bfqq(bfqd, &bfqg->async_idle_bfqq[k]); + } } =20 /* diff --git a/block/bfq-iosched.h b/block/bfq-iosched.h index a685aa32b037..1450990dba32 100644 --- a/block/bfq-iosched.h +++ b/block/bfq-iosched.h @@ -976,8 +976,8 @@ struct bfq_group { =20 void *bfqd; =20 - struct bfq_queue *async_bfqq[2][IOPRIO_NR_LEVELS]; - struct bfq_queue *async_idle_bfqq; + struct bfq_queue *async_bfqq[2][IOPRIO_NR_LEVELS][BFQ_MAX_ACTUATORS]; + struct bfq_queue *async_idle_bfqq[BFQ_MAX_ACTUATORS]; =20 struct bfq_entity *my_entity; =20 @@ -993,8 +993,8 @@ struct bfq_group { struct bfq_entity entity; struct bfq_sched_data sched_data; =20 - struct bfq_queue *async_bfqq[2][IOPRIO_NR_LEVELS]; - struct bfq_queue *async_idle_bfqq; + struct bfq_queue *async_bfqq[2][IOPRIO_NR_LEVELS][BFQ_MAX_ACTUATORS]; + struct bfq_queue *async_idle_bfqq[BFQ_MAX_ACTUATORS]; =20 struct rb_root rq_pos_tree; }; --=20 2.20.1 From nobody Thu Sep 18 13:10:46 2025 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 BC21DC352A1 for ; Tue, 6 Dec 2022 08:16:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233453AbiLFIQj (ORCPT ); Tue, 6 Dec 2022 03:16:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45708 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232825AbiLFIQH (ORCPT ); Tue, 6 Dec 2022 03:16:07 -0500 Received: from mail-ed1-x52e.google.com (mail-ed1-x52e.google.com [IPv6:2a00:1450:4864:20::52e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 51D8118E0D for ; Tue, 6 Dec 2022 00:16:05 -0800 (PST) Received: by mail-ed1-x52e.google.com with SMTP id m19so19161528edj.8 for ; Tue, 06 Dec 2022 00:16:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=7BpKU2NYbTziJwWq6AjACejxgrhoAentIWtSJgkaJ4g=; b=yK7/MZoaRbZtgYXmF3MAZ+t8TxI0i+WFdOdvu8VLqq45rSubMmRh9JnjbAipy5b1mK xr8U8y7xEn7TiOv61nOBWtXAzfUFjRVwKSyjeiMbpUj5MwCtz4IsQLgU1uxiNCY4i5PT us6imHP7UkljpG4V5X5WVm+2bN9NyqTgcGI4GfhOjeND6DS9Vz13OUw5glG46yAhlaPt QaSY2Nazv0K1rJj2UOc0GkA7wUV7aDrfJYmxUENzZBB2keFOu150JGZLIBzu15DCwacS ETe1JiNKHvmacxeHj2brWDIms2hk/NprMtNKMPxcP4om2RNWOl7w42SuPZ6x06Cammjh DB0w== 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=7BpKU2NYbTziJwWq6AjACejxgrhoAentIWtSJgkaJ4g=; b=iLPKNqRnwL515HpZyzfrv6Z7GM9LY1DOwQ79YgjO5FwWYtQu85avWZZpwc8nAkfBdM aSIwr4O8vi5OQogHvTfCmgK5zyV5uZdBntzTMqU41PhIgbgVS0W15DpNtxDq9NF7LFMR ONcPbEt9NOK3QG6Ix7mhyzPrpfw9629g0u+QuuLqp7mE1WsUBiawHZ43Szq6NVEJl8yQ paRMQrWHMNIdz8MyK2D81gB9fuNV2sWM9k/NRqlo7/cn9/OtfN9We16b6Fu7O7zxjeWe VU8oU9l6VM1jp9hObvD1bKI8x0T+I2FL7VqGOtWLskR045soxFvZSkFMnm7ISOzNendM kbog== X-Gm-Message-State: ANoB5pke812cN0bwK+E1r6HDmEvIhY51bDNMEAxL6nfLRuHiQMAqg7W/ B/xrZ2j8lDFdXY3mxk+uMh0kfA== X-Google-Smtp-Source: AA0mqf59IAODO9bKfkWzNiG9vFLbwCbvCtC8LtCopTIlBYCJaSxGXXQvl1TPULIVhdf/IwlQl3OASA== X-Received: by 2002:aa7:d1c3:0:b0:46c:edb5:afea with SMTP id g3-20020aa7d1c3000000b0046cedb5afeamr4095540edp.315.1670314563597; Tue, 06 Dec 2022 00:16:03 -0800 (PST) Received: from MBP-di-Paolo.station (net-2-35-55-161.cust.vodafonedsl.it. [2.35.55.161]) by smtp.gmail.com with ESMTPSA id 24-20020a170906329800b007b29d292852sm7161944ejw.148.2022.12.06.00.16.02 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Dec 2022 00:16:03 -0800 (PST) From: Paolo Valente To: Jens Axboe Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, arie.vanderhoeven@seagate.com, rory.c.chen@seagate.com, glen.valante@linaro.org, Federico Gavioli , Paolo Valente Subject: [PATCH V7 6/8] block, bfq: retrieve independent access ranges from request queue Date: Tue, 6 Dec 2022 09:15:49 +0100 Message-Id: <20221206081551.28257-7-paolo.valente@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20221206081551.28257-1-paolo.valente@linaro.org> References: <20221206081551.28257-1-paolo.valente@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Federico Gavioli This patch implements the code to gather the content of the independent_access_ranges structure from the request_queue and copy it into the queue's bfq_data. This copy is done at queue initialization. We copy the access ranges into the bfq_data to avoid taking the queue lock each time we access the ranges. This implementation, however, puts a limit to the maximum independent ranges supported by the scheduler. Such a limit is equal to the constant BFQ_MAX_ACTUATORS. This limit was placed to avoid the allocation of dynamic memory. Co-developed-by: Rory Chen Signed-off-by: Rory Chen Signed-off-by: Federico Gavioli Signed-off-by: Paolo Valente --- block/bfq-iosched.c | 56 ++++++++++++++++++++++++++++++++++++++------- block/bfq-iosched.h | 8 ++++++- 2 files changed, 55 insertions(+), 9 deletions(-) diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index 6b1376ab8980..665e78035666 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -1838,10 +1838,25 @@ static bool bfq_bfqq_higher_class_or_weight(struct = bfq_queue *bfqq, */ static unsigned int bfq_actuator_index(struct bfq_data *bfqd, struct bio *= bio) { - /* - * Multi-actuator support not complete yet, so always return 0 - * for the moment (to keep incomplete mechanisms off). - */ + unsigned int i; + sector_t end; + + /* no search needed if one or zero ranges present */ + if (bfqd->num_actuators < 2) + return 0; + + /* bio_end_sector(bio) gives the sector after the last one */ + end =3D bio_end_sector(bio) - 1; + + for (i =3D 0; i < bfqd->num_actuators; i++) { + if (end >=3D bfqd->sector[i] && + end < bfqd->sector[i] + bfqd->nr_sectors[i]) + return i; + } + + WARN_ONCE(true, + "bfq_actuator_index: bio sector out of ranges: end=3D%llu\n", + end); return 0; } =20 @@ -7159,6 +7174,8 @@ static int bfq_init_queue(struct request_queue *q, st= ruct elevator_type *e) { struct bfq_data *bfqd; struct elevator_queue *eq; + unsigned int i; + struct blk_independent_access_ranges *ia_ranges =3D q->disk->ia_ranges; =20 eq =3D elevator_alloc(q, e); if (!eq) @@ -7202,11 +7219,34 @@ static int bfq_init_queue(struct request_queue *q, = struct elevator_type *e) bfqd->queue =3D q; =20 /* - * Multi-actuator support not complete yet, unconditionally - * set to only one actuator for the moment (to keep incomplete - * mechanisms off). + * If the disk supports multiple actuators, copy independent + * access ranges from the request queue structure. */ - bfqd->num_actuators =3D 1; + spin_lock_irq(&q->queue_lock); + if (ia_ranges) { + /* + * Check if the disk ia_ranges size exceeds the current bfq + * actuator limit. + */ + if (ia_ranges->nr_ia_ranges > BFQ_MAX_ACTUATORS) { + pr_crit("nr_ia_ranges higher than act limit: iars=3D%d, max=3D%d.\n", + ia_ranges->nr_ia_ranges, BFQ_MAX_ACTUATORS); + pr_crit("Falling back to single actuator mode.\n"); + bfqd->num_actuators =3D 0; + } else { + bfqd->num_actuators =3D ia_ranges->nr_ia_ranges; + + for (i =3D 0; i < bfqd->num_actuators; i++) { + bfqd->sector[i] =3D ia_ranges->ia_range[i].sector; + bfqd->nr_sectors[i] =3D + ia_ranges->ia_range[i].nr_sectors; + } + } + } else { + bfqd->num_actuators =3D 0; + } + + spin_unlock_irq(&q->queue_lock); =20 INIT_LIST_HEAD(&bfqd->dispatch); =20 diff --git a/block/bfq-iosched.h b/block/bfq-iosched.h index 1450990dba32..953980de6b4b 100644 --- a/block/bfq-iosched.h +++ b/block/bfq-iosched.h @@ -810,7 +810,13 @@ struct bfq_data { * case of single-actuator drives. */ unsigned int num_actuators; - + /* + * Disk independent access ranges for each actuator + * in this device. + */ + sector_t sector[BFQ_MAX_ACTUATORS]; + sector_t nr_sectors[BFQ_MAX_ACTUATORS]; + struct blk_independent_access_range ia_ranges[BFQ_MAX_ACTUATORS]; }; =20 enum bfqq_state_flags { --=20 2.20.1 From nobody Thu Sep 18 13:10:46 2025 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 749C1C636F9 for ; Tue, 6 Dec 2022 08:16:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233037AbiLFIQq (ORCPT ); Tue, 6 Dec 2022 03:16:46 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46078 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233119AbiLFIQW (ORCPT ); Tue, 6 Dec 2022 03:16:22 -0500 Received: from mail-ed1-x52c.google.com (mail-ed1-x52c.google.com [IPv6:2a00:1450:4864:20::52c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 554F21A207 for ; Tue, 6 Dec 2022 00:16:06 -0800 (PST) Received: by mail-ed1-x52c.google.com with SMTP id r26so19150545edc.10 for ; Tue, 06 Dec 2022 00:16:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=y4Nf49ADSGLlGyjDOUT9QXEULpQkeBaIMdSYlxuRDIA=; b=XE8BHkKOI5xakejcRiy6og75hE83Uq5ULuQylOdGu1eRFcfkIxzgo3Q4DR0PVpZR+w yLCRsfV9QxJV1KF97eQv5duqKb4CcDFIWL7qO/GM+OGzuRWDnod89GDZEjKkqadA6iZq TuDCW1G+EuxjL265DgfB5R/LRJepUgHMn9RhsrTfO3Bwj0oK7O01aC4+SYBAn6HfJfpN AKqcZBOm2qVh3qDDYURg1mRUwovXV3V/LV9cztZKt9pR0LllqVzs2LtS2rHI9WzZCfY8 kSCRQROv6cIeywYl11wpIzr2f2r/UXxufVEJEXLMnjQkt6snMpaQIvreUiJMwEKQFUw/ Q6+w== 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=y4Nf49ADSGLlGyjDOUT9QXEULpQkeBaIMdSYlxuRDIA=; b=6RHIcK+zRD9SGpGJ/y6dfi5kIQMmg31toiGy9s67zCBTDjkihyPrhDBTIaDZa4RCc6 /vasIHt9e35d0YZlkHae0+vGmHyDEhMXLYYVdNTQEM8BMTAKdR/UfzYyCfniSKbz41wi cxTsnA7fLGSc2xTND17lEtKOkA0C53NsJ2NRvmdJjVsflA4tkys34fPjJgvrp/ab2FI4 mrvtLTuApIGLtvb1PcRugxPTGgFRF2+9ezztrCKzDSSg9S9PxZdBn6p0buS0Du504TtI x3VwvJwGPEAUYMkGb/LoysK1hrAB6l5pF3hd8ksHfRehEO0wEF0CYsqPPFqs9RzvC0gb hR1Q== X-Gm-Message-State: ANoB5plkQt4UnJ/StyrywgGVT44g9a6aB+M34d/gf7W3HcLTocpU9Oz8 0BlfW0kpVAiJVoJjzssHNK73wA== X-Google-Smtp-Source: AA0mqf7UHfb34xYThc2L4bS4qLhq3dvY8mJidl8oXmyx9U1SdboFxTqwtb8DjeipZxIcFQjwG5RbFg== X-Received: by 2002:a05:6402:538e:b0:468:ea55:ab40 with SMTP id ew14-20020a056402538e00b00468ea55ab40mr66718edb.323.1670314564631; Tue, 06 Dec 2022 00:16:04 -0800 (PST) Received: from MBP-di-Paolo.station (net-2-35-55-161.cust.vodafonedsl.it. [2.35.55.161]) by smtp.gmail.com with ESMTPSA id 24-20020a170906329800b007b29d292852sm7161944ejw.148.2022.12.06.00.16.03 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Dec 2022 00:16:04 -0800 (PST) From: Paolo Valente To: Jens Axboe Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, arie.vanderhoeven@seagate.com, rory.c.chen@seagate.com, glen.valante@linaro.org, Davide Zini , Paolo Valente Subject: [PATCH V7 7/8] block, bfq: inject I/O to underutilized actuators Date: Tue, 6 Dec 2022 09:15:50 +0100 Message-Id: <20221206081551.28257-8-paolo.valente@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20221206081551.28257-1-paolo.valente@linaro.org> References: <20221206081551.28257-1-paolo.valente@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Davide Zini The main service scheme of BFQ for sync I/O is serving one sync bfq_queue at a time, for a while. In particular, BFQ enforces this scheme when it deems the latter necessary to boost throughput or to preserve service guarantees. Unfortunately, when BFQ enforces this policy, only one actuator at a time gets served for a while, because each bfq_queue contains I/O only for one actuator. The other actuators may remain underutilized. Actually, BFQ may serve (inject) extra I/O, taken from other bfq_queues, in parallel with that of the in-service queue. This injection mechanism may provide the ground for dealing also with the above actuator-underutilization problem. Yet BFQ does not take the actuator load into account when choosing which queue to pick extra I/O from. In addition, BFQ may happen to inject extra I/O only when the in-service queue is temporarily empty. In view of these facts, this commit extends the injection mechanism in such a way that the latter: (1) takes into account also the actuator load; (2) checks such a load on each dispatch, and injects I/O for an underutilized actuator, if there is one and there is I/O for it. To perform the check in (2), this commit introduces a load threshold, currently set to 4. A linear scan of each actuator is performed, until an actuator is found for which the following two conditions hold: the load of the actuator is below the threshold, and there is at least one non-in-service queue that contains I/O for that actuator. If such a pair (actuator, queue) is found, then the head request of that queue is returned for dispatch, instead of the head request of the in-service queue. We have set the threshold, empirically, to the minimum possible value for which an actuator is fully utilized, or close to be fully utilized. By doing so, injected I/O 'steals' as few drive-queue slots as possibile to the in-service queue. This reduces as much as possible the probability that the service of I/O from the in-service bfq_queue gets delayed because of slot exhaustion, i.e., because all the slots of the drive queue are filled with I/O injected from other queues (NCQ provides for 32 slots). This new mechanism also counters actuator underutilization in the case of asymmetric configurations of bfq_queues. Namely if there are few bfq_queues containing I/O for some actuators and many bfq_queues containing I/O for other actuators. Or if the bfq_queues containing I/O for some actuators have lower weights than the other bfq_queues. Signed-off-by: Paolo Valente Signed-off-by: Davide Zini --- block/bfq-cgroup.c | 2 +- block/bfq-iosched.c | 143 ++++++++++++++++++++++++++++++++------------ block/bfq-iosched.h | 39 +++++++++++- block/bfq-wf2q.c | 2 +- 4 files changed, 144 insertions(+), 42 deletions(-) diff --git a/block/bfq-cgroup.c b/block/bfq-cgroup.c index 8275cdd4573f..3de4884f728d 100644 --- a/block/bfq-cgroup.c +++ b/block/bfq-cgroup.c @@ -698,7 +698,7 @@ void bfq_bfqq_move(struct bfq_data *bfqd, struct bfq_qu= eue *bfqq, bfq_activate_bfqq(bfqd, bfqq); } =20 - if (!bfqd->in_service_queue && !bfqd->rq_in_driver) + if (!bfqd->in_service_queue && !bfqd->tot_rq_in_driver) bfq_schedule_dispatch(bfqd); /* release extra ref taken above, bfqq may happen to be freed now */ bfq_put_queue(bfqq); diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index 665e78035666..f4df5710b648 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -2303,9 +2303,9 @@ static void bfq_add_request(struct request *rq) * elapsed. */ if (bfqq =3D=3D bfqd->in_service_queue && - (bfqd->rq_in_driver =3D=3D 0 || + (bfqd->tot_rq_in_driver =3D=3D 0 || (bfqq->last_serv_time_ns > 0 && - bfqd->rqs_injected && bfqd->rq_in_driver > 0)) && + bfqd->rqs_injected && bfqd->tot_rq_in_driver > 0)) && time_is_before_eq_jiffies(bfqq->decrease_time_jif + msecs_to_jiffies(10))) { bfqd->last_empty_occupied_ns =3D ktime_get_ns(); @@ -2329,7 +2329,7 @@ static void bfq_add_request(struct request *rq) * will be set in case injection is performed * on bfqq before rq is completed). */ - if (bfqd->rq_in_driver =3D=3D 0) + if (bfqd->tot_rq_in_driver =3D=3D 0) bfqd->rqs_injected =3D false; } } @@ -2427,15 +2427,18 @@ static sector_t get_sdist(sector_t last_pos, struct= request *rq) static void bfq_activate_request(struct request_queue *q, struct request *= rq) { struct bfq_data *bfqd =3D q->elevator->elevator_data; + unsigned int act_idx =3D bfq_actuator_index(bfqd, rq->bio); =20 - bfqd->rq_in_driver++; + bfqd->tot_rq_in_driver++; + bfqd->rq_in_driver[act_idx]++; } =20 static void bfq_deactivate_request(struct request_queue *q, struct request= *rq) { struct bfq_data *bfqd =3D q->elevator->elevator_data; =20 - bfqd->rq_in_driver--; + bfqd->tot_rq_in_driver--; + bfqd->rq_in_driver[bfq_actuator_index(bfqd, rq->bio)]--; } #endif =20 @@ -2710,11 +2713,14 @@ void bfq_end_wr_async_queues(struct bfq_data *bfqd, static void bfq_end_wr(struct bfq_data *bfqd) { struct bfq_queue *bfqq; + int i; =20 spin_lock_irq(&bfqd->lock); =20 - list_for_each_entry(bfqq, &bfqd->active_list, bfqq_list) - bfq_bfqq_end_wr(bfqq); + for (i =3D 0; i < bfqd->num_actuators; i++) { + list_for_each_entry(bfqq, &bfqd->active_list[i], bfqq_list) + bfq_bfqq_end_wr(bfqq); + } list_for_each_entry(bfqq, &bfqd->idle_list, bfqq_list) bfq_bfqq_end_wr(bfqq); bfq_end_wr_async(bfqd); @@ -3671,13 +3677,13 @@ static void bfq_update_peak_rate(struct bfq_data *b= fqd, struct request *rq) * - start a new observation interval with this dispatch */ if (now_ns - bfqd->last_dispatch > 100*NSEC_PER_MSEC && - bfqd->rq_in_driver =3D=3D 0) + bfqd->tot_rq_in_driver =3D=3D 0) goto update_rate_and_reset; =20 /* Update sampling information */ bfqd->peak_rate_samples++; =20 - if ((bfqd->rq_in_driver > 0 || + if ((bfqd->tot_rq_in_driver > 0 || now_ns - bfqd->last_completion < BFQ_MIN_TT) && !BFQ_RQ_SEEKY(bfqd, bfqd->last_position, rq)) bfqd->sequential_samples++; @@ -3942,10 +3948,8 @@ static bool idling_needed_for_service_guarantees(str= uct bfq_data *bfqd, return false; =20 return (bfqq->wr_coeff > 1 && - (bfqd->wr_busy_queues < - tot_busy_queues || - bfqd->rq_in_driver >=3D - bfqq->dispatched + 4)) || + (bfqd->wr_busy_queues < tot_busy_queues || + bfqd->tot_rq_in_driver >=3D bfqq->dispatched + 4)) || bfq_asymmetric_scenario(bfqd, bfqq) || tot_busy_queues =3D=3D 1; } @@ -4716,6 +4720,8 @@ bfq_choose_bfqq_for_injection(struct bfq_data *bfqd) { struct bfq_queue *bfqq, *in_serv_bfqq =3D bfqd->in_service_queue; unsigned int limit =3D in_serv_bfqq->inject_limit; + int i; + /* * If * - bfqq is not weight-raised and therefore does not carry @@ -4747,7 +4753,7 @@ bfq_choose_bfqq_for_injection(struct bfq_data *bfqd) ) limit =3D 1; =20 - if (bfqd->rq_in_driver >=3D limit) + if (bfqd->tot_rq_in_driver >=3D limit) return NULL; =20 /* @@ -4762,11 +4768,12 @@ bfq_choose_bfqq_for_injection(struct bfq_data *bfqd) * (and re-added only if it gets new requests, but then it * is assigned again enough budget for its new backlog). */ - list_for_each_entry(bfqq, &bfqd->active_list, bfqq_list) - if (!RB_EMPTY_ROOT(&bfqq->sort_list) && - (in_serv_always_inject || bfqq->wr_coeff > 1) && - bfq_serv_to_charge(bfqq->next_rq, bfqq) <=3D - bfq_bfqq_budget_left(bfqq)) { + for (i =3D 0; i < bfqd->num_actuators; i++) { + list_for_each_entry(bfqq, &bfqd->active_list[i], bfqq_list) + if (!RB_EMPTY_ROOT(&bfqq->sort_list) && + (in_serv_always_inject || bfqq->wr_coeff > 1) && + bfq_serv_to_charge(bfqq->next_rq, bfqq) <=3D + bfq_bfqq_budget_left(bfqq)) { /* * Allow for only one large in-flight request * on non-rotational devices, for the @@ -4791,22 +4798,69 @@ bfq_choose_bfqq_for_injection(struct bfq_data *bfqd) else limit =3D in_serv_bfqq->inject_limit; =20 - if (bfqd->rq_in_driver < limit) { + if (bfqd->tot_rq_in_driver < limit) { bfqd->rqs_injected =3D true; return bfqq; } } + } + + return NULL; +} + +static struct bfq_queue * +bfq_find_active_bfqq_for_actuator(struct bfq_data *bfqd, int idx) +{ + struct bfq_queue *bfqq =3D NULL; + + if (bfqd->in_service_queue && + bfqd->in_service_queue->actuator_idx =3D=3D idx) + return bfqd->in_service_queue; + + list_for_each_entry(bfqq, &bfqd->active_list[idx], bfqq_list) { + if (!RB_EMPTY_ROOT(&bfqq->sort_list) && + bfq_serv_to_charge(bfqq->next_rq, bfqq) <=3D + bfq_bfqq_budget_left(bfqq)) { + return bfqq; + } + } =20 return NULL; } =20 +/* + * Perform a linear scan of each actuator, until an actuator is found + * for which the following two conditions hold: the load of the + * actuator is below the threshold (see comments on actuator_load_threshold + * for details), and there is a queue that contains I/O for that + * actuator. On success, return that queue. + */ +static struct bfq_queue * +bfq_find_bfqq_for_underused_actuator(struct bfq_data *bfqd) +{ + int i; + + for (i =3D 0 ; i < bfqd->num_actuators; i++) { + if (bfqd->rq_in_driver[i] < bfqd->actuator_load_threshold) { + struct bfq_queue *bfqq =3D + bfq_find_active_bfqq_for_actuator(bfqd, i); + + if (bfqq) + return bfqq; + } + } + + return NULL; +} + + /* * Select a queue for service. If we have a current queue in service, * check whether to continue servicing it, or retrieve and set a new one. */ static struct bfq_queue *bfq_select_queue(struct bfq_data *bfqd) { - struct bfq_queue *bfqq; + struct bfq_queue *bfqq, *inject_bfqq; struct request *next_rq; enum bfqq_expiration reason =3D BFQQE_BUDGET_TIMEOUT; =20 @@ -4828,6 +4882,15 @@ static struct bfq_queue *bfq_select_queue(struct bfq= _data *bfqd) goto expire; =20 check_queue: + /* + * If some actuator is underutilized, but the in-service + * queue does not contain I/O for that actuator, then try to + * inject I/O for that actuator. + */ + inject_bfqq =3D bfq_find_bfqq_for_underused_actuator(bfqd); + if (inject_bfqq && inject_bfqq !=3D bfqq) + return inject_bfqq; + /* * This loop is rarely executed more than once. Even when it * happens, it is much more convenient to re-execute this loop @@ -5183,11 +5246,11 @@ static struct request *__bfq_dispatch_request(struc= t blk_mq_hw_ctx *hctx) =20 /* * We exploit the bfq_finish_requeue_request hook to - * decrement rq_in_driver, but + * decrement tot_rq_in_driver, but * bfq_finish_requeue_request will not be invoked on * this request. So, to avoid unbalance, just start - * this request, without incrementing rq_in_driver. As - * a negative consequence, rq_in_driver is deceptively + * this request, without incrementing tot_rq_in_driver. As + * a negative consequence, tot_rq_in_driver is deceptively * lower than it should be while this request is in * service. This may cause bfq_schedule_dispatch to be * invoked uselessly. @@ -5196,7 +5259,7 @@ static struct request *__bfq_dispatch_request(struct = blk_mq_hw_ctx *hctx) * bfq_finish_requeue_request hook, if defined, is * probably invoked also on this request. So, by * exploiting this hook, we could 1) increment - * rq_in_driver here, and 2) decrement it in + * tot_rq_in_driver here, and 2) decrement it in * bfq_finish_requeue_request. Such a solution would * let the value of the counter be always accurate, * but it would entail using an extra interface @@ -5225,7 +5288,7 @@ static struct request *__bfq_dispatch_request(struct = blk_mq_hw_ctx *hctx) * Of course, serving one request at a time may cause loss of * throughput. */ - if (bfqd->strict_guarantees && bfqd->rq_in_driver > 0) + if (bfqd->strict_guarantees && bfqd->tot_rq_in_driver > 0) goto exit; =20 bfqq =3D bfq_select_queue(bfqd); @@ -5236,7 +5299,8 @@ static struct request *__bfq_dispatch_request(struct = blk_mq_hw_ctx *hctx) =20 if (rq) { inc_in_driver_start_rq: - bfqd->rq_in_driver++; + bfqd->rq_in_driver[bfqq->actuator_idx]++; + bfqd->tot_rq_in_driver++; start_rq: rq->rq_flags |=3D RQF_STARTED; } @@ -6304,7 +6368,7 @@ static void bfq_update_hw_tag(struct bfq_data *bfqd) struct bfq_queue *bfqq =3D bfqd->in_service_queue; =20 bfqd->max_rq_in_driver =3D max_t(int, bfqd->max_rq_in_driver, - bfqd->rq_in_driver); + bfqd->tot_rq_in_driver); =20 if (bfqd->hw_tag =3D=3D 1) return; @@ -6315,7 +6379,7 @@ static void bfq_update_hw_tag(struct bfq_data *bfqd) * sum is not exact, as it's not taking into account deactivated * requests. */ - if (bfqd->rq_in_driver + bfqd->queued <=3D BFQ_HW_QUEUE_THRESHOLD) + if (bfqd->tot_rq_in_driver + bfqd->queued <=3D BFQ_HW_QUEUE_THRESHOLD) return; =20 /* @@ -6326,7 +6390,7 @@ static void bfq_update_hw_tag(struct bfq_data *bfqd) if (bfqq && bfq_bfqq_has_short_ttime(bfqq) && bfqq->dispatched + bfqq->queued[0] + bfqq->queued[1] < BFQ_HW_QUEUE_THRESHOLD && - bfqd->rq_in_driver < BFQ_HW_QUEUE_THRESHOLD) + bfqd->tot_rq_in_driver < BFQ_HW_QUEUE_THRESHOLD) return; =20 if (bfqd->hw_tag_samples++ < BFQ_HW_QUEUE_SAMPLES) @@ -6347,7 +6411,8 @@ static void bfq_completed_request(struct bfq_queue *b= fqq, struct bfq_data *bfqd) =20 bfq_update_hw_tag(bfqd); =20 - bfqd->rq_in_driver--; + bfqd->rq_in_driver[bfqq->actuator_idx]--; + bfqd->tot_rq_in_driver--; bfqq->dispatched--; =20 if (!bfqq->dispatched && !bfq_bfqq_busy(bfqq)) { @@ -6466,7 +6531,7 @@ static void bfq_completed_request(struct bfq_queue *b= fqq, struct bfq_data *bfqd) BFQQE_NO_MORE_REQUESTS); } =20 - if (!bfqd->rq_in_driver) + if (!bfqd->tot_rq_in_driver) bfq_schedule_dispatch(bfqd); } =20 @@ -6597,13 +6662,13 @@ static void bfq_update_inject_limit(struct bfq_data= *bfqd, * conditions to do it, or we can lower the last base value * computed. * - * NOTE: (bfqd->rq_in_driver =3D=3D 1) means that there is no I/O + * NOTE: (bfqd->tot_rq_in_driver =3D=3D 1) means that there is no I/O * request in flight, because this function is in the code * path that handles the completion of a request of bfqq, and, * in particular, this function is executed before - * bfqd->rq_in_driver is decremented in such a code path. + * bfqd->tot_rq_in_driver is decremented in such a code path. */ - if ((bfqq->last_serv_time_ns =3D=3D 0 && bfqd->rq_in_driver =3D=3D 1) || + if ((bfqq->last_serv_time_ns =3D=3D 0 && bfqd->tot_rq_in_driver =3D=3D 1)= || tot_time_ns < bfqq->last_serv_time_ns) { if (bfqq->last_serv_time_ns =3D=3D 0) { /* @@ -6613,7 +6678,7 @@ static void bfq_update_inject_limit(struct bfq_data *= bfqd, bfqq->inject_limit =3D max_t(unsigned int, 1, old_limit); } bfqq->last_serv_time_ns =3D tot_time_ns; - } else if (!bfqd->rqs_injected && bfqd->rq_in_driver =3D=3D 1) + } else if (!bfqd->rqs_injected && bfqd->tot_rq_in_driver =3D=3D 1) /* * No I/O injected and no request still in service in * the drive: these are the exact conditions for @@ -7257,7 +7322,8 @@ static int bfq_init_queue(struct request_queue *q, st= ruct elevator_type *e) bfqd->queue_weights_tree =3D RB_ROOT_CACHED; bfqd->num_groups_with_pending_reqs =3D 0; =20 - INIT_LIST_HEAD(&bfqd->active_list); + INIT_LIST_HEAD(&bfqd->active_list[0]); + INIT_LIST_HEAD(&bfqd->active_list[1]); INIT_LIST_HEAD(&bfqd->idle_list); INIT_HLIST_HEAD(&bfqd->burst_list); =20 @@ -7302,6 +7368,9 @@ static int bfq_init_queue(struct request_queue *q, st= ruct elevator_type *e) ref_wr_duration[blk_queue_nonrot(bfqd->queue)]; bfqd->peak_rate =3D ref_rate[blk_queue_nonrot(bfqd->queue)] * 2 / 3; =20 + /* see comments on the definition of next field inside bfq_data */ + bfqd->actuator_load_threshold =3D 4; + spin_lock_init(&bfqd->lock); =20 /* diff --git a/block/bfq-iosched.h b/block/bfq-iosched.h index 953980de6b4b..be725d9143fa 100644 --- a/block/bfq-iosched.h +++ b/block/bfq-iosched.h @@ -586,7 +586,12 @@ struct bfq_data { /* number of queued requests */ int queued; /* number of requests dispatched and waiting for completion */ - int rq_in_driver; + int tot_rq_in_driver; + /* + * number of requests dispatched and waiting for completion + * for each actuator + */ + int rq_in_driver[BFQ_MAX_ACTUATORS]; =20 /* true if the device is non rotational and performs queueing */ bool nonrot_with_queueing; @@ -680,8 +685,13 @@ struct bfq_data { /* maximum budget allotted to a bfq_queue before rescheduling */ int bfq_max_budget; =20 - /* list of all the bfq_queues active on the device */ - struct list_head active_list; + /* + * List of all the bfq_queues active for a specific actuator + * on the device. Keeping active queues separate on a + * per-actuator basis helps implementing per-actuator + * injection more efficiently. + */ + struct list_head active_list[BFQ_MAX_ACTUATORS]; /* list of all the bfq_queues idle on the device */ struct list_head idle_list; =20 @@ -817,6 +827,29 @@ struct bfq_data { sector_t sector[BFQ_MAX_ACTUATORS]; sector_t nr_sectors[BFQ_MAX_ACTUATORS]; struct blk_independent_access_range ia_ranges[BFQ_MAX_ACTUATORS]; + + /* + * If the number of I/O requests queued in the device for a + * given actuator is below next threshold, then the actuator + * is deemed as underutilized. If this condition is found to + * hold for some actuator upon a dispatch, but (i) the + * in-service queue does not contain I/O for that actuator, + * while (ii) some other queue does contain I/O for that + * actuator, then the head I/O request of the latter queue is + * returned (injected), instead of the head request of the + * currently in-service queue. + * + * We set the threshold, empirically, to the minimum possible + * value for which an actuator is fully utilized, or close to + * be fully utilized. By doing so, injected I/O 'steals' as + * few drive-queue slots as possibile to the in-service + * queue. This reduces as much as possible the probability + * that the service of I/O from the in-service bfq_queue gets + * delayed because of slot exhaustion, i.e., because all the + * slots of the drive queue are filled with I/O injected from + * other queues (NCQ provides for 32 slots). + */ + unsigned int actuator_load_threshold; }; =20 enum bfqq_state_flags { diff --git a/block/bfq-wf2q.c b/block/bfq-wf2q.c index 8fc3da4c23bb..ec0273e2cd07 100644 --- a/block/bfq-wf2q.c +++ b/block/bfq-wf2q.c @@ -477,7 +477,7 @@ static void bfq_active_insert(struct bfq_service_tree *= st, bfqd =3D (struct bfq_data *)bfqg->bfqd; #endif if (bfqq) - list_add(&bfqq->bfqq_list, &bfqq->bfqd->active_list); + list_add(&bfqq->bfqq_list, &bfqq->bfqd->active_list[bfqq->actuator_idx]); #ifdef CONFIG_BFQ_GROUP_IOSCHED if (bfqg !=3D bfqd->root_group) bfqg->active_entities++; --=20 2.20.1 From nobody Thu Sep 18 13:10:46 2025 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 225D7C352A1 for ; Tue, 6 Dec 2022 08:16:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233417AbiLFIQf (ORCPT ); Tue, 6 Dec 2022 03:16:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45704 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232604AbiLFIQH (ORCPT ); Tue, 6 Dec 2022 03:16:07 -0500 Received: from mail-ej1-x631.google.com (mail-ej1-x631.google.com [IPv6:2a00:1450:4864:20::631]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0F33918E19 for ; Tue, 6 Dec 2022 00:16:05 -0800 (PST) Received: by mail-ej1-x631.google.com with SMTP id n20so4434834ejh.0 for ; Tue, 06 Dec 2022 00:16:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=aIGTr+7euArpiTpzI80FpH3/QoI1PLTpeFSiS7XZzKI=; b=GYETnHd8eiTTncZxQpBvSQi3BbYW5rDLYYzD0TtKTJUNRDDyx7OpK61BXwV1+m5/KE x7XlImUAj4Kor/DOnJasoxIKA/Md4cVrClTSQ1eKB+gumO3q1/Yp5IpFra5zOvenEjXO QZ4hSr2E1Q8Uz4UcaKiFDsmqRZ8CygCmpdpW1eDfMFY9sZxiEmJrVXAudPg0gXPcOySt UINzhec9E+UXobJootA84YNLede5ynABmRH7wylw50EvJgrE91G0U0j+Y/gBnnFOV2Gw gYiRbEl76gwbKwlcxqWmGB0Z5pNczxZ7GOsmYCyzifM0+JJ6dhFy5SgZAET/K/dSm6Tw yxZw== 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=aIGTr+7euArpiTpzI80FpH3/QoI1PLTpeFSiS7XZzKI=; b=Wf2+4z3VC8/ZN473LhmtjqatuVyDOO1H8N1nmm0auX7PumInLagu1klvzL8y9CESyi 7JIiHcWapm8e8vSFvYUfyTBiXXsdzfVoseKHOGqy7D1buB61bHwRd3BfovN3rYIMKUIj mqpEV5LjD730bR8d1gHDyvLCz91+9tPAPsaOkuNbeXKCUCCs2BtYoNNE5jxOwUaMMab1 DCex+nhLLMWzgORsH3LuWRWqZOEnxfXLRiSIPxGDuITTCB5jLCUcMgGWZbmxHXaEEKxU 5LPKGtOn6W0t9Ayra26+hF07XuSUC9A6i6X/trm/mBqXmy2loDiMHrZ9q3jXKJaBwceM brCg== X-Gm-Message-State: ANoB5pmg5FpEiLTcz14jiauL8NKbHiolizfoSXxijTi1S80hNASw1UN6 c9LmFL99xCRV9Bg+hCVE8RbIuQ== X-Google-Smtp-Source: AA0mqf5x7UfKblxILdjxFcL99wCRjpiXgBQhZSMMA3pY9x7wwQdFIA0HpVKTxUADHfv/po1dpUmF2Q== X-Received: by 2002:a17:906:2599:b0:78d:474c:2a59 with SMTP id m25-20020a170906259900b0078d474c2a59mr72397901ejb.759.1670314565487; Tue, 06 Dec 2022 00:16:05 -0800 (PST) Received: from MBP-di-Paolo.station (net-2-35-55-161.cust.vodafonedsl.it. [2.35.55.161]) by smtp.gmail.com with ESMTPSA id 24-20020a170906329800b007b29d292852sm7161944ejw.148.2022.12.06.00.16.04 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Dec 2022 00:16:05 -0800 (PST) From: Paolo Valente To: Jens Axboe Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, arie.vanderhoeven@seagate.com, rory.c.chen@seagate.com, glen.valante@linaro.org, Davide Zini , Paolo Valente Subject: [PATCH V7 8/8] block, bfq: balance I/O injection among underutilized actuators Date: Tue, 6 Dec 2022 09:15:51 +0100 Message-Id: <20221206081551.28257-9-paolo.valente@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20221206081551.28257-1-paolo.valente@linaro.org> References: <20221206081551.28257-1-paolo.valente@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Davide Zini Upon the invocation of its dispatch function, BFQ returns the next I/O request of the in-service bfq_queue, unless some exception holds. One such exception is that there is some underutilized actuator, different from the actuator for which the in-service queue contains I/O, and that some other bfq_queue happens to contain I/O for such an actuator. In this case, the next I/O request of the latter bfq_queue, and not of the in-service bfq_queue, is returned (I/O is injected from that bfq_queue). To find such an actuator, a linear scan, in increasing index order, is performed among actuators. Performing a linear scan entails a prioritization among actuators: an underutilized actuator may be considered for injection only if all actuators with a lower index are currently fully utilized, or if there is no pending I/O for any lower-index actuator that happens to be underutilized. This commits breaks this prioritization and tends to distribute injection uniformly across actuators. This is obtained by adding the following condition to the linear scan: even if an actuator A is underutilized, A is however skipped if its load is higher than that of the next actuator. Signed-off-by: Paolo Valente Signed-off-by: Davide Zini --- block/bfq-iosched.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index f4df5710b648..6a360d5bae1c 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -4830,10 +4830,16 @@ bfq_find_active_bfqq_for_actuator(struct bfq_data *= bfqd, int idx) =20 /* * Perform a linear scan of each actuator, until an actuator is found - * for which the following two conditions hold: the load of the - * actuator is below the threshold (see comments on actuator_load_threshold - * for details), and there is a queue that contains I/O for that - * actuator. On success, return that queue. + * for which the following three conditions hold: the load of the + * actuator is below the threshold (see comments on + * actuator_load_threshold for details) and lower than that of the + * next actuator (comments on this extra condition below), and there + * is a queue that contains I/O for that actuator. On success, return + * that queue. + * + * Performing a plain linear scan entails a prioritization among + * actuators. The extra condition above breaks this prioritization and + * tends to distribute injection uniformly across actuators. */ static struct bfq_queue * bfq_find_bfqq_for_underused_actuator(struct bfq_data *bfqd) @@ -4841,7 +4847,9 @@ bfq_find_bfqq_for_underused_actuator(struct bfq_data = *bfqd) int i; =20 for (i =3D 0 ; i < bfqd->num_actuators; i++) { - if (bfqd->rq_in_driver[i] < bfqd->actuator_load_threshold) { + if (bfqd->rq_in_driver[i] < bfqd->actuator_load_threshold && + (i =3D=3D bfqd->num_actuators - 1 || + bfqd->rq_in_driver[i] < bfqd->rq_in_driver[i+1])) { struct bfq_queue *bfqq =3D bfq_find_active_bfqq_for_actuator(bfqd, i); =20 --=20 2.20.1