openvswitch
12 years agovswitch.xml: Document more details of CFM intervals.
Ben Pfaff [Mon, 30 Apr 2012 18:24:59 +0000 (11:24 -0700)]
vswitch.xml: Document more details of CFM intervals.

Signed-off-by: Ben Pfaff <blp@nicira.com>
12 years agoovs-appctl: Point to individual daemon manpages in docs.
Ben Pfaff [Mon, 30 Apr 2012 18:24:31 +0000 (11:24 -0700)]
ovs-appctl: Point to individual daemon manpages in docs.

Sometimes users seem surprised that appctl commands are documented.

Signed-off-by: Ben Pfaff <blp@nicira.com>
12 years agonetdev: Document use for get_etheraddr member of struct netdev_class.
Ben Pfaff [Mon, 30 Apr 2012 18:23:38 +0000 (11:23 -0700)]
netdev: Document use for get_etheraddr member of struct netdev_class.

This has confused developers adding hardware support, e.g.:
http://openvswitch.org/pipermail/dev/2012-April/016350.html

Signed-off-by: Ben Pfaff <blp@nicira.com>
12 years agoconnmgr: Log when controllers are added and removed.
Ben Pfaff [Mon, 30 Apr 2012 20:56:49 +0000 (13:56 -0700)]
connmgr: Log when controllers are added and removed.

Otherwise occasionally during debugging it can hard to figure out why a
controller connection seemed to drop for a while (when in fact it happened
because the configuration changed).

Suggested-by: Natasha Gude <natasha@nicira.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
12 years agoINSTALL.Linux: Document use of "sparse" with Open vSwitch.
Ben Pfaff [Mon, 30 Apr 2012 19:59:11 +0000 (12:59 -0700)]
INSTALL.Linux: Document use of "sparse" with Open vSwitch.

Signed-off-by: Ben Pfaff <blp@nicira.com>
12 years agocfm: Avoid constructing log message that will be dropped by rate-limiting.
Ben Pfaff [Mon, 30 Apr 2012 20:01:43 +0000 (13:01 -0700)]
cfm: Avoid constructing log message that will be dropped by rate-limiting.

Signed-off-by: Ben Pfaff <blp@nicira.com>
12 years agoovs-bugtool: Add "ovs-vsctl show" output to bugtool.
Ben Pfaff [Mon, 30 Apr 2012 17:47:51 +0000 (10:47 -0700)]
ovs-bugtool: Add "ovs-vsctl show" output to bugtool.

The information output by "ovs-vsctl show" is a subset of that available
elsewhere in bugtool output, but it is human-readable instead of needing
to be processed through ovsdb-server or ovsdb-tool, so it is much more
convenient for basic diagnosis.

Signed-off-by: Ben Pfaff <blp@nicira.com>
12 years agoovs-bugtool: Add "ovs-appctl coverage/show" output to bugtool.
Ben Pfaff [Fri, 27 Apr 2012 21:07:51 +0000 (14:07 -0700)]
ovs-bugtool: Add "ovs-appctl coverage/show" output to bugtool.

This can be useful for diagnosis.

Signed-off-by: Ben Pfaff <blp@nicira.com>
12 years agodebian: Install ovs-bugtool scripts by wildcard to openvswitch-common.
Ben Pfaff [Mon, 30 Apr 2012 17:29:45 +0000 (10:29 -0700)]
debian: Install ovs-bugtool scripts by wildcard to openvswitch-common.

Same for debian/copyright.

This reduces the number of files to update when we add bugtool plugins.

Signed-off-by: Ben Pfaff <blp@nicira.com>
12 years agoxenserver: Update Open vSwitch post upgrade instructions.
Gurucharan Shetty [Thu, 26 Apr 2012 17:57:47 +0000 (10:57 -0700)]
xenserver: Update Open vSwitch post upgrade instructions.

Currently, when we upgrade the userspace rpm for XenServer,
we print a message asking users to reboot the hypervisor.
This is not needed. The reboot of hypervisor is needed when
we upgrade the rpm containing the kernel module.  This
reboot can sometimes be avoided by running a
"service openvswitch force-reload-kmod".

Signed-off-by: Gurucharan Shetty <gshetty@nicira.com>
12 years agometa-flow: Correctly set destination MAC in mf_set_flow_value().
Ben Pfaff [Fri, 27 Apr 2012 15:45:10 +0000 (08:45 -0700)]
meta-flow: Correctly set destination MAC in mf_set_flow_value().

Signed-off-by: Ben Pfaff <blp@nicira.com>
12 years agorconn: Simplify rconn_send() semantics.
Ethan Jackson [Thu, 26 Apr 2012 04:12:18 +0000 (21:12 -0700)]
rconn: Simplify rconn_send() semantics.

Before this patch, rconn_send() would delete 'b' on success, and
not on error.  This is confusing and error-prone.  This patch
causes rconn_send() to always delete 'b'.

Signed-off-by: Ethan Jackson <ethan@nicira.com>
12 years agonicira-ext: Support masking of nd_target field
Ansis Atteka [Wed, 25 Apr 2012 22:48:40 +0000 (15:48 -0700)]
nicira-ext: Support masking of nd_target field

This commit adds support to specify a mask in CIDR format for
the nd_target field.

Signed-off-by: Ansis Atteka <aatteka@nicira.com>
12 years agocoverage: Make ovs-appctl command more useful and less alarming.
Ben Pfaff [Fri, 20 Apr 2012 21:09:30 +0000 (14:09 -0700)]
coverage: Make ovs-appctl command more useful and less alarming.

I've had a few complaints that ovs-vswitchd logs its coverage counters
at WARN level, but this is mainly wrong: ovs-vswitchd only logs coverage
counters at WARN level when the "coverage/log" command is used through
ovs-appctl.  This was even documented.

The reason to log at such a high level was to make it fairly certain that
these messages specifically requested by the admin would not be filtered
out before making it to the log.  But it's even better if the admin just
gets the coverage counters as a reply to the ovs-appctl command.  So that
is what this commit does.

