From owner-p4-projects@FreeBSD.ORG  Sat Jun  8 17:10:22 2013
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id 44FC8393; Sat,  8 Jun 2013 17:10:22 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 071C8391
 for <perforce@freebsd.org>; Sat,  8 Jun 2013 17:10:22 +0000 (UTC)
 (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
 [IPv6:2001:1900:2254:2068::682:0])
 by mx1.freebsd.org (Postfix) with ESMTP id EB5D81725
 for <perforce@freebsd.org>; Sat,  8 Jun 2013 17:10:21 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r58HALnw047017
 for <perforce@freebsd.org>; Sat, 8 Jun 2013 17:10:21 GMT
 (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r58HALbv047014
 for perforce@freebsd.org; Sat, 8 Jun 2013 17:10:21 GMT
 (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sat, 8 Jun 2013 17:10:21 GMT
Message-Id: <201306081710.r58HALbv047014@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 229510 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: Sat, 08 Jun 2013 17:10:22 -0000

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

Change 229510 by rwatson@rwatson_cinnamon on 2013/06/08 17:09:41

	Add a new tesla-kernel.h that will have useful FreeBSD kernel-specific
	TESLA definitions, such as TESLA_SYSCALL(), TESLA_VM_FAULT(), etc.
	
	Use this in ffs_vnops.c.

Affected files ...

.. //depot/projects/ctsrd/tesla/src/sys/sys/tesla-kernel.h#1 add
.. //depot/projects/ctsrd/tesla/src/sys/ufs/ffs/ffs_vnops.c#8 edit

Differences ...

==== //depot/projects/ctsrd/tesla/src/sys/ufs/ffs/ffs_vnops.c#8 (text+ko) ====

@@ -80,8 +80,11 @@
 #include <sys/vmmeter.h>
 #include <sys/vnode.h>
 
+#include <security/mac/mac_framework.h>
+
 #include <tesla.h>
 #include <tesla-macros.h>
+#include <sys/tesla-kernel.h>
 
 #include <vm/vm.h>
 #include <vm/vm_param.h>
@@ -409,17 +412,7 @@
 #endif
 }
 
-#ifdef TESLA
 /*
- * XXXRW: It would be nice if we didn't have to do this.
- */
-#include <security/mac/mac_framework.h>
-
-void syscall(void);		/* Varies by arch but we only need symbol. */
-#define	TESLA_SYSCALL(x)	TESLA_WITHIN(syscall, x)
-#endif
-
-/*
  * Vnode op for reading.
  */
 static int
@@ -447,6 +440,8 @@
 	vp = ap->a_vp;
 	TESLA_SYSCALL(previously(mac_vnode_check_read(ANY(ptr), ANY(ptr), vp)
 	    == 0));
+	TESLA_VM_FAULT(previously(mac_vnode_check_read(ANY(ptr), ANY(ptr), vp)
+	    == 0));
 
 	uio = ap->a_uio;
 	ioflag = ap->a_ioflag;
@@ -671,6 +666,8 @@
 	vp = ap->a_vp;
 	TESLA_SYSCALL(previously(mac_vnode_check_write(ANY(ptr), ANY(ptr), vp)
 	    == 0));
+	TESLA_VM_FAULT(previously(mac_vnode_check_WRITE(ANY(ptr), ANY(ptr),
+	    vp) == 0));
 
 	uio = ap->a_uio;
 	ioflag = ap->a_ioflag;