From owner-freebsd-current@FreeBSD.ORG  Wed Aug 11 04:40:33 2004
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
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 4241716A4CE; Wed, 11 Aug 2004 04:40:33 +0000 (GMT)
Received: from outbound0.sv.meer.net (outbound0.sv.meer.net [205.217.152.13])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 3377543D48; Wed, 11 Aug 2004 04:40:33 +0000 (GMT)
	(envelope-from gnn@neville-neil.com)
Received: from mail.meer.net (mail.meer.net [209.157.152.14])
	i7B4dvr8073497;	Tue, 10 Aug 2004 21:40:04 -0700 (PDT)
	(envelope-from gnn@neville-neil.com)
Received: from minion.local.neville-neil.com (h234.neville-neil.com
	[209.157.133.234] (may be forged))
	by mail.meer.net (8.12.10/8.12.2/meer) with ESMTP id i7B4dCuE039215;
	Tue, 10 Aug 2004 21:39:12 -0700 (PDT)
	(envelope-from gnn@neville-neil.com)
Date: Tue, 10 Aug 2004 21:39:09 -0700
Message-ID: <m2llgmi902.wl@minion.local.neville-neil.com>
From: "George V. Neville-Neil" <gnn@neville-neil.com>
To: Robert Watson <rwatson@freebsd.org>
In-Reply-To: <m2n012i9d2.wl@minion.local.neville-neil.com>
References: <7mbrhiibby.wl@black.imgsrc.co.jp>
	<Pine.NEB.3.96L.1040811001359.1357I-100000@fledge.watson.org>
	<m2n012i9d2.wl@minion.local.neville-neil.com>
User-Agent: Wanderlust/2.10.1 (Watching The Wheels) SEMI/1.14.5 (Awara-Onsen)
	FLIM/1.14.5 (Demachiyanagi) APEL/10.5 Emacs/21.2 (powerpc-apple-darwin)
	MULE/5.0 (SAKAKI)
MIME-Version: 1.0 (generated by SEMI 1.14.5 - "Awara-Onsen")
Content-Type: text/plain; charset=US-ASCII
cc: Jun Kuriyama <kuriyama@imgsrc.co.jp>
cc: Current <freebsd-current@freebsd.org>
Subject: Re: Sleeping in "rip6_output" with the following non-sleepable
	locks	held
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Aug 2004 04:40:33 -0000

At Tue, 10 Aug 2004 21:31:21 -0700,
George V. Neville-Neil wrote:
> 
> At Wed, 11 Aug 2004 00:14:49 -0400 (EDT),
> Robert Watson wrote:
> > 
> > 
> > On Wed, 11 Aug 2004, Jun Kuriyama wrote:
> > 
> > > This is today's -current on amd64 box:
> > 
> > Hmm.  There was a patch floating around for this based on my suggestion of
> > converting this to an M_DONTWAIT and then handling the error case, but I
> > don't seem to be able to find it in my mailbox.  Do you have a copy? 
> > 
> 
> I believe this is what you mean:
> 
> @@ -376,7 +377,12 @@
>  		code = icmp6->icmp6_code;
>  	}
>  
> -	M_PREPEND(m, sizeof(*ip6), M_TRYWAIT);
> +	M_PREPEND(m, sizeof(*ip6), M_DONTWAIT);
> +	if (m == NULL) {
> +		error = ENOBUFS;
> +		goto bad;
> +	}
> +
>  	ip6 = mtod(m, struct ip6_hdr *);
>  
>  	/*
> 

Sorry, forgot to put in the the name of the file.  It's 

sys/netinet6/raw_ip6.c

Later,
George