[V4,1/8] block, bfq: split sync bfq_queues on a per-actuator basis

Commit Message

Paolo Valente Oct. 20, 2022, 3:26 p.m. UTC

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’s 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 <[e-mail]>
Signed-off-by: Carmine Zaccagnino <[e-mail]>
Signed-off-by: Paolo Valente <[e-mail]>
---
 block/bfq-cgroup.c  |  95 ++++++++++++++++-------------
 block/bfq-iosched.c | 141 +++++++++++++++++++++++++++-----------------
 block/bfq-iosched.h |  51 ++++++++++++----
 3 files changed, 183 insertions(+), 104 deletions(-)

Comments

Dan Carpenter Oct. 21, 2022, 12:56 p.m. UTC | #1

Hi Paolo,

https://git-scm.com/docs/git-format-patch#_base_tree_information  ]

url:    https://github.com/intel-lab-lkp/linux/commits/Paolo-Valente/block-bfq-extend-bfq-to-support-multi-actuator-drives/20221020-233011  
base:   https://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git   for-next
patch link:    https://lore.kernel.org/r/20221020152643.21199-2-paolo.valente%40linaro.org  
patch subject: [PATCH V4 1/8] block, bfq: split sync bfq_queues on a per-actuator basis
config: openrisc-randconfig-m041-20221019
compiler: or1k-linux-gcc (GCC) 12.1.0

If you fix the issue, kindly add following tag where applicable
| Reported-by: kernel test robot <[e-mail]>
| Reported-by: Dan Carpenter <[e-mail]>

New smatch warnings:
block/bfq-iosched.c:5423 bfq_exit_icq() error: we previously assumed 'bfqd' could be null (see line 5420)
block/bfq-iosched.c:5431 bfq_exit_icq() warn: variable dereferenced before check 'bfqd' (see line 5423)

Old smatch warnings:
block/bfq-iosched.c:6115 __bfq_insert_request() warn: variable dereferenced before check 'bfqq' (see line 6111)

vim +/bfqd +5423 block/bfq-iosched.c

aee69d78dec0ff Paolo Valente 2017-04-19  5409  static void bfq_exit_icq(struct io_cq *icq)
aee69d78dec0ff Paolo Valente 2017-04-19  5410  {
aee69d78dec0ff Paolo Valente 2017-04-19  5411  	struct bfq_io_cq *bic = icq_to_bic(icq);
fc8f914d9fc5a0 Paolo Valente 2022-10-20  5412  	struct bfq_data *bfqd = bic_to_bfqd(bic);
fc8f914d9fc5a0 Paolo Valente 2022-10-20  5413  	unsigned long flags;
fc8f914d9fc5a0 Paolo Valente 2022-10-20  5414  	unsigned int act_idx;
430a67f9d6169a Paolo Valente 2021-03-04  5415  
430a67f9d6169a Paolo Valente 2021-03-04  5416  	/*
fc8f914d9fc5a0 Paolo Valente 2022-10-20  5417  	 * bfqd is NULL if scheduler already exited, and in that case
                                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

fc8f914d9fc5a0 Paolo Valente 2022-10-20  5418  	 * this is the last time these queues are accessed.
430a67f9d6169a Paolo Valente 2021-03-04  5419  	 */
fc8f914d9fc5a0 Paolo Valente 2022-10-20 @5420  	if (bfqd)
430a67f9d6169a Paolo Valente 2021-03-04  5421  		spin_lock_irqsave(&bfqd->lock, flags);
fc8f914d9fc5a0 Paolo Valente 2022-10-20  5422  
fc8f914d9fc5a0 Paolo Valente 2022-10-20 @5423  	for (act_idx = 0; act_idx < bfqd->num_actuators; act_idx++) {
                                                                            ^^^^^^^^^^^^^^^^^^^
If "bfqd" is NULL then we're toasted.

fc8f914d9fc5a0 Paolo Valente 2022-10-20  5424  		if (bic->stable_merge_bfqq)
430a67f9d6169a Paolo Valente 2021-03-04  5425  			bfq_put_stable_ref(bic->stable_merge_bfqq);
fc8f914d9fc5a0 Paolo Valente 2022-10-20  5426  
fc8f914d9fc5a0 Paolo Valente 2022-10-20  5427  		bfq_exit_icq_bfqq(bic, true, act_idx);
fc8f914d9fc5a0 Paolo Valente 2022-10-20  5428  		bfq_exit_icq_bfqq(bic, false, act_idx);
430a67f9d6169a Paolo Valente 2021-03-04  5429  	}
430a67f9d6169a Paolo Valente 2021-03-04  5430  
fc8f914d9fc5a0 Paolo Valente 2022-10-20 @5431  	if (bfqd)
fc8f914d9fc5a0 Paolo Valente 2022-10-20  5432  		spin_unlock_irqrestore(&bfqd->lock, flags);
aee69d78dec0ff Paolo Valente 2017-04-19  5433  }

Rory Chen Oct. 28, 2022, 2:50 a.m. UTC | #2

