Merge branch 'master' into github-master

Author: giuseppelettieri

LINUX/README

@@ -71,7 +71,7 @@ features, namely:
 
   netmap subsystems
   -----------------
- 
+
   These are optional parts of netmap that can be compiled in with
   --enable-SUBSYSTEM and commented out with --disable-SUBSYSTEM.
   The available subsystems the following (the starred ones are enabled
@@ -110,16 +110,16 @@ features, namely:
   the host OS already supplies a driver. The optimal performance, however,
   is only obtained with netmap-enabled NIC drivers.  The configure script
   implements two methods to obtain the netmap-enabled drivers:
-	
+
 	1. patching the native drivers that come with your kernel;
 	2. patching NIC-vendors out-of-tree drivers selected by us.
-  
+
   Both methods have advantages and drawbacks and none is perfect.
   In method 1 the patches we supply may fail to apply (especially on
   Red Hat based distributions), but compilation of successfully patched
   drivers usually works. In method 2 the patches will be guaranteed to
   apply, but compilation may fail since the out-of-tree drivers may
-  not support your kernel. 
+  not support your kernel.
 
   By default e1000e, i40e, ixgbe, ixgbevf and igb use method 2, while
   e1000, r8169.c, forcedeth.c, veth.c and virtio_net.c drivers use method
@@ -149,7 +149,7 @@ features, namely:
 	  external module compilation is available and there is typically
 	  no need to supply it, since configure is already able to find
 	  it in the standard place.
-  
+
   The configure script selects the patch to apply based only on the
   kernel version. Moreover, we only supply patches for the vanilla kernel
   from the Torvalds repository (not even the stable kernels). If the
@@ -298,4 +298,4 @@ DETAILS
 + if_e1000_e uses regular descriptor up 3.1 at least
   3.2.32 is reported to use extended descriptors
 	(in my repo updated at -r 11975)
-	
+

LINUX/configure

@@ -28,7 +28,11 @@ setop()
 
 	case "$2" in
 	new)
-		eval "$1_avail=\$$3_avail; $1=\$$3"
+		eval "$1_avail=\$$3_avail; $1="
+		return
+		;;
+	copy)
+		eval "$1=\$$3"
 		return
 		;;
 	intersect)
@@ -113,8 +117,7 @@ drv()
 drv enable-all
 
 # drivers built by external commands (subset of driver)
