Skip to contentSkip to conversation

rust: dma_fence: gate abstractions on CONFIG_DMA_SHARED_BUFFER

PATCH Applied Edwin Peer 3 participants 3 messages Sep 9 – Sep 10

Subsystems (2)
lore
Share & tools
lore

Edwin Peer

author
#0 lore raw

PATCH 1/1 rust: dma_fence: gate abstractions on CONFIG_DMA_SHARED_BUFFER

The dma_fence abstractions added by commit 3282d5916019 ("rust: Add dma_fence abstractions") are compiled unconditionally, but the C dma_fence_* symbols they reference live in drivers/dma-buf/dma-fence.c, which is only built when CONFIG_DMA_SHARED_BUFFER=y. Kernels with CONFIG_RUST=y and CONFIG_RUST_KERNEL_DOCTESTS=y but CONFIG_DMA_SHARED_BUFFER=n fail to link:

ld.lld: error: undefined symbol: dma_fence_release

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

referenced by usercopy_64.c
vmlinux.o:(rust_helper_dma_fence_put)

... dma_fence_signal{,_locked}, dma_fence_context_alloc,
dma_fence_init, dma_fence_{add,remove}_callback ...

Wrap the dma_fence.c helper include in the same
pub mod dma_buf; in rust/kernel/lib.rs with a matching #[cfg].

Fixes 3282d5916019 ("rust: Add dma_fence abstractions")
---
 rust/helpers/helpers.c | 2 +-
 rust/kernel/lib.rs     | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
rust/helpers/helpers.c +1 -1
index 609689fba3dd..2c5eecc091c4 100644
@@ -57,8 +57,8 @@
 #include "cred.c"
 #include "device.c"
 #include "dma.c"
-#include "dma_fence.c"
 #ifdef CONFIG_DMA_SHARED_BUFFER
+#include "dma_fence.c"
 #include "dma-resv.c"
 #endif
 #include "drm.c"
rust/kernel/lib.rs +1 -0
index 72f5527ba66c..f9ef36217bb5 100644
@@ -67,6 +67,7 @@
 pub mod device_id;
 pub mod devres;
 pub mod dma;
+#[cfg(CONFIG_DMA_SHARED_BUFFER)]
 pub mod dma_buf;
 pub mod driver;
 #[cfg(CONFIG_DRM = "y")]
Signature · 1 line
2.50.1 (Apple Git-155)
Reviewed-by on v1 1/1
#1 lore raw
Quoted 8 lines · Edwin Peer

The dma_fence abstractions added by commit 3282d5916019 ("rust: Add dma_fence abstractions") are compiled unconditionally, but the C dma_fence_* symbols they reference live in drivers/dma-buf/dma-fence.c, which is only built when CONFIG_DMA_SHARED_BUFFER=y. Kernels with CONFIG_RUST=y and CONFIG_RUST_KERNEL_DOCTESTS=y but CONFIG_DMA_SHARED_BUFFER=n fail to link:

Quoted 8 lines

  ld.lld: error: undefined symbol: dma_fence_release >>> referenced by usercopy_64.c
  >>>               vmlinux.o:(rust_helper_dma_fence_put) ... dma_fence_signal{,_locked}, dma_fence_context_alloc, dma_fence_init, dma_fence_{add,remove}_callback ...

Wrap the dma_fence.c helper include in the same
pub mod dma_buf; in rust/kernel/lib.rs with a matching #[cfg].

Oh dear, yes. Sorry about that, thx for fixing!

Quoted 4 lines
Fixes 3282d5916019 ("rust: Add dma_fence abstractions")
Quoted 31 lines

---
 rust/helpers/helpers.c | 2 +-
 rust/kernel/lib.rs     | 1 +

 2 files changed, 2 insertions(+), 1 deletion(-)
rust/helpers/helpers.c +1 -1
index 609689fba3dd..2c5eecc091c4 100644
@@ -57,8 +57,8 @@
  #include "cred.c"
  #include "device.c"
  #include "dma.c"
-#include "dma_fence.c"
  #ifdef CONFIG_DMA_SHARED_BUFFER
+#include "dma_fence.c"
  #include "dma-resv.c"
  #endif
  #include "drm.c"
rust/kernel/lib.rs +1 -0
index 72f5527ba66c..f9ef36217bb5 100644
@@ -67,6 +67,7 @@
  pub mod device_id;
  pub mod devres;
  pub mod dma;
+#[cfg(CONFIG_DMA_SHARED_BUFFER)]
  pub mod dma_buf;
  pub mod driver;
  #[cfg(CONFIG_DRM = "y")]
reviewer Applied
#2 lore raw
In reply to Edwin Peer
Quoted 1 line · Edwin Peer

[PATCH drm-rust-next] rust: dma_fence: gate abstractions on CONFIG_DMA_SHARED_BUFFER

Applied, thanks!

Branch: drm-rust-next
Tree: https://gitlab.freedesktop.org/drm/rust/kernel.git

[1/1] rust: dma_fence: gate abstractions on CONFIG_DMA_SHARED_BUFFER

      commit: 73e5616f3d19

The patch will appear in the next linux-next integration (typically within 24 hours on weekdays).

The patch is queued up for the upcoming merge window for the next major kernel release.