3ab69a246b
Mostly bugfixes or features developed in the past 6 months, so this is a 10.1 candidate. Basically no user API changes (some bugfixes in sys/net/netmap_user.h). In detail: 1. netmap support for virtio-net, including in netmap mode. Under bhyve and with a netmap backend [2] we reach over 1Mpps with standard APIs (e.g. libpcap), and 5-8 Mpps in netmap mode. 2. (kernel) add support for multiple memory allocators, so we can better partition physical and virtual interfaces giving access to separate users. The most visible effect is one additional argument to the various kernel functions to compute buffer addresses. All netmap-supported drivers are affected, but changes are mechanical and trivial 3. (kernel) simplify the prototype for *txsync() and *rxsync() driver methods. All netmap drivers affected, changes mostly mechanical. 4. add support for netmap-monitor ports. Think of it as a mirroring port on a physical switch: a netmap monitor port replicates traffic present on the main port. Restrictions apply. Drive carefully. 5. if_lem.c: support for various paravirtualization features, experimental and disabled by default. Most of these are described in our ANCS'13 paper [1]. Paravirtualized support in netmap mode is new, and beats the numbers in the paper by a large factor (under qemu-kvm, we measured gues-host throughput up to 10-12 Mpps). A lot of refactoring and additional documentation in the files in sys/dev/netmap, but apart from #2 and #3 above, almost nothing of this stuff is visible to other kernel parts. Example programs in tools/tools/netmap have been updated with bugfixes and to support more of the existing features. This is meant to go into 10.1 so we plan an MFC before the Aug.22 deadline. A lot of this code has been contributed by my colleagues at UNIPI, including Giuseppe Lettieri, Vincenzo Maffione, Stefano Garzarella. MFC after: 3 days.
90 lines
2.7 KiB
C
90 lines
2.7 KiB
C
/*
|
|
* Copyright (C) 2013-2014 Vincenzo Maffione. All rights reserved.
|
|
*
|
|
* 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
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR 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.
|
|
*/
|
|
|
|
/*
|
|
* $FreeBSD$
|
|
*/
|
|
|
|
|
|
#ifndef __NETMAP_MBQ_H__
|
|
#define __NETMAP_MBQ_H__
|
|
|
|
/*
|
|
* These function implement an mbuf tailq with an optional lock.
|
|
* The base functions act ONLY ON THE QUEUE, whereas the "safe"
|
|
* variants (mbq_safe_*) also handle the lock.
|
|
*/
|
|
|
|
/* XXX probably rely on a previous definition of SPINLOCK_T */
|
|
#ifdef linux
|
|
#define SPINLOCK_T safe_spinlock_t
|
|
#else
|
|
#define SPINLOCK_T struct mtx
|
|
#endif
|
|
|
|
/* A FIFO queue of mbufs with an optional lock. */
|
|
struct mbq {
|
|
struct mbuf *head;
|
|
struct mbuf *tail;
|
|
int count;
|
|
SPINLOCK_T lock;
|
|
};
|
|
|
|
/* XXX "destroy" does not match "init" as a name.
|
|
* We should also clarify whether init can be used while
|
|
* holding a lock, and whether mbq_safe_destroy() is a NOP.
|
|
*/
|
|
void mbq_init(struct mbq *q);
|
|
void mbq_destroy(struct mbq *q);
|
|
void mbq_enqueue(struct mbq *q, struct mbuf *m);
|
|
struct mbuf *mbq_dequeue(struct mbq *q);
|
|
void mbq_purge(struct mbq *q);
|
|
|
|
static inline void
|
|
mbq_lock(struct mbq *q)
|
|
{
|
|
mtx_lock_spin(&q->lock);
|
|
}
|
|
|
|
static inline void
|
|
mbq_unlock(struct mbq *q)
|
|
{
|
|
mtx_unlock_spin(&q->lock);
|
|
}
|
|
|
|
|
|
void mbq_safe_init(struct mbq *q);
|
|
void mbq_safe_destroy(struct mbq *q);
|
|
void mbq_safe_enqueue(struct mbq *q, struct mbuf *m);
|
|
struct mbuf *mbq_safe_dequeue(struct mbq *q);
|
|
void mbq_safe_purge(struct mbq *q);
|
|
|
|
static inline unsigned int mbq_len(struct mbq *q)
|
|
{
|
|
return q->count;
|
|
}
|
|
|
|
#endif /* __NETMAP_MBQ_H_ */
|