This commit also improves the documentation of the ovs-appctl command.

Signed-off-by: Ben Pfaff <blp@nicira.com>
12 years agocoverage: Rate-limit logging coverage information.
Ben Pfaff [Fri, 20 Apr 2012 20:51:13 +0000 (13:51 -0700)]
coverage: Rate-limit logging coverage information.

I'd always assumed that the exponentially weighted moving average code in
timeval was enough rate-limiting, but I actually encountered a pathological
case some time ago that forced this coverage information to print once a
second or so, which seems too often.

Signed-off-by: Ben Pfaff <blp@nicira.com>
12 years agotimeval: Rate-limit logging rusage information.
Ben Pfaff [Fri, 20 Apr 2012 20:43:54 +0000 (13:43 -0700)]
timeval: Rate-limit logging rusage information.

I'd always assumed that the exponentially weighted moving average code
here was sufficient rate-limiting, but I actually encountered a
pathological case some time ago that forced this rusage information to
print once a second or so, which seems too often.

Signed-off-by: Ben Pfaff <blp@nicira.com>
12 years agocfm: Log fault status changes more informatively.
Ben Pfaff [Fri, 20 Apr 2012 21:52:16 +0000 (14:52 -0700)]
cfm: Log fault status changes more informatively.

Until now, fault status changes just log the new status.  This means that
the administrator has to find two consecutive status change messages to
see what actually changed.

This commit changes the log message format to prefix new faults with '+'
and faults that disappeared with '-'.  Existing faults that are still
present are not prefixed.

This also simplifies the code a little by making ds_put_cfm_fault()
put spaces before fault names instead of after.

Signed-off-by: Ben Pfaff <blp@nicira.com>
12 years agojson: Correct position tracking in JSON parser implementations.
Ben Pfaff [Thu, 26 Apr 2012 16:48:28 +0000 (09:48 -0700)]
json: Correct position tracking in JSON parser implementations.

When json_lex_input() returns false, the parser does not consume the byte
passed in.  That byte will get processed again in the next iteration of
the json_parser_feed() loop.  Therefore, until now, this code has
double-counted bytes that cause a false return from json_lex_input().

This fixes the problem.  Every input byte is now counted only once.

Signed-off-by: Ben Pfaff <blp@nicira.com>
12 years agojsonrpc: Keep jsonrpc_recv() from taking over the CPU.
Ben Pfaff [Tue, 24 Apr 2012 17:57:41 +0000 (10:57 -0700)]
jsonrpc: Keep jsonrpc_recv() from taking over the CPU.

jsonrpc_recv() could take an unbounded amount of CPU time as long as data
kept arriving, preventing other work from taking place.  This limits the
amount of work to processing at most 25 kB of received data and then
yielding to the caller.

Signed-off-by: Ben Pfaff <blp@nicira.com>
12 years agoFix memory leaks.
Ben Pfaff [Mon, 23 Apr 2012 20:22:10 +0000 (13:22 -0700)]
Fix memory leaks.

Found by valgrind.

Reported-by: Ethan Jackson <ethan@nicira.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
12 years agoAdd OXM data to mf_fields
Simon Horman [Wed, 25 Apr 2012 01:18:30 +0000 (10:18 +0900)]
Add OXM data to mf_fields

Add oxm_name and oxm_header elements to struct mf_field
and populate those entries for fields that are present
in both NXM and the OXM basic class.

This implementation was suggested by Ben Pfaff.

This does not address any possible differences in the NXM and
OXM basic class fields, for instance different maskability.
That may be addressed later as needed.

Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: Ben Pfaff <blp@nicira.com>
12 years agoAdd OXM_OF_* definitions
Simon Horman [Wed, 25 Apr 2012 01:18:29 +0000 (10:18 +0900)]
Add OXM_OF_* definitions

These oxm_type definitions values will may be used
when parsing serialising OXM TLVs.

Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: Ben Pfaff <blp@nicira.com>
12 years agoCorrect OFPXMC12_{OPENFLOW_BASIC,EXPERIMENTER} definitions
Simon Horman [Wed, 25 Apr 2012 01:18:28 +0000 (10:18 +0900)]
Correct OFPXMC12_{OPENFLOW_BASIC,EXPERIMENTER} definitions

This corrects errors that appear to have been included
by me in the original version.

Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: Ben Pfaff <blp@nicira.com>
12 years agovswitchd: Clean up iface_create().
Ben Pfaff [Tue, 24 Apr 2012 23:53:01 +0000 (16:53 -0700)]
vswitchd: Clean up iface_create().

iface_create() did its work in an order that meant it had to do a lot more
cleanup on error paths than is otherwise needed.  This commit reorders the
work to avoid this extra cleanup.

bridge_ofproto_port_del() is no longer used after the refactoring so this
commit deletes it.

Signed-off-by: Ben Pfaff <blp@nicira.com>
12 years agovswitchd: Make reconfiguration update port configuration again.
Ben Pfaff [Tue, 24 Apr 2012 23:47:27 +0000 (16:47 -0700)]
vswitchd: Make reconfiguration update port configuration again.

Commit bae7208e91a0 (bridge: Refactor bridge_reconfigure().) introduced
a regression in bridge reconfiguration.  Previously, reconfiguration would
update the configuration of each bridge port, so that if the controller
(or the admin) changed a port's options, then that change would propagate
to the datapath.  Following that commit, that no longer happened.

This commit restores that feature.

Bug #10972.
Reported-by: Michael Hu <mhu@nicira.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
12 years agovswitchd: Make iface_create() return an indication of success.
Ben Pfaff [Tue, 24 Apr 2012 23:39:50 +0000 (16:39 -0700)]
vswitchd: Make iface_create() return an indication of success.

This is the minimal change that gets the job done.  There are much nicer
ways to do this, but I'll leave that refactoring for later in the series.

The return value will have its first user in an upcoming commit.

