Skip to contentSkip to conversation

gdbserver-xen: fix corefile access

PATCH In review Horms 2 participants 10 messages Mar 2, 2006 – Mar 6, 2006

lore
Share & tools
lore

Horms

author
#0 lore raw

PATCH 1/1 gdbserver-xen: fix corefile access

# HG changeset patch
# User Horms <[email protected]>
# Node ID d15c3e045aa21d0753761121ef3c9a0f73c0e82a # Parent 48cbeecfa8a4b438f72fbe440f0642344f2f24a4
gdbserver-xen: fix corefile access

This patch fixes corefile access by ensuring that the open fd to the corefile (current_domid) is passed to the underlying xc_routines as neccessary. Currently the prevailing pid is passed, which works fine when attaching to a running domain, but fails for the corefile case.

This is done by creaating a wrapper for curvcpuid(), called curvcpuid_or_domfd() which returns current_domid if the global isfile is set. This assumes that isfile is stable, if this is not the caes, it could easily be saved at the time that myptrace is set using this variable.

I did not replace curvcpuid(), as it seems to be needed elsewhere, though it may be possible to eliminate it.

This patch also relocates curvcpuid() (without modifying it). This is because curvcpuid_or_domfd() needs to below the declaration of isfile, and it seems to make sense to put curvcpuid() and curvcpuid_or_domfd() next to each other.

