From owner-p4-projects@FreeBSD.ORG Tue Sep 16 10:30:42 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2EB7416A4C0; Tue, 16 Sep 2003 10:30:42 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D1F5C16A4B3 for ; Tue, 16 Sep 2003 10:30:41 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5FCAF43FB1 for ; Tue, 16 Sep 2003 10:30:41 -0700 (PDT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h8GHUe0U021574 for ; Tue, 16 Sep 2003 10:30:40 -0700 (PDT) (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h8GHUem3021569 for perforce@freebsd.org; Tue, 16 Sep 2003 10:30:40 -0700 (PDT) Date: Tue, 16 Sep 2003 10:30:40 -0700 (PDT) Message-Id: <200309161730.h8GHUem3021569@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Subject: PERFORCE change 38136 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Sep 2003 17:30:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=38136 Change 38136 by areisse@areisse_tislabs on 2003/09/16 10:30:38 explicit lock ordering for sebsd Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/kern/subr_witness.c#7 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/kern/subr_witness.c#7 (text+ko) ==== @@ -267,8 +267,11 @@ { "uidinfo hash", &lock_class_mtx_sleep }, { "uidinfo struct", &lock_class_mtx_sleep }, { "allprison", &lock_class_mtx_sleep }, + { "SEBSD AVC", &lock_class_mtx_sleep }, - { "SEBSD Policy Lock", &lock_class_sx }, + { "SEBSD message lock", &lock_class_mtx_sleep }, + { "SEBSD policy lock", &lock_class_sx }, + { NULL, NULL }, /* * spin locks @@ -318,6 +321,7 @@ #if defined(__i386__) || defined(__amd64__) { "pcicfg", &lock_class_mtx_spin }, #endif + { NULL, NULL }, { NULL, NULL } }; @@ -375,6 +379,7 @@ /* * We have to release Giant before initializing its witness * structure so that WITNESS doesn't get confused. + */ mtx_unlock(&Giant); mtx_assert(&Giant, MA_NOTOWNED);