Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1224696 > unrolled thread

[tip:perf/core] tools lib api fs: Remove debugfs, tracefs and findfs objects

Back to article view | Back to linux.kernel

This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by below is the oldest one visible, not the original post.

Contents

  [tip:perf/core] tools lib api fs: Remove debugfs,   tracefs and findfs objects tip-bot for Jiri Olsa <tipbot@zytor.com> - 2015-09-15 09:10 +0200
    Re: [tip:perf/core] tools lib api fs: Remove debugfs, tracefs and  findfs objects Vinson Lee <vlee@twopensource.com> - 2015-09-22 02:30 +0200
      Re: [tip:perf/core] tools lib api fs: Remove debugfs, tracefs and  findfs objects Arnaldo Carvalho de Melo <acme@redhat.com> - 2015-09-22 16:00 +0200
        Re: [tip:perf/core] tools lib api fs: Remove debugfs, tracefs and  findfs objects Vinson Lee <vlee@twopensource.com> - 2015-09-22 23:30 +0200
      Re: [tip:perf/core] tools lib api fs: Remove debugfs, tracefs and  findfs objects Matt Fleming <matt@codeblueprint.co.uk> - 2015-09-23 10:30 +0200
        Re: [tip:perf/core] tools lib api fs: Remove debugfs, tracefs and  findfs objects Jiri Olsa <jolsa@redhat.com> - 2015-09-23 10:40 +0200
          Re: [tip:perf/core] tools lib api fs: Remove debugfs, tracefs and  findfs objects Matt Fleming <matt@codeblueprint.co.uk> - 2015-09-23 12:10 +0200
            Re: [tip:perf/core] tools lib api fs: Remove debugfs, tracefs and  findfs objects Michael Petlan <mpetlan@redhat.com> - 2015-09-24 17:10 +0200
          Re: [tip:perf/core] tools lib api fs: Remove debugfs, tracefs and  findfs objects Arnaldo Carvalho de Melo <acme@redhat.com> - 2015-09-23 15:50 +0200
            Re: [tip:perf/core] tools lib api fs: Remove debugfs, tracefs and  findfs objects Jiri Olsa <jolsa@redhat.com> - 2015-09-23 16:00 +0200
              Re: [tip:perf/core] tools lib api fs: Remove debugfs, tracefs and  findfs objects Arnaldo Carvalho de Melo <acme@redhat.com> - 2015-09-23 16:00 +0200
            Re: [tip:perf/core] tools lib api fs: Remove debugfs, tracefs and  findfs objects Matt Fleming <matt@codeblueprint.co.uk> - 2015-09-24 14:20 +0200
              Re: [tip:perf/core] tools lib api fs: Remove debugfs, tracefs and  findfs objects Arnaldo Carvalho de Melo <acme@redhat.com> - 2015-09-24 16:30 +0200

#1224696 — [tip:perf/core] tools lib api fs: Remove debugfs, tracefs and findfs objects

Commit-ID:  60a1133a5b39738671eff1e4d77bedc1ee3fa528
Gitweb:     http://git.kernel.org/tip/60a1133a5b39738671eff1e4d77bedc1ee3fa528
Author:     Jiri Olsa <jolsa@kernel.org>
AuthorDate: Wed, 2 Sep 2015 09:56:44 +0200
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Mon, 14 Sep 2015 12:50:15 -0300

tools lib api fs: Remove debugfs, tracefs and findfs objects

We have all the functionality in fs.c, let's remove unneeded
objects.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Matt Fleming <matt@codeblueprint.co.uk>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Raphael Beamonte <raphael.beamonte@gmail.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Link: http://lkml.kernel.org/r/1441180605-24737-15-git-send-email-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/lib/api/fs/Build     |  3 --
 tools/lib/api/fs/debugfs.c | 77 ---------------------------------------------
 tools/lib/api/fs/debugfs.h | 23 --------------
 tools/lib/api/fs/findfs.c  | 63 -------------------------------------
 tools/lib/api/fs/findfs.h  | 23 --------------
 tools/lib/api/fs/tracefs.c | 78 ----------------------------------------------
 tools/lib/api/fs/tracefs.h | 21 -------------
 7 files changed, 288 deletions(-)

diff --git a/tools/lib/api/fs/Build b/tools/lib/api/fs/Build
index fa726f6..f4ed962 100644
--- a/tools/lib/api/fs/Build
+++ b/tools/lib/api/fs/Build
@@ -1,5 +1,2 @@
 libapi-y += fs.o
 libapi-y += tracing_path.o
