Date: Thu, 16 Jan 2014 23:21:29 +0200 From: Mikolaj Golub <trociny@FreeBSD.org> To: Craig Rodrigues <rodrigc@FreeBSD.org> Cc: Devin Teske <dteske@freebsd.org>, FreeBSD stable <freebsd-stable@freebsd.org>, "Teske, Devin" <Devin.Teske@fisglobal.com> Subject: Re: MFC r258588: Fix for VIMAGE Message-ID: <20140116212128.GA11477@gmail.com> In-Reply-To: <CAG=rPVdByXCHELtWZE8h28=KLYXMS6rKUBtgARjUzq1_jn8GUg@mail.gmail.com> References: <4BDBE950-849D-4FBF-9F62-F08200A22F15@fisglobal.com> <20140112121802.GA16750@gmail.com> <CAG=rPVdByXCHELtWZE8h28=KLYXMS6rKUBtgARjUzq1_jn8GUg@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sun, Jan 12, 2014 at 04:20:32PM -0800, Craig Rodrigues wrote: > On Sun, Jan 12, 2014 at 4:18 AM, Mikolaj Golub <trociny@freebsd.org> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140116212128.GA11477>