From owner-dev-commits-src-main@freebsd.org Wed Jul 7 11:08:13 2021
Return-Path: <owner-dev-commits-src-main@freebsd.org>
Delivered-To: dev-commits-src-main@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 EF68A6539A4;
Wed, 7 Jul 2021 11:08:13 +0000 (UTC) (envelope-from git@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 "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4GKc996BYnz4fQ0;
Wed, 7 Jul 2021 11:08:13 +0000 (UTC) (envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:5])
(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 did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BC043439D;
Wed, 7 Jul 2021 11:08:13 +0000 (UTC) (envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 167B8Dou032105;
Wed, 7 Jul 2021 11:08:13 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 167B8DZZ032104;
Wed, 7 Jul 2021 11:08:13 GMT (envelope-from git)
Date: Wed, 7 Jul 2021 11:08:13 GMT
Message-Id: <202107071108.167B8DZZ032104@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Mateusz Guzik <mjg@FreeBSD.org>
Subject: git: 0a718a6e6eba - main - mbuf: replace all direct
uma_zfree(zone_mbuf) calls with m_free_raw
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: mjg
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 0a718a6e6ebaa1b8442123df8bdbae5a04a77987
Auto-Submitted: auto-generated
X-BeenThere: dev-commits-src-main@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: Commit messages for the main branch of the src repository
<dev-commits-src-main.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-src-main>,
<mailto:dev-commits-src-main-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-src-main/>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Help: <mailto:dev-commits-src-main-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main>,
<mailto:dev-commits-src-main-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Jul 2021 11:08:14 -0000
The branch main has been updated by mjg:
URL: https://cgit.FreeBSD.org/src/commit/?id=0a718a6e6ebaa1b8442123df8bdbae5a04a77987
commit 0a718a6e6ebaa1b8442123df8bdbae5a04a77987
Author: Mateusz Guzik <mjg@FreeBSD.org>
AuthorDate: 2021-07-06 16:44:35 +0000
Commit: Mateusz Guzik <mjg@FreeBSD.org>
CommitDate: 2021-07-07 11:05:46 +0000
mbuf: replace all direct uma_zfree(zone_mbuf) calls with m_free_raw
Reviewed by: donner
Sponsored by: Rubicon Communications, LLC ("Netgate")
Differential Revision: https://reviews.freebsd.org/D31082
---
sys/kern/kern_mbuf.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/sys/kern/kern_mbuf.c b/sys/kern/kern_mbuf.c
index 2333bf887354..c43f086bb83f 100644
--- a/sys/kern/kern_mbuf.c
+++ b/sys/kern/kern_mbuf.c
@@ -1191,19 +1191,19 @@ mb_free_ext(struct mbuf *m)
break;
case EXT_CLUSTER:
uma_zfree(zone_clust, m->m_ext.ext_buf);
- uma_zfree(zone_mbuf, mref);
+ m_free_raw(mref);
break;
case EXT_JUMBOP:
uma_zfree(zone_jumbop, m->m_ext.ext_buf);
- uma_zfree(zone_mbuf, mref);
+ m_free_raw(mref);
break;
case EXT_JUMBO9:
uma_zfree(zone_jumbo9, m->m_ext.ext_buf);
- uma_zfree(zone_mbuf, mref);
+ m_free_raw(mref);
break;
case EXT_JUMBO16:
uma_zfree(zone_jumbo16, m->m_ext.ext_buf);
- uma_zfree(zone_mbuf, mref);
+ m_free_raw(mref);
break;
case EXT_SFBUF:
case EXT_NET_DRV:
@@ -1212,7 +1212,7 @@ mb_free_ext(struct mbuf *m)
KASSERT(mref->m_ext.ext_free != NULL,
("%s: ext_free not set", __func__));
mref->m_ext.ext_free(mref);
- uma_zfree(zone_mbuf, mref);
+ m_free_raw(mref);
break;
case EXT_EXTREF:
KASSERT(m->m_ext.ext_free != NULL,
@@ -1230,7 +1230,7 @@ mb_free_ext(struct mbuf *m)
}
if (freembuf && m != mref)
- uma_zfree(zone_mbuf, m);
+ m_free_raw(m);
}
/*
@@ -1268,11 +1268,11 @@ mb_free_extpg(struct mbuf *m)
ktls_enqueue_to_free(mref);
else
#endif
- uma_zfree(zone_mbuf, mref);
+ m_free_raw(mref);
}
if (m != mref)
- uma_zfree(zone_mbuf, m);
+ m_free_raw(m);
}
/*
@@ -1364,7 +1364,7 @@ m_get2(int size, int how, short type, int flags)
n = uma_zalloc_arg(zone_jumbop, m, how);
if (n == NULL) {
- uma_zfree(zone_mbuf, m);
+ m_free_raw(m);
return (NULL);
}
@@ -1395,7 +1395,7 @@ m_getjcl(int how, short type, int flags, int size)
zone = m_getzone(size);
n = uma_zalloc_arg(zone, m, how);
if (n == NULL) {
- uma_zfree(zone_mbuf, m);
+ m_free_raw(m);
return (NULL);
}
MBUF_PROBE5(m__getjcl, how, type, flags, size, m);