io_uring: cap SQ submit size for SQPOLL with multiple rings

In the spirit of fairness, cap the max number of SQ entries we'll submit
for SQPOLL if we have multiple rings. If we don't do that, we could be
submitting tons of entries for one ring, while others are waiting to get
service.

The value of 8 is somewhat arbitrarily chosen as something that allows
a fair bit of batching, without using an excessive time per ring.

Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/fs/io_uring.c b/fs/io_uring.c
index 268d8c5261167d42af073b3aa5a969a3aa8eddae..61a65a2b0a247360badaa7579e07f75959990431 100644 (file)
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -6690,7 +6690,7 @@ enum sq_ret {
 };
 
 static enum sq_ret __io_sq_thread(struct io_ring_ctx *ctx,
-                                 unsigned long start_jiffies)
+                                 unsigned long start_jiffies, bool cap_entries)
 {
        unsigned long timeout = start_jiffies + ctx->sq_thread_idle;
        struct io_sq_data *sqd = ctx->sq_data;
@@ -6758,6 +6758,10 @@ again:
        finish_wait(&sqd->wait, &ctx->sqo_wait_entry);
        io_ring_clear_wakeup_flag(ctx);
 
+       /* if we're handling multiple rings, cap submit size for fairness */
+       if (cap_entries && to_submit > 8)
+               to_submit = 8;
+
        mutex_lock(&ctx->uring_lock);
        if (likely(!percpu_ref_is_dying(&ctx->refs)))
                ret = io_submit_sqes(ctx, to_submit);
@@ -6792,6 +6796,7 @@ static int io_sq_thread(void *data)
        start_jiffies = jiffies;
        while (!kthread_should_stop()) {
                enum sq_ret ret = 0;
+               bool cap_entries;
 
                /*
                 * Any changes to the sqd lists are synchronized through the
@@ -6804,6 +6809,8 @@ static int io_sq_thread(void *data)
                if (unlikely(!list_empty(&sqd->ctx_new_list)))
                        io_sqd_init_new(sqd);
 
+               cap_entries = !list_is_singular(&sqd->ctx_list);
+
                list_for_each_entry(ctx, &sqd->ctx_list, sqd_list) {
                        if (current->cred != ctx->creds) {
                                if (old_cred)
@@ -6811,7 +6818,7 @@ static int io_sq_thread(void *data)
                                old_cred = override_creds(ctx->creds);
                        }
 
-                       ret |= __io_sq_thread(ctx, start_jiffies);
+                       ret |= __io_sq_thread(ctx, start_jiffies, cap_entries);
 
                        io_sq_thread_drop_mm();
                }