PERFORCE change 179406 for review

[Alexandre Fiveg]

http://p4web.freebsd.org/@@179406?ac=10

Change 179406 by afiveg at cottonmouth on 2010/06/10 15:54:32

	Trying integration the ringmap code in CURRENT. Still unsuccessful :(

Affected files ...

.. //depot/projects/soc2010/ringmap/current/Makefile#2 edit
.. //depot/projects/soc2010/ringmap/current/lib/libpcap/Makefile#2 edit
.. //depot/projects/soc2010/ringmap/current/lib/libstand/ioctl.c#2 edit
.. //depot/projects/soc2010/ringmap/current/sys/conf/NOTES#2 edit
.. //depot/projects/soc2010/ringmap/current/sys/conf/files#2 edit
.. //depot/projects/soc2010/ringmap/current/sys/conf/options#2 edit
.. //depot/projects/soc2010/ringmap/current/sys/dev/e1000/ringmap_e1000.h#1 add
.. //depot/projects/soc2010/ringmap/current/sys/dev/hptmv/ioctl.c#2 edit
.. //depot/projects/soc2010/ringmap/current/sys/i386/conf/I686RINGMAP_CURRENT#1 add
.. //depot/projects/soc2010/ringmap/current/sys/i386/conf/I686SMP.CURRENT#1 add
.. //depot/projects/soc2010/ringmap/current/sys/modules/em/Makefile#2 edit
.. //depot/projects/soc2010/ringmap/current/sys/net/ringmap.c#1 add
.. //depot/projects/soc2010/ringmap/current/sys/net/ringmap.h#1 add
.. //depot/projects/soc2010/ringmap/current/usr.bin/kdump/Makefile#2 edit
.. //depot/projects/soc2010/ringmap/current/usr.bin/kdump/mkioctls#2 edit

Differences ...

==== //depot/projects/soc2010/ringmap/current/Makefile#2 (text+ko) ====


==== //depot/projects/soc2010/ringmap/current/lib/libpcap/Makefile#2 (text+ko) ====

@@ -11,6 +11,11 @@
 	etherent.c savefile.c bpf_filter.c bpf_image.c bpf_dump.c \
 	scanner.l version.c
 
+.if defined(LIBPCAP_RINGMAP)
+CFLAGS+=-D__RINGMAP__ -D__E1000_RINGMAP__ 
+SRC+=ringmap_pcap.c
+.endif 
+
 # Old compatibility headers
 INCS=	pcap.h pcap-int.h pcap-namedb.h pcap-bpf.h
 

==== //depot/projects/soc2010/ringmap/current/lib/libstand/ioctl.c#2 (text+ko) ====


==== //depot/projects/soc2010/ringmap/current/sys/conf/NOTES#2 (text+ko) ====

@@ -2915,3 +2915,7 @@
 options 	BROOKTREE_ALLOC_PAGES=(217*4+1)
 options 	MAXFILES=999
 
+#
+# RINGMAP options 
+#
+options		RINGMAP	# packet capturing optimization

==== //depot/projects/soc2010/ringmap/current/sys/conf/files#2 (text+ko) ====

@@ -2351,6 +2351,7 @@
 net/radix_mpath.c		standard
 net/raw_cb.c			standard
 net/raw_usrreq.c		standard
+net/ringmap.c		optional em | ixgbe
 net/route.c			standard
 net/rtsock.c			standard
 net/slcompress.c		optional netgraph_vjc | sppp | \

==== //depot/projects/soc2010/ringmap/current/sys/conf/options#2 (text+ko) ====

@@ -684,6 +684,10 @@
 DEV_CARP		opt_carp.h
 DEV_SPLASH		opt_splash.h
 
+# RINGMAP
+RINGMAP
+
+
 # EISA support
 DEV_EISA		opt_eisa.h
 EISA_SLOTS		opt_eisa.h

==== //depot/projects/soc2010/ringmap/current/sys/dev/hptmv/ioctl.c#2 (text+ko) ====


==== //depot/projects/soc2010/ringmap/current/sys/modules/em/Makefile#2 (text+ko) ====

@@ -1,10 +1,24 @@
 # $FreeBSD: src/sys/modules/em/Makefile,v 1.16 2010/03/29 23:36:34 jfv Exp $
 .PATH:  ${.CURDIR}/../../dev/e1000
+
+.if defined(RINGMAP)
+KMOD	= if_ringmap
+.else 
 KMOD    = if_em
+.endif
+
 SRCS    = device_if.h bus_if.h pci_if.h opt_inet.h
 SRCS    += $(CORE_SRC) $(LEGACY_SRC)
 SRCS	+= $(COMMON_SHARED) $(LEGACY_SHARED) $(PCIE_SHARED)
+
+.if defined(RINGMAP)
+CFLAGS += D__RINGMAP__
+SRC		+= ${.CURDIR}/../../net/ringmap.c
+.endif
+
 CORE_SRC = if_em.c e1000_osdep.c
+
+
 # This is the Legacy, pre-PCIE source, it can be
 # undefined when using modular driver if not needed
 LEGACY_SRC    += if_lem.c

==== //depot/projects/soc2010/ringmap/current/usr.bin/kdump/Makefile#2 (text+ko) ====


==== //depot/projects/soc2010/ringmap/current/usr.bin/kdump/mkioctls#2 (text+ko) ====