Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1219995 > unrolled thread
| Started by | Jiri Olsa <jolsa@kernel.org> |
|---|---|
| First post | 2015-09-07 10:40 +0200 |
| Last post | 2015-09-16 09:40 +0200 |
| Articles | 20 on this page of 25 — 8 participants |
Back to article view | Back to linux.kernel
[PATCHv2 0/5] perf tools: Enhance parsing events tracepoint error output Jiri Olsa <jolsa@kernel.org> - 2015-09-07 10:40 +0200
[PATCH 1/5] tools: Add err.h with ERR_PTR PTR_ERR interface Jiri Olsa <jolsa@kernel.org> - 2015-09-07 10:40 +0200
Re: [PATCH 1/5] tools: Add err.h with ERR_PTR PTR_ERR interface Raphaël Beamonte <raphael.beamonte@gmail.com> - 2015-09-08 22:30 +0200
Re: [PATCH 1/5] tools: Add err.h with ERR_PTR PTR_ERR interface Raphaël Beamonte <raphael.beamonte@gmail.com> - 2015-09-08 22:30 +0200
Re: [PATCH 1/5] tools: Add err.h with ERR_PTR PTR_ERR interface Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-09-08 23:10 +0200
Re: [PATCH 1/5] tools: Add err.h with ERR_PTR PTR_ERR interface Raphaël Beamonte <raphael.beamonte@gmail.com> - 2015-09-08 23:30 +0200
Re: [PATCH 1/5] tools: Add err.h with ERR_PTR PTR_ERR interface Raphaël Beamonte <raphael.beamonte@gmail.com> - 2015-09-08 23:40 +0200
[tip:perf/core] tools: Add err.h with ERR_PTR PTR_ERR interface tip-bot for Jiri Olsa <tipbot@zytor.com> - 2015-09-16 09:30 +0200
Re: [tip:perf/core] tools: Add err.h with ERR_PTR PTR_ERR interface Vinson Lee <vlee@twopensource.com> - 2015-09-22 01:50 +0200
[PATCH 3/5] perf tools: Propagate error info for the tracepoint parsing Jiri Olsa <jolsa@kernel.org> - 2015-09-07 10:40 +0200
Re: [PATCH 3/5] perf tools: Propagate error info for the tracepoint parsing Raphaël Beamonte <raphael.beamonte@gmail.com> - 2015-09-08 23:50 +0200
Re: [PATCH 3/5] perf tools: Propagate error info for the tracepoint parsing Jiri Olsa <jolsa@redhat.com> - 2015-09-09 10:00 +0200
Re: [PATCH 3/5] perf tools: Propagate error info for the tracepoint parsing Matt Fleming <matt@codeblueprint.co.uk> - 2015-09-12 13:00 +0200
[tip:perf/core] perf tools: Propagate error info for the tracepoint parsing tip-bot for Jiri Olsa <tipbot@zytor.com> - 2015-09-16 09:30 +0200
[PATCH 4/5] perf tools: Propagate error info from tp_format Jiri Olsa <jolsa@kernel.org> - 2015-09-07 10:40 +0200
Re: [PATCH 4/5] perf tools: Propagate error info from tp_format Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-09-09 23:00 +0200
Re: [PATCH 4/5] perf tools: Propagate error info from tp_format Jiri Olsa <jolsa@redhat.com> - 2015-09-10 10:30 +0200
Re: [PATCH 4/5] perf tools: Propagate error info from tp_format Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-09-10 16:20 +0200
Re: [PATCH 4/5] perf tools: Propagate error info from tp_format Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-09-14 23:00 +0200
Re: [PATCH 4/5] perf tools: Propagate error info from tp_format Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-09-14 23:10 +0200
Re: [PATCH 4/5] perf tools: Propagate error info from tp_format Raphaël Beamonte <raphael.beamonte@gmail.com> - 2015-09-14 23:10 +0200
Re: [PATCH 4/5] perf tools: Propagate error info from tp_format Arnaldo Carvalho de Melo <arnaldo.melo@gmail.com> - 2015-09-14 23:40 +0200
Re: [PATCH 4/5] perf tools: Propagate error info from tp_format Raphaël Beamonte <raphael.beamonte@gmail.com> - 2015-09-15 00:10 +0200
Re: [PATCH 4/5] perf tools: Propagate error info from tp_format Arnaldo Carvalho de Melo <arnaldo.melo@gmail.com> - 2015-09-15 04:40 +0200
[tip:perf/core] perf evsel: Propagate error info from tp_format tip-bot for Jiri Olsa <tipbot@zytor.com> - 2015-09-16 09:40 +0200
Page 1 of 2 [1] 2 Next page →
| From | Jiri Olsa <jolsa@kernel.org> |
|---|---|
| Date | 2015-09-07 10:40 +0200 |
| Subject | [PATCHv2 0/5] perf tools: Enhance parsing events tracepoint error output |
| Message-ID | <q6082-ic-11@gated-at.bofh.it> |
hi,
enhancing parsing events tracepoint error output. Adding
more verbose output when the tracepoint is not found or
the tracing event path cannot be access.
$ sudo perf record -e sched:sched_krava ls
event syntax error: 'sched:sched_krava'
\___ unknown tracepoint
Error: File /sys/kernel/debug/tracing//tracing/events/sched/sched_krava not found.
Hint: Perhaps this kernel misses some CONFIG_ setting to enable this feature?.
Run 'perf list' for a list of valid events
...
$ perf record -e sched:sched_krava ls
event syntax error: 'sched:sched_krava'
\___ can't access trace events
Error: No permissions to read /sys/kernel/debug/tracing//tracing/events/sched/sched_krava
Hint: Try 'sudo mount -o remount,mode=755 /sys/kernel/debug'
Run 'perf list' for a list of valid events
...
v2 changes:
- debugfs/tracefs changes went already in through separate patchset
- more commentary on err.h interface
- fixed callers of err.h enhanced functions
- added extra tags/cscope fix
Also available in:
git://git.kernel.org/pub/scm/linux/kernel/git/jolsa/perf.git
perf/tp
thanks,
jirka
---
Jiri Olsa (5):
tools: Add err.h with ERR_PTR PTR_ERR interface
perf tools: Add tools/include into tags directories
perf tools: Propagate error info for the tracepoint parsing
perf tools: Propagate error info from tp_format
perf tools: Enhance parsing events tracepoint error output
tools/include/linux/err.h | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
tools/perf/Makefile.perf | 2 +-
tools/perf/builtin-trace.c | 19 +++++++++++--------
tools/perf/tests/evsel-tp-sched.c | 10 ++++++++--
tools/perf/tests/openat-syscall-all-cpus.c | 3 ++-
tools/perf/tests/openat-syscall-tp-fields.c | 3 ++-
tools/perf/tests/openat-syscall.c | 3 ++-
tools/perf/util/evlist.c | 3 ++-
tools/perf/util/evsel.c | 11 +++++++++--
tools/perf/util/evsel.h | 3 +++
tools/perf/util/parse-events.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++----------------
tools/perf/util/parse-events.h | 3 ++-
tools/perf/util/parse-events.y | 16 +++++++++-------
tools/perf/util/trace-event.c | 13 +++++++++++--
14 files changed, 161 insertions(+), 43 deletions(-)
create mode 100644 tools/include/linux/err.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]
| From | Jiri Olsa <jolsa@kernel.org> |
|---|---|
| Date | 2015-09-07 10:40 +0200 |
| Subject | [PATCH 1/5] tools: Add err.h with ERR_PTR PTR_ERR interface |
| Message-ID | <q6082-ic-17@gated-at.bofh.it> |
| In reply to | #1219995 |
Adding part of the kernel's <linux/err.h> interface:
inline void * __must_check ERR_PTR(long error);
inline long __must_check PTR_ERR(__force const void *ptr);
inline bool __must_check IS_ERR(__force const void *ptr);
it will be used to propagate error through pointers
in following patches.
Link: http://lkml.kernel.org/n/tip-ufgnyf683uab69anmmrabgdf@git.kernel.org
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
tools/include/linux/err.h | 49 +++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 49 insertions(+)
create mode 100644 tools/include/linux/err.h
diff --git a/tools/include/linux/err.h b/tools/include/linux/err.h
new file mode 100644
index 000000000000..c9ada48f5156
--- /dev/null
+++ b/tools/include/linux/err.h
@@ -0,0 +1,49 @@
+#ifndef __TOOLS_LINUX_ERR_H
+#define __TOOLS_LINUX_ERR_H
+
+#include <linux/compiler.h>
+#include <linux/types.h>
+
+#include <asm/errno.h>
+
+/*
+ * Original kernel header comment:
+ *
+ * Kernel pointers have redundant information, so we can use a
+ * scheme where we can return either an error code or a normal
+ * pointer with the same return value.
+ *
+ * This should be a per-architecture thing, to allow different
+ * error and pointer decisions.
+ *
+ * Userspace note:
+ * The same principle works for userspace, because 'error' pointers
+ * fall down to the unused hole far from user space, as described
+ * in Documentation/x86/x86_64/mm.txt for x86_64 arch:
+ *
+ * 0000000000000000 - 00007fffffffffff (=47 bits) user space, different per mm hole caused by [48:63] sign extension
+ * ffffffffffe00000 - ffffffffffffffff (=2 MB) unused hole
+ *
+ * It should be the same case for other architectures, because
+ * this code is used in generic kernel code.
+ */
+#define MAX_ERRNO 4095
+
+#define IS_ERR_VALUE(x) unlikely((x) >= (unsigned long)-MAX_ERRNO)
+
+static inline void * __must_check ERR_PTR(long error)
+{
+ return (void *) error;
+}
+
+static inline long __must_check PTR_ERR(__force const void *ptr)
+{
+ return (long) ptr;
+}
+
+static inline bool __must_check IS_ERR(__force const void *ptr)
+{
+ return IS_ERR_VALUE((unsigned long)ptr);
+}
+
+#endif /* _LINUX_ERR_H */
--
2.4.3
--
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]
| From | Raphaël Beamonte <raphael.beamonte@gmail.com> |
|---|---|
| Date | 2015-09-08 22:30 +0200 |
| Subject | Re: [PATCH 1/5] tools: Add err.h with ERR_PTR PTR_ERR interface |
| Message-ID | <q6xGG-6yx-7@gated-at.bofh.it> |
| In reply to | #1219996 |
2015-09-08 16:22 GMT-04:00 Raphaël Beamonte <raphael.beamonte@gmail.com>: > Perhaps a dumb question, but it seems the code is exactly the same as > in linux/err.h besides the part of the comment you added. Why not > using that file directly in the other patches then? I meant include/linux/err.h, from git root -- 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]
| From | Raphaël Beamonte <raphael.beamonte@gmail.com> |
|---|---|
| Date | 2015-09-08 22:30 +0200 |
| Subject | Re: [PATCH 1/5] tools: Add err.h with ERR_PTR PTR_ERR interface |
| Message-ID | <q6xGG-6yx-9@gated-at.bofh.it> |
| In reply to | #1219996 |
2015-09-07 4:38 GMT-04:00 Jiri Olsa <jolsa@kernel.org>:
> Adding part of the kernel's <linux/err.h> interface:
> inline void * __must_check ERR_PTR(long error);
> inline long __must_check PTR_ERR(__force const void *ptr);
> inline bool __must_check IS_ERR(__force const void *ptr);
>
> it will be used to propagate error through pointers
> in following patches.
>
> Link: http://lkml.kernel.org/n/tip-ufgnyf683uab69anmmrabgdf@git.kernel.org
> Signed-off-by: Jiri Olsa <jolsa@kernel.org>
> ---
> tools/include/linux/err.h | 49 +++++++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 49 insertions(+)
> create mode 100644 tools/include/linux/err.h
>
> diff --git a/tools/include/linux/err.h b/tools/include/linux/err.h
> new file mode 100644
> index 000000000000..c9ada48f5156
> --- /dev/null
> +++ b/tools/include/linux/err.h
> @@ -0,0 +1,49 @@
> +#ifndef __TOOLS_LINUX_ERR_H
> +#define __TOOLS_LINUX_ERR_H
> +
> +#include <linux/compiler.h>
> +#include <linux/types.h>
> +
> +#include <asm/errno.h>
> +
> +/*
> + * Original kernel header comment:
> + *
> + * Kernel pointers have redundant information, so we can use a
> + * scheme where we can return either an error code or a normal
> + * pointer with the same return value.
> + *
> + * This should be a per-architecture thing, to allow different
> + * error and pointer decisions.
> + *
> + * Userspace note:
> + * The same principle works for userspace, because 'error' pointers
> + * fall down to the unused hole far from user space, as described
> + * in Documentation/x86/x86_64/mm.txt for x86_64 arch:
> + *
> + * 0000000000000000 - 00007fffffffffff (=47 bits) user space, different per mm hole caused by [48:63] sign extension
> + * ffffffffffe00000 - ffffffffffffffff (=2 MB) unused hole
> + *
> + * It should be the same case for other architectures, because
> + * this code is used in generic kernel code.
> + */
> +#define MAX_ERRNO 4095
> +
> +#define IS_ERR_VALUE(x) unlikely((x) >= (unsigned long)-MAX_ERRNO)
> +
> +static inline void * __must_check ERR_PTR(long error)
> +{
> + return (void *) error;
> +}
> +
> +static inline long __must_check PTR_ERR(__force const void *ptr)
> +{
> + return (long) ptr;
> +}
> +
> +static inline bool __must_check IS_ERR(__force const void *ptr)
> +{
> + return IS_ERR_VALUE((unsigned long)ptr);
> +}
> +
> +#endif /* _LINUX_ERR_H */
> --
> 2.4.3
Perhaps a dumb question, but it seems the code is exactly the same as
in linux/err.h besides the part of the comment you added. Why not
using that file directly in the other patches then?
--
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]
| From | Arnaldo Carvalho de Melo <acme@kernel.org> |
|---|---|
| Date | 2015-09-08 23:10 +0200 |
| Subject | Re: [PATCH 1/5] tools: Add err.h with ERR_PTR PTR_ERR interface |
| Message-ID | <q6yjo-7xa-13@gated-at.bofh.it> |
| In reply to | #1221068 |
Em Tue, Sep 08, 2015 at 04:22:39PM -0400, Raphaël Beamonte escreveu:
> 2015-09-07 4:38 GMT-04:00 Jiri Olsa <jolsa@kernel.org>:
> > Adding part of the kernel's <linux/err.h> interface:
> > inline void * __must_check ERR_PTR(long error);
> > inline long __must_check PTR_ERR(__force const void *ptr);
> > inline bool __must_check IS_ERR(__force const void *ptr);
> >
> > it will be used to propagate error through pointers
> > in following patches.
> >
> > Link: http://lkml.kernel.org/n/tip-ufgnyf683uab69anmmrabgdf@git.kernel.org
> > Signed-off-by: Jiri Olsa <jolsa@kernel.org>
> > ---
> > tools/include/linux/err.h | 49 +++++++++++++++++++++++++++++++++++++++++++++++
> > 1 file changed, 49 insertions(+)
> > create mode 100644 tools/include/linux/err.h
> >
> > diff --git a/tools/include/linux/err.h b/tools/include/linux/err.h
> > new file mode 100644
> > index 000000000000..c9ada48f5156
> > --- /dev/null
> > +++ b/tools/include/linux/err.h
> > @@ -0,0 +1,49 @@
> > +#ifndef __TOOLS_LINUX_ERR_H
> > +#define __TOOLS_LINUX_ERR_H
> > +
> > +#include <linux/compiler.h>
> > +#include <linux/types.h>
> > +
> > +#include <asm/errno.h>
> > +
> > +/*
> > + * Original kernel header comment:
> > + *
> > + * Kernel pointers have redundant information, so we can use a
> > + * scheme where we can return either an error code or a normal
> > + * pointer with the same return value.
> > + *
> > + * This should be a per-architecture thing, to allow different
> > + * error and pointer decisions.
> > + *
> > + * Userspace note:
> > + * The same principle works for userspace, because 'error' pointers
> > + * fall down to the unused hole far from user space, as described
> > + * in Documentation/x86/x86_64/mm.txt for x86_64 arch:
> > + *
> > + * 0000000000000000 - 00007fffffffffff (=47 bits) user space, different per mm hole caused by [48:63] sign extension
> > + * ffffffffffe00000 - ffffffffffffffff (=2 MB) unused hole
> > + *
> > + * It should be the same case for other architectures, because
> > + * this code is used in generic kernel code.
> > + */
> > +#define MAX_ERRNO 4095
> > +
> > +#define IS_ERR_VALUE(x) unlikely((x) >= (unsigned long)-MAX_ERRNO)
> > +
> > +static inline void * __must_check ERR_PTR(long error)
> > +{
> > + return (void *) error;
> > +}
> > +
> > +static inline long __must_check PTR_ERR(__force const void *ptr)
> > +{
> > + return (long) ptr;
> > +}
> > +
> > +static inline bool __must_check IS_ERR(__force const void *ptr)
> > +{
> > + return IS_ERR_VALUE((unsigned long)ptr);
> > +}
> > +
> > +#endif /* _LINUX_ERR_H */
> > --
> > 2.4.3
>
> Perhaps a dumb question, but it seems the code is exactly the same as
> in linux/err.h besides the part of the comment you added. Why not
> using that file directly in the other patches then?
We can't do that.
Read:
commit 3f735377bfd6567d80815a6242c147211963680a
Author: Arnaldo Carvalho de Melo <acme@redhat.com>
Date: Sun Jul 5 22:48:21 2015 -0300
tools: Copy lib/rbtree.c to tools/lib/
So that we can remove kernel specific stuff we've been stubbing out via
a tools/include/linux/export.h that gets removed in this patch and to
avoid breakages in the future like the one fixed recently where
rcupdate.h started being used in rbtree.h.
--------------------------
There are more copies like that, but the explanation above should be
enough, no?
- 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]
| From | Raphaël Beamonte <raphael.beamonte@gmail.com> |
|---|---|
| Date | 2015-09-08 23:30 +0200 |
| Subject | Re: [PATCH 1/5] tools: Add err.h with ERR_PTR PTR_ERR interface |
| Message-ID | <q6yCK-7U1-21@gated-at.bofh.it> |
| In reply to | #1221085 |
2015-09-08 17:06 GMT-04:00 Arnaldo Carvalho de Melo <arnaldo.melo@gmail.com>:
> Em Tue, Sep 08, 2015 at 04:22:39PM -0400, Raphaël Beamonte escreveu:
>> 2015-09-07 4:38 GMT-04:00 Jiri Olsa <jolsa@kernel.org>:
>> > Adding part of the kernel's <linux/err.h> interface:
>> > inline void * __must_check ERR_PTR(long error);
>> > inline long __must_check PTR_ERR(__force const void *ptr);
>> > inline bool __must_check IS_ERR(__force const void *ptr);
>> >
>> > it will be used to propagate error through pointers
>> > in following patches.
>> >
>> > Link: http://lkml.kernel.org/n/tip-ufgnyf683uab69anmmrabgdf@git.kernel.org
>> > Signed-off-by: Jiri Olsa <jolsa@kernel.org>
>> > ---
>> > tools/include/linux/err.h | 49 +++++++++++++++++++++++++++++++++++++++++++++++
>> > 1 file changed, 49 insertions(+)
>> > create mode 100644 tools/include/linux/err.h
>> >
>> > diff --git a/tools/include/linux/err.h b/tools/include/linux/err.h
>> > new file mode 100644
>> > index 000000000000..c9ada48f5156
>> > --- /dev/null
>> > +++ b/tools/include/linux/err.h
>> > @@ -0,0 +1,49 @@
>> > +#ifndef __TOOLS_LINUX_ERR_H
>> > +#define __TOOLS_LINUX_ERR_H
>> > +
>> > +#include <linux/compiler.h>
>> > +#include <linux/types.h>
>> > +
>> > +#include <asm/errno.h>
>> > +
>> > +/*
>> > + * Original kernel header comment:
>> > + *
>> > + * Kernel pointers have redundant information, so we can use a
>> > + * scheme where we can return either an error code or a normal
>> > + * pointer with the same return value.
>> > + *
>> > + * This should be a per-architecture thing, to allow different
>> > + * error and pointer decisions.
>> > + *
>> > + * Userspace note:
>> > + * The same principle works for userspace, because 'error' pointers
>> > + * fall down to the unused hole far from user space, as described
>> > + * in Documentation/x86/x86_64/mm.txt for x86_64 arch:
>> > + *
>> > + * 0000000000000000 - 00007fffffffffff (=47 bits) user space, different per mm hole caused by [48:63] sign extension
>> > + * ffffffffffe00000 - ffffffffffffffff (=2 MB) unused hole
>> > + *
>> > + * It should be the same case for other architectures, because
>> > + * this code is used in generic kernel code.
>> > + */
>> > +#define MAX_ERRNO 4095
>> > +
>> > +#define IS_ERR_VALUE(x) unlikely((x) >= (unsigned long)-MAX_ERRNO)
>> > +
>> > +static inline void * __must_check ERR_PTR(long error)
>> > +{
>> > + return (void *) error;
>> > +}
>> > +
>> > +static inline long __must_check PTR_ERR(__force const void *ptr)
>> > +{
>> > + return (long) ptr;
>> > +}
>> > +
>> > +static inline bool __must_check IS_ERR(__force const void *ptr)
>> > +{
>> > + return IS_ERR_VALUE((unsigned long)ptr);
>> > +}
>> > +
>> > +#endif /* _LINUX_ERR_H */
>> > --
>> > 2.4.3
>>
>> Perhaps a dumb question, but it seems the code is exactly the same as
>> in linux/err.h besides the part of the comment you added. Why not
>> using that file directly in the other patches then?
>
> We can't do that.
>
> Read:
>
> commit 3f735377bfd6567d80815a6242c147211963680a
> Author: Arnaldo Carvalho de Melo <acme@redhat.com>
> Date: Sun Jul 5 22:48:21 2015 -0300
>
> tools: Copy lib/rbtree.c to tools/lib/
>
> So that we can remove kernel specific stuff we've been stubbing out via
> a tools/include/linux/export.h that gets removed in this patch and to
> avoid breakages in the future like the one fixed recently where
> rcupdate.h started being used in rbtree.h.
>
>
> --------------------------
>
> There are more copies like that, but the explanation above should be
> enough, no?
Yes, I understand now! Thanks!
>
>
> - 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]
| From | Raphaël Beamonte <raphael.beamonte@gmail.com> |
|---|---|
| Date | 2015-09-08 23:40 +0200 |
| Subject | Re: [PATCH 1/5] tools: Add err.h with ERR_PTR PTR_ERR interface |
| Message-ID | <q6yMr-85m-49@gated-at.bofh.it> |
| In reply to | #1219996 |
2015-09-07 4:38 GMT-04:00 Jiri Olsa <jolsa@kernel.org>:
> Adding part of the kernel's <linux/err.h> interface:
> inline void * __must_check ERR_PTR(long error);
> inline long __must_check PTR_ERR(__force const void *ptr);
> inline bool __must_check IS_ERR(__force const void *ptr);
>
> it will be used to propagate error through pointers
> in following patches.
>
> Link: http://lkml.kernel.org/n/tip-ufgnyf683uab69anmmrabgdf@git.kernel.org
> Signed-off-by: Jiri Olsa <jolsa@kernel.org>
> ---
> tools/include/linux/err.h | 49 +++++++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 49 insertions(+)
> create mode 100644 tools/include/linux/err.h
Reviewed-by: Raphaël Beamonte <raphael.beamonte@gmail.com>
>
> diff --git a/tools/include/linux/err.h b/tools/include/linux/err.h
> new file mode 100644
> index 000000000000..c9ada48f5156
> --- /dev/null
> +++ b/tools/include/linux/err.h
> @@ -0,0 +1,49 @@
> +#ifndef __TOOLS_LINUX_ERR_H
> +#define __TOOLS_LINUX_ERR_H
> +
> +#include <linux/compiler.h>
> +#include <linux/types.h>
> +
> +#include <asm/errno.h>
> +
> +/*
> + * Original kernel header comment:
> + *
> + * Kernel pointers have redundant information, so we can use a
> + * scheme where we can return either an error code or a normal
> + * pointer with the same return value.
> + *
> + * This should be a per-architecture thing, to allow different
> + * error and pointer decisions.
> + *
> + * Userspace note:
> + * The same principle works for userspace, because 'error' pointers
> + * fall down to the unused hole far from user space, as described
> + * in Documentation/x86/x86_64/mm.txt for x86_64 arch:
> + *
> + * 0000000000000000 - 00007fffffffffff (=47 bits) user space, different per mm hole caused by [48:63] sign extension
> + * ffffffffffe00000 - ffffffffffffffff (=2 MB) unused hole
> + *
> + * It should be the same case for other architectures, because
> + * this code is used in generic kernel code.
> + */
> +#define MAX_ERRNO 4095
> +
> +#define IS_ERR_VALUE(x) unlikely((x) >= (unsigned long)-MAX_ERRNO)
> +
> +static inline void * __must_check ERR_PTR(long error)
> +{
> + return (void *) error;
> +}
> +
> +static inline long __must_check PTR_ERR(__force const void *ptr)
> +{
> + return (long) ptr;
> +}
> +
> +static inline bool __must_check IS_ERR(__force const void *ptr)
> +{
> + return IS_ERR_VALUE((unsigned long)ptr);
> +}
> +
> +#endif /* _LINUX_ERR_H */
> --
> 2.4.3
>
--
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]
| From | tip-bot for Jiri Olsa <tipbot@zytor.com> |
|---|---|
| Date | 2015-09-16 09:30 +0200 |
| Subject | [tip:perf/core] tools: Add err.h with ERR_PTR PTR_ERR interface |
| Message-ID | <q9fke-63y-27@gated-at.bofh.it> |
| In reply to | #1219996 |
Commit-ID: 01ca9fd41d6f2ad796a6b109b5253e06b6ae6dc7
Gitweb: http://git.kernel.org/tip/01ca9fd41d6f2ad796a6b109b5253e06b6ae6dc7
Author: Jiri Olsa <jolsa@kernel.org>
AuthorDate: Mon, 7 Sep 2015 10:38:03 +0200
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Tue, 15 Sep 2015 09:48:32 -0300
tools: Add err.h with ERR_PTR PTR_ERR interface
Adding part of the kernel's <linux/err.h> interface:
inline void * __must_check ERR_PTR(long error);
inline long __must_check PTR_ERR(__force const void *ptr);
inline bool __must_check IS_ERR(__force const void *ptr);
It will be used to propagate error through pointers in following
patches.
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Reviewed-by: Raphael Beamonte <raphael.beamonte@gmail.com>
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>
Link: http://lkml.kernel.org/r/1441615087-13886-2-git-send-email-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/include/linux/err.h | 49 +++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 49 insertions(+)
diff --git a/tools/include/linux/err.h b/tools/include/linux/err.h
new file mode 100644
index 0000000..c9ada48
--- /dev/null
+++ b/tools/include/linux/err.h
@@ -0,0 +1,49 @@
+#ifndef __TOOLS_LINUX_ERR_H
+#define __TOOLS_LINUX_ERR_H
+
+#include <linux/compiler.h>
+#include <linux/types.h>
+
+#include <asm/errno.h>
+
+/*
+ * Original kernel header comment:
+ *
+ * Kernel pointers have redundant information, so we can use a
+ * scheme where we can return either an error code or a normal
+ * pointer with the same return value.
+ *
+ * This should be a per-architecture thing, to allow different
+ * error and pointer decisions.
+ *
+ * Userspace note:
+ * The same principle works for userspace, because 'error' pointers
+ * fall down to the unused hole far from user space, as described
+ * in Documentation/x86/x86_64/mm.txt for x86_64 arch:
+ *
+ * 0000000000000000 - 00007fffffffffff (=47 bits) user space, different per mm hole caused by [48:63] sign extension
+ * ffffffffffe00000 - ffffffffffffffff (=2 MB) unused hole
+ *
+ * It should be the same case for other architectures, because
+ * this code is used in generic kernel code.
+ */
+#define MAX_ERRNO 4095
+
+#define IS_ERR_VALUE(x) unlikely((x) >= (unsigned long)-MAX_ERRNO)
+
+static inline void * __must_check ERR_PTR(long error)
+{
+ return (void *) error;
+}
+
+static inline long __must_check PTR_ERR(__force const void *ptr)
+{
+ return (long) ptr;
+}
+
+static inline bool __must_check IS_ERR(__force const void *ptr)
+{
+ return IS_ERR_VALUE((unsigned long)ptr);
+}
+
+#endif /* _LINUX_ERR_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] | [prev] | [next] | [standalone]
| From | Vinson Lee <vlee@twopensource.com> |
|---|---|
| Date | 2015-09-22 01:50 +0200 |
| Subject | Re: [tip:perf/core] tools: Add err.h with ERR_PTR PTR_ERR interface |
| Message-ID | <qbj0m-4WL-5@gated-at.bofh.it> |
| In reply to | #1225776 |
On Wed, Sep 16, 2015 at 12:28 AM, tip-bot for Jiri Olsa <tipbot@zytor.com> wrote: > Commit-ID: 01ca9fd41d6f2ad796a6b109b5253e06b6ae6dc7 > Gitweb: http://git.kernel.org/tip/01ca9fd41d6f2ad796a6b109b5253e06b6ae6dc7 > Author: Jiri Olsa <jolsa@kernel.org> > AuthorDate: Mon, 7 Sep 2015 10:38:03 +0200 > Committer: Arnaldo Carvalho de Melo <acme@redhat.com> > CommitDate: Tue, 15 Sep 2015 09:48:32 -0300 > > tools: Add err.h with ERR_PTR PTR_ERR interface > > Adding part of the kernel's <linux/err.h> interface: > > inline void * __must_check ERR_PTR(long error); > inline long __must_check PTR_ERR(__force const void *ptr); > inline bool __must_check IS_ERR(__force const void *ptr); > > It will be used to propagate error through pointers in following > patches. > > Signed-off-by: Jiri Olsa <jolsa@kernel.org> > Reviewed-by: Raphael Beamonte <raphael.beamonte@gmail.com> > 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> > Link: http://lkml.kernel.org/r/1441615087-13886-2-git-send-email-jolsa@kernel.org > Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Hi. This patch appears to have introduced a build error on CentOS 6.7 with GCC 4.4. This build error occurs on next-20150921. CC util/evlist.o cc1: warnings being treated as errors In file included from util/evlist.c:28: tools/include/linux/err.h: In function ‘ERR_PTR’: tools/include/linux/err.h:34: error: declaration of ‘error’ shadows a global declaration util/util.h:135: error: shadowed declaration is here $ gcc --version gcc (GCC) 4.4.7 20120313 (Red Hat 4.4.7-16) Copyright (C) 2010 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. 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]
| From | Jiri Olsa <jolsa@kernel.org> |
|---|---|
| Date | 2015-09-07 10:40 +0200 |
| Subject | [PATCH 3/5] perf tools: Propagate error info for the tracepoint parsing |
| Message-ID | <q6082-ic-23@gated-at.bofh.it> |
| In reply to | #1219995 |
Pass 'struct parse_events_error *error' to the parse-event.c
tracepoint adding path. It will be filled with error data
in following patches.
Link: http://lkml.kernel.org/n/tip-las1hm5zf58b0twd27h9895b@git.kernel.org
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
tools/perf/util/parse-events.c | 27 ++++++++++++++++-----------
tools/perf/util/parse-events.h | 3 ++-
tools/perf/util/parse-events.y | 4 ++--
3 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index 3840176642f8..1b284b8ad243 100644
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -387,7 +387,8 @@ int parse_events_add_cache(struct list_head *list, int *idx,
}
static int add_tracepoint(struct list_head *list, int *idx,
- char *sys_name, char *evt_name)
+ char *sys_name, char *evt_name,
+ struct parse_events_error *error __maybe_unused)
{
struct perf_evsel *evsel;
@@ -401,7 +402,8 @@ static int add_tracepoint(struct list_head *list, int *idx,
}
static int add_tracepoint_multi_event(struct list_head *list, int *idx,
- char *sys_name, char *evt_name)
+ char *sys_name, char *evt_name,
+ struct parse_events_error *error)
{
char evt_path[MAXPATHLEN];
struct dirent *evt_ent;
@@ -425,7 +427,7 @@ static int add_tracepoint_multi_event(struct list_head *list, int *idx,
if (!strglobmatch(evt_ent->d_name, evt_name))
continue;
- ret = add_tracepoint(list, idx, sys_name, evt_ent->d_name);
+ ret = add_tracepoint(list, idx, sys_name, evt_ent->d_name, error);
}
closedir(evt_dir);
@@ -433,15 +435,17 @@ static int add_tracepoint_multi_event(struct list_head *list, int *idx,
}
static int add_tracepoint_event(struct list_head *list, int *idx,
- char *sys_name, char *evt_name)
+ char *sys_name, char *evt_name,
+ struct parse_events_error *error)
{
return strpbrk(evt_name, "*?") ?
- add_tracepoint_multi_event(list, idx, sys_name, evt_name) :
- add_tracepoint(list, idx, sys_name, evt_name);
+ add_tracepoint_multi_event(list, idx, sys_name, evt_name, error) :
+ add_tracepoint(list, idx, sys_name, evt_name, error);
}
static int add_tracepoint_multi_sys(struct list_head *list, int *idx,
- char *sys_name, char *evt_name)
+ char *sys_name, char *evt_name,
+ struct parse_events_error *error)
{
struct dirent *events_ent;
DIR *events_dir;
@@ -465,7 +469,7 @@ static int add_tracepoint_multi_sys(struct list_head *list, int *idx,
continue;
ret = add_tracepoint_event(list, idx, events_ent->d_name,
- evt_name);
+ evt_name, error);
}
closedir(events_dir);
@@ -473,12 +477,13 @@ static int add_tracepoint_multi_sys(struct list_head *list, int *idx,
}
int parse_events_add_tracepoint(struct list_head *list, int *idx,
- char *sys, char *event)
+ char *sys, char *event,
+ struct parse_events_error *error)
{
if (strpbrk(sys, "*?"))
- return add_tracepoint_multi_sys(list, idx, sys, event);
+ return add_tracepoint_multi_sys(list, idx, sys, event, error);
else
- return add_tracepoint_event(list, idx, sys, event);
+ return add_tracepoint_event(list, idx, sys, event, error);
}
static int
diff --git a/tools/perf/util/parse-events.h b/tools/perf/util/parse-events.h
index a09b0e210997..ffee7ece75a6 100644
--- a/tools/perf/util/parse-events.h
+++ b/tools/perf/util/parse-events.h
@@ -118,7 +118,8 @@ int parse_events__modifier_event(struct list_head *list, char *str, bool add);
int parse_events__modifier_group(struct list_head *list, char *event_mod);
int parse_events_name(struct list_head *list, char *name);
int parse_events_add_tracepoint(struct list_head *list, int *idx,
- char *sys, char *event);
+ char *sys, char *event,
+ struct parse_events_error *error);
int parse_events_add_numeric(struct parse_events_evlist *data,
struct list_head *list,
u32 type, u64 config,
diff --git a/tools/perf/util/parse-events.y b/tools/perf/util/parse-events.y
index 9cd70819c795..54a3004a8192 100644
--- a/tools/perf/util/parse-events.y
+++ b/tools/perf/util/parse-events.y
@@ -376,7 +376,7 @@ PE_NAME '-' PE_NAME ':' PE_NAME
snprintf(&sys_name, 128, "%s-%s", $1, $3);
ALLOC_LIST(list);
- ABORT_ON(parse_events_add_tracepoint(list, &data->idx, &sys_name, $5));
+ ABORT_ON(parse_events_add_tracepoint(list, &data->idx, &sys_name, $5, data->error));
$$ = list;
}
|
@@ -386,7 +386,7 @@ PE_NAME ':' PE_NAME
struct list_head *list;
ALLOC_LIST(list);
- if (parse_events_add_tracepoint(list, &data->idx, $1, $3)) {
+ if (parse_events_add_tracepoint(list, &data->idx, $1, $3, data->error)) {
struct parse_events_error *error = data->error;
if (error) {
--
2.4.3
--
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]
| From | Raphaël Beamonte <raphael.beamonte@gmail.com> |
|---|---|
| Date | 2015-09-08 23:50 +0200 |
| Subject | Re: [PATCH 3/5] perf tools: Propagate error info for the tracepoint parsing |
| Message-ID | <q6yW6-8gT-19@gated-at.bofh.it> |
| In reply to | #1219998 |
2015-09-07 4:38 GMT-04:00 Jiri Olsa <jolsa@kernel.org>:
> Pass 'struct parse_events_error *error' to the parse-event.c
> tracepoint adding path. It will be filled with error data
> in following patches.
>
> Link: http://lkml.kernel.org/n/tip-las1hm5zf58b0twd27h9895b@git.kernel.org
> Signed-off-by: Jiri Olsa <jolsa@kernel.org>
> ---
> tools/perf/util/parse-events.c | 27 ++++++++++++++++-----------
> tools/perf/util/parse-events.h | 3 ++-
> tools/perf/util/parse-events.y | 4 ++--
> 3 files changed, 20 insertions(+), 14 deletions(-)
>
> diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
> index 3840176642f8..1b284b8ad243 100644
> --- a/tools/perf/util/parse-events.c
> +++ b/tools/perf/util/parse-events.c
> @@ -387,7 +387,8 @@ int parse_events_add_cache(struct list_head *list, int *idx,
> }
>
> static int add_tracepoint(struct list_head *list, int *idx,
> - char *sys_name, char *evt_name)
> + char *sys_name, char *evt_name,
> + struct parse_events_error *error __maybe_unused)
> {
> struct perf_evsel *evsel;
>
> @@ -401,7 +402,8 @@ static int add_tracepoint(struct list_head *list, int *idx,
> }
>
> static int add_tracepoint_multi_event(struct list_head *list, int *idx,
> - char *sys_name, char *evt_name)
> + char *sys_name, char *evt_name,
> + struct parse_events_error *error)
> {
> char evt_path[MAXPATHLEN];
> struct dirent *evt_ent;
> @@ -425,7 +427,7 @@ static int add_tracepoint_multi_event(struct list_head *list, int *idx,
> if (!strglobmatch(evt_ent->d_name, evt_name))
> continue;
>
> - ret = add_tracepoint(list, idx, sys_name, evt_ent->d_name);
> + ret = add_tracepoint(list, idx, sys_name, evt_ent->d_name, error);
> }
>
> closedir(evt_dir);
> @@ -433,15 +435,17 @@ static int add_tracepoint_multi_event(struct list_head *list, int *idx,
> }
>
> static int add_tracepoint_event(struct list_head *list, int *idx,
> - char *sys_name, char *evt_name)
> + char *sys_name, char *evt_name,
> + struct parse_events_error *error)
> {
> return strpbrk(evt_name, "*?") ?
> - add_tracepoint_multi_event(list, idx, sys_name, evt_name) :
> - add_tracepoint(list, idx, sys_name, evt_name);
> + add_tracepoint_multi_event(list, idx, sys_name, evt_name, error) :
> + add_tracepoint(list, idx, sys_name, evt_name, error);
> }
>
> static int add_tracepoint_multi_sys(struct list_head *list, int *idx,
> - char *sys_name, char *evt_name)
> + char *sys_name, char *evt_name,
> + struct parse_events_error *error)
> {
> struct dirent *events_ent;
> DIR *events_dir;
> @@ -465,7 +469,7 @@ static int add_tracepoint_multi_sys(struct list_head *list, int *idx,
> continue;
>
> ret = add_tracepoint_event(list, idx, events_ent->d_name,
> - evt_name);
> + evt_name, error);
> }
>
> closedir(events_dir);
> @@ -473,12 +477,13 @@ static int add_tracepoint_multi_sys(struct list_head *list, int *idx,
> }
>
> int parse_events_add_tracepoint(struct list_head *list, int *idx,
> - char *sys, char *event)
> + char *sys, char *event,
> + struct parse_events_error *error)
> {
> if (strpbrk(sys, "*?"))
> - return add_tracepoint_multi_sys(list, idx, sys, event);
> + return add_tracepoint_multi_sys(list, idx, sys, event, error);
> else
> - return add_tracepoint_event(list, idx, sys, event);
> + return add_tracepoint_event(list, idx, sys, event, error);
> }
>
> static int
> diff --git a/tools/perf/util/parse-events.h b/tools/perf/util/parse-events.h
> index a09b0e210997..ffee7ece75a6 100644
> --- a/tools/perf/util/parse-events.h
> +++ b/tools/perf/util/parse-events.h
> @@ -118,7 +118,8 @@ int parse_events__modifier_event(struct list_head *list, char *str, bool add);
> int parse_events__modifier_group(struct list_head *list, char *event_mod);
> int parse_events_name(struct list_head *list, char *name);
> int parse_events_add_tracepoint(struct list_head *list, int *idx,
> - char *sys, char *event);
> + char *sys, char *event,
> + struct parse_events_error *error);
> int parse_events_add_numeric(struct parse_events_evlist *data,
> struct list_head *list,
> u32 type, u64 config,
> diff --git a/tools/perf/util/parse-events.y b/tools/perf/util/parse-events.y
> index 9cd70819c795..54a3004a8192 100644
> --- a/tools/perf/util/parse-events.y
> +++ b/tools/perf/util/parse-events.y
> @@ -376,7 +376,7 @@ PE_NAME '-' PE_NAME ':' PE_NAME
> snprintf(&sys_name, 128, "%s-%s", $1, $3);
>
> ALLOC_LIST(list);
> - ABORT_ON(parse_events_add_tracepoint(list, &data->idx, &sys_name, $5));
> + ABORT_ON(parse_events_add_tracepoint(list, &data->idx, &sys_name, $5, data->error));
> $$ = list;
> }
> |
> @@ -386,7 +386,7 @@ PE_NAME ':' PE_NAME
> struct list_head *list;
>
> ALLOC_LIST(list);
> - if (parse_events_add_tracepoint(list, &data->idx, $1, $3)) {
> + if (parse_events_add_tracepoint(list, &data->idx, $1, $3, data->error)) {
> struct parse_events_error *error = data->error;
>
> if (error) {
> --
> 2.4.3
>
Works for me.
Reviewed-by: Raphaël Beamonte <raphael.beamonte@gmail.com>
I also made sure I could compile and run perf with that patch applied
on top of the current linux master. Should I also propose my
Tested-by: tag? I didn't do thorough tests though.
--
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]
| From | Jiri Olsa <jolsa@redhat.com> |
|---|---|
| Date | 2015-09-09 10:00 +0200 |
| Subject | Re: [PATCH 3/5] perf tools: Propagate error info for the tracepoint parsing |
| Message-ID | <q6Isp-5dz-7@gated-at.bofh.it> |
| In reply to | #1221110 |
On Tue, Sep 08, 2015 at 05:42:25PM -0400, Raphaël Beamonte wrote:
SNIP
> > @@ -386,7 +386,7 @@ PE_NAME ':' PE_NAME
> > struct list_head *list;
> >
> > ALLOC_LIST(list);
> > - if (parse_events_add_tracepoint(list, &data->idx, $1, $3)) {
> > + if (parse_events_add_tracepoint(list, &data->idx, $1, $3, data->error)) {
> > struct parse_events_error *error = data->error;
> >
> > if (error) {
> > --
> > 2.4.3
> >
>
> Works for me.
> Reviewed-by: Raphaël Beamonte <raphael.beamonte@gmail.com>
>
> I also made sure I could compile and run perf with that patch applied
> on top of the current linux master. Should I also propose my
> Tested-by: tag? I didn't do thorough tests though.
I always base my changes over Arnaldo's perf/core,
which gets eventually merged to Ingo's tip tree and
then the Linus'es tree.. it should be enough to test
it over my branch
thanks,
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]
| From | Matt Fleming <matt@codeblueprint.co.uk> |
|---|---|
| Date | 2015-09-12 13:00 +0200 |
| Subject | Re: [PATCH 3/5] perf tools: Propagate error info for the tracepoint parsing |
| Message-ID | <q7QHg-6H2-17@gated-at.bofh.it> |
| In reply to | #1219998 |
On Mon, 07 Sep, at 10:38:05AM, Jiri Olsa wrote: > Pass 'struct parse_events_error *error' to the parse-event.c > tracepoint adding path. It will be filled with error data > in following patches. > > Link: http://lkml.kernel.org/n/tip-las1hm5zf58b0twd27h9895b@git.kernel.org > Signed-off-by: Jiri Olsa <jolsa@kernel.org> > --- > tools/perf/util/parse-events.c | 27 ++++++++++++++++----------- > tools/perf/util/parse-events.h | 3 ++- > tools/perf/util/parse-events.y | 4 ++-- > 3 files changed, 20 insertions(+), 14 deletions(-) Reviewed-by: Matt Fleming <matt.fleming@intel.com> -- 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]
| From | tip-bot for Jiri Olsa <tipbot@zytor.com> |
|---|---|
| Date | 2015-09-16 09:30 +0200 |
| Subject | [tip:perf/core] perf tools: Propagate error info for the tracepoint parsing |
| Message-ID | <q9fkd-63y-3@gated-at.bofh.it> |
| In reply to | #1219998 |
Commit-ID: e2f9f8ea6a54e252e3a94a5c2321f673b5b97360
Gitweb: http://git.kernel.org/tip/e2f9f8ea6a54e252e3a94a5c2321f673b5b97360
Author: Jiri Olsa <jolsa@kernel.org>
AuthorDate: Mon, 7 Sep 2015 10:38:05 +0200
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Tue, 15 Sep 2015 09:48:32 -0300
perf tools: Propagate error info for the tracepoint parsing
Pass 'struct parse_events_error *error' to the parse-event.c tracepoint
adding path. It will be filled with error data in following patches.
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Reviewed-by: Raphael Beamonte <raphael.beamonte@gmail.com>
Reviewed-by: Matt Fleming <matt@codeblueprint.co.uk>
Cc: David Ahern <dsahern@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1441615087-13886-4-git-send-email-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/util/parse-events.c | 27 ++++++++++++++++-----------
tools/perf/util/parse-events.h | 3 ++-
tools/perf/util/parse-events.y | 4 ++--
3 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index 3840176..1b284b8 100644
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -387,7 +387,8 @@ int parse_events_add_cache(struct list_head *list, int *idx,
}
static int add_tracepoint(struct list_head *list, int *idx,
- char *sys_name, char *evt_name)
+ char *sys_name, char *evt_name,
+ struct parse_events_error *error __maybe_unused)
{
struct perf_evsel *evsel;
@@ -401,7 +402,8 @@ static int add_tracepoint(struct list_head *list, int *idx,
}
static int add_tracepoint_multi_event(struct list_head *list, int *idx,
- char *sys_name, char *evt_name)
+ char *sys_name, char *evt_name,
+ struct parse_events_error *error)
{
char evt_path[MAXPATHLEN];
struct dirent *evt_ent;
@@ -425,7 +427,7 @@ static int add_tracepoint_multi_event(struct list_head *list, int *idx,
if (!strglobmatch(evt_ent->d_name, evt_name))
continue;
- ret = add_tracepoint(list, idx, sys_name, evt_ent->d_name);
+ ret = add_tracepoint(list, idx, sys_name, evt_ent->d_name, error);
}
closedir(evt_dir);
@@ -433,15 +435,17 @@ static int add_tracepoint_multi_event(struct list_head *list, int *idx,
}
static int add_tracepoint_event(struct list_head *list, int *idx,
- char *sys_name, char *evt_name)
+ char *sys_name, char *evt_name,
+ struct parse_events_error *error)
{
return strpbrk(evt_name, "*?") ?
- add_tracepoint_multi_event(list, idx, sys_name, evt_name) :
- add_tracepoint(list, idx, sys_name, evt_name);
+ add_tracepoint_multi_event(list, idx, sys_name, evt_name, error) :
+ add_tracepoint(list, idx, sys_name, evt_name, error);
}
static int add_tracepoint_multi_sys(struct list_head *list, int *idx,
- char *sys_name, char *evt_name)
+ char *sys_name, char *evt_name,
+ struct parse_events_error *error)
{
struct dirent *events_ent;
DIR *events_dir;
@@ -465,7 +469,7 @@ static int add_tracepoint_multi_sys(struct list_head *list, int *idx,
continue;
ret = add_tracepoint_event(list, idx, events_ent->d_name,
- evt_name);
+ evt_name, error);
}
closedir(events_dir);
@@ -473,12 +477,13 @@ static int add_tracepoint_multi_sys(struct list_head *list, int *idx,
}
int parse_events_add_tracepoint(struct list_head *list, int *idx,
- char *sys, char *event)
+ char *sys, char *event,
+ struct parse_events_error *error)
{
if (strpbrk(sys, "*?"))
- return add_tracepoint_multi_sys(list, idx, sys, event);
+ return add_tracepoint_multi_sys(list, idx, sys, event, error);
else
- return add_tracepoint_event(list, idx, sys, event);
+ return add_tracepoint_event(list, idx, sys, event, error);
}
static int
diff --git a/tools/perf/util/parse-events.h b/tools/perf/util/parse-events.h
index a09b0e2..ffee7ec 100644
--- a/tools/perf/util/parse-events.h
+++ b/tools/perf/util/parse-events.h
@@ -118,7 +118,8 @@ int parse_events__modifier_event(struct list_head *list, char *str, bool add);
int parse_events__modifier_group(struct list_head *list, char *event_mod);
int parse_events_name(struct list_head *list, char *name);
int parse_events_add_tracepoint(struct list_head *list, int *idx,
- char *sys, char *event);
+ char *sys, char *event,
+ struct parse_events_error *error);
int parse_events_add_numeric(struct parse_events_evlist *data,
struct list_head *list,
u32 type, u64 config,
diff --git a/tools/perf/util/parse-events.y b/tools/perf/util/parse-events.y
index 9cd7081..54a3004 100644
--- a/tools/perf/util/parse-events.y
+++ b/tools/perf/util/parse-events.y
@@ -376,7 +376,7 @@ PE_NAME '-' PE_NAME ':' PE_NAME
snprintf(&sys_name, 128, "%s-%s", $1, $3);
ALLOC_LIST(list);
- ABORT_ON(parse_events_add_tracepoint(list, &data->idx, &sys_name, $5));
+ ABORT_ON(parse_events_add_tracepoint(list, &data->idx, &sys_name, $5, data->error));
$$ = list;
}
|
@@ -386,7 +386,7 @@ PE_NAME ':' PE_NAME
struct list_head *list;
ALLOC_LIST(list);
- if (parse_events_add_tracepoint(list, &data->idx, $1, $3)) {
+ if (parse_events_add_tracepoint(list, &data->idx, $1, $3, data->error)) {
struct parse_events_error *error = data->error;
if (error) {
--
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]
| From | Jiri Olsa <jolsa@kernel.org> |
|---|---|
| Date | 2015-09-07 10:40 +0200 |
| Subject | [PATCH 4/5] perf tools: Propagate error info from tp_format |
| Message-ID | <q6082-ic-21@gated-at.bofh.it> |
| In reply to | #1219995 |
Propagate error info from tp_format via ERR_PTR to get
it all the way down to the parse-event.c tracepoint adding
routines. Following functions now return pointer with
encoded error:
- tp_format
- trace_event__tp_format
- perf_evsel__newtp_idx
- perf_evsel__newtp
This affects several other places in perf, that cannot use
pointer check anymore, but must utilize the err.h interface,
when getting error information from above functions list.
Link: http://lkml.kernel.org/n/tip-bzdckgv1zfp2y8up9l7ojt7y@git.kernel.org
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
tools/perf/builtin-trace.c | 19 +++++++++++--------
tools/perf/tests/evsel-tp-sched.c | 10 ++++++++--
tools/perf/tests/openat-syscall-all-cpus.c | 3 ++-
tools/perf/tests/openat-syscall-tp-fields.c | 3 ++-
tools/perf/tests/openat-syscall.c | 3 ++-
tools/perf/util/evlist.c | 3 ++-
tools/perf/util/evsel.c | 11 +++++++++--
tools/perf/util/evsel.h | 3 +++
tools/perf/util/parse-events.c | 6 +++---
tools/perf/util/trace-event.c | 13 +++++++++++--
10 files changed, 53 insertions(+), 21 deletions(-)
diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
index 215653274102..93b80f12f35e 100644
--- a/tools/perf/builtin-trace.c
+++ b/tools/perf/builtin-trace.c
@@ -38,6 +38,7 @@
#include <stdlib.h>
#include <sys/mman.h>
#include <linux/futex.h>
+#include <linux/err.h>
/* For older distros: */
#ifndef MAP_STACK
@@ -245,13 +246,14 @@ static struct perf_evsel *perf_evsel__syscall_newtp(const char *direction, void
struct perf_evsel *evsel = perf_evsel__newtp("raw_syscalls", direction);
/* older kernel (e.g., RHEL6) use syscalls:{enter,exit} */
- if (evsel == NULL)
+ if (IS_ERR(evsel))
evsel = perf_evsel__newtp("syscalls", direction);
- if (evsel) {
- if (perf_evsel__init_syscall_tp(evsel, handler))
- goto out_delete;
- }
+ if (IS_ERR(evsel))
+ return NULL;
+
+ if (perf_evsel__init_syscall_tp(evsel, handler))
+ goto out_delete;
return evsel;
@@ -1705,12 +1707,12 @@ static int trace__read_syscall_info(struct trace *trace, int id)
snprintf(tp_name, sizeof(tp_name), "sys_enter_%s", sc->name);
sc->tp_format = trace_event__tp_format("syscalls", tp_name);
- if (sc->tp_format == NULL && sc->fmt && sc->fmt->alias) {
+ if (IS_ERR(sc->tp_format) && sc->fmt && sc->fmt->alias) {
snprintf(tp_name, sizeof(tp_name), "sys_enter_%s", sc->fmt->alias);
sc->tp_format = trace_event__tp_format("syscalls", tp_name);
}
- if (sc->tp_format == NULL)
+ if (IS_ERR(sc->tp_format))
return -1;
sc->args = sc->tp_format->format.fields;
@@ -2390,7 +2392,8 @@ static size_t trace__fprintf_thread_summary(struct trace *trace, FILE *fp);
static bool perf_evlist__add_vfs_getname(struct perf_evlist *evlist)
{
struct perf_evsel *evsel = perf_evsel__newtp("probe", "vfs_getname");
- if (evsel == NULL)
+
+ if (IS_ERR(evsel))
return false;
if (perf_evsel__field(evsel, "pathname") == NULL) {
diff --git a/tools/perf/tests/evsel-tp-sched.c b/tools/perf/tests/evsel-tp-sched.c
index 52162425c969..790e413d9a1f 100644
--- a/tools/perf/tests/evsel-tp-sched.c
+++ b/tools/perf/tests/evsel-tp-sched.c
@@ -1,3 +1,4 @@
+#include <linux/err.h>
#include <traceevent/event-parse.h>
#include "evsel.h"
#include "tests.h"
@@ -36,8 +37,8 @@ int test__perf_evsel__tp_sched_test(void)
struct perf_evsel *evsel = perf_evsel__newtp("sched", "sched_switch");
int ret = 0;
- if (evsel == NULL) {
- pr_debug("perf_evsel__new\n");
+ if (IS_ERR(evsel)) {
+ pr_debug("perf_evsel__newtp failed with %ld\n", PTR_ERR(evsel));
return -1;
}
@@ -66,6 +67,11 @@ int test__perf_evsel__tp_sched_test(void)
evsel = perf_evsel__newtp("sched", "sched_wakeup");
+ if (IS_ERR(evsel)) {
+ pr_debug("perf_evsel__newtp failed with %ld\n", PTR_ERR(evsel));
+ return -1;
+ }
+
if (perf_evsel__test_field(evsel, "comm", 16, true))
ret = -1;
diff --git a/tools/perf/tests/openat-syscall-all-cpus.c b/tools/perf/tests/openat-syscall-all-cpus.c
index 495d8126b722..9e104a2e973d 100644
--- a/tools/perf/tests/openat-syscall-all-cpus.c
+++ b/tools/perf/tests/openat-syscall-all-cpus.c
@@ -1,4 +1,5 @@
#include <api/fs/fs.h>
+#include <linux/err.h>
#include "evsel.h"
#include "tests.h"
#include "thread_map.h"
@@ -31,7 +32,7 @@ int test__openat_syscall_event_on_all_cpus(void)
CPU_ZERO(&cpu_set);
evsel = perf_evsel__newtp("syscalls", "sys_enter_openat");
- if (evsel == NULL) {
+ if (IS_ERR(evsel)) {
tracing_path__strerror_open_tp(errno, errbuf, sizeof(errbuf), "syscalls", "sys_enter_openat");
pr_err("%s\n", errbuf);
goto out_thread_map_delete;
diff --git a/tools/perf/tests/openat-syscall-tp-fields.c b/tools/perf/tests/openat-syscall-tp-fields.c
index 01a19626c846..473d3869727e 100644
--- a/tools/perf/tests/openat-syscall-tp-fields.c
+++ b/tools/perf/tests/openat-syscall-tp-fields.c
@@ -1,3 +1,4 @@
+#include <linux/err.h>
#include "perf.h"
#include "evlist.h"
#include "evsel.h"
@@ -30,7 +31,7 @@ int test__syscall_openat_tp_fields(void)
}
evsel = perf_evsel__newtp("syscalls", "sys_enter_openat");
- if (evsel == NULL) {
+ if (IS_ERR(evsel)) {
pr_debug("%s: perf_evsel__newtp\n", __func__);
goto out_delete_evlist;
}
diff --git a/tools/perf/tests/openat-syscall.c b/tools/perf/tests/openat-syscall.c
index 08ac9d94a050..7b1db8306098 100644
--- a/tools/perf/tests/openat-syscall.c
+++ b/tools/perf/tests/openat-syscall.c
@@ -1,4 +1,5 @@
#include <api/fs/tracing_path.h>
+#include <linux/err.h>
#include "thread_map.h"
#include "evsel.h"
#include "debug.h"
@@ -19,7 +20,7 @@ int test__openat_syscall_event(void)
}
evsel = perf_evsel__newtp("syscalls", "sys_enter_openat");
- if (evsel == NULL) {
+ if (IS_ERR(evsel)) {
tracing_path__strerror_open_tp(errno, errbuf, sizeof(errbuf), "syscalls", "sys_enter_openat");
pr_err("%s\n", errbuf);
goto out_thread_map_delete;
diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
index d51a5200c8af..3cb2bf9bd4bd 100644
--- a/tools/perf/util/evlist.c
+++ b/tools/perf/util/evlist.c
@@ -25,6 +25,7 @@
#include <linux/bitops.h>
#include <linux/hash.h>
#include <linux/log2.h>
+#include <linux/err.h>
static void perf_evlist__mmap_put(struct perf_evlist *evlist, int idx);
static void __perf_evlist__munmap(struct perf_evlist *evlist, int idx);
@@ -265,7 +266,7 @@ int perf_evlist__add_newtp(struct perf_evlist *evlist,
{
struct perf_evsel *evsel = perf_evsel__newtp(sys, name);
- if (evsel == NULL)
+ if (IS_ERR(evsel))
return -1;
evsel->handler = handler;
diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
index 771ade4d5966..08c20ee4e27d 100644
--- a/tools/perf/util/evsel.c
+++ b/tools/perf/util/evsel.c
@@ -13,6 +13,7 @@
#include <traceevent/event-parse.h>
#include <linux/hw_breakpoint.h>
#include <linux/perf_event.h>
+#include <linux/err.h>
#include <sys/resource.h>
#include "asm/bug.h"
#include "callchain.h"
@@ -225,9 +226,13 @@ struct perf_evsel *perf_evsel__new_idx(struct perf_event_attr *attr, int idx)
return evsel;
}
+/*
+ * Returns pointer with encoded error via <linux/err.h> interface.
+ */
struct perf_evsel *perf_evsel__newtp_idx(const char *sys, const char *name, int idx)
{
struct perf_evsel *evsel = zalloc(perf_evsel__object.size);
+ int err = -ENOMEM;
if (evsel != NULL) {
struct perf_event_attr attr = {
@@ -240,8 +245,10 @@ struct perf_evsel *perf_evsel__newtp_idx(const char *sys, const char *name, int
goto out_free;
evsel->tp_format = trace_event__tp_format(sys, name);
- if (evsel->tp_format == NULL)
+ if (IS_ERR(evsel->tp_format)) {
+ err = PTR_ERR(evsel->tp_format);
goto out_free;
+ }
event_attr_init(&attr);
attr.config = evsel->tp_format->id;
@@ -254,7 +261,7 @@ struct perf_evsel *perf_evsel__newtp_idx(const char *sys, const char *name, int
out_free:
zfree(&evsel->name);
free(evsel);
- return NULL;
+ return ERR_PTR(err);
}
const char *perf_evsel__hw_names[PERF_COUNT_HW_MAX] = {
diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h
index 298e6bbca200..b6e8ff876f17 100644
--- a/tools/perf/util/evsel.h
+++ b/tools/perf/util/evsel.h
@@ -161,6 +161,9 @@ static inline struct perf_evsel *perf_evsel__new(struct perf_event_attr *attr)
struct perf_evsel *perf_evsel__newtp_idx(const char *sys, const char *name, int idx);
+/*
+ * Returns pointer with encoded error via <linux/err.h> interface.
+ */
static inline struct perf_evsel *perf_evsel__newtp(const char *sys, const char *name)
{
return perf_evsel__newtp_idx(sys, name, 0);
diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index 1b284b8ad243..c47831c47220 100644
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -1,4 +1,5 @@
#include <linux/hw_breakpoint.h>
+#include <linux/err.h>
#include "util.h"
#include "../perf.h"
#include "evlist.h"
@@ -393,11 +394,10 @@ static int add_tracepoint(struct list_head *list, int *idx,
struct perf_evsel *evsel;
evsel = perf_evsel__newtp_idx(sys_name, evt_name, (*idx)++);
- if (!evsel)
- return -ENOMEM;
+ if (IS_ERR(evsel))
+ return PTR_ERR(evsel);
list_add_tail(&evsel->node, list);
-
return 0;
}
diff --git a/tools/perf/util/trace-event.c b/tools/perf/util/trace-event.c
index 2f4996ab313d..8e3a60e3e15f 100644
--- a/tools/perf/util/trace-event.c
+++ b/tools/perf/util/trace-event.c
@@ -7,6 +7,7 @@
#include <sys/stat.h>
#include <fcntl.h>
#include <linux/kernel.h>
+#include <linux/err.h>
#include <traceevent/event-parse.h>
#include <api/fs/tracing_path.h>
#include "trace-event.h"
@@ -66,6 +67,9 @@ void trace_event__cleanup(struct trace_event *t)
pevent_free(t->pevent);
}
+/*
+ * Returns pointer with encoded error via <linux/err.h> interface.
+ */
static struct event_format*
tp_format(const char *sys, const char *name)
{
@@ -74,12 +78,14 @@ tp_format(const char *sys, const char *name)
char path[PATH_MAX];
size_t size;
char *data;
+ int err;
scnprintf(path, PATH_MAX, "%s/%s/%s/format",
tracing_events_path, sys, name);
- if (filename__read_str(path, &data, &size))
- return NULL;
+ err = filename__read_str(path, &data, &size);
+ if (err)
+ return ERR_PTR(err);
pevent_parse_format(pevent, &event, data, size, sys);
@@ -87,6 +93,9 @@ tp_format(const char *sys, const char *name)
return event;
}
+/*
+ * Returns pointer with encoded error via <linux/err.h> interface.
+ */
struct event_format*
trace_event__tp_format(const char *sys, const char *name)
{
--
2.4.3
--
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]
| From | Arnaldo Carvalho de Melo <acme@kernel.org> |
|---|---|
| Date | 2015-09-09 23:00 +0200 |
| Subject | Re: [PATCH 4/5] perf tools: Propagate error info from tp_format |
| Message-ID | <q6UDg-5Q3-9@gated-at.bofh.it> |
| In reply to | #1219999 |
Em Mon, Sep 07, 2015 at 10:38:06AM +0200, Jiri Olsa escreveu:
> Propagate error info from tp_format via ERR_PTR to get
> it all the way down to the parse-event.c tracepoint adding
> routines. Following functions now return pointer with
> encoded error:
> - tp_format
> - trace_event__tp_format
> - perf_evsel__newtp_idx
> - perf_evsel__newtp
>
> This affects several other places in perf, that cannot use
> pointer check anymore, but must utilize the err.h interface,
> when getting error information from above functions list.
Right, so this is tricky and we must be careful, see below...
> Link: http://lkml.kernel.org/n/tip-bzdckgv1zfp2y8up9l7ojt7y@git.kernel.org
> Signed-off-by: Jiri Olsa <jolsa@kernel.org>
> ---
> tools/perf/builtin-trace.c | 19 +++++++++++--------
> tools/perf/tests/evsel-tp-sched.c | 10 ++++++++--
> tools/perf/tests/openat-syscall-all-cpus.c | 3 ++-
> tools/perf/tests/openat-syscall-tp-fields.c | 3 ++-
> tools/perf/tests/openat-syscall.c | 3 ++-
> tools/perf/util/evlist.c | 3 ++-
> tools/perf/util/evsel.c | 11 +++++++++--
> tools/perf/util/evsel.h | 3 +++
> tools/perf/util/parse-events.c | 6 +++---
> tools/perf/util/trace-event.c | 13 +++++++++++--
> 10 files changed, 53 insertions(+), 21 deletions(-)
>
> diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
> index 215653274102..93b80f12f35e 100644
> --- a/tools/perf/builtin-trace.c
> +++ b/tools/perf/builtin-trace.c
> @@ -38,6 +38,7 @@
> #include <stdlib.h>
> #include <sys/mman.h>
> #include <linux/futex.h>
> +#include <linux/err.h>
>
> /* For older distros: */
> #ifndef MAP_STACK
> @@ -245,13 +246,14 @@ static struct perf_evsel *perf_evsel__syscall_newtp(const char *direction, void
> struct perf_evsel *evsel = perf_evsel__newtp("raw_syscalls", direction);
>
> /* older kernel (e.g., RHEL6) use syscalls:{enter,exit} */
> - if (evsel == NULL)
> + if (IS_ERR(evsel))
> evsel = perf_evsel__newtp("syscalls", direction);
>
> - if (evsel) {
> - if (perf_evsel__init_syscall_tp(evsel, handler))
> - goto out_delete;
> - }
> + if (IS_ERR(evsel))
> + return NULL;
> +
> + if (perf_evsel__init_syscall_tp(evsel, handler))
> + goto out_delete;
This kind of stuff is ok, as evsel is a local variable and you kept the
interface for perf_evsel__syscall_newtp(), i.e. it returns NULL if a new
evsel can't be instantiated.
Ok, but that is a different interface than the one used by
perf_evsel__newtp(), that also instantiates a new evsel.
So when one thinks about "foo__new()" we now need to check which one of
the two interfaces it uses, if err.h or if the old NULL based failure
reporting one.
Double tricky if it is foo__new() and foo__new_variant(), as
perf_evsel__syscall_newtp() and perf_evsel__newtp(), i.e. both will
return a "struct perf_evsel" instance, but one using err.h, the other
use NULL.
Ok, you marked the ones using a comment, wonder if we couldn't use
'sparse' somehow here, is it used to check IS_ERR() usage in the kernel?
Ah, but what about this in trace__event_handler() in builtin-trace.c?
if (evsel->tp_format) {
event_format__fprintf(evsel->tp_format, sample->cpu,
sample->raw_data, sample->raw_size,
trace->output);
}
Don't we have to use IS_ERR() here? Ok, no, because if setting up
evsel->tp_format fails, then that evsel will be destroyed and
perf_evsel__newtp() will return ERR_PTR(), so it is ok not no use
ERR_PTR(evsel->tp_format) because it will only be != NULL when it was
successfully set up.
But then, in perf_evsel__newtp_idx if zalloc() fails we will not return
ERR_PTR(), but instead NULL, a-ha, this one seems to be a real bug, no?
/*
* Returns pointer with encoded error via <linux/err.h> interface.
*/
struct perf_evsel *perf_evsel__newtp_idx(const char *sys, const char *name, int idx)
{
struct perf_evsel *evsel = zalloc(perf_evsel__object.size);
int err = -ENOMEM;
if (evsel != NULL) {
struct perf_event_attr attr = {
.type = PERF_TYPE_TRACEPOINT,
.sample_type = (PERF_SAMPLE_RAW | PERF_SAMPLE_TIME |
PERF_SAMPLE_CPU | PERF_SAMPLE_PERIOD),
};
if (asprintf(&evsel->name, "%s:%s", sys, name) < 0)
goto out_free;
evsel->tp_format = trace_event__tp_format(sys, name);
if (IS_ERR(evsel->tp_format)) {
err = PTR_ERR(evsel->tp_format);
goto out_free;
}
event_attr_init(&attr);
attr.config = evsel->tp_format->id;
attr.sample_period = 1;
perf_evsel__init(evsel, &attr, idx);
}
return evsel;
out_free:
zfree(&evsel->name);
free(evsel);
return ERR_PTR(err);
}
>
> return evsel;
>
> @@ -1705,12 +1707,12 @@ static int trace__read_syscall_info(struct trace *trace, int id)
> snprintf(tp_name, sizeof(tp_name), "sys_enter_%s", sc->name);
> sc->tp_format = trace_event__tp_format("syscalls", tp_name);
>
> - if (sc->tp_format == NULL && sc->fmt && sc->fmt->alias) {
> + if (IS_ERR(sc->tp_format) && sc->fmt && sc->fmt->alias) {
> snprintf(tp_name, sizeof(tp_name), "sys_enter_%s", sc->fmt->alias);
> sc->tp_format = trace_event__tp_format("syscalls", tp_name);
> }
>
> - if (sc->tp_format == NULL)
> + if (IS_ERR(sc->tp_format))
> return -1;
>
> sc->args = sc->tp_format->format.fields;
> @@ -2390,7 +2392,8 @@ static size_t trace__fprintf_thread_summary(struct trace *trace, FILE *fp);
> static bool perf_evlist__add_vfs_getname(struct perf_evlist *evlist)
> {
> struct perf_evsel *evsel = perf_evsel__newtp("probe", "vfs_getname");
> - if (evsel == NULL)
> +
> + if (IS_ERR(evsel))
> return false;
>
> if (perf_evsel__field(evsel, "pathname") == NULL) {
> diff --git a/tools/perf/tests/evsel-tp-sched.c b/tools/perf/tests/evsel-tp-sched.c
> index 52162425c969..790e413d9a1f 100644
> --- a/tools/perf/tests/evsel-tp-sched.c
> +++ b/tools/perf/tests/evsel-tp-sched.c
> @@ -1,3 +1,4 @@
> +#include <linux/err.h>
> #include <traceevent/event-parse.h>
> #include "evsel.h"
> #include "tests.h"
> @@ -36,8 +37,8 @@ int test__perf_evsel__tp_sched_test(void)
> struct perf_evsel *evsel = perf_evsel__newtp("sched", "sched_switch");
> int ret = 0;
>
> - if (evsel == NULL) {
> - pr_debug("perf_evsel__new\n");
> + if (IS_ERR(evsel)) {
> + pr_debug("perf_evsel__newtp failed with %ld\n", PTR_ERR(evsel));
> return -1;
> }
>
> @@ -66,6 +67,11 @@ int test__perf_evsel__tp_sched_test(void)
>
> evsel = perf_evsel__newtp("sched", "sched_wakeup");
>
> + if (IS_ERR(evsel)) {
> + pr_debug("perf_evsel__newtp failed with %ld\n", PTR_ERR(evsel));
> + return -1;
> + }
> +
> if (perf_evsel__test_field(evsel, "comm", 16, true))
> ret = -1;
>
> diff --git a/tools/perf/tests/openat-syscall-all-cpus.c b/tools/perf/tests/openat-syscall-all-cpus.c
> index 495d8126b722..9e104a2e973d 100644
> --- a/tools/perf/tests/openat-syscall-all-cpus.c
> +++ b/tools/perf/tests/openat-syscall-all-cpus.c
> @@ -1,4 +1,5 @@
> #include <api/fs/fs.h>
> +#include <linux/err.h>
> #include "evsel.h"
> #include "tests.h"
> #include "thread_map.h"
> @@ -31,7 +32,7 @@ int test__openat_syscall_event_on_all_cpus(void)
> CPU_ZERO(&cpu_set);
>
> evsel = perf_evsel__newtp("syscalls", "sys_enter_openat");
> - if (evsel == NULL) {
> + if (IS_ERR(evsel)) {
> tracing_path__strerror_open_tp(errno, errbuf, sizeof(errbuf), "syscalls", "sys_enter_openat");
> pr_err("%s\n", errbuf);
> goto out_thread_map_delete;
> diff --git a/tools/perf/tests/openat-syscall-tp-fields.c b/tools/perf/tests/openat-syscall-tp-fields.c
> index 01a19626c846..473d3869727e 100644
> --- a/tools/perf/tests/openat-syscall-tp-fields.c
> +++ b/tools/perf/tests/openat-syscall-tp-fields.c
> @@ -1,3 +1,4 @@
> +#include <linux/err.h>
> #include "perf.h"
> #include "evlist.h"
> #include "evsel.h"
> @@ -30,7 +31,7 @@ int test__syscall_openat_tp_fields(void)
> }
>
> evsel = perf_evsel__newtp("syscalls", "sys_enter_openat");
> - if (evsel == NULL) {
> + if (IS_ERR(evsel)) {
> pr_debug("%s: perf_evsel__newtp\n", __func__);
> goto out_delete_evlist;
> }
> diff --git a/tools/perf/tests/openat-syscall.c b/tools/perf/tests/openat-syscall.c
> index 08ac9d94a050..7b1db8306098 100644
> --- a/tools/perf/tests/openat-syscall.c
> +++ b/tools/perf/tests/openat-syscall.c
> @@ -1,4 +1,5 @@
> #include <api/fs/tracing_path.h>
> +#include <linux/err.h>
> #include "thread_map.h"
> #include "evsel.h"
> #include "debug.h"
> @@ -19,7 +20,7 @@ int test__openat_syscall_event(void)
> }
>
> evsel = perf_evsel__newtp("syscalls", "sys_enter_openat");
> - if (evsel == NULL) {
> + if (IS_ERR(evsel)) {
> tracing_path__strerror_open_tp(errno, errbuf, sizeof(errbuf), "syscalls", "sys_enter_openat");
> pr_err("%s\n", errbuf);
> goto out_thread_map_delete;
> diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
> index d51a5200c8af..3cb2bf9bd4bd 100644
> --- a/tools/perf/util/evlist.c
> +++ b/tools/perf/util/evlist.c
> @@ -25,6 +25,7 @@
> #include <linux/bitops.h>
> #include <linux/hash.h>
> #include <linux/log2.h>
> +#include <linux/err.h>
>
> static void perf_evlist__mmap_put(struct perf_evlist *evlist, int idx);
> static void __perf_evlist__munmap(struct perf_evlist *evlist, int idx);
> @@ -265,7 +266,7 @@ int perf_evlist__add_newtp(struct perf_evlist *evlist,
> {
> struct perf_evsel *evsel = perf_evsel__newtp(sys, name);
>
> - if (evsel == NULL)
> + if (IS_ERR(evsel))
> return -1;
>
> evsel->handler = handler;
> diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
> index 771ade4d5966..08c20ee4e27d 100644
> --- a/tools/perf/util/evsel.c
> +++ b/tools/perf/util/evsel.c
> @@ -13,6 +13,7 @@
> #include <traceevent/event-parse.h>
> #include <linux/hw_breakpoint.h>
> #include <linux/perf_event.h>
> +#include <linux/err.h>
> #include <sys/resource.h>
> #include "asm/bug.h"
> #include "callchain.h"
> @@ -225,9 +226,13 @@ struct perf_evsel *perf_evsel__new_idx(struct perf_event_attr *attr, int idx)
> return evsel;
> }
>
> +/*
> + * Returns pointer with encoded error via <linux/err.h> interface.
> + */
> struct perf_evsel *perf_evsel__newtp_idx(const char *sys, const char *name, int idx)
> {
> struct perf_evsel *evsel = zalloc(perf_evsel__object.size);
> + int err = -ENOMEM;
>
> if (evsel != NULL) {
> struct perf_event_attr attr = {
> @@ -240,8 +245,10 @@ struct perf_evsel *perf_evsel__newtp_idx(const char *sys, const char *name, int
> goto out_free;
>
> evsel->tp_format = trace_event__tp_format(sys, name);
> - if (evsel->tp_format == NULL)
> + if (IS_ERR(evsel->tp_format)) {
> + err = PTR_ERR(evsel->tp_format);
> goto out_free;
> + }
>
> event_attr_init(&attr);
> attr.config = evsel->tp_format->id;
> @@ -254,7 +261,7 @@ struct perf_evsel *perf_evsel__newtp_idx(const char *sys, const char *name, int
> out_free:
> zfree(&evsel->name);
> free(evsel);
> - return NULL;
> + return ERR_PTR(err);
> }
>
> const char *perf_evsel__hw_names[PERF_COUNT_HW_MAX] = {
> diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h
> index 298e6bbca200..b6e8ff876f17 100644
> --- a/tools/perf/util/evsel.h
> +++ b/tools/perf/util/evsel.h
> @@ -161,6 +161,9 @@ static inline struct perf_evsel *perf_evsel__new(struct perf_event_attr *attr)
>
> struct perf_evsel *perf_evsel__newtp_idx(const char *sys, const char *name, int idx);
>
> +/*
> + * Returns pointer with encoded error via <linux/err.h> interface.
> + */
> static inline struct perf_evsel *perf_evsel__newtp(const char *sys, const char *name)
> {
> return perf_evsel__newtp_idx(sys, name, 0);
> diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
> index 1b284b8ad243..c47831c47220 100644
> --- a/tools/perf/util/parse-events.c
> +++ b/tools/perf/util/parse-events.c
> @@ -1,4 +1,5 @@
> #include <linux/hw_breakpoint.h>
> +#include <linux/err.h>
> #include "util.h"
> #include "../perf.h"
> #include "evlist.h"
> @@ -393,11 +394,10 @@ static int add_tracepoint(struct list_head *list, int *idx,
> struct perf_evsel *evsel;
>
> evsel = perf_evsel__newtp_idx(sys_name, evt_name, (*idx)++);
> - if (!evsel)
> - return -ENOMEM;
> + if (IS_ERR(evsel))
> + return PTR_ERR(evsel);
>
> list_add_tail(&evsel->node, list);
> -
> return 0;
> }
>
> diff --git a/tools/perf/util/trace-event.c b/tools/perf/util/trace-event.c
> index 2f4996ab313d..8e3a60e3e15f 100644
> --- a/tools/perf/util/trace-event.c
> +++ b/tools/perf/util/trace-event.c
> @@ -7,6 +7,7 @@
> #include <sys/stat.h>
> #include <fcntl.h>
> #include <linux/kernel.h>
> +#include <linux/err.h>
> #include <traceevent/event-parse.h>
> #include <api/fs/tracing_path.h>
> #include "trace-event.h"
> @@ -66,6 +67,9 @@ void trace_event__cleanup(struct trace_event *t)
> pevent_free(t->pevent);
> }
>
> +/*
> + * Returns pointer with encoded error via <linux/err.h> interface.
> + */
> static struct event_format*
> tp_format(const char *sys, const char *name)
> {
> @@ -74,12 +78,14 @@ tp_format(const char *sys, const char *name)
> char path[PATH_MAX];
> size_t size;
> char *data;
> + int err;
>
> scnprintf(path, PATH_MAX, "%s/%s/%s/format",
> tracing_events_path, sys, name);
>
> - if (filename__read_str(path, &data, &size))
> - return NULL;
> + err = filename__read_str(path, &data, &size);
> + if (err)
> + return ERR_PTR(err);
>
> pevent_parse_format(pevent, &event, data, size, sys);
>
> @@ -87,6 +93,9 @@ tp_format(const char *sys, const char *name)
> return event;
> }
>
> +/*
> + * Returns pointer with encoded error via <linux/err.h> interface.
> + */
> struct event_format*
> trace_event__tp_format(const char *sys, const char *name)
> {
> --
> 2.4.3
--
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]
| From | Jiri Olsa <jolsa@redhat.com> |
|---|---|
| Date | 2015-09-10 10:30 +0200 |
| Subject | Re: [PATCH 4/5] perf tools: Propagate error info from tp_format |
| Message-ID | <q75oZ-4nU-7@gated-at.bofh.it> |
| In reply to | #1221707 |
On Wed, Sep 09, 2015 at 05:58:13PM -0300, Arnaldo Carvalho de Melo wrote:
SNIP
> This kind of stuff is ok, as evsel is a local variable and you kept the
> interface for perf_evsel__syscall_newtp(), i.e. it returns NULL if a new
> evsel can't be instantiated.
>
> Ok, but that is a different interface than the one used by
> perf_evsel__newtp(), that also instantiates a new evsel.
>
> So when one thinks about "foo__new()" we now need to check which one of
> the two interfaces it uses, if err.h or if the old NULL based failure
> reporting one.
>
> Double tricky if it is foo__new() and foo__new_variant(), as
> perf_evsel__syscall_newtp() and perf_evsel__newtp(), i.e. both will
> return a "struct perf_evsel" instance, but one using err.h, the other
> use NULL.
>
> Ok, you marked the ones using a comment, wonder if we couldn't use
> 'sparse' somehow here, is it used to check IS_ERR() usage in the kernel?
hum, not sure.. will check ;-)
at least we could mark related functions with __must_check
to force the return value check
>
> Ah, but what about this in trace__event_handler() in builtin-trace.c?
>
> if (evsel->tp_format) {
> event_format__fprintf(evsel->tp_format, sample->cpu,
> sample->raw_data, sample->raw_size,
> trace->output);
> }
>
>
> Don't we have to use IS_ERR() here? Ok, no, because if setting up
> evsel->tp_format fails, then that evsel will be destroyed and
> perf_evsel__newtp() will return ERR_PTR(), so it is ok not no use
> ERR_PTR(evsel->tp_format) because it will only be != NULL when it was
> successfully set up.
>
> But then, in perf_evsel__newtp_idx if zalloc() fails we will not return
> ERR_PTR(), but instead NULL, a-ha, this one seems to be a real bug, no?
hate those allocations in declarations.. never do any good ;-)
yep, NULL is not an error, so it's real bug, attached patch should fix it
thanks,
jirka
---
diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
index 08c20ee4e27d..162973bec713 100644
--- a/tools/perf/util/evsel.c
+++ b/tools/perf/util/evsel.c
@@ -256,7 +256,7 @@ struct perf_evsel *perf_evsel__newtp_idx(const char *sys, const char *name, int
perf_evsel__init(evsel, &attr, idx);
}
- return evsel;
+ return evsel ?: ERR_PTR(err);
out_free:
zfree(&evsel->name);
--
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]
| From | Arnaldo Carvalho de Melo <acme@kernel.org> |
|---|---|
| Date | 2015-09-10 16:20 +0200 |
| Subject | Re: [PATCH 4/5] perf tools: Propagate error info from tp_format |
| Message-ID | <q7aRH-3Sb-11@gated-at.bofh.it> |
| In reply to | #1221998 |
Em Thu, Sep 10, 2015 at 10:24:52AM +0200, Jiri Olsa escreveu:
> On Wed, Sep 09, 2015 at 05:58:13PM -0300, Arnaldo Carvalho de Melo wrote:
>
> SNIP
>
> > This kind of stuff is ok, as evsel is a local variable and you kept the
> > interface for perf_evsel__syscall_newtp(), i.e. it returns NULL if a new
> > evsel can't be instantiated.
> >
> > Ok, but that is a different interface than the one used by
> > perf_evsel__newtp(), that also instantiates a new evsel.
> >
> > So when one thinks about "foo__new()" we now need to check which one of
> > the two interfaces it uses, if err.h or if the old NULL based failure
> > reporting one.
> >
> > Double tricky if it is foo__new() and foo__new_variant(), as
> > perf_evsel__syscall_newtp() and perf_evsel__newtp(), i.e. both will
> > return a "struct perf_evsel" instance, but one using err.h, the other
> > use NULL.
> >
> > Ok, you marked the ones using a comment, wonder if we couldn't use
> > 'sparse' somehow here, is it used to check IS_ERR() usage in the kernel?
>
> hum, not sure.. will check ;-)
>
> at least we could mark related functions with __must_check
> to force the return value check
Right, that helps a bit, but not when the test _is already there_,
against NULL.
That is why I thought about sparse, if it was used in the kernel somehow
to check for this, guess either it would notice ERR_PTR using routines
and then auto-mark them for checking if they are being tested using
IS_ERR() or plain NULL, will check, later...
- Arnaldo
> >
> > Ah, but what about this in trace__event_handler() in builtin-trace.c?
> >
> > if (evsel->tp_format) {
> > event_format__fprintf(evsel->tp_format, sample->cpu,
> > sample->raw_data, sample->raw_size,
> > trace->output);
> > }
> >
> >
> > Don't we have to use IS_ERR() here? Ok, no, because if setting up
> > evsel->tp_format fails, then that evsel will be destroyed and
> > perf_evsel__newtp() will return ERR_PTR(), so it is ok not no use
> > ERR_PTR(evsel->tp_format) because it will only be != NULL when it was
> > successfully set up.
> >
> > But then, in perf_evsel__newtp_idx if zalloc() fails we will not return
> > ERR_PTR(), but instead NULL, a-ha, this one seems to be a real bug, no?
>
> hate those allocations in declarations.. never do any good ;-)
>
> yep, NULL is not an error, so it's real bug, attached patch should fix it
>
> thanks,
> jirka
>
>
> ---
> diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
> index 08c20ee4e27d..162973bec713 100644
> --- a/tools/perf/util/evsel.c
> +++ b/tools/perf/util/evsel.c
> @@ -256,7 +256,7 @@ struct perf_evsel *perf_evsel__newtp_idx(const char *sys, const char *name, int
> perf_evsel__init(evsel, &attr, idx);
> }
>
> - return evsel;
> + return evsel ?: ERR_PTR(err);
>
> out_free:
> zfree(&evsel->name);
--
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]
| From | Arnaldo Carvalho de Melo <acme@kernel.org> |
|---|---|
| Date | 2015-09-14 23:00 +0200 |
| Subject | Re: [PATCH 4/5] perf tools: Propagate error info from tp_format |
| Message-ID | <q8J10-Ci-19@gated-at.bofh.it> |
| In reply to | #1221998 |
Em Thu, Sep 10, 2015 at 10:24:52AM +0200, Jiri Olsa escreveu:
> On Wed, Sep 09, 2015 at 05:58:13PM -0300, Arnaldo Carvalho de Melo wrote:
>
> SNIP
>
> > This kind of stuff is ok, as evsel is a local variable and you kept the
> > interface for perf_evsel__syscall_newtp(), i.e. it returns NULL if a new
> > evsel can't be instantiated.
> >
> > Ok, but that is a different interface than the one used by
> > perf_evsel__newtp(), that also instantiates a new evsel.
> >
> > So when one thinks about "foo__new()" we now need to check which one of
> > the two interfaces it uses, if err.h or if the old NULL based failure
> > reporting one.
> >
> > Double tricky if it is foo__new() and foo__new_variant(), as
> > perf_evsel__syscall_newtp() and perf_evsel__newtp(), i.e. both will
> > return a "struct perf_evsel" instance, but one using err.h, the other
> > use NULL.
> >
> > Ok, you marked the ones using a comment, wonder if we couldn't use
> > 'sparse' somehow here, is it used to check IS_ERR() usage in the kernel?
>
> hum, not sure.. will check ;-)
>
> at least we could mark related functions with __must_check
> to force the return value check
>
> >
> > Ah, but what about this in trace__event_handler() in builtin-trace.c?
> >
> > if (evsel->tp_format) {
> > event_format__fprintf(evsel->tp_format, sample->cpu,
> > sample->raw_data, sample->raw_size,
> > trace->output);
> > }
> >
> >
> > Don't we have to use IS_ERR() here? Ok, no, because if setting up
> > evsel->tp_format fails, then that evsel will be destroyed and
> > perf_evsel__newtp() will return ERR_PTR(), so it is ok not no use
> > ERR_PTR(evsel->tp_format) because it will only be != NULL when it was
> > successfully set up.
> >
> > But then, in perf_evsel__newtp_idx if zalloc() fails we will not return
> > ERR_PTR(), but instead NULL, a-ha, this one seems to be a real bug, no?
>
> hate those allocations in declarations.. never do any good ;-)
>
> yep, NULL is not an error, so it's real bug, attached patch should fix it
>
> thanks,
> jirka
Ok continuing, found two more problems in this patch, fixed as follows,
merging.
- Arnaldo
diff --git a/tools/perf/tests/mmap-basic.c b/tools/perf/tests/mmap-basic.c
index 666b67a4df9d..4bb0c5d2059d 100644
--- a/tools/perf/tests/mmap-basic.c
+++ b/tools/perf/tests/mmap-basic.c
@@ -65,7 +65,7 @@ int test__basic_mmap(void)
snprintf(name, sizeof(name), "sys_enter_%s", syscall_names[i]);
evsels[i] = perf_evsel__newtp("syscalls", name);
- if (evsels[i] == NULL) {
+ if (IS_ERR(evsels[i]) == NULL) {
pr_debug("perf_evsel__new\n");
goto out_delete_evlist;
}
diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
index 08c20ee4e27d..6b5d1b509148 100644
--- a/tools/perf/util/evsel.c
+++ b/tools/perf/util/evsel.c
@@ -234,7 +234,9 @@ struct perf_evsel *perf_evsel__newtp_idx(const char *sys, const char *name, int
struct perf_evsel *evsel = zalloc(perf_evsel__object.size);
int err = -ENOMEM;
- if (evsel != NULL) {
+ if (evsel == NULL) {
+ goto out_err;
+ } else {
struct perf_event_attr attr = {
.type = PERF_TYPE_TRACEPOINT,
.sample_type = (PERF_SAMPLE_RAW | PERF_SAMPLE_TIME |
@@ -261,6 +263,7 @@ struct perf_evsel *perf_evsel__newtp_idx(const char *sys, const char *name, int
out_free:
zfree(&evsel->name);
free(evsel);
+out_err:
return ERR_PTR(err);
}
diff --git a/tools/perf/util/trace-event.c b/tools/perf/util/trace-event.c
index 8e3a60e3e15f..802bb868d446 100644
--- a/tools/perf/util/trace-event.c
+++ b/tools/perf/util/trace-event.c
@@ -100,7 +100,7 @@ struct event_format*
trace_event__tp_format(const char *sys, const char *name)
{
if (!tevent_initialized && trace_event__init2())
- return NULL;
+ return ERR_PTR(-ENOMEM);
return tp_format(sys, name);
}
--
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]
| From | Arnaldo Carvalho de Melo <acme@kernel.org> |
|---|---|
| Date | 2015-09-14 23:10 +0200 |
| Subject | Re: [PATCH 4/5] perf tools: Propagate error info from tp_format |
| Message-ID | <q8JaF-12P-13@gated-at.bofh.it> |
| In reply to | #1224449 |
Em Mon, Sep 14, 2015 at 05:53:03PM -0300, Arnaldo Carvalho de Melo escreveu:
> Ok continuing, found two more problems in this patch, fixed as follows,
> merging.
> - Arnaldo
> +++ b/tools/perf/tests/mmap-basic.c
> @@ -65,7 +65,7 @@ int test__basic_mmap(void)
>
> snprintf(name, sizeof(name), "sys_enter_%s", syscall_names[i]);
> evsels[i] = perf_evsel__newtp("syscalls", name);
> - if (evsels[i] == NULL) {
> + if (IS_ERR(evsels[i]) == NULL) {
modulo the == NULL ;-)
> pr_debug("perf_evsel__new\n");
> goto out_delete_evlist;
> }
--
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]
Page 1 of 2 [1] 2 Next page →
Back to top | Article view | linux.kernel
csiph-web