cascardo/ovs.git
9 years agodatapath-windows: Add functionality to return OVSPortName given a VM
Alin Serdean [Tue, 11 Nov 2014 18:45:32 +0000 (18:45 +0000)]
datapath-windows: Add functionality to return OVSPortName given a VM

This commit adds functionality to return the ElementName of all the VNIC of a
given virtual machine name.

The function returns all the allocated ports including the ones which the OVS
port name was not set.

The default OVS port name that is set is the following:
"ElementName             : Dynamic Ethernet Switch Port".

Example of usage:
Import-Module OVS.psm1
Get-VMNetworkAdapterWithOvsPort test_ubuntu_1
$a = Get-VMNetworkAdapterWithOvsPort test_2_1
$a | findstr ElementName

Requested-by: Nithin Raju <nithin@vmware.com>
Reported-at: https://github.com/openvswitch/ovs-issues/issues/51
Signed-off-by: Alin Gabriel Serdean <aserdean@cloudbasesolutions.com>
Tested-by: Nithin Raju <nithin@vmware.com>
Acked-by: Nithin Raju <nithin@vmware.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
9 years agotravis: Add building of shared library to CI matrix.
Thomas Graf [Wed, 12 Nov 2014 09:22:02 +0000 (10:22 +0100)]
travis: Add building of shared library to CI matrix.

Signed-off-by: Thomas Graf <tgraf@noironetworks.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
9 years agoBuild: Add support for shared libraries and versioning.
Scott Mann [Sat, 8 Nov 2014 03:02:09 +0000 (19:02 -0800)]
Build: Add support for shared libraries and versioning.

These changes allow for the building of shared libraries by providing
the --enable-shared option to configure. In particular, lib/libopenvwitch.so,
lib/libsflow.so, ofproto/libofproto.so, and ovsdb/libovsdb.so will be built.
Original behavior of building static remains the same.

Additionally, versioning is introduced to each of the libraries objects
paving the way for APIs to be built around them. A detailed comment
outlining the rules for changing a version number is provided in
configure.ac. Note that at this time, the version number is set to
1.0.0, no API is specified yet, and there are no requirements to
maintain any sort of compatibility in any of the libraries.

Signed-off-by: Scott Mann <smann@noironetworks.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
9 years agoutil: Add be32_prefix_mask().
Jarno Rajahalme [Tue, 11 Nov 2014 23:50:51 +0000 (15:50 -0800)]
util: Add be32_prefix_mask().

Shifting a 32-bit entity by 32 bits is undefined behavior.  As we have 3
cases where we may hit this, it is a time to introduce a helper for
this.

VMware-BZ: #1355026
Signed-off-by: Jarno Rajahalme <jrajahalme@nicira.com>
Acked-by: Pravin B Shelar <pshelar@nicira.com>
9 years agoovs-atomic: Prefer Clang intrinsics over <stdatomic.h>.
Ben Pfaff [Tue, 11 Nov 2014 16:19:27 +0000 (08:19 -0800)]
ovs-atomic: Prefer Clang intrinsics over <stdatomic.h>.

On my Debian "jessie" system, <stdatomic.h> provided by GCC 4.9 is busted
when Clang 3.5 tries to use it.  Even a trivial program like this:

    #include <stdatomic.h>

    void
    foo(void)
    {
         _Atomic(int) x;
         atomic_fetch_add(&x, 1);
}

yields:

     atomic.c:7:5: error: address argument to atomic operation must be a
        pointer to integer or pointer ('_Atomic(int) *' invalid)

The Clang-specific version of ovs-atomic.h stills works, though, so this
commit works around the problem.

Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Jarno Rajahalme <jrajahalme@nicira.com>
9 years agosflow: Export LAG, PORTNAME, and OPENFLOWPORT information also.
Neil McKee [Fri, 27 Jun 2014 18:19:59 +0000 (11:19 -0700)]
sflow: Export LAG, PORTNAME, and OPENFLOWPORT information also.

Export standard sFlow LAG, PORTNAME and OPENFLOWPORT structures with each
counter-sample. Add unit-test for sFlow-LAG. Adjust other unit-tests to
accommodate these new annotations.

The sFlow-LAG structures are important for topology discovery, for
troubleshooting LAG instability,  and for correctly combining
sFlow feeds from multiple sources.

The OPENFLOWPORT and PORTNAME structures are important for systems that
aim to combine sFlow monitoring with OpenFlow controls,  as they
provide straightforward mapping (1) between sFlow agent IP and OpenFlow
datapath-id,  and (2) between interface name,ifIndex and OpenFlow
port number.

Signed-off-by: Neil McKee <neil.mckee@inmon.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
9 years agoofproto: Add OpenFlow 1.5 group tests.
Simon Horman [Tue, 11 Nov 2014 03:39:24 +0000 (12:39 +0900)]
ofproto: Add OpenFlow 1.5 group tests.

This motivation for this change is to exercise
(draft) OpenFlow 1.5 group messages.

ONF-JIRA: EXT-350
Signed-off-by: Simon Horman <simon.horman@netronome.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
9 years agoofproto: Add OpenFlow 1.3 group stats test.
Simon Horman [Tue, 11 Nov 2014 03:39:23 +0000 (12:39 +0900)]
ofproto: Add OpenFlow 1.3 group stats test.

This is to exercise OpenFlow 1.3 group stats replies
messages which include a duration.

ONF-JIRA: EXT-350
Signed-off-by: Simon Horman <simon.horman@netronome.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
9 years agoofp-parse: Parse (draft) OpenFlow 1.5 bucket ids.
Simon Horman [Tue, 11 Nov 2014 03:39:22 +0000 (12:39 +0900)]
ofp-parse: Parse (draft) OpenFlow 1.5 bucket ids.

This is part of support for (draft) OpenFlow 1.5 flow mod messages.

This adds support for specifying the bucket_id of buckets of groups in
ovs-ofctl and documents that accordingly.

