From owner-cvs-src-old@FreeBSD.ORG Sat Nov 20 04:55:17 2010 Return-Path: Delivered-To: cvs-src-old@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D7DC1106576F for ; Sat, 20 Nov 2010 04:55:17 +0000 (UTC) (envelope-from rstone@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9177F8FC12 for ; Sat, 20 Nov 2010 04:55:11 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id oAK4tBl6062970 for ; Sat, 20 Nov 2010 04:55:11 GMT (envelope-from rstone@repoman.freebsd.org) Received: (from svn2cvs@localhost) by repoman.freebsd.org (8.14.4/8.14.4/Submit) id oAK4tBmJ062969 for cvs-src-old@freebsd.org; Sat, 20 Nov 2010 04:55:11 GMT (envelope-from rstone@repoman.freebsd.org) Message-Id: <201011200455.oAK4tBmJ062969@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to rstone@repoman.freebsd.org using -f From: Ryan Stone Date: Sat, 20 Nov 2010 04:54:58 +0000 (UTC) To: cvs-src-old@freebsd.org X-FreeBSD-CVS-Branch: RELENG_8 Subject: cvs commit: src/sys/vm vm_mmap.c X-BeenThere: cvs-src-old@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: **OBSOLETE** CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Nov 2010 04:55:17 -0000 rstone 2010-11-20 04:54:58 UTC FreeBSD src repository Modified files: (Branch: RELENG_8) sys/vm vm_mmap.c Log: SVN rev 215551 on 2010-11-20 04:54:58Z by rstone MFC r212281 and 212282 In munmap() downgrade the vm_map_lock to a read lock before taking a read lock on the pmc-sx lock. This prevents a deadlock with pmc_log_process_mappings, which has an exclusive lock on pmc-sx and tries to get a read lock on a vm_map. Downgrading the vm_map_lock in munmap allows pmc_log_process_mappings to continue, preventing the deadlock. Without this change I could cause a deadlock on a multicore 8.1-RELEASE system by having one thread constantly mmap'ing and then munmap'ing a PROT_EXEC mapping in a loop while I repeatedly invoked and stopped pmcstat in system-wide sampling mode. Approved by: emaste (mentor) Revision Changes Path 1.233.2.6 +11 -3 src/sys/vm/vm_mmap.c