svn commit: r257887 - in projects/ifq/sys: amd64/conf conf modules modules/ifq_bge modules/ifq_fxp modules/ifq_igb modules/ifq_ixgbe modules/ifq_re
Andre Oppermann
andre at FreeBSD.org
Sat Nov 9 14:46:26 UTC 2013
Author: andre
Date: Sat Nov 9 14:46:24 2013
New Revision: 257887
URL: http://svnweb.freebsd.org/changeset/base/257887
Log:
Hook the to be modified copies of bge(4), fxp(4), igb(4), ixgbe(4) and re(4)
to the build under the ifq_ prefix.
Provide a stripped IFQ kernel configuration with them replacing the stock
drivers.
Sponsored by: The FreeBSD Foundation
Added:
projects/ifq/sys/amd64/conf/IFQ
projects/ifq/sys/modules/ifq_bge/
- copied from r257886, projects/ifq/sys/modules/bge/
projects/ifq/sys/modules/ifq_fxp/
- copied from r257886, projects/ifq/sys/modules/fxp/
projects/ifq/sys/modules/ifq_igb/
- copied from r257886, projects/ifq/sys/modules/igb/
projects/ifq/sys/modules/ifq_ixgbe/
- copied from r257886, projects/ifq/sys/modules/ixgbe/
projects/ifq/sys/modules/ifq_re/
- copied from r257886, projects/ifq/sys/modules/re/
Modified:
projects/ifq/sys/conf/files
projects/ifq/sys/modules/Makefile
projects/ifq/sys/modules/ifq_bge/Makefile
projects/ifq/sys/modules/ifq_fxp/Makefile
projects/ifq/sys/modules/ifq_igb/Makefile
projects/ifq/sys/modules/ifq_ixgbe/Makefile
projects/ifq/sys/modules/ifq_re/Makefile
Added: projects/ifq/sys/amd64/conf/IFQ
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/ifq/sys/amd64/conf/IFQ Sat Nov 9 14:46:24 2013 (r257887)
@@ -0,0 +1,196 @@
+#
+# $FreeBSD: projects/ifq/sys/amd64/conf/GENERIC 257251 2013-10-28 13:33:29Z kib $
+
+cpu HAMMER
+ident IFQ
+
+makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
+makeoptions WITH_CTF=1 # Run ctfconvert(1) for DTrace support
+
+options SCHED_ULE # ULE scheduler
+options PREEMPTION # Enable kernel thread preemption
+options INET # InterNETworking
+options INET6 # IPv6 communications protocols
+options SCTP # Stream Control Transmission Protocol
+options FFS # Berkeley Fast Filesystem
+options SOFTUPDATES # Enable FFS soft updates support
+options UFS_DIRHASH # Improve performance on big directories
+options QUOTA # Enable disk quotas for UFS
+options CD9660 # ISO 9660 Filesystem
+options PROCFS # Process filesystem (requires PSEUDOFS)
+options PSEUDOFS # Pseudo-filesystem framework
+options GEOM_PART_GPT # GUID Partition Tables.
+options GEOM_RAID # Soft RAID functionality.
+options GEOM_LABEL # Provides labelization
+options COMPAT_FREEBSD32 # Compatible with i386 binaries
+options COMPAT_FREEBSD4 # Compatible with FreeBSD4
+options COMPAT_FREEBSD5 # Compatible with FreeBSD5
+options COMPAT_FREEBSD6 # Compatible with FreeBSD6
+options COMPAT_FREEBSD7 # Compatible with FreeBSD7
+options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI
+options KTRACE # ktrace(1) support
+options STACK # stack(9) support
+options SYSVSHM # SYSV-style shared memory
+options SYSVMSG # SYSV-style message queues
+options SYSVSEM # SYSV-style semaphores
+options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
+options PRINTF_BUFR_SIZE=128 # Prevent printf output being interspersed.
+options KBD_INSTALL_CDEV # install a CDEV entry in /dev
+options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4)
+options PROCDESC # Support for process descriptors
+options KDTRACE_FRAME # Ensure frames are compiled in
+options KDTRACE_HOOKS # Kernel DTrace hooks
+options DDB_CTF # Kernel ELF linker loads CTF data
+options INCLUDE_CONFIG_FILE # Include this file in kernel
+
+# Debugging support. Always need this:
+options KDB # Enable kernel debugger support.
+options KDB_TRACE # Print a stack trace for a panic.
+# For full debugger support use (turn off in stable branch):
+options DDB # Support DDB.
+options GDB # Support remote GDB.
+options DEADLKRES # Enable the deadlock resolver
+options INVARIANTS # Enable calls of extra sanity checking
+options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS
+options WITNESS # Enable checks to detect deadlocks and cycles
+options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed
+options MALLOC_DEBUG_MAXZONES=8 # Separate malloc(9) zones
+
+# Make an SMP-capable kernel by default
+options SMP # Symmetric MultiProcessor Kernel
+
+# CPU frequency control
+device cpufreq
+
+# Bus support.
+device acpi
+options ACPI_DMAR
+device pci
+
+# ATA controllers
+device ahci # AHCI-compatible SATA controllers
+device ata # Legacy ATA/SATA controllers
+options ATA_STATIC_ID # Static device numbering
+device mvs # Marvell 88SX50XX/88SX60XX/88SX70XX/SoC SATA
+device siis # SiliconImage SiI3124/SiI3132/SiI3531 SATA
+
+# SCSI Controllers
+device mpt # LSI-Logic MPT-Fusion
+device mps # LSI-Logic MPT-Fusion 2
+
+# ATA/SCSI peripherals
+device scbus # SCSI bus (required for ATA/SCSI)
+device ch # SCSI media changers
+device da # Direct Access (disks)
+device sa # Sequential Access (tape etc)
+device cd # CD
+device pass # Passthrough device (direct ATA/SCSI access)
+device ses # Enclosure Services (SES and SAF-TE)
+#device ctl # CAM Target Layer
+
+# RAID controllers
+
+# atkbdc0 controls both the keyboard and the PS/2 mouse
+device atkbdc # AT keyboard controller
+device atkbd # AT keyboard
+device psm # PS/2 mouse
+
+device kbdmux # keyboard multiplexer
+
+device vga # VGA video card driver
+options VESA # Add support for VESA BIOS Extensions (VBE)
+
+device splash # Splash screen and screen saver support
+
+# syscons is the default console driver, resembling an SCO console
+device sc
+options SC_PIXEL_MODE # add support for the raster text mode
+
+device agp # support several AGP chipsets
+
+# Serial (COM) ports
+device uart # Generic UART driver
+
+# Parallel port
+device ppc
+device ppbus # Parallel port bus (required)
+
+# PCI Ethernet NICs.
+device ifq_igb # Intel PRO/1000 PCIE Server Gigabit Family
+device ifq_ixgbe # Intel PRO/10GbE PCIE Ethernet Family
+
+# PCI Ethernet NICs that use the common MII bus controller code.
+# NOTE: Be sure to keep the 'device miibus' line in order to use these NICs!
+device miibus # MII bus support
+device ifq_bge # Broadcom BCM570xx Gigabit Ethernet
+device ifq_fxp # Intel EtherExpress PRO/100B (82557, 82558)
+device ifq_re # RealTek 8139C+/8169/8169S/8110S
+
+# Wireless NIC cards
+device wlan # 802.11 support
+options IEEE80211_DEBUG # enable debug msgs
+options IEEE80211_AMPDU_AGE # age frames in AMPDU reorder q's
+options IEEE80211_SUPPORT_MESH # enable 802.11s draft support
+device wlan_wep # 802.11 WEP support
+device wlan_ccmp # 802.11 CCMP support
+device wlan_tkip # 802.11 TKIP support
+device wlan_amrr # AMRR transmit rate control algorithm
+device ath # Atheros NICs
+device ath_pci # Atheros pci/cardbus glue
+device ath_hal # pci/cardbus chip support
+options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors
+options AH_AR5416_INTERRUPT_MITIGATION # AR5416 interrupt mitigation
+options ATH_ENABLE_11N # Enable 802.11n support for AR5416 and later
+device ath_rate_sample # SampleRate tx rate control for ath
+
+# Pseudo devices.
+device loop # Network loopback
+device random # Entropy device
+device padlock_rng # VIA Padlock RNG
+device rdrand_rng # Intel Bull Mountain RNG
+device ether # Ethernet support
+device vlan # 802.1Q VLAN support
+device tun # Packet tunnel.
+device md # Memory "disks"
+device gif # IPv6 and IPv4 tunneling
+device faith # IPv6-to-IPv4 relaying (translation)
+device firmware # firmware assist module
+
+# The `bpf' device enables the Berkeley Packet Filter.
+# Be aware of the administrative consequences of enabling this!
+# Note that 'bpf' is required for DHCP.
+device bpf # Berkeley packet filter
+
+# USB support
+options USB_DEBUG # enable debug msgs
+device uhci # UHCI PCI->USB interface
+device ohci # OHCI PCI->USB interface
+device ehci # EHCI PCI->USB interface (USB 2.0)
+device xhci # XHCI PCI->USB interface (USB 3.0)
+device usb # USB Bus (required)
+device ukbd # Keyboard
+device umass # Disks/Mass storage - Requires scbus and da
+
+# MMC/SD
+device mmc # MMC/SD bus
+device mmcsd # MMC/SD memory card
+device sdhci # Generic PCI SD Host Controller
+
+# VirtIO support
+device virtio # Generic VirtIO bus (required)
+device virtio_pci # VirtIO PCI device
+device vtnet # VirtIO Ethernet device
+device virtio_blk # VirtIO Block device
+device virtio_scsi # VirtIO SCSI device
+device virtio_balloon # VirtIO Memory Balloon device
+
+# HyperV drivers
+device hyperv # HyperV drivers
+
+# Xen HVM Guest Optimizations
+# NOTE: XENHVM depends on xenpci. They must be added or removed together.
+options XENHVM # Xen HVM kernel infrastructure
+device xenpci # Xen HVM Hypervisor services driver
+
+# VMware support
+device vmx # VMware VMXNET3 Ethernet
Modified: projects/ifq/sys/conf/files
==============================================================================
--- projects/ifq/sys/conf/files Sat Nov 9 10:35:29 2013 (r257886)
+++ projects/ifq/sys/conf/files Sat Nov 9 14:46:24 2013 (r257887)
@@ -1096,6 +1096,7 @@ dev/ath/ath_dfs/null/dfs_null.c optional
dev/bce/if_bce.c optional bce
dev/bfe/if_bfe.c optional bfe
dev/bge/if_bge.c optional bge
+dev/ifq_bge/if_bge.c optional ifq_bge
dev/bktr/bktr_audio.c optional bktr pci
dev/bktr/bktr_card.c optional bktr pci
dev/bktr/bktr_core.c optional bktr pci
@@ -1363,6 +1364,42 @@ dev/e1000/e1000_mbx.c optional em | igb
compile-with "${NORMAL_C} -I$S/dev/e1000"
dev/e1000/e1000_osdep.c optional em | igb \
compile-with "${NORMAL_C} -I$S/dev/e1000"
+dev/ifq_e1000/if_igb.c optional ifq_igb \
+ compile-with "${NORMAL_C} -I$S/dev/ifq_e1000"
+dev/ifq_e1000/e1000_80003es2lan.c optional ifq_igb \
+ compile-with "${NORMAL_C} -I$S/dev/ifq_e1000"
+dev/ifq_e1000/e1000_82540.c optional ifq_igb \
+ compile-with "${NORMAL_C} -I$S/dev/ifq_e1000"
+dev/ifq_e1000/e1000_82541.c optional ifq_igb \
+ compile-with "${NORMAL_C} -I$S/dev/ifq_e1000"
+dev/ifq_e1000/e1000_82542.c optional ifq_igb \
+ compile-with "${NORMAL_C} -I$S/dev/ifq_e1000"
+dev/ifq_e1000/e1000_82543.c optional ifq_igb \
+ compile-with "${NORMAL_C} -I$S/dev/ifq_e1000"
+dev/ifq_e1000/e1000_82571.c optional ifq_igb \
+ compile-with "${NORMAL_C} -I$S/dev/ifq_e1000"
+dev/ifq_e1000/e1000_82575.c optional ifq_igb \
+ compile-with "${NORMAL_C} -I$S/dev/ifq_e1000"
+dev/ifq_e1000/e1000_ich8lan.c optional ifq_igb \
+ compile-with "${NORMAL_C} -I$S/dev/ifq_e1000"
+dev/ifq_e1000/e1000_i210.c optional ifq_igb \
+ compile-with "${NORMAL_C} -I$S/dev/ifq_e1000"
+dev/ifq_e1000/e1000_api.c optional ifq_igb \
+ compile-with "${NORMAL_C} -I$S/dev/ifq_e1000"
+dev/ifq_e1000/e1000_mac.c optional ifq_igb \
+ compile-with "${NORMAL_C} -I$S/dev/ifq_e1000"
+dev/ifq_e1000/e1000_manage.c optional ifq_igb \
+ compile-with "${NORMAL_C} -I$S/dev/ifq_e1000"
+dev/ifq_e1000/e1000_nvm.c optional ifq_igb \
+ compile-with "${NORMAL_C} -I$S/dev/ifq_e1000"
+dev/ifq_e1000/e1000_phy.c optional ifq_igb \
+ compile-with "${NORMAL_C} -I$S/dev/ifq_e1000"
+dev/ifq_e1000/e1000_vf.c optional ifq_igb \
+ compile-with "${NORMAL_C} -I$S/dev/ifq_e1000"
+dev/ifq_e1000/e1000_mbx.c optional ifq_igb \
+ compile-with "${NORMAL_C} -I$S/dev/ifq_e1000"
+dev/ifq_e1000/e1000_osdep.c optional ifq_igb \
+ compile-with "${NORMAL_C} -I$S/dev/ifq_e1000"
dev/et/if_et.c optional et
dev/en/if_en_pci.c optional en pci
dev/en/midway.c optional en
@@ -1425,6 +1462,7 @@ dev/firewire/sbp_targ.c optional sbp_ta
dev/flash/at45d.c optional at45d
dev/flash/mx25l.c optional mx25l
dev/fxp/if_fxp.c optional fxp
+dev/ifq_fxp/if_fxp.c optional ifq_fxp
dev/fxp/inphy.c optional fxp
dev/gem/if_gem.c optional gem
dev/gem/if_gem_pci.c optional gem pci
@@ -1732,7 +1770,33 @@ dev/ixgbe/ixgbe_dcb.c optional ixgbe in
dev/ixgbe/ixgbe_dcb_82598.c optional ixgbe inet \
compile-with "${NORMAL_C} -I$S/dev/ixgbe"
dev/ixgbe/ixgbe_dcb_82599.c optional ixgbe inet \
- compile-with "${NORMAL_C} -I$S/dev/ixgbe"
+ compile-with "${NORMAL_C} -I$S/dev/ifq_ixgbe"
+dev/ifq_ixgbe/ixgbe.c optional ifq_ixgbe inet \
+ compile-with "${NORMAL_C} -I$S/dev/ifq_ixgbe -DSMP -DIXGBE_FDIR"
+dev/ifq_ixgbe/ixv.c optional ifq_ixgbe inet \
+ compile-with "${NORMAL_C} -I$S/dev/ifq_ixgbe"
+dev/ifq_ixgbe/ixgbe_phy.c optional ifq_ixgbe inet \
+ compile-with "${NORMAL_C} -I$S/dev/ifq_ixgbe"
+dev/ifq_ixgbe/ixgbe_api.c optional ifq_ixgbe inet \
+ compile-with "${NORMAL_C} -I$S/dev/ifq_ixgbe"
+dev/ifq_ixgbe/ixgbe_common.c optional ifq_ixgbe inet \
+ compile-with "${NORMAL_C} -I$S/dev/ifq_ixgbe"
+dev/ifq_ixgbe/ixgbe_mbx.c optional ifq_ixgbe inet \
+ compile-with "${NORMAL_C} -I$S/dev/ifq_ixgbe"
+dev/ifq_ixgbe/ixgbe_vf.c optional ifq_ixgbe inet \
+ compile-with "${NORMAL_C} -I$S/dev/ifq_ixgbe"
+dev/ifq_ixgbe/ixgbe_82598.c optional ifq_ixgbe inet \
+ compile-with "${NORMAL_C} -I$S/dev/ifq_ixgbe"
+dev/ifq_ixgbe/ixgbe_82599.c optional ifq_ixgbe inet \
+ compile-with "${NORMAL_C} -I$S/dev/ifq_ixgbe"
+dev/ifq_ixgbe/ixgbe_x540.c optional ifq_ixgbe inet \
+ compile-with "${NORMAL_C} -I$S/dev/ifq_ixgbe"
+dev/ifq_ixgbe/ixgbe_dcb.c optional ifq_ixgbe inet \
+ compile-with "${NORMAL_C} -I$S/dev/ifq_ixgbe"
+dev/ifq_ixgbe/ixgbe_dcb_82598.c optional ifq_ixgbe inet \
+ compile-with "${NORMAL_C} -I$S/dev/ifq_ixgbe"
+dev/ifq_ixgbe/ixgbe_dcb_82599.c optional ifq_ixgbe inet \
+ compile-with "${NORMAL_C} -I$S/dev/ifq_ixgbe"
dev/jme/if_jme.c optional jme pci
dev/joy/joy.c optional joy
dev/joy/joy_isa.c optional joy isa
@@ -2057,6 +2121,7 @@ dev/random/hash.c optional random
dev/random/rwfile.c optional random
dev/rc/rc.c optional rc
dev/re/if_re.c optional re
+dev/ifq_re/if_re.c optional ifq_re
dev/rndtest/rndtest.c optional rndtest
dev/rp/rp.c optional rp
dev/rp/rp_isa.c optional rp isa
Modified: projects/ifq/sys/modules/Makefile
==============================================================================
--- projects/ifq/sys/modules/Makefile Sat Nov 9 10:35:29 2013 (r257886)
+++ projects/ifq/sys/modules/Makefile Sat Nov 9 14:46:24 2013 (r257887)
@@ -154,6 +154,11 @@ SUBDIR= \
${_ipdivert} \
${_ipfilter} \
${_ipfw} \
+ ifq_bge \
+ ifq_fxp \
+ ifq_igb \
+ ifq_ixgbe \
+ ifq_re \
ipfw_nat \
${_ipmi} \
ip6_mroute_mod \
Modified: projects/ifq/sys/modules/ifq_bge/Makefile
==============================================================================
--- projects/ifq/sys/modules/bge/Makefile Sat Nov 9 10:35:29 2013 (r257886)
+++ projects/ifq/sys/modules/ifq_bge/Makefile Sat Nov 9 14:46:24 2013 (r257887)
@@ -1,8 +1,8 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../dev/bge
+.PATH: ${.CURDIR}/../../dev/ifq_bge
-KMOD= if_bge
+KMOD= ifq_bge
SRCS= if_bge.c miibus_if.h miidevs.h device_if.h bus_if.h pci_if.h
.if ${MACHINE_CPUARCH} == sparc64
Modified: projects/ifq/sys/modules/ifq_fxp/Makefile
==============================================================================
--- projects/ifq/sys/modules/fxp/Makefile Sat Nov 9 10:35:29 2013 (r257886)
+++ projects/ifq/sys/modules/ifq_fxp/Makefile Sat Nov 9 14:46:24 2013 (r257887)
@@ -1,8 +1,8 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../dev/fxp
+.PATH: ${.CURDIR}/../../dev/ifq_fxp
-KMOD= if_fxp
+KMOD= ifq_fxp
SRCS= device_if.h bus_if.h if_fxp.c inphy.c miibus_if.h miidevs.h pci_if.h
.include <bsd.kmod.mk>
Modified: projects/ifq/sys/modules/ifq_igb/Makefile
==============================================================================
--- projects/ifq/sys/modules/igb/Makefile Sat Nov 9 10:35:29 2013 (r257886)
+++ projects/ifq/sys/modules/ifq_igb/Makefile Sat Nov 9 14:46:24 2013 (r257887)
@@ -2,8 +2,8 @@
.include <bsd.own.mk>
-.PATH: ${.CURDIR}/../../dev/e1000
-KMOD = if_igb
+.PATH: ${.CURDIR}/../../dev/ifq_e1000
+KMOD = ifq_igb
SRCS = device_if.h bus_if.h pci_if.h opt_inet.h opt_inet6.h
SRCS += if_igb.c $(SHARED_SRCS)
SHARED_SRCS = e1000_api.c e1000_phy.c e1000_nvm.c e1000_mac.c e1000_manage.c
@@ -11,7 +11,7 @@ SHARED_SRCS += e1000_80003es2lan.c e1000
SHARED_SRCS += e1000_82540.c e1000_ich8lan.c e1000_82571.c e1000_osdep.c
SHARED_SRCS += e1000_82575.c e1000_vf.c e1000_mbx.c e1000_i210.c
-CFLAGS += -I${.CURDIR}/../../dev/e1000 -DSMP
+CFLAGS += -I${.CURDIR}/../../dev/ifq_e1000 -DSMP
# DEVICE_POLLING gives you non-interrupt handling
# not advisable since MSIX gives better results
Modified: projects/ifq/sys/modules/ifq_ixgbe/Makefile
==============================================================================
--- projects/ifq/sys/modules/ixgbe/Makefile Sat Nov 9 10:35:29 2013 (r257886)
+++ projects/ifq/sys/modules/ifq_ixgbe/Makefile Sat Nov 9 14:46:24 2013 (r257887)
@@ -2,9 +2,9 @@
.include <bsd.own.mk>
-.PATH: ${.CURDIR}/../../dev/ixgbe
+.PATH: ${.CURDIR}/../../dev/ifq_ixgbe
-KMOD = if_ixgbe
+KMOD = ifq_ixgbe
SRCS = device_if.h bus_if.h pci_if.h
SRCS += opt_inet.h opt_inet6.h
SRCS += ixgbe.c ixv.c
@@ -12,7 +12,7 @@ SRCS += ixgbe.c ixv.c
SRCS += ixgbe_common.c ixgbe_api.c ixgbe_phy.c ixgbe_mbx.c ixgbe_vf.c
SRCS += ixgbe_dcb.c ixgbe_dcb_82598.c ixgbe_dcb_82599.c
SRCS += ixgbe_82599.c ixgbe_82598.c ixgbe_x540.c
-CFLAGS+= -I${.CURDIR}/../../dev/ixgbe -DSMP -DIXGBE_FDIR
+CFLAGS+= -I${.CURDIR}/../../dev/ifq_ixgbe -DSMP -DIXGBE_FDIR
.if !defined(KERNBUILDDIR)
.if ${MK_INET_SUPPORT} != "no"
Modified: projects/ifq/sys/modules/ifq_re/Makefile
==============================================================================
--- projects/ifq/sys/modules/re/Makefile Sat Nov 9 10:35:29 2013 (r257886)
+++ projects/ifq/sys/modules/ifq_re/Makefile Sat Nov 9 14:46:24 2013 (r257887)
@@ -1,8 +1,8 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../dev/re
+.PATH: ${.CURDIR}/../../dev/ifq_re
-KMOD= if_re
+KMOD= ifq_re
SRCS= if_re.c device_if.h bus_if.h pci_if.h
SRCS+= miibus_if.h
More information about the svn-src-projects
mailing list