Signed-off-by: Ben Pfaff <blp@nicira.com>
12 years agovswitchd: Factor code to configure netdevs out of iface_create().
Ben Pfaff [Tue, 24 Apr 2012 23:28:18 +0000 (16:28 -0700)]
vswitchd: Factor code to configure netdevs out of iface_create().

An upcoming patch will need the same code in another function.

Signed-off-by: Ben Pfaff <blp@nicira.com>
12 years agovswitchd: Refactor iface_refresh_type() into iface_get_type().
Ben Pfaff [Tue, 24 Apr 2012 22:59:42 +0000 (15:59 -0700)]
vswitchd: Refactor iface_refresh_type() into iface_get_type().

The calculation that this function does will need to be used in a
context where no "struct iface" is available in an upcoming commit.

Signed-off-by: Ben Pfaff <blp@nicira.com>
12 years agovswitchd: Drop 'need_refresh' member from struct iface.
Ben Pfaff [Tue, 24 Apr 2012 22:43:11 +0000 (15:43 -0700)]
vswitchd: Drop 'need_refresh' member from struct iface.

It's no longer useful.

Signed-off-by: Ben Pfaff <blp@nicira.com>
12 years agovswitchd: Push ofproto_port declaration down to inner blocks.
Ben Pfaff [Tue, 24 Apr 2012 21:56:53 +0000 (14:56 -0700)]
vswitchd: Push ofproto_port declaration down to inner blocks.

Just a tiny code cleanup.

Signed-off-by: Ben Pfaff <blp@nicira.com>
12 years agobridge: Ignore null interfaces as required.
Ethan Jackson [Mon, 23 Apr 2012 16:25:07 +0000 (09:25 -0700)]
bridge: Ignore null interfaces as required.

This issue has been around for quite some time.  It doesn't really
cause problems beyond some spurious warnings.

Signed-off-by: Ethan Jackson <ethan@nicira.com>
12 years agovswitchd: Report actual port number, not -1, in "added interface" message.
Ben Pfaff [Tue, 24 Apr 2012 17:44:54 +0000 (10:44 -0700)]
vswitchd: Report actual port number, not -1, in "added interface" message.

CC: Ethan Jackson <ethan@nicira.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
12 years agovswitch.xml: Document Interface external-ids:iface-status.
Ben Pfaff [Tue, 24 Apr 2012 17:07:49 +0000 (10:07 -0700)]
vswitch.xml: Document Interface external-ids:iface-status.

This has been implemented for a long time but we forgot to document it.

Signed-off-by: Ben Pfaff <blp@nicira.com>
12 years agobridge: Refactor bridge_reconfigure().
Ethan Jackson [Sat, 21 Apr 2012 02:11:35 +0000 (19:11 -0700)]
bridge: Refactor bridge_reconfigure().

The existing bridge_reconfigure() implementation is suboptimal.
When adding lots of new ports, on every pass through the run loop
it allocates a bunch of "struct iface"s and "struct port"s, only to
destroy them when out of time.  Additionally, when there are errors
adding or deleting ports, it can fail to converge.  Instead it will
attempt and fail to add the same set of ports forever.

This patch rewrites bridge_reconfigure() using a new strategy.
Whenever the database changes, some initial bookkeeping is done,
and a list of future work is compiled.  The bridge begins whittling
down this list, and stops processing database changes until
finished.

Bug #10902.
Signed-off-by: Ethan Jackson <ethan@nicira.com>
12 years agovswitchd: Remove unused 'tag' from 'struct iface'.
Ethan Jackson [Fri, 20 Apr 2012 19:57:29 +0000 (12:57 -0700)]
vswitchd: Remove unused 'tag' from 'struct iface'.

Signed-off-by: Ethan Jackson <ethan@nicira.com>
12 years agoDESIGN: Describe principles of in-band control.
Ben Pfaff [Mon, 23 Apr 2012 21:15:32 +0000 (14:15 -0700)]
DESIGN: Describe principles of in-band control.

These principles are drawn from an email I sent to the openflow-spec list
long ago.

Signed-off-by: Ben Pfaff <blp@nicira.com>
12 years agotests: Generalize 'sed' calls in MAC learning test to more than one digit.
Ben Pfaff [Mon, 23 Apr 2012 17:07:29 +0000 (10:07 -0700)]
tests: Generalize 'sed' calls in MAC learning test to more than one digit.

With "check-valgrind" the test can take more than 10 seconds to run, so
replacing only a single trailing digit with ? ends up with 1? which causes
the test to fail.

Signed-off-by: Ben Pfaff <blp@nicira.com>
12 years agotests: Avoid daemon race between pidfile creation and parent notification.
Ben Pfaff [Mon, 23 Apr 2012 17:05:50 +0000 (10:05 -0700)]
tests: Avoid daemon race between pidfile creation and parent notification.

This was causing "check-valgrind" to sometimes fail in this test.

Signed-off-by: Ben Pfaff <blp@nicira.com>
12 years agoofproto: Fix use-after-free error when ports disappear.
Ben Pfaff [Mon, 23 Apr 2012 16:16:18 +0000 (09:16 -0700)]
ofproto: Fix use-after-free error when ports disappear.

update_port() can delete the port for which it is called, if the underlying
network device has been destroyed, so HMAP_FOR_EACH is unsafe in
ofproto_run().

Less obviously, update_port() can delete unrelated ports.  For example,
suppose that initially device A is port 1 and device B is port 2.  If
update_port("A") runs just after this, then it will ofport_remove() both
ports, then ofport_install() A as the new port 2.

So this commit first assembles a list of ports to update, then updates them
in a separate loop.

Without this commit, running "ovs-dpctl del-dp" while ovs-vswitchd is
running consistently causes a crash for me within a few seconds.

Signed-off-by: Ben Pfaff <blp@nicira.com>
12 years agovswitchd: Make "cfm_health" column ephemeral.
Ben Pfaff [Fri, 20 Apr 2012 18:12:46 +0000 (11:12 -0700)]
vswitchd: Make "cfm_health" column ephemeral.

