Skip to contentSkip to conversation

Replace CONFIG_DMABUF_SYSFS_STATS with BPF

PATCH Superseded T.J. Mercier 2 participants 10 messages May 12, 2025

Subsystems (6)

v5 of 7 Superseded Latest is v7 →

lore
Share & tools
lore
#0 lore raw

v5 cover Replace CONFIG_DMABUF_SYSFS_STATS with BPF

Until CONFIG_DMABUF_SYSFS_STATS was added [1] it was only possible to perform per-buffer accounting with debugfs which is not suitable for production environments. Eventually we discovered the overhead with per-buffer sysfs file creation/removal was significantly impacting allocation and free times, and exacerbated kernfs lock contention. [2] dma_buf_stats_setup() is responsible for 39% of single-page buffer creation duration, or 74% of single-page dma_buf_export() duration when stressing dmabuf allocations and frees.

I prototyped a change from per-buffer to per-exporter statistics with a RCU protected list of exporter allocations that accommodates most (but not all) of our use-cases and avoids almost all of the sysfs overhead. While that adds less overhead than per-buffer sysfs, and less even than the maintenance of the dmabuf debugfs_list, it's still *additional* overhead on top of the debugfs_list and doesn't give us per-buffer info.

This series uses the existing dmabuf debugfs_list to implement a BPF dmabuf iterator, which adds no overhead to buffer allocation/free and provides per-buffer info. The list has been moved outside of CONFIG_DEBUG_FS scope so that it is always populated. The BPF program loaded by userspace that extracts per-buffer information gets to define its own interface which avoids the lack of ABI stability with debugfs.

This will allow us to replace our use of CONFIG_DMABUF_SYSFS_STATS, and the plan is to remove it from the kernel after the next longterm stable release.

[1] https://lore.kernel.org/linux-media/[email protected]
[2] https://lore.kernel.org/all/[email protected]

v1: https://lore.kernel.org/all/[email protected]
v1 -> v2:
Make the DMA buffer list independent of CONFIG_DEBUG_FS per Christian
König
Add CONFIG_DMA_SHARED_BUFFER check to kernel/bpf/Makefile per kernel
test robot
Use BTF_ID_LIST_SINGLE instead of BTF_ID_LIST_GLOBAL_SINGLE per Song Liu Fixup comment style, mixing code/declarations, and use ASSERT_OK_FD in
selftest per Song Liu
Add BPF_ITER_RESCHED feature to bpf_dmabuf_reg_info per Alexei
Starovoitov
Add open-coded iterator and selftest per Alexei Starovoitov
Add a second test buffer from the system dmabuf heap to selftests Use the BPF program we'll use in production for selftest per Alexei
Starovoitov
https://r.android.com/c/platform/system/bpfprogs/+/3616123/2/dmabufIter.c
https://r.android.com/c/platform/system/memory/libmeminfo/+/3614259/1/libdmabufinfo/dmabuf_bpf_stats.cpp
v2: https://lore.kernel.org/all/[email protected]
v2 -> v3:
Rebase onto bpf-next/master
Move get_next_dmabuf() into drivers/dma-buf/dma-buf.c, along with the
new get_first_dmabuf(). This avoids having to expose the dmabuf list and mutex to the rest of the kernel, and keeps the dmabuf mutex operations near each other in the same file. (Christian König)
Add Christian's RB to dma-buf: Rename debugfs symbols
Drop RFC: dma-buf: Remove DMA-BUF statistics
v3: https://lore.kernel.org/all/[email protected]
v3 -> v4:
Fix selftest BPF program comment style (not kdoc) per Alexei Starovoitov Fix dma-buf.c kdoc comment style per Alexei Starovoitov
Rename get_first_dmabuf / get_next_dmabuf to dma_buf_iter_begin /
dma_buf_iter_next per Christian König
Add Christian's RB to bpf: Add dmabuf iterator
v4: https://lore.kernel.org/all/[email protected]
v4 -> v5:
Add Christian's Acks to all patches
Add Song Liu's Acks
Move BTF_ID_LIST_SINGLE and DEFINE_BPF_ITER_FUNC closer to usage per
Song Liu
Fix open-coded iterator comment style per Song Liu
Move iterator termination check to its own subtest per Song Liu Rework selftest buffer creation per Song Liu
Fix spacing in sanitize_string per BPF CI

