Bring in the most recent version of ipfw and dummynet, developed
and tested over the past two months in the ipfw3-head branch. This
also happens to be the same code available in the Linux and Windows
ports of ipfw and dummynet.
The major enhancement is a completely restructured version of
dummynet, with support for different packet scheduling algorithms
(loadable at runtime), faster queue/pipe lookup, and a much cleaner
internal architecture and kernel/userland ABI which simplifies
future extensions.
In addition to the existing schedulers (FIFO and WF2Q+), we include
a Deficit Round Robin (DRR or RR for brevity) scheduler, and a new,
very fast version of WF2Q+ called QFQ.
Some test code is also present (in sys/netinet/ipfw/test) that
lets you build and test schedulers in userland.
Also, we have added a compatibility layer that understands requests
from the RELENG_7 and RELENG_8 versions of the /sbin/ipfw binaries,
and replies correctly (at least, it does its best; sometimes you
just cannot tell who sent the request and how to answer).
The compatibility layer should make it possible to MFC this code in a
relatively short time.
Some minor glitches (e.g. handling of ipfw set enable/disable,
and a workaround for a bug in RELENG_7's /sbin/ipfw) will be
fixed with separate commits.
CREDITS:
This work has been partly supported by the ONELAB2 project, and
mostly developed by Riccardo Panicucci and myself.
The code for the qfq scheduler is mostly from Fabio Checconi,
and Marta Carbone and Francesco Magno have helped with testing,
debugging and some bug fixes.
2010-03-02 17:40:48 +00:00
|
|
|
/*
|
|
|
|
* $FreeBSD$
|
|
|
|
*
|
|
|
|
* userspace compatibility code for dummynet schedulers
|
|
|
|
*/
|
|
|
|
|
|
|
|
#ifndef _DN_TEST_H
|
|
|
|
#define _DN_TEST_H
|
|
|
|
#include <inttypes.h>
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <strings.h> /* bzero, ffs, ... */
|
|
|
|
#include <string.h> /* strcmp */
|
|
|
|
#include <errno.h>
|
|
|
|
#include <sys/queue.h>
|
|
|
|
#include <sys/time.h>
|
|
|
|
|
|
|
|
extern int debug;
|
|
|
|
#define ND(fmt, args...) do {} while (0)
|
|
|
|
#define D1(fmt, args...) do {} while (0)
|
|
|
|
#define D(fmt, args...) fprintf(stderr, "%-8s " fmt "\n", \
|
|
|
|
__FUNCTION__, ## args)
|
|
|
|
#define DX(lev, fmt, args...) do { \
|
|
|
|
if (debug > lev) D(fmt, ## args); } while (0)
|
|
|
|
|
|
|
|
|
|
|
|
#define offsetof(t,m) (int)((&((t *)0L)->m))
|
|
|
|
|
|
|
|
#include <mylist.h>
|
|
|
|
|
|
|
|
/* prevent include of other system headers */
|
|
|
|
#define _NETINET_IP_VAR_H_ /* ip_fw_args */
|
|
|
|
#define _IPFW2_H
|
|
|
|
#define _SYS_MBUF_H_
|
|
|
|
|
|
|
|
enum {
|
|
|
|
DN_QUEUE,
|
|
|
|
};
|
|
|
|
|
|
|
|
enum {
|
|
|
|
DN_SCHED_FIFO,
|
|
|
|
DN_SCHED_WF2QP,
|
|
|
|
};
|
|
|
|
|
|
|
|
struct dn_id {
|
|
|
|
int type, subtype, len, id;
|
|
|
|
};
|
|
|
|
struct dn_fs {
|
|
|
|
int par[4]; /* flowset parameters */
|
|
|
|
|
|
|
|
/* simulation entries.
|
|
|
|
* 'index' is not strictly necessary
|
|
|
|
* y is used for the inverse mapping ,
|
|
|
|
*/
|
|
|
|
int index;
|
|
|
|
int y; /* inverse mapping */
|
|
|
|
int base_y; /* inverse mapping */
|
|
|
|
int next_y; /* inverse mapping */
|
|
|
|
int n_flows;
|
|
|
|
int first_flow;
|
|
|
|
int next_flow; /* first_flow + n_flows */
|
|
|
|
/*
|
|
|
|
* when generating, let 'cur' go from 0 to n_flows-1,
|
|
|
|
* then point to flow first_flow + cur
|
|
|
|
*/
|
|
|
|
int cur;
|
|
|
|
};
|
|
|
|
struct dn_sch {
|
|
|
|
};
|
|
|
|
struct dn_flow {
|
|
|
|
struct dn_id oid;
|
|
|
|
int length;
|
|
|
|
int len_bytes;
|
|
|
|
int drops;
|
|
|
|
uint64_t tot_bytes;
|
|
|
|
uint32_t flow_id;
|
|
|
|
struct list_head h; /* used by the generator */
|
|
|
|
};
|
|
|
|
struct dn_link {
|
|
|
|
};
|
|
|
|
|
|
|
|
struct ip_fw_args {
|
|
|
|
};
|
|
|
|
|
|
|
|
struct mbuf {
|
|
|
|
struct {
|
|
|
|
int len;
|
|
|
|
} m_pkthdr;
|
|
|
|
struct mbuf *m_nextpkt;
|
|
|
|
int flow_id; /* for testing, index of a flow */
|
|
|
|
//int flowset_id; /* for testing, index of a flowset */
|
|
|
|
void *cfg; /* config args */
|
|
|
|
};
|
|
|
|
|
|
|
|
#define MALLOC_DECLARE(x)
|
|
|
|
#define KASSERT(x, y) do { if (!(x)) printf y ; exit(0); } while (0)
|
|
|
|
struct ipfw_flow_id {
|
|
|
|
};
|
|
|
|
|
|
|
|
typedef void * module_t;
|
|
|
|
struct _md_t {
|
|
|
|
const char *name;
|
|
|
|
int (*f)(module_t, int, void *);
|
|
|
|
void *p;
|
|
|
|
};
|
|
|
|
typedef struct _md_t moduledata_t;
|
|
|
|
#define DECLARE_MODULE(name, b, c, d) \
|
|
|
|
moduledata_t *_g_##name = & b
|
|
|
|
#define MODULE_DEPEND(a, b, c, d, e)
|
|
|
|
|
|
|
|
#ifdef IPFW
|
|
|
|
#include <dn_heap.h>
|
|
|
|
#include <ip_dn_private.h>
|
|
|
|
#include <dn_sched.h>
|
|
|
|
#else
|
|
|
|
struct dn_queue {
|
|
|
|
struct dn_fsk *fs; /* parent flowset. */
|
|
|
|
struct dn_sch_inst *_si; /* parent sched instance. */
|
|
|
|
};
|
|
|
|
struct dn_schk {
|
|
|
|
};
|
|
|
|
struct dn_fsk {
|
|
|
|
struct dn_fs fs;
|
|
|
|
struct dn_schk *sched;
|
|
|
|
};
|
|
|
|
struct dn_sch_inst {
|
|
|
|
struct dn_schk *sched;
|
|
|
|
};
|
|
|
|
struct dn_alg {
|
|
|
|
int type;
|
|
|
|
const char *name;
|
|
|
|
void *enqueue, *dequeue;
|
|
|
|
int q_datalen, si_datalen, schk_datalen;
|
|
|
|
int (*config)(struct dn_schk *);
|
|
|
|
int (*new_sched)(struct dn_sch_inst *);
|
|
|
|
int (*new_fsk)(struct dn_fsk *);
|
|
|
|
int (*new_queue)(struct dn_queue *q);
|
|
|
|
};
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
2010-03-04 21:52:40 +00:00
|
|
|
#ifndef __FreeBSD__
|
|
|
|
int fls(int);
|
|
|
|
#endif
|
|
|
|
|
Bring in the most recent version of ipfw and dummynet, developed
and tested over the past two months in the ipfw3-head branch. This
also happens to be the same code available in the Linux and Windows
ports of ipfw and dummynet.
The major enhancement is a completely restructured version of
dummynet, with support for different packet scheduling algorithms
(loadable at runtime), faster queue/pipe lookup, and a much cleaner
internal architecture and kernel/userland ABI which simplifies
future extensions.
In addition to the existing schedulers (FIFO and WF2Q+), we include
a Deficit Round Robin (DRR or RR for brevity) scheduler, and a new,
very fast version of WF2Q+ called QFQ.
Some test code is also present (in sys/netinet/ipfw/test) that
lets you build and test schedulers in userland.
Also, we have added a compatibility layer that understands requests
from the RELENG_7 and RELENG_8 versions of the /sbin/ipfw binaries,
and replies correctly (at least, it does its best; sometimes you
just cannot tell who sent the request and how to answer).
The compatibility layer should make it possible to MFC this code in a
relatively short time.
Some minor glitches (e.g. handling of ipfw set enable/disable,
and a workaround for a bug in RELENG_7's /sbin/ipfw) will be
fixed with separate commits.
CREDITS:
This work has been partly supported by the ONELAB2 project, and
mostly developed by Riccardo Panicucci and myself.
The code for the qfq scheduler is mostly from Fabio Checconi,
and Marta Carbone and Francesco Magno have helped with testing,
debugging and some bug fixes.
2010-03-02 17:40:48 +00:00
|
|
|
static inline void
|
|
|
|
mq_append(struct mq *q, struct mbuf *m)
|
|
|
|
{
|
|
|
|
if (q->head == NULL)
|
|
|
|
q->head = m;
|
|
|
|
else
|
|
|
|
q->tail->m_nextpkt = m;
|
|
|
|
q->tail = m;
|
|
|
|
m->m_nextpkt = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
#endif /* _DN_TEST_H */
|