There's no need to log this to the on-disk database.

Spotted while examining "ovsdb-tool show-log" output.

Reported-by: Ethan Jackson <ethan@nicira.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
12 years agovswitchd: Make "cfm_fault_status" column ephemeral.
Ben Pfaff [Fri, 20 Apr 2012 18:03:14 +0000 (11:03 -0700)]
vswitchd: Make "cfm_fault_status" column ephemeral.

There's no need to log this to the on-disk database.

Spotted while examining "ovsdb-tool show-log" output.

Signed-off-by: Ben Pfaff <blp@nicira.com>
12 years agoautomake: ofp-errors.[c|inc] are actually inside srcdir
Ansis Atteka [Thu, 19 Apr 2012 19:54:16 +0000 (12:54 -0700)]
automake: ofp-errors.[c|inc] are actually inside srcdir

This patch fixes a build error when OVS is built inside
"./_debian" directory.

To reproduce this issue run "fakeroot debian/rules binary"
or "debuild binary" inside the git root directory.

Signed-off-by: Ansis Atteka <aatteka@nicira.com>
12 years agodocumantation: Trivial fix for kvm option error.
Yasuhito Takamiya [Fri, 20 Apr 2012 14:38:04 +0000 (07:38 -0700)]
documantation: Trivial fix for kvm option error.

Signed-off-by: Yasuhito Takamiya <yasuhito@gmail.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
12 years agoovs-vsctl: Speed up port management operations with many ports.
Ben Pfaff [Tue, 17 Apr 2012 23:56:21 +0000 (16:56 -0700)]
ovs-vsctl: Speed up port management operations with many ports.

This makes a sequence of 10,000 "add-port" operations on a single ovs-vsctl
command line about 4X faster.  It makes a sequence of 10,000 "del-port"
operations on a single command line over 2X faster.

It works by not repopulating the cache of relationships between bridges,
ports, and interfaces after most operations, instead updating them
incrementally in-place.

Signed-off-by: Ben Pfaff <blp@nicira.com>
12 years agoovs-vsctl: Remove 'ctrl', 'n_ctrl' from struct vsctl_bridge.
Ben Pfaff [Tue, 17 Apr 2012 20:56:38 +0000 (13:56 -0700)]
ovs-vsctl: Remove 'ctrl', 'n_ctrl' from struct vsctl_bridge.

Only the controller commands used these members and they didn't even help
those commands very much.

Signed-off-by: Ben Pfaff <blp@nicira.com>
12 years agoovs-vsctl: Remove 'fail_mode' member from struct vsctl_bridge.
Ben Pfaff [Thu, 19 Apr 2012 21:27:40 +0000 (14:27 -0700)]
ovs-vsctl: Remove 'fail_mode' member from struct vsctl_bridge.

It's only used in cmd_get_fail_mode(), which can easily look it up for
itself, so there's no benefit to storing it in every vsctl_bridge record.

Signed-off-by: Ben Pfaff <blp@nicira.com>
12 years agoovs-vsctl: Merge struct vsctl_info into struct vsctl_context.
Ben Pfaff [Wed, 18 Apr 2012 00:07:00 +0000 (17:07 -0700)]
ovs-vsctl: Merge struct vsctl_info into struct vsctl_context.

To speed up management operations with many ports, we need to preserve the
cache of bridges, ports, and interfaces from one operation to the next.
One necessary step is to push the "struct vsctl_info" that did the caching
up from the individual functions that need it into a more global structure.
This commit does that, merging it into struct vsctl_context.

This commit also modifies do_vsctl(), the top-level control code in
ovs-vsctl, to keep this part of the vsctl_context unchanged from running
one command to the next.

Signed-off-by: Ben Pfaff <blp@nicira.com>
12 years agoovs-vsctl: Verify VLAN bridge controllers in cmd_get_controller().
Ben Pfaff [Tue, 17 Apr 2012 20:50:53 +0000 (13:50 -0700)]
ovs-vsctl: Verify VLAN bridge controllers in cmd_get_controller().

A VLAN bridge uses its parent's controllers, so checking the controller
should verify the parent's set of controllers.

The change to verify_controllers() isn't necessary; it just deletes
the check for a null 'bridge' because verify_controllers() can no
longer be called with a null 'bridge'.

This fixes a bug, but it is unlikely to ever have caused a real problem for
users.

Found by inspection.

Signed-off-by: Ben Pfaff <blp@nicira.com>
12 years agoovs-vsctl: Verify correct record in cmd_get_fail_mode() for VLAN bridges.
Ben Pfaff [Tue, 17 Apr 2012 20:44:51 +0000 (13:44 -0700)]
ovs-vsctl: Verify correct record in cmd_get_fail_mode() for VLAN bridges.

A VLAN bridge uses its parent's fail-mode, so checking the fail-mode should
verify the parent's bridge record.

This fixes a bug, but it is unlikely to ever have caused a real problem for
users.

Found by inspection.

Signed-off-by: Ben Pfaff <blp@nicira.com>
12 years agodatapath: Use ETH_ALEN instead of VLAN_ETH_ALEN
Simon Horman [Thu, 19 Apr 2012 07:38:39 +0000 (16:38 +0900)]
datapath: Use ETH_ALEN instead of VLAN_ETH_ALEN

VLAN_ETH_ALEN will be removed in version 3.5 of the Linux kernel.

Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: Jesse Gross <jesse@nicira.com>
12 years agodatapath: Include linux/completion.h
Simon Horman [Thu, 19 Apr 2012 07:38:20 +0000 (16:38 +0900)]
datapath: Include linux/completion.h

This is needed for compilation against Linux 2.6.19

Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: Jesse Gross <jesse@nicira.com>
12 years agoofproto-dpif: Avoid extra flow copy in xlate_actions() for unneeded warnings.
Ben Pfaff [Mon, 16 Apr 2012 22:54:37 +0000 (15:54 -0700)]
ofproto-dpif: Avoid extra flow copy in xlate_actions() for unneeded warnings.

