[for-next,0/4] some 6.2 cleanups

Message

Pavel Begunkov Dec. 2, 2022, 5:47 p.m. UTC

Random cleanups, mostly around locking and timeouts. Even though 1/4 is
makred for stable it shouldn't be too important.

Pavel Begunkov (4):
  io_uring: protect cq_timeouts with timeout_lock
  io_uring: revise completion_lock locking
  io_uring: ease timeout flush locking requirements
  io_uring: rename __io_fill_cqe_req

 io_uring/io_uring.c | 29 ++++++++++++++++++++---------
 io_uring/io_uring.h | 13 +------------
 io_uring/rw.c       |  2 +-
 io_uring/timeout.c  | 14 +++++++++-----
 4 files changed, 31 insertions(+), 27 deletions(-)

Comments

Jens Axboe Dec. 2, 2022, 8:03 p.m. UTC | #1

On Fri, 02 Dec 2022 17:47:21 +0000, Pavel Begunkov wrote:
> Random cleanups, mostly around locking and timeouts. Even though 1/4 is
> makred for stable it shouldn't be too important.
> 
> Pavel Begunkov (4):
>   io_uring: protect cq_timeouts with timeout_lock
>   io_uring: revise completion_lock locking
>   io_uring: ease timeout flush locking requirements
>   io_uring: rename __io_fill_cqe_req
> 
> [...]

Applied, thanks!

[1/4] io_uring: protect cq_timeouts with timeout_lock
      commit: f9df7554e30aa244a860a09ba8f68d9d25f5d1fb
[2/4] io_uring: revise completion_lock locking
      commit: f12da342ec9c81fd109dfbafa05f3b17ddd88b2a
[3/4] io_uring: ease timeout flush locking requirements
      commit: 4124d26a5930e5e259ea5452866749dc385b5144
[4/4] io_uring: rename __io_fill_cqe_req
      commit: 03d5549e3cb7b7f26147fd27f9627c1b4851807b

Best regards,

Jens Axboe Dec. 14, 2022, 4:06 p.m. UTC | #2

On 12/2/22 1:03?PM, Jens Axboe wrote:
> 
> On Fri, 02 Dec 2022 17:47:21 +0000, Pavel Begunkov wrote:
>> Random cleanups, mostly around locking and timeouts. Even though 1/4 is
>> makred for stable it shouldn't be too important.
>>
>> Pavel Begunkov (4):
>>   io_uring: protect cq_timeouts with timeout_lock
>>   io_uring: revise completion_lock locking
>>   io_uring: ease timeout flush locking requirements
>>   io_uring: rename __io_fill_cqe_req
>>
>> [...]
> 
> Applied, thanks!
> 
> [1/4] io_uring: protect cq_timeouts with timeout_lock
>       commit: f9df7554e30aa244a860a09ba8f68d9d25f5d1fb
> [2/4] io_uring: revise completion_lock locking
>       commit: f12da342ec9c81fd109dfbafa05f3b17ddd88b2a
> [3/4] io_uring: ease timeout flush locking requirements
>       commit: 4124d26a5930e5e259ea5452866749dc385b5144
> [4/4] io_uring: rename __io_fill_cqe_req
>       commit: 03d5549e3cb7b7f26147fd27f9627c1b4851807b

I apparently fat fingered applying these as part of moving things
around, and as a result, there were not in the tree for 6.2. I've
applied them again in io_uring-6.2 - please take a look, as I needed to
hand apply 1 and 4 because of the other locking changes.