From owner-freebsd-current@FreeBSD.ORG Mon Apr 21 22:40:24 2003 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 35B5037B401 for ; Mon, 21 Apr 2003 22:40:24 -0700 (PDT) Received: from mail26d.sbc-webhosting.com (mail26d.sbc-webhosting.com [216.173.237.132]) by mx1.FreeBSD.org (Postfix) with SMTP id 8F12F43FB1 for ; Mon, 21 Apr 2003 22:40:23 -0700 (PDT) (envelope-from alc@imimic.com) Received: from www.imimic.com (64.143.12.21) by mail26d.sbc-webhosting.com (RS ver 1.0.80vs) with SMTP id 05616712 for ; Tue, 22 Apr 2003 01:40:12 -0400 (EDT) Sender: alc@FreeBSD.ORG Message-ID: <3EA4D5BC.34EC5D38@imimic.com> Date: Tue, 22 Apr 2003 00:40:12 -0500 From: "Alan L. Cox" Organization: iMimic Networking, Inc. X-Mailer: Mozilla 4.8 [en] (X11; U; Linux 2.4.2 i386) X-Accept-Language: en MIME-Version: 1.0 To: current@freebsd.org Content-Type: multipart/mixed; boundary="------------B2DB37A6A514B8F67896A61F" X-Loop-Detect: 1 Subject: [Fwd: cvs commit: src/sys/vm vm_page.c] X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Apr 2003 05:40:24 -0000 This is a multi-part message in MIME format. --------------B2DB37A6A514B8F67896A61F Content-Type: text/plain; charset=x-user-defined Content-Transfer-Encoding: 7bit This should remedy the kernel panics due to an assertion failure in vm_page.c that various people have reported. Regards, Alan --------------B2DB37A6A514B8F67896A61F Content-Type: message/rfc822 Content-Transfer-Encoding: 7bit Content-Disposition: inline Received: from mx2.freebsd.org (216.136.204.119)0186649777 for ; Tue, 22 Apr 2003 01:36:17 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id C4E9E557C5 for ; Mon, 21 Apr 2003 22:36:17 -0700 (PDT) (envelope-from owner-src-committers@FreeBSD.org) Received: by hub.freebsd.org (Postfix) id A131A37B407; Mon, 21 Apr 2003 22:36:17 -0700 (PDT) Delivered-To: alc@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 538) id 7801237B404; Mon, 21 Apr 2003 22:36:17 -0700 (PDT) Delivered-To: src-committers@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5937A37B401; Mon, 21 Apr 2003 22:36:15 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EB6D943FB1; Mon, 21 Apr 2003 22:36:14 -0700 (PDT) (envelope-from alc@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h3M5aE0U092339; Mon, 21 Apr 2003 22:36:14 -0700 (PDT) (envelope-from alc@repoman.freebsd.org) Received: (from alc@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3M5aEF6092335; Mon, 21 Apr 2003 22:36:14 -0700 (PDT) Message-Id: <200304220536.h3M5aEF6092335@repoman.freebsd.org> From: Alan Cox Date: Mon, 21 Apr 2003 22:36:14 -0700 (PDT) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/sys/vm vm_page.c X-FreeBSD-CVS-Branch: HEAD Sender: owner-src-committers@FreeBSD.org Precedence: bulk X-Loop: FreeBSD.ORG X-Loop-Detect: 1 X-Mozilla-Status2: 00000000 alc 2003/04/21 22:36:14 PDT FreeBSD src repository Modified files: sys/vm vm_page.c Log: Revision 1.52 of vm/uma_core.c has led to UMA's obj_alloc() being called without Giant; and obj_alloc() in turn calls vm_page_alloc() without Giant. This causes an assertion failure in vm_page_alloc(). Fortunately, obj_alloc() is now MPSAFE. So, we need only clean up some assertions. - Weaken the assertion in vm_page_lookup() to require Giant only if the vm_object isn't locked. - Remove an assertion from vm_page_alloc() that duplicates a check performed in vm_page_lookup(). In collaboration with: gallatin, jake, jeff Revision Changes Path 1.246 +2 -3 src/sys/vm/vm_page.c --------------B2DB37A6A514B8F67896A61F--