]> git.proxmox.com Git - mirror_ovs.git/log
mirror_ovs.git
7 years agoopenvswitch: deprecates support for IPsec tunnel port.
Pravin B Shelar [Tue, 20 Sep 2016 17:52:58 +0000 (10:52 -0700)]
openvswitch: deprecates support for IPsec tunnel port.

OVS IPsec tunnel support has issues:
1. It only works for GRE.
2. only works on Debian.
3. It does not allow user to match on packet-mark
   on packet received on tunnel ports.

This patch deprecates support for IPsec tunnel port.

Signed-off-by: Pravin B Shelar <pshelar@ovn.org>
Acked-by: Ansis Atteka <aatteka@ovn.org>
7 years agonetdev-dpdk: More correct log message on vhost_driver_unregister failure.
Ilya Maximets [Fri, 23 Sep 2016 13:17:57 +0000 (16:17 +0300)]
netdev-dpdk: More correct log message on vhost_driver_unregister failure.

Current error message incorrect for the client mode.

Fixes: c1ff66ac80b5 ("netdev-dpdk: vHost client mode and reconnect")
Signed-off-by: Ilya Maximets <i.maximets@samsung.com>
Acked-by: Daniele Di Proietto <diproiettod@vmware.com>
7 years agonetdev-dpdk: Add missed lock in set_config for vhost client mode.
Ilya Maximets [Fri, 23 Sep 2016 13:17:56 +0000 (16:17 +0300)]
netdev-dpdk: Add missed lock in set_config for vhost client mode.

'vhost_driver_flags' and 'vhost_id' are mutable and must be protected
by 'dev->mutex'.

Fixes: 2d24d165d6a5 ("netdev-dpdk: Add new 'dpdkvhostuserclient' port type")
Signed-off-by: Ilya Maximets <i.maximets@samsung.com>
Acked-by: Daniele Di Proietto <diproiettod@vmware.com>
7 years agoovn-controller: Flush conntrack entries for newly allocated zones.
Justin Pettit [Fri, 19 Aug 2016 19:29:57 +0000 (12:29 -0700)]
ovn-controller: Flush conntrack entries for newly allocated zones.

Flush any existing conntrack entries for a zone when that zone is
allocated to a new logical port.

Signed-off-by: Justin Pettit <jpettit@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
7 years agoovn-controller: Store conntrack zone mappings to OVS database.
Justin Pettit [Tue, 20 Sep 2016 23:34:46 +0000 (16:34 -0700)]
ovn-controller: Store conntrack zone mappings to OVS database.

If ovn-controller is restarted, it may choose different conntrack zones
than had been previously used, which could cause the wrong conntrack
entries to be associated with a logical port.  This commit stores in the
integration bridge's OVS "Bridge" table the mapping to the conntrack zone.

Signed-off-by: Justin Pettit <jpettit@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
7 years agoovsdb-idl: Return result of transaction in ovsdb_idl_loop_commit_and_wait().
Ben Pfaff [Thu, 22 Sep 2016 05:16:19 +0000 (22:16 -0700)]
ovsdb-idl: Return result of transaction in ovsdb_idl_loop_commit_and_wait().

This will have a caller in the future.

Signed-off-by: Ben Pfaff <blp@ovn.org>
Signed-off-by: Justin Pettit <jpettit@ovn.org>
7 years agoAdd OpenFlow command to flush conntrack table entries.
Justin Pettit [Thu, 18 Aug 2016 21:09:41 +0000 (14:09 -0700)]
Add OpenFlow command to flush conntrack table entries.

Signed-off-by: Justin Pettit <jpettit@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
7 years agoovn: Initialize the databases.
Gurucharan Shetty [Mon, 19 Sep 2016 06:24:57 +0000 (23:24 -0700)]
ovn: Initialize the databases.

Without initializing the databases, commands of the form
'ovn-nbctl --wait=sb ls-add ls0' will simply hang.

Signed-off-by: Gurucharan Shetty <guru@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
7 years agoovs-lib: Fix SELinux contexts for created dirs.
Joe Stringer [Fri, 23 Sep 2016 00:25:46 +0000 (17:25 -0700)]
ovs-lib: Fix SELinux contexts for created dirs.

ovs-lib creates several directories directly from the script, but
doesn't make any attempt to ensure that the correct SELinux context is
applied to these directories. As a result, the created directories end
up with type var_run_t rather than openvswitch_var_run_t.

During reboot using a tmpfs for /var/run, startup scripts will invoke
ovs-lib to create these directories with the wrong context. If SELinux
is enabled, OVS will fail to start as it cannot write to this directory.

Fix the issue by sprinkling "restorecon" in each of the places where
directories are created. In practice, many of these should otherwise be
handled by packaging scripts but if they exist then we should ensure the
correct SELinux context is set.

On systems where 'restorecon' is unavailable, this should be a no-op.

VMware-BZ: #1732672

Signed-off-by: Joe Stringer <joe@ovn.org>
Acked-by: Ansis Atteka <aatteka@ovn.org>
7 years agoovn-northd: Fix overlapping ARP/ND resolution logical flows.
Ben Pfaff [Fri, 23 Sep 2016 03:59:22 +0000 (20:59 -0700)]
ovn-northd: Fix overlapping ARP/ND resolution logical flows.

IPv4 and IPv6 packets have separate flows and should not overlap with a
catch-all flow that treats all packets like IPv4.  It's unpredictable what
flow actually gets chosen in this situation.

Found by inspection.

Fixes: c34a87b6c570 ("ovn: Add support for IPv6 dynamic bindings.")
Signed-off-by: Ben Pfaff <blp@ovn.org>
Acked-by: Justin Pettit <jpettit@ovn.org>
7 years agotnl-neigh-cache: Unwildcard flow members before inspecting them.
Daniele Di Proietto [Wed, 25 May 2016 00:13:29 +0000 (17:13 -0700)]
tnl-neigh-cache: Unwildcard flow members before inspecting them.

tnl_neigh_snoop() is part of the translation.  During translation we
have to unwildcard all the fields we examine to make a decision.

tnl_arp_snoop() and tnl_nd_snoop() failed to unwildcard fileds in case
of failure.  The solution is to do unwildcarding before the field is
inspected.

Signed-off-by: Daniele Di Proietto <diproiettod@vmware.com>
Acked-by: Jarno Rajahalme <jarno@ovn.org>
7 years agoofproto-dpif-xlate: Adjust generated mask for fragments.
Daniele Di Proietto [Thu, 25 Aug 2016 16:48:56 +0000 (09:48 -0700)]
ofproto-dpif-xlate: Adjust generated mask for fragments.

It's possible to install an OpenFlow flow that matches on udp source and
destination ports without matching on fragments.  If the subtable where
such flow stays is visited during translation of a later fragment, the
generated mask will have incorrect prerequisited for the datapath and it
would be revalidated away at the first chance.

This commit fixes it by adjusting the mask for later fragments after
translation.

Other prerequisites of the mask are also prerequisites in OpenFlow, but
not the ip fragment bit, that's why we need a special case here.

For completeness, this commits also fixes a related problem in bfd,
where we check the udp destination port without checking if the frame is
an ip fragment.  It's not really necessary to address this separately,
given the adjustment that we perform.

VMware-BZ: #1651589
Signed-off-by: Daniele Di Proietto <diproiettod@vmware.com>
Acked-by: Jarno Rajahalme <jarno@ovn.org>
7 years agoconntrack: fix address offset bug
Wei [Thu, 25 Aug 2016 12:47:49 +0000 (20:47 +0800)]
conntrack: fix address offset bug

Signed-off-by: Wei <realbaseball2008@gmail.com>
Signed-off-by: Daniele Di Proietto <diproiettod@vmware.com>
7 years agoconntrack: remove duplicated code
Wei [Tue, 2 Aug 2016 14:09:18 +0000 (22:09 +0800)]
conntrack: remove duplicated code

Signed-off-by: Wei <realbaseball2008@gmail.com>
Signed-off-by: Daniele Di Proietto <diproiettod@vmware.com>
7 years agoNEWS: Add known issues for v2.6.0.
Joe Stringer [Thu, 15 Sep 2016 23:26:05 +0000 (16:26 -0700)]
NEWS: Add known issues for v2.6.0.