ONF-JIRA: EXT-350
Signed-off-by: Simon Horman <simon.horman@netronome.com>
[blp@nicira.com tweaked the documentation]
Signed-off-by: Ben Pfaff <blp@nicira.com>
9 years agoofp-print: Support printing of (draft) OpenFlow 1.5 group messages with bucket actions
Simon Horman [Tue, 11 Nov 2014 03:39:21 +0000 (12:39 +0900)]
ofp-print: Support printing of (draft) OpenFlow 1.5 group messages with bucket actions

ONF-JIRA: EXT-350
Signed-off-by: Simon Horman <simon.horman@netronome.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
9 years agoofp-print: Print bucket ids of OpenFlow 1.5 group messages.
Simon Horman [Tue, 11 Nov 2014 03:39:20 +0000 (12:39 +0900)]
ofp-print: Print bucket ids of OpenFlow 1.5 group messages.

ONF-JIRA: EXT-350
Signed-off-by: Simon Horman <simon.horman@netronome.com>
[blp@nicira.com changed ofp_print_bucket_id()]
Signed-off-by: Ben Pfaff <blp@nicira.com>
9 years agoofp-util: Encoding and decoding of (draft) OpenFlow 1.5 group messages.
Simon Horman [Tue, 11 Nov 2014 03:39:19 +0000 (12:39 +0900)]
ofp-util: Encoding and decoding of (draft) OpenFlow 1.5 group messages.

This provides the bulk of the ofproto side of support for
OpenFlow 1.5 group messages. It provides for encoding and decoding
of updated group mod and group desc reply messages. This includes
a new bucket format and their properties.

Open Flow 1.5 Groups also have properties but as no non-experimenter
properties are defined this patch does not provide parsing or encoding
of group properties.

ONF-JIRA: EXT-350
Signed-off-by: Simon Horman <simon.horman@netronome.com>
[blp@nicira.com fixed minor bugs and style issues]
Signed-off-by: Ben Pfaff <blp@nicira.com>
9 years agoopenflow: Add types for (draft) OpenFlow 1.5 group mod.
Simon Horman [Tue, 11 Nov 2014 03:39:18 +0000 (12:39 +0900)]
openflow: Add types for (draft) OpenFlow 1.5 group mod.

ONF-JIRA: EXT-350
Signed-off-by: Simon Horman <simon.horman@netronome.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
9 years agotravis: Enable -Wsparse-error and fail on new sparse warnings
Thomas Graf [Tue, 11 Nov 2014 13:51:46 +0000 (14:51 +0100)]
travis: Enable -Wsparse-error and fail on new sparse warnings

A new option -Wsparse-error has been introduced to sparse in the
commits:

4d8811 sparse: Make -Werror turn warnigns into errors
fe57af rename -Werror to -Wsparse-error

which makes sparse fail on warnings. Start using the sparse git tree
for verification and make use of the new flag.

Signed-off-by: Thomas Graf <tgraf@noironetworks.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
9 years agotests: Avoid nonportable use of bash-specific {a..b..c} construct.
Ben Pfaff [Tue, 11 Nov 2014 04:27:26 +0000 (20:27 -0800)]
tests: Avoid nonportable use of bash-specific {a..b..c} construct.

Reported-by: Alex Wang <alexw@nicira.com>
Reported-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
9 years agoofp-errors: Add (draft) OpenFlow 1.5 group mod errors.
Simon Horman [Tue, 11 Nov 2014 03:39:17 +0000 (12:39 +0900)]
ofp-errors: Add (draft) OpenFlow 1.5 group mod errors.

Add OFPERR_OFPGMFC_UNKNOWN_BUCKET and OFPERR_OFPGMFC_BUCKET_EXISTS
which are part of (draft) OpenFlow 1.5 groups.

ONF-JIRA: EXT-350
Signed-off-by: Simon Horman <simon.horman@netronome.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
9 years agoovs-router: Fix build on NetBSD
YAMAMOTO Takashi [Mon, 10 Nov 2014 07:31:47 +0000 (16:31 +0900)]
ovs-router: Fix build on NetBSD

Split the linux-specific part of ovs-router.h
into ovs-router-linux.h.

The breakage was introduced by
commit d9b4ebc5d15202bedad06969353435a4c1951c71
("route-table: Use classifier to store routing table.")

Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Acked-by: Ben Pfaff <blp@nicira.com>
9 years agoAUTHORS: Add Shu Shen.
Ben Pfaff [Tue, 11 Nov 2014 01:39:25 +0000 (17:39 -0800)]
AUTHORS: Add Shu Shen.

Signed-off-by: Ben Pfaff <blp@nicira.com>
9 years agoofproto: Fix supported group types.
Shu Shen [Tue, 11 Nov 2014 00:35:08 +0000 (16:35 -0800)]
ofproto: Fix supported group types.

Previously the types field is uninited and leds to no supported type
being reported in OFPMP_GROUP_FEATURES message.

Signed-off-by: Shu Shen <shu.shen@radisys.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
9 years agoFix setting transport ports with frags.
Jarno Rajahalme [Wed, 5 Nov 2014 18:10:13 +0000 (10:10 -0800)]
Fix setting transport ports with frags.

Packets with 'LATER' fragment do not have a transport header, so it is
not possible to either match on or set transport ports on such
packets.  Matching is prevented by augmenting mf_are_prereqs_ok() with
a nw_frag 'LATER' bit check.  Setting the transport headers on such
packets is prevented in three ways:

1. Flows with an explicit match on nw_frag, where the LATER bit is 1:
   existing calls to the modified mf_are_prereqs_ok() prohibit using
   transport header fields (port numbers) in OXM/NXM actions
   (set_field, move).  SET_TP_* actions need a new check on the LATER
   bit.

2. Flows that wildcard the nw_frag LATER bit: At flow translation
   time, add calls to mf_are_prereqs_ok() to make sure that we do not
   use transport ports in flows that do not have them.

3. At action execution time, do not set transport ports, if the packet
   does not have a full transport header.  This ensures that we never
   call the packet_set functions, that require a valid transport
   header, with packets that do not have them.  For example, if the
   flow was created with a IPv6 first fragment that had the full TCP
   header, but the next packet's first fragment is missing them.