T.J. Mercier (5):
dma-buf: Rename debugfs symbols
bpf: Add dmabuf iterator
bpf: Add open coded dmabuf iterator selftests/bpf: Add test for dmabuf_iter selftests/bpf: Add test for open coded dmabuf_iter

 drivers/dma-buf/dma-buf.c                     |  98 +++++--
 include/linux/dma-buf.h                       |   4 +-
 kernel/bpf/Makefile                           |   3 +
 kernel/bpf/dmabuf_iter.c                      | 150 ++++++++++
 kernel/bpf/helpers.c                          |   5 +
 .../testing/selftests/bpf/bpf_experimental.h  |   5 +
 tools/testing/selftests/bpf/config            |   3 +
 .../selftests/bpf/prog_tests/dmabuf_iter.c    | 276 ++++++++++++++++++
 .../testing/selftests/bpf/progs/dmabuf_iter.c |  91 ++++++
 9 files changed, 613 insertions(+), 22 deletions(-)
 create mode 100644 kernel/bpf/dmabuf_iter.c
 create mode 100644 tools/testing/selftests/bpf/prog_tests/dmabuf_iter.c
 create mode 100644 tools/testing/selftests/bpf/progs/dmabuf_iter.c

base-commit: 43745d11bfd9683abdf08ad7a5cc403d6a9ffd15

Signature · 1 line
2.49.0.1045.g170613ef41-goog
#1 lore raw

PATCH v5 1/5 dma-buf: Rename debugfs symbols

Rename the debugfs list and mutex so it's clear they are now usable without the need for CONFIG_DEBUG_FS. The list will always be populated to support the creation of a BPF iterator for dmabufs.

---
 drivers/dma-buf/dma-buf.c | 40 +++++++++++++++------------------------
 include/linux/dma-buf.h   |  2 --
 2 files changed, 15 insertions(+), 27 deletions(-)
drivers/dma-buf/dma-buf.c +15 -25
index 5baa83b85515..8d151784e302 100644
@@ -35,35 +35,25 @@
 
 static inline int is_dma_buf_file(struct file *);
 
-#if IS_ENABLED(CONFIG_DEBUG_FS)
-static DEFINE_MUTEX(debugfs_list_mutex);
-static LIST_HEAD(debugfs_list);
+static DEFINE_MUTEX(dmabuf_list_mutex);
+static LIST_HEAD(dmabuf_list);
 
-static void __dma_buf_debugfs_list_add(struct dma_buf *dmabuf)
+static void __dma_buf_list_add(struct dma_buf *dmabuf)
 {
-	mutex_lock(&debugfs_list_mutex);
-	list_add(&dmabuf->list_node, &debugfs_list);
-	mutex_unlock(&debugfs_list_mutex);
+	mutex_lock(&dmabuf_list_mutex);
+	list_add(&dmabuf->list_node, &dmabuf_list);
+	mutex_unlock(&dmabuf_list_mutex);
 }
 
-static void __dma_buf_debugfs_list_del(struct dma_buf *dmabuf)
+static void __dma_buf_list_del(struct dma_buf *dmabuf)
 {
 	if (!dmabuf)
 		return;
 
-	mutex_lock(&debugfs_list_mutex);
+	mutex_lock(&dmabuf_list_mutex);
 	list_del(&dmabuf->list_node);
-	mutex_unlock(&debugfs_list_mutex);
+	mutex_unlock(&dmabuf_list_mutex);
 }
-#else
-static void __dma_buf_debugfs_list_add(struct dma_buf *dmabuf)
-{
-}
-
-static void __dma_buf_debugfs_list_del(struct dma_buf *dmabuf)
-{
-}
-#endif
 
 static char *dmabuffs_dname(struct dentry *dentry, char *buffer, int buflen)
 {
@@ -115,7 +105,7 @@ static int dma_buf_file_release(struct inode *inode, struct file *file)
 	if (!is_dma_buf_file(file))
 		return -EINVAL;
 
-	__dma_buf_debugfs_list_del(file->private_data);
+	__dma_buf_list_del(file->private_data);
 
 	return 0;
 }
@@ -689,7 +679,7 @@ struct dma_buf *dma_buf_export(const struct dma_buf_export_info *exp_info)
 	file->f_path.dentry->d_fsdata = dmabuf;
 	dmabuf->file = file;
 
-	__dma_buf_debugfs_list_add(dmabuf);
+	__dma_buf_list_add(dmabuf);
 
 	return dmabuf;
 
@@ -1630,7 +1620,7 @@ static int dma_buf_debug_show(struct seq_file *s, void *unused)
 	size_t size = 0;
 	int ret;
 
-	ret = mutex_lock_interruptible(&debugfs_list_mutex);
+	ret = mutex_lock_interruptible(&dmabuf_list_mutex);
 
 	if (ret)
 		return ret;
