UPSTREAM: io_uring: fix CQ waiting timeout handling

commit 12521a5d upstream.

Jiffy to ktime CQ waiting conversion broke how we treat timeouts, in
particular we rearm it anew every time we get into
io_cqring_wait_schedule() without adjusting the timeout. Waiting for 2
CQEs and getting a task_work in the middle may double the timeout value,
or even worse in some cases task may wait indefinitely.

Cc: stable@vger.kernel.org
Fixes: 22833966 ("io_uring: don't convert to jiffies for waiting on timeouts")
Change-Id: I1a2f159751c9cb5fcb8ae28f0349bcd0225fdcee
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/f7bffddd71b08f28a877d44d37ac953ddb01590d.1672915663.git.asml.silence@gmail.com


Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit c3222fd2)
Bug: 268174392
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>