github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-09-23 13:14:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

perf machine: Reuse module path buffer

Browse Source 
Rather than copying the path and appending the directory entry in a
fresh path buffer, append to the path at the end of where it is for
the recursion level. This saves a PATH_MAX buffer per recursion level
and some unnecessary copying.

Signed-off-by: Ian Rogers <irogers@google.com>
Link: https://lore.kernel.org/r/20250222061015.303622-9-irogers@google.com
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
This commit is contained in:
Ian Rogers 2025-02-21 22:10:13 -08:00 committed by Namhyung Kim
parent d996c726a5
commit e7af194681
1 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
tools/perf/util/machine.c
View File

@ -1338,22 +1338,23 @@ static int maps__set_module_path(struct maps *maps, const char *path, struct kmo
return 0; return 0;
} }
static int maps__set_modules_path_dir(struct maps *maps, const char *dir_name, int depth) static int maps__set_modules_path_dir(struct maps *maps, char *path, size_t path_size, int depth)
{ {
struct io_dirent64 *dent; struct io_dirent64 *dent;
struct io_dir iod; struct io_dir iod;
size_t root_len = strlen(path);
int ret = 0; int ret = 0;
io_dir__init(&iod, open(dir_name, O_CLOEXEC | O_DIRECTORY | O_RDONLY)); io_dir__init(&iod, open(path, O_CLOEXEC | O_DIRECTORY | O_RDONLY));
if (iod.dirfd < 0) { if (iod.dirfd < 0) {
pr_debug("%s: cannot open %s dir\n", __func__, dir_name); pr_debug("%s: cannot open %s dir\n", __func__, path);
return -1; return -1;
} }
/* Bounds check, should never happen. */
if (root_len >= path_size)
return -1;
path[root_len++] = '/';
while ((dent = io_dir__readdir(&iod)) != NULL) { while ((dent = io_dir__readdir(&iod)) != NULL) {
char path[PATH_MAX];
path__join(path, sizeof(path), dir_name, dent->d_name);
if (io_dir__is_dir(&iod, dent)) { if (io_dir__is_dir(&iod, dent)) {
if (!strcmp(dent->d_name, ".") || if (!strcmp(dent->d_name, ".") ||
!strcmp(dent->d_name, "..")) !strcmp(dent->d_name, ".."))
@ -1366,7 +1367,12 @@ static int maps__set_modules_path_dir(struct maps *maps, const char *dir_name, i
continue; continue;
} }
ret = maps__set_modules_path_dir(maps, path, depth + 1); /* Bounds check, should never happen. */
if (root_len + strlen(dent->d_name) >= path_size)
continue;
strcpy(path + root_len, dent->d_name);
ret = maps__set_modules_path_dir(maps, path, path_size, depth + 1);
if (ret < 0) if (ret < 0)
goto out; goto out;
} else { } else {
@ -1376,9 +1382,14 @@ static int maps__set_modules_path_dir(struct maps *maps, const char *dir_name, i
if (ret) if (ret)
goto out; goto out;
if (m.kmod) if (m.kmod) {
ret = maps__set_module_path(maps, path, &m); /* Bounds check, should never happen. */
if (root_len + strlen(dent->d_name) < path_size) {
strcpy(path + root_len, dent->d_name);
ret = maps__set_module_path(maps, path, &m);
}
}
zfree(&m.name); zfree(&m.name);
if (ret) if (ret)
@ -1404,7 +1415,8 @@ static int machine__set_modules_path(struct machine *machine)
machine->root_dir, version); machine->root_dir, version);
free(version); free(version);
return maps__set_modules_path_dir(machine__kernel_maps(machine), modules_path, 0); return maps__set_modules_path_dir(machine__kernel_maps(machine),
modules_path, sizeof(modules_path), 0);
} }
int __weak arch__fix_module_text_start(u64 *start __maybe_unused, int __weak arch__fix_module_text_start(u64 *start __maybe_unused,
u64 *size __maybe_unused, u64 *size __maybe_unused,