sync with OpenBSD -current
This commit is contained in:
parent
bf0d2e284c
commit
c0feaae94d
GPG key ID:
F42C07F07E2E35B7
70 changed files with 792 additions and 1025 deletions
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: kern_sysctl.c,v 1.445 2024/08/26 08:24:25 mvs Exp $ */
|
||||
/* $OpenBSD: kern_sysctl.c,v 1.446 2024/08/29 10:44:40 bluhm Exp $ */
|
||||
/* $NetBSD: kern_sysctl.c,v 1.17 1996/05/20 17:49:05 mrg Exp $ */
|
||||
|
||||
/*-
|
||||
|
|
@ -530,7 +530,6 @@ kern_sysctl(int *name, u_int namelen, void *oldp, size_t *oldlenp, void *newp,
|
|||
return (sysctl_rdstruct(oldp, oldlenp, newp, &bt, sizeof bt));
|
||||
}
|
||||
case KERN_MBSTAT: {
|
||||
extern struct cpumem *mbstat;
|
||||
uint64_t counters[MBSTAT_COUNT];
|
||||
struct mbstat mbs;
|
||||
unsigned int i;
|
||||
|
|
@ -543,6 +542,12 @@ kern_sysctl(int *name, u_int namelen, void *oldp, size_t *oldlenp, void *newp,
|
|||
mbs.m_drops = counters[MBSTAT_DROPS];
|
||||
mbs.m_wait = counters[MBSTAT_WAIT];
|
||||
mbs.m_drain = counters[MBSTAT_DRAIN];
|
||||
mbs.m_defrag_alloc = counters[MBSTAT_DEFRAG_ALLOC];
|
||||
mbs.m_prepend_alloc = counters[MBSTAT_PREPEND_ALLOC];
|
||||
mbs.m_pullup_alloc = counters[MBSTAT_PULLUP_ALLOC];
|
||||
mbs.m_pullup_copy = counters[MBSTAT_PULLUP_COPY];
|
||||
mbs.m_pulldown_alloc = counters[MBSTAT_PULLDOWN_ALLOC];
|
||||
mbs.m_pulldown_copy = counters[MBSTAT_PULLDOWN_COPY];
|
||||
|
||||
return (sysctl_rdstruct(oldp, oldlenp, newp,
|
||||
&mbs, sizeof(mbs)));
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: uipc_mbuf.c,v 1.290 2024/03/05 18:52:41 bluhm Exp $ */
|
||||
/* $OpenBSD: uipc_mbuf.c,v 1.291 2024/08/29 10:44:40 bluhm Exp $ */
|
||||
/* $NetBSD: uipc_mbuf.c,v 1.15.4.1 1996/06/13 17:11:44 cgd Exp $ */
|
||||
|
||||
/*
|
||||
|
|
@ -234,8 +234,6 @@ struct mbuf *
|
|||
m_get(int nowait, int type)
|
||||
{
|
||||
struct mbuf *m;
|
||||
struct counters_ref cr;
|
||||
uint64_t *counters;
|
||||
int s;
|
||||
|
||||
KASSERT(type >= 0 && type < MT_NTYPES);
|
||||
|
|
@ -245,9 +243,7 @@ m_get(int nowait, int type)
|
|||
return (NULL);
|
||||
|
||||
s = splnet();
|
||||
counters = counters_enter(&cr, mbstat);
|
||||
counters[type]++;
|
||||
counters_leave(&cr, mbstat);
|
||||
counters_inc(mbstat, type);
|
||||
splx(s);
|
||||
|
||||
m->m_type = type;
|
||||
|
|
@ -267,8 +263,6 @@ struct mbuf *
|
|||
m_gethdr(int nowait, int type)
|
||||
{
|
||||
struct mbuf *m;
|
||||
struct counters_ref cr;
|
||||
uint64_t *counters;
|
||||
int s;
|
||||
|
||||
KASSERT(type >= 0 && type < MT_NTYPES);
|
||||
|
|
@ -278,9 +272,7 @@ m_gethdr(int nowait, int type)
|
|||
return (NULL);
|
||||
|
||||
s = splnet();
|
||||
counters = counters_enter(&cr, mbstat);
|
||||
counters[type]++;
|
||||
counters_leave(&cr, mbstat);
|
||||
counters_inc(mbstat, type);
|
||||
splx(s);
|
||||
|
||||
m->m_type = type;
|
||||
|
|
@ -417,17 +409,13 @@ struct mbuf *
|
|||
m_free(struct mbuf *m)
|
||||
{
|
||||
struct mbuf *n;
|
||||
struct counters_ref cr;
|
||||
uint64_t *counters;
|
||||
int s;
|
||||
|
||||
if (m == NULL)
|
||||
return (NULL);
|
||||
|
||||
s = splnet();
|
||||
counters = counters_enter(&cr, mbstat);
|
||||
counters[m->m_type]--;
|
||||
counters_leave(&cr, mbstat);
|
||||
counters_dec(mbstat, m->m_type);
|
||||
splx(s);
|
||||
|
||||
n = m->m_next;
|
||||
|
|
@ -557,6 +545,7 @@ m_defrag(struct mbuf *m, int how)
|
|||
|
||||
KASSERT(m->m_flags & M_PKTHDR);
|
||||
|
||||
counters_inc(mbstat, MBSTAT_DEFRAG_ALLOC);
|
||||
if ((m0 = m_gethdr(how, m->m_type)) == NULL)
|
||||
return (ENOBUFS);
|
||||
if (m->m_pkthdr.len > MHLEN) {
|
||||
|
|
@ -616,6 +605,7 @@ m_prepend(struct mbuf *m, int len, int how)
|
|||
m->m_data -= len;
|
||||
m->m_len += len;
|
||||
} else {
|
||||
counters_inc(mbstat, MBSTAT_PREPEND_ALLOC);
|
||||
MGET(mn, how, m->m_type);
|
||||
if (mn == NULL) {
|
||||
m_freem(m);
|
||||
|
|
@ -956,8 +946,8 @@ m_pullup(struct mbuf *m0, int len)
|
|||
memmove(head, mtod(m0, caddr_t), m0->m_len);
|
||||
m0->m_data = head;
|
||||
}
|
||||
|
||||
len -= m0->m_len;
|
||||
counters_inc(mbstat, MBSTAT_PULLUP_COPY);
|
||||
} else {
|
||||
/* the first mbuf is too small or read-only, make a new one */
|
||||
space = adj + len;
|
||||
|
|
@ -968,6 +958,7 @@ m_pullup(struct mbuf *m0, int len)
|
|||
m0->m_next = m;
|
||||
m = m0;
|
||||
|
||||
counters_inc(mbstat, MBSTAT_PULLUP_ALLOC);
|
||||
MGET(m0, M_DONTWAIT, m->m_type);
|
||||
if (m0 == NULL)
|
||||
goto bad;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: uipc_mbuf2.c,v 1.45 2020/12/12 11:48:54 jan Exp $ */
|
||||
/* $OpenBSD: uipc_mbuf2.c,v 1.47 2024/08/29 16:42:30 bluhm Exp $ */
|
||||
/* $KAME: uipc_mbuf2.c,v 1.29 2001/02/14 13:42:10 itojun Exp $ */
|
||||
/* $NetBSD: uipc_mbuf.c,v 1.40 1999/04/01 00:23:25 thorpej Exp $ */
|
||||
|
||||
|
|
@ -66,6 +66,7 @@
|
|||
#include <sys/systm.h>
|
||||
#include <sys/malloc.h>
|
||||
#include <sys/pool.h>
|
||||
#include <sys/percpu.h>
|
||||
#include <sys/mbuf.h>
|
||||
|
||||
extern struct pool mtagpool;
|
||||
|
|
@ -117,6 +118,7 @@ m_pulldown(struct mbuf *m, int off, int len, int *offp)
|
|||
if (len <= n->m_len - off) {
|
||||
struct mbuf *mlast;
|
||||
|
||||
counters_inc(mbstat, MBSTAT_PULLDOWN_ALLOC);
|
||||
o = m_dup1(n, off, n->m_len - off, M_DONTWAIT);
|
||||
if (o == NULL) {
|
||||
m_freem(m);
|
||||
|
|
@ -158,6 +160,7 @@ m_pulldown(struct mbuf *m, int off, int len, int *offp)
|
|||
*/
|
||||
if ((off == 0 || offp) && m_trailingspace(n) >= tlen &&
|
||||
!sharedcluster) {
|
||||
counters_inc(mbstat, MBSTAT_PULLDOWN_COPY);
|
||||
m_copydata(n->m_next, 0, tlen, mtod(n, caddr_t) + n->m_len);
|
||||
n->m_len += tlen;
|
||||
m_adj(n->m_next, tlen);
|
||||
|
|
@ -167,7 +170,8 @@ m_pulldown(struct mbuf *m, int off, int len, int *offp)
|
|||
!sharedcluster && n->m_next->m_len >= tlen) {
|
||||
n->m_next->m_data -= hlen;
|
||||
n->m_next->m_len += hlen;
|
||||
memmove(mtod(n->m_next, caddr_t), mtod(n, caddr_t) + off, hlen);
|
||||
counters_inc(mbstat, MBSTAT_PULLDOWN_COPY);
|
||||
memcpy(mtod(n->m_next, caddr_t), mtod(n, caddr_t) + off, hlen);
|
||||
n->m_len -= hlen;
|
||||
n = n->m_next;
|
||||
off = 0;
|
||||
|
|
@ -182,6 +186,7 @@ m_pulldown(struct mbuf *m, int off, int len, int *offp)
|
|||
m_freem(m);
|
||||
return (NULL);
|
||||
}
|
||||
counters_inc(mbstat, MBSTAT_PULLDOWN_ALLOC);
|
||||
MGET(o, M_DONTWAIT, m->m_type);
|
||||
if (o && len > MLEN) {
|
||||
MCLGETL(o, M_DONTWAIT, len);
|
||||
|
|
@ -196,7 +201,7 @@ m_pulldown(struct mbuf *m, int off, int len, int *offp)
|
|||
}
|
||||
/* get hlen from <n, off> into <o, 0> */
|
||||
o->m_len = hlen;
|
||||
memmove(mtod(o, caddr_t), mtod(n, caddr_t) + off, hlen);
|
||||
memcpy(mtod(o, caddr_t), mtod(n, caddr_t) + off, hlen);
|
||||
n->m_len -= hlen;
|
||||
/* get tlen from <n->m_next, 0> into <o, hlen> */
|
||||
m_copydata(n->m_next, 0, tlen, mtod(o, caddr_t) + o->m_len);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue