From owner-p4-projects@FreeBSD.ORG  Thu May  1 01:29:00 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 52F95106568D; Thu,  1 May 2008 01:29:00 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1350F106567D
	for <perforce@freebsd.org>; Thu,  1 May 2008 01:29:00 +0000 (UTC)
	(envelope-from peter-gmail@wemm.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id ED94C8FC15
	for <perforce@freebsd.org>; Thu,  1 May 2008 01:28:59 +0000 (UTC)
	(envelope-from peter-gmail@wemm.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m411Sxrk036345
	for <perforce@freebsd.org>; Thu, 1 May 2008 01:28:59 GMT
	(envelope-from peter-gmail@wemm.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m411Sxau036343
	for perforce@freebsd.org; Thu, 1 May 2008 01:28:59 GMT
	(envelope-from peter-gmail@wemm.org)
Date: Thu, 1 May 2008 01:28:59 GMT
Message-Id: <200805010128.m411Sxau036343@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter-gmail@wemm.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 140958 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 01 May 2008 01:29:00 -0000

http://perforce.freebsd.org/chv.cgi?CH=140958

Change 140958 by peter@peter_daintree on 2008/05/01 01:28:01

	Snapshot WIP

Affected files ...

.. //depot/projects/hammer/lib/libkvm/kvm_amd64.c#23 edit

Differences ...

==== //depot/projects/hammer/lib/libkvm/kvm_amd64.c#23 (text+ko) ====

@@ -75,6 +75,8 @@
 	void		*mmapbase;
 	size_t		mmapsize;
 	pml4_entry_t	*PML4;
+	int		mp_maxcpus;
+	struct pcpu	*pcpu;
 };
 
 /*
@@ -355,3 +357,58 @@
 	}
 	return (_kvm_vatop(kd, va, pa));
 }
+
+static int
+_kvm_initpcpu(kvm_t *kd)
+{
+	struct nlist nlist[2];
+	u_long pa;
+	struct vmstate *vm = kd->vmst;
+
+	nlist[0].n_name = "mp_maxcpus";
+	nlist[1].n_name = 0;
+	if (kvm_nlist(kd, nlist) == 0) {
+		if (kvm_read(kd, nlist[0].n_value, &vm->mp_maxcpus,
+		    sizeof(vm->mp_maxcpus)) != sizeof(vm->mp_maxcpus)) {
+			_kvm_err(kd, kd->program, "cannot read mp_maxcpus");
+	} else {
+		/* UP system; symbol doesn't exist */
+		vmst->mp_maxcpus = 1;
+	}
+	vm->pcpu = _kvm_malloc(kd, sizeof(struct pcpu) * vm->mp_maxcpus);
+
+	nlist[0].n_name = "pcpu";
+	nlist[1].n_name = 0;
+
+	if (kvm_nlist(kd, nlist) != 0) {
+		_kvm_err(kd, kd->program, "bad namelist - no pcpu");
+		return (-1);
+	}
+	if (kvm_read(kd, nlist[0].n_value, vm->pcpu,
+	    sizeof(struct pcpu) * vm->mp_maxcpus) !=
+	    sizeof(struct pcpu) * vm->mp_maxcpus) {
+		_kvm_err(kd, kd->program, "cannot read pcpu chunk");
+		return (-1);
+	}
+	return (0);
+}
+
+struct pcpu *
+kvm_pcpu_get(kvm_t *kd, int cpu)
+{
+	struct vmstate *vm = kd->vmst;
+
+	if (ISALIVE(kd)) {
+		_kvm_err(kd, kd->program, "kvm_initpcpu called in live kernel!");
+		return (NULL);
+	}
+	if (vm->mp_maxcpus == 0 || vm->pcpu == NULL) {
+		if (_kvm_initpcpu(kd) != 0)
+			return (NULL);
+	}
+
+	if (cpu < 0 ||  cpu > vm->vm_maxcpus)
+		_kvm_err(kd, kd->program, "
+		return (NULL);	/* EDOOFUS actually */
+	return (&vm->pcpu[cpu]);
+}