Try to patch V4 and report some kinds of patch errors on linux-6.1-rc2 and linux-5.19.17 like below.
patching file block/bfq-cgroup.c
patch: **** malformed patch at line 115: @@ -714,53 +756,24 @@ static void *__bfq_bic_change_cgroup(struct bfq_data *bfqd,


Seagate Internal

-----Original Message-----
From: Paolo Valente <[e-mail]> 
Sent: Thursday, October 20, 2022 11:27 PM
To: Jens Axboe <[e-mail]>
Cc: [e-mail]; [e-mail]; [e-mail]; Arie van der Hoeven <[e-mail]>; Rory Chen <[e-mail]>; Paolo Valente <[e-mail]>; Gabriele Felici <[e-mail]>; Carmine Zaccagnino <[e-mail]>
Subject: [PATCH V4 1/8] block, bfq: split sync bfq_queues on a per-actuator basis


This message has originated from an External Source. Please use proper judgment and caution when opening attachments, clicking links, or responding to this email.


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’s 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://secure-web.cisco.com/1lMoLKzubwoa1F7LMfdO-FsqrGgK0HP3dmPSHEyMRO6bw1nTIkTCnTygsqv368Ay-emGQ1HvBQV07BkcjBp2COjNFEdeaeIwgraUXRlvYmSpDBCqQOiypj8b8gVp2yWJqj-6JUDQii6QqIP3DF9KxeDR01O3EtfPLYVp8cp8ODZK0RHSPnBFiXljzCpbK58EKimV0sPmctRDql1uTE7nZKYeQ0x2LFSZKH7r88EOAk5tfvhraF0nG7L8KPsUMgIv9FP639hFt_Ff_GZSVcNoVmDiSZJdSAm_wrvzUz8PsPOJFgQVOxo62wZHp4uJNizYSJCy0tueq5UnWSEz2J7TkIGQvDt_P_FT3Mqqq6sr1KXok5zwe0MeU06mTVIl7JbJs9URMdbpGFHnIv7Twm6ogQf25z9vJOyRpzhe_zg1hkNM/https%3A%2F%2Fwww.linaro.org%2Fblog%2Fbudget-fair-queueing-bfq-linux-io-scheduler-optimizations-for-multi-actuator-sata-hard-drives%2F

Signed-off-by: Gabriele Felici <mailto:[e-mail]>
Signed-off-by: Carmine Zaccagnino <mailto:[e-mail]>
Signed-off-by: Paolo Valente <mailto:[e-mail]>
---
 block/bfq-cgroup.c  |  95 ++++++++++++++++-------------  block/bfq-iosched.c | 141 +++++++++++++++++++++++++++-----------------
 block/bfq-iosched.h |  51 ++++++++++++----
 3 files changed, 183 insertions(+), 104 deletions(-)

diff --git a/block/bfq-cgroup.c b/block/bfq-cgroup.c index 144bca006463..d243c429d9c0 100644
--- a/block/bfq-cgroup.c
+++ b/block/bfq-cgroup.c
@@ -700,6 +700,48 @@ void bfq_bfqq_move(struct bfq_data *bfqd, struct bfq_queue *bfqq,
        bfq_put_queue(bfqq);
 }

+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) {
+       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 != &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 = sync_bfqq; bfqq; bfqq = bfqq->new_bfqq)
+                       if (bfqq->entity.sched_data !=
+                           &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.
@@ -714,53 +756,24 @@ static void *__bfq_bic_change_cgroup(struct bfq_data *bfqd,
                                     struct bfq_io_cq *bic,
                                     struct bfq_group *bfqg)  {
-       struct bfq_queue *async_bfqq = bic_to_bfqq(bic, 0);
-       struct bfq_queue *sync_bfqq = bic_to_bfqq(bic, 1);
        struct bfq_entity *entity;
+       unsigned int act_idx;

-       if (async_bfqq) {
-               entity = &async_bfqq->entity;
-
-               if (entity->sched_data != &bfqg->sched_data) {
-                       bic_set_bfqq(bic, NULL, 0);
-                       bfq_release_process_ref(bfqd, async_bfqq);
-               }
-       }
+       for (act_idx = 0; act_idx < bfqd->num_actuators; act_idx++) {
+               struct bfq_queue *async_bfqq = bic_to_bfqq(bic, 0, act_idx);
+               struct bfq_queue *sync_bfqq = bic_to_bfqq(bic, 1, 
+ act_idx);

-       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 != &bfqg->sched_data)
-                               bfq_bfqq_move(bfqd, sync_bfqq, bfqg);
-               } else {
-                       struct bfq_queue *bfqq;
+               if (async_bfqq) {
+                       entity = &async_bfqq->entity;

-                       /*
-                        * The queue was merged to a different queue. Check
-                        * that the merge chain still belongs to the same
-                        * cgroup.
-                        */
-                       for (bfqq = sync_bfqq; bfqq; bfqq = bfqq->new_bfqq)
-                               if (bfqq->entity.sched_data !=
-                                   &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 (entity->sched_data != &bfqg->sched_data) {
+                               bic_set_bfqq(bic, NULL, 0, act_idx);
+                               bfq_release_process_ref(bfqd, 
+ async_bfqq);
                        }
                }
+
+               if (sync_bfqq)
+                       bfq_sync_bfqq_move(bfqd, sync_bfqq, bic, bfqg, 
+ act_idx);
        }

        return bfqg;
diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index 7ea427817f7f..99c01e184f1d 100644
--- a/block/bfq-iosched.c
+++ b/block/bfq-iosched.c
@@ -377,14 +377,19 @@ static const unsigned long bfq_late_stable_merging = 600;
 #define RQ_BIC(rq)             ((struct bfq_io_cq *)((rq)->elv.priv[0]))
 #define RQ_BFQQ(rq)            ((rq)->elv.priv[1])

-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];
+       return bic->bfqq[is_sync][actuator_idx];
 }

 static void bfq_put_stable_ref(struct bfq_queue *bfqq);

