diff options
author | kmacy <kmacy@FreeBSD.org> | 2008-12-17 04:00:43 +0000 |
---|---|---|
committer | kmacy <kmacy@FreeBSD.org> | 2008-12-17 04:00:43 +0000 |
commit | 4b4aad01dc1f9b4b7b3a5e843c8a34629fb6fd67 (patch) | |
tree | 124e26067b399b2cf50dcf7d8c27225624203897 | |
parent | 0d699e4383e0140c80269e315e36686906dddd3c (diff) | |
download | FreeBSD-src-4b4aad01dc1f9b4b7b3a5e843c8a34629fb6fd67.zip FreeBSD-src-4b4aad01dc1f9b4b7b3a5e843c8a34629fb6fd67.tar.gz |
merge in 2 buf_ring helper routines for enqueueing and freeing buf_rings
-rw-r--r-- | sys/net/if_var.h | 27 | ||||
-rw-r--r-- | sys/sys/buf_ring.h | 3 |
2 files changed, 29 insertions, 1 deletions
diff --git a/sys/net/if_var.h b/sys/net/if_var.h index 7b2881e..6e6d2db 100644 --- a/sys/net/if_var.h +++ b/sys/net/if_var.h @@ -77,6 +77,7 @@ struct ifvlantrunk; #ifdef _KERNEL #include <sys/mbuf.h> #include <sys/eventhandler.h> +#include <sys/buf_ring.h> #endif /* _KERNEL */ #include <sys/lock.h> /* XXX */ #include <sys/mutex.h> /* XXX */ @@ -548,6 +549,32 @@ do { \ IFQ_PURGE(ifq); \ } while (0) +#ifdef _KERNEL +static __inline int +drbr_enqueue(struct buf_ring *br, struct mbuf *m) +{ + int error = 0; + + if ((error = buf_ring_enqueue(br, m)) == ENOBUFS) { + br->br_drops++; + m_freem(m); + } + + return (error); +} + +static __inline void +drbr_free(struct buf_ring *br, struct malloc_type *type) +{ + struct mbuf *m; + + while ((m = buf_ring_dequeue_sc(br)) != NULL) + m_freem(m); + + buf_ring_free(br, type); +} +#endif + /* * 72 was chosen below because it is the size of a TCP/IP * header (40) + the minimum mss (32). diff --git a/sys/sys/buf_ring.h b/sys/sys/buf_ring.h index 6d0cb7d..efea85a 100644 --- a/sys/sys/buf_ring.h +++ b/sys/sys/buf_ring.h @@ -48,10 +48,11 @@ struct buf_ring { volatile uint32_t br_prod_tail; int br_prod_size; int br_prod_mask; + uint64_t br_drops; /* * Pad out to next L2 cache line */ - uint64_t _pad0[14]; + uint64_t _pad0[13]; volatile uint32_t br_cons_head; volatile uint32_t br_cons_tail; |