3 alone would suffice for correct behavior, but 1 and 2 seem like a
right thing to do, anyway.

Currently, if we are setting port numbers, we will also match them,
due to us tracking the set fields with the same flow_wildcards as the
matched fields.  Hence, if the incoming port number was not zero, the
flow would not match any packets with missing or truncated transport
headers.  However, relying on no packets having zero port numbers
would not be very robust.  Also, we may separate the tracking of set
and matched fields in the future, which would allow some flows that
blindly set port numbers to not match on them at all.

For TCP in case 3 we use ofpbuf_get_tcp_payload() that requires the
whole (potentially variable size) TCP header to be present.  However,
when parsing a flow, we only require the fixed size portion of the TCP
header to be present, which would be enough to set the port numbers
and fix the TCP checksum.

Finally, we add tests testing the new behavior.

Signed-off-by: Jarno Rajahalme <jrajahalme@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
9 years agominiflow_extract: Properly handle small IP packets.
Jarno Rajahalme [Wed, 5 Nov 2014 18:10:13 +0000 (10:10 -0800)]
miniflow_extract: Properly handle small IP packets.

Ethernet frames may contain padding after the IP payload.  When
parsing IP packets, check the IP total size (IPv4) or IP payload size
(IPv6) to detect the size of l2 padding.  The l2 padding size is
stored in the ofpbuf to prevent ofpbuf_pull from entering the padding,
as well as to allow ofpbuf_l4_size() to return the size of the IP
payload without the l2 padding.

This helps avoiding parsing truncated transport headers, for example.

Signed-off-by: Jarno Rajahalme <jrajahalme@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
9 years agoofproto-dpif: Clean up table lookup code.
Jarno Rajahalme [Mon, 10 Nov 2014 21:14:29 +0000 (13:14 -0800)]
ofproto-dpif: Clean up table lookup code.

Keep knowledge about ofproto-dpif internal rules within ofproto-dpif.
This removes duplication of code (accross multiple files), and allows
making the ofproto-dpif-xlate interface a bit smaller.

'may_packet_in' was previously not honored for the
'LOOKUP_VERDICT_DEFAULT' case.  Now it is, but this change did not
break any unit tests.

Also, previously in the 'LOOKUP_VERDICT_CONTROLLER' case packet-in
messages would have been generated when the in_port could not be found
('config' was set to zero in this case, causing 'OFPUTIL_PC_NO_PACKET_IN'
flag to be zero as well).  This patch changes this behavior and never
issues packet-in messages when the in_port cannot be found.  This did
not break any unit tests either.

Signed-off-by: Jarno Rajahalme <jrajahalme@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
9 years agoofproto-dpif-xlate: Remove xbridge->frag.
Jarno Rajahalme [Mon, 10 Nov 2014 21:14:29 +0000 (13:14 -0800)]
ofproto-dpif-xlate: Remove xbridge->frag.

It it no longer used, so better remove it.

Signed-off-by: Jarno Rajahalme <jrajahalme@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
9 years agorule_dpif_lookup_from_table: Check frags only once.
Jarno Rajahalme [Mon, 10 Nov 2014 21:14:29 +0000 (13:14 -0800)]
rule_dpif_lookup_from_table: Check frags only once.

Move the frags handling check up in the call chain, so that it is done
once for each rule_dpif_lookup_from_table() call.

Signed-off-by: Jarno Rajahalme <jrajahalme@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
9 years agoofp-util: Refactor decoding of OpenFlow 1.1 group desc reply messages.
Simon Horman [Mon, 10 Nov 2014 04:47:58 +0000 (13:47 +0900)]
ofp-util: Refactor decoding of OpenFlow 1.1 group desc reply messages.

This refactoring is in preparation for supporting encoding
of (draft) OpenFlow 1.5 group mod messages.

ONF-JIRA: EXT-350
Signed-off-by: Simon Horman <simon.horman@netronome.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
9 years agoofp-util: Refactor encoding of OpenFlow 1.1 group desc reply messages.
Simon Horman [Mon, 10 Nov 2014 04:47:57 +0000 (13:47 +0900)]
ofp-util: Refactor encoding of OpenFlow 1.1 group desc reply messages.

This refactoring is in preparation for supporting encoding
of (draft) OpenFlow 1.5 group mod messages.

ONF-JIRA: EXT-350
Signed-off-by: Simon Horman <simon.horman@netronome.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
9 years agoofp-util: Refactor decoding of OpenFlow 1.1 group mod messages.
Simon Horman [Mon, 10 Nov 2014 04:47:56 +0000 (13:47 +0900)]
ofp-util: Refactor decoding of OpenFlow 1.1 group mod messages.

This refactoring is in preparation for supporting encoding
of (draft) OpenFlow 1.5 group mod messages.

ONF-JIRA: EXT-350
Signed-off-by: Simon Horman <simon.horman@netronome.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
9 years agoofp-util: Rename OpenFlow 1.1 buckets decoder.
Simon Horman [Mon, 10 Nov 2014 04:47:55 +0000 (13:47 +0900)]
ofp-util: Rename OpenFlow 1.1 buckets decoder.

Rename ofputil_pull_buckets() as ofputil_pull_buckets11()
to denote that it decodes OpenFlow 1.1 buckets (also used in
OpenFlow 1.2 to 1.4).

This refactoring is in preparation for supporting decoding
of (draft) OpenFlow 1.5 group mod messages and their
buckets.

ONF-JIRA: EXT-350
Signed-off-by: Simon Horman <simon.horman@netronome.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
9 years agoofp-util: Break out encoding of OpenFlow 1.1 group mod messages.
Simon Horman [Mon, 10 Nov 2014 04:47:54 +0000 (13:47 +0900)]
ofp-util: Break out encoding of OpenFlow 1.1 group mod messages.

This refactoring is in preparation for supporting encoding
of (draft) OpenFlow 1.5 group mod messages.

