Blame SOURCES/gdb-x86_64-i386-syscall-restart.patch

2c2fa1
http://sourceware.org/ml/gdb-patches/2009-11/msg00592.html
2c2fa1
Subject: [patch] Fix syscall restarts for amd64->i386 biarch
2c2fa1
2c2fa1
Hi,
2c2fa1
2c2fa1
tested only on recent Linux kernels, it should apply also on vanilla ones.
2c2fa1
There were various changes of the kernels behavior in the past.
2c2fa1
2c2fa1
FSF GDB HEAD state:
2c2fa1
kernel debugger inferior state
2c2fa1
x86_64 x86_64   x86_64   PASS
2c2fa1
x86_64 x86_64   i386     FAIL without this patch, PASS with this patch
2c2fa1
x86_64 i386     i386     PASS on recent kernels
2c2fa1
                         (FAIL: kernel-2.6.31.5-127.fc12.x86_64 - Fedora 12)
2c2fa1
                         (PASS: kernel-2.6.32-0.55.rc8.git1.fc13.x86_64)
2c2fa1
i386   i386     i386     PASS
2c2fa1
2c2fa1
2c2fa1
Currently gdb.base/interrupt.exp fails on amd64 host running under
2c2fa1
--target_board unix/-m32 with:
2c2fa1
	continue
2c2fa1
	Continuing.
2c2fa1
	Unknown error 512
2c2fa1
2c2fa1
<linux/errno.h>:
2c2fa1
/*
2c2fa1
 * These should never be seen by user programs.  To return one of ERESTART*
2c2fa1
 * codes, signal_pending() MUST be set.  Note that ptrace can observe these
2c2fa1
 * at syscall exit tracing, but they will never be left for the debugged user
2c2fa1
 * process to see.
2c2fa1
 */
2c2fa1
#define ERESTARTSYS     512
2c2fa1
2c2fa1
"Unknown error 512" printed above is printed by the inferior itself, not by GDB.
2c2fa1
2c2fa1
It is because GDB reads it as 0xfffffffffffffe00 but writes it back as
2c2fa1
0xfffffe00.
2c2fa1
+      /* Sign-extend %eax as during return from a syscall it is being checked
2c2fa1
+	 for -ERESTART* values -512 being above 0xfffffffffffffe00; tested by
2c2fa1
+	 interrupt.exp.  */
2c2fa1
2c2fa1
2c2fa1
Quote of Roland McGrath from IRC:
2c2fa1
2c2fa1
roland: in the user_regset model, there are 64-bit user_regset flavors and
2c2fa1
32-bit user_regset flavors, so at the kabi level the (kernel) caller can say
2c2fa1
what it means: calls on the 32-bit user_regset flavor will behave as if on
2c2fa1
a 32-bit kernel/userland.  in ptrace, there is no way for x86_64 ptrace calls
2c2fa1
to say "i think of the inferior as being 32 bits, so act accordingly" (tho ppc
2c2fa1
and/or sparc have ptr
2c2fa1
roland: ace requests that do that iirc)
2c2fa1
roland: ergo 64-bit ptrace callers must either save/restore full 64-bits so
2c2fa1
the kernel's sign-extension choices are preserved, or else grok magic ways to
2c2fa1
expand stored 32-bit register contents to 64-bit values to stuff via 64-bit
2c2fa1
ptrace
2c2fa1
[...]
2c2fa1
roland: there is a "32-bit-flavored task", but it's not really true that it
2c2fa1
has 32-bit registers.  there is no 32-bit-only userland condition.  any task
2c2fa1
can always ljmp to the 64-bit code segment and run 64-bit insns including
2c2fa1
a 64-bit syscall
2c2fa1
roland: so a 64-bit debugger should see and be able to fiddle the full
2c2fa1
registers.  it can even change cs via ptrace to force the inferior into
2c2fa1
running 32 or 64 bit code.
2c2fa1
2c2fa1
2c2fa1
Saving whole 64bits for i386 targets on x86_64 hosts does not much match the
2c2fa1
GDB architecture as `struct type' for these registers still should be 32bit
2c2fa1
etc.   Therefore provided just this exception.
2c2fa1
2c2fa1
The problem is reproducible only if one does an inferior call during the
2c2fa1
interruption to do full inferior save/restore from GDB regcache.
2c2fa1
2c2fa1
Regression tested on {x86_64,x86_64-m32,i686}-fedora12-linux-gnu.
2c2fa1
2c2fa1
2c2fa1
Thanks,
2c2fa1
Jan
2c2fa1
2c2fa1
2c2fa1
gdb/
2c2fa1
2009-11-29  Jan Kratochvil  <jan.kratochvil@redhat.com>
2c2fa1
2c2fa1
	* amd64-nat.c (amd64_collect_native_gregset): Do not pre-clear %eax.
2c2fa1
	Sign extend it afterwards.
2c2fa1
2c2fa1
--- a/gdb/amd64-nat.c
2c2fa1
+++ b/gdb/amd64-nat.c
2c2fa1
@@ -131,9 +131,9 @@ amd64_collect_native_gregset (const struct regcache *regcache,
2c2fa1
     {
2c2fa1
       num_regs = amd64_native_gregset32_num_regs;
2c2fa1
 
2c2fa1
-      /* Make sure %eax, %ebx, %ecx, %edx, %esi, %edi, %ebp, %esp and
2c2fa1
+      /* Make sure %ebx, %ecx, %edx, %esi, %edi, %ebp, %esp and
2c2fa1
          %eip get zero-extended to 64 bits.  */
2c2fa1
-      for (i = 0; i <= I386_EIP_REGNUM; i++)
2c2fa1
+      for (i = I386_ECX_REGNUM; i <= I386_EIP_REGNUM; i++)
2c2fa1
 	{
2c2fa1
 	  if (regnum == -1 || regnum == i)
2c2fa1
 	    memset (regs + amd64_native_gregset_reg_offset (gdbarch, i), 0, 8);
2c2fa1
@@ -159,4 +159,20 @@ amd64_collect_native_gregset (const struct regcache *regcache,
2c2fa1
 	    regcache_raw_collect (regcache, i, regs + offset);
2c2fa1
 	}
2c2fa1
     }
2c2fa1
+
2c2fa1
+  if (gdbarch_bfd_arch_info (gdbarch)->bits_per_word == 32)
2c2fa1
+    {
2c2fa1
+      /* Sign-extend %eax as during return from a syscall it is being checked
2c2fa1
+	 for -ERESTART* values -512 being above 0xfffffffffffffe00; tested by
2c2fa1
+	 interrupt.exp.  */
2c2fa1
+
2c2fa1
+      int i = I386_EAX_REGNUM;
2c2fa1
+
2c2fa1
+      if (regnum == -1 || regnum == i)
2c2fa1
+	{
2c2fa1
+	  void *ptr = regs + amd64_native_gregset_reg_offset (gdbarch, i);
2c2fa1
+
2c2fa1
+	  *(int64_t *) ptr = *(int32_t *) ptr;
2c2fa1
+	}
2c2fa1
+    }
2c2fa1
 }
2c2fa1