Signed-off-by: Joe Stringer <joe@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
7 years agotravis: Work around glibtoolize error.
Joe Stringer [Wed, 21 Sep 2016 18:36:42 +0000 (11:36 -0700)]
travis: Work around glibtoolize error.

Signed-off-by: Joe Stringer <joe@ovn.org>
Acked-by: Lance Richardson <lrichard@redhat.com>
7 years agoofproto: restore file mode to 644.
antonio.fischetti@intel.com [Wed, 21 Sep 2016 13:05:09 +0000 (14:05 +0100)]
ofproto: restore file mode to 644.

Just restored file mode from 755 to 644.

Signed-off-by: Antonio Fischetti <antonio.fischetti@intel.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
7 years agoRemove execute permisson on source files
Huanle Han [Mon, 19 Sep 2016 16:13:36 +0000 (00:13 +0800)]
Remove execute permisson on source files

Signed-off-by: Huanle Han <hanxueluo@gmail.com>
Signed-off-by: Russell Bryant <russell@ovn.org>
7 years agoovn: Change ct_label[0] to ct_label.blocked
Babu Shanmugam [Wed, 21 Sep 2016 09:01:21 +0000 (14:31 +0530)]
ovn: Change ct_label[0] to ct_label.blocked

ovn-northd uses ct_label[0] to keep track of the ACL changes on
existing connections.This patch replaces the usage of ct_label[0]
in the logical flows with a symbolic name ct_label.blocked

Suggested-by: Justin Pettit <jpettit@ovn.org>
Suggested-at: http://openvswitch.org/pipermail/dev/2016-July/075773.html
Signed-off-by: Babu Shanmugam <bschanmu@redhat.com>
Signed-off-by: Russell Bryant <russell@ovn.org>
7 years agoWindows: Disable python3 tests
Alin Serdean [Tue, 20 Sep 2016 19:09:28 +0000 (19:09 +0000)]
Windows: Disable python3 tests

Until the effort of the python series is integrated, disable the python3
tests under Windows.

Signed-off-by: Alin Gabriel Serdean <aserdean@cloudbasesolutions.com>
Signed-off-by: Gurucharan Shetty <guru@ovn.org>
7 years agotoken-bucket: Add token_bucket_wait_at().
Jarno Rajahalme [Tue, 20 Sep 2016 18:38:59 +0000 (11:38 -0700)]
token-bucket: Add token_bucket_wait_at().

Having the caller of token_bucket_wait() indicated in the log messages
makes debugging easier.

Signed-off-by: Jarno Rajahalme <jarno@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
7 years agoofproto: Do not signal revalidation for group mods twice.
Jarno Rajahalme [Tue, 20 Sep 2016 18:38:59 +0000 (11:38 -0700)]
ofproto: Do not signal revalidation for group mods twice.

The new group mod implementation signals revalidation through
'->set_tables_version()', so the separate '->group_modify()' is no
longer needed.  The ofproto-provider API is changed to allow
'group_modify' to be NULL.

Fixes: 5d08a275cd ("ofproto: Make groups versioned.")
Signed-off-by: Jarno Rajahalme <jarno@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
7 years agoovn-controller: Fix possible null pointer dereference.
Justin Pettit [Tue, 20 Sep 2016 00:56:11 +0000 (17:56 -0700)]
ovn-controller: Fix possible null pointer dereference.

The code dereferences "chassis", which could be null if chassis_run()
returns null.  "chassis" will always be null if "chassis_id" is null, so
checking "chassis" is sufficient to check both.

Found by inspection.

Signed-off-by: Justin Pettit <jpettit@ovn.org>
7 years agodatapath: avoid deferred execution of recirc actions
Lance Richardson [Tue, 20 Sep 2016 12:55:34 +0000 (05:55 -0700)]
datapath: avoid deferred execution of recirc actions

Port upstream fix to datapath module. The only notable difference
between this patch and the upstream version is that the value of
ovs_recursion_limit (5 for upstream kernel, 4 for out-of-tree
module) is maintained in this patch.

Upstream commit:
    commit f43e6dfb056b58628e43179d8f6b59eae417754d
    Author: Lance Richardson <lrichard@redhat.com>
    Date:   Mon Sep 12 17:07:23 2016 -0400

    openvswitch: avoid deferred execution of recirc actions

    The ovs kernel data path currently defers the execution of all
    recirc actions until stack utilization is at a minimum.
    This is too limiting for some packet forwarding scenarios due to
    the small size of the deferred action FIFO (10 entries). For
    example, broadcast traffic sent out more than 10 ports with
    recirculation results in packet drops when the deferred action
    FIFO becomes full, as reported here:

         http://openvswitch.org/pipermail/dev/2016-March/067672.html

    Since the current recursion depth is available (it is already tracked
    by the exec_actions_level pcpu variable), we can use it to determine
    whether to execute recirculation actions immediately (safe when
    recursion depth is low) or defer execution until more stack space is
    available.

    With this change, the deferred action fifo size becomes a non-issue
    for currently failing scenarios because it is no longer used when
    there are three or fewer recursions through ovs_execute_actions().

Suggested-by: Pravin Shelar <pshelar@ovn.org>
Signed-off-by: Lance Richardson <lrichard@redhat.com>
Acked-by: Pravin B Shelar <pshelar@ovn.org>
7 years agoofproto-dpif-xlate: Fix memory leak in execute_controller_action.
Ryan Moats [Tue, 20 Sep 2016 15:35:46 +0000 (10:35 -0500)]
ofproto-dpif-xlate: Fix memory leak in execute_controller_action.

