Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755425AbZFJQQv (ORCPT ); Wed, 10 Jun 2009 12:16:51 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751165AbZFJQQn (ORCPT ); Wed, 10 Jun 2009 12:16:43 -0400 Received: from courier.cs.helsinki.fi ([128.214.9.1]:56441 "EHLO mail.cs.helsinki.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751552AbZFJQQn (ORCPT ); Wed, 10 Jun 2009 12:16:43 -0400 Subject: Re: [Bug #13319] Page allocation failures with b43 and p54usb From: Pekka Enberg To: Johannes Berg Cc: Larry Finger , David Rientjes , Mel Gorman , Rik van Riel , "Rafael J. Wysocki" , Linux Kernel Mailing List , Kernel Testers List , Andrew Morton , KOSAKI Motohiro , KAMEZAWA Hiroyuki , Christoph Lameter , npiggin@suse.de, yanmin.zhang@linux.intel.com In-Reply-To: <1244649174.6165.0.camel@johannes.local> References: <4A2BBC30.2030300@lwfinger.net> <84144f020906070640rf5ab14nbf66d3ca7c97675f@mail.gmail.com> <4A2BCC6F.8090004@redhat.com> <84144f020906070732l31786156r5d9753a0cabfde79@mail.gmail.com> <20090608101739.GA15377@csn.ul.ie> <84144f020906080352k57f12ff9pbd696da5f332ac1a@mail.gmail.com> <20090608110303.GD15377@csn.ul.ie> <20090608141212.GE15070@csn.ul.ie> <1244531201.5024.3.camel@penberg-laptop> <1244534315.5024.34.camel@penberg-laptop> <1244536124.5024.41.camel@penberg-laptop> <4A2FC62C.6030407@lwfinger.net> <1244648659.23799.26.camel@penberg-laptop> <1244648968.23799.27.camel@penberg-laptop> <1244649174.6165.0.camel@johannes.local> Date: Wed, 10 Jun 2009 19:16:44 +0300 Message-Id: <1244650604.23799.35.camel@penberg-laptop> Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 7bit X-Mailer: Evolution 2.24.3 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1866 Lines: 61 On Wed, 2009-06-10 at 18:49 +0300, Pekka Enberg wrote: > > On Wed, 2009-06-10 at 18:44 +0300, Pekka Enberg wrote: > > > > > Aha, SLUB thinks the minimum order for 4096 is 1. I guess you have > > > CONFIG_SLUB_DEBUG enabled? If yes, something like to following should > > > help. Christoph, are you okay with this patch? On Wed, 2009-06-10 at 17:52 +0200, Johannes Berg wrote: > > + if ((size + MAX_DEBUG_SIZE) >= PAGE_SIZE) > > && size <= PAGE_SIZE > > ? Or is this a path that only happens for small allocations? > > > + s->flags &= ~(SLAB_POISON|SLAB_RED_ZONE|SLAB_STORE_USER); > > + > > if (!calculate_sizes(s, -1)) > > goto error; Although something like this would probably be even nicer. Pekka diff --git a/mm/slub.c b/mm/slub.c index 65ffda5..a4206ef 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -2334,6 +2334,16 @@ static int calculate_sizes(struct kmem_cache *s, int forced_order) } +#define MAX_DEBUG_SIZE (3 * sizeof(void *) + 2 * sizeof(struct track)) + +static bool must_disable_debug(size_t size) +{ + /* + * Disable debugging if it increases the minimum page order. + */ + return get_order(size + MAX_DEBUG_SIZE) > get_order(size); +} + static int kmem_cache_open(struct kmem_cache *s, gfp_t gfpflags, const char *name, size_t size, size_t align, unsigned long flags, @@ -2346,6 +2356,9 @@ static int kmem_cache_open(struct kmem_cache *s, gfp_t gfpflags, s->align = align; s->flags = kmem_cache_flags(size, flags, name, ctor); + if (must_disable_debug(size)) + s->flags &= ~(SLAB_POISON|SLAB_RED_ZONE|SLAB_STORE_USER); + if (!calculate_sizes(s, -1)) goto error; -- 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/