-libapi-y += debugfs.o
-libapi-y += findfs.o
-libapi-y += tracefs.o
diff --git a/tools/lib/api/fs/debugfs.c b/tools/lib/api/fs/debugfs.c
deleted file mode 100644
index c707cfb..0000000
--- a/tools/lib/api/fs/debugfs.c
+++ /dev/null
@@ -1,77 +0,0 @@
-#define _GNU_SOURCE
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <stdbool.h>
-#include <sys/vfs.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/mount.h>
-#include <linux/kernel.h>
-
-#include "debugfs.h"
-#include "tracefs.h"
-
-#ifndef DEBUGFS_DEFAULT_PATH
-#define DEBUGFS_DEFAULT_PATH		"/sys/kernel/debug"
-#endif
-
-char debugfs_mountpoint[PATH_MAX + 1] = DEBUGFS_DEFAULT_PATH;
-
-static const char * const debugfs_known_mountpoints[] = {
-	DEBUGFS_DEFAULT_PATH,
-	"/debug",
-	0,
-};
-
-static bool debugfs_found;
-
-bool debugfs_configured(void)
-{
-	return debugfs_find_mountpoint() != NULL;
-}
-
-/* find the path to the mounted debugfs */
-const char *debugfs_find_mountpoint(void)
-{
-	const char *ret;
-
-	if (debugfs_found)
-		return (const char *)debugfs_mountpoint;
-
-	ret = find_mountpoint("debugfs", (long) DEBUGFS_MAGIC,
-			      debugfs_mountpoint, PATH_MAX + 1,
-			      debugfs_known_mountpoints);
-	if (ret)
-		debugfs_found = true;
-
-	return ret;
-}
-
-/* mount the debugfs somewhere if it's not mounted */
-char *debugfs_mount(const char *mountpoint)
-{
-	/* see if it's already mounted */
-	if (debugfs_find_mountpoint())
-		goto out;
-
-	/* if not mounted and no argument */
-	if (mountpoint == NULL) {
-		/* see if environment variable set */
-		mountpoint = getenv(PERF_DEBUGFS_ENVIRONMENT);
-		/* if no environment variable, use default */
-		if (mountpoint == NULL)
-			mountpoint = DEBUGFS_DEFAULT_PATH;
-	}
-
-	if (mount(NULL, mountpoint, "debugfs", 0, NULL) < 0)
-		return NULL;
-
-	/* save the mountpoint */
-	debugfs_found = true;
-	strncpy(debugfs_mountpoint, mountpoint, sizeof(debugfs_mountpoint));
-out:
-	return debugfs_mountpoint;
-}
diff --git a/tools/lib/api/fs/debugfs.h b/tools/lib/api/fs/debugfs.h
deleted file mode 100644
index 4550236..0000000
--- a/tools/lib/api/fs/debugfs.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef __API_DEBUGFS_H__
-#define __API_DEBUGFS_H__
-
-#include "findfs.h"
-
-#ifndef DEBUGFS_MAGIC
-#define DEBUGFS_MAGIC          0x64626720
-#endif
-
-#ifndef PERF_DEBUGFS_ENVIRONMENT
-#define PERF_DEBUGFS_ENVIRONMENT "PERF_DEBUGFS_DIR"
-#endif
-
-bool debugfs_configured(void);
-const char *debugfs_find_mountpoint(void);
-char *debugfs_mount(const char *mountpoint);
-
-extern char debugfs_mountpoint[];
-
-int debugfs__strerror_open(int err, char *buf, size_t size, const char *filename);
-int debugfs__strerror_open_tp(int err, char *buf, size_t size, const char *sys, const char *name);
-
-#endif /* __API_DEBUGFS_H__ */
diff --git a/tools/lib/api/fs/findfs.c b/tools/lib/api/fs/findfs.c
deleted file mode 100644
index 49946cb..0000000
--- a/tools/lib/api/fs/findfs.c
+++ /dev/null
@@ -1,63 +0,0 @@
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdbool.h>
-#include <sys/vfs.h>
-
-#include "findfs.h"
-
-/* verify that a mountpoint is actually the type we want */
-
-int valid_mountpoint(const char *mount, long magic)
-{
-	struct statfs st_fs;
-
-	if (statfs(mount, &st_fs) < 0)
-		return -ENOENT;
-	else if ((long)st_fs.f_type != magic)
-		return -ENOENT;
-
-	return 0;
-}
-
-/* find the path to a mounted file system */
-const char *find_mountpoint(const char *fstype, long magic,
-			    char *mountpoint, int len,
-			    const char * const *known_mountpoints)
-{
-	const char * const *ptr;
-	char format[128];
-	char type[100];
-	FILE *fp;
-
-	if (known_mountpoints) {
-		ptr = known_mountpoints;
-		while (*ptr) {
-			if (valid_mountpoint(*ptr, magic) == 0) {
-				strncpy(mountpoint, *ptr, len - 1);
-				mountpoint[len-1] = 0;
-				return mountpoint;
-			}
-			ptr++;
-		}
-	}
-
-	/* give up and parse /proc/mounts */
-	fp = fopen("/proc/mounts", "r");
-	if (fp == NULL)
-		return NULL;
-
-	snprintf(format, 128, "%%*s %%%ds %%99s %%*s %%*d %%*d\n", len);
-
-	while (fscanf(fp, format, mountpoint, type) == 2) {
-		if (strcmp(type, fstype) == 0)
-			break;
-	}
-	fclose(fp);
-
-	if (strcmp(type, fstype) != 0)
-		return NULL;
-
-	return mountpoint;
-}
diff --git a/tools/lib/api/fs/findfs.h b/tools/lib/api/fs/findfs.h
deleted file mode 100644
index b6f5d05..0000000
--- a/tools/lib/api/fs/findfs.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef __API_FINDFS_H__
-#define __API_FINDFS_H__
-
-#include <stdbool.h>
-
-#define _STR(x) #x
-#define STR(x) _STR(x)
-
-/*
- * On most systems <limits.h> would have given us this, but  not on some systems
- * (e.g. GNU/Hurd).
- */
-#ifndef PATH_MAX
-#define PATH_MAX 4096
-#endif
-
-const char *find_mountpoint(const char *fstype, long magic,
-			    char *mountpoint, int len,
-			    const char * const *known_mountpoints);
-
-int valid_mountpoint(const char *mount, long magic);
-
-#endif /* __API_FINDFS_H__ */
diff --git a/tools/lib/api/fs/tracefs.c b/tools/lib/api/fs/tracefs.c
deleted file mode 100644
index e4aa968..0000000
--- a/tools/lib/api/fs/tracefs.c
+++ /dev/null
@@ -1,78 +0,0 @@
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <stdbool.h>
-#include <sys/vfs.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/mount.h>
-#include <linux/kernel.h>
-
-#include "tracefs.h"
-
-#ifndef TRACEFS_DEFAULT_PATH
-#define TRACEFS_DEFAULT_PATH		"/sys/kernel/tracing"
-#endif
-
-char tracefs_mountpoint[PATH_MAX + 1] = TRACEFS_DEFAULT_PATH;
-
-static const char * const tracefs_known_mountpoints[] = {
-	TRACEFS_DEFAULT_PATH,
-	"/sys/kernel/debug/tracing",
-	"/tracing",
-	"/trace",
-	0,
-};
-
-static bool tracefs_found;
-
-bool tracefs_configured(void)
-{
-	return tracefs_find_mountpoint() != NULL;
-}
-
-/* find the path to the mounted tracefs */
-const char *tracefs_find_mountpoint(void)
-{
-	const char *ret;
-
-	if (tracefs_found)
-		return (const char *)tracefs_mountpoint;
-
-	ret = find_mountpoint("tracefs", (long) TRACEFS_MAGIC,
-			      tracefs_mountpoint, PATH_MAX + 1,
-			      tracefs_known_mountpoints);
-
-	if (ret)
-		tracefs_found = true;
-
-	return ret;
-}
-
-/* mount the tracefs somewhere if it's not mounted */
-char *tracefs_mount(const char *mountpoint)
-{
-	/* see if it's already mounted */
-	if (tracefs_find_mountpoint())
-		goto out;
-
-	/* if not mounted and no argument */
-	if (mountpoint == NULL) {
-		/* see if environment variable set */
-		mountpoint = getenv(PERF_TRACEFS_ENVIRONMENT);
-		/* if no environment variable, use default */
-		if (mountpoint == NULL)
-			mountpoint = TRACEFS_DEFAULT_PATH;
-	}
-
-	if (mount(NULL, mountpoint, "tracefs", 0, NULL) < 0)
-		return NULL;
-
-	/* save the mountpoint */
-	tracefs_found = true;
-	strncpy(tracefs_mountpoint, mountpoint, sizeof(tracefs_mountpoint));
-out:
-	return tracefs_mountpoint;
-}
diff --git a/tools/lib/api/fs/tracefs.h b/tools/lib/api/fs/tracefs.h
deleted file mode 100644
index da780ac..0000000
--- a/tools/lib/api/fs/tracefs.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef __API_TRACEFS_H__
-#define __API_TRACEFS_H__
-
-#include "findfs.h"
-
-#ifndef TRACEFS_MAGIC
-#define TRACEFS_MAGIC          0x74726163
-#endif
-
-#ifndef PERF_TRACEFS_ENVIRONMENT
-#define PERF_TRACEFS_ENVIRONMENT "PERF_TRACEFS_DIR"
-#endif
-
-bool tracefs_configured(void);
-const char *tracefs_find_mountpoint(void);
-int tracefs_valid_mountpoint(const char *debugfs);
-char *tracefs_mount(const char *mountpoint);
-
-extern char tracefs_mountpoint[];
-
-#endif /* __API_DEBUGFS_H__ */
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [next] | [standalone]

