* [LTP] [PATCH] tracing/intel_pt: Fix build on older userspace.
@ 2018-10-17 15:38 Cyril Hrubis
2018-10-17 19:48 ` Petr Vorel
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Cyril Hrubis @ 2018-10-17 15:38 UTC (permalink / raw)
To: ltp
Older userspace linux headers do not have aux_* fields struct
perf_event_mmap_page. This commit disables the test build if older
headers were detected, the alternative would be adding a fallback
definition to LTP but I doubt that it's worth the effort.
Signed-off-by: Cyril Hrubis <chrubis@suse.cz>
CC: Ammy Yi <ammy.yi@intel.com>
---
configure.ac | 1 +
m4/ltp-perf_event.m4 | 13 +++++++++++++
testcases/kernel/tracing/pt_test/pt_test.c | 7 +++++++
3 files changed, 21 insertions(+)
create mode 100644 m4/ltp-perf_event.m4
diff --git a/configure.ac b/configure.ac
index 0f0d8c17a..e81d2add5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -229,6 +229,7 @@ LTP_CHECK_X_TABLES
LTP_CHECK_ATOMIC_MEMORY_MODEL
LTP_CHECK_TPACKET_V3
LTP_DETECT_HOST_CPU
+LTP_CHECK_PERF_EVENT
if test "x$with_numa" = xyes; then
LTP_CHECK_SYSCALL_NUMA
diff --git a/m4/ltp-perf_event.m4 b/m4/ltp-perf_event.m4
new file mode 100644
index 000000000..109ad4935
--- /dev/null
+++ b/m4/ltp-perf_event.m4
@@ -0,0 +1,13 @@
+dnl
+dnl Copyright (c) 2018 Cyril Hrubis <chrubis@suse.cz>
+dnl
+dnl SPDX-License-Identifier: GPL-2.0-or-later
+dnl
+
+dnl
+dnl LTP_CHECK_PERF_EVENT
+dnl ----------------------------
+dnl
+AC_DEFUN([LTP_CHECK_PERF_EVENT],[
+AC_CHECK_MEMBERS([struct perf_event_mmap_page.aux_head],,,[#include <linux/perf_event.h>])
+])
diff --git a/testcases/kernel/tracing/pt_test/pt_test.c b/testcases/kernel/tracing/pt_test/pt_test.c
index 517427992..abf575d37 100644
--- a/testcases/kernel/tracing/pt_test/pt_test.c
+++ b/testcases/kernel/tracing/pt_test/pt_test.c
@@ -20,6 +20,9 @@
#include <stdio.h>
#include "tst_test.h"
#include "lapi/syscalls.h"
+#include "config.h"
+
+#ifdef HAVE_STRUCT_PERF_EVENT_MMAP_PAGE_AUX_HEAD
#define PAGESIZE 4096
#define INTEL_PT_MEMSIZE (17*PAGESIZE)
@@ -157,3 +160,7 @@ static struct tst_test test = {
.cleanup = cleanup,
.needs_root = 1,
};
+
+#else
+TST_TEST_TCONF("missing aux_* fields in struct perf_event_mmap_page");
+#endif /* HAVE_STRUCT_PERF_EVENT_MMAP_PAGE_AUX_HEAD */
--
2.16.4
^ permalink raw reply related [flat|nested] 5+ messages in thread* [LTP] [PATCH] tracing/intel_pt: Fix build on older userspace.
2018-10-17 15:38 [LTP] [PATCH] tracing/intel_pt: Fix build on older userspace Cyril Hrubis
@ 2018-10-17 19:48 ` Petr Vorel
2018-10-17 20:27 ` Jan Stancek
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Petr Vorel @ 2018-10-17 19:48 UTC (permalink / raw)
To: ltp
Hi Cyril,
> Older userspace linux headers do not have aux_* fields struct
> perf_event_mmap_page. This commit disables the test build if older
> headers were detected, the alternative would be adding a fallback
> definition to LTP but I doubt that it's worth the effort.
> Signed-off-by: Cyril Hrubis <chrubis@suse.cz>
> CC: Ammy Yi <ammy.yi@intel.com>
Reviewed-by: Petr Vorel <pvorel@suse.cz>
Thanks for fixing it.
Kind regards,
Petr
^ permalink raw reply [flat|nested] 5+ messages in thread* [LTP] [PATCH] tracing/intel_pt: Fix build on older userspace.
2018-10-17 15:38 [LTP] [PATCH] tracing/intel_pt: Fix build on older userspace Cyril Hrubis
2018-10-17 19:48 ` Petr Vorel
@ 2018-10-17 20:27 ` Jan Stancek
2018-10-18 1:36 ` Yi, Ammy
2018-10-18 8:25 ` Cyril Hrubis
3 siblings, 0 replies; 5+ messages in thread
From: Jan Stancek @ 2018-10-17 20:27 UTC (permalink / raw)
To: ltp
----- Original Message -----
> Older userspace linux headers do not have aux_* fields struct
> perf_event_mmap_page. This commit disables the test build if older
> headers were detected, the alternative would be adding a fallback
> definition to LTP but I doubt that it's worth the effort.
>
> Signed-off-by: Cyril Hrubis <chrubis@suse.cz>
> CC: Ammy Yi <ammy.yi@intel.com>
ack, fixes build for me too
> ---
> configure.ac | 1 +
> m4/ltp-perf_event.m4 | 13 +++++++++++++
> testcases/kernel/tracing/pt_test/pt_test.c | 7 +++++++
> 3 files changed, 21 insertions(+)
> create mode 100644 m4/ltp-perf_event.m4
>
> diff --git a/configure.ac b/configure.ac
> index 0f0d8c17a..e81d2add5 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -229,6 +229,7 @@ LTP_CHECK_X_TABLES
> LTP_CHECK_ATOMIC_MEMORY_MODEL
> LTP_CHECK_TPACKET_V3
> LTP_DETECT_HOST_CPU
> +LTP_CHECK_PERF_EVENT
>
> if test "x$with_numa" = xyes; then
> LTP_CHECK_SYSCALL_NUMA
> diff --git a/m4/ltp-perf_event.m4 b/m4/ltp-perf_event.m4
> new file mode 100644
> index 000000000..109ad4935
> --- /dev/null
> +++ b/m4/ltp-perf_event.m4
> @@ -0,0 +1,13 @@
> +dnl
> +dnl Copyright (c) 2018 Cyril Hrubis <chrubis@suse.cz>
> +dnl
> +dnl SPDX-License-Identifier: GPL-2.0-or-later
> +dnl
> +
> +dnl
> +dnl LTP_CHECK_PERF_EVENT
> +dnl ----------------------------
> +dnl
> +AC_DEFUN([LTP_CHECK_PERF_EVENT],[
> +AC_CHECK_MEMBERS([struct perf_event_mmap_page.aux_head],,,[#include
> <linux/perf_event.h>])
> +])
> diff --git a/testcases/kernel/tracing/pt_test/pt_test.c
> b/testcases/kernel/tracing/pt_test/pt_test.c
> index 517427992..abf575d37 100644
> --- a/testcases/kernel/tracing/pt_test/pt_test.c
> +++ b/testcases/kernel/tracing/pt_test/pt_test.c
> @@ -20,6 +20,9 @@
> #include <stdio.h>
> #include "tst_test.h"
> #include "lapi/syscalls.h"
> +#include "config.h"
> +
> +#ifdef HAVE_STRUCT_PERF_EVENT_MMAP_PAGE_AUX_HEAD
>
> #define PAGESIZE 4096
> #define INTEL_PT_MEMSIZE (17*PAGESIZE)
> @@ -157,3 +160,7 @@ static struct tst_test test = {
> .cleanup = cleanup,
> .needs_root = 1,
> };
> +
> +#else
> +TST_TEST_TCONF("missing aux_* fields in struct perf_event_mmap_page");
> +#endif /* HAVE_STRUCT_PERF_EVENT_MMAP_PAGE_AUX_HEAD */
> --
> 2.16.4
>
>
> --
> Mailing list info: https://lists.linux.it/listinfo/ltp
>
^ permalink raw reply [flat|nested] 5+ messages in thread* [LTP] [PATCH] tracing/intel_pt: Fix build on older userspace.
2018-10-17 15:38 [LTP] [PATCH] tracing/intel_pt: Fix build on older userspace Cyril Hrubis
2018-10-17 19:48 ` Petr Vorel
2018-10-17 20:27 ` Jan Stancek
@ 2018-10-18 1:36 ` Yi, Ammy
2018-10-18 8:25 ` Cyril Hrubis
3 siblings, 0 replies; 5+ messages in thread
From: Yi, Ammy @ 2018-10-18 1:36 UTC (permalink / raw)
To: ltp
Hi Cyril,
Thanks for fixing this for Intel PT test.
Best Regards
Ammy Yi
-----Original Message-----
From: Cyril Hrubis [mailto:chrubis@suse.cz]
Sent: Wednesday, October 17, 2018 11:39 PM
To: ltp@lists.linux.it
Cc: Yi, Ammy <ammy.yi@intel.com>
Subject: [PATCH] tracing/intel_pt: Fix build on older userspace.
Older userspace linux headers do not have aux_* fields struct perf_event_mmap_page. This commit disables the test build if older headers were detected, the alternative would be adding a fallback definition to LTP but I doubt that it's worth the effort.
Signed-off-by: Cyril Hrubis <chrubis@suse.cz>
CC: Ammy Yi <ammy.yi@intel.com>
---
configure.ac | 1 +
m4/ltp-perf_event.m4 | 13 +++++++++++++
testcases/kernel/tracing/pt_test/pt_test.c | 7 +++++++
3 files changed, 21 insertions(+)
create mode 100644 m4/ltp-perf_event.m4
diff --git a/configure.ac b/configure.ac index 0f0d8c17a..e81d2add5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -229,6 +229,7 @@ LTP_CHECK_X_TABLES
LTP_CHECK_ATOMIC_MEMORY_MODEL
LTP_CHECK_TPACKET_V3
LTP_DETECT_HOST_CPU
+LTP_CHECK_PERF_EVENT
if test "x$with_numa" = xyes; then
LTP_CHECK_SYSCALL_NUMA
diff --git a/m4/ltp-perf_event.m4 b/m4/ltp-perf_event.m4 new file mode 100644 index 000000000..109ad4935
--- /dev/null
+++ b/m4/ltp-perf_event.m4
@@ -0,0 +1,13 @@
+dnl
+dnl Copyright (c) 2018 Cyril Hrubis <chrubis@suse.cz> dnl dnl
+SPDX-License-Identifier: GPL-2.0-or-later dnl
+
+dnl
+dnl LTP_CHECK_PERF_EVENT
+dnl ----------------------------
+dnl
+AC_DEFUN([LTP_CHECK_PERF_EVENT],[
+AC_CHECK_MEMBERS([struct perf_event_mmap_page.aux_head],,,[#include
+<linux/perf_event.h>])
+])
diff --git a/testcases/kernel/tracing/pt_test/pt_test.c b/testcases/kernel/tracing/pt_test/pt_test.c
index 517427992..abf575d37 100644
--- a/testcases/kernel/tracing/pt_test/pt_test.c
+++ b/testcases/kernel/tracing/pt_test/pt_test.c
@@ -20,6 +20,9 @@
#include <stdio.h>
#include "tst_test.h"
#include "lapi/syscalls.h"
+#include "config.h"
+
+#ifdef HAVE_STRUCT_PERF_EVENT_MMAP_PAGE_AUX_HEAD
#define PAGESIZE 4096
#define INTEL_PT_MEMSIZE (17*PAGESIZE)
@@ -157,3 +160,7 @@ static struct tst_test test = {
.cleanup = cleanup,
.needs_root = 1,
};
+
+#else
+TST_TEST_TCONF("missing aux_* fields in struct perf_event_mmap_page");
+#endif /* HAVE_STRUCT_PERF_EVENT_MMAP_PAGE_AUX_HEAD */
--
2.16.4
^ permalink raw reply related [flat|nested] 5+ messages in thread* [LTP] [PATCH] tracing/intel_pt: Fix build on older userspace.
2018-10-17 15:38 [LTP] [PATCH] tracing/intel_pt: Fix build on older userspace Cyril Hrubis
` (2 preceding siblings ...)
2018-10-18 1:36 ` Yi, Ammy
@ 2018-10-18 8:25 ` Cyril Hrubis
3 siblings, 0 replies; 5+ messages in thread
From: Cyril Hrubis @ 2018-10-18 8:25 UTC (permalink / raw)
To: ltp
Hi!
Pushed.
--
Cyril Hrubis
chrubis@suse.cz
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-10-18 8:25 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-10-17 15:38 [LTP] [PATCH] tracing/intel_pt: Fix build on older userspace Cyril Hrubis
2018-10-17 19:48 ` Petr Vorel
2018-10-17 20:27 ` Jan Stancek
2018-10-18 1:36 ` Yi, Ammy
2018-10-18 8:25 ` Cyril Hrubis
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox