Re: SQPOLL question

[Josef <josef.grieb@gmail.com>]

> Are you using for-5.10 and SQEPOLL + ASYNC accept? I'll give that a
> test spin.

yes exactly

> This should do it for your testing, need to confirm this is absolutely
> safe. But it'll make it work for the 5.10/io_uring setup of allowing
> file open/closes.
>
> diff --git a/fs/io_uring.c b/fs/io_uring.c
> index 80913973337a..e21a7a9c6a59 100644
> --- a/fs/io_uring.c
> +++ b/fs/io_uring.c
> @@ -6757,7 +6757,7 @@ static enum sq_ret __io_sq_thread(struct io_ring_ctx *ctx,
>
>         mutex_lock(&ctx->uring_lock);
>         if (likely(!percpu_ref_is_dying(&ctx->refs)))
> -               ret = io_submit_sqes(ctx, to_submit, NULL, -1);
> +               ret = io_submit_sqes(ctx, to_submit, ctx->ring_file, ctx->ring_fd);
>         mutex_unlock(&ctx->uring_lock);
>
>         if (!io_sqring_full(ctx) && wq_has_sleeper(&ctx->sqo_sq_wait))
> @@ -8966,6 +8966,11 @@ static int io_uring_create(unsigned entries, struct io_uring_params *p,
>                 goto err;
>         }
>
> +       if (p->flags & IORING_SETUP_SQPOLL) {
> +               ctx->ring_fd = fd;
> +               ctx->ring_file = file;
> +       }
> +
>         ret = io_sq_offload_create(ctx, p);
>         if (ret)
>                 goto err;
>

sorry I couldn't apply this patch, my last commit is
https://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git/commit/?h=for-5.10/io_uring&id=9c2446cffaf55da88e7a9a7c0a5aeb02a9eba2c0
what's your last commit?

it's a small patch, so I'll try it manually :)

---
Josef