Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b130f83e authored by Adrian Hunter's avatar Adrian Hunter Committed by Greg Kroah-Hartman
Browse files

perf kcore_copy: Do not check /proc/modules is unchanged 



[ Upstream commit 5b427df27b94aec1312cace48a746782a0925c53 ]

/proc/kallsyms and /proc/modules are compared before and after the copy
in order to ensure no changes during the copy.

However /proc/modules also might change due to reference counts changing
even though that does not make any difference.

Any modules loaded or unloaded should be visible in changes to kallsyms,
so it is not necessary to check /proc/modules also anyway.

Remove the comparison checking that /proc/modules is unchanged.

Fixes: fc1b691d ("perf buildid-cache: Add ability to add kcore to the cache")
Reported-by: default avatarDaniel Dao <dqminh@cloudflare.com>
Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Tested-by: default avatarDaniel Dao <dqminh@cloudflare.com>
Acked-by: default avatarNamhyung Kim <namhyung@kernel.org>
Cc: Ian Rogers <irogers@google.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Link: https://lore.kernel.org/r/20220914122429.8770-1-adrian.hunter@intel.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 84ddf7b4

tools/perf/util/symbol-elf.c

+2 −5
Original line number Diff line number Diff line
@@ -1871,8 +1871,8 @@ static int kcore_copy__compare_file(const char *from_dir, const char *to_dir, 
 * unusual.  One significant peculiarity is that the mapping (start -> pgoff)

 * is not the same for the kernel map and the modules map.  That happens because

 * the data is copied adjacently whereas the original kcore has gaps.  Finally,

 * kallsyms and modules files are compared with their copies to check that

 * modules have not been loaded or unloaded while the copies were taking place.

 * kallsyms file is compared with its copy to check that modules have not been

 * loaded or unloaded while the copies were taking place.

 *

 * Return: %0 on success, %-1 on failure.

 */
@@ -1935,9 +1935,6 @@ int kcore_copy(const char *from_dir, const char *to_dir) 
			goto out_extract_close;

	}



	if (kcore_copy__compare_file(from_dir, to_dir, "modules"))

		goto out_extract_close;



	if (kcore_copy__compare_file(from_dir, to_dir, "kallsyms"))

		goto out_extract_close;