Return-Path: <linux-kernel-owner+willy=40w.ods.org@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id <S312619AbSGFTDm>; Sat, 6 Jul 2002 15:03:42 -0400
Received: (majordomo@vger.kernel.org) by vger.kernel.org
	id <S313687AbSGFTDl>; Sat, 6 Jul 2002 15:03:41 -0400
Received: from neon-gw-l3.transmeta.com ([63.209.4.196]:51462 "EHLO
	neon-gw.transmeta.com") by vger.kernel.org with ESMTP
	id <S312619AbSGFTDk>; Sat, 6 Jul 2002 15:03:40 -0400
Date: Sat, 6 Jul 2002 12:06:55 -0700 (PDT)
From: Linus Torvalds <torvalds@transmeta.com>
To: Andrew Morton <akpm@zip.com.au>
cc: Rik van Riel <riel@conectiva.com.br>, <linux-kernel@vger.kernel.org>,
       <linux-mm@kvack.org>
Subject: Re: [PATCH][RFT](2) minimal rmap for 2.5 - akpm tested
In-Reply-To: <3D268E19.B68559F6@zip.com.au>
Message-ID: <Pine.LNX.4.44.0207061205001.1157-100000@home.transmeta.com>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
Sender: linux-kernel-owner@vger.kernel.org
X-Mailing-List: linux-kernel@vger.kernel.org
Content-Length: 1385
Lines: 48



On Fri, 5 Jul 2002, Andrew Morton wrote:
>
> The box died, but not due to rmap.  We have a lock ranking
> bug:
>
>         do_exit
>         ->mmput
>           ->exit_mmap                           page_table_lock
>             ->removed_shared_vm_struct
>               ->lock_vma_mappings               i_shared_lock

I _think_ we should just move the remove_shared_vm_struct() down into the
case where we're closing the mapping, ie something like the appended.

That way we _only_ do the actual page table stuff under the page table
lock, and do all the generic VM/FS stuff outside the lock.

Comments?

		Linus

-------------------------------
--- 1.34/mm/mmap.c	Thu Jun 27 00:35:55 2002
+++ edited/mm/mmap.c	Sat Jul  6 12:06:02 2002
@@ -1121,7 +1121,6 @@
 		unsigned long end = mpnt->vm_end;

 		mm->map_count--;
-		remove_shared_vm_struct(mpnt);
 		unmap_page_range(tlb, mpnt, start, end);
 		mpnt = mpnt->vm_next;
 	}
@@ -1148,6 +1147,7 @@
 	 */
 	while (mpnt) {
 		struct vm_area_struct * next = mpnt->vm_next;
+		remove_shared_vm_struct(mpnt);
 		if (mpnt->vm_ops) {
 			if (mpnt->vm_ops->close)
 				mpnt->vm_ops->close(mpnt);

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/