From nobody Thu Sep 18 09:57:52 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 2F3C0C4332F for ; Fri, 9 Dec 2022 09:45:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230010AbiLIJpE (ORCPT ); Fri, 9 Dec 2022 04:45:04 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54418 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229634AbiLIJoz (ORCPT ); Fri, 9 Dec 2022 04:44:55 -0500 Received: from mail-ej1-x62d.google.com (mail-ej1-x62d.google.com [IPv6:2a00:1450:4864:20::62d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7D5D361B85 for ; Fri, 9 Dec 2022 01:44:53 -0800 (PST) Received: by mail-ej1-x62d.google.com with SMTP id n21so10194495ejb.9 for ; Fri, 09 Dec 2022 01:44:53 -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=cYbo291sOXt7l2BC18S2yHlocn22et2tRa8ByKa8vkY=; b=Sga2LLnuRDsEwvL7t02EfazswzXvVGiUiHMH9lgT5pOqv3efinPo6RDmkOMAx59NuU sgLPG7MQgO1CsWCxQvdHRJJOoj9ZzSG7Tpme1KC2kxwXp1WJzBxmeVkt1SIAIyLh1Ljj 9MCgpZlun4rCRpRx302psTQr6d1jH6xA7wDKvHr91WL+lQR/gr7X2aQ1Ttw0kQirQf6Q H1bFIdog1VQHg+umuyiOBgwhHmvhS3TF87FfvVP7cMW+t/2lKr0QvsPvFyGtZjeAFdlo mkd3WpPV/uJOu6pInLw/T7n1zTQQslLEbY3/63NEIM7ItLrIBFdOmrpcwiPgQebdjI4B I7Dg== 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=cYbo291sOXt7l2BC18S2yHlocn22et2tRa8ByKa8vkY=; b=wKbmjtnEE8ggCaxrD77zcxe+0MJv63LUvnB5UHDGFf+QSKcTpzDTHpPemB5OCIVinT b2QFlmi5Y55iF7hF7m/zFz0DfqrosR6800dRB0uzbA4QLkjjJgUcmaCszFOQxpMQVwBN 9H5DjpjRrn+Low7Iet5Dw73b/r8SI4tRlklpmLHNZxToySC0AmJjfm2Dtiw6/KaZDlbJ YxjFgKMQy91XxTgnT6nMm1TqqFGUVYBEA926o5r5H0XUNQT7YhOC3CGEu3l+mhyZfHWh yPSIJakxbkggdyuPfAhvMHYN6X8gWNcFuh4zATvd9p88gaVxpPed4yhcBWsa8ghd66NO cLIg== X-Gm-Message-State: ANoB5plrLvgzros0kwCom3isjTGw5zTOLHpTVrJcaRKDZ46sBYlfWM2/ k0xSxJwlYbrk3Bo/+wfX0aTWpQ== X-Google-Smtp-Source: AA0mqf5vFv+IeRPc8/YR/kVnw3Edty+PaRkrWqSxRjll9HxJVnRLHj2BKeIgd7Q4A4vsox2fJdTFeA== X-Received: by 2002:a17:906:1356:b0:7c0:f216:cc14 with SMTP id x22-20020a170906135600b007c0f216cc14mr4423852ejb.11.1670579091896; Fri, 09 Dec 2022 01:44:51 -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 oz18-20020a170906cd1200b007c11f2a3b3dsm353421ejb.107.2022.12.09.01.44.51 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Dec 2022 01:44:51 -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 , Gabriele Felici , Gianmarco Lusvardi , Giulio Barabino , Emiliano Maccaferri Subject: [PATCH V10 4/8] block, bfq: turn bfqq_data into an array in bfq_io_cq Date: Fri, 9 Dec 2022 10:44:38 +0100 Message-Id: <20221209094442.36896-5-paolo.valente@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20221209094442.36896-1-paolo.valente@linaro.org> References: <20221209094442.36896-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. Reviewed-by: Damien Le Moal 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 | 100 ++++++++++++++++++++++++++------------------ block/bfq-iosched.h | 12 ++++-- 2 files changed, 67 insertions(+), 45 deletions(-) diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index 0d6b35ef3d3f..48a2a57097c9 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]; =20 if (is_sync) bic->bfqq[1][actuator_idx] =3D bfqq; @@ -1181,9 +1181,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); @@ -1864,7 +1865,9 @@ static void bfq_bfqq_handle_idle_busy_switch(struct b= fq_data *bfqd, arrived_in_time =3D ktime_get_ns() <=3D bfqq->ttime.last_end_request + bfqd->bfq_slice_idle * 3; - + unsigned int act_idx =3D bfq_actuator_index(bfqd, rq->bio); + bool bfqq_non_merged_or_stably_merged =3D + bfqq->bic || RQ_BIC(rq)->bfqq_data[act_idx].stably_merged; =20 /* * bfqq deserves to be weight-raised if: @@ -1898,9 +1901,8 @@ 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) && - (*interactive || soft_rt))); + (bfq_bfqq_sync(bfqq) && bfqq_non_merged_or_stably_merged && + (*interactive || soft_rt))); =20 /* * Using the last flag, update budget and check whether bfqq @@ -2888,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)); + struct bfq_queue *new_bfqq; + + if (idling_boosts_thr_without_issues(bfqd, bfqq) || + proc_ref =3D=3D 0) + return NULL; + + /* next function will take at least one ref */ + 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; +} + /* * Attempt to schedule a merge of bfqq with the currently in-service * queue or with a close queue among the scheduled queues. Return @@ -2913,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) @@ -2943,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 @@ -3060,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 @@ -3071,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; @@ -5438,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 @@ -5449,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); } @@ -5639,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 @@ -5717,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 @@ -5779,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 @@ -6699,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; @@ -6807,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; @@ -6831,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