Page MenuHomeFreeBSD
Files F102787928

D30132.diff
No OneTemporary
Actions

D30132.diff
View Options

diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c
--- a/sys/kern/uipc_mbuf.c
+++ b/sys/kern/uipc_mbuf.c
@@ -1239,6 +1239,62 @@
return (remainder == 0);
}
+static int
+m_apply_extpg_one(struct mbuf *m, int off, int len,
+ int (*f)(void *, void *, u_int), void *arg)
+{
+ void *p;
+ u_int i, count, pgoff, pglen;
+ int rval;
+
+ KASSERT(PMAP_HAS_DMAP,
+ ("m_apply_extpg_one does not support unmapped mbufs"));
+ off += mtod(m, vm_offset_t);
+ if (off < m->m_epg_hdrlen) {
+ count = min(m->m_epg_hdrlen - off, len);
+ rval = f(arg, m->m_epg_hdr + off, count);
+ if (rval)
+ return (rval);
+ len -= count;
+ off = 0;
+ } else
+ off -= m->m_epg_hdrlen;
+ pgoff = m->m_epg_1st_off;
+ for (i = 0; i < m->m_epg_npgs && len > 0; i++) {
+ pglen = m_epg_pagelen(m, i, pgoff);
+ if (off < pglen) {
+ count = min(pglen - off, len);
+ p = (void *)PHYS_TO_DMAP(m->m_epg_pa[i] + pgoff);
+ rval = f(arg, p, count);
+ if (rval)
+ return (rval);
+ len -= count;
+ off = 0;
+ } else
+ off -= pglen;
+ pgoff = 0;
+ }
+ if (len > 0) {
+ KASSERT(off < m->m_epg_trllen,
+ ("m_apply_extpg_one: offset beyond trailer"));
+ KASSERT(len <= m->m_epg_trllen - off,
+ ("m_apply_extpg_one: length beyond trailer"));
+ return (f(arg, m->m_epg_trail + off, len));
+ }
+ return (0);
+}
+
+/* Apply function f to the data in a single mbuf. */
+static int
+m_apply_one(struct mbuf *m, int off, int len,
+ int (*f)(void *, void *, u_int), void *arg)
+{
+ if ((m->m_flags & M_EXTPG) != 0)
+ return (m_apply_extpg_one(m, off, len, f, arg));
+ else
+ return (f(arg, mtod(m, caddr_t) + off, len));
+}
+
/*
* Apply function f to the data in an mbuf chain starting "off" bytes from
* the beginning, continuing for "len" bytes.
@@ -1262,7 +1318,7 @@
while (len > 0) {
KASSERT(m != NULL, ("m_apply, offset > size of mbuf chain"));
count = min(m->m_len - off, len);
- rval = (*f)(arg, mtod(m, caddr_t) + off, count);
+ rval = m_apply_one(m, off, count, f, arg);
if (rval)
return (rval);
len -= count;

File Metadata

Mime Type
text/plain
Expires
Mon, Nov 18, 5:08 AM (20 h, 42 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
14690168
Default Alt Text
D30132.diff (1 KB)

Event Timeline