Patch "perf tools: Use readdir() instead of deprecated readdir_r()" has been added to the 4.4-stable tree

[<gregkh@linuxfoundation.org>]

This is a note to let you know that I've just added the patch titled

    perf tools: 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-tools-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 <stable@vger.kernel.org> know about it.


>From 7093b4c963cc4e344e490c774924a180602a7092 Mon Sep 17 00:00:00 2001
From: Arnaldo Carvalho de Melo <acme@redhat.com>
Date: Fri, 8 Apr 2016 11:32:15 -0300
Subject: perf tools: Use readdir() instead of deprecated readdir_r()

From: Arnaldo Carvalho de Melo <acme@redhat.com>

commit 7093b4c963cc4e344e490c774924a180602a7092 upstream.

The readdir() function is thread safe as long as just one thread uses a
DIR, which is the case when synthesizing events for pre-existing threads
by traversing /proc, 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.

   CC       /tmp/build/perf/util/event.o
  util/event.c: In function '__event__synthesize_thread':
  util/event.c:466:2: error: 'readdir_r' is deprecated [-Werror=deprecated-declarations]
    while (!readdir_r(tasks, &dirent, &next) && next) {
    ^~~~~
  In file included from /usr/include/features.h:368:0,
                   from /usr/include/stdint.h:25,
                   from /usr/lib/gcc/x86_64-redhat-linux/6.0.0/include/stdint.h:9,
                   from /git/linux/tools/include/linux/types.h:6,
                   from util/event.c:1:
  /usr/include/dirent.h:189:12: note: declared here

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-i1vj7nyjp2p750rirxgrfd3c@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 tools/perf/util/event.c |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

--- a/tools/perf/util/event.c
+++ b/tools/perf/util/event.c
@@ -416,7 +416,7 @@ static int __event__synthesize_thread(un
 {
 	char filename[PATH_MAX];
 	DIR *tasks;
-	struct dirent dirent, *next;
+	struct dirent *dirent;
 	pid_t tgid, ppid;
 	int rc = 0;
 
@@ -445,11 +445,11 @@ static int __event__synthesize_thread(un
 		return 0;
 	}
 
-	while (!readdir_r(tasks, &dirent, &next) && next) {
+	while ((dirent = readdir(tasks)) != NULL) {
 		char *end;
 		pid_t _pid;
 
-		_pid = strtol(dirent.d_name, &end, 10);
+		_pid = strtol(dirent->d_name, &end, 10);
 		if (*end)
 			continue;
 
@@ -558,7 +558,7 @@ int perf_event__synthesize_threads(struc
 {
 	DIR *proc;
 	char proc_path[PATH_MAX];
-	struct dirent dirent, *next;
+	struct dirent *dirent;
 	union perf_event *comm_event, *mmap_event, *fork_event;
 	int err = -1;
 
@@ -583,9 +583,9 @@ int perf_event__synthesize_threads(struc
 	if (proc == NULL)
 		goto out_free_fork;
 
-	while (!readdir_r(proc, &dirent, &next) && next) {
+	while ((dirent = readdir(proc)) != NULL) {
 		char *end;
-		pid_t pid = strtol(dirent.d_name, &end, 10);
+		pid_t pid = strtol(dirent->d_name, &end, 10);
 
 		if (*end) /* only interested in proper numerical dirents */
 			continue;


Patches currently in stable-queue which might be from acme@redhat.com 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