Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/lib/libkvm Added support for sun2 kernel cores.



details:   https://anonhg.NetBSD.org/src/rev/133b42a87307
branches:  trunk
changeset: 510153:133b42a87307
user:      fredette <fredette%NetBSD.org@localhost>
date:      Mon May 21 14:56:29 2001 +0000

description:
Added support for sun2 kernel cores.

diffstat:

 lib/libkvm/Makefile   |    6 +-
 lib/libkvm/kvm_m68k.c |    3 +-
 lib/libkvm/kvm_m68k.h |    3 +-
 lib/libkvm/kvm_sun2.c |  192 ++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 199 insertions(+), 5 deletions(-)

diffs (249 lines):

diff -r 395eaf76671d -r 133b42a87307 lib/libkvm/Makefile
--- a/lib/libkvm/Makefile       Mon May 21 14:48:58 2001 +0000
+++ b/lib/libkvm/Makefile       Mon May 21 14:56:29 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.35 2001/01/08 18:30:03 bjh21 Exp $
+#      $NetBSD: Makefile,v 1.36 2001/05/21 14:56:29 fredette Exp $
 #      from: @(#)Makefile      8.1 (Berkeley) 6/4/93
 
 LIB=   kvm
@@ -23,8 +23,8 @@
 .endif
 
 # Additional modules needed for m68k
-.if (${MACHINE_ARCH} == "m68k")
-SRCS+= kvm_m68k_cmn.c kvm_sun3.c kvm_sun3x.c
+.if (${MACHINE_ARCH} == "m68k" || ${MACHINE_CPU} == "m68k")
+SRCS+= kvm_m68k_cmn.c kvm_sun2.c kvm_sun3.c kvm_sun3x.c
 .endif
 
 MAN=   kvm.3 kvm_dump.3 kvm_geterr.3 kvm_getfiles.3 kvm_getloadavg.3 \
diff -r 395eaf76671d -r 133b42a87307 lib/libkvm/kvm_m68k.c
--- a/lib/libkvm/kvm_m68k.c     Mon May 21 14:48:58 2001 +0000
+++ b/lib/libkvm/kvm_m68k.c     Mon May 21 14:56:29 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kvm_m68k.c,v 1.14 1998/01/17 15:14:03 veego Exp $      */
+/*     $NetBSD: kvm_m68k.c,v 1.15 2001/05/21 14:56:29 fredette Exp $   */
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -74,6 +74,7 @@
  * Match specific kcore types first, falling into a default.
  */
 static struct name_ops optbl[] = {
+       { "sun2",       &_kvm_ops_sun2 },
        { "sun3",       &_kvm_ops_sun3 },
        { "sun3x",      &_kvm_ops_sun3x },
        { NULL,         &_kvm_ops_cmn },
diff -r 395eaf76671d -r 133b42a87307 lib/libkvm/kvm_m68k.h
--- a/lib/libkvm/kvm_m68k.h     Mon May 21 14:48:58 2001 +0000
+++ b/lib/libkvm/kvm_m68k.h     Mon May 21 14:56:29 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kvm_m68k.h,v 1.2 1997/04/09 21:15:53 thorpej Exp $     */
+/*     $NetBSD: kvm_m68k.h,v 1.3 2001/05/21 14:56:29 fredette Exp $    */
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -51,5 +51,6 @@
 };
 
 extern struct kvm_ops _kvm_ops_cmn;
+extern struct kvm_ops _kvm_ops_sun2;
 extern struct kvm_ops _kvm_ops_sun3;
 extern struct kvm_ops _kvm_ops_sun3x;
