Commit 08d3bf68 authored by Mike Hibler's avatar Mike Hibler
Browse files

Changes to handle a 10.1 client with up-to-date ports.

parent 4fe36df4
......@@ -11,22 +11,28 @@ beastie_disable="YES"
# We do this at Utah for d820 nodes with 128GB.
hw.memtest.tests=0
#
# ixgbe driver will throttle back number of rx queues if not enough
# nmbclusters; i.e., less than min(cores,8) * ports_on_card * ring_bufs,
# which for the Utah d820s is 8 * 2 * 2048 == 32768. So we set nmbclusters
# to that value here (and set the other nmb* values as the kernel would
# based on that value). Note that it is not too much larger than the default
# the kernel would calculate 25600 (which is based on "maxusers").
#
# These values will get re-adjusted in the Emulab startup scripts to a
# more appropriate value based on the size of RAM and total number of
# interfaces.
#
kern.ipc.nmbclusters=32768
kern.ipc.nmbjumbop=16384
kern.ipc.nmbjumbo9=8192
kern.ipc.nmbjumbo16=4096
##
## Some drivers, most notably the Intel 10Gb "ixgbe" driver are very liberal
## with their mbuf allocation for RX buffers. That driver in particular
## wants to allocate up to 2048 buffers per interface per CPU core (up to 8).
## On the Utah d820 nodes that is 2048 * 4 * 8 == 65536 mbufs.
##
## This can cause dhclient to fail when it fires up all interfaces at once
## and the kernel runs out of mbufs.
##
## At Utah we avoid this by not dhcp'ing on the "ix" interfaces (see
## /etc/rc.d/netif-emulab) because they are never the control net. But if
## you have a 10Gb control net, or some other interface that allocates
## excessive mbufs, you may need to try the following settings or something
## even larger. Note that the relationship between the four values is the
## same as what FreeBSD uses for the defaults; i.e., each value is half the
## preceding value.
##
#kern.ipc.nmbclusters=131072
#kern.ipc.nmbjumbop=65536
#kern.ipc.nmbjumbo16=32768
#kern.ipc.nmbjumbo9=16384
# force module path, our pxeboot can mess it up
module_path="/boot/kernel;/boot/modules"
#!/bin/sh
#
# Copyright (c) 2000-2014 University of Utah and the Flux Group.
# Copyright (c) 2000-2015 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......@@ -28,10 +29,10 @@
#
# PROVIDE: netif-emulab
# REQUIRE: atm1 ipfilter mountcritlocal serial sppp sysctl
# REQUIRE: adjkerntz hostname ipfs ipnat kldxref random
# REQUIRE: atm1 FILESYSTEMS serial sppp sysctl
# REQUIRE: ipfilter ipfs netoptions
# BEFORE: netif
# KEYWORD: nojail
# KEYWORD: nojailvnet
. /etc/rc.subr
. /etc/network.subr
......@@ -218,6 +219,13 @@ cnet_start()
WA_BOOTMETHOD="dhcp"
fi
#
# Let's always bring up lo0 first.
# Needed for the static configuration case (else clause).
# Also needed for newer dhclients which need some interface to bind to.
#
ifconfig lo0 inet 127.0.0.1 up
if [ "$WA_BOOTMETHOD" = "dhcp" ]; then
#
# use good ol' Emulab dhcp!
......@@ -254,10 +262,6 @@ cnet_start()
ifconfig "$cnetif" inet "$WA_IP_ADDR" netmask "$WA_IP_NETMASK" up
route add default "$WA_IP_GATEWAY"
# bring up lo0 too, since we neuter netif
ifconfig lo0 inet 127.0.0.1 up
route add 127.0.0.1 -interface lo0
# setup resolv.conf
echo "search $WA_DOMAIN" > /etc/resolv.conf
echo "nameserver $WA_IP_DNS1" >> /etc/resolv.conf
......
......@@ -46,16 +46,7 @@ background_fsck="NO"
network_interfaces="lo0"
#
# Argh! dhclient in FreeBSD 5 has a new auto-background "feature",
# it dives into the background after 10 seconds regardless of whether
# it has received a response. This is fubar for us. Unfortunately,
# we cannot just crank this number through the roof because it is based
# on a polling interval which actually has a rational purpose. The timeout
# is actually (2 * polling_interval) where polling_interval is how often
# dhclient rechecks an interface without link. We need to keep this value
# reasonable in the event that we boot up and don't immediately have link
# on the control net. So lets try 15 seconds (30 second auto-background
# timeout) and see how things go.
# Use the ISC dhclient which support invocation with multiple interfaces.
#
dhclient_program="/usr/local/sbin/dhclient"
dhclient_flags="-i 15"
dhclient_flags="-d"
......@@ -8,8 +8,8 @@
# are being run under another UID.
#security.bsd.see_other_uids=0
# Emulab 7.x machines use linux_base-fc6
compat.linux.osrelease=2.6.16
# Emulab 10.x machines use linux_base-c6
compat.linux.osrelease=2.6.18
# do not put console output in syslog, we log console output elsewhere
kern.log_console_output=0
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment