Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add some information to /proc/cpuinfo #7

Merged
merged 3 commits into from
Sep 10, 2020
Merged

Add some information to /proc/cpuinfo #7

merged 3 commits into from
Sep 10, 2020

Conversation

AntonioND
Copy link

  • Add a hook to lkl_host_operations to get the number of CPUs.
  • Use it to fill some fields of /proc/cpuinfo.

@AntonioND AntonioND mentioned this pull request Aug 17, 2020
Merged
davidchisnall
davidchisnall requested changes Aug 26, 2020
View reviewed changes
arch/lkl/kernel/proc.c Outdated Show resolved Hide resolved
arch/lkl/kernel/proc.c Outdated Show resolved Hide resolved
arch/lkl/kernel/proc.c Outdated Show resolved Hide resolved
fs/seq_file.c Outdated Show resolved Hide resolved
prp pushed a commit that referenced this pull request Sep 7, 2020
@gregkh
tools lib traceevent: Fix memory leak in process_dynamic_array_len
3429579 
[ Upstream commit e24c644 ]

I compiled with AddressSanitizer and I had these memory leaks while I
was using the tep_parse_format function:

    Direct leak of 28 byte(s) in 4 object(s) allocated from:
        #0 0x7fb07db49ffe in __interceptor_realloc (/lib/x86_64-linux-gnu/libasan.so.5+0x10dffe)
        #1 0x7fb07a724228 in extend_token /home/pduplessis/repo/linux/tools/lib/traceevent/event-parse.c:985
        #2 0x7fb07a724c21 in __read_token /home/pduplessis/repo/linux/tools/lib/traceevent/event-parse.c:1140
        #3 0x7fb07a724f78 in read_token /home/pduplessis/repo/linux/tools/lib/traceevent/event-parse.c:1206
        #4 0x7fb07a725191 in __read_expect_type /home/pduplessis/repo/linux/tools/lib/traceevent/event-parse.c:1291
        #5 0x7fb07a7251df in read_expect_type /home/pduplessis/repo/linux/tools/lib/traceevent/event-parse.c:1299
        #6 0x7fb07a72e6c8 in process_dynamic_array_len /home/pduplessis/repo/linux/tools/lib/traceevent/event-parse.c:2849
        #7 0x7fb07a7304b8 in process_function /home/pduplessis/repo/linux/tools/lib/traceevent/event-parse.c:3161
        #8 0x7fb07a730900 in process_arg_token /home/pduplessis/repo/linux/tools/lib/traceevent/event-parse.c:3207
        #9 0x7fb07a727c0b in process_arg /home/pduplessis/repo/linux/tools/lib/traceevent/event-parse.c:1786
        #10 0x7fb07a731080 in event_read_print_args /home/pduplessis/repo/linux/tools/lib/traceevent/event-parse.c:3285
        lkl#11 0x7fb07a731722 in event_read_print /home/pduplessis/repo/linux/tools/lib/traceevent/event-parse.c:3369
        lkl#12 0x7fb07a740054 in __tep_parse_format /home/pduplessis/repo/linux/tools/lib/traceevent/event-parse.c:6335
        lkl#13 0x7fb07a74047a in __parse_event /home/pduplessis/repo/linux/tools/lib/traceevent/event-parse.c:6389
        lkl#14 0x7fb07a740536 in tep_parse_format /home/pduplessis/repo/linux/tools/lib/traceevent/event-parse.c:6431
        lkl#15 0x7fb07a785acf in parse_event ../../../src/fs-src/fs.c:251
        lkl#16 0x7fb07a785ccd in parse_systems ../../../src/fs-src/fs.c:284
        lkl#17 0x7fb07a786fb3 in read_metadata ../../../src/fs-src/fs.c:593
        lkl#18 0x7fb07a78760e in ftrace_fs_source_init ../../../src/fs-src/fs.c:727
        lkl#19 0x7fb07d90c19c in add_component_with_init_method_data ../../../../src/lib/graph/graph.c:1048
        lkl#20 0x7fb07d90c87b in add_source_component_with_initialize_method_data ../../../../src/lib/graph/graph.c:1127
        lkl#21 0x7fb07d90c92a in bt_graph_add_source_component ../../../../src/lib/graph/graph.c:1152
        lkl#22 0x55db11aa632e in cmd_run_ctx_create_components_from_config_components ../../../src/cli/babeltrace2.c:2252
        lkl#23 0x55db11aa6fda in cmd_run_ctx_create_components ../../../src/cli/babeltrace2.c:2347
        lkl#24 0x55db11aa780c in cmd_run ../../../src/cli/babeltrace2.c:2461
        lkl#25 0x55db11aa8a7d in main ../../../src/cli/babeltrace2.c:2673
        lkl#26 0x7fb07d5460b2 in __libc_start_main (/lib/x86_64-linux-gnu/libc.so.6+0x270b2)

The token variable in the process_dynamic_array_len function is
allocated in the read_expect_type function, but is not freed before
calling the read_token function.

Free the token variable before calling read_token in order to plug the
leak.

Signed-off-by: Philippe Duplessis-Guindon <pduplessis@efficios.com>
Reviewed-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Link: https://lore.kernel.org/linux-trace-devel/20200730150236.5392-1-pduplessis@efficios.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
prp
prp approved these changes Sep 7, 2020
View reviewed changes
Copy link
Member

@prp prp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

tools/lkl/lib/posix-host.c Show resolved Hide resolved
@AntonioND
Copy link
Author

Note that this PR is needed before lsds/sgx-lkl#798 can be merged.

@AntonioND
lkl: Add hook to lkl_host_operations to get cpuinfo
89bd510
@AntonioND
lkl: Fill /proc/cpuinfo with information
51d6677 
For now, only the CPU number and related fields are known (and they are
the number of ethreads). The other fields are still fake.
@AntonioND
lkl: Add test that reads /proc/cpuinfo
33594c3 
This test reads from the file from two descriptors at the same time and
verifies that the file isn't empty and the contents read from both
descriptors are the same.

The current information in cpuinfo is hardcoded.
@AntonioND AntonioND merged commit eced6cd into lsds:upstream-refactor Sep 10, 2020
@AntonioND AntonioND deleted the an/cpuinfo branch September 10, 2020 13:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@davidchisnall davidchisnall davidchisnall approved these changes

@prp prp prp approved these changes

@vtikoo vtikoo vtikoo approved these changes

@wintersteiger wintersteiger Awaiting requested review from wintersteiger

@paulcallen paulcallen Awaiting requested review from paulcallen

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@AntonioND @davidchisnall @prp @vtikoo