commit df70a7731 ("ofproto-dpif-xlate: Allow translating
without side-effects.") created a memory leak by removing the
dp_packet_delete statement in execute_controller_action that
freed the earlier cloned packet.  This commit restores this
statement to the end of the method.

Fixes: df70a7731 ("ofproto-dpif-xlate: Allow translating without side-effects.")
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
7 years agonetdev: Avoid leaking seq in netdev_open() error path.
Huanle Han [Sat, 17 Sep 2016 15:53:07 +0000 (23:53 +0800)]
netdev: Avoid leaking seq in netdev_open() error path.

Signed-off-by: Huanle Han <hanxueluo@gmail.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
7 years agoofp-actions: Remove unused OFPACT_FOR_EACH_TYPE.
Binbin Xu [Tue, 20 Sep 2016 19:54:06 +0000 (03:54 +0800)]
ofp-actions: Remove unused OFPACT_FOR_EACH_TYPE.

Signed-off-by: Binbin Xu <xu.binbin1@zte.com.cn>
Signed-off-by: Ben Pfaff <blp@ovn.org>
7 years agoofproto: Remove groups that nested actions reference when removing rule.
Binbin Xu [Tue, 20 Sep 2016 19:54:05 +0000 (03:54 +0800)]
ofproto: Remove groups that nested actions reference when removing rule.

topology:
                      +----------------+
            +-------->| SDN Controller |<--------------+
            |         +----------------+               |
            |                                        |
+-----------|-----+    +-----------|-----+
| +-----+   |     |                        | +-----+   |     |
| | VM1 |   |     |                        | | VM2 |   |     |
| +-----+   |     |                        | +-----+   |     |
|    ^      V     |                        |    ^      V     |
|    |   +-----+  |                        |    |   +-----+  |
|    +-> | OVS |  |                        |    +-> | OVS |  |
|        +-----+  |                        |        +-----+  |
|           ^     |                        |           ^     |
+-----------|-----+                        +-----------|-----+
    | Nic                                   Nic|
            +------------------------------------------+

We start the communication between VM1 and VM2, for example, ICMP.
At the meantime, disconnect OVS and SDN controller, and reconnect
them again, the process ovs-vswitchd crashes.

backtrace:
0  0x00007f658082ffe4 in cls_rule_make_invisible_in_version ()
1  0x00007f65807f6bb3 in delete_flows_start__ ()
2  0x00007f65807f7ee9 in ofproto_group_mod_start ()
3  0x00007f65807fa07b in handle_openflow ()
4  0x00007f658082119b in connmgr_run ()
5  0x00007f65807f3ba6 in ofproto_run ()
6  0x00007f65807e101c in bridge_run__ ()
7  0x00007f65807e715d in bridge_run ()
8  0x00007f658065784d in main ()

Signed-off-by: Binbin Xu <xu.binbin1@zte.com.cn>
Signed-off-by: Ben Pfaff <blp@ovn.org>
7 years agodatapath-windows: Add define for last module number
Shashank Ram [Mon, 19 Sep 2016 23:16:02 +0000 (16:16 -0700)]
datapath-windows: Add define for last module number

Adds a define for the last defined module number.

Signed-off-by: Shashank Ram <rams@vmware.com>
Acked-by: Sairam Venugopal <vsairam@vmware.com>
Acked-by: Nithin Raju <nithin@vmware.com>
Signed-off-by: Gurucharan Shetty <guru@ovn.org>
7 years agoovsdb-idl: Update comments.
Ben Pfaff [Mon, 19 Sep 2016 23:23:20 +0000 (16:23 -0700)]
ovsdb-idl: Update comments.

TXN_AGAIN_WAIT and TXN_AGAIN_NOW were combined into a single return code
TXN_TRY_AGAIN a long time ago, but these comment was not updated.

Reported-by: Justin Pettit <jpettit@ovn.org>
Signed-off-by: Ben Pfaff <blp@ovn.org>
Acked-by: Justin Pettit <jpettit@ovn.org>
7 years agonetdev-dpdk: Fix memory leak in dpdk_mp_{get, put}().
Ilya Maximets [Mon, 5 Sep 2016 13:36:28 +0000 (16:36 +0300)]
netdev-dpdk: Fix memory leak in dpdk_mp_{get, put}().

'dmp' should be freed on failure and on put.

Fixes: 8a9562d21a40 ("dpif-netdev: Add DPDK netdev.")
Fixes: 8d38823bdf8b ("netdev-dpdk: fix memory leak")
Signed-off-by: Ilya Maximets <i.maximets@samsung.com>
Signed-off-by: Daniele Di Proietto <diproiettod@vmware.com>
7 years agonetdev-dpdk: Add new 'dpdkvhostuserclient' port type
Ciara Loftus [Fri, 19 Aug 2016 09:22:30 +0000 (10:22 +0100)]
netdev-dpdk: Add new 'dpdkvhostuserclient' port type

The 'dpdkvhostuser' port type no longer supports both server and client
mode. Instead, 'dpdkvhostuser' ports are always 'server' mode and
'dpdkvhostuserclient' ports are always 'client' mode.

Suggested-by: Daniele Di Proietto <diproiettod@vmware.com>
Signed-off-by: Ciara Loftus <ciara.loftus@intel.com>
Signed-off-by: Daniele Di Proietto <diproiettod@vmware.com>
7 years agoovsdb: monitor - Replace tabs with spaces
Alin Serdean [Fri, 16 Sep 2016 00:51:49 +0000 (00:51 +0000)]
ovsdb: monitor - Replace tabs with spaces

Found by inspection.

Signed-off-by: Alin Gabriel Serdean <aserdean@cloudbasesolutions.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
7 years agotun-metadata: Manage tunnel TLV mapping table on a per-bridge basis.
Jesse Gross [Wed, 20 Apr 2016 01:36:04 +0000 (18:36 -0700)]
tun-metadata: Manage tunnel TLV mapping table on a per-bridge basis.

When using tunnel TLVs (at the moment, this means Geneve options), a
controller must first map the class and type onto an appropriate OXM
field so that it can be used in OVS flow operations. This table is
managed using OpenFlow extensions.

The original code that added support for TLVs made the mapping table
global as a simplification. However, this is not really logically
correct as the OpenFlow management commands are operating on a per-bridge
basis. This removes the original limitation to make the table per-bridge.

One nice result of this change is that it is generally clearer whether
the tunnel metadata is in datapath or OpenFlow format. Rather than
allowing ad-hoc format changes and trying to handle both formats in the
tunnel metadata functions, the format is more clearly separated by function.
Datapaths (both kernel and userspace) use datapath format and it is not
changed during the upcall process. At the beginning of action translation,
tunnel metadata is converted to OpenFlow format and flows and wildcards
are translated back at the end of the process.

As an additional benefit, this change improves performance in some flow
setup situations by keeping the tunnel metadata in the original packet
format in more cases. This helps when copies need to be made as the amount
of data touched is only what is present in the packet rather than the
maximum amount of metadata supported.

Co-authored-by: Madhu Challa <challa@noironetworks.com>
Signed-off-by: Madhu Challa <challa@noironetworks.com>
Signed-off-by: Jesse Gross <jesse@kernel.org>
Acked-by: Ben Pfaff <blp@ovn.org>
7 years agoovs-ofctl.8.in: Fix minor formatting issues.
Justin Pettit [Thu, 18 Aug 2016 21:14:45 +0000 (14:14 -0700)]
ovs-ofctl.8.in: Fix minor formatting issues.

Signed-off-by: Justin Pettit <jpettit@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
7 years agodpif-provider: Clean up comments around ct functions.
Justin Pettit [Thu, 11 Aug 2016 19:50:55 +0000 (12:50 -0700)]
dpif-provider: Clean up comments around ct functions.

Signed-off-by: Justin Pettit <jpettit@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
7 years agojsonrpc: Improve comment for jsonrpc_get_status().
Justin Pettit [Thu, 11 Aug 2016 17:31:43 +0000 (10:31 -0700)]
jsonrpc: Improve comment for jsonrpc_get_status().

Signed-off-by: Justin Pettit <jpettit@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
7 years agoINSTALL.DPDK-ADVANCED.md: Remove execute permissions.
Justin Pettit [Fri, 16 Sep 2016 18:21:26 +0000 (11:21 -0700)]
INSTALL.DPDK-ADVANCED.md: Remove execute permissions.

Signed-off-by: Justin Pettit <jpettit@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
7 years agodatapath: backport: openvswitch: use alias for genetlink family names
Thadeu Lima de Souza Cascardo [Fri, 16 Sep 2016 18:52:48 +0000 (15:52 -0300)]
datapath: backport: openvswitch: use alias for genetlink family names

Upstream commit:
    commit ed227099dac95128e2aecd62af51bb9d922e5977
    Author: Thadeu Lima de Souza Cascardo <cascardo@redhat.com>
    Date:   Fri Sep 9 17:42:30 2016 -0300

    openvswitch: use alias for genetlink family names

    When userspace tries to create datapaths and the module is not loaded,
    it will simply fail. With this patch, the module will be automatically
    loaded.

Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@redhat.com>
Acked-by: Pravin B Shelar <pshelar@ovn.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@redhat.com>
Signed-off-by: Jesse Gross <jesse@kernel.org>
7 years agoofp-parse: Fix sparse warnings about comparing ofp_port_ts.
Ben Pfaff [Thu, 15 Sep 2016 03:59:10 +0000 (20:59 -0700)]
ofp-parse: Fix sparse warnings about comparing ofp_port_ts.

Without this, sparse complains:

    lib/ofp-parse.c:588:19: warning: restricted ofp_port_t degrades to integer
    lib/ofp-parse.c:588:31: warning: restricted ofp_port_t degrades to integer

This is one of the irritating bits of using sparse, but on the whole I
think it saves us pretty often.

CC: Jarno Rajahalme <jarno@ovn.org>
Fixes: 6dd3c787f591 ("ofproto: Support packet_outs in bundles.")
Signed-off-by: Ben Pfaff <blp@ovn.org>
Acked-by: Joe Stringer <joe@ovn.org>
7 years agoofproto-dpif-xlate: Fix treatment of mirrors across patch port.
Ben Pfaff [Thu, 15 Sep 2016 18:43:46 +0000 (11:43 -0700)]
ofproto-dpif-xlate: Fix treatment of mirrors across patch port.

When the bridges on both sides of a patch port included mirrors, the
translation code incorrectly conflated them instead of treating them as
independent.

Reported-by: Zoltán Balogh <zoltan.balogh@ericsson.com>
Reported-by: Sugesh Chandran <sugesh.chandran@intel.com>
Reported-at: http://openvswitch.org/pipermail/discuss/2016-September/022689.html
Signed-off-by: Ben Pfaff <blp@ovn.org>
Tested-by: Zoltán Balogh <zoltan.balogh@ericsson.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
7 years agoxlate: Use dp_hash for select groups.
Jarno Rajahalme [Fri, 16 Sep 2016 16:39:13 +0000 (09:39 -0700)]
xlate: Use dp_hash for select groups.

Add a new select group selection method "dp_hash", which uses minimal
number of bits from the datapath calculated packet hash to inform the
select group bucket selection.  This makes the datapath flows more
generic resulting in less upcalls to userspace, but adds recirculation
prior to group selection.

Signed-off-by: Jarno Rajahalme <jarno@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
7 years agoofp-parse: Harden checking with group selection_method.
Jarno Rajahalme [Fri, 16 Sep 2016 16:39:13 +0000 (09:39 -0700)]
ofp-parse: Harden checking with group selection_method.

Only allow fields when "selection_method=hash".  Only allow
selection_method_param when a non-nil selection_method is given.

Signed-off-by: Jarno Rajahalme <jarno@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
7 years agoofp-parse: Remove double uninit of group mod if parsing fails.
Jarno Rajahalme [Fri, 16 Sep 2016 16:39:13 +0000 (09:39 -0700)]
ofp-parse: Remove double uninit of group mod if parsing fails.

Double ofputil_uninit_group_mod() used to be harmless, but leads to
double free after commit e8dba7197, which will crash if any error in
group parsing happens.

Add a test to prevent this regression from happening again.

Fixes: e8dba7197 ("meta-flow: Compact struct field_array.")
Signed-off-by: Jarno Rajahalme <jarno@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
7 years agodatapath: compat: tunnels: Log error during initialization.
Pravin B Shelar [Thu, 15 Sep 2016 21:57:56 +0000 (14:57 -0700)]
datapath: compat: tunnels: Log error during initialization.

At present OVS compat tunneling can fail due to conflict with
already loaded tunneling kernel module. In this case openvswitch
kernel module loading fails silently. Following patch give more
clues about what went wrong.

Signed-off-by: Pravin B Shelar <pshelar@ovn.org>
Acked-by: Jesse Gross <jesse@kernel.org>
7 years agoNEWS: Move bundle timeout to 2.6.
Jarno Rajahalme [Thu, 15 Sep 2016 21:46:55 +0000 (14:46 -0700)]
NEWS: Move bundle timeout to 2.6.

Move the news for bundle timeouts to OVS 2.6, as we decided to
backport it there.

Signed-off-by: Jarno Rajahalme <jarno@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
7 years agoNEWS: Memory efficiency improvements.
Jarno Rajahalme [Thu, 15 Sep 2016 20:59:52 +0000 (13:59 -0700)]
NEWS: Memory efficiency improvements.

Mention both flow table and bundle memory efficiency improvements.

Signed-off-by: Jarno Rajahalme <jarno@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
7 years agoofproto: Remove double reporting from bundles.
Jarno Rajahalme [Thu, 15 Sep 2016 20:59:52 +0000 (13:59 -0700)]
ofproto: Remove double reporting from bundles.

Patch b0d38b2f17 unified flow mod reporting in ofproto for both
stand-alone flow mods and bundle flow mods, but left bundle-specific
reporting to the bundle removal code.  This patch fixes this by
removing the bundle-specific reporting of flow mods.

Found by inspection.

Fixes: b0d38b2f17 ("ofproto: Report flow mods also from bundles.")
Signed-off-by: Jarno Rajahalme <jarno@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
7 years agoovs-save: Use ${bridge} when dumping TLV map.
Jesse Gross [Mon, 12 Sep 2016 01:23:05 +0000 (18:23 -0700)]
ovs-save: Use ${bridge} when dumping TLV map.

The script accidentally hardcoded the bridge name as 'br-int',
a leftover from testing.

Reported-by: Huanle Han <hanxueluo@gmail.com>
Signed-off-by: Jesse Gross <jesse@kernel.org>
Acked-by: Ben Pfaff <blp@ovn.org>
7 years agosocket-util-unix: Avoid buffer read overrun in get_unix_name_len().
Ben Pfaff [Thu, 15 Sep 2016 03:39:03 +0000 (20:39 -0700)]
socket-util-unix: Avoid buffer read overrun in get_unix_name_len().

If the socket length does not include any of the bytes of the path, then
the code should not read even the first byte of the path.

Found by valgrind.

Reported-by: Joe Stringer <joe@ovn.org>
Signed-off-by: Ben Pfaff <blp@ovn.org>
Acked-by: Thadeu Lima de Souza Cascardo <cascardo@redhat.com>
Acked-by: Joe Stringer <joe@ovn.org>
7 years agoovn: Add test to ensure datapath removal is proper.
Flavio Fernandes [Thu, 15 Sep 2016 14:50:40 +0000 (09:50 -0500)]
ovn: Add test to ensure datapath removal is proper.

Adding a unit test in ovn.at, to exercise the cleanup of
OF rules related to a logical datapath, when a logical
switch is removed.

Reported-by: Guru Shetty <guru@ovn.org>
Reported-at: http://openvswitch.org/pipermail/discuss/2016-August/022478.html
Signed-off-by: Flavio Fernandes <flavio@flaviof.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
7 years agoovn-northd: Format logical flows a little better.
Gurucharan Shetty [Mon, 12 Sep 2016 10:22:42 +0000 (03:22 -0700)]
ovn-northd: Format logical flows a little better.

This is a cosmetic fix.

Signed-off-by: Gurucharan Shetty <guru@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
7 years agoovn-northd: Fix a memory leak.
Gurucharan Shetty [Mon, 12 Sep 2016 10:20:06 +0000 (03:20 -0700)]
ovn-northd: Fix a memory leak.

Signed-off-by: Gurucharan Shetty <guru@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
7 years agoovn-trace: Avoid segfault for DHCP options flows.
Ben Pfaff [Wed, 14 Sep 2016 23:58:44 +0000 (16:58 -0700)]
ovn-trace: Avoid segfault for DHCP options flows.

It would be better if ovn-trace fully supported DHCP options, but this at
least should avoid the segmentation fault.

Reported-by: Han Zhou <zhouhan@gmail.com>
Acked-by: Han Zhou <zhouhan@gmail.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
7 years agoovn: make ipam tests more reliable
Lance Richardson [Wed, 14 Sep 2016 23:30:50 +0000 (19:30 -0400)]
ovn: make ipam tests more reliable

After adding log messages to better understand  IPAM-related code
in ovn northd, the IPAM tests began to fail occasionally. Adding
--wait=sb to commands triggering address allocation eliminated
these failures (there were no failures with 100 executions when
testing with this change).

Signed-off-by: Lance Richardson <lrichard@redhat.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
7 years agoofproto: Support packet_outs in bundles.
Jarno Rajahalme [Wed, 14 Sep 2016 23:51:27 +0000 (16:51 -0700)]
ofproto: Support packet_outs in bundles.

Add support for OFPT_PACKET_OUT messages in bundles.

While ovs-ofctl already has a packet-out command, we did not have a
string parser for it, as the parsing was done directly from command
line arguments.

This patch adds the string parser for packet-out messages, adds
support for it into the 'ovs-ofctl packet-out' command, and adds a new
ofctl/packet-out ovs-appctl command that can be used when ovs-ofctl is
used as a flow monitor.  The old 'ovs-ofctl packet-out syntax is
deprecated' and will be removed in a later OVS release.

The new packet-out parser is further supported with the ovs-ofctl
bundle command, which allows bundles to mix flow mods, group mods and
packet-out messages.  Also the packet-outs in bundles are only
executed if the whole bundle is successful.  A failing packet-out
translation may also make the whole bundle to fail.

Signed-off-by: Jarno Rajahalme <jarno@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
7 years agoofproto: Refactor packet_out handling.
Jarno Rajahalme [Wed, 14 Sep 2016 23:51:27 +0000 (16:51 -0700)]
ofproto: Refactor packet_out handling.

Refactor handle_packet_out() to prepare for bundle support for packet
outs in a later patch.

Two new callbacks are introduced in ofproto-provider class:
->packet_xlate() and ->packet_execute().  ->packet_xlate() translates
the packet using the flow and actions provided by the caller, but
defers all OpenFlow-visible side-effects (stats, learn actions, actual
packet output, etc.) to be explicitly executed with the
->packet_execute() call.

Adds a new ofproto_rule_reduce_timeouts__() that must be called with
'ofproto_mutex' held.  This is used in the next patch.

Signed-off-by: Jarno Rajahalme <jarno@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
7 years agocoverage: Rename init functions to avoid symbol collisions.
Jarno Rajahalme [Wed, 14 Sep 2016 23:51:27 +0000 (16:51 -0700)]
coverage: Rename init functions to avoid symbol collisions.

ofproto now uses various *_init() functions, so use something else for
coverage constructors.

Signed-off-by: Jarno Rajahalme <jarno@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
7 years agoofproto-dpif-xlate: Allow translating without side-effects.
Jarno Rajahalme [Wed, 14 Sep 2016 23:51:27 +0000 (16:51 -0700)]
ofproto-dpif-xlate: Allow translating without side-effects.

Extend 'may_learn' attribute to also control the treatment of
FIN_TIMEOUT action and asynchronous messages (packet ins,
continuations), so that when 'may_learn' is 'false' and
'resubmit_stats' is 'NULL', no OpenFlow-visible side effects are
generated by the translation.

Correspondingly, add support for one-time asynchronous messages to
xlate cache, so that all side-effects of the translation may be
executed at a later stage.  This will be useful for bundle commits.

Signed-off-by: Jarno Rajahalme <jarno@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
7 years agoofproto: Use ofproto_flow_mod for learn execution from xlate cache.
Jarno Rajahalme [Wed, 14 Sep 2016 23:51:27 +0000 (16:51 -0700)]
ofproto: Use ofproto_flow_mod for learn execution from xlate cache.

Use ofproto_flow_mod with a reference to an existing or new rule
instead of ofputil_flow_mod for learn action execution from xlate
cache

Typically we would find that when a learn xlate cache entry is
created, a preceding upcall has already created the learned flow.  In
this case the xlate cache entry takes a reference to that flow and
keeps refreshing it without needing to perform any flow table lookups.
Otherwise the creation of the xlate cache entry creates the new rule,
which is then subsequently added to the classifier.  In both cases
this is both faster and shrinks the memory cost of each learn cache
entry from ~3.5kb to about 0.3kb.

If the learned rule does not yet exist, it is created and attached to
the ofproto_flow_mod, from which it is then added.  If the referred
rule happens to expire, or is modified in any way and is thus removed
from the classifier tables, we create a new rule using the old rule as
a template, so that we can avoid storing the ofputil_flow_mod in all
cases.

Signed-off-by: Jarno Rajahalme <jarno@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
7 years agoofproto-dpif-xlate: Add xlate cache type XC_TABLE.
Jarno Rajahalme [Wed, 14 Sep 2016 23:51:27 +0000 (16:51 -0700)]
ofproto-dpif-xlate: Add xlate cache type XC_TABLE.

Xlate cache entry type XC_TABLE is required for the table stats
(number of misses and matches) to be correctly attributed.

It appears that table stats have been off ever since xlate cache was
introduced.  This was now revealed by a PACKET_OUT unit test case in a
later patch that checks for table stats explicitly.

Fixes: b256dc52 ("ofproto-dpif-xlate: Cache xlate_actions() effects.")
Signed-off-by: Jarno Rajahalme <jarno@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
7 years agoofproto-dpif-xlate: Expose xlate cache.
Jarno Rajahalme [Wed, 14 Sep 2016 23:51:27 +0000 (16:51 -0700)]
ofproto-dpif-xlate: Expose xlate cache.

Later patches will need to create xlate cache entries from different
modules.  This patch refactors the xlate cache code in preparation
without any functional changes, so that the changes are clearly
visible in the following patches.

The definition of XC_ENTRY_FOR_EACH() iterator macro is changed so
that it now does not take the xlate cache pointer to unify the usage
accross all call sites.

Signed-off-by: Jarno Rajahalme <jarno@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
7 years agolib: Refactor mac-learning updates.
Jarno Rajahalme [Wed, 14 Sep 2016 23:51:26 +0000 (16:51 -0700)]
lib: Refactor mac-learning updates.

Make mac table update functions part of the mac-learning module, which
also helps in figuring what is the minimal set of struct flow fields
needed for the update.  Use this to change the xlate cache entry for
XC_NORMAL to not take a copy of the struct flow, but only save the
in_port, dl_src, and some auxiliary fields.  This reduces the memory
burden of XC_NORMAL by roughly 0.5kb.

Signed-off-by: Jarno Rajahalme <jarno@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
7 years agoovn-northd: add dhcpv6 stateless option support
Zongkai LI [Fri, 9 Sep 2016 06:39:17 +0000 (06:39 +0000)]
ovn-northd: add dhcpv6 stateless option support

This patch adds DHCPv6 stateless option support, to allow ovn native dhcpv6
work in stateless mode.

User can add new option dhcpv6_stateless with string value true in
DHCP_Options.options column, to let ovn dhcpv6 only reply other configurations
for DHCPv6 request messages come from VM/VIF ports, and let VM/VIF ports get
their IPv6 addresses configured via stateless way.

Signed-off-by: Zongkai LI <zealokii@gmail.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
7 years agoovn: log dhcp responses for debugging
Ramu Ramamurthy [Thu, 1 Sep 2016 18:38:58 +0000 (18:38 +0000)]
ovn: log dhcp responses for debugging

Add a few messages at INFO to help debug the vif lifecycle.
A logsearch on mac or ip helps debug what happened to the
vif and when. This helps easily correlate logs across CMS and ovn.

Logs appear like this:

2016-09-01T18:15:48Z|00014|binding|INFO|Claiming lport eee1a9af-7513-4540-9385-9e3972bfca05 for this chassis.
2016-09-01T18:15:48Z|00015|binding|INFO|Claiming fa:16:3e:01:c3:4a 10.0.0.7 fd93:b509:aa46:0:f816:3eff:fe01:c34a
2016-09-01T18:15:59Z|00016|pinctrl|INFO|DHCPOFFER fa:16:3e:01:c3:4a 10.0.0.7
2016-09-01T18:15:59Z|00017|pinctrl|INFO|DHCPACK fa:16:3e:01:c3:4a 10.0.0.7
2016-09-01T18:16:22Z|00018|binding|INFO|Releasing lport eee1a9af-7513-4540-9385-9e3972bfca05 from this chassis.
2016-09-01T18:16:22Z|00019|binding|INFO|Releasing fa:16:3e:01:c3:4a 10.0.0.7 fd93:b509:aa46:0:f816:3eff:fe01:c34a

Signed-off-by: Ramu Ramamurthy <ramu.ramamurthy@us.ibm.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
7 years agoovn: add lsp-deletion and bcast-flow removal tests for localnet
Ramu Ramamurthy [Tue, 30 Aug 2016 23:58:34 +0000 (23:58 +0000)]
ovn: add lsp-deletion and bcast-flow removal tests for localnet

Add 2 tests for scenarios around lsp-deletion and flow removal
which have escaped current unit tests.

This test depends on the following patch:
"ovn-controller: Back out incremental processing" and passes
after applying it, but fails currently on master.

1) In the following sequence of events,
createi&bind vif1, create&bind vif2, delete vif1
we find that the localnet patch port
got deleted, whereas it should exist because there is a
bound vif2.

