From owner-freebsd-current@FreeBSD.ORG Mon Jun 7 21:47:02 2004 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 0364116A4D1; Mon, 7 Jun 2004 21:47:02 +0000 (GMT) Received: from cell.sick.ru (cell.sick.ru [217.72.144.68]) by mx1.FreeBSD.org (Postfix) with ESMTP id 37CF743D1D; Mon, 7 Jun 2004 21:47:01 +0000 (GMT) (envelope-from glebius@cell.sick.ru) Received: from cell.sick.ru (glebius@localhost [127.0.0.1]) by cell.sick.ru (8.12.9/8.12.8) with ESMTP id i57LkRvw024407 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 8 Jun 2004 01:46:28 +0400 (MSD) (envelope-from glebius@cell.sick.ru) Received: (from glebius@localhost) by cell.sick.ru (8.12.9/8.12.6/Submit) id i57LkRYo024406; Tue, 8 Jun 2004 01:46:27 +0400 (MSD) Date: Tue, 8 Jun 2004 01:46:27 +0400 From: Gleb Smirnoff To: Brian Feldman , Julian Elischer Message-ID: <20040607214627.GA24142@cell.sick.ru> References: <20040607160206.G854@pukruppa.net> <20040607172132.GA22717@cell.sick.ru> <20040607205827.GD20308@green.homeunix.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="ZPt4rx8FFjLCG7dd" Content-Disposition: inline In-Reply-To: <20040607205827.GD20308@green.homeunix.org> User-Agent: Mutt/1.5.6i cc: Peter Ulrich Kruppa cc: FreeBSD current users cc: Bosko Milekic cc: net@FreeBSD.org Subject: check for M_DONTWAIT in NG_MKMESSAGE 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: Mon, 07 Jun 2004 21:47:02 -0000 --ZPt4rx8FFjLCG7dd Content-Type: text/plain; charset=koi8-r Content-Disposition: inline On Mon, Jun 07, 2004 at 04:58:27PM -0400, Brian Feldman wrote: B> > Seems like you problem is caused (indirectly) by mbuma import. See B> > B> > http://lists.freebsd.org/pipermail/freebsd-current/2004-June/028153.html B> > B> > Perhaps Bosko has more comments. B> B> Please try removing both KASSERT() calls from NG_MKMESSAGE() in B> src/sys/sys/ng_message.h, and then rebuild (and unload and reload) B> all netgraph modules. The KASSERT() lines appear to be entirely B> bogus now. Agreed. After mbuma import the first KASSERT() definitely must be removed. Julian, take a look at this. It must be fixed ASAP. -- Totus tuus, Glebius. GLEBIUS-RIPN GLEB-RIPE --ZPt4rx8FFjLCG7dd Content-Type: text/plain; charset=koi8-r Content-Disposition: attachment; filename="ng_message.h.diff" Index: ng_message.h =================================================================== RCS file: /home/ncvs/src/sys/netgraph/ng_message.h,v retrieving revision 1.22 diff -u -r1.22 ng_message.h --- ng_message.h 26 Jan 2004 14:05:31 -0000 1.22 +++ ng_message.h 7 Jun 2004 21:45:06 -0000 @@ -371,8 +371,6 @@ */ #define NG_MKMESSAGE(msg, cookie, cmdid, len, how) \ do { \ - KASSERT(!(how & M_DONTWAIT), \ - ("NG_MKMESSAGE() with how=M_DONTWAIT (%d)\n", how)); \ KASSERT(!(how & M_TRYWAIT), \ ("NG_MKMESSAGE() with how=M_TRYWAIT (%d)\n", how)); \ MALLOC((msg), struct ng_mesg *, sizeof(struct ng_mesg) \ --ZPt4rx8FFjLCG7dd--