From owner-freebsd-stable@FreeBSD.ORG Thu Jan 16 21:21:35 2014 Return-Path: Delivered-To: freebsd-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 563788A3; Thu, 16 Jan 2014 21:21:35 +0000 (UTC) Received: from mail-bk0-x22a.google.com (mail-bk0-x22a.google.com [IPv6:2a00:1450:4008:c01::22a]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 8A3761A7C; Thu, 16 Jan 2014 21:21:34 +0000 (UTC) Received: by mail-bk0-f42.google.com with SMTP id my12so1376629bkb.15 for ; Thu, 16 Jan 2014 13:21:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=nfpzaKIoYmkswWuIBUvEQTLR5Jl5y9xt54Ex5/qYv6U=; b=rtXkQiC/lQbiFtFYKThdEysBS/J1hRUxedXureh9i1Geo5lYoNcqAgFfAuHZ0EGj1z ZLtieBXlm1rwpody+dFfCHfRtgQtXjnKhnmsskAS72etxNjsoiDyyOBx6DQLAWZJMgUT h5WLXJV+zmns2LqNRG4eUhnE07li7J+S7Kd8VEtw9Xw8xILsz+TupbaM3sYv/gj/bKoG Vw1j3/cALhB75mk4YBCRY1kwtgFirKsFpWIJuPbX3YFzfqlUFhU4EeurSFKnrSV8OF+1 Px9cp4zbb1TGiDxWx+sFNz3hlkS8FcPSlGojTRChOvVZlb38T/rOrtzwY/liUNIHSM1o sfUA== X-Received: by 10.204.118.131 with SMTP id v3mr6656788bkq.30.1389907292736; Thu, 16 Jan 2014 13:21:32 -0800 (PST) Received: from localhost ([178.150.115.244]) by mx.google.com with ESMTPSA id q5sm7691869bkr.5.2014.01.16.13.21.31 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 16 Jan 2014 13:21:32 -0800 (PST) Sender: Mikolaj Golub Date: Thu, 16 Jan 2014 23:21:29 +0200 From: Mikolaj Golub To: Craig Rodrigues Subject: Re: MFC r258588: Fix for VIMAGE Message-ID: <20140116212128.GA11477@gmail.com> References: <4BDBE950-849D-4FBF-9F62-F08200A22F15@fisglobal.com> <20140112121802.GA16750@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.22 (2013-10-16) Cc: Devin Teske , FreeBSD stable , "Teske, Devin" X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Jan 2014 21:21:35 -0000 On Sun, Jan 12, 2014 at 04:20:32PM -0800, Craig Rodrigues wrote: > On Sun, Jan 12, 2014 at 4:18 AM, Mikolaj Golub wrote: > > > On Tue, Dec 31, 2013 at 12:12:47AM +0000, Teske, Devin wrote: > > > Hi, > > > > > > I recently updated from 9.2-R to stable/9 and found that many times while > > > attempting to shut down a vimage jail, that the box would crash. So I > > found > > > SVN r258588 in HEAD, merged it into my stable/9 kernel, rebooted.. and > > > problem is now solved. > > > > > > Any objects to merging r258588 to stable/9? > > > > Ah, it looks like I was responsible for that bug. Craig, thank you for > > fixing it. I think it should definitely be merged to stable/9. > > > > BTW, wouldn't increasing IPFW_NAT_VNET_ORDER instead of > > IPFW_NAT_SI_SUB_FIREWALL fix the issue? It looks a little better to me. > > Also, I think it would be good to have some coment in the code why > > this order was chosen. Or better -- to export startup order > > declarations from ip_fw2.c to ip_fw_private.h and use it for ip_fw_nat > > too, so it would become self-documenting and not break if one decides > > to change the ordering in ipfw module. > > > > > I tried to implement the least intrusive change to fix the problem, > since I am not so familiar with VIMAGE / VNET and module order loading > issues. > > If you have a cleaner fix in mind, I would say, go for it. Ok, I might update it later. But for now just merging r258588 to stable/9 would be helpful. Devin, as I understood, you wanted to merge it? Will you do this? -- Mikolaj Golub