2) The flow broadcasting to tunnels in table=32 must be deleted
when a localnet port gets bound, but we find that the flow remains
in table 32 causing broadcasts to both tunnels and localnet patch.

Signed-off-by: Ramu Ramamurthy <ramu.ramamurthy@us.ibm.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
7 years agolib: Create $(sysconfdir)/openvswitch upon install
Flavio Fernandes [Tue, 13 Sep 2016 16:26:15 +0000 (11:26 -0500)]
lib: Create $(sysconfdir)/openvswitch upon install

In cases where dbdir and etcdir are not the same, there is a need
for creating etcdir (i.e. $(sysconfdir)/openvswitch) explicitly.

Note that there is no attempt being made here to make the etcdir
configurable as in "--with-dbdir".

Reported-at: http://openvswitch.org/pipermail/dev/2016-September/TBD.html
Fixes: f973f2af2fd4 ("Make the location of the database separately configurable.")
Signed-off-by: Flavio Fernandes <flavio@flaviof.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
7 years agoWindows: Extend support for binaries which allow detach
Alin Serdean [Wed, 14 Sep 2016 15:25:57 +0000 (15:25 +0000)]
Windows: Extend support for binaries which allow detach

On Windows we require service_start to be called to parse and setup
requirements for '--detach' argument.
Affected binaries: ovn-trace, ovsdb-client, ovs-testcontroller.

