Patch "perf script: Use readdir() instead of deprecated readdir_r()" has been added to the 4.4-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
perf script: Use readdir() instead of deprecated readdir_r()
to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
perf-script-use-readdir-instead-of-deprecated-readdir_r.patch
and it can be found in the queue-4.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
a5e8e825bd1704c488bf6a46936aaf3b9f203d6aMon Sep 17 00:00:00 2001
From: Arnaldo Carvalho de Melo <[email protected]>
Date: Fri, 8 Apr 2016 11:25:59 -0300
Subject: perf script: Use readdir() instead of deprecated readdir_r()
From: Arnaldo Carvalho de Melo <[email protected]>
commit a5e8e825bd1704c488bf6a46936aaf3b9f203d6a upstream.
The readdir() function is thread safe as long as just one thread uses a DIR, which is the case in 'perf script', so, to avoid breaking the build with glibc-2.23.90 (upcoming 2.24), use it instead of readdir_r().
See: http://man7.org/linux/man-pages/man3/readdir.3.html
"However, in modern implementations (including the glibc implementation), concurrent calls to readdir() that specify different directory streams are thread-safe. In cases where multiple threads must read from the same directory stream, using readdir() with external synchronization is still preferable to the use of the deprecated readdir_r(3) function."
Noticed while building on a Fedora Rawhide docker container.
--- tools/perf/builtin-script.c | 70 +++++++++++++++++++++----------------------- 1 file changed, 34 insertions(+), 36 deletions(-)
tools/perf/builtin-script.c +34 -36
@@ -1252,21 +1252,19 @@ static int is_directory(const char *basereturn S_ISDIR (st.st_mode); } -#define for_each_lang (scripts_path, scripts_dir, lang_dirent, lang_next)\ - while (!readdir_r(scripts_dir, &lang_dirent, &lang_next) && \ - lang_next) \ - if ((lang_dirent.d_type == DT_DIR || \ - (lang_dirent.d_type == DT_UNKNOWN && \ - is_directory(scripts_path, &lang_dirent))) && \ - (strcmp(lang_dirent.d_name, ".")) && \ - (strcmp(lang_dirent.d_name, ".."))) - -#define for_each_script (lang_path, lang_dir, script_dirent, script_next)\ - while (!readdir_r(lang_dir, &script_dirent, &script_next) && \ - script_next) \ - if (script_dirent.d_type != DT_DIR && \ - (script_dirent.d_type != DT_UNKNOWN || \ - !is_directory(lang_path, &script_dirent))) +#define for_each_lang (scripts_path, scripts_dir, lang_dirent) \ + while ((lang_dirent = readdir(scripts_dir)) != NULL) \ + if ((lang_dirent->d_type == DT_DIR || \ + (lang_dirent->d_type == DT_UNKNOWN && \ + is_directory(scripts_path, lang_dirent))) && \ + (strcmp(lang_dirent->d_name, ".")) && \ + (strcmp(lang_dirent->d_name, ".."))) + +#define for_each_script (lang_path, lang_dir, script_dirent) \ + while ((script_dirent = readdir(lang_dir)) != NULL) \ + if (script_dirent->d_type != DT_DIR && \ + (script_dirent->d_type != DT_UNKNOWN || \ + !is_directory(lang_path, script_dirent)))#define RECORD_SUFFIX "-record"
@@ -1412,7 +1410,7 @@ static int list_available_scripts(const const char *s __maybe_unused, int unset __maybe_unused) { -struct dirent *script_next, *lang_next, script_dirent, lang_dirent; +struct dirent *script_dirent, *lang_dirent;char scripts_path[MAXPATHLEN ];DIR *scripts_dir, *lang_dir;char script_path[MAXPATHLEN ];
@@ -1427,19 +1425,19 @@ static int list_available_scripts(constif (!scripts_dir)return -1 ; -for_each_lang (scripts_path, scripts_dir, lang_dirent, lang_next) { +for_each_lang (scripts_path, scripts_dir, lang_dirent) {snprintf (lang_path,MAXPATHLEN ,"%s/%s/bin" , scripts_path, - lang_dirent.d_name); + lang_dirent->d_name); lang_dir =opendir (lang_path);if (!lang_dir)continue ; -for_each_script (lang_path, lang_dir, script_dirent, script_next) { - script_root =get_script_root (&script_dirent,REPORT_SUFFIX ); +for_each_script (lang_path, lang_dir, script_dirent) { + script_root =get_script_root (script_dirent,REPORT_SUFFIX );if (script_root) { desc =script_desc__findnew (script_root);snprintf (script_path,MAXPATHLEN ,"%s/%s" , - lang_path, script_dirent.d_name); + lang_path, script_dirent->d_name);read_script_info (desc, script_path);free (script_root); }
@@ -1527,7 +1525,7 @@ static int check_ev_match(char *dir_name*/ int find_scripts (char **scripts_array,char **scripts_path_array) { -struct dirent *script_next, *lang_next, script_dirent, lang_dirent; +struct dirent *script_dirent, *lang_dirent;char scripts_path[MAXPATHLEN ], lang_path[MAXPATHLEN ];DIR *scripts_dir, *lang_dir;struct perf_session *session;
@@ -1550,9 +1548,9 @@ int find_scripts(char **scripts_array, creturn -1 ; } -for_each_lang (scripts_path, scripts_dir, lang_dirent, lang_next) { +for_each_lang (scripts_path, scripts_dir, lang_dirent) {snprintf (lang_path,MAXPATHLEN ,"%s/%s" , scripts_path, - lang_dirent.d_name); + lang_dirent->d_name);#ifdef NO_LIBPERL if (strstr (lang_path,"perl" ))continue ;
@@ -1566,16 +1564,16 @@ int find_scripts(char **scripts_array, cif (!lang_dir)continue ; -for_each_script (lang_path, lang_dir, script_dirent, script_next) { +for_each_script (lang_path, lang_dir, script_dirent) {/* Skip those real time scripts: xxxtop.p[yl] */ -if (strstr (script_dirent.d_name,"top." )) +if (strstr (script_dirent->d_name,"top." ))continue ;sprintf (scripts_path_array[i],"%s/%s" , lang_path, - script_dirent.d_name); - temp =strchr (script_dirent.d_name,'.' ); + script_dirent->d_name); + temp =strchr (script_dirent->d_name,'.' );snprintf (scripts_array[i], - (temp - script_dirent.d_name) +1 , -"%s" , script_dirent.d_name); + (temp - script_dirent->d_name) +1 , +"%s" , script_dirent->d_name);if (check_ev_match (lang_path, scripts_array[i], session))
@@ -1593,7 +1591,7 @@ int find_scripts(char **scripts_array, cstatic char *get_script_path (const char *script_root,const char *suffix) { -struct dirent *script_next, *lang_next, script_dirent, lang_dirent; +struct dirent *script_dirent, *lang_dirent;char scripts_path[MAXPATHLEN ];char script_path[MAXPATHLEN ];DIR *scripts_dir, *lang_dir;
@@ -1606,21 +1604,21 @@ static char *get_script_path(const charif (!scripts_dir)return NULL ; -for_each_lang (scripts_path, scripts_dir, lang_dirent, lang_next) { +for_each_lang (scripts_path, scripts_dir, lang_dirent) {snprintf (lang_path,MAXPATHLEN ,"%s/%s/bin" , scripts_path, - lang_dirent.d_name); + lang_dirent->d_name); lang_dir =opendir (lang_path);if (!lang_dir)continue ; -for_each_script (lang_path, lang_dir, script_dirent, script_next) { - __script_root =get_script_root (&script_dirent, suffix); +for_each_script (lang_path, lang_dir, script_dirent) { + __script_root =get_script_root (script_dirent, suffix);if (__script_root && !strcmp (script_root, __script_root)) {free (__script_root);closedir (lang_dir);closedir (scripts_dir);snprintf (script_path,MAXPATHLEN ,"%s/%s" , - lang_path, script_dirent.d_name); + lang_path, script_dirent->d_name);return strdup (script_path); }free (__script_root);
Patches currently in stable-queue which might be from [email protected] are
queue-4.4/perf-tools-use-readdir-instead-of-deprecated-readdir_r.patch queue-4.4/perf-thread_map-correctly-size-buffer-used-with-dirent-dt_name.patch queue-4.4/perf-tests-remove-wrong-semicolon-in-while-loop-in-cqm-test.patch queue-4.4/perf-annotate-browser-fix-behaviour-of-shift-tab-with-nothing-focussed.patch queue-4.4/perf-tests-avoid-possible-truncation-with-dirent-d_name-snprintf.patch queue-4.4/perf-top-use-__fallthrough.patch queue-4.4/perf-scripting-perl-fix-compile-error-with-some-perl5-versions.patch queue-4.4/perf-bench-numa-avoid-possible-truncation-when-using-snprintf.patch queue-4.4/perf-tools-use-readdir-instead-of-deprecated-readdir_r-again.patch queue-4.4/perf-thread_map-use-readdir-instead-of-deprecated-readdir_r.patch queue-4.4/perf-tools-remove-duplicate-const-qualifier.patch queue-4.4/tools-string-use-__fallthrough-in-perf_atoll.patch queue-4.4/perf-intel-pt-use-__fallthrough.patch queue-4.4/perf-script-use-readdir-instead-of-deprecated-readdir_r.patch queue-4.4/tools-include-add-a-__fallthrough-statement.patch queue-4.4/tools-strfilter-use-__fallthrough.patch queue-4.4/perf-dwarf-guard-x86_64-definitions-under-ifdef-else-clause.patch queue-4.4/perf-pmu-fix-misleadingly-indented-assignment-whitespace.patch queue-4.4/perf-trace-do-not-process-perf_record_lost-twice.patch