PERFORCE change 79199 for review
Peter Wemm
peter at FreeBSD.org
Wed Jun 29 22:06:45 GMT 2005
http://perforce.freebsd.org/chv.cgi?CH=79199
Change 79199 by peter at peter_daintree on 2005/06/29 22:06:27
pre-commit cosmetic cleanups/syncups
Affected files ...
.. //depot/projects/hammer/lib/libkvm/kvm_amd64.c#17 edit
.. //depot/projects/hammer/lib/libkvm/kvm_i386.c#9 edit
Differences ...
==== //depot/projects/hammer/lib/libkvm/kvm_amd64.c#17 (text+ko) ====
@@ -224,7 +224,8 @@
if (vm->PML4 == 0) {
s = _kvm_pa2off(kd, va, pa);
if (s == 0) {
- _kvm_err(kd, kd->program, "_kvm_kvatop: bootstrap data not in dump");
+ _kvm_err(kd, kd->program,
+ "_kvm_vatop: bootstrap data not in dump");
goto invalid;
} else
return (PAGE_SIZE - offset);
@@ -233,28 +234,29 @@
pml4eindex = (va >> PML4SHIFT) & (NPML4EPG - 1);
pml4e = vm->PML4[pml4eindex];
if (((u_long)pml4e & PG_V) == 0) {
- _kvm_err(kd, kd->program, "_kvm_kvatop: pml4e not valid");
+ _kvm_err(kd, kd->program, "_kvm_vatop: pml4e not valid");
goto invalid;
}
pdpeindex = (va >> PDPSHIFT) & (NPDPEPG-1);
- pdpe_pa = ((u_long)pml4e & PG_FRAME) + (pdpeindex * sizeof(pdp_entry_t));
+ pdpe_pa = ((u_long)pml4e & PG_FRAME) +
+ (pdpeindex * sizeof(pdp_entry_t));
s = _kvm_pa2off(kd, pdpe_pa, &ofs);
if (s <= sizeof pdpe) {
- _kvm_err(kd, kd->program, "_kvm_kvatop: pdpe_pa not found");
+ _kvm_err(kd, kd->program, "_kvm_vatop: pdpe_pa not found");
goto invalid;
}
if (lseek(kd->pmfd, ofs, 0) == -1) {
- _kvm_syserr(kd, kd->program, "_kvm_kvatop: lseek pdpe_pa");
+ _kvm_syserr(kd, kd->program, "_kvm_vatop: lseek pdpe_pa");
goto invalid;
}
if (read(kd->pmfd, &pdpe, sizeof pdpe) != sizeof pdpe) {
- _kvm_syserr(kd, kd->program, "_kvm_kvatop: read pdpe");
+ _kvm_syserr(kd, kd->program, "_kvm_vatop: read pdpe");
goto invalid;
}
if (((u_long)pdpe & PG_V) == 0) {
- _kvm_err(kd, kd->program, "_kvm_kvatop: pdpe not valid");
+ _kvm_err(kd, kd->program, "_kvm_vatop: pdpe not valid");
goto invalid;
}
@@ -263,19 +265,19 @@
s = _kvm_pa2off(kd, pde_pa, &ofs);
if (s <= sizeof pde) {
- _kvm_syserr(kd, kd->program, "_kvm_kvatop: pde_pa not found");
+ _kvm_syserr(kd, kd->program, "_kvm_vatop: pde_pa not found");
goto invalid;
}
if (lseek(kd->pmfd, ofs, 0) == -1) {
- _kvm_err(kd, kd->program, "_kvm_kvatop: lseek pde_pa");
+ _kvm_err(kd, kd->program, "_kvm_vatop: lseek pde_pa");
goto invalid;
}
if (read(kd->pmfd, &pde, sizeof pde) != sizeof pde) {
- _kvm_syserr(kd, kd->program, "_kvm_kvatop: read pde");
+ _kvm_syserr(kd, kd->program, "_kvm_vatop: read pde");
goto invalid;
}
if (((u_long)pde & PG_V) == 0) {
- _kvm_err(kd, kd->program, "_kvm_kvatop: pde not valid");
+ _kvm_err(kd, kd->program, "_kvm_vatop: pde not valid");
goto invalid;
}
@@ -288,7 +290,8 @@
a = ((u_long)pde & PG_FRAME2M) + (va & PAGE2M_MASK);
s = _kvm_pa2off(kd, a, pa);
if (s == 0) {
- _kvm_err(kd, kd->program, "_kvm_kvatop: 2MB page address not in dump");
+ _kvm_err(kd, kd->program,
+ "_kvm_vatop: 2MB page address not in dump");
goto invalid;
} else
return (NBPDR - (va & PAGE2M_MASK));
@@ -299,26 +302,26 @@
s = _kvm_pa2off(kd, pte_pa, &ofs);
if (s <= sizeof pte) {
- _kvm_err(kd, kd->program, "_kvm_kvatop: pte_pa not found");
+ _kvm_err(kd, kd->program, "_kvm_vatop: pte_pa not found");
goto invalid;
}
if (lseek(kd->pmfd, ofs, 0) == -1) {
- _kvm_syserr(kd, kd->program, "_kvm_kvatop: lseek");
+ _kvm_syserr(kd, kd->program, "_kvm_vatop: lseek");
goto invalid;
}
if (read(kd->pmfd, &pte, sizeof pte) != sizeof pte) {
- _kvm_syserr(kd, kd->program, "_kvm_kvatop: read");
+ _kvm_syserr(kd, kd->program, "_kvm_vatop: read");
goto invalid;
}
if (((u_long)pte & PG_V) == 0) {
- _kvm_err(kd, kd->program, "_kvm_kvatop: pte not valid");
+ _kvm_err(kd, kd->program, "_kvm_vatop: pte not valid");
goto invalid;
}
a = ((u_long)pte & PG_FRAME) + offset;
s = _kvm_pa2off(kd, a, pa);
if (s == 0) {
- _kvm_err(kd, kd->program, "_kvm_kvatop: address not in dump");
+ _kvm_err(kd, kd->program, "_kvm_vatop: address not in dump");
goto invalid;
} else
return (PAGE_SIZE - offset);
@@ -331,10 +334,10 @@
int
_kvm_kvatop(kvm_t *kd, u_long va, off_t *pa)
{
+
if (ISALIVE(kd)) {
_kvm_err(kd, 0, "kvm_kvatop called in live kernel!");
return (0);
}
-
return (_kvm_vatop(kd, va, pa));
}
==== //depot/projects/hammer/lib/libkvm/kvm_i386.c#9 (text+ko) ====
@@ -268,22 +268,24 @@
pdeindex = va >> PDRSHIFT;
pde = PTD[pdeindex];
- if (((u_long)pde & PG_V) == 0)
+ if (((u_long)pde & PG_V) == 0) {
+ _kvm_err(kd, kd->program, "_kvm_vatop: pde not valid");
goto invalid;
+ }
if ((u_long)pde & PG_PS) {
/*
* No second-level page table; ptd describes one 4MB page.
* (We assume that the kernel wouldn't set PG_PS without enabling
- * it cr0, and that the kernel doesn't support 36-bit physical
- * addresses).
+ * it cr0).
*/
#define PAGE4M_MASK (NBPDR - 1)
#define PG_FRAME4M (~PAGE4M_MASK)
pde_pa = ((u_long)pde & PG_FRAME4M) + (va & PAGE4M_MASK);
s = _kvm_pa2off(kd, pde_pa, &ofs);
if (s <= sizeof pde) {
- _kvm_syserr(kd, kd->program, "_kvm_vatop: pde_pa not found");
+ _kvm_syserr(kd, kd->program,
+ "_kvm_vatop: pde_pa not found");
goto invalid;
}
*pa = ofs;
@@ -308,8 +310,10 @@
_kvm_syserr(kd, kd->program, "_kvm_vatop: read");
goto invalid;
}
- if (((u_long)pte & PG_V) == 0)
+ if (((u_long)pte & PG_V) == 0) {
+ _kvm_err(kd, kd->program, "_kvm_kvatop: pte not valid");
goto invalid;
+ }
a = ((u_long)pte & PG_FRAME) + offset;
s =_kvm_pa2off(kd, a, pa);
@@ -360,22 +364,24 @@
pdeindex = va >> PDRSHIFT_PAE;
pde = PTD[pdeindex];
- if (((u_long)pde & PG_V) == 0)
+ if (((u_long)pde & PG_V) == 0) {
+ _kvm_err(kd, kd->program, "_kvm_kvatop_pae: pde not valid");
goto invalid;
+ }
if ((u_long)pde & PG_PS) {
/*
* No second-level page table; ptd describes one 2MB page.
* (We assume that the kernel wouldn't set PG_PS without enabling
- * it cr0, and that the kernel doesn't support 36-bit physical
- * addresses).
+ * it cr0).
*/
#define PAGE2M_MASK (NBPDR_PAE - 1)
#define PG_FRAME2M (~PAGE2M_MASK)
pde_pa = ((u_long)pde & PG_FRAME2M) + (va & PAGE2M_MASK);
s = _kvm_pa2off(kd, pde_pa, &ofs);
if (s <= sizeof pde) {
- _kvm_syserr(kd, kd->program, "_kvm_vatop_pae: pde_pa not found");
+ _kvm_syserr(kd, kd->program,
+ "_kvm_vatop_pae: pde_pa not found");
goto invalid;
}
*pa = ofs;
@@ -400,13 +406,16 @@
_kvm_syserr(kd, kd->program, "_kvm_vatop_pae: read");
goto invalid;
}
- if (((uint64_t)pte & PG_V) == 0)
+ if (((uint64_t)pte & PG_V) == 0) {
+ _kvm_err(kd, kd->program, "_kvm_vatop_pae: pte not valid");
goto invalid;
+ }
a = ((uint64_t)pte & PG_FRAME_PAE) + offset;
s =_kvm_pa2off(kd, a, pa);
if (s == 0) {
- _kvm_err(kd, kd->program, "_kvm_vatop_pae: address not in dump");
+ _kvm_err(kd, kd->program,
+ "_kvm_vatop_pae: address not in dump");
goto invalid;
} else
return (PAGE_SIZE - offset);
@@ -419,11 +428,11 @@
int
_kvm_kvatop(kvm_t *kd, u_long va, uint64_t *pa)
{
+
if (ISALIVE(kd)) {
_kvm_err(kd, 0, "vatop called in live kernel!");
return (0);
}
-
if (kd->vmst->pae)
_kvm_vatop_pae(kd, va, pa);
else
More information about the p4-projects
mailing list