tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'trace-rtla-v5.20' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace

Browse Source 
Pull real time analysis tool (rtla) updates from Steven Rostedt:

 - Fix a double free

 - Define syscall numbers for RISCV

 - Fix Makefile when called from -C tools

 - Use calloc() to check for memory allocation failures

* tag 'trace-rtla-v5.20' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  rtla: Define syscall numbers for riscv
  rtla: Fix double free
  rtla: Fix Makefile when called from -C tools/
  rtla/utils: Use calloc and check the potential memory allocation failure
This commit is contained in:
Linus Torvalds
2022-08-05 09:35:46 -07:00
parent b2a88c212e dd0b15bda4
commit 29b1d469f3
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/tracing/rtla/Makefile
+1 -1
View File
@@ -1,6 +1,6 @@
NAME := rtla NAME := rtla
# Follow the kernel version # Follow the kernel version
VERSION := $(shell cat VERSION 2> /dev/null || make -sC ../../.. kernelversion) VERSION := $(shell cat VERSION 2> /dev/null || make -sC ../../.. kernelversion | grep -v make)
# From libtracefs: # From libtracefs:
# Makefiles suck: This macro sets a default value of $(2) for the # Makefiles suck: This macro sets a default value of $(2) for the
tools/tracing/rtla/src/trace.c
+7 -2
View File
@@ -134,13 +134,18 @@ void trace_instance_destroy(struct trace_instance *trace)
if (trace->inst) { if (trace->inst) {
disable_tracer(trace->inst); disable_tracer(trace->inst);
destroy_instance(trace->inst); destroy_instance(trace->inst);
trace->inst = NULL;
} }
if (trace->seq) if (trace->seq) {
free(trace->seq); free(trace->seq);
trace->seq = NULL;
}
if (trace->tep) if (trace->tep) {
tep_free(trace->tep); tep_free(trace->tep);
trace->tep = NULL;
}
} }
/* /*
tools/tracing/rtla/src/utils.c
+4 -3
View File
@@ -106,8 +106,9 @@ int parse_cpu_list(char *cpu_list, char **monitored_cpus)
nr_cpus = sysconf(_SC_NPROCESSORS_CONF); nr_cpus = sysconf(_SC_NPROCESSORS_CONF);
mon_cpus = malloc(nr_cpus * sizeof(char)); mon_cpus = calloc(nr_cpus, sizeof(char));
memset(mon_cpus, 0, (nr_cpus * sizeof(char))); if (!mon_cpus)
goto err;
for (p = cpu_list; *p; ) { for (p = cpu_list; *p; ) {
cpu = atoi(p); cpu = atoi(p);
@@ -224,7 +225,7 @@ long parse_ns_duration(char *val)
#elif __arm__ #elif __arm__
# define __NR_sched_setattr 380 # define __NR_sched_setattr 380
# define __NR_sched_getattr 381 # define __NR_sched_getattr 381
#elif __aarch64__ #elif __aarch64__ || __riscv
# define __NR_sched_setattr 274 # define __NR_sched_setattr 274
# define __NR_sched_getattr 275 # define __NR_sched_getattr 275
#elif __powerpc__ #elif __powerpc__