#1229857 — Re: [tip:perf/core] tools lib api fs: Remove debugfs, tracefs and findfs objects

On Mon, Sep 14, 2015 at 11:59 PM, tip-bot for Jiri Olsa
<tipbot@zytor.com> wrote:
> Commit-ID:  60a1133a5b39738671eff1e4d77bedc1ee3fa528
> Gitweb:     http://git.kernel.org/tip/60a1133a5b39738671eff1e4d77bedc1ee3fa528
> Author:     Jiri Olsa <jolsa@kernel.org>
> AuthorDate: Wed, 2 Sep 2015 09:56:44 +0200
> Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
> CommitDate: Mon, 14 Sep 2015 12:50:15 -0300
>
> tools lib api fs: Remove debugfs, tracefs and findfs objects
>
> We have all the functionality in fs.c, let's remove unneeded
> objects.
>
> Signed-off-by: Jiri Olsa <jolsa@kernel.org>
> Cc: David Ahern <dsahern@gmail.com>
> Cc: Matt Fleming <matt@codeblueprint.co.uk>
> Cc: Namhyung Kim <namhyung@kernel.org>
> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
> Cc: Raphael Beamonte <raphael.beamonte@gmail.com>
> Cc: Steven Rostedt <rostedt@goodmis.org>
> Link: http://lkml.kernel.org/r/1441180605-24737-15-git-send-email-jolsa@kernel.org
> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

Hi.

This commit seems to have introduced a build failure with tools/vm.

$ make -C tools vm
[...]
gcc -Wall -Wextra -I../lib/ -o page-types page-types.c ../lib/api/libapi.a
page-types.c:45:28: fatal error: api/fs/debugfs.h: No such file or directory
 #include <api/fs/debugfs.h>
                            ^

Cheers,
Vinson
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]

#1230237 — Re: [tip:perf/core] tools lib api fs: Remove debugfs, tracefs and findfs objects

