[PATCH v2 1/2] libtraceevent utest: Handle short reads when reading BTF
Cao Ruichuang <[email protected]> Tue, 2 Jun 2026 00:52:56 +0800
| Newsgroups | org.kernel.vger.linux-trace-devel |
|---|---|
| Message-ID | <[email protected]> |
test_btf_read() falls back to malloc() and read() when mmap() of
/sys/kernel/btf/vmlinux fails. The fallback currently assumes that one
read(fd, buf, st.st_size) call returns the whole file.
That is not guaranteed. On a Rocky Linux 9.7 system with a readable
/sys/kernel/btf/vmlinux, mmap() fails with ENODEV and a single read()
returns only 4096 bytes from a 5150407-byte file. Reading in a loop
returns the complete file.
Read the BTF file in a loop so the fallback path handles short reads
correctly and avoids passing partial BTF data to tep_load_btf().
Fixes: 5b44859765fc ("libtraceevent utest: Read btf file in utest if mmap fails")
Assisted-by: Codex:gpt-5.5
Signed-off-by: Cao Ruichuang <[email protected]>
---
utest/traceevent-utest.c | 32 +++++++++++++++++++++++++++++++-
1 file changed, 31 insertions(+), 1 deletion(-)
diff --git a/utest/traceevent-utest.c b/utest/traceevent-utest.c
index 1c3a4c2..275e5ed 100644
--- a/utest/traceevent-utest.c
+++ b/utest/traceevent-utest.c
@@ -9,6 +9,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <stdint.h>
+#include <errno.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
@@ -506,6 +507,28 @@ static void test_parse_dma_addr(void)
data, sizeof(data), "dma=0x1234abcd");
}
+static int read_full(int fd, void *buf, size_t size)
+{
+ char *data = buf;
+ size_t total = 0;
+
+ while (total < size) {
+ ssize_t ret;
+
+ ret = read(fd, data + total, size - total);
+ if (ret < 0) {
+ if (errno == EINTR)
+ continue;
+ return -1;
+ }
+ if (!ret)
+ return -1;
+ total += ret;
+ }
+
+ return 0;
+}
+
static void test_btf_read(void)
{
uint64_t args[] = {0x7ffe7d33f3d0, 0, 0, 0, 0, 0};
@@ -525,6 +548,8 @@ static void test_btf_read(void)
buf = mmap(NULL, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
if (buf == MAP_FAILED) {
+ int ret;
+
malloced = true;
buf = malloc(st.st_size);
if (buf == NULL) {
@@ -532,7 +557,12 @@ static void test_btf_read(void)
close(fd);
return;
}
- CU_TEST(read(fd, buf, st.st_size) == st.st_size);
+ CU_TEST((ret = read_full(fd, buf, st.st_size)) == 0);
+ if (ret < 0) {
+ free(buf);
+ close(fd);
+ return;
+ }
}
CU_TEST(tep_load_btf(test_tep, buf, st.st_size) == 0);
--
2.39.5 (Apple Git-154)