Subsequent patches will be sent to adapt the tests with the new features.

Signed-off-by: Alin Gabriel Serdean <aserdean@cloudbasesolutions.com>
Signed-off-by: Gurucharan Shetty <guru@ovn.org>
7 years agoconnmgr: Make connmgr_wants_packet_in_on_miss() lock-free.
Jarno Rajahalme [Tue, 13 Sep 2016 21:46:16 +0000 (14:46 -0700)]
connmgr: Make connmgr_wants_packet_in_on_miss() lock-free.

Make connmgr_wants_packet_in_on_miss() use an atomic int instead of a
list traversal taking the 'ofproto_mutex'.  This allows
connmgr_wants_packet_in_on_miss() to be called also when
'ofproto_mutex' is already held, and makes it faster, too.

Remove unused ofproto_dpif_wants_packet_in_on_miss().

Signed-off-by: Jarno Rajahalme <jarno@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
7 years agoofproto: Change rule's 'removed' member to a tri-state 'state'.
Jarno Rajahalme [Tue, 13 Sep 2016 21:46:16 +0000 (14:46 -0700)]
ofproto: Change rule's 'removed' member to a tri-state 'state'.

As a rule may not be re-inserted to ofproto data structures, it is
cleaner to have three states for the rule, rather than just two.  This
will be useful for managing learned flows in later patches.