Em Mon, Sep 21, 2015 at 05:20:03PM -0700, Vinson Lee escreveu:
> On Mon, Sep 14, 2015 at 11:59 PM, tip-bot for Jiri Olsa
> <tipbot@zytor.com> wrote:
> > Commit-ID:  60a1133a5b39738671eff1e4d77bedc1ee3fa528
> > Gitweb:     http://git.kernel.org/tip/60a1133a5b39738671eff1e4d77bedc1ee3fa528
> > Author:     Jiri Olsa <jolsa@kernel.org>
> > AuthorDate: Wed, 2 Sep 2015 09:56:44 +0200
> > Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
> > CommitDate: Mon, 14 Sep 2015 12:50:15 -0300
> >
> > tools lib api fs: Remove debugfs, tracefs and findfs objects
> >
> > We have all the functionality in fs.c, let's remove unneeded
> > objects.
> >
> > Signed-off-by: Jiri Olsa <jolsa@kernel.org>
> > Cc: David Ahern <dsahern@gmail.com>
> > Cc: Matt Fleming <matt@codeblueprint.co.uk>
> > Cc: Namhyung Kim <namhyung@kernel.org>
> > Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
> > Cc: Raphael Beamonte <raphael.beamonte@gmail.com>
> > Cc: Steven Rostedt <rostedt@goodmis.org>
> > Link: http://lkml.kernel.org/r/1441180605-24737-15-git-send-email-jolsa@kernel.org
> > Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
> 
> Hi.
> 
> This commit seems to have introduced a build failure with tools/vm.
> 
> $ make -C tools vm
> [...]
> gcc -Wall -Wextra -I../lib/ -o page-types page-types.c ../lib/api/libapi.a
> page-types.c:45:28: fatal error: api/fs/debugfs.h: No such file or directory
>  #include <api/fs/debugfs.h>

Can you please check if this solves the problem?

- Arnaldo

diff --git a/tools/vm/page-types.c b/tools/vm/page-types.c
index 7f73fa32a590..bcf5ec760eb9 100644
--- a/tools/vm/page-types.c
+++ b/tools/vm/page-types.c
@@ -42,7 +42,7 @@
 #include <sys/mman.h>
 #include "../../include/uapi/linux/magic.h"
 #include "../../include/uapi/linux/kernel-page-flags.h"
-#include <api/fs/debugfs.h>
+#include <api/fs/fs.h>
 
 #ifndef MAX_PATH
 # define MAX_PATH 256
@@ -188,7 +188,7 @@ static int		kpageflags_fd;
 static int		opt_hwpoison;
 static int		opt_unpoison;
 
-static char		*hwpoison_debug_fs;
+static const char	*hwpoison_debug_fs;
 static int		hwpoison_inject_fd;
 static int		hwpoison_forget_fd;
 
