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
