7:33 p.m.
From: Don Slutz <dslutz(a)verizon.com>
Currently crash 4.0 and later using the code:
http://lists.xen.org/archives/html/xen-devel/2013-11/msg02569.html
There is some very limited documention on crashes remote ptotocol in:
http://lists.xen.org/archives/html/xen-devel/2013-11/msg02352.html
and some fixes in the attachment 0001-xen-crashd-Connect-crash-with-domain.patch
from the 1st link above.
How ever there are issues with the current code:
1) The remote protocol has a minor issue (which I have not been able to
happen) based on the fact TCP/IP is stream based protocol. This means
a RECV or a SEND may not do the fully requested size of data. In fact
the current code assumes that the amount of data that a SEND is called
with will all be read with a single RECV.
2) The most common mismatch between crash and older kernels is
phys_base. In the remote case, see if the remote server supports
vitrual memory access, and if so, see if phys_base can be retreived.
3) crash assumes that the remote system is active and can not return
currect IP and SP to do a better back trace.
4) enable a non-active mode of remote access.
This patch set attempts to fix these:
The fix for #1 I have called NIL mode (patch 1).
The fix for #2 uses get_remote_phys_base (patch 3).
The fix for #3 uses get_remote_regs (patch 5).
The fix for #4 uses special fake file /dev/xenmem (patch 7).
It also REMOTE_PAUSED() to indicate "remote paused system".
changes v1 to v2:
Daniel Kiper:
remove all camelCase.
remove Emacs directives.
Dave Anderson:
rework flags, and time of changes.
change get_remote_regs() to return non-zero when it successfully gets the registers.
fix "make warn" warnings
remove Emacs directives.
Don Slutz (7):
Add NIL mode to remote.
remote_proc_version: NULL terminate passed buffer on error.
Add get_remote_phys_base.
Add remote_vtop.
bt: get remote live registers if possible.
Add get_remote_cr3
Add support for non-live remote.
defs.h | 8 +-
kernel.c | 13 +-
memory.c | 13 +-
remote.c | 464 +++++++++++++++++++++++++++++++++++++++++++++++++++++----------
x86_64.c | 12 ++
5 files changed, 430 insertions(+), 80 deletions(-)
--
1.8.4
7:33 p.m.
New subject: [PATCH v2 1/7] Add NIL mode to remote.
From: Don Slutz <dslutz(a)verizon.com>
The new macro NIL_MODE() reflexs this state.
This is the code to correctly handle that fact that TCP/IP is a
stream protocol and not a "line" protocol. NIL mode is the new term
interduced here to describe the zero byte termination that was added
to do this. It is fully backwards compattable because the commands
were terminated with a zero byte on both ends already and a extra
zero byte does not affect a C array of chars.
Signed-off-by: Don Slutz <dslutz(a)verizon.com>
---
remote.c | 241 ++++++++++++++++++++++++++++++++++++++++++++-------------------
1 file changed, 171 insertions(+), 70 deletions(-)
diff --git a/remote.c b/remote.c
index fca08a1..95ce03d 100755
--- a/remote.c
+++ b/remote.c
@@ -1808,6 +1808,20 @@ static int remote_file_type(char *);
static int remote_lkcd_dump_init(void);
static int remote_s390_dump_init(void);
static int remote_netdump_init(void);
+static int remote_tcp_read(int, const char *, size_t);
+static int remote_tcp_read_string(int, const char *, size_t, int);
+static int remote_tcp_write(int, const void *, size_t);
+static int remote_tcp_write_string(int, const char *);
+
+struct _remote_context {
+ uint flags;
+} remote_context;
+
+#define NIL_FLAG (0x01U)
+
+#define NIL_MODE() (rc->flags & NIL_FLAG)
+
+struct _remote_context *rc = &remote_context;
/*
* Parse, verify and establish a connection with the network daemon
@@ -1921,6 +1935,16 @@ is_remote_daemon(char *dp)
remote_socket_options(pc->sockfd);
+ /*
+ * Try and use NIL mode.
+ */
+ BZERO(sendbuf, BUFSIZE);
+ BZERO(recvbuf, BUFSIZE);
+ sprintf(sendbuf, "NIL");
+ remote_tcp_write_string(pc->sockfd, sendbuf);
+ remote_tcp_read_string(pc->sockfd, recvbuf, BUFSIZE-1, 0);
+ if (!strstr(recvbuf, "<FAIL>"))
+ rc->flags |= NIL_FLAG;
/*
* Get the remote machine type and verify a match. The daemon pid
* is also used as a live system initial context.
@@ -1928,8 +1952,8 @@ is_remote_daemon(char *dp)
BZERO(sendbuf, BUFSIZE);
BZERO(recvbuf, BUFSIZE);
sprintf(sendbuf, "MACHINE_PID");
- send(pc->sockfd, sendbuf, strlen(sendbuf), 0);
- recv(pc->sockfd, recvbuf, BUFSIZE-1, 0);
+ remote_tcp_write_string(pc->sockfd, sendbuf);
+ remote_tcp_read_string(pc->sockfd, recvbuf, BUFSIZE-1, NIL_MODE());
p1 = strtok(recvbuf, " "); /* MACHINE */
p1 = strtok(NULL, " "); /* machine type */
if (CRASHDEBUG(1))
@@ -2032,8 +2056,8 @@ remote_file_type(char *file)
BZERO(sendbuf, BUFSIZE);
BZERO(recvbuf, BUFSIZE);
sprintf(sendbuf, "TYPE %s", file);
- send(pc->sockfd, sendbuf, strlen(sendbuf), 0);
- recv(pc->sockfd, recvbuf, BUFSIZE-1, 0);
+ remote_tcp_write_string(pc->sockfd, sendbuf);
+ remote_tcp_read_string(pc->sockfd, recvbuf, BUFSIZE-1, NIL_MODE());
if (strstr(recvbuf, "<FAIL>"))
error(FATAL, "invalid remote file name: %s\n", file);
@@ -2112,6 +2136,84 @@ remote_socket_options(int sockfd)
}
/*
+ * Wrapper around recv to read full length packet.
+ */
+static int
+remote_tcp_read(int sock, const char *pv_buffer, size_t cb_buffer)
+{
+ size_t cb_total = 0;
+
+ do
+ {
+ ssize_t cb_read = recv(sock, (void*)pv_buffer, cb_buffer, MSG_NOSIGNAL);
+
+ if (cb_read <= 0)
+ return cb_read;
+ cb_total += cb_read;
+ cb_buffer -= cb_read;
+ pv_buffer = (char *)pv_buffer + cb_read;
+ } while (cb_buffer);
+
+ return cb_total;
+}
+
+/*
+ * Wrapper around recv to read full string packet.
+ */
+static int
+remote_tcp_read_string(int sock, const char *pv_buffer, size_t cb_buffer, int nil_mode)
+{
+ size_t cb_total = 0;
+
+ do
+ {
+ ssize_t cb_read = recv(sock, (void*)pv_buffer, cb_buffer, MSG_NOSIGNAL);
+
+ if (cb_read <= 0)
+ return cb_read;
+ cb_total += cb_read;
+ if (!nil_mode && cb_total >= 4)
+ return cb_total;
+ if (!pv_buffer[cb_read - 1])
+ return cb_total;
+ cb_buffer -= cb_read;
+ pv_buffer = (char *)pv_buffer + cb_read;
+ } while (cb_buffer);
+
+ return cb_total;
+}
+
+/*
+ * Wrapper around send to send full packet.
+ */
+static int
+remote_tcp_write(int sock, const void *pv_buffer, size_t cb_buffer)
+{
+ do
+ {
+ size_t cb_now = cb_buffer;
+ ssize_t cb_written = send(sock, (const char *)pv_buffer, cb_now, MSG_NOSIGNAL);
+
+ if (cb_written < 0)
+ return 1;
+ cb_buffer -= cb_written;
+ pv_buffer = (char *)pv_buffer + cb_written;
+ } while (cb_buffer);
+
+ return 0;
+}
+
+/*
+ * Wrapper around tcp_write to send a string
+ */
+static int
+remote_tcp_write_string(int sock, const char *pv_buffer)
+{
+ return remote_tcp_write(sock, pv_buffer, strlen(pv_buffer) + 1);
+}
+
+
+/*
* Request that the daemon open a file.
*/
static int
@@ -2124,8 +2226,8 @@ remote_file_open(struct remote_file *rfp)
BZERO(sendbuf, BUFSIZE);
BZERO(recvbuf, BUFSIZE);
sprintf(sendbuf, "OPEN %s", rfp->filename);
- send(pc->sockfd, sendbuf, strlen(sendbuf), 0);
- recv(pc->sockfd, recvbuf, BUFSIZE-1, 0);
+ remote_tcp_write_string(pc->sockfd, sendbuf);
+ remote_tcp_read_string(pc->sockfd, recvbuf, BUFSIZE-1, NIL_MODE());
if (CRASHDEBUG(1))
fprintf(fp, "remote_file_open: [%s]\n", recvbuf);
@@ -2159,8 +2261,8 @@ remote_file_close(struct remote_file *rfp)
BZERO(sendbuf, BUFSIZE);
BZERO(recvbuf, BUFSIZE);
sprintf(sendbuf, "CLOSE %d", rfp->fd);
- send(pc->sockfd, sendbuf, strlen(sendbuf), 0);
- recv(pc->sockfd, recvbuf, BUFSIZE-1, 0);
+ remote_tcp_write_string(pc->sockfd, sendbuf);
+ remote_tcp_read_string(pc->sockfd, recvbuf, BUFSIZE-1, NIL_MODE());
return (strstr(recvbuf, "OK") ? TRUE : FALSE);
}
@@ -2177,8 +2279,8 @@ remote_proc_version(char *buf)
BZERO(sendbuf, BUFSIZE);
BZERO(recvbuf, BUFSIZE);
sprintf(sendbuf, "PROC_VERSION");
- send(pc->sockfd, sendbuf, strlen(sendbuf), 0);
- recv(pc->sockfd, recvbuf, BUFSIZE-1, 0);
+ remote_tcp_write_string(pc->sockfd, sendbuf);
+ remote_tcp_read_string(pc->sockfd, recvbuf, BUFSIZE-1, NIL_MODE());
if (STREQ(recvbuf, "<FAIL>"))
return FALSE;
strcpy(buf, recvbuf);
@@ -2359,8 +2461,8 @@ copy_to_local_namelist(struct remote_file *rfp)
BZERO(sendbuf, BUFSIZE);
BZERO(recvbuf, BUFSIZE);
sprintf(sendbuf, "DEBUGGING_SYMBOLS %s", rfp->filename);
- send(pc->sockfd, sendbuf, strlen(sendbuf), 0);
- recv(pc->sockfd, recvbuf, BUFSIZE-1, 0);
+ remote_tcp_write_string(pc->sockfd, sendbuf);
+ remote_tcp_read_string(pc->sockfd, recvbuf, BUFSIZE-1, NIL_MODE());
if (strstr(recvbuf, "NO_DEBUG")) {
sprintf(readbuf, "%s@%s", rfp->filename, pc->server);
pc->namelist = readbuf;
@@ -2472,8 +2574,8 @@ identical_namelist(char *file, struct remote_file *rfp)
BZERO(readbuf, BUFSIZE);
sprintf(sendbuf, "LINUX_VERSION %s", rfp->filename);
- send(pc->sockfd, sendbuf, strlen(sendbuf), 0);
- recv(pc->sockfd, recvbuf, BUFSIZE-1, 0);
+ remote_tcp_write_string(pc->sockfd, sendbuf);
+ remote_tcp_read_string(pc->sockfd, recvbuf, BUFSIZE-1, NIL_MODE());
if (strstr(recvbuf, "<FAIL>"))
return FALSE;
@@ -2515,8 +2617,8 @@ remote_file_checksum(struct remote_file *rfp)
BZERO(sendbuf, BUFSIZE);
BZERO(recvbuf, BUFSIZE);
sprintf(sendbuf, "SUM %s", rfp->filename);
- send(pc->sockfd, sendbuf, strlen(sendbuf), 0);
- recv(pc->sockfd, recvbuf, BUFSIZE-1, 0);
+ remote_tcp_write_string(pc->sockfd, sendbuf);
+ remote_tcp_read_string(pc->sockfd, recvbuf, BUFSIZE-1, NIL_MODE());
if (strstr(recvbuf, "<FAIL>")) {
error(INFO, "%s: does not exist on server %s\n",
rfp->filename, pc->server);
@@ -2785,8 +2887,8 @@ remote_find_booted_kernel(struct remote_file *rfp)
BZERO(sendbuf, BUFSIZE);
BZERO(recvbuf, BUFSIZE);
sprintf(sendbuf, "FIND_BOOTED_KERNEL");
- send(pc->sockfd, sendbuf, strlen(sendbuf), 0);
- recv(pc->sockfd, recvbuf, BUFSIZE-1, 0);
+ remote_tcp_write_string(pc->sockfd, sendbuf);
+ remote_tcp_read_string(pc->sockfd, recvbuf, BUFSIZE-1, NIL_MODE());
strtok(recvbuf, " "); /* FIND_BOOTED_KERNEL */
p1 = strtok(NULL, " "); /* filename */
if (STREQ(p1, "<FAIL>"))
@@ -2806,8 +2908,8 @@ remote_lkcd_dump_init(void)
BZERO(sendbuf, BUFSIZE);
BZERO(recvbuf, BUFSIZE);
sprintf(sendbuf, "LKCD_DUMP_INIT %d %s", pc->rmfd,
pc->server_memsrc);
- send(pc->sockfd, sendbuf, strlen(sendbuf), 0);
- recv(pc->sockfd, recvbuf, BUFSIZE-1, 0);
+ remote_tcp_write_string(pc->sockfd, sendbuf);
+ remote_tcp_read_string(pc->sockfd, recvbuf, BUFSIZE-1, NIL_MODE());
if (strstr(recvbuf, "<FAIL>"))
return FALSE;
@@ -2844,8 +2946,8 @@ remote_s390_dump_init(void)
BZERO(sendbuf, BUFSIZE);
BZERO(recvbuf, BUFSIZE);
sprintf(sendbuf, "S390_DUMP_INIT %d %s", pc->rmfd,
pc->server_memsrc);
- send(pc->sockfd, sendbuf, strlen(sendbuf), 0);
- recv(pc->sockfd, recvbuf, BUFSIZE-1, 0);
+ remote_tcp_write_string(pc->sockfd, sendbuf);
+ remote_tcp_read_string(pc->sockfd, recvbuf, BUFSIZE-1, NIL_MODE());
if (strstr(recvbuf, "<FAIL>"))
return FALSE;
@@ -2880,8 +2982,8 @@ remote_netdump_init(void)
BZERO(sendbuf, BUFSIZE);
BZERO(recvbuf, BUFSIZE);
sprintf(sendbuf, "NETDUMP_INIT %d %s", pc->rmfd,
pc->server_memsrc);
- send(pc->sockfd, sendbuf, strlen(sendbuf), 0);
- recv(pc->sockfd, recvbuf, BUFSIZE-1, 0);
+ remote_tcp_write_string(pc->sockfd, sendbuf);
+ remote_tcp_read_string(pc->sockfd, recvbuf, BUFSIZE-1, NIL_MODE());
if (strstr(recvbuf, "<FAIL>"))
return FALSE;
@@ -2925,8 +3027,8 @@ remote_page_size(void)
error(FATAL,
"cannot determine remote page size (unknown memory source)\n");
- send(pc->sockfd, sendbuf, strlen(sendbuf), 0);
- recv(pc->sockfd, recvbuf, BUFSIZE-1, 0);
+ remote_tcp_write_string(pc->sockfd, sendbuf);
+ remote_tcp_read_string(pc->sockfd, recvbuf, BUFSIZE-1, NIL_MODE());
if (strstr(recvbuf, "FAIL"))
error(FATAL, "cannot determine remote page size\n");
strtok(recvbuf, " "); /* PAGESIZE */
@@ -2968,7 +3070,7 @@ copy_remote_file(struct remote_file *rfp, int fd, char *file, char
*ttystr)
BZERO(sendbuf, BUFSIZE);
sprintf(sendbuf, "READ %d %lx %ld", rfp->fd, offset, size);
- bytes = write(pc->sockfd, sendbuf, strlen(sendbuf));
+ bytes = write(pc->sockfd, sendbuf, strlen(sendbuf) + 1);
bzero(readbuf, READBUFSIZE);
@@ -3059,7 +3161,7 @@ copy_remote_gzip_file(struct remote_file *rfp, char *file, char
*ttystr)
BZERO(sendbuf, BUFSIZE);
sprintf(sendbuf, "READ_GZIP %ld %s", pc->rcvbufsize,
rfp->filename);
- send(pc->sockfd, sendbuf, strlen(sendbuf), 0);
+ remote_tcp_write_string(pc->sockfd, sendbuf);
bzero(readbuf, READBUFSIZE);
@@ -3170,8 +3272,8 @@ find_remote_module_objfile(struct load_module *lm, char *module,
char *retbuf)
BZERO(recvbuf, BUFSIZE);
sprintf(sendbuf, "FIND_MODULE %s %s",
kt->utsname.release, module);
- send(pc->sockfd, sendbuf, strlen(sendbuf), 0);
- recv(pc->sockfd, recvbuf, BUFSIZE-1, 0);
+ remote_tcp_write_string(pc->sockfd, sendbuf);
+ remote_tcp_read_string(pc->sockfd, recvbuf, BUFSIZE-1, NIL_MODE());
if (strstr(recvbuf, "<FAIL>")) {
fprintf(fp, "find_remote_module_objfile: [%s]\n",
recvbuf);
@@ -3231,8 +3333,8 @@ remote_free_memory(void)
BZERO(sendbuf, BUFSIZE);
BZERO(recvbuf, BUFSIZE);
sprintf(sendbuf, "MEMORY FREE %s", type);
- send(pc->sockfd, sendbuf, strlen(sendbuf), 0);
- recv(pc->sockfd, recvbuf, BUFSIZE-1, 0);
+ remote_tcp_write_string(pc->sockfd, sendbuf);
+ remote_tcp_read_string(pc->sockfd, recvbuf, BUFSIZE-1, NIL_MODE());
p1 = strtok(recvbuf, " "); /* MEMORY */
p1 = strtok(NULL, " "); /* FREE */
p1 = strtok(NULL, " "); /* MCLXCD, LKCD etc. */
@@ -3267,8 +3369,8 @@ remote_memory_used(void)
BZERO(sendbuf, BUFSIZE);
BZERO(recvbuf, BUFSIZE);
sprintf(sendbuf, "MEMORY USED %s", type);
- send(pc->sockfd, sendbuf, strlen(sendbuf), 0);
- recv(pc->sockfd, recvbuf, BUFSIZE-1, 0);
+ remote_tcp_write_string(pc->sockfd, sendbuf);
+ remote_tcp_read_string(pc->sockfd, recvbuf, BUFSIZE-1, NIL_MODE());
p1 = strtok(recvbuf, " "); /* MEMORY */
p1 = strtok(NULL, " "); /* FREE */
p1 = strtok(NULL, " "); /* MCLXCD, LKCD, etc. */
@@ -3308,7 +3410,7 @@ remote_memory_dump(int verbose)
BZERO(sendbuf, BUFSIZE);
sprintf(sendbuf, "MEMORY_DUMP %ld %s%s", pc->rcvbufsize, type,
verbose ? "_VERBOSE" : "");
- send(pc->sockfd, sendbuf, strlen(sendbuf), 0);
+ remote_tcp_write_string(pc->sockfd, sendbuf);
bzero(readbuf, READBUFSIZE);
done = total = 0;
@@ -3371,10 +3473,9 @@ int
remote_memory_read(int rfd, char *buffer, int cnt, physaddr_t address)
{
char sendbuf[BUFSIZE];
- char readbuf[READBUFSIZE];
char datahdr[DATA_HDRSIZE];
- char *bufptr, *p1;
- int ret, req, tot;
+ char *p1;
+ int ret, tot;
ulong addr;
addr = (ulong)address; /* may be virtual */
@@ -3391,48 +3492,49 @@ remote_memory_read(int rfd, char *buffer, int cnt, physaddr_t
address)
else
sprintf(sendbuf, "READ_LIVE %d %lx %d", rfd, addr, cnt);
- send(pc->sockfd, sendbuf, strlen(sendbuf), 0);
-
- bzero(readbuf, READBUFSIZE);
+ if (remote_tcp_write_string(pc->sockfd, sendbuf))
+ return -1;
/*
* Read request will come back with a singular header
* followed by the data.
*/
- req = cnt+DATA_HDRSIZE;
- tot = 0;
- errno = 0;
- bufptr = readbuf;
-
- while (req) {
- if ((ret = recv(pc->sockfd, bufptr, req, 0)) == -1)
- return -1;
- req -= ret;
- bufptr += ret;
- tot += ret;
- if ((tot >= DATA_HDRSIZE) && STRNEQ(readbuf, FAILMSG)) {
- p1 = strtok(readbuf, " "); /* FAIL */
- p1 = strtok(NULL, " "); /* errno */
- errno = atoi(p1);
- return -1;
- }
+ BZERO(datahdr, DATA_HDRSIZE);
+ ret = remote_tcp_read_string(pc->sockfd, datahdr, DATA_HDRSIZE, 1);
+ if (ret <= 0)
+ return -1;
+ if (CRASHDEBUG(3))
+ fprintf(fp, "remote_memory_read: [%s]\n", datahdr);
+ if (STRNEQ(datahdr, FAILMSG)) {
+ p1 = strtok(datahdr, " "); /* FAIL */
+ p1 = strtok(NULL, " "); /* errno */
+ errno = atoi(p1);
+ return -1;
}
-
- if (!STRNEQ(readbuf, DONEMSG) && !STRNEQ(readbuf, DATAMSG)) {
+ if (!STRNEQ(datahdr, DONEMSG) && !STRNEQ(datahdr, DATAMSG)) {
error(INFO, "out of sync with remote memory source\n");
return -1;
}
- strncpy(datahdr, readbuf, DATA_HDRSIZE);
- if (CRASHDEBUG(3))
- fprintf(fp, "remote_memory_read: [%s]\n", datahdr);
- p1 = strtok(datahdr, " "); /* DONE */
- p1 = strtok(NULL, " "); /* count */
+ p1 = strtok(datahdr, " "); /* DONE */
+ p1 = strtok(NULL, " "); /* count */
tot = atol(p1);
- BCOPY(readbuf+DATA_HDRSIZE, buffer, tot);
+ if (cnt != tot) {
+ error(FATAL,
+ "requested %d bytes remote memory return %d bytes\n",
+ cnt, tot);
+ return -1;
+ }
+ ret = remote_tcp_read(pc->sockfd, buffer, tot);
+ if (ret != tot) {
+ error(FATAL,
+ "requested %d bytes remote memory return %d bytes\n",
+ ret, tot);
+ return -1;
+ }
return tot;
}
@@ -3492,7 +3594,7 @@ remote_execute(void)
BZERO(sendbuf, BUFSIZE);
sprintf(sendbuf, "EXECUTE %ld %s", pc->rcvbufsize, command);
- send(pc->sockfd, sendbuf, strlen(sendbuf), 0);
+ remote_tcp_write_string(pc->sockfd, sendbuf);
bzero(readbuf, READBUFSIZE);
done = total = 0;
@@ -3561,12 +3663,11 @@ remote_exit(void)
BZERO(buf, BUFSIZE);
sprintf(buf, "EXIT");
- send(pc->sockfd, buf, strlen(buf), 0);
+ remote_tcp_write_string(pc->sockfd, buf);
/*
* Read but ignore the return status -- we don't really care...
*/
- recv(pc->sockfd, buf, BUFSIZE-1, 0);
+ remote_tcp_read_string(pc->sockfd, buf, BUFSIZE-1, NIL_MODE());
}
#endif /* !DAEMON */
-
--
1.8.4
7:33 p.m.
New subject: [PATCH v2 2/7] remote_proc_version: NULL terminate passed buffer on error.
From: Don Slutz <dslutz(a)verizon.com>
Also add cpu argumnet to remote_memory_read.
Signed-off-by: Don Slutz <dslutz(a)verizon.com>
---
defs.h | 2 +-
memory.c | 4 ++--
remote.c | 8 ++++++--
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/defs.h b/defs.h
index a5299cc..86b4fae 100755
--- a/defs.h
+++ b/defs.h
@@ -5535,7 +5535,7 @@ int remote_memory_used(void);
void remote_exit(void);
int remote_execute(void);
void remote_clear_pipeline(void);
-int remote_memory_read(int, char *, int, physaddr_t);
+int remote_memory_read(int, char *, int, physaddr_t, int);
/*
* gnu_binutils.c
diff --git a/memory.c b/memory.c
index d936b53..5ec454d 100755
--- a/memory.c
+++ b/memory.c
@@ -2492,7 +2492,7 @@ write_lkcd_dumpfile(int fd, void *bufptr, int cnt, ulong addr,
physaddr_t paddr)
int
read_daemon(int fd, void *bufptr, int cnt, ulong vaddr, physaddr_t paddr)
{
- if (remote_memory_read(pc->rmfd, bufptr, cnt, paddr) == cnt)
+ if (remote_memory_read(pc->rmfd, bufptr, cnt, paddr, -1) == cnt)
return cnt;
if (!IS_VMALLOC_ADDR(vaddr) || DUMPFILE())
@@ -2506,7 +2506,7 @@ read_daemon(int fd, void *bufptr, int cnt, ulong vaddr, physaddr_t
paddr)
* the only alternative is to read it from /dev/kmem.
*/
- if (BITS32() && remote_memory_read(pc->rkfd, bufptr, cnt, vaddr) == cnt)
+ if (BITS32() && remote_memory_read(pc->rkfd, bufptr, cnt, vaddr, -1) == cnt)
return cnt;
return READ_ERROR;
diff --git a/remote.c b/remote.c
index 95ce03d..204f7b8 100755
--- a/remote.c
+++ b/remote.c
@@ -2281,8 +2281,10 @@ remote_proc_version(char *buf)
sprintf(sendbuf, "PROC_VERSION");
remote_tcp_write_string(pc->sockfd, sendbuf);
remote_tcp_read_string(pc->sockfd, recvbuf, BUFSIZE-1, NIL_MODE());
- if (STREQ(recvbuf, "<FAIL>"))
+ if (STREQ(recvbuf, "<FAIL>")) {
+ buf[0] = 0;
return FALSE;
+ }
strcpy(buf, recvbuf);
return TRUE;
}
@@ -3470,7 +3472,7 @@ remote_memory_dump(int verbose)
* a page in length.
*/
int
-remote_memory_read(int rfd, char *buffer, int cnt, physaddr_t address)
+remote_memory_read(int rfd, char *buffer, int cnt, physaddr_t address, int vcpu)
{
char sendbuf[BUFSIZE];
char datahdr[DATA_HDRSIZE];
@@ -3489,6 +3491,8 @@ remote_memory_read(int rfd, char *buffer, int cnt, physaddr_t
address)
sprintf(sendbuf, "READ_LKCD %d %lx %d", rfd, addr, cnt);
else if (pc->flags & REM_S390D)
sprintf(sendbuf, "READ_S390D %d %lx %d", rfd, addr, cnt);
+ else if (vcpu >= 0)
+ sprintf(sendbuf, "READ_LIVE %d %lx %d %d", rfd, addr, cnt,
vcpu);
else
sprintf(sendbuf, "READ_LIVE %d %lx %d", rfd, addr, cnt);
--
1.8.4
7:33 p.m.
New subject: [PATCH v2 3/7] Add get_remote_phys_base.
From: Don Slutz <dslutz(a)verizon.com>
The most common mismatch between crash and older kernels is
phys_base. In the remote case, see if the remote server supports
vitrual memory access, and if so, see if phys_base can be retreived.
Signed-off-by: Don Slutz <dslutz(a)verizon.com>
---
defs.h | 3 +++
remote.c | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
x86_64.c | 12 +++++++++++
3 files changed, 88 insertions(+), 2 deletions(-)
diff --git a/defs.h b/defs.h
index 86b4fae..8d56da8 100755
--- a/defs.h
+++ b/defs.h
@@ -504,6 +504,8 @@ struct program_context {
#define GET_LOG (0x200ULL)
#define VMCOREINFO (0x400ULL)
#define ALLOW_FP (0x800ULL)
+#define REM_PAUSED_F (0x1000ULL)
+#define REMOTE_PAUSED() (pc->flags2 & REM_PAUSED_F)
char *cleanup;
char *namelist_orig;
char *namelist_debug_orig;
@@ -5525,6 +5527,7 @@ void dump_sockets_workhorse(ulong, ulong, struct reference *);
* remote.c
*/
int is_remote_daemon(char *);
+physaddr_t get_remote_phys_base(physaddr_t, physaddr_t);
void remote_fd_init(void);
int get_remote_file(struct remote_file *);
uint remote_page_size(void);
diff --git a/remote.c b/remote.c
index 204f7b8..a4069a7 100755
--- a/remote.c
+++ b/remote.c
@@ -1797,6 +1797,7 @@ static void copy_to_local_namelist(struct remote_file *);
static char *create_local_namelist(struct remote_file *);
static int remote_find_booted_kernel(struct remote_file *);
static int remote_proc_version(char *);
+static int validate_phys_base(physaddr_t, physaddr_t, physaddr_t);
static int remote_file_open(struct remote_file *);
static int remote_file_close(struct remote_file *);
static int identical_namelist(char *, struct remote_file *);
@@ -1815,6 +1816,9 @@ static int remote_tcp_write_string(int, const char *);
struct _remote_context {
uint flags;
+ int n_cpus;
+ int vfd;
+ char remote_type[10];
} remote_context;
#define NIL_FLAG (0x01U)
@@ -1858,7 +1862,7 @@ is_remote_daemon(char *dp)
pc->port = 0;
pc->server = pc->server_memsrc = NULL;
- pc->rmfd = pc->rkfd = -1;
+ rc->vfd = pc->rmfd = pc->rkfd = -1;
file1 = file2 = NULL;
if ((filep = strstr(dp, ","))) {
@@ -2290,6 +2294,62 @@ remote_proc_version(char *buf)
}
/*
+ * Check that virt_phys_base when accessed via
+ * phys_base - text_start is phys_base.
+ */
+static int
+validate_phys_base(physaddr_t phys_base, physaddr_t text_start, physaddr_t
virt_phys_base)
+{
+ ulong value;
+
+ if (CRASHDEBUG(3))
+ fprintf(fp, "validate_phys_base: virt_phys_base=0x%llx
phys_base=0x%llx text_start=0x%llx calc=0x%llx\n",
+ (long long unsigned int)virt_phys_base,
+ (long long unsigned int)phys_base,
+ (long long unsigned int)text_start,
+ (long long unsigned int)virt_phys_base + phys_base - text_start);
+
+ if (READMEM(pc->rmfd, (void*)&value, sizeof(value),
+ virt_phys_base, virt_phys_base + phys_base - text_start)
+ == sizeof(value)) {
+ if (value == phys_base)
+ return 1;
+ }
+ return 0;
+}
+
+/*
+ * Get remote phys_base based on virtual address of "phys_base".
+ */
+physaddr_t
+get_remote_phys_base(physaddr_t text_start, physaddr_t virt_phys_base)
+{
+ int vcpu;
+ ulong value;
+
+ if (rc->vfd < 0) {
+ struct remote_file remote_file, *rfp;
+
+ rfp = &remote_file;
+ BZERO(rfp, sizeof(struct remote_file));
+ rfp->filename = "/dev/vmem";
+ if (remote_file_open(rfp)) {
+ rc->vfd = rfp->fd;
+ } else
+ return 0;
+ }
+
+ for (vcpu = 0; vcpu < rc->n_cpus; vcpu++)
+ if (remote_memory_read(rc->vfd, (void*)&value, sizeof(value),
+ virt_phys_base, vcpu) == sizeof(value)) {
+ if (validate_phys_base(value, text_start, virt_phys_base))
+ return value;
+ }
+
+ return 0;
+}
+
+/*
*
* Set up the file descriptors and file name strings if they haven't
* been set up before:
@@ -3009,7 +3069,7 @@ remote_page_size(void)
{
char sendbuf[BUFSIZE];
char recvbuf[BUFSIZE];
- char *p1;
+ char *p1, *p2, *p3;
uint psz;
BZERO(sendbuf, BUFSIZE);
@@ -3036,12 +3096,23 @@ remote_page_size(void)
strtok(recvbuf, " "); /* PAGESIZE */
p1 = strtok(NULL, " "); /* LIVE, MCLXCD or LKCD */
p1 = strtok(NULL, " "); /* page size */
+ p2 = strtok(NULL, " "); /* remote type */
+ p3 = strtok(NULL, " "); /* number of Cpus */
psz = atoi(p1);
if (psz > MAXRECVBUFSIZE)
error(FATAL,
"remote page size %d is larger than MAXRECVBUFSIZE!\n", psz);
+ if (p2) {
+ strncpy(rc->remote_type, p2, sizeof(rc->remote_type) - 1);
+ rc->remote_type[sizeof(rc->remote_type) - 1] = 0;
+ if (rc->remote_type[0] != 'L')
+ pc->flags2 |= REM_PAUSED_F;
+ }
+ if (p3)
+ rc->n_cpus = atoi(p3);
+
return psz;
}
diff --git a/x86_64.c b/x86_64.c
index e8196f8..cc26fec 100755
--- a/x86_64.c
+++ b/x86_64.c
@@ -5838,6 +5838,18 @@ x86_64_calc_phys_base(void)
return;
else
text_start = symbol_value("_text");
+ if (REMOTE()) {
+ phys_base = get_remote_phys_base(text_start, symbol_value("phys_base"));
+ if (phys_base) {
+ machdep->machspec->phys_base = phys_base;
+ if (CRASHDEBUG(1)) {
+ fprintf(fp, "_text: %lx ", text_start);
+ fprintf(fp, "phys_base: %lx\n\n",
+ machdep->machspec->phys_base);
+ }
+ return;
+ }
+ }
}
if (ACTIVE()) {
--
1.8.4
7:33 p.m.
New subject: [PATCH v2 4/7] Add remote_vtop.
From: Don Slutz <dslutz(a)verizon.com>
For eaxmple:
crash> vtop 0xffffffff802ee778
VIRTUAL PHYSICAL
ffffffff802ee778 4ee778
PML4 DIRECTORY: ffffffff80001000
PAGE DIRECTORY: 203067
PUD: 203ff0 => 205063
PMD: 205008 => bee2c163
PTE: bee2c770 => 4ee163
PAGE: 4ee000
PTE PHYSICAL FLAGS
4ee163 4ee000 (PRESENT|RW|ACCESSED|DIRTY|GLOBAL)
PAGE PHYSICAL MAPPING INDEX CNT FLAGS
ffff8100006f7410 4ee000 0 0 1 400
crash> set debug 1
debug: 1
crash> vtop 0xffffffff802ee778
VIRTUAL PHYSICAL
ffffffff802ee778 4ee778
PML4 DIRECTORY: ffffffff80001000
PAGE DIRECTORY: 203067
PUD: 203ff0 => 205063
PMD: 205008 => bee2c163
PTE: bee2c770 => 4ee163
PAGE: 4ee000
PTE PHYSICAL FLAGS
4ee163 4ee000 (PRESENT|RW|ACCESSED|DIRTY|GLOBAL)
PAGE PHYSICAL MAPPING INDEX CNT FLAGS
ffff8100006f7410 4ee000 0 0 1 400
rvtop(ffffffff802ee778)=4ee778
Signed-off-by: Don Slutz <dslutz(a)verizon.com>
---
defs.h | 1 +
memory.c | 7 +++++++
remote.c | 40 ++++++++++++++++++++++++++++++++++++++++
3 files changed, 48 insertions(+)
diff --git a/defs.h b/defs.h
index 8d56da8..489e4cc 100755
--- a/defs.h
+++ b/defs.h
@@ -5528,6 +5528,7 @@ void dump_sockets_workhorse(ulong, ulong, struct reference *);
*/
int is_remote_daemon(char *);
physaddr_t get_remote_phys_base(physaddr_t, physaddr_t);
+physaddr_t remote_vtop(int, physaddr_t);
void remote_fd_init(void);
int get_remote_file(struct remote_file *);
uint remote_page_size(void);
diff --git a/memory.c b/memory.c
index 5ec454d..707e784 100755
--- a/memory.c
+++ b/memory.c
@@ -2932,6 +2932,13 @@ cmd_vtop(void)
do_vtop(vaddr, tc, vtop_flags | loop_vtop_flags);
+ if (REMOTE() && CRASHDEBUG(1)) {
+ ulong pAddr = remote_vtop(tc->processor, vaddr);
+
+ if (pAddr)
+ fprintf(fp, "rvtop(%lx)=%lx\n", vaddr, pAddr);
+ }
+
optind++;
}
}
diff --git a/remote.c b/remote.c
index a4069a7..23d17fe 100755
--- a/remote.c
+++ b/remote.c
@@ -2350,6 +2350,46 @@ get_remote_phys_base(physaddr_t text_start, physaddr_t
virt_phys_base)
}
/*
+ * Do a remote VTOP if supported.
+ */
+physaddr_t
+remote_vtop(int cpu, physaddr_t virt_addr)
+{
+ char sendbuf[BUFSIZE];
+ char recvbuf[BUFSIZE];
+ char *p1, *p2, *p3, *p4;
+ int errflag;
+ ulong value;
+
+ if (!rc->remoteType[0])
+ return 0; /* Not a special remote. */
+
+ BZERO(sendbuf, BUFSIZE);
+ BZERO(recvbuf, BUFSIZE);
+ sprintf(sendbuf, "VTOP %d %llx", cpu, virt_addr);
+ remote_tcp_write_string(pc->sockfd, sendbuf);
+ remote_tcp_read_string(pc->sockfd, recvbuf, BUFSIZE-1, pc->flags2 &
REMOTE_NIL);
+
+ if (CRASHDEBUG(2))
+ fprintf(fp, "remote_vtop(%d,%llx): [%s]\n",
+ cpu, virt_addr, recvbuf);
+
+ if (strstr(recvbuf, "<FAIL>"))
+ error(FATAL, "remote_vtop for CPU %d\n", cpu);
+ p1 = strtok(recvbuf, " "); /* VTOP */
+ p2 = strtok(NULL, " "); /* cpu */
+ p3 = strtok(NULL, " "); /* vaddr */
+ p4 = strtok(NULL, " "); /* paddr */
+
+ errflag = 0;
+ value = htol(p4, RETURN_ON_ERROR|QUIET, &errflag);
+ if (!errflag) {
+ return value;
+ }
+ return 0;
+}
+
+/*
*
* Set up the file descriptors and file name strings if they haven't
* been set up before:
--
1.8.4
7:33 p.m.
New subject: [PATCH v2 5/7] bt: get remote live registers if possible.
From: Don Slutz <dslutz(a)verizon.com>
Signed-off-by: Don Slutz <dslutz(a)verizon.com>
---
defs.h | 1 +
kernel.c | 10 +++++++--
remote.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---------
3 files changed, 75 insertions(+), 12 deletions(-)
diff --git a/defs.h b/defs.h
index 489e4cc..de10b70 100755
--- a/defs.h
+++ b/defs.h
@@ -5529,6 +5529,7 @@ void dump_sockets_workhorse(ulong, ulong, struct reference *);
int is_remote_daemon(char *);
physaddr_t get_remote_phys_base(physaddr_t, physaddr_t);
physaddr_t remote_vtop(int, physaddr_t);
+int get_remote_regs(struct bt_info *, ulong *, ulong *);
void remote_fd_init(void);
int get_remote_file(struct remote_file *);
uint remote_page_size(void);
diff --git a/kernel.c b/kernel.c
index 7b451c9..9c181ee 100755
--- a/kernel.c
+++ b/kernel.c
@@ -1116,6 +1116,9 @@ non_matching_kernel(void)
if (REMOTE_DUMPFILE())
fprintf(fp, "%s@%s (remote dumpfile)\n",
pc->server_memsrc, pc->server);
+ else if (REMOTE_PAUSED())
+ fprintf(fp, "%s@%s (remote paused system)\n",
+ pc->server_memsrc, pc->server);
else {
if (dumpfile_is_split())
show_split_dumpfiles();
@@ -2408,7 +2411,7 @@ back_trace(struct bt_info *bt)
(BT_KSTACKP|BT_TEXT_SYMBOLS|BT_TEXT_SYMBOLS_ALL)))
fprintf(fp, "(active)\n");
- if (!(bt->flags & (BT_TEXT_SYMBOLS|BT_TEXT_SYMBOLS_ALL)))
+ if (!(bt->flags & (BT_TEXT_SYMBOLS|BT_TEXT_SYMBOLS_ALL) || REMOTE_PAUSED()))
return;
}
@@ -2486,7 +2489,10 @@ back_trace(struct bt_info *bt)
get_xendump_regs(bt, &eip, &esp);
else if (SADUMP_DUMPFILE())
get_sadump_regs(bt, &eip, &esp);
- else
+ else if (REMOTE_PAUSED()) {
+ if (!is_task_active(bt->task) || !get_remote_regs(bt, &eip, &esp))
+ machdep->get_stack_frame(bt, &eip, &esp);
+ } else
machdep->get_stack_frame(bt, &eip, &esp);
if (bt->flags & BT_KSTACKP) {
diff --git a/remote.c b/remote.c
index 23d17fe..b8a00a7 100755
--- a/remote.c
+++ b/remote.c
@@ -2357,32 +2357,31 @@ remote_vtop(int cpu, physaddr_t virt_addr)
{
char sendbuf[BUFSIZE];
char recvbuf[BUFSIZE];
- char *p1, *p2, *p3, *p4;
+ char *p1;
int errflag;
ulong value;
- if (!rc->remoteType[0])
+ if (!rc->remote_type[0])
return 0; /* Not a special remote. */
BZERO(sendbuf, BUFSIZE);
BZERO(recvbuf, BUFSIZE);
- sprintf(sendbuf, "VTOP %d %llx", cpu, virt_addr);
+ sprintf(sendbuf, "VTOP %d %llx", cpu, (long long unsigned int)virt_addr);
remote_tcp_write_string(pc->sockfd, sendbuf);
- remote_tcp_read_string(pc->sockfd, recvbuf, BUFSIZE-1, pc->flags2 &
REMOTE_NIL);
+ remote_tcp_read_string(pc->sockfd, recvbuf, BUFSIZE-1, NIL_MODE());
if (CRASHDEBUG(2))
- fprintf(fp, "remote_vtop(%d,%llx): [%s]\n",
- cpu, virt_addr, recvbuf);
+ fprintf(fp, "remote_vtop: [%s]\n", recvbuf);
if (strstr(recvbuf, "<FAIL>"))
error(FATAL, "remote_vtop for CPU %d\n", cpu);
p1 = strtok(recvbuf, " "); /* VTOP */
- p2 = strtok(NULL, " "); /* cpu */
- p3 = strtok(NULL, " "); /* vaddr */
- p4 = strtok(NULL, " "); /* paddr */
+ p1 = strtok(NULL, " "); /* cpu */
+ p1 = strtok(NULL, " "); /* vaddr */
+ p1 = strtok(NULL, " "); /* paddr */
errflag = 0;
- value = htol(p4, RETURN_ON_ERROR|QUIET, &errflag);
+ value = htol(p1, RETURN_ON_ERROR|QUIET, &errflag);
if (!errflag) {
return value;
}
@@ -2390,6 +2389,63 @@ remote_vtop(int cpu, physaddr_t virt_addr)
}
/*
+ * Get a copy of the daemon machine cpu regs.
+ */
+int
+get_remote_regs(struct bt_info *bt, ulong *eip, ulong *esp)
+{
+ char sendbuf[BUFSIZE];
+ char recvbuf[BUFSIZE];
+ char *p1, *p2;
+ int errflag;
+ ulong value;
+
+ if (!rc->remote_type[0])
+ return 0; /* Not a special remote. */
+
+ *eip = 0;
+ *esp = 0;
+
+ BZERO(sendbuf, BUFSIZE);
+ BZERO(recvbuf, BUFSIZE);
+ sprintf(sendbuf, "FETCH_LIVE_IP_SP_BP %d", bt->tc->processor);
+ if (remote_tcp_write_string(pc->sockfd, sendbuf))
+ return 0;
+ errflag = remote_tcp_read_string(pc->sockfd, recvbuf, BUFSIZE-1, NIL_MODE());
+ if (errflag <= 0)
+ return 0;
+
+ if (CRASHDEBUG(1))
+ fprintf(fp, "get_remote_regs(cpu=%d): [%s]\n",
+ bt->tc->processor, recvbuf);
+
+ if (strstr(recvbuf, "<FAIL>")) {
+ error(INFO, "get_remote_regs for CPU %d\n", bt->tc->processor);
+ return 0;
+ }
+ p1 = strtok(recvbuf, " "); /* FETCH_LIVE_IP_SP_BP */
+ p1 = strtok(NULL, " "); /* cpu */
+ p1 = strtok(NULL, ":"); /* cs */
+ p1 = strtok(NULL, " "); /* ip */
+ p2 = strtok(NULL, ":"); /* ss */
+ p2 = strtok(NULL, " "); /* sp */
+ /* p2 = strtok(NULL, " "); bp */
+
+ errflag = 0;
+ value = htol(p1, RETURN_ON_ERROR|QUIET, &errflag);
+ if (!errflag) {
+ *eip = value;
+ }
+
+ errflag = 0;
+ value = htol(p2, RETURN_ON_ERROR|QUIET, &errflag);
+ if (!errflag) {
+ *esp = value;
+ }
+ return 1;
+}
+
+/*
*
* Set up the file descriptors and file name strings if they haven't
* been set up before:
--
1.8.4
7:33 p.m.
New subject: [PATCH v2 6/7] Add get_remote_cr3
From: Don Slutz <dslutz(a)verizon.com>
Signed-off-by: Don Slutz <dslutz(a)verizon.com>
---
defs.h | 1 +
remote.c | 39 +++++++++++++++++++++++++++++++++++++++
2 files changed, 40 insertions(+)
diff --git a/defs.h b/defs.h
index de10b70..dae9662 100755
--- a/defs.h
+++ b/defs.h
@@ -5530,6 +5530,7 @@ int is_remote_daemon(char *);
physaddr_t get_remote_phys_base(physaddr_t, physaddr_t);
physaddr_t remote_vtop(int, physaddr_t);
int get_remote_regs(struct bt_info *, ulong *, ulong *);
+physaddr_t get_remote_cr3(int);
void remote_fd_init(void);
int get_remote_file(struct remote_file *);
uint remote_page_size(void);
diff --git a/remote.c b/remote.c
index b8a00a7..621942e 100755
--- a/remote.c
+++ b/remote.c
@@ -2446,6 +2446,45 @@ get_remote_regs(struct bt_info *bt, ulong *eip, ulong *esp)
}
/*
+ * Get a remote cr3 if supported.
+ */
+physaddr_t
+get_remote_cr3(int cpu)
+{
+ char sendbuf[BUFSIZE];
+ char recvbuf[BUFSIZE];
+ char *p1;
+ int errflag;
+ ulong value;
+
+ if (!rc->remote_type[0])
+ return 0; /* Not a special remote. */
+
+ BZERO(sendbuf, BUFSIZE);
+ BZERO(recvbuf, BUFSIZE);
+ sprintf(sendbuf, "FETCH_LIVE_CR3 %d", cpu);
+ if (remote_tcp_write_string(pc->sockfd, sendbuf))
+ return 0;
+ remote_tcp_read_string(pc->sockfd, recvbuf, BUFSIZE-1, NIL_MODE());
+
+ if (CRASHDEBUG(1))
+ fprintf(fp, "get_remote_cr3: [%s]\n", recvbuf);
+
+ if (strstr(recvbuf, "<FAIL>"))
+ error(FATAL, "get_remote_cr3 for CPU %d\n", cpu);
+ p1 = strtok(recvbuf, " "); /* FETCH_LIVE_CR3 */
+ p1 = strtok(NULL, " "); /* cpu */
+ p1 = strtok(NULL, " "); /* cr3 */
+
+ errflag = 0;
+ value = htol(p1, RETURN_ON_ERROR|QUIET, &errflag);
+ if (!errflag)
+ return value;
+ return 0;
+}
+
+
+/*
*
* Set up the file descriptors and file name strings if they haven't
* been set up before:
--
1.8.4
7:33 p.m.
New subject: [PATCH v2 7/7] Add support for non-live remote.
From: Don Slutz <dslutz(a)verizon.com>
This is accessed via:
crash localhost:5991,/dev/xenmem /usr/lib/debug/lib/modules/2.6.18-128.el5/vmlinux
Signed-off-by: Don Slutz <dslutz(a)verizon.com>
---
kernel.c | 3 +++
memory.c | 2 +-
remote.c | 11 ++++++++---
3 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/kernel.c b/kernel.c
index 9c181ee..822094a 100755
--- a/kernel.c
+++ b/kernel.c
@@ -4677,6 +4677,9 @@ display_sys_stats(void)
if (REMOTE_DUMPFILE())
fprintf(fp, "%s@%s (remote dumpfile)",
pc->server_memsrc, pc->server);
+ else if (REMOTE_PAUSED())
+ fprintf(fp, "%s@%s (remote paused system)\n",
+ pc->server_memsrc, pc->server);
else {
if (dumpfile_is_split())
show_split_dumpfiles();
diff --git a/memory.c b/memory.c
index 707e784..cf8da2c 100755
--- a/memory.c
+++ b/memory.c
@@ -14903,7 +14903,7 @@ memory_page_size(void)
if (machdep->pagesize)
return machdep->pagesize;
- if (REMOTE_MEMSRC())
+ if (REMOTE_MEMSRC() || REMOTE_PAUSED())
return remote_page_size();
switch (pc->flags & MEMORY_SOURCES)
diff --git a/remote.c b/remote.c
index 621942e..5dc88ad 100755
--- a/remote.c
+++ b/remote.c
@@ -1947,8 +1947,13 @@ is_remote_daemon(char *dp)
sprintf(sendbuf, "NIL");
remote_tcp_write_string(pc->sockfd, sendbuf);
remote_tcp_read_string(pc->sockfd, recvbuf, BUFSIZE-1, 0);
- if (!strstr(recvbuf, "<FAIL>"))
+ if (!strstr(recvbuf, "<FAIL>")) {
rc->flags |= NIL_FLAG;
+ p1 = strtok(recvbuf, " "); /* NIL */
+ p1 = strtok(NULL, " "); /* remote type */
+ if (p1 && p1[0] != 'L')
+ pc->flags2 |= REM_PAUSED_F;
+ }
/*
* Get the remote machine type and verify a match. The daemon pid
* is also used as a live system initial context.
@@ -3212,6 +3217,8 @@ remote_page_size(void)
if (REMOTE_ACTIVE())
sprintf(sendbuf, "PAGESIZE LIVE");
+ else if (REMOTE_PAUSED())
+ sprintf(sendbuf, "PAGESIZE NIL");
else if (pc->flags & REM_NETDUMP)
sprintf(sendbuf, "PAGESIZE NETDUMP");
else if (pc->flags & REM_MCLXCD)
@@ -3242,8 +3249,6 @@ remote_page_size(void)
if (p2) {
strncpy(rc->remote_type, p2, sizeof(rc->remote_type) - 1);
rc->remote_type[sizeof(rc->remote_type) - 1] = 0;
- if (rc->remote_type[0] != 'L')
- pc->flags2 |= REM_PAUSED_F;
}
if (p3)
rc->n_cpus = atoi(p3);
--
1.8.4
3876
days inactive
3876
days old
devel@lists.crash-utility.osci.io
7 comments
1 participants
participants (1)
-
Don Slutz