@@ -487,7 +487,7 @@ static void prepare_hwpoison_fd(void)
 {
 	char buf[MAX_PATH + 1];
 
-	hwpoison_debug_fs = debugfs_mount(NULL);
+	hwpoison_debug_fs = debugfs__mount();
 	if (!hwpoison_debug_fs) {
 		perror("mount debugfs");
 		exit(EXIT_FAILURE);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]

#1230966 — Re: [tip:perf/core] tools lib api fs: Remove debugfs, tracefs and findfs objects

On Tue, Sep 22, 2015 at 6:53 AM, Arnaldo Carvalho de Melo
<acme@redhat.com> wrote:
> Em Mon, Sep 21, 2015 at 05:20:03PM -0700, Vinson Lee escreveu:
>> On Mon, Sep 14, 2015 at 11:59 PM, tip-bot for Jiri Olsa
>> <tipbot@zytor.com> wrote:
>> > Commit-ID:  60a1133a5b39738671eff1e4d77bedc1ee3fa528
>> > Gitweb:     http://git.kernel.org/tip/60a1133a5b39738671eff1e4d77bedc1ee3fa528
>> > Author:     Jiri Olsa <jolsa@kernel.org>
>> > AuthorDate: Wed, 2 Sep 2015 09:56:44 +0200
>> > Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
>> > CommitDate: Mon, 14 Sep 2015 12:50:15 -0300
>> >
>> > tools lib api fs: Remove debugfs, tracefs and findfs objects
>> >
>> > We have all the functionality in fs.c, let's remove unneeded
>> > objects.
>> >
>> > Signed-off-by: Jiri Olsa <jolsa@kernel.org>
>> > Cc: David Ahern <dsahern@gmail.com>
>> > Cc: Matt Fleming <matt@codeblueprint.co.uk>
>> > Cc: Namhyung Kim <namhyung@kernel.org>
>> > Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
>> > Cc: Raphael Beamonte <raphael.beamonte@gmail.com>
>> > Cc: Steven Rostedt <rostedt@goodmis.org>
>> > Link: http://lkml.kernel.org/r/1441180605-24737-15-git-send-email-jolsa@kernel.org
>> > Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
>>
>> Hi.
>>
>> This commit seems to have introduced a build failure with tools/vm.
>>
>> $ make -C tools vm
>> [...]
>> gcc -Wall -Wextra -I../lib/ -o page-types page-types.c ../lib/api/libapi.a
>> page-types.c:45:28: fatal error: api/fs/debugfs.h: No such file or directory
>>  #include <api/fs/debugfs.h>
>
> Can you please check if this solves the problem?
>
> - Arnaldo
>
> diff --git a/tools/vm/page-types.c b/tools/vm/page-types.c
> index 7f73fa32a590..bcf5ec760eb9 100644
> --- a/tools/vm/page-types.c
> +++ b/tools/vm/page-types.c
> @@ -42,7 +42,7 @@
>  #include <sys/mman.h>
>  #include "../../include/uapi/linux/magic.h"
>  #include "../../include/uapi/linux/kernel-page-flags.h"
> -#include <api/fs/debugfs.h>
> +#include <api/fs/fs.h>
>
>  #ifndef MAX_PATH
>  # define MAX_PATH 256
> @@ -188,7 +188,7 @@ static int          kpageflags_fd;
>  static int             opt_hwpoison;
>  static int             opt_unpoison;
>
> -static char            *hwpoison_debug_fs;
> +static const char      *hwpoison_debug_fs;
>  static int             hwpoison_inject_fd;
>  static int             hwpoison_forget_fd;
>
> @@ -487,7 +487,7 @@ static void prepare_hwpoison_fd(void)
>  {
>         char buf[MAX_PATH + 1];
>
> -       hwpoison_debug_fs = debugfs_mount(NULL);
> +       hwpoison_debug_fs = debugfs__mount();
>         if (!hwpoison_debug_fs) {
>                 perror("mount debugfs");
>                 exit(EXIT_FAILURE);


Yes, this patch fixes the build for me.

Vinson
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]

#1231225 — Re: [tip:perf/core] tools lib api fs: Remove debugfs, tracefs and findfs objects

On Mon, 21 Sep, at 05:20:03PM, Vinson Lee wrote:
> On Mon, Sep 14, 2015 at 11:59 PM, tip-bot for Jiri Olsa
> <tipbot@zytor.com> wrote:
> > Commit-ID:  60a1133a5b39738671eff1e4d77bedc1ee3fa528
> > Gitweb:     http://git.kernel.org/tip/60a1133a5b39738671eff1e4d77bedc1ee3fa528
> > Author:     Jiri Olsa <jolsa@kernel.org>
> > AuthorDate: Wed, 2 Sep 2015 09:56:44 +0200
> > Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
> > CommitDate: Mon, 14 Sep 2015 12:50:15 -0300
> >
> > tools lib api fs: Remove debugfs, tracefs and findfs objects
> >
> > We have all the functionality in fs.c, let's remove unneeded
> > objects.
> >
> > Signed-off-by: Jiri Olsa <jolsa@kernel.org>
> > Cc: David Ahern <dsahern@gmail.com>
> > Cc: Matt Fleming <matt@codeblueprint.co.uk>
> > Cc: Namhyung Kim <namhyung@kernel.org>
> > Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
> > Cc: Raphael Beamonte <raphael.beamonte@gmail.com>
> > Cc: Steven Rostedt <rostedt@goodmis.org>
> > Link: http://lkml.kernel.org/r/1441180605-24737-15-git-send-email-jolsa@kernel.org
> > Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
> 
> Hi.
> 
> This commit seems to have introduced a build failure with tools/vm.
> 
> $ make -C tools vm
> [...]
> gcc -Wall -Wextra -I../lib/ -o page-types page-types.c ../lib/api/libapi.a
> page-types.c:45:28: fatal error: api/fs/debugfs.h: No such file or directory
>  #include <api/fs/debugfs.h>

Given the ferocious pace of development of tools/perf, is there not
some kind of automated build that happens when new patches are picked
up, before they're pushed out?

Things are refactored and changed so fast in this area (I dare say
faster than almost any other part of the kernel source tree) that not
having the safety net of automated builds just seems suicidal.

And that doesn't even begin to cover runtime testing, since I've
noticed things breaking in tools/perf and people not catching it
immediately.

Does automated testing exist for perf tools development?

-- 
Matt Fleming, Intel Open Source Technology Center
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]

#1231231 — Re: [tip:perf/core] tools lib api fs: Remove debugfs, tracefs and findfs objects

On Wed, Sep 23, 2015 at 09:23:02AM +0100, Matt Fleming wrote:
> On Mon, 21 Sep, at 05:20:03PM, Vinson Lee wrote:
> > On Mon, Sep 14, 2015 at 11:59 PM, tip-bot for Jiri Olsa
> > <tipbot@zytor.com> wrote:
> > > Commit-ID:  60a1133a5b39738671eff1e4d77bedc1ee3fa528
> > > Gitweb:     http://git.kernel.org/tip/60a1133a5b39738671eff1e4d77bedc1ee3fa528
> > > Author:     Jiri Olsa <jolsa@kernel.org>
> > > AuthorDate: Wed, 2 Sep 2015 09:56:44 +0200
> > > Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
> > > CommitDate: Mon, 14 Sep 2015 12:50:15 -0300
> > >
> > > tools lib api fs: Remove debugfs, tracefs and findfs objects
> > >
> > > We have all the functionality in fs.c, let's remove unneeded
> > > objects.
> > >
> > > Signed-off-by: Jiri Olsa <jolsa@kernel.org>
> > > Cc: David Ahern <dsahern@gmail.com>
> > > Cc: Matt Fleming <matt@codeblueprint.co.uk>
> > > Cc: Namhyung Kim <namhyung@kernel.org>
> > > Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
> > > Cc: Raphael Beamonte <raphael.beamonte@gmail.com>
> > > Cc: Steven Rostedt <rostedt@goodmis.org>
> > > Link: http://lkml.kernel.org/r/1441180605-24737-15-git-send-email-jolsa@kernel.org
> > > Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
> > 
> > Hi.
> > 
> > This commit seems to have introduced a build failure with tools/vm.
> > 
> > $ make -C tools vm
> > [...]
> > gcc -Wall -Wextra -I../lib/ -o page-types page-types.c ../lib/api/libapi.a
> > page-types.c:45:28: fatal error: api/fs/debugfs.h: No such file or directory
> >  #include <api/fs/debugfs.h>
> 
> Given the ferocious pace of development of tools/perf, is there not
> some kind of automated build that happens when new patches are picked
> up, before they're pushed out?
> 
> Things are refactored and changed so fast in this area (I dare say
> faster than almost any other part of the kernel source tree) that not
> having the safety net of automated builds just seems suicidal.
> 
> And that doesn't even begin to cover runtime testing, since I've
> noticed things breaking in tools/perf and people not catching it
> immediately.
> 
> Does automated testing exist for perf tools development?

heh, we've been playing game "who first mention it in public will implement it" ... you won! ;-)

AFAIK we have: 
  - 'perf test' for perf specific functionality
  - 'make -f tests/make' for building
  - build framework tests

I 'try' to run those before sending anything out, but we dont have
automated thing that would run it any time Arnaldo push new perf/core.

The RedHat QE has some more perf tool tests. There was some movement
to make those public, but not sure how it ended up.. ccing Michael Petlan
for news on this ;-)

jirka
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]

#1231303 — Re: [tip:perf/core] tools lib api fs: Remove debugfs, tracefs and findfs objects

On Wed, 23 Sep, at 10:39:06AM, Jiri Olsa wrote:
> On Wed, Sep 23, 2015 at 09:23:02AM +0100, Matt Fleming wrote:
> > 
> > Does automated testing exist for perf tools development?
> 
> heh, we've been playing game "who first mention it in public will implement it" ... you won! ;-)
 
Hehe, whoops!

> AFAIK we have: 
>   - 'perf test' for perf specific functionality
>   - 'make -f tests/make' for building
>   - build framework tests
> 
> I 'try' to run those before sending anything out, but we dont have
> automated thing that would run it any time Arnaldo push new perf/core.
 
Right. The problem with manual steps is that they're easy to forget.
Furthermore, it actively discourages you from adding new testing
functionality that requires more manual steps (who wants to remember
to type another command?).

Yes, you can script it, but then every developer ends up with their
own version, which get out of sync, or work slightly differently etc.

Also, now that we've potentially got perf arch tests coming [1] you or
Arnaldo may not always have the hardware available to ensure that no
regressions were introduced to the runtime testing, or the OS
installations to perform build testing, for say, Ubuntu or OpenSUSE.

That is kind of a separate problem (automated testing of a matrix of
OS and hardware configs), but having a single, standard way to
automate build/runtime testing of tools/perf is the first step.

> The RedHat QE has some more perf tool tests. There was some movement
> to make those public, but not sure how it ended up.. ccing Michael Petlan
> for news on this ;-)

Cool! I'd definitely be interested in knowing the details.

[1] - https://lkml.kernel.org/r/1441479742-15402-1-git-send-email-matt@codeblueprint.co.uk

-- 
Matt Fleming, Intel Open Source Technology Center
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]

#1232175 — Re: [tip:perf/core] tools lib api fs: Remove debugfs, tracefs and findfs objects

On Wed, 2015-09-23 at 11:08 +0100, Matt Fleming wrote:

[SNIP]

> > The RedHat QE has some more perf tool tests. There was some movement
> > to make those public, but not sure how it ended up.. ccing Michael Petlan
> > for news on this ;-)
> 
> Cool! I'd definitely be interested in knowing the details.
> 

Hi!

Yes, we have some tests, but they really need some refactoring and then
extending.

There are many "regression" tests that cover some extreme situations
that failed with some kernel/perf version on some hardware. They are
probably not very useful for the purpose mentioned here.

Then there are some tests that should cover basic functionality and
check for the correctness of perf's behaviour. Since it became being
pretty messy, I have got an idea to rewrite that in a more structured
and robust way and make it public.

So I started with some skeleton and tests for perf stat builtin sub
command [1]. My idea is to port there all the meaningful tests that
we have at Red Hat. Then I will be happy if someone else is interested
in contributing some more coverage, ideas or whatever...

I am on a PTO for two weeks from now, so I will respond after it, if you
have any questions, suggestions or ideas.


Regards,
Michael



[1] https://github.com/rfmvh/perftool-testsuite


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]

#1231453 — Re: [tip:perf/core] tools lib api fs: Remove debugfs, tracefs and findfs objects

Em Wed, Sep 23, 2015 at 10:39:06AM +0200, Jiri Olsa escreveu:
> On Wed, Sep 23, 2015 at 09:23:02AM +0100, Matt Fleming wrote:
> > On Mon, 21 Sep, at 05:20:03PM, Vinson Lee wrote:
> > > This commit seems to have introduced a build failure with tools/vm.
> > > 
> > > $ make -C tools vm
> > > [...]
> > > gcc -Wall -Wextra -I../lib/ -o page-types page-types.c ../lib/api/libapi.a
> > > page-types.c:45:28: fatal error: api/fs/debugfs.h: No such file or directory
> > >  #include <api/fs/debugfs.h>
> > 
> > Given the ferocious pace of development of tools/perf, is there not
> > some kind of automated build that happens when new patches are picked
> > up, before they're pushed out?

> > Things are refactored and changed so fast in this area (I dare say
> > faster than almost any other part of the kernel source tree) that not
> > having the safety net of automated builds just seems suicidal.

Well, I don't want to die, and I work with people that would kill me if
I behaved that way, so I think its not _that_ bad, there are safeguards,
and we're always thinking about adding some more. 8-)

> > And that doesn't even begin to cover runtime testing, since I've
> > noticed things breaking in tools/perf and people not catching it
> > immediately.
> > 
> > Does automated testing exist for perf tools development?
 
> heh, we've been playing game "who first mention it in public will
> implement it" ... you won! ;-)