The copy of the extra flow copy here was showing up in profiles.  We only
need this copy if we end up doing a "trace" to warn the user.  Most runs
won't ever do that, so don't start making copies until we actually hit
such a case.

This has a small behavioral change in that we'll only get a warning on the
*second* time we hit the resubmit recursion limit, not on the first.  I
doubt that's really a problem.

Signed-off-by: Ben Pfaff <blp@nicira.com>
12 years agoofproto-dpif: Avoid extra flow copy in xlate_actions() if no mirrors.
Ben Pfaff [Mon, 16 Apr 2012 22:43:15 +0000 (15:43 -0700)]
ofproto-dpif: Avoid extra flow copy in xlate_actions() if no mirrors.

This was showing up on profiles.

Signed-off-by: Ben Pfaff <blp@nicira.com>
12 years agoofproto-dpif: Avoid calling get_ofp_port() twice in xlate_normal().
Ben Pfaff [Mon, 16 Apr 2012 22:22:52 +0000 (15:22 -0700)]
ofproto-dpif: Avoid calling get_ofp_port() twice in xlate_normal().

This was showing up in profiles.

Signed-off-by: Ben Pfaff <blp@nicira.com>
12 years agoofproto-dpif: Implement "flow setup governor" to speed up many short flows.
Ben Pfaff [Thu, 19 Apr 2012 00:11:10 +0000 (17:11 -0700)]
ofproto-dpif: Implement "flow setup governor" to speed up many short flows.

The cost of creating and initializing facets and subfacets and installing,
tracking, and uninstalling kernel flows is significant.  When most flows
have only one or a few packets, this overhead is higher than the cost of
handling each packet individually.  This commit introduces heuristics that
cheaply count (approximately) the number of packets seen in a flow and
skips most of this expensive bookkeeping until the packet count exceeds a
threshold (currently 5 packets).

Signed-off-by: Ben Pfaff <blp@nicira.com>
12 years agoofproto-dpif: Avoid malloc() in common case for "execute" operations.
Ben Pfaff [Wed, 18 Apr 2012 23:54:10 +0000 (16:54 -0700)]
ofproto-dpif: Avoid malloc() in common case for "execute" operations.

Signed-off-by: Ben Pfaff <blp@nicira.com>
12 years agoofproto-dpif: Make it easier to credit statistics for resubmits.
Ben Pfaff [Fri, 13 Apr 2012 21:09:10 +0000 (14:09 -0700)]
ofproto-dpif: Make it easier to credit statistics for resubmits.

Until now, crediting statistics to OpenFlow rules due to "resubmit" actions
has required setting up a "resubmit hook" with a callback function and
auxiliary data.  This commit makes it easier to do, by adding a member to
struct action_xlate_ctx that specifies statistics to credit to each
resubmitted rule.

This commit includes one small behavioral change as an optimization.
Previously, rule_execute() translated the rule twice: once to get the ODP
actions, then a second time after executing the ODP actions to credit
statistics to the rules.  After this commit, rule_execute() translates the
rule only once, crediting statistics as a side effect.  The difference only
becomes visible when executing the actions fails: previously the statistics
would not be incremented, after this commit they will be.  It is very
unusual for executing actions to fail (generally this indicates a bug) so
I'm not concerned about it.

Signed-off-by: Ben Pfaff <blp@nicira.com>
12 years agoclassifier: Optimize search of "catchall" table.
Ben Pfaff [Mon, 9 Apr 2012 22:49:22 +0000 (15:49 -0700)]
classifier: Optimize search of "catchall" table.

Most flow tables have some kind of "catchall" rule that matches every
packet.  For this table, the cost of copying, zeroing, and hashing the
input flow is significant.  This patch avoids these costs.

Signed-off-by: Ben Pfaff <blp@nicira.com>
12 years agomac-learning: Speed up mac_table_hash().
Ben Pfaff [Mon, 9 Apr 2012 21:33:56 +0000 (14:33 -0700)]
mac-learning: Speed up mac_table_hash().

Signed-off-by: Ben Pfaff <blp@nicira.com>
12 years agohash: Speed up hash_bytes().
Ben Pfaff [Mon, 9 Apr 2012 21:33:33 +0000 (14:33 -0700)]
hash: Speed up hash_bytes().

Signed-off-by: Ben Pfaff <blp@nicira.com>
12 years agoofproto-dpif: Avoid malloc() of "struct flow_miss".
Ben Pfaff [Sat, 7 Apr 2012 00:11:18 +0000 (17:11 -0700)]
ofproto-dpif: Avoid malloc() of "struct flow_miss".

In addition to avoid malloc() for struct flow_miss, this commit avoids
copying "struct flow" around, which is a significant benefit because
struct flow is currently 144 bytes.

Signed-off-by: Ben Pfaff <blp@nicira.com>
12 years agodpif: Make caller of dpif_recv() provide buffer space.
Ben Pfaff [Fri, 6 Apr 2012 23:23:28 +0000 (16:23 -0700)]
dpif: Make caller of dpif_recv() provide buffer space.

This improves performance under heavy flow setup loads.

Signed-off-by: Ben Pfaff <blp@nicira.com>
12 years agoofproto-dpif: Avoid malloc() in common case for allocating subfacets.
Ben Pfaff [Fri, 6 Apr 2012 22:30:21 +0000 (15:30 -0700)]
ofproto-dpif: Avoid malloc() in common case for allocating subfacets.

Usually a facet has exactly one subfacet that has the same lifetime as
the facet.  Allocating both the facet and its subfacet in a single memory
block improves performance.

Signed-off-by: Ben Pfaff <blp@nicira.com>
12 years agoofproto-dpif: Move definition of "struct subfacet" earlier.
Ben Pfaff [Fri, 6 Apr 2012 22:27:31 +0000 (15:27 -0700)]
ofproto-dpif: Move definition of "struct subfacet" earlier.

