Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755106AbXKETcP (ORCPT ); Mon, 5 Nov 2007 14:32:15 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752603AbXKETb7 (ORCPT ); Mon, 5 Nov 2007 14:31:59 -0500 Received: from netops-testserver-4-out.sgi.com ([192.48.171.29]:51628 "EHLO relay.sgi.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750830AbXKETb6 (ORCPT ); Mon, 5 Nov 2007 14:31:58 -0500 Date: Mon, 5 Nov 2007 11:31:58 -0800 (PST) From: Christoph Lameter X-X-Sender: clameter@schroedinger.engr.sgi.com To: Linus Torvalds cc: stable@kernel.org, Hugh Dickins , Oliv?r Pint?r , Andrew Morton , Willy Tarreau , linux-kernel@vger.kernel.org Subject: Re: [PATCH 1/2] slub: fix leakage In-Reply-To: Message-ID: References: <6101e8c40711031027x3f946b28p324dadeab7c1b2c3@mail.gmail.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: 2192 Lines: 65 On Mon, 5 Nov 2007, Linus Torvalds wrote: > > Here is the fix against 2.6.23: > > Will you send the equivalent one for the current -git tree? I already sent that on Saturday (also sent a version against mm which is a bit different now). Here is the version against git again: SLUB: Fix memory leak by not reusing cpu_slab Fix the memory leak that may occur when we attempt to reuse a cpu_slab that was allocated while we reenabled interrupts in order to be able to grow a slab cache. The per cpu freelist may contain objects and in that situation we may overwrite the per cpu freelist pointer loosing objects. This only occurs if we find that the concurrently allocated slab fits our allocation needs. If we simply always deactivate the slab then the freelist will be properly reintegrated and the memory leak will go away. Signed-off-by: Christoph Lameter --- mm/slub.c | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) Index: linux-2.6/mm/slub.c =================================================================== --- linux-2.6.orig/mm/slub.c 2007-11-03 11:41:58.000000000 -0700 +++ linux-2.6/mm/slub.c 2007-11-03 11:42:12.000000000 -0700 @@ -1511,26 +1511,8 @@ new_slab: if (new) { c = get_cpu_slab(s, smp_processor_id()); - if (c->page) { - /* - * Someone else populated the cpu_slab while we - * enabled interrupts, or we have gotten scheduled - * on another cpu. The page may not be on the - * requested node even if __GFP_THISNODE was - * specified. So we need to recheck. - */ - if (node_match(c, node)) { - /* - * Current cpuslab is acceptable and we - * want the current one since its cache hot - */ - discard_slab(s, new); - slab_lock(c->page); - goto load_freelist; - } - /* New slab does not fit our expectations */ + if (c->page) flush_slab(s, c); - } slab_lock(new); SetSlabFrozen(new); c->page = new; - 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/