Nah, you did lotsa already with tools/perf/tests/make

[acme@zoo linux]$ grep ^make tools/perf/tests/make 
make_clean_all      := clean all
make_python_perf_so := python/perf.so
make_debug          := DEBUG=1
make_no_libperl     := NO_LIBPERL=1
make_no_libpython   := NO_LIBPYTHON=1
make_no_scripts     := NO_LIBPYTHON=1 NO_LIBPERL=1
make_no_newt        := NO_NEWT=1
make_no_slang       := NO_SLANG=1
make_no_gtk2        := NO_GTK2=1
make_no_ui          := NO_NEWT=1 NO_SLANG=1 NO_GTK2=1
make_no_demangle    := NO_DEMANGLE=1
make_no_libelf      := NO_LIBELF=1
make_no_libunwind   := NO_LIBUNWIND=1
make_no_libdw_dwarf_unwind := NO_LIBDW_DWARF_UNWIND=1
make_no_backtrace   := NO_BACKTRACE=1
make_no_libnuma     := NO_LIBNUMA=1
make_no_libaudit    := NO_LIBAUDIT=1
make_no_libbionic   := NO_LIBBIONIC=1
make_no_auxtrace    := NO_AUXTRACE=1
make_tags           := tags
make_cscope         := cscope
make_help           := help
make_doc            := doc
make_perf_o           := perf.o
make_util_map_o       := util/map.o
make_util_pmu_bison_o := util/pmu-bison.o
make_install        := install
make_install_bin    := install-bin
make_install_doc    := install-doc
make_install_man    := install-man
make_install_html   := install-html
make_install_info   := install-info
make_install_pdf    := install-pdf
make_install_prefix       := install prefix=/tmp/krava
make_install_prefix_slash := install prefix=/tmp/krava/
make_static         := LDFLAGS=-static
make_minimal        := NO_LIBPERL=1 NO_LIBPYTHON=1 NO_NEWT=1 NO_GTK2=1
make_minimal        += NO_DEMANGLE=1 NO_LIBELF=1 NO_LIBUNWIND=1
NO_BACKTRACE=1
make_minimal        += NO_LIBNUMA=1 NO_LIBAUDIT=1 NO_LIBBIONIC=1
make_minimal        += NO_LIBDW_DWARF_UNWIND=1 NO_AUXTRACE=1
make_kernelsrc:
make_kernelsrc_tools:
[acme@zoo linux]$ 

This takes a lot of testing, I plan on using TypeChef to speed that up
and increase the number of tests:

https://github.com/ckaestne/TypeChef-LinuxAnalysis/blob/master/README.md

And 'perf test' has 40 tests, with some being really a multiplexor, like
the perf_event_attr ones, that will run the tools and look at how they
set up perf_event_attr for multiple command line options:

[root@zoo ~]# perf test | tail -10
31: Test output sorting of hist entries                      : Ok
32: Test cumulation of child hist entries                    : Ok
33: Test tracking with sched_switch                          : Ok
34: Filter fds with revents mask in a fdarray                : Ok
35: Add fd to a fdarray, making it autogrow                  : Ok
36: Test kmod_path__parse function                           : Ok
37: Test thread map                                          : Ok
38: Test LLVM searching and compiling                        : (skip bpf parsing) Ok
39: Test x86 instruction decoder - new instructions          : Ok
40: Test topology in session                                 : Ok
[root@zoo ~]# 

New stuff normally comes with new 'perf test' entries, Intel PT borrowed
the kernel x86 instruction decoder: added a 'perf test' entry, AFAIK
there was no similar test for it in the kernel proper, IIRC Masami plans
to do it.

The attr one you can look at:

[acme@zoo linux]$ ls -la tools/perf/tests/attr/test-* | wc -l
33
 
> AFAIK we have: 
>   - 'perf test' for perf specific functionality
>   - 'make -f tests/make' for building
>   - build framework tests
> 
> I 'try' to run those before sending anything out, but we dont have
> automated thing that would run it any time Arnaldo push new perf/core.

Well, I do run it in multiple distros, like RHEL5, RHEL6 and RHEL7
besides Fedora 21.

We're getting used to tools/{lib,include}/ so this happened, but
otherwise I don't feel like there are that many problems cropping up as
you seem to think :-\

Of course, in these days of CI, I'd love if someone would hook 'make -C
tools/perf build-test' and 'perf test' somewhere to be run for every
changeset.
 
> The RedHat QE has some more perf tool tests. There was some movement
> to make those public, but not sure how it ended up.. ccing Michael Petlan
> for news on this ;-)

Yeah, this too has helped catch and fix problems.

BTW, tools/vm/ was reported yesterday and a fix is already in
tip/perf/core/:

https://git.kernel.org/cgit/linux/kernel/git/tip/tip.git/commit/tools/vm?id=f6489bc2d402c0db84aa64f13b864d17f7eecb07

Age       Commit message (Expand)                                           Author                   Files Lines
12 hours  tools vm: Fix build due to removal of tools/lib/api/fs/debugfs.h  Arnaldo Carvalho de Melo	1  -3/+3

- Arnaldo
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]

#1231455 — Re: [tip:perf/core] tools lib api fs: Remove debugfs, tracefs and findfs objects

On Wed, Sep 23, 2015 at 10:44:56AM -0300, Arnaldo Carvalho de Melo wrote:

SNIP