The next commit will add an instance of struct subfacet as a member of
struct facet, so struct subfacet must be declared first.

This commit moves around code without otherwise changing it.

Signed-off-by: Ben Pfaff <blp@nicira.com>
12 years agonetlink-socket: Make caller provide message receive buffers.
Ben Pfaff [Mon, 9 Apr 2012 22:35:29 +0000 (15:35 -0700)]
netlink-socket: Make caller provide message receive buffers.

Typically an nl_sock client can stack-allocate the buffer for receiving
a Netlink message, which provides a performance boost.

Signed-off-by: Ben Pfaff <blp@nicira.com>
12 years agonetlink-socket: Remove unnecessary #include.
Ben Pfaff [Fri, 6 Apr 2012 22:13:37 +0000 (15:13 -0700)]
netlink-socket: Remove unnecessary #include.

Signed-off-by: Ben Pfaff <blp@nicira.com>
12 years agonetlink: Postpone choosing sequence numbers until send time.
Ben Pfaff [Mon, 16 Apr 2012 23:01:01 +0000 (16:01 -0700)]
netlink: Postpone choosing sequence numbers until send time.

Choosing sequence numbers at time of creating a packet means that
nl_sock_transact_multiple() has to search for the sequence number
of a reply, because the sequence numbers of the requests aren't
necessarily sequential.  This commit makes it possible to avoid
the search, by deferring choice of sequence numbers until the
time that we send the packets.  It doesn't actually modify
nl_sock_transact_multiple(), which will happen in a later commit.

Previously, I was concerned about a theoretical race condition
described in a comment in the old versino of this code:

    This implementation uses sequence numbers that are unique
    process-wide, to avoid a hypothetical race: send request, close
    socket, open new socket that reuses the old socket's PID value,
    send request on new socket, receive reply from kernel to old
    socket but with same PID and sequence number.  (This race could be
    avoided other ways, e.g. by preventing PIDs from being quickly
    reused).

However, I no longer believe that this can be a real problem,
because Netlink operates synchronously.  The reply to a request
will always arrive before the socket can be closed and a new
socket opened with the old socket's PID.

Signed-off-by: Ben Pfaff <blp@nicira.com>
12 years agoofproto-dpif: Avoid computing flow hash multiple times.
Ben Pfaff [Wed, 18 Apr 2012 16:17:33 +0000 (09:17 -0700)]
ofproto-dpif: Avoid computing flow hash multiple times.

Signed-off-by: Ben Pfaff <blp@nicira.com>
12 years agodpif-linux: Avoid malloc() in dpif_linux_operate().
Ben Pfaff [Thu, 5 Apr 2012 23:49:22 +0000 (16:49 -0700)]
dpif-linux: Avoid malloc() in dpif_linux_operate().

Signed-off-by: Ben Pfaff <blp@nicira.com>
12 years agoofproto-dpif: Avoid malloc() in common cases for xlate_actions().
Ben Pfaff [Mon, 16 Apr 2012 20:52:09 +0000 (13:52 -0700)]
ofproto-dpif: Avoid malloc() in common cases for xlate_actions().

Signed-off-by: Ben Pfaff <blp@nicira.com>
12 years agoofpbuf: New functions ofpbuf_use_stub() and ofpbuf_get_uninit_pointer().
Ben Pfaff [Wed, 18 Apr 2012 04:55:27 +0000 (21:55 -0700)]
ofpbuf: New functions ofpbuf_use_stub() and ofpbuf_get_uninit_pointer().

Signed-off-by: Ben Pfaff <blp@nicira.com>
12 years agoofproto-dpif: Don't do an extra flow translation when removing facets.
Ben Pfaff [Thu, 5 Apr 2012 20:43:24 +0000 (13:43 -0700)]
ofproto-dpif: Don't do an extra flow translation when removing facets.

When we remove a facet, it seems superfluous to translate the flow
once more just to update the MAC learning table, since we know that
it was done within a second or so anyway (e.g. when the flow stats
were last updated).

Signed-off-by: Ben Pfaff <blp@nicira.com>
12 years agonetlink-socket: Avoid forcing a reply for final message in a transaction.
Ben Pfaff [Thu, 5 Apr 2012 19:58:42 +0000 (12:58 -0700)]
netlink-socket: Avoid forcing a reply for final message in a transaction.

Signed-off-by: Ben Pfaff <blp@nicira.com>
12 years agodpif: Include TCP flags in "ovs-dpctl dump-flows" output.
Ben Pfaff [Thu, 5 Apr 2012 17:24:56 +0000 (10:24 -0700)]
dpif: Include TCP flags in "ovs-dpctl dump-flows" output.

Signed-off-by: Ben Pfaff <blp@nicira.com>
12 years agoofproto-dpif: Batch flow uninstallations due to expiration.
Ben Pfaff [Wed, 18 Apr 2012 04:52:10 +0000 (21:52 -0700)]
ofproto-dpif: Batch flow uninstallations due to expiration.

Signed-off-by: Ben Pfaff <blp@nicira.com>
12 years agoofproto-dpif: Drop unneeded _SAFE from iteration in handle_flow_miss().
Ben Pfaff [Mon, 16 Apr 2012 21:07:56 +0000 (14:07 -0700)]
ofproto-dpif: Drop unneeded _SAFE from iteration in handle_flow_miss().

The loop never frees the packet that it operates on, so _SAFE is not
needed.

Signed-off-by: Ben Pfaff <blp@nicira.com>
12 years agoofproto-dpif: Keep subfacet "used" times more up-to-date.
Ben Pfaff [Fri, 13 Apr 2012 21:15:15 +0000 (14:15 -0700)]
ofproto-dpif: Keep subfacet "used" times more up-to-date.

handle_flow_miss() didn't update subfacet "used" times for packets
processed by userspace.  This commit fixes the problem.

Found by inspection.  I didn't verify the bug in testing.