-external_driver_avail=$driver_avail
-external_driver=
+setop external_driver new driver
 edrv()
 {
 	setop external_driver "$@"
@@ -126,6 +129,21 @@ edrv enable ixgbe
 edrv enable ixgbevf
 edrv enable i40e
 
+# drivers built by patching the system drivers
+setop internal_driver new driver
+idrv()
+{
+	setop internal_driver "$@"
+}
+
+update_drivers() {
+	edrv intersect driver
+	idrv copy driver
+	idrv subtract external_driver
+}
+
+update_drivers
+
 # available apps
 application_avail="pkt-gen bridge lb tlem nmreplay vale-ctl"
 application=0
@@ -232,9 +250,9 @@ replace_vars()
 		-e "s|@LIN_VER@|$lin_ver|g" \
 		-e "s|@MOD_LIST@|$mod_list|g" \
 		-e "s|@PATCHES@|$(echo $patches)|g" \
-		-e "s|@S_DRIVERS@|$(echo $s_drivers)|g" \
-		-e "s|@E_DRIVERS@|$(echo $e_drivers)|g" \
-		-e "s|@I_DRIVERS@|$(echo $i_drivers)|g" \
+		-e "s|@S_DRIVERS@|$(drv print)|g" \
+		-e "s|@E_DRIVERS@|$(edrv print)|g" \
+		-e "s|@I_DRIVERS@|$(idrv print)|g" \
 		-e "s|@DRVSUFFIX@|$drvsuffix|g" \
 		-e "s|@APPS_LIST@|$(app print)|g" \
 		-e "s|@APPS_CC@|$cc|g" \
@@ -405,9 +423,9 @@ SRCDIR=$SRCDIR
 ifneq (\$(KERNELRELEASE),)
 obj-m := $TESTOBJS
 else
-S_DRIVERS := $s_drivers
-E_DRIVERS := $e_drivers
-I_DRIVERS := $i_drivers
+S_DRIVERS := $(drv print)
+E_DRIVERS := $(edrv print)
+I_DRIVERS := $(idrv print)
 all: \$(S_DRIVERS:%=get-%) \$(E_DRIVERS:%=build-%) \$(I_DRIVERS:%=patch-%) tests
 
 tests:
@@ -580,6 +598,9 @@ for opt do
 	esac
 done
 
+# update the divers subsets so that they are all consistent
+update_drivers
+
 ####################################################################
 ################### START OF PROCESSING ############################
 ####################################################################
@@ -671,21 +692,16 @@ if ! drv is-empty; then
 	[ -d patches ] || { rm -f patches; ln -s $SRCDIR/final-patches patches; }
 fi
 
-s_drivers=$(drv print)
-edrv intersect driver
-e_drivers=$(edrv print)
-setop internal_driver new driver
-setop internal_driver subtract external_driver
-i_drivers=$(setop internal_driver print)
-
 ln -s $SRCDIR/read-vars.mak 2>/dev/null || true
 rm -f drivers.mak
 # read in all the kernel .config, we use it below
 . $ksrc/.config
 # check for full kernel sources just once
 src_checked=
 src_found=
-for d in $s_drivers; do
+# cache
+e_drivers=$(edrv print)
+for d in $(drv print); do
 	# reset all driver variables to default values
 	drv_fetch=
 	drv_src=
@@ -696,6 +712,31 @@ for d in $s_drivers; do
 	# possibly override from config.mak
 	eval $(make -nrf read-vars.mak $d@vars E_DRIVERS="$e_drivers")
 
+	# check that the original driver had been compiled as a module, otherwise
+	# skip this driver
+	# (we do this mainly to be sure that any module dependency has already
+	#  been taken care of)
+	# XXX maybe add a (per driver?) flag to force compilation anyway
+	m="$(eval echo \$$drv_conf)"
+	[ -n "$m" ] || {
+		echo "$drv_conf not set in $ksrc/.config, skipping $d" | warning
+		drv disable $d
+		continue
+	}
+	[ "$m" = y ] && [ -z "$drvsuffix" ] && {
+		warning <<EOF
+The $d driver is not compiled as a module:
+you will not be able to load the netmap enabled driver on this kernel.
+Please consider setting
+
+    $drv_conf=m
+
+in your .config.
+
+Alternatively, you can pass a --driver-suffix= option to configure.
+EOF
+	}
+
 	if [ -n "$drv_fetch" ]; then
 		message " NOTE  " <<EOF
 We are trying to download the original sources for driver
@@ -781,30 +822,6 @@ EOF
 	elif [ "$drv_patch" = none ]; then
 		drv_patch=
 	fi
-	# check that the original driver had been compiled as a module, otherwise
-	# skip this driver
-	# (we do this mainly to be sure that any module dependency has already
-	#  been taken care of)
-	# XXX maybe add a (per driver?) flag to force compilation anyway
-	m="$(eval echo \$$drv_conf)"
-	[ -n "$m" ] || {
-		echo "$drv_conf not set in $ksrc/.config, skipping $d" | warning
-		drv disable $d
-		continue
-	}
-	[ "$m" = y ] && [ -z "$drvsuffix" ] && {
-		warning <<EOF
-The $d driver is not compiled as a module:
-you will not be able to load the netmap enabled driver on this kernel.
-Please consider setting
-
-    $drv_conf=m
-
-in your .config.
-
-Alternatively, you can pass a --driver-suffix= option to configure.
-EOF
-	}
 
 	# if no external build command has been specified, add
 	# this driver to the list of modules built by netmap,
@@ -820,6 +837,10 @@ $d@patch := $drv_patch
 EOF
 done
 
+# update the subsets again since the above checks
+# may have disabled some driver
+update_drivers
+
 #################################################
 # create the config.h file
 #################################################
@@ -1253,8 +1274,10 @@ EOF
   add_test 'have XMIT_MORE' <<EOF
 	#include <linux/skbuff.h>
 
-	struct sk_buff *skb;
-        (void)skb->xmit_more;
+	unsigned int
+	dummy(struct sk_buff *skb) {
+		return skb->xmit_more;
+	}
 EOF
 
   # arguments of skb_add_rx_frag (either 5 or 6)
@@ -1436,7 +1459,7 @@ EOF
  	 #include "ixgbe/ixgbe_main.c"
 
  	 void
- 	 dummy(struct ixgbe_adapter *adater, u64 qmask) {
+ 	 dummy(struct ixgbe_adapter *adapter, u64 qmask) {
  	 	ixgbe_irq_disable_queues(adapter, qmask);
  	 }
 EOF
@@ -1609,10 +1632,6 @@ EOF
 
 fi # ! -f $cache/netmap_config_h
 
-# get the drivers that are still enabled
-s_drivers=$(drv print)
-e_drivers=$(edrv print)
-
 # create netmap.mak and Kbuild
 for f in $SRCDIR/*.in; do
 	replace_vars $f > $(basename $f .in)

LINUX/netmap_linux.c

@@ -2196,7 +2196,14 @@ EXPORT_SYMBOL(netmap_bdg_name);		/* the bridge the vp is attached to */
 EXPORT_SYMBOL(netmap_disable_all_rings);
 EXPORT_SYMBOL(netmap_enable_all_rings);
 EXPORT_SYMBOL(netmap_krings_create);
-
+EXPORT_SYMBOL(netmap_krings_delete);	/* used by veth module */
+EXPORT_SYMBOL(netmap_mem_rings_create);	/* used by veth module */
+EXPORT_SYMBOL(netmap_mem_rings_delete);	/* used by veth module */
+#ifdef WITH_PIPES
+EXPORT_SYMBOL(netmap_pipe_txsync);	/* used by veth module */
+EXPORT_SYMBOL(netmap_pipe_rxsync);	/* used by veth module */
+#endif /* WITH_PIPES */
+EXPORT_SYMBOL(netmap_verbose);
 
 MODULE_AUTHOR("http://info.iet.unipi.it/~luigi/netmap/");
 MODULE_DESCRIPTION("The netmap packet I/O framework");