git: badf44cc2124 - main - mbuf: provide m_freemp()
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 04 Jun 2024 00:23:17 UTC
The branch main has been updated by glebius:
URL: https://cgit.FreeBSD.org/src/commit/?id=badf44cc21249a56e7d822a77acfdd21f8352d50
commit badf44cc21249a56e7d822a77acfdd21f8352d50
Author: Gleb Smirnoff <glebius@FreeBSD.org>
AuthorDate: 2024-06-04 00:22:07 +0000
Commit: Gleb Smirnoff <glebius@FreeBSD.org>
CommitDate: 2024-06-04 00:23:06 +0000
mbuf: provide m_freemp()
This function follows both m_nextpkt and m_next linkage freeing all mbufs.
Note that existing m_freem() follows only m_next.
Reviewed by: khng
Differential Revision: https://reviews.freebsd.org/D45477
---
sys/kern/kern_mbuf.c | 19 +++++++++++++++++++
sys/kern/uipc_mbuf.c | 3 +++
sys/sys/mbuf.h | 2 ++
3 files changed, 24 insertions(+)
diff --git a/sys/kern/kern_mbuf.c b/sys/kern/kern_mbuf.c
index 44b6584f7331..5c1c5b095449 100644
--- a/sys/kern/kern_mbuf.c
+++ b/sys/kern/kern_mbuf.c
@@ -1591,6 +1591,25 @@ m_freem(struct mbuf *mb)
mb = m_free(mb);
}
+/*
+ * Free an entire chain of mbufs and associated external buffers, following
+ * both m_next and m_nextpkt linkage.
+ * Note: doesn't support NULL argument.
+ */
+void
+m_freemp(struct mbuf *m)
+{
+ struct mbuf *n;
+
+ MBUF_PROBE1(m__freemp, m);
+ do {
+ n = m->m_nextpkt;
+ while (m != NULL)
+ m = m_free(m);
+ m = n;
+ } while (m != NULL);
+}
+
/*
* Temporary primitive to allow freeing without going through m_free.
*/
diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c
index d3389aeeccaf..d6b38cf8fbc8 100644
--- a/sys/kern/uipc_mbuf.c
+++ b/sys/kern/uipc_mbuf.c
@@ -111,6 +111,9 @@ SDT_PROBE_DEFINE1_XLATE(sdt, , , m__free,
SDT_PROBE_DEFINE1_XLATE(sdt, , , m__freem,
"struct mbuf *", "mbufinfo_t *");
+SDT_PROBE_DEFINE1_XLATE(sdt, , , m__freemp,
+ "struct mbuf *", "mbufinfo_t *");
+
#include <security/mac/mac_framework.h>
/*
diff --git a/sys/sys/mbuf.h b/sys/sys/mbuf.h
index 741ae1b7c387..6e8454ea62d6 100644
--- a/sys/sys/mbuf.h
+++ b/sys/sys/mbuf.h
@@ -65,6 +65,7 @@ SDT_PROBE_DECLARE(sdt, , , m__cljget);
SDT_PROBE_DECLARE(sdt, , , m__cljset);
SDT_PROBE_DECLARE(sdt, , , m__free);
SDT_PROBE_DECLARE(sdt, , , m__freem);
+SDT_PROBE_DECLARE(sdt, , , m__freemp);
#endif /* _KERNEL */
@@ -843,6 +844,7 @@ void m_extadd(struct mbuf *, char *, u_int, m_ext_free_t,
u_int m_fixhdr(struct mbuf *);
struct mbuf *m_fragment(struct mbuf *, int, int);
void m_freem(struct mbuf *);
+void m_freemp(struct mbuf *);
void m_free_raw(struct mbuf *);
struct mbuf *m_get2(int, int, short, int);
struct mbuf *m_get3(int, int, short, int);