@@ -1639,7 +1629,7 @@ static int dma_buf_debug_show(struct seq_file *s, void *unused)
 	seq_printf(s, "%-8s\t%-8s\t%-8s\t%-8s\texp_name\t%-8s\tname\n",
 		   "size", "flags", "mode", "count", "ino");
 
-	list_for_each_entry(buf_obj, &debugfs_list, list_node) {
+	list_for_each_entry(buf_obj, &dmabuf_list, list_node) {
 
 		ret = dma_resv_lock_interruptible(buf_obj->resv, NULL);
 		if (ret)
@@ -1676,11 +1666,11 @@ static int dma_buf_debug_show(struct seq_file *s, void *unused)
 
 	seq_printf(s, "\nTotal %d objects, %zu bytes\n", count, size);
 
-	mutex_unlock(&debugfs_list_mutex);
+	mutex_unlock(&dmabuf_list_mutex);
 	return 0;
 
 error_unlock:
-	mutex_unlock(&debugfs_list_mutex);
+	mutex_unlock(&dmabuf_list_mutex);
 	return ret;
 }
 
include/linux/dma-buf.h +0 -2
index 36216d28d8bd..8ff4add71f88 100644
@@ -370,10 +370,8 @@ struct dma_buf {
 	 */
 	struct module *owner;
 
-#if IS_ENABLED(CONFIG_DEBUG_FS)
 	/** @list_node: node for dma_buf accounting and debugging. */
 	struct list_head list_node;
-#endif
 
 	/** @priv: exporter specific private data for this buffer object. */
 	void *priv;
Signature · 1 line
2.49.0.1045.g170613ef41-goog
#2 lore raw

PATCH v5 2/5 bpf: Add dmabuf iterator

In reply to T.J. Mercier

The dmabuf iterator traverses the list of all DMA buffers.

DMA buffers are refcounted through their associated struct file. A reference is taken on each buffer as the list is iterated to ensure each buffer persists for the duration of the bpf program execution without holding the list mutex.

---
 drivers/dma-buf/dma-buf.c |  68 +++++++++++++++++++++++++
 include/linux/dma-buf.h   |   2 +
 kernel/bpf/Makefile       |   3 ++
 kernel/bpf/dmabuf_iter.c  | 102 ++++++++++++++++++++++++++++++++++++++
 4 files changed, 175 insertions(+)
 create mode 100644 kernel/bpf/dmabuf_iter.c
drivers/dma-buf/dma-buf.c +68 -0
index 8d151784e302..6b59506a1b94 100644
@@ -19,7 +19,9 @@
 #include <linux/anon_inodes.h>
 #include <linux/export.h>
 #include <linux/debugfs.h>
+#include <linux/list.h>
 #include <linux/module.h>
+#include <linux/mutex.h>
 #include <linux/seq_file.h>
 #include <linux/sync_file.h>
 #include <linux/poll.h>
@@ -55,6 +57,72 @@ static void __dma_buf_list_del(struct dma_buf *dmabuf)
 	mutex_unlock(&dmabuf_list_mutex);
 }
 
+/**
+ * dma_buf_iter_begin - begin iteration through global list of all DMA buffers
+ *
+ * Returns the first buffer in the global list of DMA-bufs that's not in the
+ * process of being destroyed. Increments that buffer's reference count to
+ * prevent buffer destruction. Callers must release the reference, either by
+ * continuing iteration with dma_buf_iter_next(), or with dma_buf_put().
+ *
+ * Return:
+ * * First buffer from global list, with refcount elevated
+ * * NULL if no active buffers are present
+ */
+struct dma_buf *dma_buf_iter_begin(void)
+{
+	struct dma_buf *ret = NULL, *dmabuf;
+
+	/*
+	 * The list mutex does not protect a dmabuf's refcount, so it can be
+	 * zeroed while we are iterating. We cannot call get_dma_buf() since the
+	 * caller may not already own a reference to the buffer.
+	 */
+	mutex_lock(&dmabuf_list_mutex);
+	list_for_each_entry(dmabuf, &dmabuf_list, list_node) {
+		if (file_ref_get(&dmabuf->file->f_ref)) {
+			ret = dmabuf;
+			break;
+		}
+	}
+	mutex_unlock(&dmabuf_list_mutex);
+	return ret;
+}
+
+/**
+ * dma_buf_iter_next - continue iteration through global list of all DMA buffers
+ * @dmabuf:	[in]	pointer to dma_buf
+ *
+ * Decrements the reference count on the provided buffer. Returns the next
+ * buffer from the remainder of the global list of DMA-bufs with its reference
+ * count incremented. Callers must release the reference, either by continuing
+ * iteration with dma_buf_iter_next(), or with dma_buf_put().
+ *
+ * Return:
+ * * Next buffer from global list, with refcount elevated
+ * * NULL if no additional active buffers are present
+ */
+struct dma_buf *dma_buf_iter_next(struct dma_buf *dmabuf)
+{
+	struct dma_buf *ret = NULL;
+
+	/*
+	 * The list mutex does not protect a dmabuf's refcount, so it can be
+	 * zeroed while we are iterating. We cannot call get_dma_buf() since the
+	 * caller may not already own a reference to the buffer.
+	 */
+	mutex_lock(&dmabuf_list_mutex);
+	dma_buf_put(dmabuf);
+	list_for_each_entry_continue(dmabuf, &dmabuf_list, list_node) {
+		if (file_ref_get(&dmabuf->file->f_ref)) {
+			ret = dmabuf;
+			break;
+		}
+	}
+	mutex_unlock(&dmabuf_list_mutex);
+	return ret;
+}
+
 static char *dmabuffs_dname(struct dentry *dentry, char *buffer, int buflen)
 {
 	struct dma_buf *dmabuf;
include/linux/dma-buf.h +2 -0
index 8ff4add71f88..7af2ea839f58 100644
@@ -634,4 +634,6 @@ int dma_buf_vmap(struct dma_buf *dmabuf, struct iosys_map *map);
 void dma_buf_vunmap(struct dma_buf *dmabuf, struct iosys_map *map);
 int dma_buf_vmap_unlocked(struct dma_buf *dmabuf, struct iosys_map *map);
 void dma_buf_vunmap_unlocked(struct dma_buf *dmabuf, struct iosys_map *map);
+struct dma_buf *dma_buf_iter_begin(void);
+struct dma_buf *dma_buf_iter_next(struct dma_buf *dmbuf);
 #endif /* __DMA_BUF_H__ */
kernel/bpf/Makefile +3 -0
index 70502f038b92..3a335c50e6e3 100644
@@ -53,6 +53,9 @@ obj-$(CONFIG_BPF_SYSCALL) += relo_core.o
 obj-$(CONFIG_BPF_SYSCALL) += btf_iter.o
 obj-$(CONFIG_BPF_SYSCALL) += btf_relocate.o
 obj-$(CONFIG_BPF_SYSCALL) += kmem_cache_iter.o
+ifeq ($(CONFIG_DMA_SHARED_BUFFER),y)
+obj-$(CONFIG_BPF_SYSCALL) += dmabuf_iter.o
+endif
 
 CFLAGS_REMOVE_percpu_freelist.o = $(CC_FLAGS_FTRACE)
 CFLAGS_REMOVE_bpf_lru_list.o = $(CC_FLAGS_FTRACE)
kernel/bpf/dmabuf_iter.c new file +102 -0

102 lines not on this page · raw message

Signature · 1 line
2.49.0.1045.g170613ef41-goog
#3 lore raw

PATCH v5 3/5 bpf: Add open coded dmabuf iterator

In reply to T.J. Mercier

This open coded iterator allows for more flexibility when creating BPF programs. It can support output in formats other than text. With an open coded iterator, a single BPF program can traverse multiple kernel data structures (now including dmabufs), allowing for more efficient analysis of kernel data compared to multiple reads from procfs, sysfs, or multiple traditional BPF iterator invocations.

---
 kernel/bpf/dmabuf_iter.c | 48 ++++++++++++++++++++++++++++++++++++++++
 kernel/bpf/helpers.c     |  5 +++++
 2 files changed, 53 insertions(+)
kernel/bpf/dmabuf_iter.c +48 -0
index 83ef54d78b62..4dd7ef7c145c 100644
@@ -100,3 +100,51 @@ static int __init dmabuf_iter_init(void)
 }
 
 late_initcall(dmabuf_iter_init);
+
+struct bpf_iter_dmabuf {
+	/*
+	 * opaque iterator state; having __u64 here allows to preserve correct
+	 * alignment requirements in vmlinux.h, generated from BTF
+	 */
+	__u64 __opaque[1];
+} __aligned(8);
+
+/* Non-opaque version of bpf_iter_dmabuf */
+struct bpf_iter_dmabuf_kern {
+	struct dma_buf *dmabuf;
+} __aligned(8);
+
+__bpf_kfunc_start_defs();
+
+__bpf_kfunc int bpf_iter_dmabuf_new(struct bpf_iter_dmabuf *it)
+{
+	struct bpf_iter_dmabuf_kern *kit = (void *)it;
+
+	BUILD_BUG_ON(sizeof(*kit) > sizeof(*it));
+	BUILD_BUG_ON(__alignof__(*kit) != __alignof__(*it));
+
+	kit->dmabuf = NULL;
+	return 0;
+}
+
+__bpf_kfunc struct dma_buf *bpf_iter_dmabuf_next(struct bpf_iter_dmabuf *it)
+{
+	struct bpf_iter_dmabuf_kern *kit = (void *)it;
+
+	if (kit->dmabuf)
+		kit->dmabuf = dma_buf_iter_next(kit->dmabuf);
+	else
+		kit->dmabuf = dma_buf_iter_begin();
+
+	return kit->dmabuf;
+}
+
+__bpf_kfunc void bpf_iter_dmabuf_destroy(struct bpf_iter_dmabuf *it)
+{
+	struct bpf_iter_dmabuf_kern *kit = (void *)it;
+
+	if (kit->dmabuf)
+		dma_buf_put(kit->dmabuf);
+}
+
+__bpf_kfunc_end_defs();
kernel/bpf/helpers.c +5 -0
index 78cefb41266a..39fe63016868 100644
@@ -3346,6 +3346,11 @@ BTF_ID_FLAGS(func, bpf_iter_kmem_cache_next, KF_ITER_NEXT | KF_RET_NULL | KF_SLE
 BTF_ID_FLAGS(func, bpf_iter_kmem_cache_destroy, KF_ITER_DESTROY | KF_SLEEPABLE)
 BTF_ID_FLAGS(func, bpf_local_irq_save)
 BTF_ID_FLAGS(func, bpf_local_irq_restore)
+#ifdef CONFIG_DMA_SHARED_BUFFER
+BTF_ID_FLAGS(func, bpf_iter_dmabuf_new, KF_ITER_NEW | KF_SLEEPABLE)
+BTF_ID_FLAGS(func, bpf_iter_dmabuf_next, KF_ITER_NEXT | KF_RET_NULL | KF_SLEEPABLE)
+BTF_ID_FLAGS(func, bpf_iter_dmabuf_destroy, KF_ITER_DESTROY | KF_SLEEPABLE)
+#endif
 BTF_KFUNCS_END(common_btf_ids)
 
 static const struct btf_kfunc_id_set common_kfunc_set = {
Signature · 1 line
2.49.0.1045.g170613ef41-goog
#4 lore raw

PATCH v5 4/5 selftests/bpf: Add test for dmabuf_iter

In reply to T.J. Mercier

This test creates a udmabuf, and a dmabuf from the system dmabuf heap, and uses a BPF program that prints dmabuf metadata with the new dmabuf_iter to verify they can be found.

---
 tools/testing/selftests/bpf/config            |   3 +
 .../selftests/bpf/prog_tests/dmabuf_iter.c    | 240 ++++++++++++++++++
 .../testing/selftests/bpf/progs/dmabuf_iter.c |  53 ++++
 3 files changed, 296 insertions(+)
 create mode 100644 tools/testing/selftests/bpf/prog_tests/dmabuf_iter.c
 create mode 100644 tools/testing/selftests/bpf/progs/dmabuf_iter.c
tools/testing/selftests/bpf/config +3 -0
index c378d5d07e02..2bdff2f3285f 100644
@@ -22,6 +22,8 @@ CONFIG_CRYPTO_AES=y
 CONFIG_DEBUG_INFO=y
 CONFIG_DEBUG_INFO_BTF=y
 CONFIG_DEBUG_INFO_DWARF4=y
+CONFIG_DMABUF_HEAPS=y
+CONFIG_DMABUF_HEAPS_SYSTEM=y
 CONFIG_DUMMY=y
 CONFIG_DYNAMIC_FTRACE=y
 CONFIG_FPROBE=y
@@ -106,6 +108,7 @@ CONFIG_SECURITY=y
 CONFIG_SECURITYFS=y
 CONFIG_SYN_COOKIES=y
 CONFIG_TEST_BPF=m
+CONFIG_UDMABUF=y
 CONFIG_USERFAULTFD=y
 CONFIG_VSOCKETS=y
 CONFIG_VXLAN=y
tools/testing/selftests/bpf/prog_tests/dmabuf_iter.c new file +240 -0

240 lines not on this page · raw message

tools/testing/selftests/bpf/progs/dmabuf_iter.c new file +53 -0

53 lines not on this page · raw message

Signature · 1 line
2.49.0.1045.g170613ef41-goog
reviewer
#5 lore raw

Re: [PATCH bpf-next v5 4/5] selftests/bpf: Add test for dmabuf_iter

On Mon, May 12, 2025 at 10:41 AM T.J. Mercier <[email protected]> wrote:
[...]

Review

Quoted 2 lines
(quoted diff) +2 -0
+
+static int udmabuf;

static int udmabuf = -1;

tools/testing/selftests/bpf/prog_tests/dmabuf_iter.c line 25

Quoted 3 lines
tools/testing/selftests/bpf/prog_tests/dmabuf_iter.c new file +3 -0
+static const char udmabuf_test_buffer_name[DMA_BUF_NAME_LEN] = "udmabuf_test_buffer_for_iter";
+static size_t udmabuf_test_buffer_size;
+static int sysheap_dmabuf;

static int sysheap_dmabuf = -1;

tools/testing/selftests/bpf/prog_tests/dmabuf_iter.c line 31

Quoted 6 lines
tools/testing/selftests/bpf/prog_tests/dmabuf_iter.c new file +6 -0
+static const char sysheap_test_buffer_name[DMA_BUF_NAME_LEN] = "sysheap_test_buffer_for_iter";
+static size_t sysheap_test_buffer_size;
+
+static int create_udmabuf(void)
+{
+       struct udmabuf_create create;

nit: zero initialize create to be future proof.

Quoted 3 lines
tools/testing/selftests/bpf/prog_tests/dmabuf_iter.c new file +3 -0
+       int dev_udmabuf, memfd, local_udmabuf;
+
+       udmabuf_test_buffer_size = 10 * getpagesize();

[...]

tools/testing/selftests/bpf/prog_tests/dmabuf_iter.c line 175

Quoted 12 lines
tools/testing/selftests/bpf/prog_tests/dmabuf_iter.c new file +12 -0
+static void subtest_dmabuf_iter_check_default_iter(struct dmabuf_iter *skel)
+{
+       bool found_test_sysheap_dmabuf = false;
+       bool found_test_udmabuf = false;
+       struct DmabufInfo bufinfo;
+       size_t linesize = 0;
+       char *line = NULL;
+       FILE *iter_file;
+       int iter_fd, f = INODE;
+
+       iter_fd = bpf_iter_create(bpf_link__fd(skel->links.dmabuf_collector));
+       ASSERT_OK_FD(iter_fd, "iter_create");

Should we check ASSERT_OK_FD() and exit early on
failures?

tools/testing/selftests/bpf/prog_tests/dmabuf_iter.c line 178

Quoted 3 lines
tools/testing/selftests/bpf/prog_tests/dmabuf_iter.c new file +3 -0
+
+       iter_file = fdopen(iter_fd, "r");
+       ASSERT_OK_PTR(iter_file, "fdopen");

Same here.
[...]

tools/testing/selftests/bpf/progs/dmabuf_iter.c line 18

Quoted 7 lines
tools/testing/selftests/bpf/progs/dmabuf_iter.c new file +7 -0
+/*
+ * Fields output by this iterator are delimited by newlines. Convert any
+ * newlines in user-provided printed strings to spaces.
+ */
+static void sanitize_string(char *src, size_t size)
+{
+       for (char *c = src; c && (size_t)(c - src) < size; ++c)

Should this be:

  for (char *c = src; *c && (size_t)(c - src) < size; ++c)

?

Thanks,
Song

[...]

#6 lore raw

Re: [PATCH bpf-next v5 4/5] selftests/bpf: Add test for dmabuf_iter

Quoted 8 lines · Song Liu

On Mon, May 12, 2025 at 10:41 AM T.J. Mercier <[email protected]> wrote:
[...]

Review

Quoted 2 lines
(quoted diff) +2 -0
+
+static int udmabuf;

static int udmabuf = -1;

Quoted 5 lines

tools/testing/selftests/bpf/prog_tests/dmabuf_iter.c line 25

Quoted 3 lines
tools/testing/selftests/bpf/prog_tests/dmabuf_iter.c new file +3 -0
+static const char udmabuf_test_buffer_name[DMA_BUF_NAME_LEN] = "udmabuf_test_buffer_for_iter";
+static size_t udmabuf_test_buffer_size;
+static int sysheap_dmabuf;

static int sysheap_dmabuf = -1;

We don't really need the -1 since the rework in this version initializes them to -1 on failure, but I'll add it anyway.

Quoted 8 lines

tools/testing/selftests/bpf/prog_tests/dmabuf_iter.c line 31

Quoted 6 lines
tools/testing/selftests/bpf/prog_tests/dmabuf_iter.c new file +6 -0
+static const char sysheap_test_buffer_name[DMA_BUF_NAME_LEN] = "sysheap_test_buffer_for_iter";
+static size_t sysheap_test_buffer_size;
+
+static int create_udmabuf(void)
+{
+       struct udmabuf_create create;

nit: zero initialize create to be future proof.

Ok, done.

Quoted 7 lines
Quoted 4 lines
tools/testing/selftests/bpf/prog_tests/dmabuf_iter.c new file +3 -0
+       int dev_udmabuf, memfd, local_udmabuf;
+
+       udmabuf_test_buffer_size = 10 * getpagesize();

[...]

Quoted 15 lines

tools/testing/selftests/bpf/prog_tests/dmabuf_iter.c line 175

Quoted 12 lines
tools/testing/selftests/bpf/prog_tests/dmabuf_iter.c new file +12 -0
+static void subtest_dmabuf_iter_check_default_iter(struct dmabuf_iter *skel)
+{
+       bool found_test_sysheap_dmabuf = false;
+       bool found_test_udmabuf = false;
+       struct DmabufInfo bufinfo;
+       size_t linesize = 0;
+       char *line = NULL;
+       FILE *iter_file;
+       int iter_fd, f = INODE;
+
+       iter_fd = bpf_iter_create(bpf_link__fd(skel->links.dmabuf_collector));
+       ASSERT_OK_FD(iter_fd, "iter_create");

Should we check ASSERT_OK_FD() and exit early on
failures?

We should fallthrough on error, but let's add the early out.

Quoted 17 lines

tools/testing/selftests/bpf/prog_tests/dmabuf_iter.c line 178

Quoted 4 lines
tools/testing/selftests/bpf/prog_tests/dmabuf_iter.c new file +3 -0
+
+       iter_file = fdopen(iter_fd, "r");
+       ASSERT_OK_PTR(iter_file, "fdopen");

Same here.
[...]

tools/testing/selftests/bpf/progs/dmabuf_iter.c line 18

Quoted 7 lines
tools/testing/selftests/bpf/progs/dmabuf_iter.c new file +7 -0
+/*
+ * Fields output by this iterator are delimited by newlines. Convert any
+ * newlines in user-provided printed strings to spaces.
+ */
+static void sanitize_string(char *src, size_t size)
+{
+       for (char *c = src; c && (size_t)(c - src) < size; ++c)

Should this be:

Quoted 3 lines
  for (char *c = src; *c && (size_t)(c - src) < size; ++c)

?

Yes! Thanks.

Quoted 4 lines

Thanks,
Song

[...]

#7 lore raw

PATCH v5 5/5 selftests/bpf: Add test for open coded dmabuf_iter

In reply to T.J. Mercier

Use the same test buffers as the traditional iterator and a new BPF map to verify the test buffers can be found with the open coded dmabuf iterator.

---
 .../testing/selftests/bpf/bpf_experimental.h  |  5 +++
 .../selftests/bpf/prog_tests/dmabuf_iter.c    | 42 +++++++++++++++++--
 .../testing/selftests/bpf/progs/dmabuf_iter.c | 38 +++++++++++++++++
 3 files changed, 82 insertions(+), 3 deletions(-)
tools/testing/selftests/bpf/bpf_experimental.h +5 -0
index 6535c8ae3c46..5e512a1d09d1 100644
@@ -591,4 +591,9 @@ extern int bpf_iter_kmem_cache_new(struct bpf_iter_kmem_cache *it) __weak __ksym
 extern struct kmem_cache *bpf_iter_kmem_cache_next(struct bpf_iter_kmem_cache *it) __weak __ksym;
 extern void bpf_iter_kmem_cache_destroy(struct bpf_iter_kmem_cache *it) __weak __ksym;
 
+struct bpf_iter_dmabuf;
+extern int bpf_iter_dmabuf_new(struct bpf_iter_dmabuf *it) __weak __ksym;
+extern struct dma_buf *bpf_iter_dmabuf_next(struct bpf_iter_dmabuf *it) __weak __ksym;
+extern void bpf_iter_dmabuf_destroy(struct bpf_iter_dmabuf *it) __weak __ksym;
+
 #endif
tools/testing/selftests/bpf/prog_tests/dmabuf_iter.c +39 -3

77 lines not on this page · raw message

tools/testing/selftests/bpf/progs/dmabuf_iter.c +38 -0
index 900a730a05f6..5f2cc4f3de96 100644
@@ -9,6 +9,13 @@
 
 char _license[] SEC("license") = "GPL";
 
+struct {
+	__uint(type, BPF_MAP_TYPE_HASH);
+	__uint(key_size, DMA_BUF_NAME_LEN);
+	__type(value, bool);
+	__uint(max_entries, 5);
+} testbuf_hash SEC(".maps");
+
 /*
  * Fields output by this iterator are delimited by newlines. Convert any
  * newlines in user-provided printed strings to spaces.
@@ -51,3 +58,34 @@ int dmabuf_collector(struct bpf_iter__dmabuf *ctx)
 	BPF_SEQ_PRINTF(seq, "%lu\n%llu\n%s\n%s\n", inode, size, name, exporter);
 	return 0;
 }
+
+SEC("syscall")
+int iter_dmabuf_for_each(const void *ctx)
+{
+	struct dma_buf *d;
+
+	bpf_for_each(dmabuf, d) {
+		char name[DMA_BUF_NAME_LEN];
+		const char *pname;
+		bool *found;
+
+		if (bpf_core_read(&pname, sizeof(pname), &d->name))
+			return 1;
+
+		/* Buffers are not required to be named */
+		if (!pname)
+			continue;
+
+		if (bpf_probe_read_kernel(name, sizeof(name), pname))
+			return 1;
+
+		found = bpf_map_lookup_elem(&testbuf_hash, name);
+		if (found) {
+			bool t = true;
+
+			bpf_map_update_elem(&testbuf_hash, name, &t, BPF_EXIST);
+		}
+	}
+
+	return 0;
+}
Signature · 1 line
2.49.0.1045.g170613ef41-goog
reviewer Acked-by on v5 5/5
#8 lore raw

Re: [PATCH bpf-next v5 5/5] selftests/bpf: Add test for open coded dmabuf_iter

Quoted 7 lines · T.J. Mercier

Use the same test buffers as the traditional iterator and a new BPF map to verify the test buffers can be found with the open coded dmabuf iterator.

With a nitpick below.

[...]

Quoted 5 lines
tools/testing/selftests/bpf/prog_tests/dmabuf_iter.c +2 -1
-static int create_test_buffers(void)
+static int create_test_buffers(int map_fd)
 {
+       bool f = false;

tools/testing/selftests/bpf/prog_tests/dmabuf_iter.c static int create_sys_heap_dmabuf(void) · line 120

Quoted 10 lines
tools/testing/selftests/bpf/prog_tests/dmabuf_iter.c +3 -1
+
        udmabuf = create_udmabuf();
        sysheap_dmabuf = create_sys_heap_dmabuf();
 
        if (udmabuf < 0 || sysheap_dmabuf < 0)
                return -1;
 
-       return 0;
+       return bpf_map_update_elem(map_fd, udmabuf_test_buffer_name, &f, BPF_ANY) ||
+              bpf_map_update_elem(map_fd, sysheap_test_buffer_name, &f, BPF_ANY);

nit: Instead of passing map_fd in here, we can just call bpf_map_update_elem() in test_dmabuf_iter()

[...]

#9 lore raw

Re: [PATCH bpf-next v5 5/5] selftests/bpf: Add test for open coded dmabuf_iter

Quoted 11 lines · Song Liu
Quoted 7 lines · T.J. Mercier

Use the same test buffers as the traditional iterator and a new BPF map to verify the test buffers can be found with the open coded dmabuf iterator.

Thanks, I'll send v6 this afternoon or tomorrow morning with all changes.

Quoted 25 lines

With a nitpick below.

[...]

Quoted 5 lines
tools/testing/selftests/bpf/prog_tests/dmabuf_iter.c +2 -1
-static int create_test_buffers(void)
+static int create_test_buffers(int map_fd)
 {
+       bool f = false;

tools/testing/selftests/bpf/prog_tests/dmabuf_iter.c static int create_sys_heap_dmabuf(void) · line 120

Quoted 10 lines
tools/testing/selftests/bpf/prog_tests/dmabuf_iter.c +3 -1
+
        udmabuf = create_udmabuf();
        sysheap_dmabuf = create_sys_heap_dmabuf();
 
        if (udmabuf < 0 || sysheap_dmabuf < 0)
                return -1;
 
-       return 0;
+       return bpf_map_update_elem(map_fd, udmabuf_test_buffer_name, &f, BPF_ANY) ||
+              bpf_map_update_elem(map_fd, sysheap_test_buffer_name, &f, BPF_ANY);

nit: Instead of passing map_fd in here, we can just call bpf_map_update_elem() in test_dmabuf_iter()

[...]