[LTP] [PATCH v2] ptrace: Fix build problems with glibc-2.18

[LTP] [PATCH v2] ptrace: Fix build problems with glibc-2.18

[Markos Chandras]

Since glibc-2.18, the struct ptrace_peeksiginfo_args is
also defined in sys/ptrace.h and conflicts with the definition
from the Linux kernel in linux/ptrace.h. We fix this by not
including the linux/ptrace.h header if the sys/ptrace.h header
defines the said struct. Fixes
https://github.com/linux-test-project/ltp/issues/6

Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
---
Build tested on glibc-2.17 and glibc-2.18 systems

Changes since v1:
Comments: http://sourceforge.net/mailarchive/message.php?msg_id=31677254
- Move the AC_CHECK_TYPES from configure.ac to m4/ltp-ptrace.m4
- Fix typo in config.h.default
---
 include/config.h.default                  | 3 +++
 m4/ltp-ptrace.m4                          | 3 +++
 testcases/kernel/syscalls/ptrace/ptrace.h | 4 +++-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/include/config.h.default b/include/config.h.default
index 96e25c4..7095b92 100644
--- a/include/config.h.default
+++ b/include/config.h.default
@@ -167,6 +167,9 @@
 /* Define to 1 if the system has the type `struct modify_ldt_ldt_s'. */
 #undef HAVE_STRUCT_MODIFY_LDT_LDT_S
 
+/* Define to 1 if the system has the type `struct ptrace_peeksiginfo_args'. */
+#undef HAVE_STRUCT_PTRACE_PEEKSIGINFO_ARGS
+
 /* Define to 1 if `signo' is member of `struct signalfd_siginfo'. */
 #undef HAVE_STRUCT_SIGNALFD_SIGINFO_SIGNO
 
