From owner-p4-projects@FreeBSD.ORG Sat Jan 26 07:36:51 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 02ECC16A419; Sat, 26 Jan 2008 07:36:51 +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 A48F416A417 for ; Sat, 26 Jan 2008 07:36:50 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7413E13C457 for ; Sat, 26 Jan 2008 07:36:50 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0Q7aovG047394 for ; Sat, 26 Jan 2008 07:36:50 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0Q7aoxB047391 for perforce@freebsd.org; Sat, 26 Jan 2008 07:36:50 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 26 Jan 2008 07:36:50 GMT Message-Id: <200801260736.m0Q7aoxB047391@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 134124 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Jan 2008 07:36:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=134124 Change 134124 by kmacy@pandemonium:kmacy:xen31 on 2008/01/26 07:35:55 assert that the multicalls succeed Affected files ... .. //depot/projects/xen31/sys/i386/xen/pmap.c#35 edit Differences ... ==== //depot/projects/xen31/sys/i386/xen/pmap.c#35 (text+ko) ==== @@ -1227,7 +1227,8 @@ int mclcount = 0; multicall_entry_t mcl[16]; multicall_entry_t *mclp = mcl; - + int error; + pte = vtopte(sva); endpte = pte + count; while (pte < endpte) { @@ -1245,13 +1246,17 @@ mclp++; mclcount++; if (mclcount == 16) { - HYPERVISOR_multicall(mcl, mclcount); + error = HYPERVISOR_multicall(mcl, mclcount); mclp = mcl; mclcount = 0; + KASSERT(error == 0, ("bad multicall %d", error)); } } - if (mclcount) - HYPERVISOR_multicall(mcl, mclcount); + if (mclcount) { + error = HYPERVISOR_multicall(mcl, mclcount); + KASSERT(error == 0, ("bad multicall %d", error)); + } + #ifdef INVARIANTS for (pte = vtopte(sva), mclcount = 0; mclcount < count; mclcount++, pte++) KASSERT(*pte, ("pte not set for va=0x%x\n", sva + mclcount*PAGE_SIZE)); @@ -2746,7 +2751,7 @@ vm_pindex_t diff, psize; multicall_entry_t mcl[16]; multicall_entry_t *mclp = mcl; - int count = 0; + int error, count = 0; VM_OBJECT_LOCK_ASSERT(m_start->object, MA_OWNED); psize = atop(end - start); @@ -2759,14 +2764,18 @@ prot, mpte); m = TAILQ_NEXT(m, listq); if (count == 16) { - HYPERVISOR_multicall(mcl, count); + error = HYPERVISOR_multicall(mcl, count); + KASSERT(error == 0, ("bad multicall %d", error)); mclp = mcl; count = 0; } } - if (count) - HYPERVISOR_multicall(mcl, count); - PMAP_UNLOCK(pmap); + if (count) { + error = HYPERVISOR_multicall(mcl, count); + KASSERT(error == 0, ("bad multicall %d", error)); + } + + PMAP_UNLOCK(pmap); } /* @@ -2795,7 +2804,7 @@ void pmap_enter_quick_range(pmap_t pmap, vm_offset_t *addrs, vm_page_t *pages, vm_prot_t *prots, int count) { - int i, index = 0; + int i, error, index = 0; multicall_entry_t mcl[16]; multicall_entry_t *mclp = mcl; @@ -2806,13 +2815,17 @@ (void) pmap_enter_quick_locked(&mclp, &index, pmap, *addrs, *pages, *prots, NULL); if (index == 16) { - HYPERVISOR_multicall(mcl, count); + error = HYPERVISOR_multicall(mcl, count); mclp = mcl; index = 0; + KASSERT(error == 0, ("bad multicall %d", error)); } } - if (index) - HYPERVISOR_multicall(mcl, index); + if (index) { + error = HYPERVISOR_multicall(mcl, index); + KASSERT(error == 0, ("bad multicall %d", error)); + } + PMAP_UNLOCK(pmap); }