[ovs-git] Open vSwitch: Implement "native VLAN" feature. (master)

dev at openvswitch.org dev at openvswitch.org
Mon Sep 26 20:17:58 UTC 2011


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Open vSwitch".

The branch, master has been updated
       via  ecac4ebf93feed5e95a517b48915e40d92052386 (commit)
       via  77d895d6867461b2433616d10ddf2c5fa0b6f4d3 (commit)
       via  04c956fc029bb97de17b62cb6d243b50f0bc9f58 (commit)
       via  dc155bff1bf6045c4eccbb5443b24d19448a4f7d (commit)
       via  823518f1f26c2320c35e762c9d1bd29e68f9c5b8 (commit)
      from  1b0fdca5faa8674a5e67f7435a43b361fca003cf (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ecac4ebf93feed5e95a517b48915e40d92052386
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=ecac4ebf93feed5e95a517b48915e40d92052386
Author: Ben Pfaff <blp at nicira.com>
		
Implement "native VLAN" feature.
		
Significant updates by Ben Pfaff, including:

* Comment, coding style, indentation updates.
* Documentation improved.
* Added tests.
* Dropped PORT_VLAN_EMPTY.


commit 77d895d6867461b2433616d10ddf2c5fa0b6f4d3
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=77d895d6867461b2433616d10ddf2c5fa0b6f4d3
Author: Ben Pfaff <blp at nicira.com>
		
bitmap: New function to allocate a bitmap initialized to all-1-bits.
		


commit 04c956fc029bb97de17b62cb6d243b50f0bc9f58
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=04c956fc029bb97de17b62cb6d243b50f0bc9f58
Author: Ben Pfaff <blp at nicira.com>
		
ofproto-dpif: Add tests for VLAN handling.
		
These tests would have caught the bug fixed in the previous commit
"ofproto-dpif: Fix behavior when a subset of VLANs is trunked."


commit dc155bff1bf6045c4eccbb5443b24d19448a4f7d
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=dc155bff1bf6045c4eccbb5443b24d19448a4f7d
Author: Ben Pfaff <blp at nicira.com>
		
ofproto-dpif: Get rid of OFP_VLAN_NONE pollution.
		
OFP_VLAN_NONE used to be convenient as a value for struct dst's 'vlan'
member, because it ended up being used in actions anyway, but now it's
much better to just use 0.


commit 823518f1f26c2320c35e762c9d1bd29e68f9c5b8
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=823518f1f26c2320c35e762c9d1bd29e68f9c5b8
Author: Ben Pfaff <blp at nicira.com>
		
ofproto-dpif: Fix VLAN and other field handling in OFPP_NORMAL.
		
compose_actions(), which is part of the OFPP_NORMAL implementation, had
multiple flaws that this commit corrects.

First, it did not commit changes made to the flow by actions preceding
the output to OFPP_NORMAL.  This means that, for example, if an OpenFlow
action to modify an L2 or L3 header preceded the output to OFPP_NORMAL,
then OFPP_NORMAL would output its packets without those changes.

Second, it did not update the action_xlate_ctx's notion of the VLAN that
was currently set, in the cases where it modified the current VLAN.  This
means that actions following the output to OFPP_NORMAL could output to
unexpected VLANs.

Third, when it switched to VLAN 0, it unconditionally also stripped the
whole 802.1Q header, so that if the packet originally was priority tagged,
the output packet was not priority tagged.  This is reasonable behavior,
but it is a change in behavior from what previous releases of OVS did, so
this commit reverts it.

Based on a patch from and a conversation with Pravin Shelar
<pshelar at nicira.com>.


-----------------------------------------------------------------------

Summary of changes:
 NEWS                         |    3 +
 lib/bitmap.c                 |   21 ++++-
 lib/bitmap.h                 |    2 +
 lib/bond.c                   |    2 +-
 ofproto/ofproto-dpif.c       |  255 +++++++++++++++++++++++++++++-------------
 ofproto/ofproto.h            |   26 ++++-
 tests/automake.mk            |    1 +
 tests/compare-odp-actions.pl |   66 +++++++++++
 tests/ofproto-dpif.at        |  146 ++++++++++++++++++++++++
 tests/ofproto-macros.at      |   43 +++++++
 vswitchd/bridge.c            |   33 +++++-
 vswitchd/vswitch.ovsschema   |    8 +-
 vswitchd/vswitch.xml         |  110 +++++++++++++------
 13 files changed, 594 insertions(+), 122 deletions(-)
 create mode 100644 tests/compare-odp-actions.pl


hooks/post-receive
-- 
Open vSwitch



More information about the git mailing list