From b6e66be22bdce2aadcf52ee6230faa1e6cd3f805 Mon Sep 17 00:00:00 2001 From: Vincenzo Maffione Date: Wed, 5 Dec 2018 11:57:16 +0000 Subject: netmap: align codebase to the current upstream (760279cfb2730a585) Changelist: - Replace netmap passthrough host support with a more general mechanism to call TXSYNC/RXSYNC from an in-kernel event-loop. No kernel threads are used to use this feature: the application is required to spawn a thread (or a process) and issue a SYNC_KLOOP_START (NIOCCTRL) command in the thread body. The kernel loop is executed by the ioctl implementation, which returns to userspace only when a different thread calls SYNC_KLOOP_STOP or the netmap file descriptor is closed. - Update the if_ptnet driver to cope with the new data structures, and prune all the obsolete ptnetmap code. - Add support for "null" netmap ports, useful to allocate netmap_if, netmap_ring and netmap buffers to be used by specialized applications (e.g. hypervisors). TXSYNC/RXSYNC on these ports have no effect. - Various fixes and code refactoring. Sponsored by: Sunny Valley Networks Differential Revision: https://reviews.freebsd.org/D18015 --- sys/modules/netmap/Makefile | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'sys/modules/netmap') diff --git a/sys/modules/netmap/Makefile b/sys/modules/netmap/Makefile index dbc686823573..8d0b358115fd 100644 --- a/sys/modules/netmap/Makefile +++ b/sys/modules/netmap/Makefile @@ -3,12 +3,12 @@ # Compile netmap as a module, useful if you want a netmap bridge # or loadable drivers. -SYSDIR?=${SRCTOP}/sys -.include "${SYSDIR}/conf/kern.opts.mk" +.include # FreeBSD 10 and earlier +# .include "${SYSDIR}/conf/kern.opts.mk" -.PATH: ${SYSDIR}/dev/netmap -.PATH.h: ${SYSDIR}/net -CFLAGS += -I${SYSDIR}/ -D INET +.PATH: ${.CURDIR}/../../dev/netmap +.PATH.h: ${.CURDIR}/../../net +CFLAGS += -I${.CURDIR}/../../ -D INET -D VIMAGE KMOD = netmap SRCS = device_if.h bus_if.h pci_if.h opt_netmap.h SRCS += netmap.c netmap.h netmap_kern.h @@ -20,8 +20,10 @@ SRCS += netmap_freebsd.c SRCS += netmap_offloadings.c SRCS += netmap_pipe.c SRCS += netmap_monitor.c -SRCS += netmap_pt.c +SRCS += netmap_kloop.c SRCS += netmap_legacy.c +SRCS += netmap_bdg.c +SRCS += netmap_null.c SRCS += if_ptnet.c SRCS += opt_inet.h opt_inet6.h -- cgit v1.3