Signed-off-by: Jarno Rajahalme <jarno@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
7 years agoofproto: Add a fixed bundle idle timeout of 10 seconds.
Jarno Rajahalme [Tue, 13 Sep 2016 21:46:16 +0000 (14:46 -0700)]
ofproto: Add a fixed bundle idle timeout of 10 seconds.

Timing out idle bundles frees memory that would effectively be leaked
if a long standing OpenFlow connection would fail to commit or discard
a bundle.

OpenFlow specification mandates the timeout to be at least one second,
if the switch implements such a timeout.  This patch makes the bundle
idle timeout to be 10 seconds.

We do not limit the number of messages in a bundle, so it does not
make sense to limit the number of bundles either, especially now that
idle bundles are timed out.

Signed-off-by: Jarno Rajahalme <jarno@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
7 years agotests: Keyword fixes.
Jarno Rajahalme [Tue, 13 Sep 2016 21:46:16 +0000 (14:46 -0700)]
tests: Keyword fixes.

Add "bundle" keyword to ofp-print.at tests about bundle messages.
Add a missing ofp-print.at test for bundle group mods.
Remove "monitor" keyword from ofproto.at tests that do not use a monitor.

Signed-off-by: Jarno Rajahalme <jarno@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
7 years agoofproto: Don't use connmgr after destruction.
Jarno Rajahalme [Tue, 13 Sep 2016 21:46:16 +0000 (14:46 -0700)]
ofproto: Don't use connmgr after destruction.

Set ofproto's connmgr pointer to NULL after the connmgr has been
destructed, and check for NULL when sending a flow removed
notification.

Verified by sending the flow removed message unconditionally and
observing numerous core dumps in the test suite.

Found by inspection.

Fixes: f695ebfae5 ("ofproto: Postpone sending flow removed messages.")
Signed-off-by: Jarno Rajahalme <jarno@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
7 years agovagrant: Add Debian Jessie support.
Thadeu Lima de Souza Cascardo [Tue, 13 Sep 2016 15:46:30 +0000 (12:46 -0300)]
vagrant: Add Debian Jessie support.

Now, vagrant up will test both Fedora 23 and Debian Jessie (8.0), which
uses Linux 3.16.

Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@redhat.com>
Signed-off-by: Joe Stringer <joe@ovn.org>
7 years agoWindows: Update the Driver and MSI properties
Sairam Venugopal [Mon, 12 Sep 2016 21:47:07 +0000 (14:47 -0700)]
Windows: Update the Driver and MSI properties

Fix the legal notice section in OVSEXT.SYS properties. Update the MSI to
include the properties mentioned in MSDN - 'Extension driver MSI packaging
requirements' section -
https://msdn.microsoft.com/windows/hardware/drivers/network/extension-driver-msi-packaging-requirements

Signed-off-by: Sairam Venugopal <vsairam@vmware.com>
Acked-by: Alin Gabriel Serdean <aserdean@cloudbasesolutions.com>
Signed-off-by: Gurucharan Shetty <guru@ovn.org>
7 years agodatapath: compat: geneve: use ovs specific device type for compat geneve module.
Pravin B Shelar [Mon, 12 Sep 2016 21:32:35 +0000 (14:32 -0700)]
datapath: compat: geneve: use ovs specific device type for compat geneve module.

This allows openvswitch and geneve module co-exist kernel on newer
kernels.

Reported-by: Joe Stringer <joe@ovn.org>
Signed-off-by: Pravin B Shelar <pshelar@ovn.org>
Acked-by: Jesse Gross <jesse@kernel.org>
7 years agodatapath-windows: Fix conntrack event handler
Sairam Venugopal [Mon, 12 Sep 2016 18:50:27 +0000 (11:50 -0700)]
datapath-windows: Fix conntrack event handler

Fix an issue with the OvsReadEventCmdHandler when handling conntrack
events. Driver initiated messages should have zero seq number.

Reverting the previous review comment since the inputBuffer in
this case will be NULL.

Signed-off-by: Sairam Venugopal <vsairam@vmware.com>
Acked-by: Nithin Raju <nithin@vmware.com>
Signed-off-by: Gurucharan Shetty <guru@ovn.org>
7 years agoreplication: Be more careful about JSON parsing and simplify code.
Ben Pfaff [Sun, 11 Sep 2016 04:23:22 +0000 (21:23 -0700)]
replication: Be more careful about JSON parsing and simplify code.

The code here wasn't careful about parsing JSON received from the remote
OVSDB server.  It assumed, for example, that a row that the remote server
implied was new was actually new, without looking to see whether there was
already a row with that UUID.  This commit improves this validation.  It
also rewrites code that translated updates locally into calls into the
query engine, via JSON, into simple lookups by UUID.

For me, this fixes a test failure in test 1866
(ovsdb-server/active-backup-role-switching), which caused the following
valgrind report:

==18725== Process terminating with default action of signal 11 (SIGSEGV): dumping core
==18725==  Access not within mapped region at address 0x0
==18725==    at 0x43937E: ovsdb_datum_compare_3way (ovsdb-data.c:1626)
==18725==    by 0x439344: ovsdb_datum_equals (ovsdb-data.c:1616)
==18725==    by 0x4166CC: update_monitor_row_data (monitor.c:310)
==18725==    by 0x414A90: ovsdb_monitor_changes_update (monitor.c:1255)
==18725==    by 0x417009: ovsdb_monitor_change_cb (monitor.c:1339)
==18725==    by 0x41DB52: ovsdb_txn_for_each_change (transaction.c:906)
==18725==    by 0x416CC9: ovsdb_monitor_commit (monitor.c:1553)
==18725==    by 0x41D993: ovsdb_txn_commit_ (transaction.c:868)
==18725==    by 0x41D6F5: ovsdb_txn_commit (transaction.c:893)
==18725==    by 0x418185: process_notification (replication.c:576)
==18725==    by 0x417705: replication_run (replication.c:185)
==18725==    by 0x408240: main_loop (ovsdb-server.c:198)
==18725==    by 0x406432: main (ovsdb-server.c:429)

I don't know the exact cause of the problem, but this new implementation
leaves me more confident due to its simplicity.

Reported-by: Joe Stringer <joe@ovn.org>
Reported-at: http://openvswitch.org/pipermail/dev/2016-September/079315.html
Fixes: 60e0cd041958 ("ovsdb: Replication usability improvements")
Signed-off-by: Ben Pfaff <blp@ovn.org>
Tested-by: Joe Stringer <joe@ovn.org>
Acked-by: Andy Zhou <azhou@ovn.org>
7 years agoovsdb: Fix replication memory leak.
Joe Stringer [Fri, 9 Sep 2016 20:48:53 +0000 (13:48 -0700)]
ovsdb: Fix replication memory leak.