ONF-JIRA: EXT-350
Signed-off-by: Simon Horman <simon.horman@netronome.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
9 years agoofp-util: Provide helper to encode OpenFlow 1.1 group buckets.
Simon Horman [Mon, 10 Nov 2014 04:47:53 +0000 (13:47 +0900)]
ofp-util: Provide helper to encode OpenFlow 1.1 group buckets.

The group bucket encoding code appears in two places
in almost identical form.  Consolidate this into
a helper function.

The helper name includes ofp11 as later patches
will add an ofp15 version to support (draft) OpenFlow 1.5 buckets.

ONF-JIRA: EXT-350
Signed-off-by: Simon Horman <simon.horman@netronome.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
9 years agoAdd support for OpenFlow 1.4+ "importance" values.
Rishi Bamba [Fri, 7 Nov 2014 12:48:48 +0000 (18:18 +0530)]
Add support for OpenFlow 1.4+ "importance" values.

This patch enables a user to set importance for a new rule via add-flow
OF1.4+ in the OVS and display the same via dump-flows command OF1.4+.
The changes are made in accordance with OpenFlow 1.4 specs to implement
eviction on the basis of "importance".  This patch also enhances the
diff-flows & replace-flows CLI for addition of importance parameter in
a rule.

This doesn't actually implement eviction on the basis of importance, which
will happen in a later patch.

Signed-off-by: Rishi Bamba <rishi.bamba@tcs.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
9 years agoid-pool: Fix memory leak.
Ben Pfaff [Mon, 10 Nov 2014 16:43:31 +0000 (08:43 -0800)]
id-pool: Fix memory leak.

This dates back to the previous location of the code in ofproto-dpif-rid.
I will backport.

Signed-off-by: Ben Pfaff <blp@nicira.com>
9 years agoid-pool: Refactor id_pool_alloc_id to allow any 32 bit value to be an id
Simon Horman [Mon, 10 Nov 2014 04:47:49 +0000 (13:47 +0900)]
id-pool: Refactor id_pool_alloc_id to allow any 32 bit value to be an id

id_pool_alloc_id() was created by breaking out the recirculation
allocation code. As it is now a library call it makes sense to remove
the restriction that id 0 is reserved.

Signed-off-by: Simon Horman <simon.horman@netronome.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
9 years agoid-pool: Re-factor recirculation id allocator into standalone id pool.
Simon Horman [Mon, 10 Nov 2014 04:47:48 +0000 (13:47 +0900)]
id-pool: Re-factor recirculation id allocator into standalone id pool.

Refactor the lock-free portion of the recirculation id allocator
into stand-alone id pool. This is in preparation for re-using
that portion to allocate bucket ids which are part of (draft)
OpenFlow 1.5 groups.

ONF-JIRA: EXT-350
Signed-off-by: Simon Horman <simon.horman@netronome.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
9 years agodatapath: fix coding style.
Pravin B Shelar [Sat, 8 Nov 2014 15:24:42 +0000 (07:24 -0800)]
datapath: fix coding style.

Kernel datapath code has diverged from upstream code.  This
makes porting patches between these two code bases harder
than it needs to be. Following patch fixes this by fixing
coding style issues on this branch.

Signed-off-by: Pravin B Shelar <pshelar@nicira.com>
9 years agodatapath: Fix few mpls issues.
Pravin B Shelar [Sat, 8 Nov 2014 16:14:21 +0000 (08:14 -0800)]
datapath: Fix few mpls issues.

Found during MPLS upstreaming.  Also sync-up MPLS header files
with upstream code.

Signed-off-by: Pravin B Shelar <pshelar@nicira.com>
9 years agodatapath: Rename last_action() as nla_is_last() and move to netlink.h
Simon Horman [Sat, 8 Nov 2014 21:53:52 +0000 (13:53 -0800)]
datapath: Rename last_action() as nla_is_last() and move to netlink.h

The original motivation for this change was to allow the helper to be used
in files other than actions.c as part of work on an odp select group
action.

It was as pointed out by Thomas Graf that this helper would be best off
living in netlink.h. Furthermore, I think that the generic nature of this
helper means it is best off in netlink.h regardless of if it is used more
than one .c file or not. Thus, I would like it considered independent of
the work on an odp select group action.

Cc: Thomas Graf <tgraf@suug.ch>
Cc: Pravin Shelar <pshelar@nicira.com>
Cc: Andy Zhou <azhou@nicira.com>
Signed-off-by: Simon Horman <simon.horman@netronome.com>
Acked-by: Thomas Graf <tgraf@noironetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Acked-by: Pravin B Shelar <pshelar@nicira.com>
9 years agodatapath-windows: Remove a not needed debug message from Flow.c.
Ankur Sharma [Wed, 5 Nov 2014 20:12:03 +0000 (12:12 -0800)]
datapath-windows: Remove a not needed debug message from Flow.c.

Signed-off-by: Ankur Sharma <ankursharma@vmware.com>
Acked-by: Nithin Raju <nithin@vmware.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
9 years agoclassifier: Clean up destroy_subtable.
Jarno Rajahalme [Mon, 3 Nov 2014 19:23:11 +0000 (11:23 -0800)]
classifier: Clean up destroy_subtable.

Add asserts to make sure the containers within are already empty.

Signed-off-by: Jarno Rajahalme <jrajahalme@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
9 years agoclassifier: Constify fields.
Jarno Rajahalme [Mon, 27 Oct 2014 17:57:28 +0000 (10:57 -0700)]
classifier: Constify fields.

Some struct cls_match and cls_subtable fields were already documented
of being const.  Make them const and use CONST_CAST where appropriate
to initialize them.

This will help catch future errors modifying those fields after
initialization.

Signed-off-by: Jarno Rajahalme <jrajahalme@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
9 years agoclassifier: Make classifier_find_rule_exactly() lockless.
Jarno Rajahalme [Mon, 3 Nov 2014 17:56:54 +0000 (09:56 -0800)]
classifier: Make classifier_find_rule_exactly() lockless.

