From owner-freebsd-stable@FreeBSD.ORG Mon Jan 13 00:20:35 2014 Return-Path: Delivered-To: freebsd-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 43958B77; Mon, 13 Jan 2014 00:20:35 +0000 (UTC) Received: from mail-la0-x229.google.com (mail-la0-x229.google.com [IPv6:2a00:1450:4010:c03::229]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 651F81ED7; Mon, 13 Jan 2014 00:20:34 +0000 (UTC) Received: by mail-la0-f41.google.com with SMTP id mc6so900328lab.0 for ; Sun, 12 Jan 2014 16:20:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:cc:content-type; bh=2+PWiZ8ywYbwEmPzIwgpxBPOvAutf14Y5SX4NhFPtDU=; b=qnxaQI8hQZg7wCDAe/diiigTCTaCpPVZ1qJBg30K1b38rgkezBik7mEeJ6fQWWUXMU LB37b1SvEeoJ9YSAX6lWGs6ehnzTZfX3NrlZKw0wzLPprxg5zRN1APnN3rHNwREZYBY5 z21zeU8Y9K/S8C4o6FYzsoXvdStxwovMeSMjcB2O4PeEOXSSW28MHhWj634t0DcopNs6 JxCppm5+3oLCywf12URFCDpDq8Ul6PX+xynNOw3ipbihFx0JPIrwYe/kTQvx0I1SkqiT 3E45Yf3WaHxnqLcbgPC3PHwMDnpxLPZZyBGqiCkMPDm/F3M7eoTfPaYKM1SoLbC3xvzf 6d9Q== MIME-Version: 1.0 X-Received: by 10.152.44.133 with SMTP id e5mr9136480lam.37.1389572432308; Sun, 12 Jan 2014 16:20:32 -0800 (PST) Sender: crodr001@gmail.com Received: by 10.112.38.43 with HTTP; Sun, 12 Jan 2014 16:20:32 -0800 (PST) In-Reply-To: <20140112121802.GA16750@gmail.com> References: <4BDBE950-849D-4FBF-9F62-F08200A22F15@fisglobal.com> <20140112121802.GA16750@gmail.com> Date: Sun, 12 Jan 2014 16:20:32 -0800 X-Google-Sender-Auth: H-GGGFCdD2WCEIi4ncXm-_-rsio Message-ID: Subject: Re: MFC r258588: Fix for VIMAGE From: Craig Rodrigues To: Mikolaj Golub Content-Type: text/plain; charset=ISO-8859-1 X-Content-Filtered-By: Mailman/MimeDel 2.1.17 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: Mon, 13 Jan 2014 00:20:35 -0000 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. -- Craig