> New stuff normally comes with new 'perf test' entries, Intel PT borrowed
> the kernel x86 instruction decoder: added a 'perf test' entry, AFAIK
> there was no similar test for it in the kernel proper, IIRC Masami plans
> to do it.
> 
> The attr one you can look at:
> 
> [acme@zoo linux]$ ls -la tools/perf/tests/attr/test-* | wc -l
> 33
>  
> > AFAIK we have: 
> >   - 'perf test' for perf specific functionality
> >   - 'make -f tests/make' for building
> >   - build framework tests
> > 
> > I 'try' to run those before sending anything out, but we dont have
> > automated thing that would run it any time Arnaldo push new perf/core.
> 
> Well, I do run it in multiple distros, like RHEL5, RHEL6 and RHEL7
> besides Fedora 21.
> 
> We're getting used to tools/{lib,include}/ so this happened, but
> otherwise I don't feel like there are that many problems cropping up as
> you seem to think :-\
> 
> Of course, in these days of CI, I'd love if someone would hook 'make -C
> tools/perf build-test' and 'perf test' somewhere to be run for every
> changeset.

yep, thats what I meant.. having this hooked up to your perf/core
would be big help

jirka
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]

#1231456 — Re: [tip:perf/core] tools lib api fs: Remove debugfs, tracefs and findfs objects

Em Wed, Sep 23, 2015 at 03:50:12PM +0200, Jiri Olsa escreveu:
> On Wed, Sep 23, 2015 at 10:44:56AM -0300, Arnaldo Carvalho de Melo wrote:
> 
> SNIP
> 
> > New stuff normally comes with new 'perf test' entries, Intel PT borrowed
> > the kernel x86 instruction decoder: added a 'perf test' entry, AFAIK
> > there was no similar test for it in the kernel proper, IIRC Masami plans
> > to do it.
> > 
> > The attr one you can look at:
> > 
> > [acme@zoo linux]$ ls -la tools/perf/tests/attr/test-* | wc -l
> > 33
> >  
> > > AFAIK we have: 
> > >   - 'perf test' for perf specific functionality
> > >   - 'make -f tests/make' for building
> > >   - build framework tests
> > > 
> > > I 'try' to run those before sending anything out, but we dont have
> > > automated thing that would run it any time Arnaldo push new perf/core.
> > 
> > Well, I do run it in multiple distros, like RHEL5, RHEL6 and RHEL7
> > besides Fedora 21.
> > 
> > We're getting used to tools/{lib,include}/ so this happened, but
> > otherwise I don't feel like there are that many problems cropping up as
> > you seem to think :-\
> > 
> > Of course, in these days of CI, I'd love if someone would hook 'make -C
> > tools/perf build-test' and 'perf test' somewhere to be run for every
> > changeset.
> 
> yep, thats what I meant.. having this hooked up to your perf/core
> would be big help

Till then, I'll turn more machines on here at my lab to do do it
manually and add an entry for:

 make -C tools/vm/

In that 'make -C tools/perf build-test'

- Arnaldo
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]

#1232083 — Re: [tip:perf/core] tools lib api fs: Remove debugfs, tracefs and findfs objects

On Wed, 23 Sep, at 10:44:56AM, Arnaldo Carvalho de Melo wrote:
> 
> Of course, in these days of CI, I'd love if someone would hook 'make -C
> tools/perf build-test' and 'perf test' somewhere to be run for every
> changeset.
  
Yes please!

> BTW, tools/vm/ was reported yesterday and a fix is already in
> tip/perf/core/:
> 
> https://git.kernel.org/cgit/linux/kernel/git/tip/tip.git/commit/tools/vm?id=f6489bc2d402c0db84aa64f13b864d17f7eecb07
> 
> Age       Commit message (Expand)                                           Author                   Files Lines
> 12 hours  tools vm: Fix build due to removal of tools/lib/api/fs/debugfs.h  Arnaldo Carvalho de Melo	1  -3/+3

It's not that this wasn't fixed quickly (kudos for that, btw), rather
it's that the breakage should have been avoided altogether.

But if this is an isolated incident, then fair enough, I'll stop
whining.

-- 
Matt Fleming, Intel Open Source Technology Center
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]

#1232131 — Re: [tip:perf/core] tools lib api fs: Remove debugfs, tracefs and findfs objects

Em Thu, Sep 24, 2015 at 01:15:51PM +0100, Matt Fleming escreveu:
> On Wed, 23 Sep, at 10:44:56AM, Arnaldo Carvalho de Melo wrote:
> > Of course, in these days of CI, I'd love if someone would hook 'make -C
> > tools/perf build-test' and 'perf test' somewhere to be run for every
> > changeset.
>   
> Yes please!

But then even this one would have not been caught, because the test in
place don't include trying to build tools/vm/, i.e. from time to time
something will pass and will be caught by people like Vinson, reported
and fixed :-)

> > BTW, tools/vm/ was reported yesterday and a fix is already in
> > tip/perf/core/:
> > 
> > https://git.kernel.org/cgit/linux/kernel/git/tip/tip.git/commit/tools/vm?id=f6489bc2d402c0db84aa64f13b864d17f7eecb07
> > 
> > Age       Commit message (Expand)                                           Author                   Files Lines
> > 12 hours  tools vm: Fix build due to removal of tools/lib/api/fs/debugfs.h  Arnaldo Carvalho de Melo	1  -3/+3
 
> It's not that this wasn't fixed quickly (kudos for that, btw), rather
> it's that the breakage should have been avoided altogether.
 
> But if this is an isolated incident, then fair enough, I'll stop
> whining.

Expressing concern is not a problem, its an opportunity for us to try
and get them addressed and improve so that others don't get afraid of
the processes in place.

- Arnaldo
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web