struct cls_match 'list' member was recently changed to an rculist.
This allows classifier_find_rule_exactly() to be made lockless.

Since subtable's 'max_priority' member would still require a lock, we
no longer check it before calling find_equal().  This adds a hash
table lookup in cases where the subtable may already be known to not
contain any rule of the target priority.
classifier_find_rule_exactly() is never called on the fastpath, so
this should not be significant.

Signed-off-by: Jarno Rajahalme <jrajahalme@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
9 years agoclassifier: Constify RCU pointers.
Jarno Rajahalme [Thu, 6 Nov 2014 22:55:29 +0000 (14:55 -0800)]
classifier: Constify RCU pointers.

Returning const struct cls_rule pointers from the classifier API helps
callers to remember that they should not modify the rules returned.

Signed-off-by: Jarno Rajahalme <jrajahalme@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
9 years agorhel: Fix tunnel port ifup/ifdown failure.
Flavio Leitner [Thu, 6 Nov 2014 18:50:06 +0000 (16:50 -0200)]
rhel: Fix tunnel port ifup/ifdown failure.

The tunnel port is invisible to the OS, so there is
no reason to call OTHERSCRIPT in the ifup/ifdown scripts.

Signed-off-by: Flavio Leitner <fbl@redhat.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
9 years agofedora-spec: remove unneeded db initialization
Flavio Leitner [Thu, 6 Nov 2014 18:45:51 +0000 (16:45 -0200)]
fedora-spec: remove unneeded db initialization

The DB initialization is done by ovs-ctl script as well,
so remove the duplicated code from the spec.

Signed-off-by: Flavio Leitner <fbl@redhat.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
9 years agofedora-spec: added systemd post/postun/pre/preun sections
Flavio Leitner [Thu, 6 Nov 2014 18:45:50 +0000 (16:45 -0200)]
fedora-spec: added systemd post/postun/pre/preun sections

The systemd requires some actions when the package is
installed, upgraded or removed. This patch adds the
needed RPM sections with the missing systemd actions.

There is a change in behavior - the service is not enabled
or started by default.

Signed-off-by: Flavio Leitner <fbl@redhat.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
9 years agofedora-spec: move sysconfig template
Flavio Leitner [Thu, 6 Nov 2014 18:45:49 +0000 (16:45 -0200)]
fedora-spec: move sysconfig template

Move the sysconfig template close to other systemd lines.

Signed-off-by: Flavio Leitner <fbl@redhat.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
9 years agofedora-spec: break long lines in %install
Flavio Leitner [Thu, 6 Nov 2014 18:45:48 +0000 (16:45 -0200)]
fedora-spec: break long lines in %install

Signed-off-by: Flavio Leitner <fbl@redhat.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
9 years agofedora-spec: remove uneeded lines
Flavio Leitner [Thu, 6 Nov 2014 18:45:47 +0000 (16:45 -0200)]
fedora-spec: remove uneeded lines

Signed-off-by: Flavio Leitner <fbl@redhat.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
9 years agofedora-spec: use empty lines to split blocks in %install
Flavio Leitner [Thu, 6 Nov 2014 18:45:46 +0000 (16:45 -0200)]
fedora-spec: use empty lines to split blocks in %install

Use empty lines to split blocks to improve readability.

Signed-off-by: Flavio Leitner <fbl@redhat.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
9 years agofedora-spec: set permission mode with 4 digits
Flavio Leitner [Thu, 6 Nov 2014 18:45:45 +0000 (16:45 -0200)]
fedora-spec: set permission mode with 4 digits

Signed-off-by: Flavio Leitner <fbl@redhat.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
9 years agofedora-spec: fix indentation in %install section
Flavio Leitner [Thu, 6 Nov 2014 18:45:44 +0000 (16:45 -0200)]
fedora-spec: fix indentation in %install section

Use spaces instead of tabs as the other lines

Signed-off-by: Flavio Leitner <fbl@redhat.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
9 years agofedora-spec: use RPM macros in %install section
Flavio Leitner [Thu, 6 Nov 2014 18:45:43 +0000 (16:45 -0200)]
fedora-spec: use RPM macros in %install section

Signed-off-by: Flavio Leitner <fbl@redhat.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
9 years agofedora-spec: do not replace logrotate cfg if modified
Flavio Leitner [Thu, 6 Nov 2014 18:45:42 +0000 (16:45 -0200)]
fedora-spec: do not replace logrotate cfg if modified

Don't overwrite if the logrotate configuration
file is modified.

Signed-off-by: Flavio Leitner <fbl@redhat.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
9 years agofedora-spec: convert missing man-pages to use macro
Flavio Leitner [Thu, 6 Nov 2014 18:45:41 +0000 (16:45 -0200)]
fedora-spec: convert missing man-pages to use macro

Signed-off-by: Flavio Leitner <fbl@redhat.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
9 years agofedora-spec: use macro for /usr/share
Flavio Leitner [Thu, 6 Nov 2014 18:45:40 +0000 (16:45 -0200)]
fedora-spec: use macro for /usr/share

Signed-off-by: Flavio Leitner <fbl@redhat.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
9 years agofedora-spec: use macro for /usr/bin
Flavio Leitner [Thu, 6 Nov 2014 18:45:39 +0000 (16:45 -0200)]
fedora-spec: use macro for /usr/bin

Signed-off-by: Flavio Leitner <fbl@redhat.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
9 years agofedora-spec: use macro for /usr/sbin
Flavio Leitner [Thu, 6 Nov 2014 18:45:38 +0000 (16:45 -0200)]
fedora-spec: use macro for /usr/sbin

Signed-off-by: Flavio Leitner <fbl@redhat.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
9 years agofedora-spec: break %doc long line
Flavio Leitner [Thu, 6 Nov 2014 18:45:37 +0000 (16:45 -0200)]
fedora-spec: break %doc long line

Signed-off-by: Flavio Leitner <fbl@redhat.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
9 years agofedora-spec: sort man-pages and use macros
Flavio Leitner [Thu, 6 Nov 2014 18:45:36 +0000 (16:45 -0200)]
fedora-spec: sort man-pages and use macros