tools/debugger/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/linux-xen-low.c +23 -17
diff -r 48cbeecfa8a4 -r d15c3e045aa2 tools/debugger/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/linux-xen-low.c
@@ -45,17 +45,6 @@ int (*myxcwait)(int xc_handle, int domai
 int (*myxcwait)(int xc_handle, int domain, int *status, int options) ;
 static int xc_handle;
 
-static inline int
-curvcpuid()
-{
-  struct process_info *process;
-  if (current_inferior == NULL)
-      return 0;
-  process = get_thread_process(current_inferior);
-  return (process->thread_known ? process->tid : 0);
-
-}
-
 
 #define DOMFLAGS_DYING     (1<<0) /* Domain is scheduled to die.             */
 #define DOMFLAGS_SHUTDOWN  (1<<2) /* The guest OS has shut down.             */
@@ -87,6 +76,23 @@ struct pending_signals
 
 static int use_regsets_p = 1;
 
+static inline int
+curvcpuid()
+{
+  struct process_info *process;
+  if (current_inferior == NULL)
+      return 0;
+  process = get_thread_process(current_inferior);
+  return (process->thread_known ? process->tid : 0);
+}
+
+static inline int
+curvcpuid_or_domfd()
+{
+  if(isfile)
+	  return current_domid;
+  return curvcpuid();
+}
 
 #define pid_of(proc) ((proc)->head.id)
 
@@ -276,7 +282,7 @@ regsets_fetch_inferior_registers ()
 
       buf = malloc (regset->size);
       res = myptrace (xc_handle, regset->get_request, 
-		      curvcpuid(),
+		      curvcpuid_or_domfd(),
 		      0, (PTRACE_XFER_TYPE)buf);
       if (res < 0)
 	{
@@ -329,7 +335,7 @@ regsets_store_inferior_registers ()
 
       buf = malloc (regset->size);
       regset->fill_function (buf);
-      res = myptrace (xc_handle, regset->set_request, curvcpuid(), 0, (PTRACE_XFER_TYPE)buf);
+      res = myptrace (xc_handle, regset->set_request, curvcpuid_or_domfd(), 0, (PTRACE_XFER_TYPE)buf);
       if (res < 0)
 	{
 	  if (errno == EIO)
@@ -407,7 +413,7 @@ linux_read_memory (CORE_ADDR memaddr, ch
   for (i = 0; i < count; i++, addr += sizeof (PTRACE_XFER_TYPE))
     {
       errno = 0;
-      buffer[i] = myptrace (xc_handle, PTRACE_PEEKTEXT, curvcpuid(), (PTRACE_ARG3_TYPE) addr, 0);
+      buffer[i] = myptrace (xc_handle, PTRACE_PEEKTEXT, curvcpuid_or_domfd(), (PTRACE_ARG3_TYPE) addr, 0);
       if (errno)
 	return errno;
     }
@@ -440,13 +446,13 @@ linux_write_memory (CORE_ADDR memaddr, c
 
   /* Fill start and end extra bytes of buffer with existing memory data.  */
 
-  buffer[0] = myptrace (xc_handle, PTRACE_PEEKTEXT, curvcpuid(),
+  buffer[0] = myptrace (xc_handle, PTRACE_PEEKTEXT, curvcpuid_or_domfd(),
 		      (PTRACE_ARG3_TYPE) addr, 0);
 
   if (count > 1)
     {
       buffer[count - 1]
-	= myptrace (xc_handle, PTRACE_PEEKTEXT, curvcpuid(),
+	= myptrace (xc_handle, PTRACE_PEEKTEXT, curvcpuid_or_domfd(),
 		  (PTRACE_ARG3_TYPE) (addr + (count - 1)
 				      * sizeof (PTRACE_XFER_TYPE)),
 		  0);
@@ -460,7 +466,7 @@ linux_write_memory (CORE_ADDR memaddr, c
   for (i = 0; i < count; i++, addr += sizeof (PTRACE_XFER_TYPE))
     {
       errno = 0;
-      myptrace (xc_handle, PTRACE_POKETEXT, curvcpuid(), 
+      myptrace (xc_handle, PTRACE_POKETEXT, current_domid, 
 		(PTRACE_ARG3_TYPE) addr, buffer[i]);
       if (errno)
 	return errno;
#1 lore raw
Quoted 5 lines · Horms

This patch fixes corefile access by ensuring that the open fd to the corefile (current_domid) is passed to the underlying xc_routines as neccessary. Currently the prevailing pid is passed, which works fine when attaching to a running domain, but fails for the corefile case.

This is too gross.

The correct fix is to update the xc_ptrace_core() interface to match the xc_ptrace() interface. Kip Macy made the latter SMP aware, but didn't fix up the former.

It should be easy to do -- note how xc_ptrace() takes a domid on PTRACE_ATTACH, and vcpuid at all other times. xc_ptrace_core() should take a fd on PTRACE_ATTACH, and vcpuid at all other times. Since we don't dump SMP core files right now, vcpuid should either be ignored for the time being, or fail the call if vcpuid!=0.

-- Keir

author
#2 lore raw
Quoted 10 lines · Keir Fraser
Quoted 5 lines · Horms

This patch fixes corefile access by ensuring that the open fd to the corefile (current_domid) is passed to the underlying xc_routines as neccessary. Currently the prevailing pid is passed, which works fine when attaching to a running domain, but fails for the corefile case.

This is too gross.

Sorry about that.

Quoted 9 lines

The correct fix is to update the xc_ptrace_core() interface to match the xc_ptrace() interface. Kip Macy made the latter SMP aware, but didn't fix up the former.

It should be easy to do -- note how xc_ptrace() takes a domid on PTRACE_ATTACH, and vcpuid at all other times. xc_ptrace_core() should take a fd on PTRACE_ATTACH, and vcpuid at all other times. Since we don't dump SMP core files right now, vcpuid should either be ignored for the time being, or fail the call if vcpuid!=0.

I didn't notice that, but I should have.

Are you suggesting that xc_ptrace_core() should record the fd passed to it on PTRACE_ATTACH and use that later, presumably in current_domid? If so, yes that does look very easy. If not, can you explain a little further? In any case, I'll look into it tomorrow.

Signature · 1 line
Horms
#3 lore raw
Quoted 10 lines · Horms
Quoted 9 lines

The correct fix is to update the xc_ptrace_core() interface to match the xc_ptrace() interface. Kip Macy made the latter SMP aware, but didn't fix up the former.

It should be easy to do -- note how xc_ptrace() takes a domid on PTRACE_ATTACH, and vcpuid at all other times. xc_ptrace_core() should take a fd on PTRACE_ATTACH, and vcpuid at all other times. Since we don't dump SMP core files right now, vcpuid should either be ignored for the time being, or fail the call if vcpuid!=0.

Quoted 6 lines

I didn't notice that, but I should have.

Are you suggesting that xc_ptrace_core() should record the fd passed to it on PTRACE_ATTACH and use that later, presumably in current_domid? If so, yes that does look very easy. If not, can you explain a little further? In any case, I'll look into it tomorrow.

Yeah, you should record it the same way that xc_ptrace() records the domid. Really the two calls (xc_ptrace and xc_ptrace_core) should probably be merged -- we could pass an extra flag to PTRACE_ATTACH to indicate whether we are attaching to a coredump or to a live domain. Then we could get rid of xc_ptrace_core altogether.

-- Keir

author
#4 lore raw
Quoted 20 lines · Keir Fraser
Quoted 10 lines · Horms
Quoted 9 lines

The correct fix is to update the xc_ptrace_core() interface to match the xc_ptrace() interface. Kip Macy made the latter SMP aware, but didn't fix up the former.

It should be easy to do -- note how xc_ptrace() takes a domid on PTRACE_ATTACH, and vcpuid at all other times. xc_ptrace_core() should take a fd on PTRACE_ATTACH, and vcpuid at all other times. Since we don't dump SMP core files right now, vcpuid should either be ignored for the time being, or fail the call if vcpuid!=0.

Quoted 6 lines

I didn't notice that, but I should have.

Are you suggesting that xc_ptrace_core() should record the fd passed to it on PTRACE_ATTACH and use that later, presumably in current_domid? If so, yes that does look very easy. If not, can you explain a little further? In any case, I'll look into it tomorrow.

Quoted 5 lines

Yeah, you should record it the same way that xc_ptrace() records the domid. Really the two calls (xc_ptrace and xc_ptrace_core) should probably be merged -- we could pass an extra flag to PTRACE_ATTACH to indicate whether we are attaching to a coredump or to a live domain. Then we could get rid of xc_ptrace_core altogether.

That sounds reasonable to me. Though internally the do different things, so would the idea be to something like:

rename xc_ptrace xc_ptrace_thread
make xc_ptrace a wapper for xc_ptrace_thread and xc_ptrace_core

Also, I haven't poked into this, but it seems that xc_waitdomain_core/xc_waitdomain could have the same treatment, and thus both myptrace and myxcwait could be replaced with direct calls to xc_ptrace and xc_waitdomain respectively.

Signature · 1 line
Horms
author
#5 lore raw
Quoted 27 lines · Horms
Quoted 20 lines · Keir Fraser
Quoted 10 lines · Horms
Quoted 9 lines

The correct fix is to update the xc_ptrace_core() interface to match the xc_ptrace() interface. Kip Macy made the latter SMP aware, but didn't fix up the former.

It should be easy to do -- note how xc_ptrace() takes a domid on PTRACE_ATTACH, and vcpuid at all other times. xc_ptrace_core() should take a fd on PTRACE_ATTACH, and vcpuid at all other times. Since we don't dump SMP core files right now, vcpuid should either be ignored for the time being, or fail the call if vcpuid!=0.

Quoted 6 lines

I didn't notice that, but I should have.

Are you suggesting that xc_ptrace_core() should record the fd passed to it on PTRACE_ATTACH and use that later, presumably in current_domid? If so, yes that does look very easy. If not, can you explain a little further? In any case, I'll look into it tomorrow.

Quoted 5 lines

Yeah, you should record it the same way that xc_ptrace() records the domid. Really the two calls (xc_ptrace and xc_ptrace_core) should probably be merged -- we could pass an extra flag to PTRACE_ATTACH to indicate whether we are attaching to a coredump or to a live domain. Then we could get rid of xc_ptrace_core altogether.

Quoted 5 lines

That sounds reasonable to me. Though internally the do different things, so would the idea be to something like:

rename xc_ptrace xc_ptrace_thread
make xc_ptrace a wapper for xc_ptrace_thread and xc_ptrace_core

Sorry, scratch that. I think they can just be merged into one function, I'll try and get a patch together.

Do you think it would be better to pass the isfile flag in the form of PTRACE_ATTACH|XC_PTRACE_FILE as the third argument to xc_ptrace, or parhaps use the last argument to xc_ptrace, edata (or perhaps the second last one, eaddr), which are unused for ATTACH.

Signature · 1 line
Horms
#6 lore raw
Quoted 7 lines · Horms

Sorry, scratch that. I think they can just be merged into one function, I'll try and get a patch together.

Do you think it would be better to pass the isfile flag in the form of PTRACE_ATTACH|XC_PTRACE_FILE as the third argument to xc_ptrace, or parhaps use the last argument to xc_ptrace, edata (or perhaps the second last one, eaddr), which are unused for ATTACH.

Having xc_ptrace_thread/xc_ptrace_core *internally* in libxenctrl would be fine, but there should be only one public function (xc_ptrace). You can update PTRACE_ATTACH as you wish -- I guess adding a new ptrac ecommand would be cleaned: PTRACE_ATTACH_COREFILE would be okay.

And yes, I expect you can give the same treatment to xc_waitdomain. It probably should be a no-op when debugging a core file (although currently it loads the core file state into memory, which is weird but I guess works okay).

-- Keir

author
#7 lore raw
In reply to Horms
Quoted 34 lines · Horms
Quoted 27 lines · Horms
Quoted 20 lines · Keir Fraser
Quoted 10 lines · Horms
Quoted 9 lines

The correct fix is to update the xc_ptrace_core() interface to match the xc_ptrace() interface. Kip Macy made the latter SMP aware, but didn't fix up the former.

It should be easy to do -- note how xc_ptrace() takes a domid on PTRACE_ATTACH, and vcpuid at all other times. xc_ptrace_core() should take a fd on PTRACE_ATTACH, and vcpuid at all other times. Since we don't dump SMP core files right now, vcpuid should either be ignored for the time being, or fail the call if vcpuid!=0.

Quoted 6 lines

I didn't notice that, but I should have.

Are you suggesting that xc_ptrace_core() should record the fd passed to it on PTRACE_ATTACH and use that later, presumably in current_domid? If so, yes that does look very easy. If not, can you explain a little further? In any case, I'll look into it tomorrow.

Quoted 5 lines

Yeah, you should record it the same way that xc_ptrace() records the domid. Really the two calls (xc_ptrace and xc_ptrace_core) should probably be merged -- we could pass an extra flag to PTRACE_ATTACH to indicate whether we are attaching to a coredump or to a live domain. Then we could get rid of xc_ptrace_core altogether.

Quoted 5 lines

That sounds reasonable to me. Though internally the do different things, so would the idea be to something like:

rename xc_ptrace xc_ptrace_thread
make xc_ptrace a wapper for xc_ptrace_thread and xc_ptrace_core

Quoted 7 lines

Sorry, scratch that. I think they can just be merged into one function, I'll try and get a patch together.

Do you think it would be better to pass the isfile flag in the form of PTRACE_ATTACH|XC_PTRACE_FILE as the third argument to xc_ptrace, or parhaps use the last argument to xc_ptrace, edata (or perhaps the second last one, eaddr), which are unused for ATTACH.

I have made a first pass at this, passing isfile as the data argument to xc_ptrace() ATTACH. Its a little rough, but I wanted to get it out for feedback before I head off for the day.

There are 4 patches attached, which need to be applied in order. Please let me know if posting patches in this way is a problem. And of course, please let me know of any and all objections so that I can refactor (or explain) accordingly.

Signature · 1 line
Horms

# HG changeset patch
# User Horms <[email protected]>
# Node ID eb41d4dae66e9319d48c27cfa1821a096b1e6d5f # Parent b8237c1cc97f7ec76a5e0e9ca161c44c27500862
libxc: Use { after if consistently in xc_ptrace()

tools/libxc/xc_ptrace.c +6 -3
diff -r b8237c1cc97f -r eb41d4dae66e tools/libxc/xc_ptrace.c
@@ -365,7 +365,8 @@ xc_ptrace(
         /* XXX assume that all CPUs have the same address space */
         guest_va = (unsigned long *)map_domain_va(
                             xc_handle, cpu, addr, PROT_READ|PROT_WRITE);
-        if ( guest_va == NULL ) {
+        if ( guest_va == NULL ) 
+	{
             status = EFAULT;
 	    break;
         }
@@ -418,11 +419,13 @@ xc_ptrace(
                 cpu = index - 1;
                 FETCH_REGS(cpu);
                 /* Clear trace flag */
-                if ( ctxt[cpu].user_regs.eflags & PSL_T ) {
+                if ( ctxt[cpu].user_regs.eflags & PSL_T ) 
+		{
                     ctxt[cpu].user_regs.eflags &= ~PSL_T;
                     retval = xc_vcpu_setcontext(xc_handle, current_domid, 
                                                 cpu, &ctxt[cpu]);
-                    if ( retval ) {
+                    if ( retval ) 
+		    {
                         perror("dom0 op failed");
 			break;
                     }

# HG changeset patch
# User Horms <[email protected]>
# Node ID fe3da025d7c08ca29dc6019fb2bd8c2b1acc18cd # Parent eb41d4dae66e9319d48c27cfa1821a096b1e6d5f
libxc: Avoid ifing values covered by case in xc_ptrace()

PTRACE_GETREGS, PTRACE_GETFPREGS and PTRACE_GETFPXREGS are grouped into a single case, and then with the exception of a call to FETCH_REGS(), different code is executed based on ifing the values covered by the case. The PTRACE_GETFPREGS and PTRACE_GETFPXREGS code is actually a duplicate. This patch breaks the code out to two different cases.

tools/libxc/xc_ptrace.c +6 -14
diff -r eb41d4dae66e -r fe3da025d7c0 tools/libxc/xc_ptrace.c
@@ -374,23 +374,15 @@ xc_ptrace(
         break;
 
     case PTRACE_GETREGS:
+        FETCH_REGS(cpu);
+        SET_PT_REGS(pt, ctxt[cpu].user_regs); 
+        memcpy(data, &pt, sizeof(struct gdb_regs));
+	break;
+
     case PTRACE_GETFPREGS:
     case PTRACE_GETFPXREGS:
-        
         FETCH_REGS(cpu);
-        if ( request == PTRACE_GETREGS )
-        {
-            SET_PT_REGS(pt, ctxt[cpu].user_regs); 
-            memcpy(data, &pt, sizeof(struct gdb_regs));
-        }
-        else if (request == PTRACE_GETFPREGS)
-        {
-            memcpy(data, &ctxt[cpu].fpu_ctxt, sizeof(ctxt[cpu].fpu_ctxt));
-        }
-        else /*if (request == PTRACE_GETFPXREGS)*/
-        {
-            memcpy(data, &ctxt[cpu].fpu_ctxt, sizeof(ctxt[cpu].fpu_ctxt));
-        }
+        memcpy(data, &ctxt[cpu].fpu_ctxt, sizeof(ctxt[cpu].fpu_ctxt));
         break;
 
     case PTRACE_SETREGS:

# HG changeset patch
# User Horms <[email protected]>
# Node ID 5d6005d3424d96dbe969a17ac9fb2505436a8018 # Parent 8a261fbb7867bc8eaa4d812b3cf29c5ceaeb907b
libxc: Remove duplicate xc_ptrace code

tools/libxc/xc_ptrace.c +27 -1
diff -r 8a261fbb7867 -r 5d6005d3424d tools/libxc/xc_ptrace.c
@@ -7,9 +7,35 @@
 
 #include "xc_private.h"
 #include "xg_private.h"
-#include <thread_db.h>
 #include "xc_ptrace.h"
 
+const char const * ptrace_names[] = {
+    "PTRACE_TRACEME",
+    "PTRACE_PEEKTEXT",
+    "PTRACE_PEEKDATA",
+    "PTRACE_PEEKUSER",
+    "PTRACE_POKETEXT",
+    "PTRACE_POKEDATA",
+    "PTRACE_POKEUSER",
+    "PTRACE_CONT",
+    "PTRACE_KILL",
+    "PTRACE_SINGLESTEP",
+    "PTRACE_INVALID",
+    "PTRACE_INVALID",
+    "PTRACE_GETREGS",
+    "PTRACE_SETREGS",
+    "PTRACE_GETFPREGS",
+    "PTRACE_SETFPREGS",
+    "PTRACE_ATTACH",
+    "PTRACE_DETACH",
+    "PTRACE_GETFPXREGS",
+    "PTRACE_SETFPXREGS",
+    "PTRACE_INVALID",
+    "PTRACE_INVALID",
+    "PTRACE_INVALID",
+    "PTRACE_INVALID",
+    "PTRACE_SYSCALL",
+};
 
 /* XXX application state */
 static long                     nr_pages = 0;
tools/libxc/xc_ptrace.h +3 -27
diff -r 8a261fbb7867 -r 5d6005d3424d tools/libxc/xc_ptrace.h
@@ -1,5 +1,7 @@
 #ifndef XC_PTRACE_
 #define XC_PTRACE_
+
+#include <thread_db.h>
 
 #ifdef XC_PTRACE_PRIVATE
 #define X86_CR0_PE              0x00000001 /* Enable Protected Mode    (RW) */
@@ -8,33 +10,7 @@
 #define PDRSHIFT        22
 #define PSL_T  0x00000100 /* trace enable bit */
 
-char * ptrace_names[] = {
-    "PTRACE_TRACEME",
-    "PTRACE_PEEKTEXT",
-    "PTRACE_PEEKDATA",
-    "PTRACE_PEEKUSER",
-    "PTRACE_POKETEXT",
-    "PTRACE_POKEDATA",
-    "PTRACE_POKEUSER",
-    "PTRACE_CONT",
-    "PTRACE_KILL",
-    "PTRACE_SINGLESTEP",
-    "PTRACE_INVALID",
-    "PTRACE_INVALID",
-    "PTRACE_GETREGS",
-    "PTRACE_SETREGS",
-    "PTRACE_GETFPREGS",
-    "PTRACE_SETFPREGS",
-    "PTRACE_ATTACH",
-    "PTRACE_DETACH",
-    "PTRACE_GETFPXREGS",
-    "PTRACE_SETFPXREGS",
-    "PTRACE_INVALID",
-    "PTRACE_INVALID",
-    "PTRACE_INVALID",
-    "PTRACE_INVALID",
-    "PTRACE_SYSCALL",
-};
+extern const char const * ptrace_names[];
 
 struct gdb_regs {
     long ebx; /* 0 */
tools/libxc/xc_ptrace_core.c +3 -72

84 lines not on this page · raw message

# HG changeset patch
# User Horms <[email protected]>
# Node ID 2cf230077da75dc679bc635c9c3b281a7fe31dad # Parent 5d6005d3424d96dbe969a17ac9fb2505436a8018 Consolidate xc_ptrace and xc_ptrace_core

* xc_ptrace
- Merge xc_ptrace_core into xc_ptrace
- ATTACH now reads the data argument. If non-zero then
a corefile is being debuged. Otherwise a thread has
been attached to. This allows xc_waitdomain_core() or xc_waitdomain() to be called as appropriate in subsequent xc_ptrace() calls.
* xc_waitdomain
- Rename xc_waitdomain (xc_ptrace.c version) __xc_waitdomain
- Rename xc_waitdomain (xc_ptrace_core.c version) xc_waitdomain_core
- Create xc_waitdomain (in xc_ptrace.c), a wrapper for __xc_waitdomain and xc_waitdomain_core.
Consolidation seemed difficult but ctxt needs to be
passed into xc_waitdomain_core or made global. Alternatively, xc_waitdomain_core could be moved into xc_ptrace.c, but this seems messy.
* map_domain_va
- Rename map_domain_va (xc_ptrace_core.c version) map_domain_va_core
- Have it accept ctxt, like xc_waitdomain_core
* myptrace and myxcwait (linux-xen-low.c)
Removed, call the now generic xc_ptrace() and xc_waitdomain() instead

When calling xc_ptrace ATTACH, if a corefile is in use, a fd will be passed, otherwise a pid. The fd part is important, as this is saved internally in xc_ptrace_core.c, and passed to xc_waitdomain_core() as neccessary. Pereviously xc_waitdomain_core() received a pid and thus could not open the corefile.

tools/debugger/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/linux-xen-low.c +11 -20
diff -r 5d6005d3424d -r 2cf230077da7 tools/debugger/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/linux-xen-low.c
@@ -41,8 +41,6 @@
 
 #define TRACE_ENTER /* printf("enter %s\n", __FUNCTION__) */
 
-long (*myptrace)(int xc_handle, enum __ptrace_request, uint32_t, long, long);
-int (*myxcwait)(int xc_handle, int domain, int *status, int options) ;
 static int xc_handle;
 
 static inline int
@@ -170,7 +168,7 @@ linux_attach (int domid)
     add_thread (0, new_process);
     new_process->stop_expected = 0;
 
-    if (myptrace (xc_handle, PTRACE_ATTACH, domid, 0, 0) != 0) {
+    if (xc_ptrace (xc_handle, PTRACE_ATTACH, domid, 0, 1) != 0) {
 	fprintf (stderr, "Cannot attach to domain %d: %s (%d)\n", domid,
 		 strerror (errno), errno);
 	fflush (stderr);
@@ -188,7 +186,7 @@ linux_kill_one_process (struct inferior_
 {
   struct thread_info *thread = (struct thread_info *) entry;
   struct process_info *process = get_thread_process (thread);
-  myptrace (xc_handle, PTRACE_KILL, pid_of (process), 0, 0);
+  xc_ptrace (xc_handle, PTRACE_KILL, pid_of (process), 0, 0);
 }
 
 
@@ -202,7 +200,7 @@ linux_detach_one_process (struct inferio
 linux_detach_one_process (struct inferior_list_entry *entry)
 {
 
-  myptrace (xc_handle, PTRACE_DETACH, current_domid, 0, 0);
+  xc_ptrace (xc_handle, PTRACE_DETACH, current_domid, 0, 0);
 }
 
 
@@ -228,7 +226,7 @@ linux_wait (char *status)
 linux_wait (char *status)
 {
   int w;
-  if (myxcwait(xc_handle, current_domid, &w, 0))
+  if (xc_waitdomain(xc_handle, current_domid, &w, 0))
       return -1;
   
   linux_set_inferior();
@@ -250,7 +248,7 @@ linux_resume (struct thread_resume *resu
   for_each_inferior(&all_threads, regcache_invalidate_one);
   if (debug_threads)
     fprintf(stderr, "step: %d\n", step);
-  myptrace (xc_handle, step ? PTRACE_SINGLESTEP : PTRACE_CONT, 
+  xc_ptrace (xc_handle, step ? PTRACE_SINGLESTEP : PTRACE_CONT, 
 	    resume_info->thread, 0, 0);
 
 }
@@ -275,7 +273,7 @@ regsets_fetch_inferior_registers ()
 	}
 
       buf = malloc (regset->size);
-      res = myptrace (xc_handle, regset->get_request, 
+      res = xc_ptrace (xc_handle, regset->get_request, 
 		      curvcpuid(),
 		      0, (PTRACE_XFER_TYPE)buf);
       if (res < 0)
@@ -329,7 +327,7 @@ regsets_store_inferior_registers ()
 
       buf = malloc (regset->size);
       regset->fill_function (buf);
-      res = myptrace (xc_handle, regset->set_request, curvcpuid(), 0, (PTRACE_XFER_TYPE)buf);
+      res = xc_ptrace (xc_handle, regset->set_request, curvcpuid(), 0, (PTRACE_XFER_TYPE)buf);
       if (res < 0)
 	{
 	  if (errno == EIO)
@@ -407,7 +405,7 @@ linux_read_memory (CORE_ADDR memaddr, ch
   for (i = 0; i < count; i++, addr += sizeof (PTRACE_XFER_TYPE))
     {
       errno = 0;
-      buffer[i] = myptrace (xc_handle, PTRACE_PEEKTEXT, curvcpuid(), (PTRACE_ARG3_TYPE) addr, 0);
+      buffer[i] = xc_ptrace (xc_handle, PTRACE_PEEKTEXT, curvcpuid(), (PTRACE_ARG3_TYPE) addr, 0);
       if (errno)
 	return errno;
     }
@@ -440,13 +438,13 @@ linux_write_memory (CORE_ADDR memaddr, c
 
   /* Fill start and end extra bytes of buffer with existing memory data.  */
 
-  buffer[0] = myptrace (xc_handle, PTRACE_PEEKTEXT, curvcpuid(),
+  buffer[0] = xc_ptrace (xc_handle, PTRACE_PEEKTEXT, curvcpuid(),
 		      (PTRACE_ARG3_TYPE) addr, 0);
 
   if (count > 1)
     {
       buffer[count - 1]
-	= myptrace (xc_handle, PTRACE_PEEKTEXT, curvcpuid(),
+	= xc_ptrace (xc_handle, PTRACE_PEEKTEXT, curvcpuid(),
 		  (PTRACE_ARG3_TYPE) (addr + (count - 1)
 				      * sizeof (PTRACE_XFER_TYPE)),
 		  0);
@@ -460,7 +458,7 @@ linux_write_memory (CORE_ADDR memaddr, c
   for (i = 0; i < count; i++, addr += sizeof (PTRACE_XFER_TYPE))
     {
       errno = 0;
-      myptrace (xc_handle, PTRACE_POKETEXT, curvcpuid(), 
+      xc_ptrace (xc_handle, PTRACE_POKETEXT, curvcpuid(), 
 		(PTRACE_ARG3_TYPE) addr, buffer[i]);
       if (errno)
 	return errno;
@@ -561,13 +559,6 @@ initialize_low (void)
 		       the_low_target.breakpoint_len);
   init_registers ();
   linux_init_signals ();
-  if (isfile) {
-      myptrace = xc_ptrace_core;
-      myxcwait = xc_waitdomain_core;
-  } else {
-      myptrace = xc_ptrace;
-      myxcwait = xc_waitdomain;
-  }
   using_threads = thread_db_init ();
 
 }
tools/libxc/xc_ptrace.c +51 -43

175 lines not on this page · raw message

tools/libxc/xc_ptrace_core.c +6 -79

118 lines not on this page · raw message

tools/libxc/xenctrl.h +9 -3
diff -r 5d6005d3424d -r 2cf230077da7 tools/libxc/xenctrl.h
@@ -99,13 +99,19 @@ long xc_ptrace_core(
     enum __ptrace_request request, 
     uint32_t domid, 
     long addr, 
-    long data);
-
+    long data,
+    vcpu_guest_context_t *ctxt);
+void * map_domain_va_core(
+    unsigned long domfd, 
+    int cpu, 
+    void *guest_va,
+    vcpu_guest_context_t *ctxt);
 int xc_waitdomain_core(
     int xc_handle,
     int domain, 
     int *status, 
-    int options);
+    int options,
+    vcpu_guest_context_t *ctxt);
 
 /*
  * DOMAIN MANAGEMENT FUNCTIONS

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel

#8 lore raw
Quoted 8 lines · Horms

I have made a first pass at this, passing isfile as the data argument to xc_ptrace() ATTACH. Its a little rough, but I wanted to get it out for feedback before I head off for the day.

There are 4 patches attached, which need to be applied in order. Please let me know if posting patches in this way is a problem. And of course, please let me know of any and all objections so that I can refactor (or explain) accordingly.

Yeah, diffstat tells me that you probably have the right approach (more lines deleted than added). I'd prefer fewer but bigger patches. e.g., merge the first three 'cleanup' patches into one.

-- Keir

author
#9 lore raw
Quoted 7 lines · Keir Fraser
Quoted 4 lines · Horms

I have made a first pass at this, passing isfile as the data argument to xc_ptrace() ATTACH. Its a little rough, but I wanted to get it out for feedback before I head off for the day.

Quoted 8 lines
Quoted 4 lines

There are 4 patches attached, which need to be applied in order. Please let me know if posting patches in this way is a problem. And of course, please let me know of any and all objections so that I can refactor (or explain) accordingly.

Yeah, diffstat tells me that you probably have the right approach (more lines deleted than added). I'd prefer fewer but bigger patches. e.g., merge the first three 'cleanup' patches into one.

Here is the second round of patches. Please apply them in order.

The current split is a cleanup patch, followed by the consolidation patch. Localy I actually have the cleanup patch broken out into the error handling changes and other changes - as per the split in the changelog entry. Let me know if you want me to send the broken out patches.

I've done a little bit of testing, and I can trace both a core and a running domain. Testing and feedback welcome.

Signature · 1 line
Horms

# HG changeset patch
# User Horms <[email protected]>
# Node ID 76218624fb4ad5f2ce5831ec0dcee1f0e24d7f41 # Parent 64f11b0e2e7d0c53320c4dc6e983fcb144258c43
libxc: xc_ptrace cleanups

General Cleanups
* Use { after if consistently in xc_ptrace.c and xc_ptrace_core.c (But not in xc_ptrace_core() which should be removed shortly)
* Remove duplicate code and centralise around xc_ptrace.h
* Avoid ifing values covered by case in xc_ptrace()
- PTRACE_GETREGS, PTRACE_GETFPREGS and PTRACE_GETFPXREGS are grouped into a single case, and then with the exception of a call to FETCH_REGS(), different code is executed based on ifing the values covered by the case. The PTRACE_GETFPREGS and PTRACE_GETFPXREGS code is actually a duplicate. This patch breaks the code out to two different cases.

Error Handling
* Eliminate FETCH_REGS macro as it forces several functions to have an otherwise uneeded error_out label, mittigating any code savins.
* Rework error handling in xc_ptrace().
- Remove FETCH_REGS as above
- Make sure that all dom0 errors are caught
- Make sure errno is always set on error
* Eliminate gotos in xc_ptrace_core.c that do nothing but return

tools/libxc/xc_ptrace.c +96 -94
diff -r 64f11b0e2e7d tools/libxc/xc_ptrace.c
@@ -7,9 +7,35 @@
 
 #include "xc_private.h"
 #include "xg_private.h"
-#include <thread_db.h>
 #include "xc_ptrace.h"
 
+const char const * ptrace_names[] = {
+    "PTRACE_TRACEME",
+    "PTRACE_PEEKTEXT",
+    "PTRACE_PEEKDATA",
+    "PTRACE_PEEKUSER",
+    "PTRACE_POKETEXT",
+    "PTRACE_POKEDATA",
+    "PTRACE_POKEUSER",
+    "PTRACE_CONT",
+    "PTRACE_KILL",
+    "PTRACE_SINGLESTEP",
+    "PTRACE_INVALID",
+    "PTRACE_INVALID",
+    "PTRACE_GETREGS",
+    "PTRACE_SETREGS",
+    "PTRACE_GETFPREGS",
+    "PTRACE_SETFPREGS",
+    "PTRACE_ATTACH",
+    "PTRACE_DETACH",
+    "PTRACE_GETFPXREGS",
+    "PTRACE_SETFPXREGS",
+    "PTRACE_INVALID",
+    "PTRACE_INVALID",
+    "PTRACE_INVALID",
+    "PTRACE_INVALID",
+    "PTRACE_SYSCALL",
+};
 
 /* XXX application state */
 static long                     nr_pages = 0;
@@ -32,7 +58,8 @@ fetch_regs(int xc_handle, int cpu, int *
 
     if (online)
         *online = 0;
-    if ( !(regs_valid & (1 << cpu)) ) { 
+    if ( !(regs_valid & (1 << cpu)) )
+    { 
         retval = xc_vcpu_getcontext(xc_handle, current_domid, 
 						cpu, &ctxt[cpu]);
         if ( retval ) 
@@ -50,9 +77,6 @@ fetch_regs(int xc_handle, int cpu, int *
     return retval;    
 }
 
-#define FETCH_REGS(cpu) if (fetch_regs(xc_handle, cpu, NULL)) goto error_out;
-
-
 static struct thr_ev_handlers {
     thr_ev_handler_t td_create;
     thr_ev_handler_t td_death;
@@ -95,14 +119,12 @@ get_online_cpumap(int xc_handle, dom0_ge
     *cpumap = 0;
     for (i = 0; i <= d->max_vcpu_id; i++) {
         if ((retval = fetch_regs(xc_handle, i, &online)))
-            goto error_out;        
+            return retval;
         if (online)
             *cpumap |= (1 << i);            
     }
     
     return 0;
- error_out:
-    return retval;
 }
 
 /* 
@@ -118,7 +140,8 @@ online_vcpus_changed(cpumap_t cpumap)
     int index;
     
     while ( (index = ffsll(changed_cpumap)) ) {
-        if ( cpumap & (1 << (index - 1)) ) {
+        if ( cpumap & (1 << (index - 1)) )
+        {
             if (handlers.td_create) handlers.td_create(index - 1);
         } else {
             printf("thread death: %d\n", index - 1);
@@ -143,34 +166,32 @@ map_domain_va_pae(
     uint64_t *l3, *l2, *l1;
     static void *v;
 
-    FETCH_REGS(cpu);
+    if (fetch_regs(xc_handle, cpu, NULL))
+        return NULL;
 
     l3 = xc_map_foreign_range(
         xc_handle, current_domid, PAGE_SIZE, PROT_READ, ctxt[cpu].ctrlreg[3] >> PAGE_SHIFT);
     if ( l3 == NULL )
-        goto error_out;
+        return NULL;
 
     l2p = l3[l3_table_offset_pae(va)] >> PAGE_SHIFT;
     l2 = xc_map_foreign_range(xc_handle, current_domid, PAGE_SIZE, PROT_READ, l2p);
     if ( l2 == NULL )
-        goto error_out;
+        return NULL;
 
     l1p = l2[l2_table_offset_pae(va)] >> PAGE_SHIFT;
     l1 = xc_map_foreign_range(xc_handle, current_domid, PAGE_SIZE, perm, l1p);
     if ( l1 == NULL )
-        goto error_out;
+        return NULL;
 
     p = l1[l1_table_offset_pae(va)] >> PAGE_SHIFT;
     if ( v != NULL )
         munmap(v, PAGE_SIZE);
     v = xc_map_foreign_range(xc_handle, current_domid, PAGE_SIZE, perm, p);
     if ( v == NULL )
-        goto error_out;
+        return NULL;
 
     return (void *)((unsigned long)v | (va & (PAGE_SIZE - 1)));
-
- error_out:
-    return NULL;
 }
 
 static void *
@@ -215,17 +236,18 @@ map_domain_va(
         if ( (page_array = malloc(nr_pages * sizeof(unsigned long))) == NULL )
         {
             printf("Could not allocate memory\n");
-            goto error_out;
+            return NULL;
         }
         if ( xc_get_pfn_list(xc_handle, current_domid,
                              page_array, nr_pages) != nr_pages )
         {
             printf("Could not get the page frame list\n");
-            goto error_out;
-        }
-    }
-
-    FETCH_REGS(cpu);
+            return NULL;
+        }
+    }
+
+    if (fetch_regs(xc_handle, cpu, NULL))
+        return NULL;
 
     if ( ctxt[cpu].ctrlreg[3] != cr3_phys[cpu] )
     {
@@ -236,10 +258,10 @@ map_domain_va(
             xc_handle, current_domid, PAGE_SIZE, PROT_READ,
             cr3_phys[cpu] >> PAGE_SHIFT);
         if ( cr3_virt[cpu] == NULL )
-            goto error_out;
+            return NULL;
     }
     if ( (pde = cr3_virt[cpu][vtopdi(va)]) == 0 )
-        goto error_out;
+        return NULL;
     if ( (ctxt[cpu].flags & VGCF_HVM_GUEST) && paging_enabled(&ctxt[cpu]) )
         pde = page_array[pde >> PAGE_SHIFT] << PAGE_SHIFT;
     if ( pde != pde_phys[cpu] )
@@ -251,10 +273,10 @@ map_domain_va(
             xc_handle, current_domid, PAGE_SIZE, PROT_READ,
             pde_phys[cpu] >> PAGE_SHIFT);
         if ( pde_virt[cpu] == NULL )
-            goto error_out;
+            return NULL;
     }
     if ( (page = pde_virt[cpu][vtopti(va)]) == 0 )
-        goto error_out;
+        return NULL;
     if ( (ctxt[cpu].flags & VGCF_HVM_GUEST) && paging_enabled(&ctxt[cpu]) )
         page = page_array[page >> PAGE_SHIFT] << PAGE_SHIFT;
     if ( (page != page_phys[cpu]) || (perm != prev_perm[cpu]) )
@@ -268,15 +290,12 @@ map_domain_va(
         if ( page_virt[cpu] == NULL )
         {
             page_phys[cpu] = 0;
-            goto error_out;
+            return NULL;
         }
         prev_perm[cpu] = perm;
     } 
 
     return (void *)(((unsigned long)page_virt[cpu]) | (va & BSD_PAGE_MASK));
-
- error_out:
-    return NULL;
 }
 
 int 
@@ -335,7 +354,6 @@ xc_ptrace(
     long edata)
 {
     DECLARE_DOM0_OP;
-    int             status = 0;
     struct gdb_regs pt;
     long            retval = 0;
     unsigned long  *guest_va;
@@ -353,10 +371,7 @@ xc_ptrace(
         guest_va = (unsigned long *)map_domain_va(
             xc_handle, cpu, addr, PROT_READ);
         if ( guest_va == NULL )
-        {
-            status = EFAULT;
-            goto error_out;
-        }
+            goto out_error;
         retval = *guest_va;
         break;
 
@@ -365,38 +380,30 @@ xc_ptrace(
         /* XXX assume that all CPUs have the same address space */
         guest_va = (unsigned long *)map_domain_va(
                             xc_handle, cpu, addr, PROT_READ|PROT_WRITE);
-        if ( guest_va == NULL ) {
-            status = EFAULT;
-            goto error_out;
-        }
+        if ( guest_va == NULL ) 
+            goto out_error;
         *guest_va = (unsigned long)data;
         break;
 
     case PTRACE_GETREGS:
+        if (fetch_regs(xc_handle, cpu, NULL))
+            goto out_error;
+        SET_PT_REGS(pt, ctxt[cpu].user_regs); 
+        memcpy(data, &pt, sizeof(struct gdb_regs));
+        break;
+
     case PTRACE_GETFPREGS:
     case PTRACE_GETFPXREGS:
-        
-        FETCH_REGS(cpu);
-        if ( request == PTRACE_GETREGS )
-        {
-            SET_PT_REGS(pt, ctxt[cpu].user_regs); 
-            memcpy(data, &pt, sizeof(struct gdb_regs));
-        }
-        else if (request == PTRACE_GETFPREGS)
-        {
-            memcpy(data, &ctxt[cpu].fpu_ctxt, sizeof(ctxt[cpu].fpu_ctxt));
-        }
-        else /*if (request == PTRACE_GETFPXREGS)*/
-        {
-            memcpy(data, &ctxt[cpu].fpu_ctxt, sizeof(ctxt[cpu].fpu_ctxt));
-        }
+        if (fetch_regs(xc_handle, cpu, NULL)) 
+            goto out_error;
+        memcpy(data, &ctxt[cpu].fpu_ctxt, sizeof(ctxt[cpu].fpu_ctxt));
         break;
 
     case PTRACE_SETREGS:
         SET_XC_REGS(((struct gdb_regs *)data), ctxt[cpu].user_regs);
-        retval = xc_vcpu_setcontext(xc_handle, current_domid, cpu, &ctxt[cpu]);
-        if (retval)
-            goto error_out;
+        if ((retval = xc_vcpu_setcontext(xc_handle, current_domid, cpu, 
+                                &ctxt[cpu])))
+            goto out_error_dom0;
         break;
 
     case PTRACE_SINGLESTEP:
@@ -404,12 +411,9 @@ xc_ptrace(
          *  during single-stepping - but that just seems retarded
          */
         ctxt[cpu].user_regs.eflags |= PSL_T; 
-        retval = xc_vcpu_setcontext(xc_handle, current_domid, cpu, &ctxt[cpu]);
-        if ( retval )
-        {
-            perror("dom0 op failed");
-            goto error_out;
-        }
+        if ((retval = xc_vcpu_setcontext(xc_handle, current_domid, cpu, 
+                                &ctxt[cpu])))
+            goto out_error_dom0;
         /* FALLTHROUGH */
 
     case PTRACE_CONT:
@@ -418,16 +422,15 @@ xc_ptrace(
         {
             FOREACH_CPU(cpumap, index) {
                 cpu = index - 1;
-                FETCH_REGS(cpu);
+                if (fetch_regs(xc_handle, cpu, NULL)) 
+                    goto out_error;
                 /* Clear trace flag */
-                if ( ctxt[cpu].user_regs.eflags & PSL_T ) {
+                if ( ctxt[cpu].user_regs.eflags & PSL_T ) 
+                {
                     ctxt[cpu].user_regs.eflags &= ~PSL_T;
-                    retval = xc_vcpu_setcontext(xc_handle, current_domid, 
-                                                cpu, &ctxt[cpu]);
-                    if ( retval ) {
-                        perror("dom0 op failed");
-                        goto error_out;
-                    }
+                    if ((retval = xc_vcpu_setcontext(xc_handle, current_domid, 
+                                                cpu, &ctxt[cpu])))
+                        goto out_error_dom0;
                 }
             }
         }
@@ -436,10 +439,13 @@ xc_ptrace(
             op.cmd = DOM0_SETDEBUGGING;
             op.u.setdebugging.domain = current_domid;
             op.u.setdebugging.enable = 0;
-            retval = do_dom0_op(xc_handle, &op);
+            if ((retval = do_dom0_op(xc_handle, &op)))
+                goto out_error_dom0;
         }
         regs_valid = 0;
-        xc_domain_unpause(xc_handle, current_domid > 0 ? current_domid : -current_domid);
+        if ((retval = xc_domain_unpause(xc_handle, current_domid > 0 ? 
+                                current_domid : -current_domid)))
+            goto out_error_dom0;
         break;
 
     case PTRACE_ATTACH:
@@ -448,19 +454,16 @@ xc_ptrace(
         op.u.getdomaininfo.domain = current_domid;
         retval = do_dom0_op(xc_handle, &op);
         if ( retval || (op.u.getdomaininfo.domain != current_domid) )
-        {
-            perror("dom0 op failed");
-            goto error_out;
-        }
+            goto out_error_dom0;
         if ( op.u.getdomaininfo.flags & DOMFLAGS_PAUSED )
-        {
             printf("domain currently paused\n");
-        } else
-            retval = xc_domain_pause(xc_handle, current_domid);
+        else if ((retval = xc_domain_pause(xc_handle, current_domid)))
+            goto out_error_dom0;
         op.cmd = DOM0_SETDEBUGGING;
         op.u.setdebugging.domain = current_domid;
         op.u.setdebugging.enable = 1;
-        retval = do_dom0_op(xc_handle, &op);
+        if ((retval = do_dom0_op(xc_handle, &op)))
+            goto out_error_dom0;
 
         if (get_online_cpumap(xc_handle, &op.u.getdomaininfo, &cpumap))
             printf("get_online_cpumap failed\n");
@@ -478,21 +481,20 @@ xc_ptrace(
         printf("unsupported xc_ptrace request %s\n", ptrace_names[request]);
 #endif
         /* XXX not yet supported */
-        status = ENOSYS;
-        break;
+        errno = ENOSYS;
+        return -1;
 
     case PTRACE_TRACEME:
         printf("PTRACE_TRACEME is an invalid request under Xen\n");
-        status = EINVAL;
-    }
-    
-    if ( status )
-    {
-        errno = status;
-        retval = -1;
-    }
-
- error_out:
+        goto out_error;
+    }
+
+    return retval;
+
+ out_error_dom0:
+    perror("dom0 op failed");
+ out_error:
+    errno = EINVAL;
     return retval;
 }
 
tools/libxc/xc_ptrace.h +3 -27
diff -r 64f11b0e2e7d tools/libxc/xc_ptrace.h
@@ -1,5 +1,7 @@
 #ifndef XC_PTRACE_
 #define XC_PTRACE_
+
+#include <thread_db.h>
 
 #ifdef XC_PTRACE_PRIVATE
 #define X86_CR0_PE              0x00000001 /* Enable Protected Mode    (RW) */
@@ -8,33 +10,7 @@
 #define PDRSHIFT        22
 #define PSL_T  0x00000100 /* trace enable bit */
 
-char * ptrace_names[] = {
-    "PTRACE_TRACEME",
-    "PTRACE_PEEKTEXT",
-    "PTRACE_PEEKDATA",
-    "PTRACE_PEEKUSER",
-    "PTRACE_POKETEXT",
-    "PTRACE_POKEDATA",
-    "PTRACE_POKEUSER",
-    "PTRACE_CONT",
-    "PTRACE_KILL",
-    "PTRACE_SINGLESTEP",
-    "PTRACE_INVALID",
-    "PTRACE_INVALID",
-    "PTRACE_GETREGS",
-    "PTRACE_SETREGS",
-    "PTRACE_GETFPREGS",
-    "PTRACE_SETFPREGS",
-    "PTRACE_ATTACH",
-    "PTRACE_DETACH",
-    "PTRACE_GETFPXREGS",
-    "PTRACE_SETFPXREGS",
-    "PTRACE_INVALID",
-    "PTRACE_INVALID",
-    "PTRACE_INVALID",
-    "PTRACE_INVALID",
-    "PTRACE_SYSCALL",
-};
+extern const char const * ptrace_names[];
 
 struct gdb_regs {
     long ebx; /* 0 */
tools/libxc/xc_ptrace_core.c +19 -91

179 lines not on this page · raw message

# HG changeset patch
# User Horms <[email protected]>
# Node ID ea13f335ceb3f370170799c121ba85ebfb559bcd # Parent 5d6005d3424d96dbe969a17ac9fb2505436a8018 Consolidate xc_ptrace and xc_ptrace_core

* xc_ptrace
- Merge xc_ptrace_core into xc_ptrace
- ATTACH now reads the data argument. If non-zero then
a corefile is being debuged. Otherwise a thread has
been attached to. This allows xc_waitdomain_core() or xc_waitdomain() to be called as appropriate in subsequent xc_ptrace() calls.
* xc_waitdomain
- Rename xc_waitdomain (xc_ptrace.c version) __xc_waitdomain
- Rename xc_waitdomain (xc_ptrace_core.c version) xc_waitdomain_core
- Create xc_waitdomain (in xc_ptrace.c), a wrapper for __xc_waitdomain and xc_waitdomain_core.
Consolidation seemed difficult but ctxt needs to be
passed into xc_waitdomain_core or made global. Alternatively, xc_waitdomain_core could be moved into xc_ptrace.c, but this seems messy.
* map_domain_va
- Rename map_domain_va (xc_ptrace_core.c version) map_domain_va_core
- Have it accept ctxt, like xc_waitdomain_core
* myptrace and myxcwait (linux-xen-low.c)
Removed, call the now generic xc_ptrace() and xc_waitdomain() instead

When calling xc_ptrace ATTACH, if a corefile is in use, a fd will be passed, otherwise a pid. The fd part is important, as this is saved internally in xc_ptrace_core.c, and passed to xc_waitdomain_core() as neccessary. Pereviously xc_waitdomain_core() received a pid and thus could not open the corefile.

tools/debugger/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/linux-xen-low.c +11 -20
diff -r 4fac2aa541aa tools/debugger/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/linux-xen-low.c
@@ -41,8 +41,6 @@
 
 #define TRACE_ENTER /* printf("enter %s\n", __FUNCTION__) */
 
-long (*myptrace)(int xc_handle, enum __ptrace_request, uint32_t, long, long);
-int (*myxcwait)(int xc_handle, int domain, int *status, int options) ;
 static int xc_handle;
 
 static inline int
@@ -170,7 +168,7 @@ linux_attach (int domid)
     add_thread (0, new_process);
     new_process->stop_expected = 0;
 
-    if (myptrace (xc_handle, PTRACE_ATTACH, domid, 0, 0) != 0) {
+    if (xc_ptrace (xc_handle, PTRACE_ATTACH, domid, 0, isfile) != 0) {
 	fprintf (stderr, "Cannot attach to domain %d: %s (%d)\n", domid,
 		 strerror (errno), errno);
 	fflush (stderr);
@@ -188,7 +186,7 @@ linux_kill_one_process (struct inferior_
 {
   struct thread_info *thread = (struct thread_info *) entry;
   struct process_info *process = get_thread_process (thread);
-  myptrace (xc_handle, PTRACE_KILL, pid_of (process), 0, 0);
+  xc_ptrace (xc_handle, PTRACE_KILL, pid_of (process), 0, 0);
 }
 
 
@@ -202,7 +200,7 @@ linux_detach_one_process (struct inferio
 linux_detach_one_process (struct inferior_list_entry *entry)
 {
 
-  myptrace (xc_handle, PTRACE_DETACH, current_domid, 0, 0);
+  xc_ptrace (xc_handle, PTRACE_DETACH, current_domid, 0, 0);
 }
 
 
@@ -228,7 +226,7 @@ linux_wait (char *status)
 linux_wait (char *status)
 {
   int w;
-  if (myxcwait(xc_handle, current_domid, &w, 0))
+  if (xc_waitdomain(xc_handle, current_domid, &w, 0))
       return -1;
   
   linux_set_inferior();
@@ -250,7 +248,7 @@ linux_resume (struct thread_resume *resu
   for_each_inferior(&all_threads, regcache_invalidate_one);
   if (debug_threads)
     fprintf(stderr, "step: %d\n", step);
-  myptrace (xc_handle, step ? PTRACE_SINGLESTEP : PTRACE_CONT, 
+  xc_ptrace (xc_handle, step ? PTRACE_SINGLESTEP : PTRACE_CONT, 
 	    resume_info->thread, 0, 0);
 
 }
@@ -275,7 +273,7 @@ regsets_fetch_inferior_registers ()
 	}
 
       buf = malloc (regset->size);
-      res = myptrace (xc_handle, regset->get_request, 
+      res = xc_ptrace (xc_handle, regset->get_request, 
 		      curvcpuid(),
 		      0, (PTRACE_XFER_TYPE)buf);
       if (res < 0)
@@ -329,7 +327,7 @@ regsets_store_inferior_registers ()
 
       buf = malloc (regset->size);
       regset->fill_function (buf);
-      res = myptrace (xc_handle, regset->set_request, curvcpuid(), 0, (PTRACE_XFER_TYPE)buf);
+      res = xc_ptrace (xc_handle, regset->set_request, curvcpuid(), 0, (PTRACE_XFER_TYPE)buf);
       if (res < 0)
 	{
 	  if (errno == EIO)
@@ -407,7 +405,7 @@ linux_read_memory (CORE_ADDR memaddr, ch
   for (i = 0; i < count; i++, addr += sizeof (PTRACE_XFER_TYPE))
     {
       errno = 0;
-      buffer[i] = myptrace (xc_handle, PTRACE_PEEKTEXT, curvcpuid(), (PTRACE_ARG3_TYPE) addr, 0);
+      buffer[i] = xc_ptrace (xc_handle, PTRACE_PEEKTEXT, curvcpuid(), (PTRACE_ARG3_TYPE) addr, 0);
       if (errno)
 	return errno;
     }
@@ -440,13 +438,13 @@ linux_write_memory (CORE_ADDR memaddr, c
 
   /* Fill start and end extra bytes of buffer with existing memory data.  */
 
-  buffer[0] = myptrace (xc_handle, PTRACE_PEEKTEXT, curvcpuid(),
+  buffer[0] = xc_ptrace (xc_handle, PTRACE_PEEKTEXT, curvcpuid(),
 		      (PTRACE_ARG3_TYPE) addr, 0);
 
   if (count > 1)
     {
       buffer[count - 1]
-	= myptrace (xc_handle, PTRACE_PEEKTEXT, curvcpuid(),
+	= xc_ptrace (xc_handle, PTRACE_PEEKTEXT, curvcpuid(),
 		  (PTRACE_ARG3_TYPE) (addr + (count - 1)
 				      * sizeof (PTRACE_XFER_TYPE)),
 		  0);
@@ -460,7 +458,7 @@ linux_write_memory (CORE_ADDR memaddr, c
   for (i = 0; i < count; i++, addr += sizeof (PTRACE_XFER_TYPE))
     {
       errno = 0;
-      myptrace (xc_handle, PTRACE_POKETEXT, curvcpuid(), 
+      xc_ptrace (xc_handle, PTRACE_POKETEXT, curvcpuid(), 
 		(PTRACE_ARG3_TYPE) addr, buffer[i]);
       if (errno)
 	return errno;
@@ -561,13 +559,6 @@ initialize_low (void)
 		       the_low_target.breakpoint_len);
   init_registers ();
   linux_init_signals ();
-  if (isfile) {
-      myptrace = xc_ptrace_core;
-      myxcwait = xc_waitdomain_core;
-  } else {
-      myptrace = xc_ptrace;
-      myxcwait = xc_waitdomain;
-  }
   using_threads = thread_db_init ();
 
 }
tools/libxc/xc_ptrace.c +48 -43

166 lines not on this page · raw message

tools/libxc/xc_ptrace_core.c +6 -85

124 lines not on this page · raw message

tools/libxc/xenctrl.h +9 -3
diff -r 4fac2aa541aa tools/libxc/xenctrl.h
@@ -98,13 +98,19 @@ long xc_ptrace_core(
     enum __ptrace_request request, 
     uint32_t domid, 
     long addr, 
-    long data);
-
+    long data,
+    vcpu_guest_context_t *ctxt);
+void * map_domain_va_core(
+    unsigned long domfd, 
+    int cpu, 
+    void *guest_va,
+    vcpu_guest_context_t *ctxt);
 int xc_waitdomain_core(
     int xc_handle,
     int domain, 
     int *status, 
-    int options);
+    int options,
+    vcpu_guest_context_t *ctxt);
 
 /*
  * DOMAIN MANAGEMENT FUNCTIONS

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel