From owner-svn-src-head@freebsd.org Wed Oct 31 07:53:40 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E297B107C94C; Wed, 31 Oct 2018 07:53:40 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5256269DC6; Wed, 31 Oct 2018 07:53:40 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (localhost [127.0.0.1]) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3) with ESMTP id w9V7rUep064955; Wed, 31 Oct 2018 00:53:30 -0700 (PDT) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: (from freebsd@localhost) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3/Submit) id w9V7rT5F064954; Wed, 31 Oct 2018 00:53:29 -0700 (PDT) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <201810310753.w9V7rT5F064954@pdx.rh.CN85.dnsmgr.net> Subject: Re: svn commit: r339930 - head/sys/net In-Reply-To: <201810302045.w9UKjFEm082518@repo.freebsd.org> To: "Bjoern A. Zeeb" Date: Wed, 31 Oct 2018 00:53:29 -0700 (PDT) CC: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org, re@freebsd.org Reply-To: rgrimes@freebsd.org X-Mailer: ELM [version 2.4ME+ PL121h (25)] MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 31 Oct 2018 07:53:41 -0000 > Author: bz > Date: Tue Oct 30 20:45:15 2018 > New Revision: 339930 > URL: https://svnweb.freebsd.org/changeset/base/339930 > > Log: > With more excessive use of modules, more kernel parts working with > VIMAGE, and feature richness and global state increasing the 8k of > vnet module space are no longer sufficient for people and loading > multiple modules, e.g., pf(4) and ipl(4) or ipsec(4) will fail on > the second module. > > Increase the module space to 8 * PAGE_SIZE which should be enough > to hold multiple firewalls, ipsec, multicast (as in the old days was > a problem), epair, carp, and any kind of other vnet enabled modules. > > Sadly this is a global byte array part of the vnet_set, so we cannot > dynamically change its size; otherwise a TUNABLE would have been > a better solution. > > PR: 228854 > Reported by: Ernie Luzar, Marek Zarychta > Discussed with: rgrimes on current > MFC after: 3 days Pleaes fast track this, I would like to see this in before BETA3 is built on Nov 1st. Same with the better diagnostics commit that followed this. Thanks. Rod Modified: > head/sys/net/vnet.c > > Modified: head/sys/net/vnet.c > ============================================================================== > --- head/sys/net/vnet.c Tue Oct 30 20:08:48 2018 (r339929) > +++ head/sys/net/vnet.c Tue Oct 30 20:45:15 2018 (r339930) > @@ -171,7 +171,7 @@ static MALLOC_DEFINE(M_VNET_DATA, "vnet_data", "VNET d > * we want the virtualized global variable space to be page-sized, we may > * have more space than that in practice. > */ > -#define VNET_MODMIN 8192 > +#define VNET_MODMIN (8 * PAGE_SIZE) > #define VNET_SIZE roundup2(VNET_BYTES, PAGE_SIZE) > > /* > > -- Rod Grimes rgrimes@freebsd.org