xnu-7195.81.3.tar.gz

[apple/xnu.git] / bsd / net / classq / classq_fq_codel.h

diff --git a/bsd/net/classq/classq_fq_codel.h b/bsd/net/classq/classq_fq_codel.h
index 7f9411802ac32d471a6e930c5404327457613762..b8c4d10beb1f5600f0ebf1ed32060da035f17709 100644 (file)
--- a/bsd/net/classq/classq_fq_codel.h
+++ b/bsd/net/classq/classq_fq_codel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Apple Inc. All rights reserved.
+ * Copyright (c) 2016-2018 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  *
@@ -27,7 +27,7 @@
  */
 
 #ifndef _NET_CLASSQ_CLASSQ_FQ_CODEL_H
-#define        _NET_CLASSQ_CLASSQ_FQ_CODEL_H
+#define _NET_CLASSQ_CLASSQ_FQ_CODEL_H
 #ifdef PRIVATE
 #ifdef BSD_KERNEL_PRIVATE
 #include <stdbool.h>
@@ -39,12 +39,12 @@
 extern "C" {
 #endif
 
-#define        FQ_MIN_FC_THRESHOLD_BYTES       7500
-#define        FQ_IS_DELAYHIGH(_fq_)   ((_fq_)->fq_flags & FQF_DELAY_HIGH)
-#define        FQ_SET_DELAY_HIGH(_fq_) do { \
+#define FQ_MIN_FC_THRESHOLD_BYTES       7500
+#define FQ_IS_DELAYHIGH(_fq_)   ((_fq_)->fq_flags & FQF_DELAY_HIGH)
+#define FQ_SET_DELAY_HIGH(_fq_) do { \
        (_fq_)->fq_flags |= FQF_DELAY_HIGH; \
 } while (0)
-#define        FQ_CLEAR_DELAY_HIGH(_fq_) do { \
+#define FQ_CLEAR_DELAY_HIGH(_fq_) do { \
        (_fq_)->fq_flags &= ~FQF_DELAY_HIGH; \
 } while (0)
 
@@ -52,34 +52,36 @@ typedef struct flowq {
        union {
                MBUFQ_HEAD(mbufq_head) __mbufq; /* mbuf packet queue */
        } __fq_pktq_u;
-#define        FQF_FLOWCTL_CAPABLE 0x01 /* Use flow control instead of drop */
-#define        FQF_DELAY_HIGH  0x02    /* Min delay is greater than target */
-#define        FQF_NEW_FLOW    0x04    /* Currently on new flows queue */
-#define        FQF_OLD_FLOW    0x08    /* Currently on old flows queue */
-#define        FQF_FLOWCTL_ON  0x10    /* Currently flow controlled */
-       u_int8_t        fq_flags;       /* flags */
-       u_int8_t        fq_sc_index; /* service_class index */
-       int16_t         fq_deficit;     /* Deficit for scheduling */
-       u_int32_t       fq_bytes;       /* Number of bytes in the queue */
-       u_int64_t       fq_min_qdelay; /* min queue delay for Codel */
-       u_int64_t       fq_updatetime; /* next update interval */
-       u_int64_t       fq_getqtime;    /* last dequeue time */
+#define FQF_FLOWCTL_CAPABLE 0x01 /* Use flow control instead of drop */
+#define FQF_DELAY_HIGH  0x02    /* Min delay is greater than target */
+#define FQF_NEW_FLOW    0x04    /* Currently on new flows queue */
+#define FQF_OLD_FLOW    0x08    /* Currently on old flows queue */
+#define FQF_FLOWCTL_ON  0x10    /* Currently flow controlled */
+       uint8_t        fq_flags;       /* flags */
+       uint8_t        fq_sc_index; /* service_class index */
+       int16_t         fq_deficit;     /* Deficit for scheduling */
+       uint32_t       fq_bytes;       /* Number of bytes in the queue */
+       uint64_t       fq_min_qdelay; /* min queue delay for Codel */
+       uint64_t       fq_updatetime; /* next update interval */
+       uint64_t       fq_getqtime;    /* last dequeue time */
        SLIST_ENTRY(flowq) fq_hashlink; /* for flow queue hash table */
        STAILQ_ENTRY(flowq) fq_actlink; /* for new/old flow queues */
-       u_int32_t       fq_flowhash;    /* Flow hash */
-       classq_pkt_type_t       fq_ptype; /* Packet type */
+       uint32_t       fq_flowhash;    /* Flow hash */
+       classq_pkt_type_t       fq_ptype; /* Packet type */
 } fq_t;
 
-#define        fq_mbufq        __fq_pktq_u.__mbufq
+#define fq_mbufq        __fq_pktq_u.__mbufq
 
-#define        fq_empty(_q)    MBUFQ_EMPTY(&(_q)->fq_mbufq)
+#define fq_empty(_q)    MBUFQ_EMPTY(&(_q)->fq_mbufq)
 
-#define        fq_enqueue(_q, _p)      MBUFQ_ENQUEUE(&(_q)->fq_mbufq, (mbuf_t)_p)
+#define fq_enqueue(_q, _h, _t, _c) \
+    MBUFQ_ENQUEUE_MULTI(&(_q)->fq_mbufq, (_h).cp_mbuf, (_t).cp_mbuf)
 
-#define        fq_dequeue(_q, _p) do {                                         \
-       mbuf_t _m;                                                      \
-       MBUFQ_DEQUEUE(&(_q)->fq_mbufq, _m);                             \
-       (_p) = _m;                                                      \
+#define fq_dequeue(_q, _p) do {                                         \
+       MBUFQ_DEQUEUE(&(_q)->fq_mbufq, (_p)->cp_mbuf);                  \
+       if (__probable((_p)->cp_mbuf != NULL)) {                        \
+               CLASSQ_PKT_INIT_MBUF((_p), (_p)->cp_mbuf);              \
+       }                                                               \
 } while (0)
 
 struct fq_codel_sched_data;
@@ -92,9 +94,9 @@ extern fq_t *fq_alloc(classq_pkt_type_t);
 extern void fq_destroy(fq_t *);
 extern int fq_addq(struct fq_codel_sched_data *, pktsched_pkt_t *,
     struct fq_if_classq *);
-extern void *fq_getq_flow(struct fq_codel_sched_data *, fq_t *,
+extern void fq_getq_flow(struct fq_codel_sched_data *, fq_t *,
     pktsched_pkt_t *);
-extern void *fq_getq_flow_internal(struct fq_codel_sched_data *,
+extern void fq_getq_flow_internal(struct fq_codel_sched_data *,
     fq_t *, pktsched_pkt_t *);
 extern void fq_head_drop(struct fq_codel_sched_data *, fq_t *);