Signed-off-by: Flavio Leitner <fbl@redhat.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
9 years agofedora-spec: the db and id must be owned
Flavio Leitner [Thu, 6 Nov 2014 18:45:35 +0000 (16:45 -0200)]
fedora-spec: the db and id must be owned

Both conf.db and system-id.conf needs to be owned, so
spec now list them in the %files section.  However,
they are not shipped with the rpm (%ghost)

Signed-off-by: Flavio Leitner <fbl@redhat.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
9 years agofedora-spec: use default tarball dirs name
Flavio Leitner [Thu, 6 Nov 2014 18:45:34 +0000 (16:45 -0200)]
fedora-spec: use default tarball dirs name

The default tarball directory follows the standard.

Signed-off-by: Flavio Leitner <fbl@redhat.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
9 years agofedora-spec: _smp_mflags macro must be conditional
Flavio Leitner [Thu, 6 Nov 2014 18:45:33 +0000 (16:45 -0200)]
fedora-spec: _smp_mflags macro must be conditional

Signed-off-by: Flavio Leitner <fbl@redhat.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
9 years agofedora-spec: obsolete controller subpackage
Flavio Leitner [Thu, 6 Nov 2014 18:45:32 +0000 (16:45 -0200)]
fedora-spec: obsolete controller subpackage

Once upon a time there was a controller subpackage
that was obsoleted

Signed-off-by: Flavio Leitner <fbl@redhat.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
9 years agofedora-spec: Enable PIE
Flavio Leitner [Thu, 6 Nov 2014 18:45:31 +0000 (16:45 -0200)]
fedora-spec: Enable PIE

Package guidelines request to enable PIE.

Signed-off-by: Flavio Leitner <fbl@redhat.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
9 years agofedora-spec: add openvswitch-devel subpackage
Flavio Leitner [Thu, 6 Nov 2014 18:45:30 +0000 (16:45 -0200)]
fedora-spec: add openvswitch-devel subpackage

This provides static library, libopenswitch.a and the openvswitch
header files needed to build an external application in a separate
RPM package.

Signed-off-by: Flavio Leitner <fbl@redhat.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
9 years agofedora-spec: add openvswitch-test package
Flavio Leitner [Thu, 6 Nov 2014 18:45:29 +0000 (16:45 -0200)]
fedora-spec: add openvswitch-test package

Put the utilities that are useful to diagnose performance
and connectivity issues in Open vSwitch setup into another
package since they are not needed in most cases.

Signed-off-by: Flavio Leitner <fbl@redhat.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
9 years agofedora-spec: add python-openvswitch subpackage
Flavio Leitner [Thu, 6 Nov 2014 18:45:28 +0000 (16:45 -0200)]
fedora-spec: add python-openvswitch subpackage

This creates a subpackage called python-openvswitch
providing python bidings for the Open vSwitch database.

Signed-off-by: Flavio Leitner <fbl@redhat.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
9 years agofedora-spec: use %configure macro
Flavio Leitner [Thu, 6 Nov 2014 18:45:27 +0000 (16:45 -0200)]
fedora-spec: use %configure macro

Signed-off-by: Flavio Leitner <fbl@redhat.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
9 years agofedora-spec: more simple description
Flavio Leitner [Thu, 6 Nov 2014 18:45:26 +0000 (16:45 -0200)]
fedora-spec: more simple description

Signed-off-by: Flavio Leitner <fbl@redhat.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
9 years agofedora-spec: added more requires
Flavio Leitner [Thu, 6 Nov 2014 18:45:25 +0000 (16:45 -0200)]
fedora-spec: added more requires

The minimum recommended kernel for fedora is
3.15.0-0 due to be the first one including the
upstream kernel commit below:

  commit 4f647e0a3c37b8d5086214128614a136064110c3
  Author: Flavio Leitner <fbl@redhat.com>
  Date:   Thu Mar 27 11:05:34 2014 -0300

  openvswitch: fix a possible deadlock and lockdep warning

Signed-off-by: Flavio Leitner <fbl@redhat.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
9 years agofedora-spec: removed extra space
Flavio Leitner [Thu, 6 Nov 2014 18:45:24 +0000 (16:45 -0200)]
fedora-spec: removed extra space

Signed-off-by: Flavio Leitner <fbl@redhat.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
9 years agofedora-spec: Added buildrequires
Flavio Leitner [Thu, 6 Nov 2014 18:45:23 +0000 (16:45 -0200)]
fedora-spec: Added buildrequires

This is needed to ensure all the packages are
installed on the system to be able to build
Open vSwitch.

This also permits to use yum-builddep(1) to
automatically install the dependencies on the
system.

Signed-off-by: Flavio Leitner <fbl@redhat.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
9 years agofedora-spec: source line points to upstream tarball
Flavio Leitner [Thu, 6 Nov 2014 18:45:22 +0000 (16:45 -0200)]
fedora-spec: source line points to upstream tarball

Signed-off-by: Flavio Leitner <fbl@redhat.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
9 years agofedora-spec: remove stale comment
Flavio Leitner [Thu, 6 Nov 2014 18:45:21 +0000 (16:45 -0200)]
fedora-spec: remove stale comment

Signed-off-by: Flavio Leitner <fbl@redhat.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
9 years agofedora-spec: use default buildroot
Flavio Leitner [Thu, 6 Nov 2014 18:45:20 +0000 (16:45 -0200)]
fedora-spec: use default buildroot

Signed-off-by: Flavio Leitner <fbl@redhat.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
9 years agofedora.spec: added license details
Flavio Leitner [Thu, 6 Nov 2014 18:45:19 +0000 (16:45 -0200)]
fedora.spec: added license details

Signed-off-by: Flavio Leitner <fbl@redhat.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
9 years agoFAQ: Describe how to add new fields and new actions.
Ben Pfaff [Thu, 6 Nov 2014 21:48:39 +0000 (13:48 -0800)]
FAQ: Describe how to add new fields and new actions.

