Keith Amidon [Tue, 14 Apr 2009 23:41:17 +0000 (16:41 -0700)]
Be more conservative about bringing up interfaces when vswitchd started
Previously we were starting all bridge interfaces when vswitchd
started to help resolve issues in Xen environemnts. However, only
starting the management interface seems to be required. The
information about which interface is the management interface is
available in /etc/xensource-inventory on Xen machines, so use that to
limit the interfaces we bring up.
Justin Pettit [Tue, 14 Apr 2009 06:52:57 +0000 (23:52 -0700)]
Add "dp-del-flows" command to dpctl.
Add ability to delete flows from the datapath. Currently, there is no
way to delete specific flows--it's all or nothing. By deleting flows
from underneath the process that set them up, some confusion may arise.
For vswitchd, this only amounts to a few warning messages, though.
Justin Pettit [Tue, 14 Apr 2009 00:41:33 +0000 (17:41 -0700)]
Add support for explicitly specifying a "drop" action when adding a flow.
When adding a flow entry with dpctl, the user specifies a set of actions
to execute when a match occurs. If none are specified, then the packet
is implicitly dropped by OpenFlow. When dumping these flows, the output
of dpctl shows an action of "drop". However, dpctl did not support
adding a flow with an explicit "drop" action. This fixes that lack of
symmetry.
Justin Pettit [Tue, 14 Apr 2009 00:21:49 +0000 (17:21 -0700)]
Add description of table output to dpctl man page.
Adds a description of the output from the "dump-flows" and
"dump-aggregate" commands of dpctl. Requested by NEC.
Ben Pfaff [Thu, 9 Apr 2009 22:20:06 +0000 (15:20 -0700)]
vswitch: Add unixctl command to reload configuration file synchronously.
The Xen interface-reconfigure script wants to tell vswitchd to reload
its configuration and wait until it is complete. Until now there has
been no way to do this: sending SIGHUP causes a reload, but there is no
way to tell when it is complete. Now "vlogconf -t <socket> -e
vswitchd/reload" does the job.
Ben Pfaff [Thu, 9 Apr 2009 21:32:12 +0000 (14:32 -0700)]
Improve infrastructure for Unix socket-based local management.
"vlog_socket" was essentially a framework for management of a process
over a simple Unix domain socket interface. Unfortunately it was a little
too simple:
* It was not extensible for use by clients other than vlog.
* It was not reliable, since it was based on datagram sockets.
* It tried to hide itself using poll_fd_callback(), instead of exposing
itself through the poll loop as does almost every other entity in
the build tree.
This commit replaces vlog_socket by unixctl, which fixes these problems:
* Arbitrary commands may now be registered.
* Use of stream sockets makes it reliable.
* The interface is exposed to clients.
Ben Pfaff [Wed, 8 Apr 2009 20:46:20 +0000 (13:46 -0700)]
vlog: Make vlog_reopen_log_file() a no-op if no log file is open.
The --log-file option is supposed to be used to create a log file, but
until now, even if this isn't done, --reopen to the vlogconf program will
make it open one. This behavior was unexpected, hence this commit that
prevents it from happening.
Fixes bug #905.
Ben Pfaff [Wed, 8 Apr 2009 20:06:02 +0000 (13:06 -0700)]
vswitch: Fix handling of ARPs received on bonded interfaces.
The vswitch must handle ARPs directed to broadcast that arrived on bonded
interfaces differently based on whether they are ARP requests or replies.
This cannot be done in a flow-based manner using OpenFlow, because
OpenFlow does not distinguish between ARP requests and replies. Thus,
every such packet must be handled separately by the bonding code, and a
flow must not be set up.
Before secchan was integrated into vswitch, this was handled correctly.
This commit restores that correct behavior, by making it possible for
a normal-action callback to signal that the actions must not be used to
set up a flow.
Ben Pfaff [Wed, 8 Apr 2009 17:36:59 +0000 (10:36 -0700)]
secchan: Fix OFPPS_LINK_DOWN detection.
netdev_get_flags() was supposed to return NETDEV_CARRIER if carrier was
detected by the network device PHY, by checking for the IFF_LOWER_UP bit
in the device flags returned by the SIOCGIFFLAGS ioctl. Unfortunately,
IFF_LOWER_UP has value 0x10000 and that ioctl returns a short int, so this
bit was always read as 0, indicating that carrier was off.
There are at least two other ways to get the carrier status. One is via
rtnetlink with RTM_GETLINK. Unfortunately that is only supported on Linux
2.6.19 and up. So we fall back to the other possibility, which is
/sys/net/class/<device>/carrier. I hope that our users mount sysfs.
Ben Pfaff [Wed, 8 Apr 2009 16:45:43 +0000 (09:45 -0700)]
dpif: Optimize no-actions case in dpif_execute().
If there are no actions, then the packet will get dropped in the kernel,
so there's no point in making the system call at all.
Ben Pfaff [Wed, 8 Apr 2009 16:44:52 +0000 (09:44 -0700)]
dpif: Improve dpif_execute() log messages.
Ben Pfaff [Wed, 8 Apr 2009 16:42:00 +0000 (09:42 -0700)]
vswitch: Drop debug print that escaped.
Justin Pettit [Tue, 7 Apr 2009 22:18:16 +0000 (15:18 -0700)]
Remove "section"-style descriptions from vswitchd.conf man page.
Due to our using programs that can modify vswitchd.conf, such as
brcompatd and cfg-mod, we are discouraging the use of "section"-style
configuration. The reason is that these programs prefer the
"dotted"-style, which is easier for a program to manipulate. This
commit changes all examples to use this dotted form.
There are also a number of other cleanups and corrections that have been
made.
Keith Amidon [Tue, 7 Apr 2009 23:49:42 +0000 (16:49 -0700)]
Change paths to match locations used in installs.
Keith Amidon [Tue, 7 Apr 2009 23:48:10 +0000 (16:48 -0700)]
Have vswitchd and brcompatd installed into sbindir
This seems more appropriate given they won't be used by regular users
normally.
Keith Amidon [Tue, 7 Apr 2009 23:35:44 +0000 (16:35 -0700)]
Add appropriate extension to profile.d script.
Keith Amidon [Tue, 7 Apr 2009 23:32:16 +0000 (16:32 -0700)]
Useful path additions, aliases, and functions for vswitch debugging.
Keith Amidon [Tue, 7 Apr 2009 22:08:48 +0000 (15:08 -0700)]
Include cfg-mod man page in extra dist.
Keith Amidon [Tue, 7 Apr 2009 22:08:28 +0000 (15:08 -0700)]
Add vswitch init files to dist target.
Ben Pfaff [Tue, 7 Apr 2009 19:50:40 +0000 (12:50 -0700)]
vlog: Improve log message when rate-limiting.
OpenFlow works with many different kinds of messages, so it can be helpful
to state that specifically *log* messages were dropped. Thanks to Pete
for pointing this out (see bug #1166).
Ben Pfaff [Tue, 7 Apr 2009 19:18:34 +0000 (12:18 -0700)]
vswitch: Let mgmt.fail-mode setting be default for bridge failure mode.
This simplifies configuration, since usually all bridges should fail in
the same way.
Ben Pfaff [Tue, 7 Apr 2009 18:10:56 +0000 (11:10 -0700)]
brcompat: Add support for bonded interfaces; avoid multiple cfg_read() call.s
Bonded interfaces have to be looked up under the bonding.* hierarchy, but
the code here didn't know about that. Also, this was calling cfg_read()
and cfg_write() for every interface to be deleted, which means that our
set of bridges and interfaces could change while we were iterating. In
theory, they shouldn't have, since the file was locked, but that
assumption still made me nervous so I eliminated it.
Ben Pfaff [Tue, 7 Apr 2009 18:08:19 +0000 (11:08 -0700)]
cfg: Avoid doing unnecessary work in cfg_del_match().
It is only necessary to compact and terminate the array if we actually
modified anything.
Ben Pfaff [Tue, 7 Apr 2009 18:07:34 +0000 (11:07 -0700)]
cfg: Always null-terminate the cfg array.
Some functions depend on the cfg array being null-terminated, so be sure
to make it so when modifying the array.
cfg_add_entry() still doesn't sort the array, but it should.
Justin Pettit [Mon, 6 Apr 2009 23:58:43 +0000 (16:58 -0700)]
Use "policing-*" instead of "policing_*" in config.
The keys to enable policing used a "_" to separate words, but everything
else in vswitchd.conf uses a "-". Use a "-" to be consistent.
Justin Pettit [Mon, 6 Apr 2009 23:54:49 +0000 (16:54 -0700)]
Add hack to get around "." delimiter problem with policing vifs.
The vswitchd.conf format uses "." as a delimiter. Unfortunately, vifs
use a "." in their name. The port is specified as part of the key when
ingress policing is enabled, but the cfg parser balks at this. For the
time-being, we check all valid ports to see if they have a policing
policy defined. This is wasteful, but it works until we change the
delimiter.
Ben Pfaff [Fri, 3 Apr 2009 00:12:14 +0000 (17:12 -0700)]
cfg-mod: Add new --del-match option.
Ben Pfaff [Mon, 6 Apr 2009 22:38:30 +0000 (15:38 -0700)]
cfg: Prevent infinite loop in cfg_del_section().
When the last entry in the file was deleted, cfg_del_section() would loop
forever because *p was never set to NULL by svec_del(). (Alternatively,
it could segfault because we were accessing freed memory.)
This better implementation is also O(N) instead of O(N**2).
Ben Pfaff [Mon, 6 Apr 2009 22:36:14 +0000 (15:36 -0700)]
cfg-mod: Complain about non-option arguments, since we don't support any.
Ben Pfaff [Mon, 6 Apr 2009 22:34:35 +0000 (15:34 -0700)]
cfg-mod: Make --help work.
Justin Pettit [Sat, 4 Apr 2009 21:17:43 +0000 (14:17 -0700)]
Use "dp-show" instead of "showdp" in dpctl.
To dump information on all datapaths, dpctl has a "showdp" command. To
be more consistent with other datapath-specific commands, this has been
changed to "dp-show".
Justin Pettit [Sat, 4 Apr 2009 07:06:43 +0000 (00:06 -0700)]
Add support for ingress policing.
This adds support for ingress policing to vswitchd. This allows a user
to limit the rate of traffic entering the switch on a particular port.
This is configured on the physical port, so this a system-wide
configuration value handled through vswitchd.
Justin Pettit [Sat, 4 Apr 2009 06:16:47 +0000 (23:16 -0700)]
NetFlow configuration is no longer is limited to eight collectors.
The vswitch.conf man page stated that at most eight collectors can be
listed per bridge. That restriction has been lifted, so this just
brings the documentation in-line with the implementation.
Justin Pettit [Sat, 4 Apr 2009 05:52:57 +0000 (22:52 -0700)]
Mention SPAN and RSPAN in vswitchd.conf man page.
The terms SPAN and RSPAN are often used in what we call mirroring. This
change points out how to achieve SPAN and RSPAN configurations using our
mirroring syntax.
Justin Pettit [Fri, 3 Apr 2009 21:56:32 +0000 (14:56 -0700)]
Use new vswitchd management settings when they change.
When changes were made to the "mgmt" section of vswitchd.conf, we
weren't noticing changes if the major sections were not modified.
Thanks to Dan for reporting this.
Ben Pfaff [Fri, 3 Apr 2009 00:11:12 +0000 (17:11 -0700)]
cfg-mod: Fix --del-section long option parsing.
Justin Pettit [Thu, 2 Apr 2009 21:05:45 +0000 (14:05 -0700)]
Don't complain when setting STP sysfs values to the default one.
We don't support configuring STP through sysfs. However, Xen tries to
disable STP by writing a zero value to some fields, which is our
default. This change suppresses the warning that we don't support
setting STP sysfs values in those circumstances.
Justin Pettit [Thu, 2 Apr 2009 07:49:01 +0000 (00:49 -0700)]
Add cfg-mod, a vswitchd.conf-style manipulation utility.
This is a first cut of a simple utility for manipulating a
vswitchd.conf-style configuration file. It uses the same locking mechanism
as vswitchd and its related utilities, so it can be used safely on "live"
configurations.
The man page needs a bit more love with deeper explanations and
examples.
Justin Pettit [Wed, 1 Apr 2009 23:44:09 +0000 (16:44 -0700)]
Fix reading wrong value when bad file provided.
When a non-existent config file is specified, we print an error message.
Unfortunately, this was attempting to read the filename from the wrong
variable, so a random pointer was being treated as a string.
Ben Pfaff [Wed, 1 Apr 2009 21:32:50 +0000 (14:32 -0700)]
Log a warning when the interval between poll_block() calls is excessive.
Ben Pfaff [Wed, 1 Apr 2009 17:05:36 +0000 (10:05 -0700)]
Fix failures in unit tests.
All of these unit test failures indicated bugs in the tests, not bugs in
the code under test.
Ben Pfaff [Wed, 1 Apr 2009 16:45:17 +0000 (09:45 -0700)]
Fix typo in manpage.
Ben Pfaff [Wed, 1 Apr 2009 16:40:07 +0000 (09:40 -0700)]
Add missing debian/automake.mk.
This file was previously (before commit
61538212, "boot.sh: Avoid the need
for Git repository information") generated automatically and hence in
.gitignore, so it was easy to forget to add it.
Ben Pfaff [Wed, 1 Apr 2009 00:12:13 +0000 (17:12 -0700)]
Add forgotten header files, to fix "make dist".
Ben Pfaff [Tue, 31 Mar 2009 23:52:57 +0000 (16:52 -0700)]
boot.sh: Avoid the need for Git repository information
It should not be necessary to have a Git repository to run boot.sh; a
checked-out tree should be sufficient. This makes it so.
Some corresponding changes to ext are necessary also.
Ben Pfaff [Tue, 31 Mar 2009 21:46:27 +0000 (14:46 -0700)]
Be more liberal about what constitutes a virtual interface MAC on Xen.
The xapi sources indicate that FE:FE:FE:FE:FE:FE can sometimes be used for
virtual interfaces, in addition to the usual FE:FF:FF:FF:FF:FF, so accept
that (and other similar variants) as well.
Ben Pfaff [Tue, 31 Mar 2009 21:45:02 +0000 (14:45 -0700)]
vswitch: Do not use "xe" on XenServer, to avoid deadlock.
Commit
4ab581b949, "vswitch: Fix duplicated DPIDs observed under
XenServer," changed vswitchd to use the "xe" program to obtain the host
UUID and network name under XenServer. Unfortunately, on XenServer pool
slaves this causes a deadlock, because on such machines "xe" always
attempts to contact the master to perform database queries. Since vswitchd
is the entity that must set up the flow that "xe" initiates as part of
that connection, this will deadlock and fail.
Instead, get the host UUID from /etc/xensource-inventory and hash it with
the bridge name. Discussion with the NOX folks indicates that this should
provide sufficient stability and uniqueness.
Justin Pettit [Mon, 30 Mar 2009 20:46:58 +0000 (13:46 -0700)]
Fix newly introduced newline in brcompatd init script.
Justin Pettit [Mon, 30 Mar 2009 20:31:46 +0000 (13:31 -0700)]
Various fixes for vswitch-brcompatd init script.
Justin Pettit [Mon, 30 Mar 2009 15:58:33 +0000 (08:58 -0700)]
Fix missing newline suppression in vswitchd automake.mk.
Justin Pettit [Mon, 30 Mar 2009 08:17:49 +0000 (01:17 -0700)]
Break bridge compatibility daemon into separate process.
The user-space bridge compatibility code formally was part of the
vswitchd process. For better separation, the bridge compatibility code
has been broken into a separate process, brcompatd.
Justin Pettit [Mon, 30 Mar 2009 08:08:38 +0000 (01:08 -0700)]
Fix skipping of lines when deleting a section with the cfg library.
When deleting a section in the "cfg" library, the cfg_del_section
function would check each line in the configuration to see if it was
part of the section to be deleted. The way it deleted was essentially
to move all future lines "down" to replace the line to be deleted.
However, it always incremented the pointer to the next entry, which
could cause it to skip over other entries that should have been deleted.
We now only increment the pointer if we didn't delete a line.
Keith Amidon [Sat, 28 Mar 2009 00:06:09 +0000 (17:06 -0700)]
New init files to work with separate brcompatd program.
Justin Pettit [Wed, 25 Mar 2009 13:00:59 +0000 (06:00 -0700)]
Return error when multiple writers are modifying vswitchd.conf.
We now have multiple writers of vswitchd.conf. The bridge compatibility
module's attempts to write can now fail due to the file being locked.
This change notifies the caller of that.
Ben Pfaff [Fri, 20 Mar 2009 20:50:51 +0000 (13:50 -0700)]
vswitch: Fix duplicated DPIDs observed under XenServer.
The procedure for choosing a bridge MAC address will, in the most
ordinary case, also choose a unique MAC that we can use as a datapath
ID. In some special cases, though, multiple bridges will end up with
the same MAC address. This is OK for the bridges, but it will confuse
the OpenFlow controller, because each datapath needs a unique datapath
ID, so this commit adds some support for two common special cases on
XenServer where DPIDs were not unique.
It is also very desirable that they be stable from one run to the
next, so that policy set on a datapath "sticks".
The special cases handled by this commit are:
1. A bridge whose MAC address is taken from a VLAN network device
(that is, a network device created with vconfig(8) or similar tool)
will have the same MAC address as a bridge on the VLAN device's
physical network device.
We handle this case by hashing the physical network device MAC
along with the VLAN identifier.
2. A purely internal bridge, that is, one that has no non-virtual
network devices on it at all, is more difficult because it has no
natural unique identifier at all.
When the host is a XenServer, we handle this case by asking "xe"
for the internal bridge's plaintext name (e.g. "Internal Network
1") and hashing that together with the XenServer's host UUID.
When the host is not a XenServer, we punt by using a random MAC
address on each run.
Ben Pfaff [Fri, 20 Mar 2009 20:47:35 +0000 (13:47 -0700)]
process: New function process_search_path().
The process code already had the logic to search PATH for a file, but
it didn't export it, and it didn't return the executable that was found.
This exports it and returns the name, for the benefit of an upcoming
commit that wants to search the PATH for an executable only once per
program run.
Ben Pfaff [Fri, 20 Mar 2009 20:45:19 +0000 (13:45 -0700)]
sha1: New function SHA1Bytes().
This is convenient for hashing an array with less work.
Ben Pfaff [Fri, 20 Mar 2009 20:41:58 +0000 (13:41 -0700)]
sha1: Fix indentation.
Ben Pfaff [Fri, 20 Mar 2009 20:41:44 +0000 (13:41 -0700)]
packets: New function eth_addr_mark_random().
This function is useful for turning a sequence of random bits into a valid
MAC address, which we need for generating DPIDs under Xen.
Ben Pfaff [Fri, 20 Mar 2009 20:38:48 +0000 (13:38 -0700)]
netdev: New function for obtaining the VID of a VLAN network device.
This is needed for autogenerating a unique datapath ID on Xen, on which
a VLAN bridge reuses the bridge address of the VLAN device's physical
network device.
Keith Amidon [Fri, 20 Mar 2009 06:21:37 +0000 (23:21 -0700)]
Remove vswitchd.conf so blank file doesn't overwrite an existing one.
Currently the file does not have anything in it. There isn't much
reason to have anything in it for the normal Xen case because the file
contents are managed by other tools (xapi, etc.) In the future, if we
decide a commented version of the file is useful after all, we can
include a vswitchd.conf.example.
Ben Pfaff [Thu, 19 Mar 2009 21:02:07 +0000 (14:02 -0700)]
secchan: Remove ofproto hook functions that are no longer used.
Ben Pfaff [Thu, 19 Mar 2009 20:56:08 +0000 (13:56 -0700)]
secchan: Make fail-open work using a wildcard rule (and flush the flow table).
Fail-open was implemented by grabbing packets as they came in and then
shoving them into a learning switch, but this interacted badly with
vswitch. First, it didn't respect the vswitch architecture; e.g. VLAN
and bonding settings were ignored. Second, it didn't override any rules
that were still in the flow table from the last time we were connected to
a controller, which could cause other things to break if those rules were
bad (or if some host just wasn't authenticated etc.)
This commit fixes these problems by making fail-open use a wildcard rule
and OFPP_NORMAL, so that vswitch then implements VLANs etc., and by
flushing the flow table when we go into fail-open, getting rid of any
bad rules.
Ben Pfaff [Thu, 19 Mar 2009 20:52:03 +0000 (13:52 -0700)]
secchan: When we flush the flow table, add the in-band control rules back in.
ofproto_flush_flows() deletes all the flows from the flow table, even the
ones added by in-band control. If that happens we need to add them back
in.
This should be the only place that the in-band control rules can get
deleted, since their priorities are such that the controller cannot see
or modify them.
Ben Pfaff [Thu, 19 Mar 2009 20:50:06 +0000 (13:50 -0700)]
secchan: Force revalidation in ofproto_add_flow(), ofproto_delete_flow().
This code needs to have flows be revalidated if the rule includes
wildcards, just like add_flow() and modify_flow().
Ben Pfaff [Thu, 19 Mar 2009 19:59:34 +0000 (12:59 -0700)]
vswitch: Force local port into bridge when in-band control configured.
In-band control requires that local port be part of the bridge. This used
to not matter, because in-band control stole packet-in messages before they
got to any part of the code that cared about configured ports, but now that
in-band control goes through the same flow table as everything else, it
matters.
Ben Pfaff [Thu, 19 Mar 2009 19:39:00 +0000 (12:39 -0700)]
vswitch: Don't choose Xen's FE:FF:FF:FF:FF:FF address as bridge MAC or DPID.
Xen uses FE:FF:FF:FF:FF:FF as the mac address for every virtual interface.
If we have a bridge that has just virtual interfaces, then this will end
up as the bridge's MAC address and thus the datapath ID also. So, instead,
use the bridge's randomly chosen MAC address if this case comes up.
This is probably not the end of this issue, since we probably want the
DPID of such bridges to be predictable. Need to figure out how to do that.
Ben Pfaff [Thu, 19 Mar 2009 19:57:17 +0000 (12:57 -0700)]
Remove debug printf() that escaped.
Ben Pfaff [Thu, 19 Mar 2009 18:16:29 +0000 (11:16 -0700)]
vswitch: Add rate-limiting support.
Ben Pfaff [Thu, 19 Mar 2009 18:16:08 +0000 (11:16 -0700)]
pinsched: Move rate-limiting sanity checks into pinsched.
The vswitch will want to do the same sanity checks so it is better to
put them in a single place.
Ben Pfaff [Thu, 19 Mar 2009 18:14:55 +0000 (11:14 -0700)]
secchan: Fix rate-limiting statistics reporting.
The n_queue_dropped value wasn't being updated at all.
n_tx_dropped wasn't being updated either but the packet scheduler no longer
has enough information to track it, so this statistic has just been
dropped.
Ben Pfaff [Thu, 19 Mar 2009 17:41:37 +0000 (10:41 -0700)]
dpif: Accept 64 kB packets from the kernel.
Under virtualization (e.g. Xen) we sometimes receive packets as large as
64 kB, so the dpif code has to be prepared to accept it.
The only place where we keep these packets around for any amount of time
is when we need to schedule them for sending later, so trim them down
from 64 kB to their actual size in that case.
Ben Pfaff [Thu, 19 Mar 2009 17:39:32 +0000 (10:39 -0700)]
New function ofpbuf_trim(), for freeing up wasted space in ofpbufs.
The dpif code will start allocating 64 kB buffers in the next commit,
since sometimes we get packets that big under virtualization. But we
need to trim them down if we're going to store them for any time, so
we need a function to do it.
Keith Amidon [Thu, 19 Mar 2009 17:08:37 +0000 (10:08 -0700)]
In init script, redirect core files to known writable directory in Xen
"Embedded" XenServers don't have a writable "/" directory. For now
point cores to /var/log, which is known to be writable.
Keith Amidon [Thu, 19 Mar 2009 16:55:50 +0000 (09:55 -0700)]
Change init script to interact with xapi better at boot.
It seems that with a controller specified in vswitchd, previously
there was a bad interaction between vswitchd and xapi during boot that
prevented the management interface from ever coming up. The solution
here is to force all bridge interfaces up when vswitchd starts, so
they are already up when xapi attempts to bring them up. Since the
interfaces are coming up earlier as a result, we move vswitch back in
the boot sequence after iptables starts.
This patch also contains a bunch of lines that have only changed in
whitespace because half the indentation in this file was done using
tabs and the other half was done with spaces...
Ben Pfaff [Thu, 19 Mar 2009 00:12:25 +0000 (17:12 -0700)]
secchan: Aggregate multiple NetFlow messages into a single packet.
Completes feature #1012.
Ben Pfaff [Wed, 18 Mar 2009 23:32:19 +0000 (16:32 -0700)]
secchan: Make NetFlow work with any flow, not just exact-match.
NetFlow only worked with exact-match flows until now. This commit extends
it to also work with wildcarded flows, which is increasingly important now
that NOX sets up a lot of these.
Ben Pfaff [Wed, 18 Mar 2009 23:27:02 +0000 (16:27 -0700)]
vlog: Trim trailing new-lines from log messages.
Sometimes a message passed into a vlog function will have a trailing
new-line due to carelessness. Tolerate this situation by just
trimming them off in format_log_message().
Keith Amidon [Wed, 18 Mar 2009 18:20:07 +0000 (11:20 -0700)]
Fix vswitch init.d file
- Add options for restarting under strace and valgrind
- Make updating modules work again
- Optimize datapath add/remove using showdp output
Ben Pfaff [Wed, 18 Mar 2009 19:42:38 +0000 (12:42 -0700)]
Restore the default maximum backoff to 15 seconds for secchan and vswitchd.
15 seconds has always been the documented default maximum backoff, but the
secchan restructuring accidentally changed it to 1 second.
Thanks to Reid for noticing.
Ben Pfaff [Wed, 18 Mar 2009 17:59:48 +0000 (10:59 -0700)]
secchan: Properly maintain super-rule's list of subrules when revalidating.
When we revalidated a subrule and found that it had a new super-rule,
we changed the subrule's pointer to its super-rule (rule->super), but
we failed to actually transfer it from the previous super-rule's list
of subrules to the new super-rule's list. This fixes the problem.
Ben Pfaff [Wed, 18 Mar 2009 17:46:46 +0000 (10:46 -0700)]
secchan: Fix memory leak.
Ben Pfaff [Wed, 18 Mar 2009 17:28:27 +0000 (10:28 -0700)]
dpif: Clear stats before deleting or query flows.
This placates Valgrind, but it also makes results more reproducible if a
caller does not check the return value.
Ben Pfaff [Wed, 18 Mar 2009 17:20:09 +0000 (10:20 -0700)]
dpctl: Make examples in the manpage more generic.
Ben Pfaff [Wed, 18 Mar 2009 17:03:14 +0000 (10:03 -0700)]
dpctl: Allow datapath names to be given in place of switch names.
It is convenient to be able to type, e.g., "dpctl show xenbr0" instead of
"dpctl show unix:/var/run/xenbr0.mgmt", so this allows this form.
Justin Pettit [Wed, 18 Mar 2009 00:35:00 +0000 (17:35 -0700)]
Fix mirroring when no selection criteria provided. (Bug #1112)
Mirroring wouldn't occur when no selection criteria was provided. If a
source/destination port or vlan were provided, mirroring would work as
expected. This fixes that.
Justin Pettit [Tue, 17 Mar 2009 23:14:11 +0000 (16:14 -0700)]
Remove extraneous debug message.
Ben Pfaff [Wed, 18 Mar 2009 00:23:35 +0000 (17:23 -0700)]
secchan: Make default normal action do switching.
The default normal action is what OFPP_NORMAL does in secchan when vswitchd
is not running. Before, this was equivalent to OFPP_FLOOD. With this
change, the behavior changes to acting as a learning switch.
This makes the recent changes to in-band control more efficient when
running in secchan without vswitchd, since we don't really want to flood
all the packets to and from the controller.
Ben Pfaff [Wed, 18 Mar 2009 00:16:22 +0000 (17:16 -0700)]
Make ofproto manage the revalidation set, instead of vswitchd.
In an upcoming change, ofproto will want to add revalidation entries of its
own, so it is better to have it manage a single revalidation set rather
than having two separate sets, one in ofproto and one in vswitchd.
Ben Pfaff [Wed, 18 Mar 2009 00:14:23 +0000 (17:14 -0700)]
in-band: Use OFPP_NORMAL instead of OFPP_LOCAL for traffic to local port.
If we use OFPP_LOCAL then the code that implements the normal action won't
get a chance to learn from these packets.
This change seems somewhat risky, since in-band control is so touchy, which
is why it is broken out as a separate commit that can easily be reverted.
Ben Pfaff [Wed, 18 Mar 2009 00:02:20 +0000 (17:02 -0700)]
secchan: Implement in-band control using wildcard rules.
Until now, there has been a problem with flows set up by the controller
overriding in-band control decisions: if the controller sets up, say, a
flow that matches every packet, then the in-band control flow miss handler
will never be called, and the connection to the controller may well fail.
This commit fixes the problem by implementing in-band control in terms
of wildcard rules that have a higher priority than any rule that can be
set up by the OpenFlow controller.
This should also fix the issue that in-band control does not respect VLANs
and other structure set up by the vswitch, since the rules set up by
in-band control use OFPP_NORMAL.
Ben Pfaff [Tue, 17 Mar 2009 23:10:40 +0000 (16:10 -0700)]
secchan: Support priorities over UINT16_MAX for internal use.
The plan is for in-band control to use these higher priorities for flows
that are to be hidden from, and take precedence over, flows set up by the
controller.
Ben Pfaff [Tue, 17 Mar 2009 21:42:24 +0000 (14:42 -0700)]
classifier: Expand the classifier priority range to 32 bits.
secchan will reserve priorities above UINT16_MAX for its own purposes
(e.g. in-band control).
Justin Pettit [Tue, 17 Mar 2009 21:51:45 +0000 (14:51 -0700)]
Read netflow config from vswitchd.conf (Bug #1087).
The bridge wasn't reading the netflow configuration from vswitchd.conf,
so it was never generating NetFlow messages. This fixes that.
Ben Pfaff [Tue, 17 Mar 2009 20:50:13 +0000 (13:50 -0700)]
secchan: Tolerate local port change in MAC address.
Before, if the local port's MAC address changed, we would not notice, and
continue to set up flows only for the local port's current MAC address,
which completely broke in-band control.
Now, we notice changes and start to set up flows for the new MAC address
instead.
Fixes bug #1081.
Ben Pfaff [Tue, 17 Mar 2009 20:48:49 +0000 (13:48 -0700)]
secchan: Get rid of static data in in-band control.
The notion of the controller's IP and MAC address in in-band control was
global. This is incorrect if different switches within a process have
different controller. Make this data part of "struct in_band" instead.
Ben Pfaff [Tue, 17 Mar 2009 17:54:33 +0000 (10:54 -0700)]
secchan: Remove idle flows from datapath even if their rules haven't expired.
Ben Pfaff [Tue, 17 Mar 2009 17:53:22 +0000 (10:53 -0700)]
secchan: Simplify code by making rule_uninstall() update stats.
All the callers wanted to update the stats of the rule being uninstalled,
or at least didn't mind, so this makes the code easier to read and
maintain.
Ben Pfaff [Tue, 17 Mar 2009 17:51:21 +0000 (10:51 -0700)]
secchan: Make expire_rule() slightly easier to read.
Search-and-replace "expiration" by "expire". In the next commit this
will keep from needing to wrap more lines, making the code easier to read
there too.
Ben Pfaff [Tue, 17 Mar 2009 17:24:28 +0000 (10:24 -0700)]
secchan: Track datapath actions in userspace, to avoid system calls.
Until now, secchan had no way to determine when datapath actions actually
changed, and so it had to be conservative and update all flows' actions,
or almost all, in some circumstances.
With this commit, secchan keeps track of flows' actions in allocated memory
and only updates them in the datapath when they actually change.
As part of the change, this factors out common code into new functions
rule_install() and rule_uninstall(), which should make secchan more
maintainable.