libtracecmd: Support changing /proc/kallsyms
v2 cover libtracecmd: Support changing /proc/kallsyms
v1: https://lore.kernel.org/linux-trace-devel/[email protected]/
v1 -> v2: Rewrite the size instead of reading the file twice (Steven).
Turns out exposing do_lseek() is not necessary, since everything is in the same C file.
Hi,
this series fixes tracing in presence of frequent BPF or kernel module loads/unloads. Patch 1 is a small required improvement; patch 2 is the actual implementation.
Best regards,
Ilya
Ilya Leoshkevich (2):
libtracecmd: Support querying position within a new compressed block
libtracecmd: Support changing /proc/kallsyms
lib/trace-cmd/trace-compress.c | 5 ++++- lib/trace-cmd/trace-output.c | 26 +++++++++++++++++++++++++- 2 files changed, 29 insertions(+), 2 deletions(-)
Signature · 1 line
2.49.0
PATCH v2 1/2 libtracecmd: Support querying position within a new compressed block
tracecmd_compress_lseek() refuses to return position within a new block, because handle->buffer is NULL. Add support for this; do not implement actually seeking within a new block, because this is not required at the moment.
--- lib/trace-cmd/trace-compress.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
lib/trace-cmd/trace-compress.c +4 -1
@@ -132,9 +132,12 @@ off_t tracecmd_compress_lseek(struct tracecmd_compression *handle, off_t offset, {unsigned long p; -if (!handle || !handle->buffer) +if (!handle)return (off_t)-1 ; +if (!handle->buffer) +return (whence ==SEEK_CUR && offset ==0 ) ?0 : (off_t)-1 ; +switch (whence) {case SEEK_CUR : p = handle->pointer + offset;
Signature · 1 line
2.49.0
PATCH v2 2/2 libtracecmd: Support changing /proc/kallsyms
In reply to Ilya LeoshkevichRunning BPF selftests under trace-cmd intermittently fails with:
error in size of file '/proc/kallsyms'
This is because these selftests load and unload BPF programs. bpf_prog_put() uses workqueues and RCU, so these programs disappear from /proc/kallsyms after a delay.
trace-cmd reads /proc/kallsyms twice: the first time to compute its size, and the second time to copy it into the trace file. If the resulting sizes don't match, which is what happens in this case, recording fails.
Fix by updating the size. This will work even for sending trace data over the network thanks to trace_msg_cache.
--- lib/trace-cmd/trace-output.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-)
lib/trace-cmd/trace-output.c +25 -1
@@ -577,6 +577,27 @@ __hidden int tcmd_out_update_section_header(struct tracecmd_output *handle, tsizreturn 0 ; } +static int tcmd_out_update_endian_4 (struct tracecmd_output *handle, +off_t offset,int val) +{ +tsize_t current; +int endian4; + +if (offset == (off_t)-1 ) +return -1 ; + current =do_lseek (handle,0 ,SEEK_CUR ); +if (current == (off_t)-1 ) +return -1 ; +if (do_lseek (handle, offset,SEEK_SET ) == (off_t)-1 ) +return -1 ; + endian4 =convert_endian_4 (handle, val); +if (tcmd_do_write_check (handle, &endian4,4 )) +return -1 ; +if (do_lseek (handle, current,SEEK_SET ) == (off_t)-1 ) +return -1 ; +return 0 ; +} +static int save_string_section (struct tracecmd_output *handle,bool compress) {enum tracecmd_section_flags flags =0 ;
@@ -1134,6 +1155,7 @@ static int read_proc_kallsyms(struct tracecmd_output *handle, bool compress)enum tracecmd_section_flags flags =0 ;unsigned int size, check_size, endian4;const char *path ="/proc/kallsyms" ; +off_t size_offset;tsize_t offset;struct stat st;int ret;
@@ -1165,13 +1187,15 @@ static int read_proc_kallsyms(struct tracecmd_output *handle, bool compress) } size =get_size (path); endian4 =convert_endian_4 (handle, size); + size_offset =do_lseek (handle,0 ,SEEK_CUR ); ret =tcmd_do_write_check (handle, &endian4,4 );if (ret) goto out;set_proc_kptr_restrict (0 ); check_size =copy_file (handle, path); -if (size != check_size) { +if (size != check_size && +tcmd_out_update_endian_4 (handle, size_offset, check_size)) { errno =EINVAL ;tracecmd_warning ("error in size of file '%s'" , path);set_proc_kptr_restrict (1 );
Signature · 1 line
2.49.0
Sorry for the late reply, been way too busy on the kernel side.
Quoted 8 lines · On Mon, 2 Jun 2025 22:38:33 +0100 Ilya Leoshkevich <[email protected]> wrote:
Running BPF selftests under trace-cmd intermittently fails with:
error in size of file '
/proc/kallsyms'This is because these selftests load and unload BPF programs.
bpf_prog_put()uses workqueues and RCU, so these programs disappear from/proc/kallsymsafter a delay.
Quoted 7 lines
trace-cmd reads
/proc/kallsymstwice: the first time to compute its size, and the second time to copy it into the trace file. If the resulting sizes don't match, which is what happens in this case, recording fails.Fix by updating the size. This will work even for sending trace data over the network thanks to
trace_msg_cache.
I'm perfectly fine with the logic, just some nits about the patch. Could you send a v3? Comments below.
Quoted 11 lines
Signed-off-by Ilya Leoshkevich <[email protected]>--- lib/trace-cmd/trace-output.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-)lib/trace-cmd/trace-output.c +0
-0
lib/trace-cmd/trace-output.c __hidden int tcmd_out_update_section_header(struct tracecmd_output *handle, tsiz · line 579
Quoted 3 lines
lib/trace-cmd/trace-output.c +0
-0@@ -577,6 +577,27 @@ __hidden int tcmd_out_update_section_header(struct tracecmd_output *handle, tsizreturn 0 ; }
Needs a comment here:
/*
* For files that can change while reading it (like /proc/kallsyms) the
* normal "size != check_size" can fail. That's because from the time
* the file size is read to write in the size to the time it is read to copy
* it into the file, it can change. In this case, the size that was stored
* in the file needs to be updated.
*/
lib/trace-cmd/trace-output.c __hidden int tcmd_out_update_section_header(struct tracecmd_output *handle, tsiz · line 581
Quoted 2 lines
lib/trace-cmd/trace-output.c +2
-0+static int tcmd_out_update_endian_4 (struct tracecmd_output *handle, +off_t offset,int val)
This is a static function, it doesn't need the "tcmd_" prefix. That should be reserved for global functions that are "__hidden".
lib/trace-cmd/trace-output.c __hidden int tcmd_out_update_section_header(struct tracecmd_output *handle, tsiz · line 587
Quoted 6 lines
lib/trace-cmd/trace-output.c +6
-0+{ +tsize_t current; +int endian4; + +if (offset == (off_t)-1 ) +return -1 ;
Add newline here.
lib/trace-cmd/trace-output.c __hidden int tcmd_out_update_section_header(struct tracecmd_output *handle, tsiz · line 590
Quoted 3 lines
lib/trace-cmd/trace-output.c +3
-0+ current =do_lseek (handle,0 ,SEEK_CUR ); +if (current == (off_t)-1 ) +return -1 ;
And here.
lib/trace-cmd/trace-output.c __hidden int tcmd_out_update_section_header(struct tracecmd_output *handle, tsiz · line 592
Quoted 2 lines
lib/trace-cmd/trace-output.c +2
-0+if (do_lseek (handle, offset,SEEK_SET ) == (off_t)-1 ) +return -1 ;
And here.
lib/trace-cmd/trace-output.c __hidden int tcmd_out_update_section_header(struct tracecmd_output *handle, tsiz · line 595
Quoted 3 lines
lib/trace-cmd/trace-output.c +3
-0+ endian4 =convert_endian_4 (handle, val); +if (tcmd_do_write_check (handle, &endian4,4 )) +return -1 ;
And here.
lib/trace-cmd/trace-output.c __hidden int tcmd_out_update_section_header(struct tracecmd_output *handle, tsiz · line 597
Quoted 2 lines
lib/trace-cmd/trace-output.c +2
-0+if (do_lseek (handle, current,SEEK_SET ) == (off_t)-1 ) +return -1 ;
And here.
Other than that, looks good.
-- Steve
Quoted 31 lines
lib/trace-cmd/trace-output.c +7
-1+return 0 ; +} +static int save_string_section (struct tracecmd_output *handle,bool compress) {enum tracecmd_section_flags flags =0 ;@@ -1134,6 +1155,7 @@ static int read_proc_kallsyms(struct tracecmd_output *handle, bool compress)enum tracecmd_section_flags flags =0 ;unsigned int size, check_size, endian4;const char *path ="/proc/kallsyms" ; +off_t size_offset;tsize_t offset;struct stat st;int ret;@@ -1165,13 +1187,15 @@ static int read_proc_kallsyms(struct tracecmd_output *handle, bool compress) } size =get_size (path); endian4 =convert_endian_4 (handle, size); + size_offset =do_lseek (handle,0 ,SEEK_CUR ); ret =tcmd_do_write_check (handle, &endian4,4 );if (ret) goto out;set_proc_kptr_restrict (0 ); check_size =copy_file (handle, path); -if (size != check_size) { +if (size != check_size && +tcmd_out_update_endian_4 (handle, size_offset, check_size)) { errno =EINVAL ;tracecmd_warning ("error in size of file '%s'" , path);set_proc_kptr_restrict (1 );