Signed-off-by: Ben Pfaff <blp@nicira.com>
12 years agoovs-test: Enhancements to the ovs-test tool
Ansis Atteka [Fri, 30 Mar 2012 02:03:08 +0000 (19:03 -0700)]
ovs-test: Enhancements to the ovs-test tool

-Implemented support for ovs-test client, so that it could automatically
spawn an ovs-test server process from itself. This reduces the number of
commands the user have to type to get tests running.
-Automated creation of OVS bridges and ports (for VLAN and GRE tests), so that
user would not need to invoke ovs-vsctl manually to switch from direct, 802.1Q
and GRE tests.
-Fixed some pylint reported warnings.
-Fixed ethtool invocation so that we always try to query the physical interface
to get the driver name and version.
-and some others enhancements.

The new usage:
Node1:ovs-test -s 15531
Node2:ovs-test -c 127.0.0.1,1.1.1.1 192.168.122.151,1.1.1.2 -d -l 125 -t gre

Signed-off-by: Ansis Atteka <aatteka@nicira.com>
12 years agolacp: Remove heartbeat mode.
Ethan Jackson [Mon, 16 Apr 2012 22:01:09 +0000 (15:01 -0700)]
lacp: Remove heartbeat mode.

The LACP heartbeat mode was used to monitor interfaces for
connectivity.  It turns out that LACP is inferior to CFM for this
purpose.  For the sake of simplicity this patch removes the
feature.

Signed-off-by: Ethan Jackson <ethan@nicira.com>
12 years agolacp: Remove custom transmission intervals.
Ethan Jackson [Mon, 16 Apr 2012 21:55:58 +0000 (14:55 -0700)]
lacp: Remove custom transmission intervals.

Open vSwitch allowed users to set a custom LACP PDU transmission
interval.  This turned out to be an ill conceived idea which was
more confusing than useful.  This patch reverts Open vSwitch to the
behavior supported in the LACP specification: two transmission
intervals, fast and slow.

Signed-off-by: Ethan Jackson <ethan@nicira.com>
12 years agovswitch: Use consistent representation of DSCP bits.
Ethan Jackson [Mon, 16 Apr 2012 19:09:49 +0000 (12:09 -0700)]
vswitch: Use consistent representation of DSCP bits.

There are two sensible ways to represent the 6 DSCP bits of an IP
packet.  One could represent them as an integer in the range 0 to
63.  Or one could represent them as they would appear in the tos
field (0 to 63) << 2.  Before this patch, OVS had used the former
method for the DSCP bits in the Queue Table, and the latter for the
DSCP in the Controller and Manager tables.  Since the ability to
set DSCP bits in the Controller and Manager tables is so new that
it hasn't been released yet, this patch changes it to use the
existing style employed in the Queue table.  Hopefully this should
make the code and configuration less confusing.

Signed-off-by: Ethan Jackson <ethan@nicira.com>
12 years agosocket-util: Remove DSCP_INVALID.
Ethan Jackson [Mon, 16 Apr 2012 20:56:58 +0000 (13:56 -0700)]
socket-util: Remove DSCP_INVALID.

The DSCP_INVALID flag allowed callers to prevent socket-util from
modify the DSCP bits of newly created sockets.  However, the two
really important callers (implementations of the controller and
manager tables) never used it.  Furthermore, the other callers
would be fine always setting the DSCP bits to zero.  This patch
removes the DSCP_INVALID option in an effort to simplify the code.

Signed-off-by: Ethan Jackson <ethan@nicira.com>
12 years agolib: Pull dscp bits out of reconnect.
Ethan Jackson [Thu, 12 Apr 2012 02:52:46 +0000 (19:52 -0700)]
lib: Pull dscp bits out of reconnect.

The DSCP bits of a connection have nothing to do with the
reconnection state machine.  This pulls them up into jsonrpc which
needs them to properly establish connections.

Signed-off-by: Ethan Jackson <ethan@nicira.com>
12 years agosocket-util: Close socket on failed dscp modification.
Ethan Jackson [Mon, 16 Apr 2012 19:46:46 +0000 (12:46 -0700)]
socket-util: Close socket on failed dscp modification.

If socket-util failed to modify the dscp bits of an active
connection, it would fail to close the file descriptor potentially
causing a leak. Found by inspection.

Signed-off-by: Ethan Jackson <ethan@nicira.com>
12 years agodocumentation: Add INSTALL.Libvirt file
Ansis Atteka [Tue, 10 Apr 2012 21:27:31 +0000 (14:27 -0700)]
documentation: Add INSTALL.Libvirt file

Add documentation on how to use OVS integration
with the upcoming Libvirt 0.9.11 release.

Signed-off-by: Ansis Atteka <aatteka@nicira.com>
12 years agoovs-save: Add "dev" keyword before interface names in the ip commands
Ansis Atteka [Mon, 16 Apr 2012 06:30:15 +0000 (23:30 -0700)]
ovs-save: Add "dev" keyword before interface names in the ip commands

The "service force-reload-kmod" command did not work properly, if there
was a bridge, which name was a prefix of string "broadcast" (e.g. "br").

To reproduce:
ovs-vsctl add-br br
service openvswitch-switch force-reload-kmod

This patch will make sure that the generated ip commands are clearly
interpretable by the ip utility.

Issue #9841
Signed-off-by: Ansis Atteka <aatteka@nicira.com>
12 years agostream: By default disable probing on unix sockets.
Ethan Jackson [Thu, 12 Apr 2012 03:18:34 +0000 (20:18 -0700)]
stream: By default disable probing on unix sockets.

There isn't a lot of value in sending inactivity probes on unix
sockets.  This patch changes the default to disable them.

Signed-off-by: Ethan Jackson <ethan@nicira.com>
12 years agopython: Honor zero probe interval in reconnect.py
Ethan Jackson [Thu, 12 Apr 2012 03:42:01 +0000 (20:42 -0700)]
python: Honor zero probe interval in reconnect.py