diff -r 395eaf76671d -r 133b42a87307 lib/libkvm/kvm_sun2.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lib/libkvm/kvm_sun2.c     Mon May 21 14:56:29 2001 +0000
@@ -0,0 +1,192 @@
+/*     $NetBSD: kvm_sun2.c,v 1.1 2001/05/21 14:56:30 fredette Exp $ */
+
+/*-
+ * Copyright (c) 1992, 1993
+ *     The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software developed by the Computer Systems
+ * Engineering group at Lawrence Berkeley Laboratory under DARPA contract
+ * BG 91-66 and contributed to Berkeley.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+#if defined(LIBC_SCCS) && !defined(lint)
+#if 0
+static char sccsid[] = "@(#)kvm_sparc.c        8.1 (Berkeley) 6/4/93";
+#else
+__RCSID("$NetBSD: kvm_sun2.c,v 1.1 2001/05/21 14:56:30 fredette Exp $");
+#endif
+#endif /* LIBC_SCCS and not lint */
+
+/*
+ * Sun2 machine dependent routines for kvm.
+ *
+ * Note: This file has to build on ALL m68000 machines,
+ * so do NOT include any <machine / *.h> files here.
+ */
+
+#include <sys/types.h>
+#include <sys/kcore.h>
+
+#include <unistd.h>
+#include <limits.h>
+#include <nlist.h>
+#include <kvm.h>
+#include <db.h>
+
+#include <m68k/kcore.h>
+
+#include "kvm_private.h"
+#include "kvm_m68k.h"
+
+int   _kvm_sun2_initvtop __P((kvm_t *));
+void  _kvm_sun2_freevtop __P((kvm_t *));
+int      _kvm_sun2_kvatop   __P((kvm_t *, u_long, u_long *));
+off_t _kvm_sun2_pa2off   __P((kvm_t *, u_long));
+
+struct kvm_ops _kvm_ops_sun2 = {
+       _kvm_sun2_initvtop,
+       _kvm_sun2_freevtop,
+       _kvm_sun2_kvatop,
+       _kvm_sun2_pa2off };
+
+#define        _kvm_pg_pa(v, s, pte)   \
+       (((pte) & (s)->pg_frame) << (v)->pgshift)
+
+#define        _kvm_va_segnum(s, x)    \
+       ((u_int)(x) >> (s)->segshift)
+#define        _kvm_pte_num_mask(v)    \
+       (0xf << (v)->pgshift)
+#define        _kvm_va_pte_num(v, va)  \
+       (((va) & _kvm_pte_num_mask((v))) >> (v)->pgshift)
+
+/*
+ * XXX Re-define these here, no other place for them.
+ */
+#define        NKSEG           512     /* kernel segmap entries */
+#define        NPAGSEG         16      /* pages per segment */
+
+/* Finally, our local stuff... */
+struct private_vmstate {
+       /* Page Map Entry Group (PMEG) */
+       int   pmeg[NKSEG][NPAGSEG];
+};
+
+/*
+ * Prepare for translation of kernel virtual addresses into offsets
+ * into crash dump files. We use the MMU specific goop written at the
+ * beginning of a crash dump by dumpsys()
+ * Note: sun2 MMU specific!
+ */
+int
+_kvm_sun2_initvtop(kd)
+       kvm_t *kd;
+{
+       cpu_kcore_hdr_t *h = kd->cpu_data;
+       char *p;
+
+       p = kd->cpu_data;
+       p += (h->page_size - sizeof(kcore_seg_t));
+       kd->vmst->private = p;
+
+       return (0);
+}
+
+void
+_kvm_sun2_freevtop(kd)
+       kvm_t *kd;
+{
+       /* This was set by pointer arithmetic, not allocation. */
+       kd->vmst->private = (void*)0;
+}
+
+/*
+ * Translate a kernel virtual address to a physical address using the
+ * mapping information in kd->vm.  Returns the result in pa, and returns
+ * the number of bytes that are contiguously available from this
+ * physical address.  This routine is used only for crashdumps.
+ */
+int
+_kvm_sun2_kvatop(kd, va, pap)
+       kvm_t *kd;
+       u_long va;
+       u_long *pap;
+{
+       cpu_kcore_hdr_t *h = kd->cpu_data;
+       struct sun2_kcore_hdr *s = &h->un._sun2;
+       struct vmstate *v = kd->vmst;
+       struct private_vmstate *pv = v->private;
+       int pte, offset;
+       u_int segnum, sme, ptenum;
+       u_long pa;
+
+       if (ISALIVE(kd)) {
+               _kvm_err(kd, 0, "vatop called in live kernel!");
+               return(0);
+       }
+
+       if (va < h->kernbase) {
+               _kvm_err(kd, 0, "not a kernel address");
+               return(0);
+       }
+
+       /*
+        * Get the segmap entry (sme) from the kernel segmap.
+        * Note: only have segmap entries from KERNBASE to end.
+        */
+       segnum = _kvm_va_segnum(s, va - h->kernbase);
+       ptenum = _kvm_va_pte_num(v, va);
+       offset = va & v->pgofset;
+
+       /* The segmap entry selects a PMEG. */
+       sme = s->ksegmap[segnum];
+       pte = pv->pmeg[sme][ptenum];
+
+       if ((pte & (s)->pg_valid) == 0) {
+               _kvm_err(kd, 0, "page not valid (VA=0x%lx)", va);
+               return (0);
+       }
+       pa = _kvm_pg_pa(v, s, pte) + offset;
+
+       *pap = pa;
+       return (h->page_size - offset);
+}
+
+/*
+ * Translate a physical address to a file-offset in the crash-dump.
+ */
+off_t
+_kvm_sun2_pa2off(kd, pa)
+       kvm_t   *kd;
+       u_long  pa;
+{
+       return(kd->dump_off + pa);
+}



Home | Main Index | Thread Index | Old Index