Add PTRACE_SYSEMU and PT_SYSEMU_SINGLESTEP from Linux 5.12 for s390

Message ID alpine.DEB.2.22.394.2105101950290.750431@digraph.polyomino.org.uk
State Committed
Commit 3c38f694622cfccd2e922e6e10b5c124c34c1ed0
Headers
Series Add PTRACE_SYSEMU and PT_SYSEMU_SINGLESTEP from Linux 5.12 for s390 |

Checks

Context Check Description
dj/TryBot-apply_patch success Patch applied to master at the time it was sent

Commit Message

Joseph Myers May 10, 2021, 7:51 p.m. UTC
  Linux 5.12 adds the constants PTRACE_SYSEMU and
PTRACE_SYSEMU_SINGLESTEP for s390.  Add these to glibc.

Tested with build-many-glibcs.py for s390-linux-gnu and
s390x-linux-gnu.
  

Comments

Andreas Schwab May 10, 2021, 8:03 p.m. UTC | #1
On Mai 10 2021, Joseph Myers wrote:

> Linux 5.12 adds the constants PTRACE_SYSEMU and
> PTRACE_SYSEMU_SINGLESTEP for s390.  Add these to glibc.

Ok.

Andreas.
  

Patch

diff --git a/sysdeps/unix/sysv/linux/s390/sys/ptrace.h b/sysdeps/unix/sysv/linux/s390/sys/ptrace.h
index 85efbae842..4f3c65726f 100644
--- a/sysdeps/unix/sysv/linux/s390/sys/ptrace.h
+++ b/sysdeps/unix/sysv/linux/s390/sys/ptrace.h
@@ -39,6 +39,8 @@  __BEGIN_DECLS
 # undef PTRACE_ATTACH
 # undef PTRACE_DETACH
 # undef PTRACE_SYSCALL
+# undef PTRACE_SYSEMU
+# undef PTRACE_SYSEMU_SINGLESTEP
 # undef PTRACE_SETOPTIONS
 # undef PTRACE_GETEVENTMSG
 # undef PTRACE_GETSIGINFO
@@ -146,6 +148,14 @@  enum __ptrace_request
   PTRACE_SYSCALL = 24,
 #define PT_SYSCALL PTRACE_SYSCALL
 
+  /* Continue and stop at the next syscall, it will not be executed.  */
+  PTRACE_SYSEMU = 31,
+#define PT_SYSEMU PTRACE_SYSEMU
+
+  /* Single step the process, the next syscall will not be executed.  */
+  PTRACE_SYSEMU_SINGLESTEP = 32,
+#define PT_SYSEMU_SINGLESTEP PTRACE_SYSEMU_SINGLESTEP
+
   /* Set ptrace filter options.  */
   PTRACE_SETOPTIONS = 0x4200,
 #define PT_SETOPTIONS PTRACE_SETOPTIONS