Skip to contentSkip to conversation

io_uring/rsrc: fix build without DMA_SHARED_BUFFER

PATCH Applied Sasha Levin 3 participants 3 messages Oct 13 io_uring

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 io_uring/rsrc: fix build without DMA_SHARED_BUFFER

io_register_dmabuf_desc() calls io_register_dmabuf() unconditionally, but io_uring/dma-buf.o is only built with CONFIG_DMA_SHARED_BUFFER enabled. This causes an undefined reference to io_register_dmabuf() when linking kernels with CONFIG_IO_URING=y and CONFIG_DMA_SHARED_BUFFER=n, as reported by KernelCI for i386 allnoconfig and ARC haps_hs_smp_defconfig builds.

Move the configuration check from io_register_dmabuf() to io_register_dmabuf_desc(), before allocating the resource node and mapped buffer. This lets the compiler eliminate the call when DMA-BUF support is disabled and rejects DMA-BUF registration with -EOPNOTSUPP. The check in io_register_dmabuf() cannot handle this configuration because its object file is not built.

---
 io_uring/dma-buf.c | 2 --
 io_uring/rsrc.c    | 3 +++
 2 files changed, 3 insertions(+), 2 deletions(-)
io_uring/dma-buf.c +0 -2
index f40c9d87ed8aa..04dd41bf53be0 100644
@@ -18,8 +18,6 @@ int io_register_dmabuf(struct io_ring_ctx *ctx,
 	struct dma_buf *dmabuf = NULL;
 	int ret;
 
-	if (!IS_ENABLED(CONFIG_DMA_SHARED_BUFFER))
-		return -EOPNOTSUPP;
 	if (ctx->flags & IORING_SETUP_IOPOLL)
 		return -EOPNOTSUPP;
 	if (desc->uaddr || desc->size)
io_uring/rsrc.c +3 -0
index d6f7cbf731eb2..00f5ed6051e0b 100644
@@ -907,6 +907,9 @@ static struct io_rsrc_node *io_register_dmabuf_desc(struct io_ring_ctx *ctx,
 	struct io_mapped_ubuf *imu = NULL;
 	int ret;
 
+	if (!IS_ENABLED(CONFIG_DMA_SHARED_BUFFER))
+		return ERR_PTR(-EOPNOTSUPP);
+
 	node = io_rsrc_node_alloc(ctx, IORING_RSRC_BUFFER);
 	if (!node)
 		return ERR_PTR(-ENOMEM);
Tested-by on v1 1/1
#1 lore raw

Hi Sasha,

Quoted 13 lines

io_register_dmabuf_desc() calls io_register_dmabuf() unconditionally, but io_uring/dma-buf.o is only built with CONFIG_DMA_SHARED_BUFFER enabled. This causes an undefined reference to io_register_dmabuf() when linking kernels with CONFIG_IO_URING=y and CONFIG_DMA_SHARED_BUFFER=n, as reported by KernelCI for i386 allnoconfig and ARC haps_hs_smp_defconfig builds.

Move the configuration check from io_register_dmabuf() to io_register_dmabuf_desc(), before allocating the resource node and mapped buffer. This lets the compiler eliminate the call when DMA-BUF support is disabled and rejects DMA-BUF registration with -EOPNOTSUPP. The check in io_register_dmabuf() cannot handle this configuration because its object file is not built.

Quoted 5 lines

Thanks, this fixes the build on a variety of my test systems

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

maintainer Applied
#2 lore raw
In reply to Sasha Levin
Quoted 6 lines · Sasha Levin

io_register_dmabuf_desc() calls io_register_dmabuf() unconditionally, but io_uring/dma-buf.o is only built with CONFIG_DMA_SHARED_BUFFER enabled. This causes an undefined reference to io_register_dmabuf() when linking kernels with CONFIG_IO_URING=y and CONFIG_DMA_SHARED_BUFFER=n, as reported by KernelCI for i386 allnoconfig and ARC haps_hs_smp_defconfig builds.

Quoted 8 lines

Move the configuration check from io_register_dmabuf() to io_register_dmabuf_desc(), before allocating the resource node and mapped buffer. This lets the compiler eliminate the call when DMA-BUF support is disabled and rejects DMA-BUF registration with -EOPNOTSUPP. The check in io_register_dmabuf() cannot handle this configuration because its object file is not built.

[...]

Applied, thanks!

[1/1] io_uring/rsrc: fix build without DMA_SHARED_BUFFER

      commit: 1127f017f33d9e9dbbadd1c230a0640f9a326055

Best regards,

Signature · 1 line
Jens Axboe