summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndriy Gapon <avg@FreeBSD.org>2017-01-18 14:13:28 +0000
committerAndriy Gapon <avg@FreeBSD.org>2017-01-18 14:13:28 +0000
commitad1d7256f28c46d2a19f5ca54becad8235efaf21 (patch)
tree99865ea3dbfb592781e8ab0380a14589a6549586
parent217e3389bc3e63fa79ce8d2a73aa64b60a347e93 (diff)
Notes
-rw-r--r--include/paths.h1
-rw-r--r--lib/libkvm/kvm.c54
-rw-r--r--lib/libkvm/kvm_private.h1
3 files changed, 49 insertions, 7 deletions
diff --git a/include/paths.h b/include/paths.h
index 3fa54dc108140..709e96d008b13 100644
--- a/include/paths.h
+++ b/include/paths.h
@@ -99,6 +99,7 @@
#define _PATH_VARDB "/var/db/"
#define _PATH_VARRUN "/var/run/"
#define _PATH_VARTMP "/var/tmp/"
+#define _PATH_DEVVMM "/dev/vmm/"
#define _PATH_YP "/var/yp/"
#define _PATH_UUCPLOCK "/var/spool/lock/"
diff --git a/lib/libkvm/kvm.c b/lib/libkvm/kvm.c
index 5ad8dcc67fe21..c8c34f287fb3d 100644
--- a/lib/libkvm/kvm.c
+++ b/lib/libkvm/kvm.c
@@ -429,8 +429,10 @@ _kvm_open(kvm_t *kd, const char *uf, const char *mf, int flag, char *errout)
return (kd);
}
}
+
/*
- * This is a crash dump.
+ * This is either a crash dump or a remote live system with its physical
+ * memory fully accessible via a special device.
* Open the namelist fd and determine the architecture.
*/
if ((kd->nlfd = open(uf, O_RDONLY | O_CLOEXEC, 0)) < 0) {
@@ -439,8 +441,11 @@ _kvm_open(kvm_t *kd, const char *uf, const char *mf, int flag, char *errout)
}
if (_kvm_read_kernel_ehdr(kd) < 0)
goto failed;
- if (strncmp(mf, _PATH_FWMEM, strlen(_PATH_FWMEM)) == 0)
+ if (strncmp(mf, _PATH_FWMEM, strlen(_PATH_FWMEM)) == 0 ||
+ strncmp(mf, _PATH_DEVVMM, strlen(_PATH_DEVVMM)) == 0) {
kd->rawdump = 1;
+ kd->writable = 1;
+ }
SET_FOREACH(parch, kvm_arch) {
if ((*parch)->ka_probe(kd)) {
kd->arch = *parch;
@@ -866,6 +871,15 @@ ssize_t
kvm_write(kvm_t *kd, u_long kva, const void *buf, size_t len)
{
int cc;
+ ssize_t cw;
+ off_t pa;
+ const char *cp;
+
+ if (!ISALIVE(kd) && !kd->writable) {
+ _kvm_err(kd, kd->program,
+ "kvm_write not implemented for dead kernels");
+ return (-1);
+ }
if (ISALIVE(kd)) {
/*
@@ -883,12 +897,38 @@ kvm_write(kvm_t *kd, u_long kva, const void *buf, size_t len)
} else if ((size_t)cc < len)
_kvm_err(kd, kd->program, "short write");
return (cc);
- } else {
- _kvm_err(kd, kd->program,
- "kvm_write not implemented for dead kernels");
- return (-1);
}
- /* NOTREACHED */
+
+ cp = buf;
+ while (len > 0) {
+ cc = kd->arch->ka_kvatop(kd, kva, &pa);
+ if (cc == 0)
+ return (-1);
+ if (cc > (ssize_t)len)
+ cc = len;
+ errno = 0;
+ if (lseek(kd->pmfd, pa, 0) == -1 && errno != 0) {
+ _kvm_syserr(kd, 0, _PATH_MEM);
+ break;
+ }
+ cw = write(kd->pmfd, cp, cc);
+ if (cw < 0) {
+ _kvm_syserr(kd, kd->program, "kvm_write");
+ break;
+ }
+ /*
+ * If ka_kvatop returns a bogus value or our core file is
+ * truncated, we might wind up seeking beyond the end of the
+ * core file in which case the read will return 0 (EOF).
+ */
+ if (cw == 0)
+ break;
+ cp += cw;
+ kva += cw;
+ len -= cw;
+ }
+
+ return (cp - (char *)buf);
}
int
diff --git a/lib/libkvm/kvm_private.h b/lib/libkvm/kvm_private.h
index 78b48458cd6fb..3a31120a9e23b 100644
--- a/lib/libkvm/kvm_private.h
+++ b/lib/libkvm/kvm_private.h
@@ -78,6 +78,7 @@ struct __kvm {
*/
struct vmstate *vmst;
int rawdump; /* raw dump format */
+ int writable; /* physical memory is writable */
int vnet_initialized; /* vnet fields set up */
kvaddr_t vnet_start; /* start of kernel's vnet region */