-void bic_set_bfqq(struct bfq_io_cq *bic, struct bfq_queue *bfqq, bool is_sync)
+void bic_set_bfqq(struct bfq_io_cq *bic,
+                 struct bfq_queue *bfqq,
+                 bool is_sync,
+                 unsigned int actuator_idx)
 {
        /*
         * If bfqq != NULL, then a non-stable queue merge between @@ -399,7 +404,7 @@ void bic_set_bfqq(struct bfq_io_cq *bic, struct bfq_queue *bfqq, bool is_sync)
         * we cancel the stable merge if
         * bic->stable_merge_bfqq == bfqq.
         */
-       bic->bfqq[is_sync] = bfqq;
+       bic->bfqq[is_sync][actuator_idx] = bfqq;

        if (bfqq && bic->stable_merge_bfqq == bfqq) {
                /*
@@ -672,9 +677,9 @@ static void bfq_limit_depth(blk_opf_t opf, struct blk_mq_alloc_data *data)  {
        struct bfq_data *bfqd = data->q->elevator->elevator_data;
        struct bfq_io_cq *bic = bfq_bic_lookup(data->q);
-       struct bfq_queue *bfqq = bic ? bic_to_bfqq(bic, op_is_sync(opf)) : NULL;
        int depth;
        unsigned limit = data->q->nr_requests;
+       unsigned int act_idx;

        /* Sync reads have full depth available */
        if (op_is_sync(opf) && !op_is_write(opf)) { @@ -684,14 +689,21 @@ static void bfq_limit_depth(blk_opf_t opf, struct blk_mq_alloc_data *data)
                limit = (limit * depth) >> bfqd->full_depth_shift;
        }

-       /*
-        * 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 = 1;
+       for (act_idx = 0; act_idx < bfqd->num_actuators; act_idx++) {
+               struct bfq_queue *bfqq =
+                       bic ? bic_to_bfqq(bic, op_is_sync(opf), act_idx) 
+ : NULL;

+               /*
+                * 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 = 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)
@@ -2142,7 +2154,7 @@ static void bfq_check_waker(struct bfq_data *bfqd, struct 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.
+        * we do not uselessly idle blocking waker in more than 1/64 cases.
         */
        if (bfqd->last_completed_rq_bfqq !=
            bfqq->tentative_waker_bfqq || @@ -2454,6 +2466,16 @@ static void bfq_remove_request(struct request_queue *q,

 }

+/* 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.
+        */
+       return 0;
+}
+
 static bool bfq_bio_merge(struct request_queue *q, struct bio *bio,
                unsigned int nr_segs)
 {
@@ -2478,7 +2500,8 @@ static bool bfq_bio_merge(struct request_queue *q, struct bio *bio,
                 */
                bfq_bic_update_cgroup(bic, bio);

-               bfqd->bio_bfqq = bic_to_bfqq(bic, op_is_sync(bio->bi_opf));
+               bfqd->bio_bfqq = bic_to_bfqq(bic, op_is_sync(bio->bi_opf),
+                                            bfq_actuator_index(bfqd, 
+ bio));
        } else {
                bfqd->bio_bfqq = NULL;
        }
@@ -3174,7 +3197,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 +4831,12 @@ static struct bfq_queue *bfq_select_queue(struct bfq_data *bfqd)
         */
        if (bfq_bfqq_wait_request(bfqq) ||
            (bfqq->dispatched != 0 && bfq_better_to_idle(bfqq))) {
+               unsigned int act_idx = bfqq->actuator_idx;
                struct bfq_queue *async_bfqq =
-                       bfqq->bic && bfqq->bic->bfqq[0] &&
-                       bfq_bfqq_busy(bfqq->bic->bfqq[0]) &&
-                       bfqq->bic->bfqq[0]->next_rq ?
-                       bfqq->bic->bfqq[0] : NULL;
+                       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 ?
+                       bfqq->bic->bfqq[0][act_idx] : NULL;
                struct bfq_queue *blocked_bfqq =
                        !hlist_empty(&bfqq->woken_list) ?
                        container_of(bfqq->woken_list.first,
@@ -4904,7 +4928,7 @@ static struct bfq_queue *bfq_select_queue(struct bfq_data *bfqd)
                    icq_to_bic(async_bfqq->next_rq->elv.icq) == bfqq->bic &&
                    bfq_serv_to_charge(async_bfqq->next_rq, async_bfqq) <=
                    bfq_bfqq_budget_left(async_bfqq))
-                       bfqq = bfqq->bic->bfqq[0];
+                       bfqq = bfqq->bic->bfqq[0][act_idx];
                else if (bfqq->waker_bfqq &&
                           bfq_bfqq_busy(bfqq->waker_bfqq) &&
                           bfqq->waker_bfqq->next_rq && @@ -5365,49 +5389,47 @@ static void bfq_exit_bfqq(struct bfq_data *bfqd, struct bfq_queue *bfqq)
        bfq_release_process_ref(bfqd, bfqq);  }

-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 = bic_to_bfqq(bic, is_sync);
+       struct bfq_queue *bfqq = bic_to_bfqq(bic, is_sync, 
+ actuator_idx);
        struct bfq_data *bfqd;

        if (bfqq)
                bfqd = bfqq->bfqd; /* NULL if scheduler already exited */

        if (bfqq && bfqd) {
-               unsigned long flags;
-
-               spin_lock_irqsave(&bfqd->lock, flags);
                bfqq->bic = 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);
        }
 }

 static void bfq_exit_icq(struct io_cq *icq)  {
        struct bfq_io_cq *bic = icq_to_bic(icq);
+       struct bfq_data *bfqd = bic_to_bfqd(bic);
+       unsigned long flags;
+       unsigned int act_idx;

-       if (bic->stable_merge_bfqq) {
-               struct bfq_data *bfqd = bic->stable_merge_bfqq->bfqd;
-
-               /*
-                * bfqd is NULL if scheduler already exited, and in
-                * that case this is the last time bfqq is accessed.
-                */
-               if (bfqd) {
-                       unsigned long flags;
+       /*
+        * 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);

-                       spin_lock_irqsave(&bfqd->lock, flags);
-                       bfq_put_stable_ref(bic->stable_merge_bfqq);
-                       spin_unlock_irqrestore(&bfqd->lock, flags);
-               } else {
+       for (act_idx = 0; act_idx < bfqd->num_actuators; act_idx++) {
+               if (bic->stable_merge_bfqq)
                        bfq_put_stable_ref(bic->stable_merge_bfqq);
-               }
+
+               bfq_exit_icq_bfqq(bic, true, act_idx);
+               bfq_exit_icq_bfqq(bic, false, act_idx);
        }

-       bfq_exit_icq_bfqq(bic, true);
-       bfq_exit_icq_bfqq(bic, false);
+       if (bfqd)
+               spin_unlock_irqrestore(&bfqd->lock, flags);
 }

 /*
@@ -5484,23 +5506,25 @@ static void bfq_check_ioprio_change(struct bfq_io_cq *bic, struct bio *bio)

        bic->ioprio = ioprio;

-       bfqq = bic_to_bfqq(bic, false);
+       bfqq = bic_to_bfqq(bic, false, bfq_actuator_index(bfqd, bio));
        if (bfqq) {
                bfq_release_process_ref(bfqd, bfqq);
                bfqq = 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));
        }

-       bfqq = bic_to_bfqq(bic, true);
+       bfqq = bic_to_bfqq(bic, true, bfq_actuator_index(bfqd, bio));
        if (bfqq)
                bfq_set_next_ioprio_data(bfqq, bic);  }

 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 = ktime_get_ns();

+       bfqq->actuator_idx = act_idx;
        RB_CLEAR_NODE(&bfqq->entity.rb_node);
        INIT_LIST_HEAD(&bfqq->fifo);
        INIT_HLIST_NODE(&bfqq->burst_list_node);
@@ -5739,6 +5763,7 @@ static struct bfq_queue *bfq_get_queue(struct bfq_data *bfqd,
        struct bfq_group *bfqg;

        bfqg = bfq_bio_bfqg(bfqd, bio);
+
        if (!is_sync) {
                async_bfqq = bfq_async_queue_prio(bfqd, bfqg, ioprio_class,
                                                  ioprio); @@ -5753,7 +5778,7 @@ static struct bfq_queue *bfq_get_queue(struct bfq_data *bfqd,

        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 +6093,8 @@ static bool __bfq_insert_request(struct bfq_data *bfqd, struct request *rq)
                 * then complete the merge and redirect it to
                 * new_bfqq.
                 */
-               if (bic_to_bfqq(RQ_BIC(rq), 1) == bfqq)
+               if (bic_to_bfqq(RQ_BIC(rq), 1,
+                               bfq_actuator_index(bfqd, rq->bio)) == 
+ bfqq)
                        bfq_merge_bfqqs(bfqd, RQ_BIC(rq),
                                        bfqq, new_bfqq);

@@ -6622,7 +6648,7 @@ bfq_split_bfqq(struct bfq_io_cq *bic, struct bfq_queue *bfqq)
                return bfqq;
        }

-       bic_set_bfqq(bic, NULL, 1);
+       bic_set_bfqq(bic, NULL, 1, bfqq->actuator_idx);

        bfq_put_cooperator(bfqq);

@@ -6636,7 +6662,8 @@ static struct bfq_queue *bfq_get_bfqq_handle_split(struct bfq_data *bfqd,
                                                   bool split, bool is_sync,
                                                   bool *new_queue)  {
-       struct bfq_queue *bfqq = bic_to_bfqq(bic, is_sync);
+       unsigned int act_idx = bfq_actuator_index(bfqd, bio);
+       struct bfq_queue *bfqq = bic_to_bfqq(bic, is_sync, act_idx);

        if (likely(bfqq && bfqq != &bfqd->oom_bfqq))
                return bfqq;
@@ -6648,7 +6675,7 @@ static struct bfq_queue *bfq_get_bfqq_handle_split(struct bfq_data *bfqd,
                bfq_put_queue(bfqq);
        bfqq = bfq_get_queue(bfqd, bio, is_sync, bic, split);

-       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 +7117,10 @@ static int bfq_init_queue(struct request_queue *q, struct 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 = BFQ_DEFAULT_QUEUE_IOPRIO;
        bfqd->oom_bfqq.new_ioprio_class = IOPRIO_CLASS_BE; @@ -7110,6 +7139,12 @@ static int bfq_init_queue(struct request_queue *q, struct elevator_type *e)

        bfqd->queue = q;

+       /*
+        * Multi-actuator support not complete yet, default to single
+        * actuator for the moment.
+        */
+       bfqd->num_actuators = 1;
+
        INIT_LIST_HEAD(&bfqd->dispatch);

        hrtimer_init(&bfqd->idle_slice_timer, CLOCK_MONOTONIC, diff --git a/block/bfq-iosched.h b/block/bfq-iosched.h index 64ee618064ba..d98e31be447f 100644
--- a/block/bfq-iosched.h
+++ b/block/bfq-iosched.h
@@ -33,6 +33,14 @@
  */
 #define BFQ_SOFTRT_WEIGHT_FACTOR       100

+/*
+ * 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 32
+
 struct bfq_entity;

 /**
@@ -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 */
@@ -399,6 +409,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;
 };

 /**
@@ -407,8 +420,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==0 or i==1, 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
@@ -772,6 +794,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;
+
 };

 enum bfqq_state_flags {
@@ -968,8 +997,10 @@ struct bfq_group {

 extern const int bfq_timeout;

-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_sync);
+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_sync,
+                               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,
--
2.20.1

Paolo Valente Oct. 28, 2022, 9:24 a.m. UTC | #3

> Il giorno 28 ott 2022, alle ore 04:50, Rory Chen <[e-mail]> ha scritto:
> 
> Try to patch V4 and report some kinds of patch errors on linux-6.1-rc2 and linux-5.19.17 like below.
> patching file block/bfq-cgroup.c
> patch: **** malformed patch at line 115: @@ -714,53 +756,24 @@ static void *__bfq_bic_change_cgroup(struct bfq_data *bfqd,
> 
> 

Ok, I'm about to post a V5, which hopefully also applies cleanly.

Thanks,
Paolo

> Seagate Internal
> 
> -----Original Message-----
> From: Paolo Valente <[e-mail]> 
> Sent: Thursday, October 20, 2022 11:27 PM
> To: Jens Axboe <[e-mail]>
> Cc: [e-mail]; [e-mail]; [e-mail]; Arie van der Hoeven <[e-mail]>; Rory Chen <[e-mail]>; Paolo Valente <[e-mail]>; Gabriele Felici <[e-mail]>; Carmine Zaccagnino <[e-mail]>
> Subject: [PATCH V4 1/8] block, bfq: split sync bfq_queues on a per-actuator basis
> 
> 
> This message has originated from an External Source. Please use proper judgment and caution when opening attachments, clicking links, or responding to this email.
> 
> 
> 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’s 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://secure-web.cisco.com/1lMoLKzubwoa1F7LMfdO-FsqrGgK0HP3dmPSHEyMRO6bw1nTIkTCnTygsqv368Ay-emGQ1HvBQV07BkcjBp2COjNFEdeaeIwgraUXRlvYmSpDBCqQOiypj8b8gVp2yWJqj-6JUDQii6QqIP3DF9KxeDR01O3EtfPLYVp8cp8ODZK0RHSPnBFiXljzCpbK58EKimV0sPmctRDql1uTE7nZKYeQ0x2LFSZKH7r88EOAk5tfvhraF0nG7L8KPsUMgIv9FP639hFt_Ff_GZSVcNoVmDiSZJdSAm_wrvzUz8PsPOJFgQVOxo62wZHp4uJNizYSJCy0tueq5UnWSEz2J7TkIGQvDt_P_FT3Mqqq6sr1KXok5zwe0MeU06mTVIl7JbJs9URMdbpGFHnIv7Twm6ogQf25z9vJOyRpzhe_zg1hkNM/https%3A%2F%2Fwww.linaro.org%2Fblog%2Fbudget-fair-queueing-bfq-linux-io-scheduler-optimizations-for-multi-actuator-sata-hard-drives%2F
> 
> Signed-off-by: Gabriele Felici <mailto:[e-mail]>
> Signed-off-by: Carmine Zaccagnino <mailto:[e-mail]>
> Signed-off-by: Paolo Valente <mailto:[e-mail]>
> ---
> block/bfq-cgroup.c  |  95 ++++++++++++++++-------------  block/bfq-iosched.c | 141 +++++++++++++++++++++++++++-----------------
> block/bfq-iosched.h |  51 ++++++++++++----
> 3 files changed, 183 insertions(+), 104 deletions(-)
> 
> diff --git a/block/bfq-cgroup.c b/block/bfq-cgroup.c index 144bca006463..d243c429d9c0 100644
> --- a/block/bfq-cgroup.c
> +++ b/block/bfq-cgroup.c
> @@ -700,6 +700,48 @@ void bfq_bfqq_move(struct bfq_data *bfqd, struct bfq_queue *bfqq,
>        bfq_put_queue(bfqq);
> }
> 
> +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) {
> +       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 != &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 = sync_bfqq; bfqq; bfqq = bfqq->new_bfqq)
> +                       if (bfqq->entity.sched_data !=
> +                           &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.
> @@ -714,53 +756,24 @@ static void *__bfq_bic_change_cgroup(struct bfq_data *bfqd,
>                                     struct bfq_io_cq *bic,
>                                     struct bfq_group *bfqg)  {
> -       struct bfq_queue *async_bfqq = bic_to_bfqq(bic, 0);
> -       struct bfq_queue *sync_bfqq = bic_to_bfqq(bic, 1);
>        struct bfq_entity *entity;
> +       unsigned int act_idx;
> 
> -       if (async_bfqq) {
> -               entity = &async_bfqq->entity;
> -
> -               if (entity->sched_data != &bfqg->sched_data) {
> -                       bic_set_bfqq(bic, NULL, 0);
> -                       bfq_release_process_ref(bfqd, async_bfqq);
> -               }
> -       }
> +       for (act_idx = 0; act_idx < bfqd->num_actuators; act_idx++) {
> +               struct bfq_queue *async_bfqq = bic_to_bfqq(bic, 0, act_idx);
> +               struct bfq_queue *sync_bfqq = bic_to_bfqq(bic, 1, 
> + act_idx);
> 
> -       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 != &bfqg->sched_data)
> -                               bfq_bfqq_move(bfqd, sync_bfqq, bfqg);
> -               } else {
> -                       struct bfq_queue *bfqq;
> +               if (async_bfqq) {
> +                       entity = &async_bfqq->entity;
> 
> -                       /*
> -                        * The queue was merged to a different queue. Check
> -                        * that the merge chain still belongs to the same
> -                        * cgroup.
> -                        */
> -                       for (bfqq = sync_bfqq; bfqq; bfqq = bfqq->new_bfqq)
> -                               if (bfqq->entity.sched_data !=
> -                                   &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 (entity->sched_data != &bfqg->sched_data) {
> +                               bic_set_bfqq(bic, NULL, 0, act_idx);
> +                               bfq_release_process_ref(bfqd, 
> + async_bfqq);
>                        }
>                }
> +
> +               if (sync_bfqq)
> +                       bfq_sync_bfqq_move(bfqd, sync_bfqq, bic, bfqg, 
> + act_idx);
>        }
> 
>        return bfqg;
> diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index 7ea427817f7f..99c01e184f1d 100644
> --- a/block/bfq-iosched.c
> +++ b/block/bfq-iosched.c
> @@ -377,14 +377,19 @@ static const unsigned long bfq_late_stable_merging = 600;
> #define RQ_BIC(rq)             ((struct bfq_io_cq *)((rq)->elv.priv[0]))
> #define RQ_BFQQ(rq)            ((rq)->elv.priv[1])
> 
> -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];
> +       return bic->bfqq[is_sync][actuator_idx];
> }
> 
> static void bfq_put_stable_ref(struct bfq_queue *bfqq);
> 
> -void bic_set_bfqq(struct bfq_io_cq *bic, struct bfq_queue *bfqq, bool is_sync)
> +void bic_set_bfqq(struct bfq_io_cq *bic,
> +                 struct bfq_queue *bfqq,
> +                 bool is_sync,
> +                 unsigned int actuator_idx)
> {
>        /*
>         * If bfqq != NULL, then a non-stable queue merge between @@ -399,7 +404,7 @@ void bic_set_bfqq(struct bfq_io_cq *bic, struct bfq_queue *bfqq, bool is_sync)
>         * we cancel the stable merge if
>         * bic->stable_merge_bfqq == bfqq.
>         */
> -       bic->bfqq[is_sync] = bfqq;
> +       bic->bfqq[is_sync][actuator_idx] = bfqq;
> 
>        if (bfqq && bic->stable_merge_bfqq == bfqq) {
>                /*
> @@ -672,9 +677,9 @@ static void bfq_limit_depth(blk_opf_t opf, struct blk_mq_alloc_data *data)  {
>        struct bfq_data *bfqd = data->q->elevator->elevator_data;
>        struct bfq_io_cq *bic = bfq_bic_lookup(data->q);
> -       struct bfq_queue *bfqq = bic ? bic_to_bfqq(bic, op_is_sync(opf)) : NULL;
>        int depth;
>        unsigned limit = data->q->nr_requests;
> +       unsigned int act_idx;
> 
>        /* Sync reads have full depth available */
>        if (op_is_sync(opf) && !op_is_write(opf)) { @@ -684,14 +689,21 @@ static void bfq_limit_depth(blk_opf_t opf, struct blk_mq_alloc_data *data)
>                limit = (limit * depth) >> bfqd->full_depth_shift;
>        }
> 
> -       /*
> -        * 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 = 1;
> +       for (act_idx = 0; act_idx < bfqd->num_actuators; act_idx++) {
> +               struct bfq_queue *bfqq =
> +                       bic ? bic_to_bfqq(bic, op_is_sync(opf), act_idx) 
> + : NULL;
> 
> +               /*
> +                * 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 = 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)
> @@ -2142,7 +2154,7 @@ static void bfq_check_waker(struct bfq_data *bfqd, struct 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.
> +        * we do not uselessly idle blocking waker in more than 1/64 cases.
>         */
>        if (bfqd->last_completed_rq_bfqq !=
>            bfqq->tentative_waker_bfqq || @@ -2454,6 +2466,16 @@ static void bfq_remove_request(struct request_queue *q,
> 
> }
> 
> +/* 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.
> +        */
> +       return 0;
> +}
> +
> static bool bfq_bio_merge(struct request_queue *q, struct bio *bio,
>                unsigned int nr_segs)
> {
> @@ -2478,7 +2500,8 @@ static bool bfq_bio_merge(struct request_queue *q, struct bio *bio,
>                 */
>                bfq_bic_update_cgroup(bic, bio);
> 
> -               bfqd->bio_bfqq = bic_to_bfqq(bic, op_is_sync(bio->bi_opf));
> +               bfqd->bio_bfqq = bic_to_bfqq(bic, op_is_sync(bio->bi_opf),
> +                                            bfq_actuator_index(bfqd, 
> + bio));
>        } else {
>                bfqd->bio_bfqq = NULL;
>        }
> @@ -3174,7 +3197,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 +4831,12 @@ static struct bfq_queue *bfq_select_queue(struct bfq_data *bfqd)
>         */
>        if (bfq_bfqq_wait_request(bfqq) ||
>            (bfqq->dispatched != 0 && bfq_better_to_idle(bfqq))) {
> +               unsigned int act_idx = bfqq->actuator_idx;
>                struct bfq_queue *async_bfqq =
> -                       bfqq->bic && bfqq->bic->bfqq[0] &&
> -                       bfq_bfqq_busy(bfqq->bic->bfqq[0]) &&
> -                       bfqq->bic->bfqq[0]->next_rq ?
> -                       bfqq->bic->bfqq[0] : NULL;
> +                       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 ?
> +                       bfqq->bic->bfqq[0][act_idx] : NULL;
>                struct bfq_queue *blocked_bfqq =
>                        !hlist_empty(&bfqq->woken_list) ?
>                        container_of(bfqq->woken_list.first,
> @@ -4904,7 +4928,7 @@ static struct bfq_queue *bfq_select_queue(struct bfq_data *bfqd)
>                    icq_to_bic(async_bfqq->next_rq->elv.icq) == bfqq->bic &&
>                    bfq_serv_to_charge(async_bfqq->next_rq, async_bfqq) <=
>                    bfq_bfqq_budget_left(async_bfqq))
> -                       bfqq = bfqq->bic->bfqq[0];
> +                       bfqq = bfqq->bic->bfqq[0][act_idx];
>                else if (bfqq->waker_bfqq &&
>                           bfq_bfqq_busy(bfqq->waker_bfqq) &&
>                           bfqq->waker_bfqq->next_rq && @@ -5365,49 +5389,47 @@ static void bfq_exit_bfqq(struct bfq_data *bfqd, struct bfq_queue *bfqq)
>        bfq_release_process_ref(bfqd, bfqq);  }
> 
> -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 = bic_to_bfqq(bic, is_sync);
> +       struct bfq_queue *bfqq = bic_to_bfqq(bic, is_sync, 
> + actuator_idx);
>        struct bfq_data *bfqd;
> 
>        if (bfqq)
>                bfqd = bfqq->bfqd; /* NULL if scheduler already exited */
> 
>        if (bfqq && bfqd) {
> -               unsigned long flags;
> -
> -               spin_lock_irqsave(&bfqd->lock, flags);
>                bfqq->bic = 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);
>        }
> }
> 
> static void bfq_exit_icq(struct io_cq *icq)  {
>        struct bfq_io_cq *bic = icq_to_bic(icq);
> +       struct bfq_data *bfqd = bic_to_bfqd(bic);
> +       unsigned long flags;
> +       unsigned int act_idx;
> 
> -       if (bic->stable_merge_bfqq) {
> -               struct bfq_data *bfqd = bic->stable_merge_bfqq->bfqd;
> -
> -               /*
> -                * bfqd is NULL if scheduler already exited, and in
> -                * that case this is the last time bfqq is accessed.
> -                */
> -               if (bfqd) {
> -                       unsigned long flags;
> +       /*
> +        * 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);
> 
> -                       spin_lock_irqsave(&bfqd->lock, flags);
> -                       bfq_put_stable_ref(bic->stable_merge_bfqq);
> -                       spin_unlock_irqrestore(&bfqd->lock, flags);
> -               } else {
> +       for (act_idx = 0; act_idx < bfqd->num_actuators; act_idx++) {
> +               if (bic->stable_merge_bfqq)
>                        bfq_put_stable_ref(bic->stable_merge_bfqq);
> -               }
> +
> +               bfq_exit_icq_bfqq(bic, true, act_idx);
> +               bfq_exit_icq_bfqq(bic, false, act_idx);
>        }
> 
> -       bfq_exit_icq_bfqq(bic, true);
> -       bfq_exit_icq_bfqq(bic, false);
> +       if (bfqd)
> +               spin_unlock_irqrestore(&bfqd->lock, flags);
> }
> 
> /*
> @@ -5484,23 +5506,25 @@ static void bfq_check_ioprio_change(struct bfq_io_cq *bic, struct bio *bio)
> 
>        bic->ioprio = ioprio;
> 
> -       bfqq = bic_to_bfqq(bic, false);
> +       bfqq = bic_to_bfqq(bic, false, bfq_actuator_index(bfqd, bio));
>        if (bfqq) {
>                bfq_release_process_ref(bfqd, bfqq);
>                bfqq = 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));
>        }
> 
> -       bfqq = bic_to_bfqq(bic, true);
> +       bfqq = bic_to_bfqq(bic, true, bfq_actuator_index(bfqd, bio));
>        if (bfqq)
>                bfq_set_next_ioprio_data(bfqq, bic);  }
> 
> 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 = ktime_get_ns();
> 
> +       bfqq->actuator_idx = act_idx;
>        RB_CLEAR_NODE(&bfqq->entity.rb_node);
>        INIT_LIST_HEAD(&bfqq->fifo);
>        INIT_HLIST_NODE(&bfqq->burst_list_node);
> @@ -5739,6 +5763,7 @@ static struct bfq_queue *bfq_get_queue(struct bfq_data *bfqd,
>        struct bfq_group *bfqg;
> 
>        bfqg = bfq_bio_bfqg(bfqd, bio);
> +
>        if (!is_sync) {
>                async_bfqq = bfq_async_queue_prio(bfqd, bfqg, ioprio_class,
>                                                  ioprio); @@ -5753,7 +5778,7 @@ static struct bfq_queue *bfq_get_queue(struct bfq_data *bfqd,
> 
>        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 +6093,8 @@ static bool __bfq_insert_request(struct bfq_data *bfqd, struct request *rq)
>                 * then complete the merge and redirect it to
>                 * new_bfqq.
>                 */
> -               if (bic_to_bfqq(RQ_BIC(rq), 1) == bfqq)
> +               if (bic_to_bfqq(RQ_BIC(rq), 1,
> +                               bfq_actuator_index(bfqd, rq->bio)) == 
> + bfqq)
>                        bfq_merge_bfqqs(bfqd, RQ_BIC(rq),
>                                        bfqq, new_bfqq);
> 
> @@ -6622,7 +6648,7 @@ bfq_split_bfqq(struct bfq_io_cq *bic, struct bfq_queue *bfqq)
>                return bfqq;
>        }
> 
> -       bic_set_bfqq(bic, NULL, 1);
> +       bic_set_bfqq(bic, NULL, 1, bfqq->actuator_idx);
> 
>        bfq_put_cooperator(bfqq);
> 
> @@ -6636,7 +6662,8 @@ static struct bfq_queue *bfq_get_bfqq_handle_split(struct bfq_data *bfqd,
>                                                   bool split, bool is_sync,
>                                                   bool *new_queue)  {
> -       struct bfq_queue *bfqq = bic_to_bfqq(bic, is_sync);
> +       unsigned int act_idx = bfq_actuator_index(bfqd, bio);
> +       struct bfq_queue *bfqq = bic_to_bfqq(bic, is_sync, act_idx);
> 
>        if (likely(bfqq && bfqq != &bfqd->oom_bfqq))
>                return bfqq;
> @@ -6648,7 +6675,7 @@ static struct bfq_queue *bfq_get_bfqq_handle_split(struct bfq_data *bfqd,
>                bfq_put_queue(bfqq);
>        bfqq = bfq_get_queue(bfqd, bio, is_sync, bic, split);
> 
> -       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 +7117,10 @@ static int bfq_init_queue(struct request_queue *q, struct 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 = BFQ_DEFAULT_QUEUE_IOPRIO;
>        bfqd->oom_bfqq.new_ioprio_class = IOPRIO_CLASS_BE; @@ -7110,6 +7139,12 @@ static int bfq_init_queue(struct request_queue *q, struct elevator_type *e)
> 
>        bfqd->queue = q;
> 
> +       /*
> +        * Multi-actuator support not complete yet, default to single
> +        * actuator for the moment.
> +        */
> +       bfqd->num_actuators = 1;
> +
>        INIT_LIST_HEAD(&bfqd->dispatch);
> 
>        hrtimer_init(&bfqd->idle_slice_timer, CLOCK_MONOTONIC, diff --git a/block/bfq-iosched.h b/block/bfq-iosched.h index 64ee618064ba..d98e31be447f 100644
> --- a/block/bfq-iosched.h
> +++ b/block/bfq-iosched.h
> @@ -33,6 +33,14 @@
>  */
> #define BFQ_SOFTRT_WEIGHT_FACTOR       100
> 
> +/*
> + * 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 32
> +
> struct bfq_entity;
> 
> /**
> @@ -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 */
> @@ -399,6 +409,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;
> };
> 
> /**
> @@ -407,8 +420,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==0 or i==1, 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
> @@ -772,6 +794,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;
> +
> };
> 
> enum bfqq_state_flags {
> @@ -968,8 +997,10 @@ struct bfq_group {
> 
> extern const int bfq_timeout;
> 
> -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_sync);
> +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_sync,
> +                               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,
> --
> 2.20.1

Patch

diff --git a/block/bfq-cgroup.c b/block/bfq-cgroup.c
index 144bca006463..d243c429d9c0 100644
--- a/block/bfq-cgroup.c
+++ b/block/bfq-cgroup.c
@@ -700,6 +700,48 @@  void bfq_bfqq_move(struct bfq_data *bfqd, struct bfq_queue *bfqq,
 	bfq_put_queue(bfqq);
 }
 
+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)
+{
+	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 != &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 = sync_bfqq; bfqq; bfqq = bfqq->new_bfqq)
+			if (bfqq->entity.sched_data !=
+			    &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.
@@ -714,53 +756,24 @@  static void *__bfq_bic_change_cgroup(struct bfq_data *bfqd,
 				     struct bfq_io_cq *bic,
 				     struct bfq_group *bfqg)
 {
-	struct bfq_queue *async_bfqq = bic_to_bfqq(bic, 0);
-	struct bfq_queue *sync_bfqq = bic_to_bfqq(bic, 1);
 	struct bfq_entity *entity;
+	unsigned int act_idx;
 
-	if (async_bfqq) {
-		entity = &async_bfqq->entity;
-
-		if (entity->sched_data != &bfqg->sched_data) {
-			bic_set_bfqq(bic, NULL, 0);
-			bfq_release_process_ref(bfqd, async_bfqq);
-		}
-	}
+	for (act_idx = 0; act_idx < bfqd->num_actuators; act_idx++) {
+		struct bfq_queue *async_bfqq = bic_to_bfqq(bic, 0, act_idx);
+		struct bfq_queue *sync_bfqq = bic_to_bfqq(bic, 1, act_idx);
 
-	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 != &bfqg->sched_data)
-				bfq_bfqq_move(bfqd, sync_bfqq, bfqg);
-		} else {
-			struct bfq_queue *bfqq;
+		if (async_bfqq) {
+			entity = &async_bfqq->entity;
 
-			/*
-			 * The queue was merged to a different queue. Check
-			 * that the merge chain still belongs to the same
-			 * cgroup.
-			 */
-			for (bfqq = sync_bfqq; bfqq; bfqq = bfqq->new_bfqq)
-				if (bfqq->entity.sched_data !=
-				    &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 (entity->sched_data != &bfqg->sched_data) {
+				bic_set_bfqq(bic, NULL, 0, act_idx);
+				bfq_release_process_ref(bfqd, async_bfqq);
 			}
 		}
+
+		if (sync_bfqq)
+			bfq_sync_bfqq_move(bfqd, sync_bfqq, bic, bfqg, act_idx);
 	}
 
 	return bfqg;
diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c
index 7ea427817f7f..99c01e184f1d 100644
--- a/block/bfq-iosched.c
+++ b/block/bfq-iosched.c
@@ -377,14 +377,19 @@  static const unsigned long bfq_late_stable_merging = 600;
 #define RQ_BIC(rq)		((struct bfq_io_cq *)((rq)->elv.priv[0]))
 #define RQ_BFQQ(rq)		((rq)->elv.priv[1])
 
-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];
+	return bic->bfqq[is_sync][actuator_idx];
 }
 
 static void bfq_put_stable_ref(struct bfq_queue *bfqq);
 
-void bic_set_bfqq(struct bfq_io_cq *bic, struct bfq_queue *bfqq, bool is_sync)
+void bic_set_bfqq(struct bfq_io_cq *bic,
+		  struct bfq_queue *bfqq,
+		  bool is_sync,
+		  unsigned int actuator_idx)
 {
 	/*
 	 * If bfqq != NULL, then a non-stable queue merge between
@@ -399,7 +404,7 @@  void bic_set_bfqq(struct bfq_io_cq *bic, struct bfq_queue *bfqq, bool is_sync)
 	 * we cancel the stable merge if
 	 * bic->stable_merge_bfqq == bfqq.
 	 */
-	bic->bfqq[is_sync] = bfqq;
+	bic->bfqq[is_sync][actuator_idx] = bfqq;
 
 	if (bfqq && bic->stable_merge_bfqq == bfqq) {
 		/*
@@ -672,9 +677,9 @@  static void bfq_limit_depth(blk_opf_t opf, struct blk_mq_alloc_data *data)
 {
 	struct bfq_data *bfqd = data->q->elevator->elevator_data;
 	struct bfq_io_cq *bic = bfq_bic_lookup(data->q);
-	struct bfq_queue *bfqq = bic ? bic_to_bfqq(bic, op_is_sync(opf)) : NULL;
 	int depth;
 	unsigned limit = data->q->nr_requests;
+	unsigned int act_idx;
 
 	/* Sync reads have full depth available */
 	if (op_is_sync(opf) && !op_is_write(opf)) {
@@ -684,14 +689,21 @@  static void bfq_limit_depth(blk_opf_t opf, struct blk_mq_alloc_data *data)
 		limit = (limit * depth) >> bfqd->full_depth_shift;
 	}
 
-	/*
-	 * 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 = 1;
+	for (act_idx = 0; act_idx < bfqd->num_actuators; act_idx++) {
+		struct bfq_queue *bfqq =
+			bic ? bic_to_bfqq(bic, op_is_sync(opf), act_idx) : NULL;
 
+		/*
+		 * 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 = 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)
@@ -2142,7 +2154,7 @@  static void bfq_check_waker(struct bfq_data *bfqd, struct 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. 
+	 * we do not uselessly idle blocking waker in more than 1/64 cases.
 	 */
 	if (bfqd->last_completed_rq_bfqq !=
 	    bfqq->tentative_waker_bfqq ||
@@ -2454,6 +2466,16 @@  static void bfq_remove_request(struct request_queue *q,
 
 }
 
+/* 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.
+	 */
+	return 0;
+}
+
 static bool bfq_bio_merge(struct request_queue *q, struct bio *bio,
 		unsigned int nr_segs)
 {
@@ -2478,7 +2500,8 @@  static bool bfq_bio_merge(struct request_queue *q, struct bio *bio,
 		 */
 		bfq_bic_update_cgroup(bic, bio);
 
-		bfqd->bio_bfqq = bic_to_bfqq(bic, op_is_sync(bio->bi_opf));
+		bfqd->bio_bfqq = bic_to_bfqq(bic, op_is_sync(bio->bi_opf),
+					     bfq_actuator_index(bfqd, bio));
 	} else {
 		bfqd->bio_bfqq = NULL;
 	}
@@ -3174,7 +3197,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 +4831,12 @@  static struct bfq_queue *bfq_select_queue(struct bfq_data *bfqd)
 	 */
 	if (bfq_bfqq_wait_request(bfqq) ||
 	    (bfqq->dispatched != 0 && bfq_better_to_idle(bfqq))) {
+		unsigned int act_idx = bfqq->actuator_idx;
 		struct bfq_queue *async_bfqq =
-			bfqq->bic && bfqq->bic->bfqq[0] &&
-			bfq_bfqq_busy(bfqq->bic->bfqq[0]) &&
-			bfqq->bic->bfqq[0]->next_rq ?
-			bfqq->bic->bfqq[0] : NULL;
+			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 ?
+			bfqq->bic->bfqq[0][act_idx] : NULL;
 		struct bfq_queue *blocked_bfqq =
 			!hlist_empty(&bfqq->woken_list) ?
 			container_of(bfqq->woken_list.first,
@@ -4904,7 +4928,7 @@  static struct bfq_queue *bfq_select_queue(struct bfq_data *bfqd)
 		    icq_to_bic(async_bfqq->next_rq->elv.icq) == bfqq->bic &&
 		    bfq_serv_to_charge(async_bfqq->next_rq, async_bfqq) <=
 		    bfq_bfqq_budget_left(async_bfqq))
-			bfqq = bfqq->bic->bfqq[0];
+			bfqq = bfqq->bic->bfqq[0][act_idx];
 		else if (bfqq->waker_bfqq &&
 			   bfq_bfqq_busy(bfqq->waker_bfqq) &&
 			   bfqq->waker_bfqq->next_rq &&
@@ -5365,49 +5389,47 @@  static void bfq_exit_bfqq(struct bfq_data *bfqd, struct bfq_queue *bfqq)
 	bfq_release_process_ref(bfqd, bfqq);
 }
 
-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 = bic_to_bfqq(bic, is_sync);
+	struct bfq_queue *bfqq = bic_to_bfqq(bic, is_sync, actuator_idx);
 	struct bfq_data *bfqd;
 
 	if (bfqq)
 		bfqd = bfqq->bfqd; /* NULL if scheduler already exited */
 
 	if (bfqq && bfqd) {
-		unsigned long flags;
-
-		spin_lock_irqsave(&bfqd->lock, flags);
 		bfqq->bic = 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);
 	}
 }
 
 static void bfq_exit_icq(struct io_cq *icq)
 {
 	struct bfq_io_cq *bic = icq_to_bic(icq);
+	struct bfq_data *bfqd = bic_to_bfqd(bic);
+	unsigned long flags;
+	unsigned int act_idx;
 
-	if (bic->stable_merge_bfqq) {
-		struct bfq_data *bfqd = bic->stable_merge_bfqq->bfqd;
-
-		/*
-		 * bfqd is NULL if scheduler already exited, and in
-		 * that case this is the last time bfqq is accessed.
-		 */
-		if (bfqd) {
-			unsigned long flags;
+	/*
+	 * 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);
 
-			spin_lock_irqsave(&bfqd->lock, flags);
-			bfq_put_stable_ref(bic->stable_merge_bfqq);
-			spin_unlock_irqrestore(&bfqd->lock, flags);
-		} else {
+	for (act_idx = 0; act_idx < bfqd->num_actuators; act_idx++) {
+		if (bic->stable_merge_bfqq)
 			bfq_put_stable_ref(bic->stable_merge_bfqq);
-		}
+
+		bfq_exit_icq_bfqq(bic, true, act_idx);
+		bfq_exit_icq_bfqq(bic, false, act_idx);
 	}
 
-	bfq_exit_icq_bfqq(bic, true);
-	bfq_exit_icq_bfqq(bic, false);
+	if (bfqd)
+		spin_unlock_irqrestore(&bfqd->lock, flags);
 }
 
 /*
@@ -5484,23 +5506,25 @@  static void bfq_check_ioprio_change(struct bfq_io_cq *bic, struct bio *bio)
 
 	bic->ioprio = ioprio;
 
-	bfqq = bic_to_bfqq(bic, false);
+	bfqq = bic_to_bfqq(bic, false, bfq_actuator_index(bfqd, bio));
 	if (bfqq) {
 		bfq_release_process_ref(bfqd, bfqq);
 		bfqq = 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));
 	}
 
-	bfqq = bic_to_bfqq(bic, true);
+	bfqq = bic_to_bfqq(bic, true, bfq_actuator_index(bfqd, bio));
 	if (bfqq)
 		bfq_set_next_ioprio_data(bfqq, bic);
 }
 
 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 = ktime_get_ns();
 
+	bfqq->actuator_idx = act_idx;
 	RB_CLEAR_NODE(&bfqq->entity.rb_node);
 	INIT_LIST_HEAD(&bfqq->fifo);
 	INIT_HLIST_NODE(&bfqq->burst_list_node);
@@ -5739,6 +5763,7 @@  static struct bfq_queue *bfq_get_queue(struct bfq_data *bfqd,
 	struct bfq_group *bfqg;
 
 	bfqg = bfq_bio_bfqg(bfqd, bio);
+
 	if (!is_sync) {
 		async_bfqq = bfq_async_queue_prio(bfqd, bfqg, ioprio_class,
 						  ioprio);
@@ -5753,7 +5778,7 @@  static struct bfq_queue *bfq_get_queue(struct bfq_data *bfqd,
 
 	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 +6093,8 @@  static bool __bfq_insert_request(struct bfq_data *bfqd, struct request *rq)
 		 * then complete the merge and redirect it to
 		 * new_bfqq.
 		 */
-		if (bic_to_bfqq(RQ_BIC(rq), 1) == bfqq)
+		if (bic_to_bfqq(RQ_BIC(rq), 1,
+				bfq_actuator_index(bfqd, rq->bio)) == bfqq)
 			bfq_merge_bfqqs(bfqd, RQ_BIC(rq),
 					bfqq, new_bfqq);
 
@@ -6622,7 +6648,7 @@  bfq_split_bfqq(struct bfq_io_cq *bic, struct bfq_queue *bfqq)
 		return bfqq;
 	}
 
-	bic_set_bfqq(bic, NULL, 1);
+	bic_set_bfqq(bic, NULL, 1, bfqq->actuator_idx);
 
 	bfq_put_cooperator(bfqq);
 
@@ -6636,7 +6662,8 @@  static struct bfq_queue *bfq_get_bfqq_handle_split(struct bfq_data *bfqd,
 						   bool split, bool is_sync,
 						   bool *new_queue)
 {
-	struct bfq_queue *bfqq = bic_to_bfqq(bic, is_sync);
+	unsigned int act_idx = bfq_actuator_index(bfqd, bio);
+	struct bfq_queue *bfqq = bic_to_bfqq(bic, is_sync, act_idx);
 
 	if (likely(bfqq && bfqq != &bfqd->oom_bfqq))
 		return bfqq;
@@ -6648,7 +6675,7 @@  static struct bfq_queue *bfq_get_bfqq_handle_split(struct bfq_data *bfqd,
 		bfq_put_queue(bfqq);
 	bfqq = bfq_get_queue(bfqd, bio, is_sync, bic, split);
 
-	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 +7117,10 @@  static int bfq_init_queue(struct request_queue *q, struct 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 = BFQ_DEFAULT_QUEUE_IOPRIO;
 	bfqd->oom_bfqq.new_ioprio_class = IOPRIO_CLASS_BE;
@@ -7110,6 +7139,12 @@  static int bfq_init_queue(struct request_queue *q, struct elevator_type *e)
 
 	bfqd->queue = q;
 
+	/*
+	 * Multi-actuator support not complete yet, default to single
+	 * actuator for the moment.
+	 */
+	bfqd->num_actuators = 1;
+
 	INIT_LIST_HEAD(&bfqd->dispatch);
 
 	hrtimer_init(&bfqd->idle_slice_timer, CLOCK_MONOTONIC,
diff --git a/block/bfq-iosched.h b/block/bfq-iosched.h
index 64ee618064ba..d98e31be447f 100644
--- a/block/bfq-iosched.h
+++ b/block/bfq-iosched.h
@@ -33,6 +33,14 @@ 
  */
 #define BFQ_SOFTRT_WEIGHT_FACTOR	100
 
+/*
+ * 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 32
+
 struct bfq_entity;
 
 /**
@@ -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 */
@@ -399,6 +409,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;
 };
 
 /**
@@ -407,8 +420,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==0 or i==1, 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
@@ -772,6 +794,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;
+
 };
 
 enum bfqq_state_flags {
@@ -968,8 +997,10 @@  struct bfq_group {
 
 extern const int bfq_timeout;
 
-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_sync);
+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_sync,
+				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,