diff --git a/m4/ltp-ptrace.m4 b/m4/ltp-ptrace.m4
index 63e968e..ca360bb 100644
--- a/m4/ltp-ptrace.m4
+++ b/m4/ltp-ptrace.m4
@@ -40,5 +40,8 @@ save_CPPFLAGS=$CPPFLAGS
 CPPFLAGS="$CPPFLAGS -I$srcdir/testcases/kernel/syscalls/ptrace"
 AC_CHECK_TYPES([struct user_regs_struct, struct pt_regs],,,[#include "ptrace.h"])
 AC_CHECK_DECLS([PTRACE_GETSIGINFO, PTRACE_O_TRACEVFORKDONE, PTRACE_SETOPTIONS],,,[#include "ptrace.h"])
+dnl glibc-2.18 defines ptrace_peeksiginfo_args in sys/ptrace.h which
+dnl conflicts with the one from linux kernel in linux/ptrace.h
+AC_CHECK_TYPES([struct ptrace_peeksiginfo_args],,,[#include <sys/ptrace.h>])
 CPPFLAGS=$save_CPPFLAGS
 ])
diff --git a/testcases/kernel/syscalls/ptrace/ptrace.h b/testcases/kernel/syscalls/ptrace/ptrace.h
index f0767d7..4a43f01 100644
--- a/testcases/kernel/syscalls/ptrace/ptrace.h
+++ b/testcases/kernel/syscalls/ptrace/ptrace.h
@@ -19,7 +19,9 @@
 # include <asm/ptrace.h>
 #endif
 #ifdef HAVE_LINUX_PTRACE_H
-# include <linux/ptrace.h>
+# ifndef HAVE_STRUCT_PTRACE_PEEKSIGINFO_ARGS
+#  include <linux/ptrace.h>
+# endif
 #endif
 #undef FU_ia64_fpreg
 #undef FU_pt_all_user_regs
-- 
1.8.4.4



------------------------------------------------------------------------------
Shape the Mobile Experience: Free Subscription
Software experts and developers: Be at the forefront of tech innovation.
Intel(R) Software Adrenaline delivers strategic insight and game-changing 
conversations that shape the rapidly evolving mobile landscape. Sign up now. 
http://pubads.g.doubleclick.net/gampad/clk?id=63431311&iu=/4140/ostg.clktrk
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list

Re: [LTP] [PATCH v2] ptrace: Fix build problems with glibc-2.18

[Markos Chandras]

On 11/25/2013 10:12 AM, Markos Chandras wrote:
> Since glibc-2.18, the struct ptrace_peeksiginfo_args is
> also defined in sys/ptrace.h and conflicts with the definition
> from the Linux kernel in linux/ptrace.h. We fix this by not
> including the linux/ptrace.h header if the sys/ptrace.h header
> defines the said struct. Fixes
> https://github.com/linux-test-project/ltp/issues/6
>
> Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
> ---
> Build tested on glibc-2.17 and glibc-2.18 systems
>
> Changes since v1:
> Comments: http://sourceforge.net/mailarchive/message.php?msg_id=31677254
> - Move the AC_CHECK_TYPES from configure.ac to m4/ltp-ptrace.m4
> - Fix typo in config.h.default
> ---
>   include/config.h.default                  | 3 +++
>   m4/ltp-ptrace.m4                          | 3 +++
>   testcases/kernel/syscalls/ptrace/ptrace.h | 4 +++-
>   3 files changed, 9 insertions(+), 1 deletion(-)
>
> diff --git a/include/config.h.default b/include/config.h.default
> index 96e25c4..7095b92 100644
> --- a/include/config.h.default
> +++ b/include/config.h.default
> @@ -167,6 +167,9 @@
>   /* Define to 1 if the system has the type `struct modify_ldt_ldt_s'. */
>   #undef HAVE_STRUCT_MODIFY_LDT_LDT_S
>
> +/* Define to 1 if the system has the type `struct ptrace_peeksiginfo_args'. */
> +#undef HAVE_STRUCT_PTRACE_PEEKSIGINFO_ARGS
> +
>   /* Define to 1 if `signo' is member of `struct signalfd_siginfo'. */
>   #undef HAVE_STRUCT_SIGNALFD_SIGINFO_SIGNO
>
> diff --git a/m4/ltp-ptrace.m4 b/m4/ltp-ptrace.m4
> index 63e968e..ca360bb 100644
> --- a/m4/ltp-ptrace.m4
> +++ b/m4/ltp-ptrace.m4
> @@ -40,5 +40,8 @@ save_CPPFLAGS=$CPPFLAGS
>   CPPFLAGS="$CPPFLAGS -I$srcdir/testcases/kernel/syscalls/ptrace"
>   AC_CHECK_TYPES([struct user_regs_struct, struct pt_regs],,,[#include "ptrace.h"])
>   AC_CHECK_DECLS([PTRACE_GETSIGINFO, PTRACE_O_TRACEVFORKDONE, PTRACE_SETOPTIONS],,,[#include "ptrace.h"])
> +dnl glibc-2.18 defines ptrace_peeksiginfo_args in sys/ptrace.h which
> +dnl conflicts with the one from linux kernel in linux/ptrace.h
> +AC_CHECK_TYPES([struct ptrace_peeksiginfo_args],,,[#include <sys/ptrace.h>])
>   CPPFLAGS=$save_CPPFLAGS
>   ])
> diff --git a/testcases/kernel/syscalls/ptrace/ptrace.h b/testcases/kernel/syscalls/ptrace/ptrace.h
> index f0767d7..4a43f01 100644
> --- a/testcases/kernel/syscalls/ptrace/ptrace.h
> +++ b/testcases/kernel/syscalls/ptrace/ptrace.h
> @@ -19,7 +19,9 @@
>   # include <asm/ptrace.h>
>   #endif
>   #ifdef HAVE_LINUX_PTRACE_H
> -# include <linux/ptrace.h>
> +# ifndef HAVE_STRUCT_PTRACE_PEEKSIGINFO_ARGS
> +#  include <linux/ptrace.h>
> +# endif
>   #endif
>   #undef FU_ia64_fpreg
>   #undef FU_pt_all_user_regs
>

Hello,

ping?

-- 
markos


------------------------------------------------------------------------------
Rapidly troubleshoot problems before they affect your business. Most IT 
organizations don't have a clear picture of how application performance 
affects their revenue. With AppDynamics, you get 100% visibility into your 
Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro!
http://pubads.g.doubleclick.net/gampad/clk?id=84349351&iu=/4140/ostg.clktrk
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list

Re: [LTP] [PATCH v2] ptrace: Fix build problems with glibc-2.18

[chrubis]

Hi!
> 
> Hello,
> 

Sorry for the delay, there was quite a number of patches lately and I'm
getting to them as fast as I can.

-- 
Cyril Hrubis
chrubis@suse.cz

------------------------------------------------------------------------------
Rapidly troubleshoot problems before they affect your business. Most IT 
organizations don't have a clear picture of how application performance 
affects their revenue. With AppDynamics, you get 100% visibility into your 
Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro!
http://pubads.g.doubleclick.net/gampad/clk?id=84349351&iu=/4140/ostg.clktrk
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list

Re: [LTP] [PATCH v2] ptrace: Fix build problems with glibc-2.18

[chrubis]

Hi!
> Since glibc-2.18, the struct ptrace_peeksiginfo_args is
> also defined in sys/ptrace.h and conflicts with the definition
> from the Linux kernel in linux/ptrace.h. We fix this by not
> including the linux/ptrace.h header if the sys/ptrace.h header
> defines the said struct. Fixes
> https://github.com/linux-test-project/ltp/issues/6
> 
> Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>

Pushed, thanks.

-- 
Cyril Hrubis
chrubis@suse.cz

------------------------------------------------------------------------------
Rapidly troubleshoot problems before they affect your business. Most IT 
organizations don't have a clear picture of how application performance 
affects their revenue. With AppDynamics, you get 100% visibility into your 
Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro!
http://pubads.g.doubleclick.net/gampad/clk?id=84349351&iu=/4140/ostg.clktrk
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list

Re: [LTP] [PATCH v2] ptrace: Fix build problems with glibc-2.18

[Mike Frysinger]

[-- Attachment #1.1: Type: Text/Plain, Size: 581 bytes --]

On Monday 25 November 2013 05:12:59 Markos Chandras wrote:
> Since glibc-2.18, the struct ptrace_peeksiginfo_args is
> also defined in sys/ptrace.h and conflicts with the definition
> from the Linux kernel in linux/ptrace.h. We fix this by not
> including the linux/ptrace.h header if the sys/ptrace.h header
> defines the said struct. Fixes
> https://github.com/linux-test-project/ltp/issues/6

i'm somewhat inclined to undo this as it's really a bug in glibc-2.18 that 
should be fixed in glibc-2.19:
	https://sourceware.org/ml/libc-alpha/2014-01/msg00078.html
-mike

[-- Attachment #1.2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

[-- Attachment #2: Type: text/plain, Size: 455 bytes --]

------------------------------------------------------------------------------
Rapidly troubleshoot problems before they affect your business. Most IT 
organizations don't have a clear picture of how application performance 
affects their revenue. With AppDynamics, you get 100% visibility into your 
Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro!
http://pubads.g.doubleclick.net/gampad/clk?id=84349831&iu=/4140/ostg.clktrk

[-- Attachment #3: Type: text/plain, Size: 155 bytes --]

_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list

Re: [LTP] [PATCH v2] ptrace: Fix build problems with glibc-2.18

[Markos Chandras]

On 01/05/2014 10:27 PM, Mike Frysinger wrote:
> On Monday 25 November 2013 05:12:59 Markos Chandras wrote:
>> Since glibc-2.18, the struct ptrace_peeksiginfo_args is
>> also defined in sys/ptrace.h and conflicts with the definition
>> from the Linux kernel in linux/ptrace.h. We fix this by not
>> including the linux/ptrace.h header if the sys/ptrace.h header
>> defines the said struct. Fixes
>> https://github.com/linux-test-project/ltp/issues/6
>
> i'm somewhat inclined to undo this as it's really a bug in glibc-2.18 that
> should be fixed in glibc-2.19:
> 	https://sourceware.org/ml/libc-alpha/2014-01/msg00078.html
> -mike
>

Ehm that would break the build for people already using 2.18. Even if a 
new 2.18 is released with the fix, people using the old one will still 
face the same problem.

-- 
markos


------------------------------------------------------------------------------
Rapidly troubleshoot problems before they affect your business. Most IT 
organizations don't have a clear picture of how application performance 
affects their revenue. With AppDynamics, you get 100% visibility into your 
Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro!
http://pubads.g.doubleclick.net/gampad/clk?id=84349831&iu=/4140/ostg.clktrk
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list

Re: [LTP] [PATCH v2] ptrace: Fix build problems with glibc-2.18

[Mike Frysinger]

[-- Attachment #1.1: Type: Text/Plain, Size: 968 bytes --]

On Monday 06 January 2014 06:45:43 Markos Chandras wrote:
> On 01/05/2014 10:27 PM, Mike Frysinger wrote:
> > On Monday 25 November 2013 05:12:59 Markos Chandras wrote:
> >> Since glibc-2.18, the struct ptrace_peeksiginfo_args is
> >> also defined in sys/ptrace.h and conflicts with the definition
> >> from the Linux kernel in linux/ptrace.h. We fix this by not
> >> including the linux/ptrace.h header if the sys/ptrace.h header
> >> defines the said struct. Fixes
> >> https://github.com/linux-test-project/ltp/issues/6
> > 
> > i'm somewhat inclined to undo this as it's really a bug in glibc-2.18
> > that should be fixed in glibc-2.19:
> > 	https://sourceware.org/ml/libc-alpha/2014-01/msg00078.html
> 
> Ehm that would break the build for people already using 2.18. Even if a
> new 2.18 is released with the fix, people using the old one will still
> face the same problem.

i'm aware that would be the situation.  i'm fine with that.
-mike

[-- Attachment #1.2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

[-- Attachment #2: Type: text/plain, Size: 455 bytes --]

------------------------------------------------------------------------------
Rapidly troubleshoot problems before they affect your business. Most IT 
organizations don't have a clear picture of how application performance 
affects their revenue. With AppDynamics, you get 100% visibility into your 
Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro!
http://pubads.g.doubleclick.net/gampad/clk?id=84349831&iu=/4140/ostg.clktrk

[-- Attachment #3: Type: text/plain, Size: 155 bytes --]

_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list

Re: [LTP] [PATCH v2] ptrace: Fix build problems with glibc-2.18

[Markos Chandras]

On 01/06/2014 12:49 PM, Mike Frysinger wrote:
> On Monday 06 January 2014 06:45:43 Markos Chandras wrote:
>> On 01/05/2014 10:27 PM, Mike Frysinger wrote:
>>> On Monday 25 November 2013 05:12:59 Markos Chandras wrote:
>>>> Since glibc-2.18, the struct ptrace_peeksiginfo_args is
>>>> also defined in sys/ptrace.h and conflicts with the definition
>>>> from the Linux kernel in linux/ptrace.h. We fix this by not
>>>> including the linux/ptrace.h header if the sys/ptrace.h header
>>>> defines the said struct. Fixes
>>>> https://github.com/linux-test-project/ltp/issues/6
>>>
>>> i'm somewhat inclined to undo this as it's really a bug in glibc-2.18
>>> that should be fixed in glibc-2.19:
>>> 	https://sourceware.org/ml/libc-alpha/2014-01/msg00078.html
>>
>> Ehm that would break the build for people already using 2.18. Even if a
>> new 2.18 is released with the fix, people using the old one will still
>> face the same problem.
>
> i'm aware that would be the situation.  i'm fine with that.
> -mike
>
It's not my call to make, but forcing people to update their glibc in 
order to build LTP is a bit too much. I suggest to keep this workaround 
for X months, until more people have been moved to a fixed glibc version.

strace also has similar fix
http://sourceforge.net/p/strace/code/ci/0b4060f61f1bb101b5d8d084714b7d2feacdb199/

other projects may have one too. Such fixes keep systems with 2.18 
working for now and it really does not affect anyone with <2.18.

but like I said, it not really my call to make. whatever works for you.

-- 
markos


------------------------------------------------------------------------------
Rapidly troubleshoot problems before they affect your business. Most IT 
organizations don't have a clear picture of how application performance 
affects their revenue. With AppDynamics, you get 100% visibility into your 
Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro!
http://pubads.g.doubleclick.net/gampad/clk?id=84349831&iu=/4140/ostg.clktrk
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list

Re: [LTP] [PATCH v2] ptrace: Fix build problems with glibc-2.18

[chrubis]

Hi!
> > Since glibc-2.18, the struct ptrace_peeksiginfo_args is
> > also defined in sys/ptrace.h and conflicts with the definition
> > from the Linux kernel in linux/ptrace.h. We fix this by not
> > including the linux/ptrace.h header if the sys/ptrace.h header
> > defines the said struct. Fixes
> > https://github.com/linux-test-project/ltp/issues/6
> 
> i'm somewhat inclined to undo this as it's really a bug in glibc-2.18 that 
> should be fixed in glibc-2.19:
> 	https://sourceware.org/ml/libc-alpha/2014-01/msg00078.html

Let's keep it for the next release (which will happen anytime soon). The
ptrace tests are messy and the ptrace.h needs to be fixed anyway.

Or do you insist on removing it before the release? I don't like that
idea much but I can change my opinion if you provide reasonable
arguments.

-- 
Cyril Hrubis
chrubis@suse.cz

------------------------------------------------------------------------------
Rapidly troubleshoot problems before they affect your business. Most IT 
organizations don't have a clear picture of how application performance 
affects their revenue. With AppDynamics, you get 100% visibility into your 
Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro!
http://pubads.g.doubleclick.net/gampad/clk?id=84349831&iu=/4140/ostg.clktrk
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list

Re: [LTP] [PATCH v2] ptrace: Fix build problems with glibc-2.18

[Mike Frysinger]

[-- Attachment #1.1: Type: Text/Plain, Size: 1696 bytes --]

On Wednesday 08 January 2014 06:50:43 Markos Chandras wrote:
> On 01/06/2014 12:49 PM, Mike Frysinger wrote:
> > On Monday 06 January 2014 06:45:43 Markos Chandras wrote:
> >> On 01/05/2014 10:27 PM, Mike Frysinger wrote:
> >>> On Monday 25 November 2013 05:12:59 Markos Chandras wrote:
> >>>> Since glibc-2.18, the struct ptrace_peeksiginfo_args is
> >>>> also defined in sys/ptrace.h and conflicts with the definition
> >>>> from the Linux kernel in linux/ptrace.h. We fix this by not
> >>>> including the linux/ptrace.h header if the sys/ptrace.h header
> >>>> defines the said struct. Fixes
> >>>> https://github.com/linux-test-project/ltp/issues/6
> >>> 
> >>> i'm somewhat inclined to undo this as it's really a bug in glibc-2.18
> >>> 
> >>> that should be fixed in glibc-2.19:
> >>> 	https://sourceware.org/ml/libc-alpha/2014-01/msg00078.html
> >> 
> >> Ehm that would break the build for people already using 2.18. Even if a
> >> new 2.18 is released with the fix, people using the old one will still
> >> face the same problem.
> > 
> > i'm aware that would be the situation.  i'm fine with that.
> 
> It's not my call to make, but forcing people to update their glibc in
> order to build LTP is a bit too much. I suggest to keep this workaround
> for X months, until more people have been moved to a fixed glibc version.

i'm not forcing people to update their glibc.  i am forcing them to get their 
distro to land a simple fix.  or run a simple sed script as root to fix their 
header.

> strace also has similar fix
> http://sourceforge.net/p/strace/code/ci/0b4060f61f1bb101b5d8d084714b7d2feac
> db199/

yes, and i already commented there
-mike

[-- Attachment #1.2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

[-- Attachment #2: Type: text/plain, Size: 455 bytes --]

------------------------------------------------------------------------------
Rapidly troubleshoot problems before they affect your business. Most IT 
organizations don't have a clear picture of how application performance 
affects their revenue. With AppDynamics, you get 100% visibility into your 
Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro!
http://pubads.g.doubleclick.net/gampad/clk?id=84349831&iu=/4140/ostg.clktrk

[-- Attachment #3: Type: text/plain, Size: 155 bytes --]

_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list

Re: [LTP] [PATCH v2] ptrace: Fix build problems with glibc-2.18

[chrubis]

Hi!
> > Let's keep it for the next release (which will happen anytime soon). The
> > ptrace tests are messy and the ptrace.h needs to be fixed anyway.
> > 
> > Or do you insist on removing it before the release? I don't like that
> > idea much but I can change my opinion if you provide reasonable
> > arguments.
> 
> we can leave it for a while, but i'll delete it once glibc-2.19 is out for 
> some time

OK with me.

-- 
Cyril Hrubis
chrubis@suse.cz

------------------------------------------------------------------------------
CenturyLink Cloud: The Leader in Enterprise Cloud Services.
Learn Why More Businesses Are Choosing CenturyLink Cloud For
Critical Workloads, Development Environments & Everything In Between.
Get a Quote or Start a Free Trial Today. 
http://pubads.g.doubleclick.net/gampad/clk?id=119420431&iu=/4140/ostg.clktrk
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list