Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <fb84f054-517c-77d4-eb11-d3df61f53701@kernel.dk>
Date:   Mon, 8 May 2023 12:41:58 -0600
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux aarch64; rv:102.0) Gecko/20100101
 Thunderbird/102.10.0
Subject: Re: [GIT PULL] Final io_uring updates for 6.4-rc1
Content-Language: en-US
To:     Chen-Yu Tsai <wenst@chromium.org>,
        Linus Torvalds <torvalds@linux-foundation.org>
Cc:     io-uring <io-uring@vger.kernel.org>, linux-kernel@vger.kernel.org
References: <9b2e791d-aeba-a2c7-1877-797ff5c680a3@kernel.dk>
 <20230508031852.GA4029098@google.com>
From:   Jens Axboe <axboe@kernel.dk>
In-Reply-To: <20230508031852.GA4029098@google.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Precedence: bulk

On 5/7/23 9:18?PM, Chen-Yu Tsai wrote:
> Hi,
> 
> On Sun, May 07, 2023 at 06:00:48AM -0600, Jens Axboe wrote:
>> Hi Linus,
>>
>> Nothing major in here, just two different parts:
>>
>> - Small series from Breno that enables passing the full SQE down
>>   for ->uring_cmd(). This is a prerequisite for enabling full network
>>   socket operations. Queued up a bit late because of some stylistic
>>   concerns that got resolved, would be nice to have this in 6.4-rc1
>>   so the dependent work will be easier to handle for 6.5.
>>
>> - Fix for the huge page coalescing, which was a regression introduced
>>   in the 6.3 kernel release (Tobias).
>>
>> Note that this will throw a merge conflict in the ublk_drv code, due
>> to this branch still being based off the original for-6.4/io_uring
>> branch. Resolution is pretty straight forward, I'm including it below
>> for reference.
>>
>> Please pull!
>>
>>
>> The following changes since commit 3c85cc43c8e7855d202da184baf00c7b8eeacf71:
>>
>>   Revert "io_uring/rsrc: disallow multi-source reg buffers" (2023-04-20 06:51:48 -0600)
>>
>> are available in the Git repository at:
>>
>>   git://git.kernel.dk/linux.git tags/for-6.4/io_uring-2023-05-07
>>
>> for you to fetch changes up to d2b7fa6174bc4260e496cbf84375c73636914641:
>>
>>   io_uring: Remove unnecessary BUILD_BUG_ON (2023-05-04 08:19:05 -0600)
>>
>> ----------------------------------------------------------------
>> for-6.4/io_uring-2023-05-07
>>
>> ----------------------------------------------------------------
>> Breno Leitao (3):
>>       io_uring: Create a helper to return the SQE size
>>       io_uring: Pass whole sqe to commands
> 
> This commit causes broken builds when IO_URING=n and NVME_CORE=y, as
> io_uring_sqe_cmd(), called in drivers/nvme/host/ioctl.c, ends up being
> undefined. This was also reported [1] by 0-day bot on your branch
> yesterday, but it's worse now that Linus merged the pull request.
> 
> Not sure what the better fix would be. Move io_uring_sqe_cmd() outside
> of the "#if defined(CONFIG_IO_URING)" block?

Queued up a patch for this:

https://git.kernel.dk/cgit/linux/commit/?h=io_uring-6.4&id=5d371b2f2b0d1a047582563ee36af8ffb5022847

-- 
Jens Axboe