From owner-svn-src-head@freebsd.org Sun Jun 21 04:59:03 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8DC57341A8E; Sun, 21 Jun 2020 04:59:03 +0000 (UTC) (envelope-from jeff@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49qL133910z4NBM; Sun, 21 Jun 2020 04:59:03 +0000 (UTC) (envelope-from jeff@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 67A4717FDB; Sun, 21 Jun 2020 04:59:03 +0000 (UTC) (envelope-from jeff@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05L4x3wO041631; Sun, 21 Jun 2020 04:59:03 GMT (envelope-from jeff@FreeBSD.org) Received: (from jeff@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05L4x3p8041630; Sun, 21 Jun 2020 04:59:03 GMT (envelope-from jeff@FreeBSD.org) Message-Id: <202006210459.05L4x3p8041630@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jeff set sender to jeff@FreeBSD.org using -f From: Jeff Roberson Date: Sun, 21 Jun 2020 04:59:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r362459 - head/sys/kern X-SVN-Group: head X-SVN-Commit-Author: jeff X-SVN-Commit-Paths: head/sys/kern X-SVN-Commit-Revision: 362459 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 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: Sun, 21 Jun 2020 04:59:03 -0000 Author: jeff Date: Sun Jun 21 04:59:02 2020 New Revision: 362459 URL: https://svnweb.freebsd.org/changeset/base/362459 Log: Use zone nomenclature that is consistent with UMA. Modified: head/sys/kern/kern_mbuf.c Modified: head/sys/kern/kern_mbuf.c ============================================================================== --- head/sys/kern/kern_mbuf.c Sun Jun 21 03:39:26 2020 (r362458) +++ head/sys/kern/kern_mbuf.c Sun Jun 21 04:59:02 2020 (r362459) @@ -73,12 +73,12 @@ __FBSDID("$FreeBSD$"); * Zone. The Zone can be capped at kern.ipc.nmbclusters, if the * administrator so desires. * - * Mbufs are allocated from a UMA Master Zone called the Mbuf + * Mbufs are allocated from a UMA Primary Zone called the Mbuf * Zone. * * Additionally, FreeBSD provides a Packet Zone, which it - * configures as a Secondary Zone to the Mbuf Master Zone, - * thus sharing backend Slab kegs with the Mbuf Master Zone. + * configures as a Secondary Zone to the Mbuf Primary Zone, + * thus sharing backend Slab kegs with the Mbuf Primary Zone. * * Thus common-case allocations and locking are simplified: * @@ -87,7 +87,7 @@ __FBSDID("$FreeBSD$"); * | .------------>[(Packet Cache)] m_get(), m_gethdr() * | | [ Packet ] | * [(Cluster Cache)] [ Secondary ] [ (Mbuf Cache) ] - * [ Cluster Zone ] [ Zone ] [ Mbuf Master Zone ] + * [ Cluster Zone ] [ Zone ] [ Mbuf Primary Zone ] * | \________ | * [ Cluster Keg ] \ / * | [ Mbuf Keg ] @@ -101,7 +101,7 @@ __FBSDID("$FreeBSD$"); * for any deallocation through uma_zfree() the _dtor_ function * is executed. * - * Caches are per-CPU and are filled from the Master Zone. + * Caches are per-CPU and are filled from the Primary Zone. * * Whenever an object is allocated from the underlying global * memory pool it gets pre-initialized with the _zinit_ functions. @@ -611,7 +611,7 @@ debugnet_mbuf_reinit(int nmbuf, int nclust, int clsize #endif /* DEBUGNET */ /* - * Constructor for Mbuf master zone. + * Constructor for Mbuf primary zone. * * The 'arg' pointer points to a mb_args structure which * contains call-specific information required to support the @@ -646,7 +646,7 @@ mb_ctor_mbuf(void *mem, int size, void *arg, int how) } /* - * The Mbuf master zone destructor. + * The Mbuf primary zone destructor. */ static void mb_dtor_mbuf(void *mem, int size, void *arg)