We get these questions from time to time and it would be nice to just be
able to cut and paste the answer.  (And possibly some people might actually
read the answer straight from the FAQ.)

Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Andy Zhou <azhou@nicira.com>
9 years agometa-flow: Make it simpler to expand mf_values in the future
Madhu Challa [Thu, 6 Nov 2014 18:55:08 +0000 (10:55 -0800)]
meta-flow: Make it simpler to expand mf_values in the future

Remove hard coded array index and make it dependent on the array size.

Signed-off-by: Madhu Challa <challa@noironetworks.com>
Co-authored-by: Ben Pfaff <blp@nicira.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
9 years agoovs-router: Define stub for ovs_router_unixctl_register()
Pravin B Shelar [Wed, 5 Nov 2014 23:21:54 +0000 (15:21 -0800)]
ovs-router: Define stub for ovs_router_unixctl_register()

ovs_router_unixctl_register() is called from ofproto layer.
But is not defined for all platform. Following patch define
stub to fix compilation error.

Reported-by: Eitan Eliahu <eliahue@vmware.com>
Signed-off-by: Pravin B Shelar <pshelar@nicira.com>
Acked-by: Jarno Rajahalme <jrajahalme@nicira.com>-
9 years agoovs-ofctl: Only allow usable protocols for group commands
Simon Horman [Wed, 5 Nov 2014 23:55:47 +0000 (15:55 -0800)]
ovs-ofctl: Only allow usable protocols for group commands

parse_ofp_group_mod_str() may limit the usable protocols according
to the group and in particular its actions. However, without this
change ovs-ofctl ignores this calculation.

Signed-off-by: Simon Horman <simon.horman@netronome.com>
Acked-by: Jarno Rajahalme <jrajahalme@nicira.com>
9 years agobridge: Store datapath version into ovsdb
Andy Zhou [Thu, 16 Oct 2014 22:23:11 +0000 (15:23 -0700)]
bridge: Store datapath version into ovsdb

OVS userspace are backward compatible with older Linux kernel modules.
However, not having the most up-to-date datapath kernel modules can
some times lead to user confusion. Storing the datapath version in
OVSDB allows management software to check and optionally provide
notifications to users.

Signed-off-by: Andy Zhou <azhou@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
9 years agodatapath-windows: Add WMI to set Hyper-V port "friendly name" from NOVA.
Eitan Eliahu [Thu, 6 Nov 2014 02:09:19 +0000 (18:09 -0800)]
datapath-windows: Add WMI to set Hyper-V port "friendly name" from NOVA.

Added a function Set-VMNetworkAdapterOVSPortDirect() to be called from
NOVA driver to set a name on the port of the first VNIC for the specified VM.

Usage example:
Set-VMNetworkAdapterOVSPortDirect -OVSPortName ovs-port-5 -VMName NoOS

To confirm that the name was set:
Get-VMNetworkAdapterByOVSPort  -OVSPortName ovs-port-5

Signed-off-by: Eitan Eliahu <eliahue@vmware.com>
Acked-by: Ankur Sharma <ankursharma@vmware.com>
Acked-by: Nithin Raju <nithin@vmware.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
9 years agorouter-table-stub: Fix compilation error.
Eitan Eliahu [Wed, 5 Nov 2014 09:39:20 +0000 (01:39 -0800)]
router-table-stub: Fix compilation error.

Signed-off-by: Eitan Eliahu <eliahue@vmware.com>
Acked-by: Nithin Raju <nithin@vmware.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
9 years agoopenflow.h: Add header for OpenFlow v1.5.
Jean Tourrilhes [Thu, 30 Oct 2014 23:17:16 +0000 (16:17 -0700)]
openflow.h: Add header for OpenFlow v1.5.

Signed-off-by: Jean Tourrilhes <jt@hpl.hp.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
9 years agoovs-testcontroller: Fix priority of non table-miss flow entries.
Jean Tourrilhes [Fri, 31 Oct 2014 20:46:43 +0000 (13:46 -0700)]
ovs-testcontroller: Fix priority of non table-miss flow entries.

Signed-off-by: Jean Tourrilhes <jt@hpl.hp.com>
9 years agodatapath: Convert dp rcu read operation to locked operations
Pravin B Shelar [Wed, 29 Oct 2014 09:45:48 +0000 (02:45 -0700)]
datapath: Convert dp rcu read operation to locked operations

dp read operations depends on ovs_dp_cmd_fill_info(). This API
needs to looup vport to find dp name, but vport lookup can
fail. Therefore to keep vport reference alive we need to
take ovs lock.

Found by code inspection.

Signed-off-by: Pravin B Shelar <pshelar@nicira.com>
Acked-by: Andy Zhou <azhou@nicira.com>
9 years agotests: Make sure test for actset_output tests initial condition.
Jean Tourrilhes [Wed, 22 Oct 2014 19:41:50 +0000 (12:41 -0700)]
tests: Make sure test for actset_output tests initial condition.

ONF-JIRA: EXT-233
Signed-off-by: Jean Tourrilhes <jt@hpl.hp.com>
9 years agoofproto-dpif: Make ofproto/trace a bit more like real packet translation.
Ben Pfaff [Tue, 4 Nov 2014 19:17:11 +0000 (11:17 -0800)]
ofproto-dpif: Make ofproto/trace a bit more like real packet translation.

Until now, ofproto/trace has looked up the flow itself.  xlate_actions()
can do the flow lookup internally and, since that is what happens when a
packet arrives, having it do its own packet lookup makes a lot of sense.

I noticed this in connection with the actset_output field, which
xlate_actions() should set to OFPP_UNSET at the beginning of translation
before looking up the flow.  ofproto/trace didn't do that, so it looked
up a rule with actset_output=0 instead.  By having xlate_actions() do the
lookup, the behavior can be consistent and correct.

Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Jarno Rajahalme <jrajahalme@nicira.com>
9 years agoofproto-dpif-xlate: Add drop_frags_rule to struct xbridge.
Ben Pfaff [Tue, 4 Nov 2014 19:09:49 +0000 (11:09 -0800)]
ofproto-dpif-xlate: Add drop_frags_rule to struct xbridge.

