Re: [GIT PULL] io_uring changes for 6.13-rc1

[Jens Axboe <axboe@kernel.dk>]

On 11/18/24 3:06 PM, Sasha Levin wrote:
> Hi Jens, Thomas,
> 
> On Mon, Nov 18, 2024 at 07:22:59AM -0700, Jens Axboe wrote:
>> hexue (1):
>>      io_uring: add support for hybrid IOPOLL
> 
> After merging of this pull request into linus-next, I've started seeing
> build errors:
> 
> /builds/linux/io_uring/rw.c: In function 'io_hybrid_iopoll_delay':
> /builds/linux/io_uring/rw.c:1179:2: error: implicit declaration of function 'hrtimer_init_sleeper_on_stack'; did you mean 'hrtimer_setup_sleeper_on_stack'? [-Werror=implicit-function-declaration]
>   hrtimer_init_sleeper_on_stack(&timer, CLOCK_MONOTONIC, mode);
>   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>   hrtimer_setup_sleeper_on_stack
> 
> This is because 01ee194d1aba ("io_uring: add support for hybrid IOPOLL")
> adds a call to hrtimer_init_sleeper_on_stack() which was removed earlier
> today in Thomas's PR[1], specifically in commit f3bef7aaa6c8
> ("hrtimers: Delete hrtimer_init_sleeper_on_stack()").

Right, forgot to mention that. linux-next has been carrying a fixup for
that which I was going to link, but it's not on a public list for some
reason. In any case, it's trivial to fixup, just change

hrtimer_init_sleeper_on_stack(&timer, CLOCK_MONOTONIC, mode);

to

hrtimer_setup_sleeper_on_stack(&timer, CLOCK_MONOTONIC, mode);

in io_uring/rw.c while merging either of the two trees that go in last.

FWIW, this kind of change should be done before -rc1 rather than be
queued up earlier. That's usually the best way to do these things and
avoid -next or merge window breakage. I'm guessing this tree isn't the
only one going to get hit by that.

-- 
Jens Axboe