Re: [GIT PULL] Networking for v6.9

From: Jens Axboe
Date: Tue Mar 12 2024 - 18:02:33 EST


On 3/12/24 3:55 PM, Jakub Kicinski wrote:
> On Tue, 12 Mar 2024 14:48:06 -0700 Jakub Kicinski wrote:
>>> index 9a85bfbbc45a..646b50e1c914 100644
>>> --- a/block/blk-iocost.c
>>> +++ b/block/blk-iocost.c
>>> @@ -1044,7 +1044,7 @@ static void ioc_now(struct ioc *ioc, struct ioc_now *now)
>>> unsigned seq;
>>> u64 vrate;
>>>
>>> - now->now_ns = blk_time_get_ns();
>>> + now->now_ns = ktime_get_ns();
>>> now->now = ktime_to_us(now->now_ns);
>>> vrate = atomic64_read(&ioc->vtime_rate);
>>
>> Let me try this, 'cause doing the revert while listening to some
>> meeting is beyond me :)
>
> That fixes the crash for me!

OK good, thanks for testing! Linus, can you just pick up the below? I
can prep a pull as well, but not ready to send the remaining merge
window fixes just yet.