The python reconnect library attempted to send a probe every 0
milliseconds instead of disabling probing when the probe_interval
was zero.

Signed-off-by: Ethan Jackson <ethan@nicira.com>
12 years agolearn: Make it possible to parse "load" actions wider than 64 bits.
Ben Pfaff [Sat, 14 Apr 2012 04:24:17 +0000 (21:24 -0700)]
learn: Make it possible to parse "load" actions wider than 64 bits.

The implementation of the "learn" action now properly implements
specifications such as 0x20010db885a308d313198a2e03707348->NXM_NX_IPV6_DST
but the parser used in ovs-ofctl and elsewhere could not generate such
specifications.  This commit adds that support.

Signed-off-by: Ben Pfaff <blp@nicira.com>
12 years agolearn: Fix bugs when learn actions use subfields wider than 64 bits.
Ben Pfaff [Thu, 12 Apr 2012 00:08:13 +0000 (17:08 -0700)]
learn: Fix bugs when learn actions use subfields wider than 64 bits.

Bug #10576.
Reported-by: James Schmidt <jschmidt@nicira.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
12 years agometa-flow: New functions for reading and writing generalized subfields.
Ben Pfaff [Wed, 11 Apr 2012 21:45:34 +0000 (14:45 -0700)]
meta-flow: New functions for reading and writing generalized subfields.

The existing functions for reading and writing the values of subfields only
handle subfields up to 64 bits wide.  These new functions handle subfields
of any width.

Also update some existing comments.

Signed-off-by: Ben Pfaff <blp@nicira.com>
12 years agoutil: New function bitwise_is_all_zeros().
Ben Pfaff [Sat, 14 Apr 2012 04:12:37 +0000 (21:12 -0700)]
util: New function bitwise_is_all_zeros().

Signed-off-by: Ben Pfaff <blp@nicira.com>
12 years agoutil: New function bitwise_one().
Ben Pfaff [Wed, 11 Apr 2012 19:07:51 +0000 (12:07 -0700)]
util: New function bitwise_one().

It's the obvious counterpart to bitwise_zero().

Signed-off-by: Ben Pfaff <blp@nicira.com>
12 years agobridge: Rate limit port creations and deletions.
Ethan Jackson [Sat, 7 Apr 2012 01:38:48 +0000 (18:38 -0700)]
bridge: Rate limit port creations and deletions.

In some datapaths, adding or deleting OpenFlow ports can take quite
a bit of time.  If there are lots of OpenFlow ports which needed to
be added in a run loop, this can cause Open vSwitch to lock up and
stop setting up flows while trying to catch up.  This patch lessons
the severity of the problem by only doing a few OpenFlow port adds
or deletions per run loop allowing other work to be done in
between.

Bug #10672.
Signed-off-by: Ethan Jackson <ethan@nicira.com>
12 years agobridge: Rate limit default address warnings.
Ethan Jackson [Wed, 11 Apr 2012 01:35:04 +0000 (18:35 -0700)]
bridge: Rate limit default address warnings.

This information is typically not more useful if displayed more
often.

Signed-off-by: Ethan Jackson <ethan@nicira.com>
12 years agoovsdb-idl: Improve documentation.
Ben Pfaff [Thu, 12 Apr 2012 15:27:56 +0000 (08:27 -0700)]
ovsdb-idl: Improve documentation.

Signed-off-by: Ben Pfaff <blp@nicira.com>
12 years agoovsdb-idl: Improve ovsdb_idl_txn_increment() interface.
Ben Pfaff [Thu, 12 Apr 2012 15:25:10 +0000 (08:25 -0700)]
ovsdb-idl: Improve ovsdb_idl_txn_increment() interface.

The previous interface was just bizarre.

Signed-off-by: Ben Pfaff <blp@nicira.com>
12 years agoovsdb-idl: Simplify transaction retry.
Ben Pfaff [Tue, 27 Mar 2012 17:16:52 +0000 (10:16 -0700)]
ovsdb-idl: Simplify transaction retry.

Originally the IDL transaction state machine had a return value
TXN_TRY_AGAIN to signal the client to wait for a change in the database and
then retry its transaction.  However, this logic was incomplete, because
it was possible for the database to change before the reply to the
transaction RPC was received, in which case the client would wait for a
further change.  Commit 4fdfe5ccf84c (ovsdb-idl: Prevent occasional hang
when multiple database clients race.) fixed the problem by breaking
TXN_TRY_AGAIN into two status codes, TXN_AGAIN_WAIT that meant to wait for
a further change and TXN_AGAIN_NOW that meant that a change had already
occurred so try again immediately.

This is correct enough, but it is more complicated than necessary.  It is
simpler and just as correct to use a single "try again" status that
requires the client to wait for a change relative to the database contents
*before* the transaction was committed.  This commit makes that change.
It also changes ovsdb_idl_run()'s return type from bool to void because
its return type is hardly useful anymore.

Signed-off-by: Ben Pfaff <blp@nicira.com>
12 years agoovs-monitor-ipsec: Use same pattern as ovs-xapi-sync.
Ben Pfaff [Thu, 8 Mar 2012 19:23:14 +0000 (11:23 -0800)]
ovs-monitor-ipsec: Use same pattern as ovs-xapi-sync.

This does not fix an actual bug in ovs-monitor-ipsec because it does not
ever commit any changes to the database.

Signed-off-by: Ben Pfaff <blp@nicira.com>
12 years agoPython binaries to write comment in db show-log while updating database
Arun Sharma [Mon, 9 Apr 2012 20:29:32 +0000 (13:29 -0700)]
Python binaries to write comment in db show-log while updating database

This is an improvement in python script ovs-xapi-sync to call add_comment()
method while updating database. This will help developer to debug binaries
and database from ovsdb-tool show-log command output and understand which
python binary is updating db.

Feature #10543
Signed-off-by: Arun Sharma <arun.sharma@calsoftinc.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>