[PATCH 1/2] linux/arm: sync sys/ptrace.h with Linux 4.15 [BZ #22433]

[PATCH 1/2] linux/arm: sync sys/ptrace.h with Linux 4.15 [BZ #22433]

[Dmitry V. Levin]

Clone generic linux/sys/ptrace.h, remove x86-specific PTRACE_GETFPXREGS
and PTRACE_SETFPXREGS constants, add the following arm-specific
__ptrace_request constants: PTRACE_GETWMMXREGS, PTRACE_SETWMMXREGS,
PTRACE_GET_THREAD_AREA, PTRACE_SET_SYSCALL, PTRACE_GETCRUNCHREGS,
PTRACE_SETCRUNCHREGS, PTRACE_GETVFPREGS, PTRACE_SETVFPREGS,
PTRACE_GETHBPREGS, PTRACE_SETHBPREGS, and PTRACE_GETFDPIC.

Tested with strace.

[BZ #22433]
* sysdeps/unix/sysv/linux/arm/sys/ptrace.h: New file.
---
 ChangeLog                                |   5 +
 sysdeps/unix/sysv/linux/arm/sys/ptrace.h | 204 +++++++++++++++++++++++++++++++
 2 files changed, 209 insertions(+)
 create mode 100644 sysdeps/unix/sysv/linux/arm/sys/ptrace.h

diff --git a/sysdeps/unix/sysv/linux/arm/sys/ptrace.h b/sysdeps/unix/sysv/linux/arm/sys/ptrace.h
new file mode 100644
index 0000000..4b1d443
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/arm/sys/ptrace.h
@@ -0,0 +1,204 @@
+/* `ptrace' debugger support interface.  Linux/ARM version.
+   Copyright (C) 1996-2017 Free Software Foundation, Inc.
+
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <https://www.gnu.org/licenses/>.  */
+
+#ifndef _SYS_PTRACE_H
+#define _SYS_PTRACE_H	1
+
+#include <features.h>
+#include <bits/types.h>
+
+__BEGIN_DECLS
+
+/* Type of the REQUEST argument to `ptrace.'  */
+enum __ptrace_request
+{
+  /* Indicate that the process making this request should be traced.
+     All signals received by this process can be intercepted by its
+     parent, and its parent can use the other `ptrace' requests.  */
+  PTRACE_TRACEME = 0,
+#define PT_TRACE_ME PTRACE_TRACEME
+
+  /* Return the word in the process's text space at address ADDR.  */
+  PTRACE_PEEKTEXT = 1,
+#define PT_READ_I PTRACE_PEEKTEXT
+
+  /* Return the word in the process's data space at address ADDR.  */
+  PTRACE_PEEKDATA = 2,
+#define PT_READ_D PTRACE_PEEKDATA
+
+  /* Return the word in the process's user area at offset ADDR.  */
+  PTRACE_PEEKUSER = 3,
+#define PT_READ_U PTRACE_PEEKUSER
+
+  /* Write the word DATA into the process's text space at address ADDR.  */
+  PTRACE_POKETEXT = 4,
+#define PT_WRITE_I PTRACE_POKETEXT
+
+  /* Write the word DATA into the process's data space at address ADDR.  */
+  PTRACE_POKEDATA = 5,
+#define PT_WRITE_D PTRACE_POKEDATA
+
+  /* Write the word DATA into the process's user area at offset ADDR.  */
+  PTRACE_POKEUSER = 6,
+#define PT_WRITE_U PTRACE_POKEUSER
+
+  /* Continue the process.  */
+  PTRACE_CONT = 7,
+#define PT_CONTINUE PTRACE_CONT
+
+  /* Kill the process.  */
+  PTRACE_KILL = 8,
+#define PT_KILL PTRACE_KILL
+
+  /* Single step the process.  */
+  PTRACE_SINGLESTEP = 9,
+#define PT_STEP PTRACE_SINGLESTEP
+
+  /* Get all general purpose registers used by a process.  */
+  PTRACE_GETREGS = 12,
+#define PT_GETREGS PTRACE_GETREGS
+
+  /* Set all general purpose registers used by a process.  */
+  PTRACE_SETREGS = 13,
+#define PT_SETREGS PTRACE_SETREGS
+
+  /* Get all floating point registers used by a process.  */
+  PTRACE_GETFPREGS = 14,
+#define PT_GETFPREGS PTRACE_GETFPREGS
+
+  /* Set all floating point registers used by a process.  */
+  PTRACE_SETFPREGS = 15,
+#define PT_SETFPREGS PTRACE_SETFPREGS
+
+  /* Attach to a process that is already running. */
+  PTRACE_ATTACH = 16,
+#define PT_ATTACH PTRACE_ATTACH
+
+  /* Detach from a process attached to with PTRACE_ATTACH.  */
+  PTRACE_DETACH = 17,
+#define PT_DETACH PTRACE_DETACH
+
+  /* Get the iWMMXt state of a process.  */
+  PTRACE_GETWMMXREGS = 18,
+#define PT_GETWMMXREGS PTRACE_GETWMMXREGS
+
+  /* Set the iWMMXt state of a process.  */
+  PTRACE_SETWMMXREGS = 19,
+#define PT_SETWMMXREGS PTRACE_SETWMMXREGS
+
+  /* Get the thread pointer of a process.  */
+  PTRACE_GET_THREAD_AREA = 22,
+#define PT_GET_THREAD_AREA PTRACE_GET_THREAD_AREA
+
+  /* Change the syscall number of a process.  */
+  PTRACE_SET_SYSCALL = 23,
+#define PT_SET_SYSCALL PTRACE_SET_SYSCALL
+
+  /* Continue and stop at the next entry to or return from syscall.  */
+  PTRACE_SYSCALL = 24,
+#define PT_SYSCALL PTRACE_SYSCALL
+
+  /* Get the Crunch state of a process.  */
+  PTRACE_GETCRUNCHREGS = 25,
+#define PT_GETCRUNCHREGS PTRACE_GETCRUNCHREGS
+
+  /* Set the Crunch state of a process.  */
+  PTRACE_SETCRUNCHREGS = 26,
+#define PT_SETCRUNCHREGS PTRACE_SETCRUNCHREGS
+
+  /* Get all VFP registers used by a process.  */
+  PTRACE_GETVFPREGS = 27,
+#define PT_GETVFPREGS PTRACE_GETVFPREGS
+
+  /* Set all VFP registers used by a process.  */
+  PTRACE_SETVFPREGS = 28,
+#define PT_SETVFPREGS PTRACE_SETVFPREGS
+
+  /* Get all hardware breakpoint registers.  */
+  PTRACE_GETHBPREGS = 29,
+#define PT_GETHBPREGS PTRACE_GETHBPREGS
+
+  /* Set all hardware breakpoint registers.  */
+  PTRACE_SETHBPREGS = 30,
+#define PT_SETHBPREGS PTRACE_SETHBPREGS
+
+  /* Get the ELF fdpic loadmap address.  */
+  PTRACE_GETFDPIC = 31,
+#define PT_GETFDPIC PTRACE_GETFDPIC
+
+  /* Set ptrace filter options.  */
+  PTRACE_SETOPTIONS = 0x4200,
+#define PT_SETOPTIONS PTRACE_SETOPTIONS
+
+  /* Get last ptrace message.  */
+  PTRACE_GETEVENTMSG = 0x4201,
+#define PT_GETEVENTMSG PTRACE_GETEVENTMSG
+
+  /* Get siginfo for process.  */
+  PTRACE_GETSIGINFO = 0x4202,
+#define PT_GETSIGINFO PTRACE_GETSIGINFO
+
+  /* Set new siginfo for process.  */
+  PTRACE_SETSIGINFO = 0x4203,
+#define PT_SETSIGINFO PTRACE_SETSIGINFO
+
+  /* Get register content.  */
+  PTRACE_GETREGSET = 0x4204,
+#define PTRACE_GETREGSET PTRACE_GETREGSET
+
+  /* Set register content.  */
+  PTRACE_SETREGSET = 0x4205,
+#define PTRACE_SETREGSET PTRACE_SETREGSET
+
+  /* Like PTRACE_ATTACH, but do not force tracee to trap and do not affect
+     signal or group stop state.  */
+  PTRACE_SEIZE = 0x4206,
+#define PTRACE_SEIZE PTRACE_SEIZE
+
+  /* Trap seized tracee.  */
+  PTRACE_INTERRUPT = 0x4207,
+#define PTRACE_INTERRUPT PTRACE_INTERRUPT
+
+  /* Wait for next group event.  */
+  PTRACE_LISTEN = 0x4208,
+#define PTRACE_LISTEN PTRACE_LISTEN
+
+  /* Retrieve siginfo_t structures without removing signals from a queue.  */
+  PTRACE_PEEKSIGINFO = 0x4209,
+#define PTRACE_PEEKSIGINFO PTRACE_PEEKSIGINFO
+
+  /* Get the mask of blocked signals.  */
+  PTRACE_GETSIGMASK = 0x420a,
+#define PTRACE_GETSIGMASK PTRACE_GETSIGMASK
+
+  /* Change the mask of blocked signals.  */
+  PTRACE_SETSIGMASK = 0x420b,
+#define PTRACE_SETSIGMASK PTRACE_SETSIGMASK
+
+  /* Get seccomp BPF filters.  */
+  PTRACE_SECCOMP_GET_FILTER = 0x420c
+#define PTRACE_SECCOMP_GET_FILTER PTRACE_SECCOMP_GET_FILTER
+};
+
+
+#include <bits/ptrace-shared.h>
+
+__END_DECLS
+
+#endif /* _SYS_PTRACE_H */
-- 
ldv

[PATCH 2/2] linux/aarch64: sync sys/ptrace.h with Linux 4.15

[Dmitry V. Levin]

Remove compat-specific constants that were never exported by kernel
headers under these names.  Before linux commit v3.7-rc1~16^2~1 they
were exported with COMPAT_ prefix, and after that commit they are not
exported at all.

To implement a proper multilib sys/ptrace.h on aarch64, arm/sys/ptrace.h
has to be used instead of aarch64/sys/ptrace.h with all arm-specific
definitions ifdef'ed.

* sysdeps/unix/sysv/linux/aarch64/sys/ptrace.h (__ptrace_request):
Remove arm-specific PTRACE_GET_THREAD_AREA, PTRACE_GETHBPREGS,
and PTRACE_SETHBPREGS.
---
 ChangeLog                                    | 4 ++++
 sysdeps/unix/sysv/linux/aarch64/sys/ptrace.h | 8 --------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/sysdeps/unix/sysv/linux/aarch64/sys/ptrace.h b/sysdeps/unix/sysv/linux/aarch64/sys/ptrace.h
index 111d54e..f02b167 100644
--- a/sysdeps/unix/sysv/linux/aarch64/sys/ptrace.h
+++ b/sysdeps/unix/sysv/linux/aarch64/sys/ptrace.h
@@ -78,18 +78,10 @@ enum __ptrace_request
   PTRACE_DETACH = 17,
 #define PT_DETACH PTRACE_DETACH
 
-  PTRACE_GET_THREAD_AREA = 22,
-
   /* Continue and stop at the next entry to or return from syscall.  */
   PTRACE_SYSCALL = 24,
 #define PT_SYSCALL PTRACE_SYSCALL
 
-  /* Get all hardware breakpoint registers.  */
-  PTRACE_GETHBPREGS = 29,
-
-  /* Set all hardware breakpoint registers.  */
-  PTRACE_SETHBPREGS = 30,
-
   /* Set ptrace filter options.  */
   PTRACE_SETOPTIONS = 0x4200,
 #define PT_SETOPTIONS PTRACE_SETOPTIONS
-- 
ldv

Re: [PATCH 2/2] linux/aarch64: sync sys/ptrace.h with Linux 4.15

[Joseph Myers]

On Sat, 30 Dec 2017, Dmitry V. Levin wrote:

> To implement a proper multilib sys/ptrace.h on aarch64, arm/sys/ptrace.h
> has to be used instead of aarch64/sys/ptrace.h with all arm-specific
> definitions ifdef'ed.

ARM and AArch64 are separate toolchain ports requiring separate compilers.  
There is no support for multilib headers supporting both in the same 
header.  (Debian/Ubuntu multiarch configurations put all bits/ and sys/ 
headers in multiarch directory arrangements so could handle having both 
versions of a sys/ header installed without problems.)

-- 
Joseph S. Myers
joseph@codesourcery.com

Re: [PATCH 1/2] linux/arm: sync sys/ptrace.h with Linux 4.15 [BZ #22433]

[Joseph Myers]

On Sat, 30 Dec 2017, Dmitry V. Levin wrote:

> Clone generic linux/sys/ptrace.h, remove x86-specific PTRACE_GETFPXREGS
> and PTRACE_SETFPXREGS constants, add the following arm-specific
> __ptrace_request constants: PTRACE_GETWMMXREGS, PTRACE_SETWMMXREGS,
> PTRACE_GET_THREAD_AREA, PTRACE_SET_SYSCALL, PTRACE_GETCRUNCHREGS,
> PTRACE_SETCRUNCHREGS, PTRACE_GETVFPREGS, PTRACE_SETVFPREGS,
> PTRACE_GETHBPREGS, PTRACE_SETHBPREGS, and PTRACE_GETFDPIC.
> 
> Tested with strace.
> 
> [BZ #22433]
> * sysdeps/unix/sysv/linux/arm/sys/ptrace.h: New file.

OK, with the copyright year range changed to end with 2018.

-- 
Joseph S. Myers
joseph@codesourcery.com

Re: [PATCH 2/2] linux/aarch64: sync sys/ptrace.h with Linux 4.15

[Dmitry V. Levin]

[-- Attachment #1: Type: text/plain, Size: 794 bytes --]

On Mon, Jan 01, 2018 at 01:43:53AM +0000, Joseph Myers wrote:
> On Sat, 30 Dec 2017, Dmitry V. Levin wrote:
> 
> > To implement a proper multilib sys/ptrace.h on aarch64, arm/sys/ptrace.h
> > has to be used instead of aarch64/sys/ptrace.h with all arm-specific
> > definitions ifdef'ed.
> 
> ARM and AArch64 are separate toolchain ports requiring separate compilers.  
> There is no support for multilib headers supporting both in the same 
> header.  (Debian/Ubuntu multiarch configurations put all bits/ and sys/ 
> headers in multiarch directory arrangements so could handle having both 
> versions of a sys/ header installed without problems.)

Sure.  My comment is addressed to people who might consider implementing
multilib headers on aarch64 in the future.


-- 
ldv

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 801 bytes --]

Re: [PATCH 2/2] linux/aarch64: sync sys/ptrace.h with Linux 4.15

[Dmitry V. Levin]

[-- Attachment #1: Type: text/plain, Size: 931 bytes --]

On Mon, Jan 01, 2018 at 11:35:41PM +0300, Dmitry V. Levin wrote:
> On Mon, Jan 01, 2018 at 01:43:53AM +0000, Joseph Myers wrote:
> > On Sat, 30 Dec 2017, Dmitry V. Levin wrote:
> > 
> > > To implement a proper multilib sys/ptrace.h on aarch64, arm/sys/ptrace.h
> > > has to be used instead of aarch64/sys/ptrace.h with all arm-specific
> > > definitions ifdef'ed.
> > 
> > ARM and AArch64 are separate toolchain ports requiring separate compilers.  
> > There is no support for multilib headers supporting both in the same 
> > header.  (Debian/Ubuntu multiarch configurations put all bits/ and sys/ 
> > headers in multiarch directory arrangements so could handle having both 
> > versions of a sys/ header installed without problems.)
> 
> Sure.  My comment is addressed to people who might consider implementing
> multilib headers on aarch64 in the future.

Any more comments?  Is the change OK?


-- 
ldv

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 801 bytes --]

Re: [PATCH 2/2] linux/aarch64: sync sys/ptrace.h with Linux 4.15

[Szabolcs Nagy]

On 07/02/18 09:48, Dmitry V. Levin wrote:
> On Mon, Jan 01, 2018 at 11:35:41PM +0300, Dmitry V. Levin wrote:
>> On Mon, Jan 01, 2018 at 01:43:53AM +0000, Joseph Myers wrote:
>>> On Sat, 30 Dec 2017, Dmitry V. Levin wrote:
>>>
>>>> To implement a proper multilib sys/ptrace.h on aarch64, arm/sys/ptrace.h
>>>> has to be used instead of aarch64/sys/ptrace.h with all arm-specific
>>>> definitions ifdef'ed.
>>>
>>> ARM and AArch64 are separate toolchain ports requiring separate compilers.
>>> There is no support for multilib headers supporting both in the same
>>> header.  (Debian/Ubuntu multiarch configurations put all bits/ and sys/
>>> headers in multiarch directory arrangements so could handle having both
>>> versions of a sys/ header installed without problems.)
>>
>> Sure.  My comment is addressed to people who might consider implementing
>> multilib headers on aarch64 in the future.
> 
> Any more comments?  Is the change OK?
> 

no, multilib header support is not wanted with arm and aarch64,
they are separate targets.

i thought users of ptrace.h just include the linux asm/ptrace.h
anyway, so glibc does not need to track linux uapi.
(at least gdb does that in its linux specific code)

Re: [PATCH 2/2] linux/aarch64: sync sys/ptrace.h with Linux 4.15

[Szabolcs Nagy]

On 30/12/17 00:09, Dmitry V. Levin wrote:
> Remove compat-specific constants that were never exported by kernel
> headers under these names.  Before linux commit v3.7-rc1~16^2~1 they
> were exported with COMPAT_ prefix, and after that commit they are not
> exported at all.
> 
> To implement a proper multilib sys/ptrace.h on aarch64, arm/sys/ptrace.h
> has to be used instead of aarch64/sys/ptrace.h with all arm-specific
> definitions ifdef'ed.
> 

this comment is unnecessary.

> * sysdeps/unix/sysv/linux/aarch64/sys/ptrace.h (__ptrace_request):
> Remove arm-specific PTRACE_GET_THREAD_AREA, PTRACE_GETHBPREGS,
> and PTRACE_SETHBPREGS.
> ---
>   ChangeLog                                    | 4 ++++
>   sysdeps/unix/sysv/linux/aarch64/sys/ptrace.h | 8 --------
>   2 files changed, 4 insertions(+), 8 deletions(-)
> 

with that OK to commit.

Re: [PATCH 2/2] linux/aarch64: sync sys/ptrace.h with Linux 4.15

[Dmitry V. Levin]

[-- Attachment #1: Type: text/plain, Size: 1697 bytes --]

On Wed, Feb 07, 2018 at 10:54:08AM +0000, Szabolcs Nagy wrote:
> On 07/02/18 09:48, Dmitry V. Levin wrote:
> > On Mon, Jan 01, 2018 at 11:35:41PM +0300, Dmitry V. Levin wrote:
> >> On Mon, Jan 01, 2018 at 01:43:53AM +0000, Joseph Myers wrote:
> >>> On Sat, 30 Dec 2017, Dmitry V. Levin wrote:
> >>>
> >>>> To implement a proper multilib sys/ptrace.h on aarch64, arm/sys/ptrace.h
> >>>> has to be used instead of aarch64/sys/ptrace.h with all arm-specific
> >>>> definitions ifdef'ed.
> >>>
> >>> ARM and AArch64 are separate toolchain ports requiring separate compilers.
> >>> There is no support for multilib headers supporting both in the same
> >>> header.  (Debian/Ubuntu multiarch configurations put all bits/ and sys/
> >>> headers in multiarch directory arrangements so could handle having both
> >>> versions of a sys/ header installed without problems.)
> >>
> >> Sure.  My comment is addressed to people who might consider implementing
> >> multilib headers on aarch64 in the future.
> > 
> > Any more comments?  Is the change OK?
> 
> no, multilib header support is not wanted with arm and aarch64,
> they are separate targets.

Okay, I can omit this comment.  Is the change itself OK?

> i thought users of ptrace.h just include the linux asm/ptrace.h
> anyway, so glibc does not need to track linux uapi.
> (at least gdb does that in its linux specific code)

Sadly, this happens sometimes because sys/ptrace.h is used to be out of date.
However, sys/ptrace.h is still in use, otherwise we wouldn't receive bug
reports like https://sourceware.org/bugzilla/show_bug.cgi?id=22433
and https://sourceware.org/bugzilla/show_bug.cgi?id=22807


-- 
ldv

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 801 bytes --]

Re: [PATCH 2/2] linux/aarch64: sync sys/ptrace.h with Linux 4.15

[Szabolcs Nagy]

On 07/02/18 11:01, Dmitry V. Levin wrote:
> On Wed, Feb 07, 2018 at 10:54:08AM +0000, Szabolcs Nagy wrote:
>> On 07/02/18 09:48, Dmitry V. Levin wrote:
>>> On Mon, Jan 01, 2018 at 11:35:41PM +0300, Dmitry V. Levin wrote:
>>>> On Mon, Jan 01, 2018 at 01:43:53AM +0000, Joseph Myers wrote:
>>>>> On Sat, 30 Dec 2017, Dmitry V. Levin wrote:
>>>>>
>>>>>> To implement a proper multilib sys/ptrace.h on aarch64, arm/sys/ptrace.h
>>>>>> has to be used instead of aarch64/sys/ptrace.h with all arm-specific
>>>>>> definitions ifdef'ed.
>>>>>
>>>>> ARM and AArch64 are separate toolchain ports requiring separate compilers.
>>>>> There is no support for multilib headers supporting both in the same
>>>>> header.  (Debian/Ubuntu multiarch configurations put all bits/ and sys/
>>>>> headers in multiarch directory arrangements so could handle having both
>>>>> versions of a sys/ header installed without problems.)
>>>>
>>>> Sure.  My comment is addressed to people who might consider implementing
>>>> multilib headers on aarch64 in the future.
>>>
>>> Any more comments?  Is the change OK?
>>
>> no, multilib header support is not wanted with arm and aarch64,
>> they are separate targets.
> 
> Okay, I can omit this comment.  Is the change itself OK?
> 

yes the change is ok, i was only arguing about the comment, sorry.

>> i thought users of ptrace.h just include the linux asm/ptrace.h
>> anyway, so glibc does not need to track linux uapi.
>> (at least gdb does that in its linux specific code)
> 
> Sadly, this happens sometimes because sys/ptrace.h is used to be out of date.
> However, sys/ptrace.h is still in use, otherwise we wouldn't receive bug
> reports like https://sourceware.org/bugzilla/show_bug.cgi?id=22433
> and https://sourceware.org/bugzilla/show_bug.cgi?id=22807
> 

i see.