Valgrind reports:

==18725== 32 bytes in 1 blocks are definitely lost in loss record 339 of 497
==18725==    at 0x4C29BBE: malloc (in
/usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
==18725==    by 0x450F1F: xmalloc (util.c:112)
==18725==    by 0x41748E: replication_add_local_db (replication.c:137)
==18725==    by 0x40803B: ovsdb_replication_init (ovsdb-server.c:146)
==18725==    by 0x407C9E: ovsdb_server_connect_active_ovsdb_server
(ovsdb-server.c:1165)
==18725==    by 0x450AB3: process_command (unixctl.c:313)
==18725==    by 0x4500DC: run_connection (unixctl.c:347)
==18725==    by 0x44FFB6: unixctl_server_run (unixctl.c:400)
==18725==    by 0x4081AC: main_loop (ovsdb-server.c:182)
==18725==    by 0x406432: main (ovsdb-server.c:429)

Fixes: 60e0cd041958 ("ovsdb: Replication usability improvements")
Signed-off-by: Joe Stringer <joe@ovn.org>
Acked-by: Flavio Fernandes <flavio@flaviof.com>
Acked-by: Ben Pfaff <blp@ovn.org>
7 years agoovsdb-monitor: Fix valgrind 'possible loss' warnings.
Joe Stringer [Fri, 9 Sep 2016 20:48:52 +0000 (13:48 -0700)]
ovsdb-monitor: Fix valgrind 'possible loss' warnings.

By placing these nodes at the start of their respective structures,
several "possibly lost" warnings from valgrind are silenced.

Fixes: 60e0cd041958 ("ovsdb: Replication usability improvements")
Signed-off-by: Joe Stringer <joe@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
7 years agodatapath-windows: update CodingStyle.
Nithin Raju [Mon, 12 Sep 2016 05:56:30 +0000 (22:56 -0700)]
datapath-windows: update CodingStyle.

Signed-off-by: Nithin Raju <nithin@vmware.com>
Acked-by: Sairam Venugopal <vsairam@vmware.com>
Signed-off-by: Gurucharan Shetty <guru@ovn.org>
7 years agoofctrl: Fix logic for mff_ovn_geneve.
Gurucharan Shetty [Fri, 9 Sep 2016 12:35:19 +0000 (05:35 -0700)]
ofctrl: Fix logic for mff_ovn_geneve.

Fixes: 7fa39c6b9376e99 ("Fix memory leak in recv_S_TLV_TABLE_REQUESTED().")
Signed-off-by: Gurucharan Shetty <guru@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
Acked-by: Flavio Fernandes <flavio@flaviof.com>
7 years agoovn-controller: Fix group_id allocation.
Gurucharan Shetty [Wed, 7 Sep 2016 06:41:32 +0000 (23:41 -0700)]
ovn-controller: Fix group_id allocation.

A bitmap in 'struct group_table' is used to track all the allocated
group_ids.  For every run of logical flows action parsing, we
add 'group_info' structure to a hmap called 'desired_groups'. The
group_id assigned to this group_info either comes from an already
installed 'existing groups' or a new reservation done in the bitmap.

In ofctrl_put(), if there is a backlog, we call ovn_group_table_clear().
This could unreserve a group_id that comes from an already existing group.
This could result in re-use of group_id in the future causing errors while
installing new groups.

This commit fixes the above scenario.

Signed-off-by: Gurucharan Shetty <guru@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
7 years agoovn-northd: Tag allocation for nested containers.
Gurucharan Shetty [Tue, 6 Sep 2016 08:17:31 +0000 (01:17 -0700)]
ovn-northd: Tag allocation for nested containers.

When there are hundreds of nodes controlled by OVN, the workflow
to track and allocate unique tags across multiple hosts becomes
complicated.  It is much easier to let ovn-northd do the allocation.

Signed-off-by: Gurucharan Shetty <guru@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
7 years agoovn-northd: Add load-balancers to gateway routers.
Gurucharan Shetty [Mon, 22 Aug 2016 08:34:17 +0000 (01:34 -0700)]
ovn-northd: Add load-balancers to gateway routers.

Load-balancers in gateway routers lets us load-balance
north-south traffic.

This commit adds a new table called "DEFRAG" in the
logical router pipeline to defragment packets and to track them.
Once the packet is tracked, new connections get a group id as
an action. The group in turn chooses a DNAT action.  Established
connections go through the DNAT table for a regular DNAT.

Signed-off-by: Gurucharan Shetty <guru@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
7 years agoovn-controller: Datapath based conntrack zone for load-balancing.
Gurucharan Shetty [Mon, 22 Aug 2016 08:31:31 +0000 (01:31 -0700)]
ovn-controller: Datapath based conntrack zone for load-balancing.

Currently ct_lb() logical action is only added for a logical switch and
we use the conntrack zone allocated for the logical port.  A future commit
will use ct_lb() for a logical router too.  In that case, use the allocated
DNAT zone.

Rationale for not passing zone as an argument for ct_lb():
One way to look at it would be that a "zone" is an internal implementation
detail and should not be seen in a action of logical flow.  But we can then
say that we could rename "zone" as "datapath" in the logical action.  But,
then we would be limiting it to 2 anyway (datapath=lswitch or
datapath=lrouter) - in which case we are inferring it with the current patch.

Signed-off-by: Gurucharan Shetty <guru@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
7 years agodatapath: Use pre-routing hook for conntrack.
Joe Stringer [Fri, 2 Sep 2016 00:01:55 +0000 (17:01 -0700)]
datapath: Use pre-routing hook for conntrack.

The upstream code uses NF_INET_PRE_ROUTING hook for the nf_conntrack_in()
call, which does deeper (eg l4proto) validation. It was previously
thought that using the NF_INET_ROUTING hook for this function on older
kernels would trigger kernel panics due to a dependency on the
unpopulated skb->dev, however during recent testing on a variety of
platforms (Centos7.[12], Ubuntu 1[46].04, Fedora23) using the latest
distribution kernels and the OVS kernel module testsuite, no such kernel
panics were observed. Therefore it appears to be safe to bring this in
line with upstream without any other workarounds.

Reported-by: Jesse Gross <jesse@kernel.org>
Signed-off-by: Joe Stringer <joe@ovn.org>
Acked-by: Jesse Gross <jesse@kernel.org>
7 years agoovn-nbctl, tests: Clean up noisy memory leaks
Ryan Moats [Fri, 9 Sep 2016 12:36:47 +0000 (07:36 -0500)]
ovn-nbctl, tests: Clean up noisy memory leaks

When run with valgrind, ovn-nbctl.c and tests/test-ovn.c reveal
memory leaks of their own.  This patch cleans these up so that
they don't create noise when looking for leaks in the OVN daemon
processes.

Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
7 years agorhel: add option to run kernel datapath test when building rpms
Lance Richardson [Fri, 2 Sep 2016 13:55:27 +0000 (09:55 -0400)]
rhel: add option to run kernel datapath test when building rpms

Add ability to execute kernel datapath tests when building rpms.
These tests are disabled by default, and can optionally be run
by providing "--with check_datapath_kernel" on the rpmbuild command
line.  This is intended to facilitate automated testing, and
should not be used in production environments (it is generally not
recommended to run rpmbuild as root).

Suggested-by: Flavio Leitner <fbl@sysclose.org>
Signed-off-by: Lance Richardson <lrichard@redhat.com>
Acked-by: Flavio Leitner <fbl@sysclose.org>
Signed-off-by: Russell Bryant <russell@ovn.org>
7 years agorhel: build source rpm packages
Lance Richardson [Fri, 2 Sep 2016 13:55:26 +0000 (09:55 -0400)]
rhel: build source rpm packages

Build source RPM packages for rpm-fedora and rpm-fedora-kmod
targets.

Signed-off-by: Lance Richardson <lrichard@redhat.com>
Acked-by: Flavio Leitner <fbl@sysclose.org>
Signed-off-by: Russell Bryant <russell@ovn.org>
7 years agoovsdb-server: Fix memory leak in ovsdb_server_get_sync_exclude_tables().
Ben Pfaff [Fri, 9 Sep 2016 04:22:21 +0000 (21:22 -0700)]
ovsdb-server: Fix memory leak in ovsdb_server_get_sync_exclude_tables().

Fixes: 3109b4e127fa ("ovsdb: Add blacklist_tables")
Signed-off-by: Ben Pfaff <blp@ovn.org>
Acked-by: Andy Zhou <azhou@ovn.org>
7 years agoovn-controller: Fix match crieria for dynamic mac binding flows
Chandra S Vejendla [Fri, 9 Sep 2016 04:31:54 +0000 (23:31 -0500)]
ovn-controller: Fix match crieria for dynamic mac binding flows

match struct is not initialized before adding flows for each entry in
mac_bindings table.  The matches for IPv4 and IPv6 entries don't have
exactly the same form (IPv4 uses reg0, IPv6 uses xxreg0), so reusing
a match structure can cause problems.

Signed-off-by: Chandra Sekhar Vejendla <csvejend@us.ibm.com>
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
Co-authored-by: Ryan Moats <rmoats@us.ibm.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
7 years agoovn-nbctl: Update man page for missing tables.
Han Zhou [Thu, 8 Sep 2016 18:17:46 +0000 (11:17 -0700)]
ovn-nbctl: Update man page for missing tables.

There are tables added recently in ovn-nb, but not mentioned in
man page of ovn-nbctl.

Signed-off-by: Han Zhou <zhouhan@gmail.com>
Signed-off-by: Russell Bryant <russell@ovn.org>
7 years agodatapath-windows: Fixed tcp flags byte order in conntrack
Paul Boca [Mon, 29 Aug 2016 19:11:06 +0000 (19:11 +0000)]
datapath-windows: Fixed tcp flags byte order in conntrack

In user mode the flags are interpreted as little endian.
This fix makes the kernel mode compatible with user mode.

Signed-off-by: Paul-Daniel Boca <pboca@cloudbasesolutions.com>
Acked-by: Alin Gabriel Serdean <aserdean@cloudbasesolutions.com>
Acked-by: Sairam Venugopal <vsairam@vmware.com>
Signed-off-by: Gurucharan Shetty <guru@ovn.org>
7 years agoovn: fix ovn-northd leaks in build_acl
Ramu Ramamurthy [Fri, 2 Sep 2016 00:05:50 +0000 (00:05 +0000)]
ovn: fix ovn-northd leaks in build_acl

The following leaks are due to missing ds_destroy in a few
places in build_acl.

5,850 bytes in 50 blocks are definitely lost in loss record 93 of 93
   at 0x4C29BFD: malloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
   by 0x4C2BACB: realloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
   by 0x449507: xrealloc (util.c:123)
   by 0x42CC73: ds_reserve (dynamic-string.c:63)
   by 0x42D08F: ds_put_format_valist (dynamic-string.c:161)
   by 0x42D176: ds_put_format (dynamic-string.c:142)
   by 0x40D380: build_acls (ovn-northd.c:2320)
   by 0x40D380: build_lswitch_flows.constprop.36 (ovn-northd.c:2472)
   by 0x4072D9: build_lflows (ovn-northd.c:3845)
   by 0x4072D9: ovnnb_db_run (ovn-northd.c:3971)
   by 0x4072D9: main (ovn-northd.c:4375)

9,360 bytes in 72 blocks are definitely lost in loss record 93 of 93
   at 0x4C29BFD: malloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
   by 0x4C2BACB: realloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
   by 0x449507: xrealloc (util.c:123)
   by 0x42CC73: ds_reserve (dynamic-string.c:63)
   by 0x42D08F: ds_put_format_valist (dynamic-string.c:161)
   by 0x42D176: ds_put_format (dynamic-string.c:142)
   by 0x40D505: build_acls (ovn-northd.c:2346)
   by 0x40D505: build_lswitch_flows.constprop.36 (ovn-northd.c:2472)
   by 0x4072D9: build_lflows (ovn-northd.c:3845)
   by 0x4072D9: ovnnb_db_run (ovn-northd.c:3971)
   by 0x4072D9: main (ovn-northd.c:4375)

Signed-off-by: Ramu Ramamurthy <ramu.ramamurthy@us.ibm.com>
Acked-by: Ryan Moats <rmoats@us.ibm.com>
Signed-off-by: Russell Bryant <russell@ovn.org>
7 years agosystem-traffic: Add FTP NAT test without seqadj.
Joe Stringer [Wed, 7 Sep 2016 21:07:41 +0000 (14:07 -0700)]
system-traffic: Add FTP NAT test without seqadj.

The existing FTP with NAT tests all perform NATing from an IP like
10.1.1.1 -> 10.1.1.240, which requires adjusting the length of FTP
control messages as they pass through the connection tracker.
Occasionally this is a source of kernel bugs, so it is useful to have a
regular FTP NAT test between IPs that do not change the message length
in FTP control messages (eg, 10.1.1.1 -> 10.1.1.9) to more clearly
identify failures in this area.

Signed-off-by: Joe Stringer <joe@ovn.org>
Acked-by: Jarno Rajahalme <jarno@ovn.org>
7 years agoxlate: Clarify comment about mac learning table entry locking.
Jarno Rajahalme [Tue, 6 Sep 2016 19:30:55 +0000 (12:30 -0700)]
xlate: Clarify comment about mac learning table entry locking.

The rationale for locking mac learning table entires wrt. gratuitous
ARP packets and bond interfaces was too cryptic for me to understand.
After reading vswitchd/INTERNALS the issue is understandable, but we
can still improve the comment to prevent such confusion in future.

Signed-off-by: Jarno Rajahalme <jarno@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
7 years agoovsdb: Replication usability improvements
Andy Zhou [Tue, 23 Aug 2016 11:05:11 +0000 (04:05 -0700)]
ovsdb: Replication usability improvements

Based on feedbacks from initial HA manager integration, added the
'--active' command line option and appctl command
"ovsdb-server/sync-status. See man page updates for details.

Added the RPL_S_INIT state in the state machine. This state is
not strictly necessary for the replication state machine, but is
introduced to make sure the state is update immediately when
the state machine is reset, via replication_init(). Without it
ovsdb/sync-status may display "replicating" or crash, if the command
is issued between after replication_init() is called, but before
the state variable is updated from replication_run().

Added a test to simulate the integration of HA manager with OVSDB
server using replication.

Other documentation and API improvements.

Tested-by: Numan Siddique <nusiddiq@redhat.com>
Signed-off-by: Andy Zhou <azhou@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
7 years agotests: Fix recently broken sFlow tests.
Ben Pfaff [Fri, 2 Sep 2016 23:07:42 +0000 (16:07 -0700)]
tests: Fix recently broken sFlow tests.

A recent improvement to the promptness of sFlow reporting caused some of
the sFlow tests to fail (because the output was reported sooner).  This
fixes up sequence numbers in the expected output to match the new behavior.
It also reduces the amount of (virtual) time that the test waits since it's
no longer necessary to wait as long.

Fixes: 784bf5d4eb3c ("sflow-agent: Flush freshly-polled sFlow counters promptly.")
Signed-off-by: Ben Pfaff <blp@ovn.org>
7 years agoofproto: Honor mtu_request even for internal ports.
Daniele Di Proietto [Fri, 2 Sep 2016 16:53:00 +0000 (09:53 -0700)]
ofproto: Honor mtu_request even for internal ports.

By default Open vSwitch tries to configure internal interfaces MTU to
match the bridge minimum, overriding any attempt by the user to
configure it through standard system tools, or the database.

While this works in many simple cases (there are probably many users
that rely on this) it may create problems for more advanced use cases
(like any overlay networks).

This commit allows the user to override the default behavior by
providing an explict MTU in the mtu_request column in the Interface
table.

This means that Open vSwitch will now treat differently database MTU
requests from standard system tools MTU requests (coming from `ip link`
or `ifconfig`), but this seems the best way to remain compatible with
old users while providing a more powerful interface.

Suggested-by: Darrell Ball <dlu998@gmail.com>
Signed-off-by: Daniele Di Proietto <diproiettod@vmware.com>
Acked-by: Ben Pfaff <blp@ovn.org>
Tested-by: Joe Stringer <joe@ovn.org>