It will be used in an upcoming commit.

Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Jarno Rajahalme <jrajahalme@nicira.com>
9 years agonetflow: Fix interpretation of flow_seq.
Motonori Shindo [Tue, 4 Nov 2014 16:12:18 +0000 (01:12 +0900)]
netflow: Fix interpretation of flow_seq.

'flow_seq" field in NetFlow v5 header should represent a number of NetFlow
flow records exported while it is representing the number of NetFlow
packets exported in the current code. This patch fixes this problem.

Signed-off-by: Motonori Shindo <motonori@shin.do>
Signed-off-by: Ben Pfaff <blp@nicira.com>
9 years agoovs-router: Fix sparse warning
Pravin B Shelar [Tue, 4 Nov 2014 17:24:24 +0000 (09:24 -0800)]
ovs-router: Fix sparse warning

Fixes following warning:
../lib/ovs-router.c:162:11: warning: incorrect type in assignment
(different base types)
../lib/ovs-router.c:162:11:    expected restricted ovs_be32
[usertype] <noident>
../lib/ovs-router.c:162:11:    got restricted ovs_be16

Reported-by: Ben Pfaff <blp@nicira.com>
Signed-off-by: Pravin B Shelar <pshelar@nicira.com>
Acked-by: Jarno Rajahalme <jrajahalme@nicira.com>
9 years agonetdev-dpdk: Fix DPDK rings broken by multi queue
David Verbeiren [Tue, 14 Oct 2014 17:01:49 +0000 (19:01 +0200)]
netdev-dpdk: Fix DPDK rings broken by multi queue

DPDK rings don't need one queue per PMD thread and don't support multiple
queues (set_multiq function is undefined). To fix operation with DPDK rings,
this patch ignores EOPNOTSUPP error on netdev_set_multiq() and provides, for
DPDK rings, a netdev send() function that ignores the provided queue id
(= PMD thread core id).

Suggested-by: Maryam Tahhan <maryam.tahhan@intel.com>
Signed-off-by: David Verbeiren <david.verbeiren@intel.com>
Acked-by: Pravin B Shelar <pshelar@nicira.com>
9 years agoofp-print: Use ds_chomp() in ofp10_match_to_string()
Simon Horman [Tue, 4 Nov 2014 06:14:04 +0000 (15:14 +0900)]
ofp-print: Use ds_chomp() in ofp10_match_to_string()

Slightly simplify ofp10_match_to_string() by using ds_chomp()
rather than open-coding its logic.

Signed-off-by: Simon Horman <simon.horman@netronome.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
9 years agomatch: Use ds_chomp() in match_format()
Simon Horman [Tue, 4 Nov 2014 06:13:45 +0000 (15:13 +0900)]
match: Use ds_chomp() in match_format()

Slightly simplify match_format() by using ds_chomp()
rather than open-coding its logic.

Signed-off-by: Simon Horman <simon.horman@netronome.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
9 years agoflow: Support OF1.5+ (draft) actset_output field.
Ben Pfaff [Mon, 3 Nov 2014 22:24:01 +0000 (14:24 -0800)]
flow: Support OF1.5+ (draft) actset_output field.

This field allows a flow table to match on the output port currently in the
action set.

ONF-JIRA: EXT-233
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Jarno Rajahalme <jrajahalme@nicira.com>
9 years agonx-match: Add support for multiple OXM field assignments for one field.
Ben Pfaff [Fri, 10 Oct 2014 05:57:47 +0000 (22:57 -0700)]
nx-match: Add support for multiple OXM field assignments for one field.

actset_output, to be added in an upcoming commit, has one OXM assignment
in OpenFlow 1.3 and another one in OpenFlow 1.5.  This commit allows both
of them to be supported in appropriate OpenFlow versions.

This feature is difficult to test on its own, so the same commit that adds
actset_output support also tests this feature.

Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Jarno Rajahalme <jrajahalme@nicira.com>
9 years agodatapath: Fix compat checks for ipv6_skip_exthdr()
Pravin B Shelar [Mon, 3 Nov 2014 16:55:12 +0000 (08:55 -0800)]
datapath: Fix compat checks for ipv6_skip_exthdr()

Signed-off-by: Pravin B Shelar <pshelar@nicira.com>
9 years agoofproto-dpif-xlate: Do not clear ports with frags in xlate_actions().
Jarno Rajahalme [Mon, 3 Nov 2014 22:40:22 +0000 (14:40 -0800)]
ofproto-dpif-xlate: Do not clear ports with frags in xlate_actions().

Transport ports are already cleared for lookup if need be, and they
should be available for action processing, so do not clear them in
xlate_actions().

A drop flow takes care of dropping the packet, so no special case is
needed in xlate_actions().

Signed-off-by: Jarno Rajahalme <jrajahalme@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
9 years agotests/ofproto-dpif - fragment handling: Add detail.
Jarno Rajahalme [Mon, 3 Nov 2014 22:40:22 +0000 (14:40 -0800)]
tests/ofproto-dpif - fragment handling: Add detail.

Add transport port modifications to the existing frags handling test
case.

This demonstrates incorrect behavior by not moving the destination
port number to source port in normal mode for first fragment, as the
transport port numbers have been zeroed and the move has no effect,
and by allowing moves to/from transport ports on later fragments
(which do not have a transport header).

Next patches fix these problems.

Signed-off-by: Jarno Rajahalme <jrajahalme@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
9 years agoroute-table: extract gw information.
Pravin B Shelar [Thu, 16 Oct 2014 18:38:16 +0000 (11:38 -0700)]
route-table: extract gw information.

Routing table will be used by ovs userspace tunneling, it need to
know gw address, following commit extract gw information from
netlink message so that ovs can populate it in ovs route table.

Signed-off-by: Pravin B Shelar <pshelar@nicira.com>
Acked-by: Thomas Graf <tgraf@noironetworks.com>