 @@ -1,14 +1,14 @@
-/*	$NetBSD: uipc_mbuf.c,v 1.250 2023/04/01 06:30:19 skrll Exp $	*/
+/*	$NetBSD: uipc_mbuf.c,v 1.251 2023/04/12 06:48:08 riastradh Exp $	*/
 /*
  * Copyright (c) 1999, 2001, 2018 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center, and Maxime Villard.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -52,27 +52,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)uipc_mbuf.c	8.4 (Berkeley) 2/14/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_mbuf.c,v 1.250 2023/04/01 06:30:19 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_mbuf.c,v 1.251 2023/04/12 06:48:08 riastradh Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_mbuftrace.h"
 #include "opt_nmbclusters.h"
 #include "opt_ddb.h"
 #include "ether.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/atomic.h>
 #include <sys/cpu.h>
 #include <sys/proc.h>
 @@ -577,26 +577,70 @@ m_gethdr(int how, int type)
 	m->m_pkthdr.csum_data = 0;
 	m->m_pkthdr.segsz = 0;
 	m->m_pkthdr.ether_vtag = 0;
 	m->m_pkthdr.pkthdr_flags = 0;
 	SLIST_INIT(&m->m_pkthdr.tags);
 	m->m_pkthdr.pattr_class = NULL;
 	m->m_pkthdr.pattr_af = AF_UNSPEC;
 	m->m_pkthdr.pattr_hdr = NULL;
 	return m;
+}
 struct mbuf *
 m_get_n(int how, int type, size_t alignbytes, size_t nbytes)
+{
 	struct mbuf *m;
 	if (alignbytes > MCLBYTES || nbytes > MCLBYTES - alignbytes)
 		return NULL;
 	if ((m = m_get(how, type)) == NULL)
 		return NULL;
 	if (nbytes + alignbytes > MLEN) {
 		m_clget(m, how);
 		if ((m->m_flags & M_EXT) == 0) {
 			m_free(m);
 			return NULL;
+		}
+	}
 	m->m_len = alignbytes + nbytes;
 	m_adj(m, alignbytes);
 	return m;
+}
 struct mbuf *
 m_gethdr_n(int how, int type, size_t alignbytes, size_t nbytes)
+{
 	struct mbuf *m;
 	if (nbytes > MCLBYTES || nbytes > MCLBYTES - alignbytes)
 		return NULL;
 	if ((m = m_gethdr(how, type)) == NULL)
 		return NULL;
 	if (alignbytes + nbytes > MHLEN) {
 		m_clget(m, how);
 		if ((m->m_flags & M_EXT) == 0) {
 			m_free(m);
 			return NULL;
+		}
+	}
 	m->m_len = m->m_pkthdr.len = alignbytes + nbytes;
 	m_adj(m, alignbytes);
 	return m;
+}
 void
 m_clget(struct mbuf *m, int how)
+{
 	m->m_ext_storage.ext_buf = (char *)pool_cache_get_paddr(mcl_cache,
 	    how == M_WAIT ? (PR_WAITOK|PR_LIMITFAIL) : PR_NOWAIT,
 	    &m->m_ext_storage.ext_paddr);
 	if (m->m_ext_storage.ext_buf == NULL)
 		return;
 	KASSERTMSG((((vaddr_t)m->m_ext_storage.ext_buf & PAGE_MASK) + mclbytes
 		<= PAGE_SIZE),
 	    "m=%p m->m_ext_storage.ext_buf=%p"

 @@ -1,14 +1,14 @@
-/*	$NetBSD: mbuf.h,v 1.237 2022/12/16 08:42:55 msaitoh Exp $	*/
+/*	$NetBSD: mbuf.h,v 1.238 2023/04/12 06:48:08 riastradh Exp $	*/
 /*
  * Copyright (c) 1996, 1997, 1999, 2001, 2007 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center and Matt Thomas of 3am Software Foundry.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -730,26 +730,28 @@ extern struct mownerhead mowners;
 extern struct mowner unknown_mowners[];
 extern struct mowner revoked_mowner;
 #endif
 MALLOC_DECLARE(M_MBUF);
 MALLOC_DECLARE(M_SONAME);
 struct	mbuf *m_copym(struct mbuf *, int, int, int);
 struct	mbuf *m_copypacket(struct mbuf *, int);
 struct	mbuf *m_devget(char *, int, int, struct ifnet *);
 struct	mbuf *m_dup(struct mbuf *, int, int, int);
 struct	mbuf *m_get(int, int);
 struct	mbuf *m_gethdr(int, int);
 struct	mbuf *m_get_n(int, int, size_t, size_t);
 struct	mbuf *m_gethdr_n(int, int, size_t, size_t);
 struct	mbuf *m_prepend(struct mbuf *,int, int);
 struct	mbuf *m_pulldown(struct mbuf *, int, int, int *);
 struct	mbuf *m_pullup(struct mbuf *, int);
 struct	mbuf *m_copyup(struct mbuf *, int, int);
 struct	mbuf *m_split(struct mbuf *,int, int);
 struct	mbuf *m_getptr(struct mbuf *, int, int *);
 void	m_adj(struct mbuf *, int);
 struct	mbuf *m_defrag(struct mbuf *, int);
 int	m_apply(struct mbuf *, int, int,
     int (*)(void *, void *, unsigned int), void *);
 void	m_cat(struct mbuf *,struct mbuf *);
 void	m_clget(struct mbuf *, int);
 void	m_copyback(struct mbuf *, int, int, const void *);