From owner-p4-projects@FreeBSD.ORG  Tue Nov 13 21:15:12 2012
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id 008DF966; Tue, 13 Nov 2012 21:15:12 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id B6D33964
 for <perforce@freebsd.org>; Tue, 13 Nov 2012 21:15:11 +0000 (UTC)
 (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
 [IPv6:2001:4f8:fff6::2d])
 by mx1.freebsd.org (Postfix) with ESMTP id 9B3B28FC08
 for <perforce@freebsd.org>; Tue, 13 Nov 2012 21:15:11 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
 by skunkworks.freebsd.org (8.14.5/8.14.5) with ESMTP id qADLFBWo041137
 for <perforce@freebsd.org>; Tue, 13 Nov 2012 21:15:11 GMT
 (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.5/8.14.5/Submit) id qADLFBQZ041134
 for perforce@freebsd.org; Tue, 13 Nov 2012 21:15:11 GMT
 (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Tue, 13 Nov 2012 21:15:11 GMT
Message-Id: <201211132115.qADLFBQZ041134@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
Subject: PERFORCE change 219772 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.14
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/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: Tue, 13 Nov 2012 21:15:12 -0000

http://p4web.freebsd.org/@@219772?ac=10

Change 219772 by rwatson@rwatson_zenith_cl_cam_ac_uk on 2012/11/13 21:15:00

	When initialising the PCB of a new thread, use a CHERI copy
	routine so that tags are propagated.  This is ineffficient
	(we should use a capability-aware copy routine) but may well
	work.

Affected files ...

.. //depot/projects/ctsrd/cheribsd/src/sys/mips/mips/vm_machdep.c#6 edit

Differences ...

==== //depot/projects/ctsrd/cheribsd/src/sys/mips/mips/vm_machdep.c#6 (text+ko) ====

@@ -413,6 +413,16 @@
 	 */
 	bcopy(td0->td_pcb, pcb2, sizeof(*pcb2));
 
+#ifdef CPU_CHERI
+	/*
+	 * XXXRW: We're copying this memory twice -- once in the bcopy()
+	 * above, and once here using capabilities.  Once bcopy() is
+	 * capability-oblivious, we can lose this.
+	 */
+	cheri_context_copy(&pcb2->pcb_cheriframe,
+	    &td0->td_pcb->pcb_cheriframe);
+#endif
+
 	/*
 	 * Set registers for trampoline to user mode.
 	 */