]> git.proxmox.com Git - mirror_ovs.git/log
mirror_ovs.git
5 years agotreewide: Remove pointless "return;" at ends of functions.
Ben Pfaff [Mon, 9 Jul 2018 23:47:03 +0000 (16:47 -0700)]
treewide: Remove pointless "return;" at ends of functions.

Found with:
    git ls-files | xargs pcregrep -n -M 'return;\n*}'

Signed-off-by: Ben Pfaff <blp@ovn.org>
Acked-by: Darrell Ball <dlu998@gmail.com>
Tested-by: Darrell Ball <dlu998@gmail.com>
5 years agoovn-nbctl, ovn-sbctl, ovs-vsctl: Don't dup error message just to report it.
Jakub Sitnicki [Mon, 9 Jul 2018 23:40:06 +0000 (16:40 -0700)]
ovn-nbctl, ovn-sbctl, ovs-vsctl: Don't dup error message just to report it.

Get rid of a pointless copy operation.

Signed-off-by: Jakub Sitnicki <jkbs@redhat.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
5 years agoovn-nbctl: Don't die in nbctl_lsp_set_type().
Jakub Sitnicki [Sat, 7 Jul 2018 11:10:04 +0000 (13:10 +0200)]
ovn-nbctl: Don't die in nbctl_lsp_set_type().

Propagate the error via the context instead.

Signed-off-by: Jakub Sitnicki <jkbs@redhat.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
5 years agoovn-nbctl: Don't die in nbctl_lr_route_del().
Jakub Sitnicki [Sat, 7 Jul 2018 11:10:03 +0000 (13:10 +0200)]
ovn-nbctl: Don't die in nbctl_lr_route_del().

Propagate the error via the context instead.

Signed-off-by: Jakub Sitnicki <jkbs@redhat.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
5 years agoovn-nbctl: Don't die in nbctl_lr_route_add().
Jakub Sitnicki [Sat, 7 Jul 2018 11:10:02 +0000 (13:10 +0200)]
ovn-nbctl: Don't die in nbctl_lr_route_add().

Propagate the error via the context instead.

Signed-off-by: Jakub Sitnicki <jkbs@redhat.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
5 years agoovn-nbctl: Don't die in nbctl_lrp_set_enabled().
Jakub Sitnicki [Sat, 7 Jul 2018 11:10:01 +0000 (13:10 +0200)]
ovn-nbctl: Don't die in nbctl_lrp_set_enabled().

Propagate the error via the context instead.

Signed-off-by: Jakub Sitnicki <jkbs@redhat.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
5 years agoovn-nbctl: Don't die in nbctl_lrp_del_gateway_chassis().
Jakub Sitnicki [Sat, 7 Jul 2018 11:10:00 +0000 (13:10 +0200)]
ovn-nbctl: Don't die in nbctl_lrp_del_gateway_chassis().

Propagate the error via the context instead.

Signed-off-by: Jakub Sitnicki <jkbs@redhat.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
5 years agoovn-nbctl: Don't die in nbctl_lrp_get_gateway_chassis().
Jakub Sitnicki [Sat, 7 Jul 2018 11:09:59 +0000 (13:09 +0200)]
ovn-nbctl: Don't die in nbctl_lrp_get_gateway_chassis().

Propagate the error via the context instead.

Signed-off-by: Jakub Sitnicki <jkbs@redhat.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
5 years agoovn-nbctl: Don't die in nbctl_lrp_set_gateway_chassis().
Jakub Sitnicki [Sat, 7 Jul 2018 11:09:58 +0000 (13:09 +0200)]
ovn-nbctl: Don't die in nbctl_lrp_set_gateway_chassis().

Propagate the error via the context instead.

Signed-off-by: Jakub Sitnicki <jkbs@redhat.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
5 years agoovn-nbctl: Don't die in nbctl_lrp_add().
Jakub Sitnicki [Sat, 7 Jul 2018 11:09:57 +0000 (13:09 +0200)]
ovn-nbctl: Don't die in nbctl_lrp_add().

Propagate the error via the context instead.

Signed-off-by: Jakub Sitnicki <jkbs@redhat.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
5 years agoovn-nbctl: Don't die in nbctl_lr_del().
Jakub Sitnicki [Sat, 7 Jul 2018 11:09:56 +0000 (13:09 +0200)]
ovn-nbctl: Don't die in nbctl_lr_del().

Propagate the error via the context instead.

Signed-off-by: Jakub Sitnicki <jkbs@redhat.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
5 years agoovn-nbctl: Don't die in nbctl_lr_add().
Jakub Sitnicki [Sat, 7 Jul 2018 11:09:55 +0000 (13:09 +0200)]
ovn-nbctl: Don't die in nbctl_lr_add().

Propagate the error via the context instead.

Signed-off-by: Jakub Sitnicki <jkbs@redhat.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
5 years agoovn-nbctl: Don't die in nbctl_lr_lb_add().
Jakub Sitnicki [Sat, 7 Jul 2018 11:09:54 +0000 (13:09 +0200)]
ovn-nbctl: Don't die in nbctl_lr_lb_add().

Propagate the error via the context instead.

Signed-off-by: Jakub Sitnicki <jkbs@redhat.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
5 years agoovn-nbctl: Don't die in nbctl_ls_lb_add().
Jakub Sitnicki [Sat, 7 Jul 2018 11:09:53 +0000 (13:09 +0200)]
ovn-nbctl: Don't die in nbctl_ls_lb_add().

Propagate the error via the context instead.

Signed-off-by: Jakub Sitnicki <jkbs@redhat.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
5 years agoovn-nbctl: Don't die in nbctl_lb_del()
Jakub Sitnicki [Sat, 7 Jul 2018 11:09:52 +0000 (13:09 +0200)]
ovn-nbctl: Don't die in nbctl_lb_del()

Propagate the error via the context instead.

Signed-off-by: Jakub Sitnicki <jkbs@redhat.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
5 years agoovn-nbctl: Don't die in nbctl_lb_add().
Jakub Sitnicki [Sat, 7 Jul 2018 11:09:51 +0000 (13:09 +0200)]
ovn-nbctl: Don't die in nbctl_lb_add().

Propagate the error via the context instead.

Signed-off-by: Jakub Sitnicki <jkbs@redhat.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
5 years agoovn-nbctl: Don't die in nbctl_lr_nat_del().
Jakub Sitnicki [Sat, 7 Jul 2018 11:09:50 +0000 (13:09 +0200)]
ovn-nbctl: Don't die in nbctl_lr_nat_del().

Propagate the error via the context instead.

Signed-off-by: Jakub Sitnicki <jkbs@redhat.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
5 years agoovn-nbctl: Don't die in nbctl_lr_nat_add().
Jakub Sitnicki [Sat, 7 Jul 2018 11:09:49 +0000 (13:09 +0200)]
ovn-nbctl: Don't die in nbctl_lr_nat_add().

Propagate the error via the context instead.

Signed-off-by: Jakub Sitnicki <jkbs@redhat.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
5 years agoovn-nbctl: Don't die in nbctl_qos_add().
Jakub Sitnicki [Sat, 7 Jul 2018 11:09:48 +0000 (13:09 +0200)]
ovn-nbctl: Don't die in nbctl_qos_add().

Propagate the error via the context instead.

Signed-off-by: Jakub Sitnicki <jkbs@redhat.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
5 years agoovn-nbctl: Don't die in nbctl_acl().
Jakub Sitnicki [Sat, 7 Jul 2018 11:09:47 +0000 (13:09 +0200)]
ovn-nbctl: Don't die in nbctl_acl().

Propagate the error via the context instead.

Signed-off-by: Jakub Sitnicki <jkbs@redhat.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
5 years agoovn-nbctl: Don't die in nbctl_lsp_add().
Jakub Sitnicki [Sat, 7 Jul 2018 11:09:46 +0000 (13:09 +0200)]
ovn-nbctl: Don't die in nbctl_lsp_add().

Propagate the error via the context instead.

Signed-off-by: Jakub Sitnicki <jkbs@redhat.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
5 years agoovn-nbctl: Don't die in nbctl_ls_del().
Jakub Sitnicki [Sat, 7 Jul 2018 11:09:45 +0000 (13:09 +0200)]
ovn-nbctl: Don't die in nbctl_ls_del().

Propagate the error via the context instead.

Signed-off-by: Jakub Sitnicki <jkbs@redhat.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
5 years agoovn-nbctl: Don't die in nbctl_ls_add().
Jakub Sitnicki [Sat, 7 Jul 2018 11:09:44 +0000 (13:09 +0200)]
ovn-nbctl: Don't die in nbctl_ls_add().

Propagate the error via the context instead.

Signed-off-by: Jakub Sitnicki <jkbs@redhat.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
5 years agoovn-nbctl: Don't die in parse_enabled().
Jakub Sitnicki [Sat, 7 Jul 2018 11:09:43 +0000 (13:09 +0200)]
ovn-nbctl: Don't die in parse_enabled().

Let the caller handle the error.

Signed-off-by: Jakub Sitnicki <jkbs@redhat.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
5 years agoovn-nbctl: Don't die in acl_cmd_get_pg_or_ls().
Jakub Sitnicki [Sat, 7 Jul 2018 11:09:42 +0000 (13:09 +0200)]
ovn-nbctl: Don't die in acl_cmd_get_pg_or_ls().

Let the caller handle the error.

Signed-off-by: Jakub Sitnicki <jkbs@redhat.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
5 years agoovn-nbctl: Don't die in lrp_by_name_or_uuid().
Jakub Sitnicki [Sat, 7 Jul 2018 11:09:41 +0000 (13:09 +0200)]
ovn-nbctl: Don't die in lrp_by_name_or_uuid().

Let the caller handle the error.

Signed-off-by: Jakub Sitnicki <jkbs@redhat.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
5 years agoovn-nbctl: Don't die in lr_by_name_or_uuid().
Jakub Sitnicki [Sat, 7 Jul 2018 11:09:40 +0000 (13:09 +0200)]
ovn-nbctl: Don't die in lr_by_name_or_uuid().

Let the caller handle the error.

Signed-off-by: Jakub Sitnicki <jkbs@redhat.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
5 years agoovn-nbctl: Don't die in lb_by_name_or_uuid()
Jakub Sitnicki [Sat, 7 Jul 2018 11:09:39 +0000 (13:09 +0200)]
ovn-nbctl: Don't die in lb_by_name_or_uuid()

Let the caller handle the error.

Signed-off-by: Jakub Sitnicki <jkbs@redhat.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
5 years agoovn-nbctl: Don't die in lsp_by_name_or_uuid().
Jakub Sitnicki [Sat, 7 Jul 2018 11:09:38 +0000 (13:09 +0200)]
ovn-nbctl: Don't die in lsp_by_name_or_uuid().

Let the caller handle the error.

Signed-off-by: Jakub Sitnicki <jkbs@redhat.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
5 years agoovn-nbctl: Don't die in ls_by_name_or_uuid().
Jakub Sitnicki [Sat, 7 Jul 2018 11:09:37 +0000 (13:09 +0200)]
ovn-nbctl: Don't die in ls_by_name_or_uuid().

Let the caller handle the error.

Signed-off-by: Jakub Sitnicki <jkbs@redhat.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
5 years agoovn-nbctl: Report the actual error from the command handler.
Jakub Sitnicki [Sat, 7 Jul 2018 11:09:36 +0000 (13:09 +0200)]
ovn-nbctl: Report the actual error from the command handler.

Fix a typo that went undetected by tests because we don't have any test
cases for error paths when using database commands with ovn-nbctl.

Fixes: 675b152e999f ("db-ctl-base: Extend ctl_context with an error message.")
Signed-off-by: Jakub Sitnicki <jkbs@redhat.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
5 years agodb-ctl-base: Don't die in cmd_add() on error.
Jakub Sitnicki [Sat, 7 Jul 2018 11:09:35 +0000 (13:09 +0200)]
db-ctl-base: Don't die in cmd_add() on error.

Return the error via the context instead of calling ctl_fatal() so that
the caller can decide how to handle it.

Signed-off-by: Jakub Sitnicki <jkbs@redhat.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
5 years agoOVN: add unit test for TCPv6 port unreachable support
Lorenzo Bianconi [Mon, 9 Jul 2018 15:02:34 +0000 (17:02 +0200)]
OVN: add unit test for TCPv6 port unreachable support

Add unit test for the TCP reset segment sent by OVN logical router when
it receives an IPv6 TCP segment directed to the router's IP address since
the logical router doesn't accept any TCP traffic

Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
5 years agoofp-group: Don't assert-fail decoding bad OF1.5 group mod type or command.
Ben Pfaff [Thu, 5 Jul 2018 22:28:51 +0000 (15:28 -0700)]
ofp-group: Don't assert-fail decoding bad OF1.5 group mod type or command.

When decoding a group mod, the current code validates the group type and
command after the whole group mod has been decoded.  The OF1.5 decoder,
however, tries to use the type and command earlier, when it might still be
invalid.  This caused an assertion failure (via OVS_NOT_REACHED).  This
commit fixes the problem.

ovs-vswitchd does not enable support for OpenFlow 1.5 by default.

Reported-at: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=9249
Signed-off-by: Ben Pfaff <blp@ovn.org>
Reviewed-by: Yifeng Sun <pkusunyifeng@gmail.com>
5 years agoovn: Add router load balancer undnat rule for IPv6
Mark Michelson [Tue, 26 Jun 2018 18:42:32 +0000 (14:42 -0400)]
ovn: Add router load balancer undnat rule for IPv6

When configuring a router port to have a redirect-chassis and using an
IPv6 load balancer rule that specifies a TCP/UDP port, load balancing
would not work as expected. This is because a rule to un-dnat the return
traffic from the load balancer destination was not installed. This is
because this rule was only being installed for IPv4 load balancers.

This change adds the same rule for IPv6 load balancers as well.

Signed-off-by: Mark Michelson <mmichels@redhat.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
5 years agoDNS: Fix build issue with dns_resolve_init().
Justin Pettit [Fri, 6 Jul 2018 21:48:56 +0000 (14:48 -0700)]
DNS: Fix build issue with dns_resolve_init().

CC: Yifeng Sun <pkusunyifeng@gmail.com>
Fixes: 771680d96f ("DNS: Add basic support for asynchronous DNS resolving")
Signed-off-by: Justin Pettit <jpettit@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
Reviewed-by: Yifeng Sun <pkusunyifeng@gmail.com>
5 years agoovs-sandbox: Fix ovs-appctl for ovn-northd and ovn-controller.
Justin Pettit [Mon, 2 Jul 2018 00:58:59 +0000 (17:58 -0700)]
ovs-sandbox: Fix ovs-appctl for ovn-northd and ovn-controller.

Commits 1e8eeb66db2e7 ("ovs-sandbox: Support starting multiple
ovn-northds.") and 047458de40391 ("ovs-sandbox: Add option to support
multiple ovn-controllers.") allowed starting multiple instances of
ovn-northd and ovn-controller, respectively.  It did this by assigning a
sequence number to to the pidfile name.  Unfortunately, this breaks the
method ovs-appctl uses to determine to which process it should connect.
This commit changes the behavior so that a sequence number is not added
to the first instance, so ovs-appctl will connect to that be default.

This commit also uses the same convention for naming the log file.

Signed-off-by: Justin Pettit <jpettit@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
5 years agoovs-sandbox: Use different log file names for ovn-controllers.
Justin Pettit [Mon, 2 Jul 2018 01:15:53 +0000 (18:15 -0700)]
ovs-sandbox: Use different log file names for ovn-controllers.

Commit 047458de40391 ("ovs-sandbox: Add option to support multiple
ovn-controllers.") allowed creating multiple instances of
ovn-controller.  However, all instances would use the same log file
name.  This commit uses the sequence number to name the log file.

Signed-off-by: Justin Pettit <jpettit@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
5 years agovswitchd: Document new fdb statistics commands
Eelco Chaudron [Mon, 25 Jun 2018 10:58:17 +0000 (12:58 +0200)]
vswitchd: Document new fdb statistics commands

Document the new fdb/stats-clear and fdb/stats-show commands

Signed-off-by: Eelco Chaudron <echaudro@redhat.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
5 years agoofproto: Add CLI commands to show and clear mac_learning statistics
Eelco Chaudron [Mon, 25 Jun 2018 10:58:05 +0000 (12:58 +0200)]
ofproto: Add CLI commands to show and clear mac_learning statistics

Add two new commands, fdb/stats-show and fdb/stats-clear, to
ovs-appctl to show and clear the new mac_learning statistics.

$ ovs-appctl fdb/stats-show ovs_pvp_br0
Statistics for bridge "ovs_pvp_br0":
  Current/maximum MAC entries in the table: 4/2048
  Total number of learned MAC entries     : 4
  Total number of expired MAC entries     : 1
  Total number of evicted MAC entries     : 0
  Total number of port moved MAC entries  : 32

$ ovs-appctl fdb/stats-clear ovs_pvp_br0
statistics successfully cleared

Signed-off-by: Eelco Chaudron <echaudro@redhat.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
5 years agoutilities: Update gdb script to include mac_learning counters
Eelco Chaudron [Mon, 25 Jun 2018 10:57:52 +0000 (12:57 +0200)]
utilities: Update gdb script to include mac_learning counters

This patch updates the GDB script "ovs_show_fdb" command to include
the new per mac_learning instance counters.

Signed-off-by: Eelco Chaudron <echaudro@redhat.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
5 years agomac-learning: Add per mac learning instance counters
Eelco Chaudron [Mon, 25 Jun 2018 10:57:40 +0000 (12:57 +0200)]
mac-learning: Add per mac learning instance counters

This patch adds counters per mac_learning instance.
The following counters are added:

total_learned: Total number of learned MAC entries
total_expired: Total number of expired MAC entries
total_evicted: Total number of evicted MAC entries, i.e. entries moved
               out due to the table being full.
total_moved  : Total number of port moved MAC entries, i.e. entries
               where the MAC address moved to a different port.

Signed-off-by: Eelco Chaudron <echaudro@redhat.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
5 years agomac-learning: Add additional mac-learning coverage counters
Eelco Chaudron [Mon, 25 Jun 2018 10:57:26 +0000 (12:57 +0200)]
mac-learning: Add additional mac-learning coverage counters

This patch adds two additional mac-learning coverage counters:
  - mac_learning_evicted, entries deleted due to mac table being full
  - mac_learning_moved, entries where the port has changed.

Signed-off-by: Eelco Chaudron <echaudro@redhat.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
5 years agoovs-ofctl: Prefer "del-meters" and "dump-meters".
Justin Pettit [Fri, 29 Jun 2018 19:02:28 +0000 (12:02 -0700)]
ovs-ofctl: Prefer "del-meters" and "dump-meters".

Previously to delete or dump the meter table, separate commands had to
be used depending on whether one wanted to operate on a single or all
meters.  This change makes it so that the "meter" argument is always
optional regardless of the command.  This is a bit more consistent with
other OVS commands and makes it easier when experimenting to not have to
distinguish between the two cases.

This also fixes an error in the ovs-ofctl man page that show the plural
version of the command supported an optional "meter" argument.

"del-meter" and "dump-meter" can still be used, but their use is no
longer documented.

Signed-off-by: Justin Pettit <jpettit@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
5 years agodpif-netdev: Fix a couple of comments for dp_netdev_run_meter().
Justin Pettit [Mon, 18 Jun 2018 19:04:50 +0000 (12:04 -0700)]
dpif-netdev: Fix a couple of comments for dp_netdev_run_meter().

Signed-off-by: Justin Pettit <jpettit@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
5 years agoovn: Clarify the differences between QoS marking and metering.
Justin Pettit [Mon, 18 Jun 2018 18:48:25 +0000 (11:48 -0700)]
ovn: Clarify the differences between QoS marking and metering.

This also correct an error that indicated that the burst size is kbps,
when it should be kb.

Signed-off-by: Justin Pettit <jpettit@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
5 years agoovs-ofctl: Clarifications in the Meter Syntax man page section.
Justin Pettit [Mon, 18 Jun 2018 16:00:20 +0000 (09:00 -0700)]
ovs-ofctl: Clarifications in the Meter Syntax man page section.

This also correct an error that indicated that the burst size is kbps,
when it should be kb.

Signed-off-by: Justin Pettit <jpettit@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
5 years agoOpenFlow: Update documentation to indicate support for virtual meters.
Justin Pettit [Mon, 18 Jun 2018 15:17:36 +0000 (08:17 -0700)]
OpenFlow: Update documentation to indicate support for virtual meters.

Support was added in commit 9e638f223feb ("ofproto: Support action
upcall meters").

Signed-off-by: Justin Pettit <jpettit@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
5 years agoNEWS: Correct release date of OVN QoS meter support.
Justin Pettit [Mon, 18 Jun 2018 13:24:45 +0000 (06:24 -0700)]
NEWS: Correct release date of OVN QoS meter support.

It occured in OVS 2.9.0, not OVS 2.8.0.

Signed-off-by: Justin Pettit <jpettit@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
5 years agoutilities: Add upcall related commands to the GDB script
Eelco Chaudron [Mon, 2 Jul 2018 12:00:10 +0000 (14:00 +0200)]
utilities: Add upcall related commands to the GDB script

This commit adds ovs_dump_udpif_keys and ovs_show_upcall commands to the GDB script.
Here are some examples of the output:

(gdb) ovs_show_upcall
netdev@ovs-netdev:
  flows         : (current 0) (avg 0) (max 0) (limit 10000)
  dump duration : 1ms
  ufid enabled  : true

  39: (keys 0)
  42: (keys 0)
  41: (keys 0)
  43: (keys 0)
  44: (keys 0)
  45: (keys 0)

system@ovs-system:
  flows         : (current 4000) (avg 4031) (max 4064) (limit 139000)
  dump duration : 4ms
  ufid enabled  : true

  99: (keys 676)
  102: (keys 665)
  101: (keys 656)
  103: (keys 648)
  104: (keys 642)
  105: (keys 713)

(gdb) ovs_dump_udpif_keys
(struct udpif *) 0x1ebb830: name = netdev@ovs-netdev, total keys = 2
(struct udpif *) 0x20c6f00: name = system@ovs-system, total keys = 0

(gdb) ovs_dump_udpif_keys 0x1ebb830
(struct umap *) 0x1ef9328:
  (struct udpif_key *) 0x7f36e0004e40: key_len = 132, mask_len = 144
                                       ufid = 3e529416-83bf-bab4-5c6e-421127a9143a
                                       hash = 0x3d96b11d, pmd_id = 1
                                       state = UKEY_OPERATIONAL
                                       n_packets = 2, n_bytes = 68
                                       used = 1397047436, tcp_flags = 0x0000
(struct umap *) 0x1efb740:
  (struct udpif_key *) 0x7f36dc004c20: key_len = 132, mask_len = 144
                                       ufid = ee98d69f-8298-04dd-844a-4d2abee9f773
                                       hash = 0x2e8077c2, pmd_id = 15
                                       state = UKEY_OPERATIONAL
                                       n_packets = 0, n_bytes = 0
                                       used = 0, tcp_flags = 0x0000

(gdb) ovs_dump_udpif_keys 0x1ebb830 short
(struct umap *) 0x1ef9328:
  (struct udpif_key *) 0x7f36e0004e40:
(struct umap *) 0x1efb740:
  (struct udpif_key *) 0x7f36dc004c20:

Signed-off-by: Eelco Chaudron <echaudro@redhat.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
5 years agoMerge branch 'dpdk_merge' of https://github.com/istokes/ovs into HEAD
Ben Pfaff [Fri, 6 Jul 2018 20:53:13 +0000 (13:53 -0700)]
Merge branch 'dpdk_merge' of https://github.com/istokes/ovs into HEAD

5 years agoDNS: Add basic support for asynchronous DNS resolving
Yifeng Sun [Tue, 26 Jun 2018 21:06:21 +0000 (14:06 -0700)]
DNS: Add basic support for asynchronous DNS resolving

This patch is a simple implementation for the proposal discussed in
https://mail.openvswitch.org/pipermail/ovs-dev/2017-August/337038.html and
https://mail.openvswitch.org/pipermail/ovs-dev/2017-October/340013.html.

It enables ovs-vswitchd and other utilities to use DNS names when specifying
OpenFlow and OVSDB remotes.

Below are some of the features and limitations of this patch:
    - Resolving is asynchornous in daemon context, avoiding blocking main loop;
    - Resolving is synchronous in general utility context;
    - Both IPv4 and IPv6 are supported;
    - The resolving API is thread-safe;
    - Depends on the unbound library;
    - When multiple ip addresses are returned, only the first one is used;
    - /etc/nsswitch.conf isn't respected as unbound library doesn't look at it;
    - For async-resolving, caller need to retry later; there is no callback.

Signed-off-by: Yifeng Sun <pkusunyifeng@gmail.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
5 years agodpif-netlink-rtnl: Retry smaller MTU when default MAX_MTU is too large.
Yifeng Sun [Fri, 6 Jul 2018 15:28:27 +0000 (08:28 -0700)]
dpif-netlink-rtnl: Retry smaller MTU when default MAX_MTU is too large.

When MAX_MTU is larger than hw supported max MTU,
dpif_netlink_rtnl_create will fail. This leads to
testing failure '11: datapath - ping over gre tunnel'
in 'make check-kmod'.

This patch fixes this issue by retrying a smaller MTU
when MAX_MTU is too large.

Signed-off-by: Yifeng Sun <pkusunyifeng@gmail.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
5 years agoOVN: add IPv6 address unreachable support to OVN router ports
Lorenzo Bianconi [Fri, 6 Jul 2018 16:12:18 +0000 (18:12 +0200)]
OVN: add IPv6 address unreachable support to OVN router ports

Add priority-70 flows to generate ICMPv6 address unreachable messages
in reply to IPv6 packets directed to the router's IP address on IP
protocols other than UDP, TCP, and ICMP

Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
5 years agoOVN: add IPv6 UDP port unreachable support to OVN logical router
Lorenzo Bianconi [Fri, 6 Jul 2018 16:12:17 +0000 (18:12 +0200)]
OVN: add IPv6 UDP port unreachable support to OVN logical router

Add priority-80 flow to generate ICMPv6 port unreachable messages in
reply to IPv6 UDP datagrams directed to the router's IP address since the
logical router doesn't accept any UDP traffic

Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
5 years agoOVN: add unit test for ICMPv6 TTL exceeded
Lorenzo Bianconi [Fri, 6 Jul 2018 17:07:32 +0000 (19:07 +0200)]
OVN: add unit test for ICMPv6 TTL exceeded

Add unit test for the ICMPv6 TTL exceeded packet sent by OVN
logical router when it receives an IPv6 packet whose TTL has
expired (ip.ttl == {0, 1})

Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
5 years agoAUTHORS: Add Keshav Gupta and Rohith Basavaraja.
Ben Pfaff [Fri, 6 Jul 2018 20:13:36 +0000 (13:13 -0700)]
AUTHORS: Add Keshav Gupta and Rohith Basavaraja.

Signed-off-by: Ben Pfaff <blp@ovn.org>
5 years agoofproto-dpif-xlate: Fix packet_in reason for Table-miss rule
Keshav Gupta [Wed, 4 Jul 2018 15:10:53 +0000 (20:40 +0530)]
ofproto-dpif-xlate: Fix packet_in reason for Table-miss rule

Currently in OvS if we hit "Table-miss" rules (associated with Controller
action) then we send PACKET_IN message to controller with reason as
OFPR_NO_MATCH.

“Table-miss” rule is one whose priority is 0 and its catch all rule.

But if we hit same "Table-miss" rule after executing group entry we will
send the reason as OFPR_ACTION (for OF1.3 and below) and OFPR_GROUP
(for OF1.4 and above).

This is because once we execute group entry we set ctx->in_group and later
when we hit the "Table-miss" rule, Since ctx->in_group  is set we send
reason as OFPR_ACTION (for OF1.3) and OFPR_GROUP (for OF1.4 and above).

For eg: for the following pipeline, we will send the reason as OFPR_ACTION
even if we hit The “Table-miss” rule.

cookie=0x8000000, duration=761.189s, table=0, n_packets=1401, n_bytes=67954,
  priority=4,in_port=9,vlan_tci=0x0000/0x1fff
  actions=write_metadata:0x67870000000000/0xffffff0000000001,goto_table:17

cookie=0x6800001, duration=768.848s, table=17, n_packets=1418, n_bytes=68776,
  priority=10,metadata=0x67870000000000/0xffffff0000000000
  actions=write_metadata:0xe067870000000000/0xfffffffffffffffe,goto_table:60

cookie=0x6800000, duration=24944.312s, table=60, n_packets=58244,
  n_bytes=2519520, priority=0 actions=resubmit(,17)

cookie=0x8040000, duration=785.733s, table=17, n_packets=1450, n_bytes=69724,
  priority=10,metadata=0xe067870000000000/0xffffff0000000000
  actions=write_metadata:0x67871d4d000000/0xfffffffffffffffe,goto_table:43

cookie=0x822002d, duration=24960.795s, table=43, n_packets=53097,
  n_bytes=2230074, priority=100,arp,arp_op=1 actions=group:6000

group_id=6000,type=all,bucket=actions=CONTROLLER:65535,
  bucket=actions=resubmit(,48), bucket=actions=resubmit(,81)

cookie=0x8500000, duration=24977.323s, table=48, n_packets=58309, n_bytes=2522634,
  priority=0 actions=resubmit(,49),resubmit(,50)

cookie=0x8050000, duration=24984.679s, table=50, n_packets=6, n_bytes=264,
  priority=0 actions=CONTROLLER:65535

Currently we are sending table_id as 50 and packet_in reason as OFPR_ACTION.
Instead of sending packet_in reason as OFPR_NO_MATCH.

Signed-off-by: Keshav Gupta <keshav.gupta@ericsson.com>
Co-authored-by: Rohith Basavaraja <rohith.basavaraja@gmail.com>
Signed-off-by: Rohith Basavaraja <rohith.basavaraja@gmail.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
5 years agodpdk: Support both shared and per port mempools.
Ian Stokes [Wed, 27 Jun 2018 13:58:31 +0000 (14:58 +0100)]
dpdk: Support both shared and per port mempools.

This commit re-introduces the concept of shared mempools as the default
memory model for DPDK devices. Per port mempools are still available but
must be enabled explicitly by a user.

OVS previously used a shared mempool model for ports with the same MTU
and socket configuration. This was replaced by a per port mempool model
to address issues flagged by users such as:

https://mail.openvswitch.org/pipermail/ovs-discuss/2016-September/042560.html

However the per port model potentially requires an increase in memory
resource requirements to support the same number of ports and configuration
as the shared port model.

This is considered a blocking factor for current deployments of OVS
when upgrading to future OVS releases as a user may have to redimension
memory for the same deployment configuration. This may not be possible for
users.

This commit resolves the issue by re-introducing shared mempools as
the default memory behaviour in OVS DPDK but also refactors the memory
configuration code to allow for per port mempools.

This patch adds a new global config option, per-port-memory, that
controls the enablement of per port mempools for DPDK devices.

    ovs-vsctl set Open_vSwitch . other_config:per-port-memory=true

This value defaults to false; to enable per port memory support,
this field should be set to true when setting other global parameters
on init (such as "dpdk-socket-mem", for example). Changing the value at
runtime is not supported, and requires restarting the vswitch
daemon.

The mempool sweep functionality is also replaced with the
sweep functionality from OVS 2.9 found in commits

c77f692 (netdev-dpdk: Free mempool only when no in-use mbufs.)
a7fb0a4 (netdev-dpdk: Add mempool reuse/free debug.)

A new document to discuss the specifics of the memory models and example
memory requirement calculations is also added.

Signed-off-by: Ian Stokes <ian.stokes@intel.com>
Acked-by: Kevin Traynor <ktraynor@redhat.com>
Acked-by: Tiago Lam <tiago.lam@intel.com>
Tested-by: Tiago Lam <tiago.lam@intel.com>
5 years agoDocumentation: document ovs-dpdk flow offload
Yuanhan Liu [Mon, 25 Jun 2018 13:21:09 +0000 (16:21 +0300)]
Documentation: document ovs-dpdk flow offload

Add details in the DPDK howto guide on the way to enable the offload along
with the supported NICs and flow types.

The flow offload is marked as experimental.

Signed-off-by: Yuanhan Liu <yliu@fridaylinux.org>
Co-authored-by: Shahaf Shuler <shahafs@mellanox.com>
Signed-off-by: Shahaf Shuler <shahafs@mellanox.com>
Signed-off-by: Ian Stokes <ian.stokes@intel.com>
5 years agodpif-netdev: do hw flow offload in a thread
Yuanhan Liu [Mon, 25 Jun 2018 13:21:08 +0000 (16:21 +0300)]
dpif-netdev: do hw flow offload in a thread

Currently, the major trigger for hw flow offload is at upcall handling,
which is actually in the datapath. Moreover, the hw offload installation
and modification is not that lightweight. Meaning, if there are so many
flows being added or modified frequently, it could stall the datapath,
which could result to packet loss.

To diminish that, all those flow operations will be recorded and appended
to a list. A thread is then introduced to process this list (to do the
real flow offloading put/del operations). This could leave the datapath
as lightweight as possible.

Signed-off-by: Yuanhan Liu <yliu@fridaylinux.org>
Co-authored-by: Shahaf Shuler <shahafs@mellanox.com>
Signed-off-by: Shahaf Shuler <shahafs@mellanox.com>
Signed-off-by: Ian Stokes <ian.stokes@intel.com>
5 years agonetdev-dpdk: add debug for rte flow patterns
Yuanhan Liu [Mon, 25 Jun 2018 13:21:07 +0000 (16:21 +0300)]
netdev-dpdk: add debug for rte flow patterns

For debug purpose.

Co-authored-by: Finn Christensen <fc@napatech.com>
Signed-off-by: Yuanhan Liu <yliu@fridaylinux.org>
Signed-off-by: Finn Christensen <fc@napatech.com>
Co-authored-by: Shahaf Shuler <shahafs@mellanox.com>
Signed-off-by: Shahaf Shuler <shahafs@mellanox.com>
Signed-off-by: Ian Stokes <ian.stokes@intel.com>
5 years agonetdev-dpdk: implement flow offload with rte flow
Finn Christensen [Mon, 25 Jun 2018 13:21:06 +0000 (16:21 +0300)]
netdev-dpdk: implement flow offload with rte flow

The basic yet the major part of this patch is to translate the "match"
to rte flow patterns. And then, we create a rte flow with MARK + RSS
actions. Afterwards, all packets match the flow will have the mark id in
the mbuf.

The reason RSS is needed is, for most NICs, a MARK only action is not
allowed. It has to be used together with some other actions, such as
QUEUE, RSS, etc. However, QUEUE action can specify one queue only, which
may break the rss. Likely, RSS action is currently the best we could
now. Thus, RSS action is choosen.

For any unsupported flows, such as MPLS, -1 is returned, meaning the
flow offload is failed and then skipped.

Co-authored-by: Yuanhan Liu <yliu@fridaylinux.org>
Signed-off-by: Finn Christensen <fc@napatech.com>
Signed-off-by: Yuanhan Liu <yliu@fridaylinux.org>
Co-authored-by: Shahaf Shuler <shahafs@mellanox.com>
Signed-off-by: Shahaf Shuler <shahafs@mellanox.com>
Signed-off-by: Ian Stokes <ian.stokes@intel.com>
5 years agodpif-netdev: retrieve flow directly from the flow mark
Yuanhan Liu [Mon, 25 Jun 2018 13:21:05 +0000 (16:21 +0300)]
dpif-netdev: retrieve flow directly from the flow mark

So that we could skip some very costly CPU operations, including but
not limiting to miniflow_extract, emc lookup, dpcls lookup, etc. Thus,
performance could be greatly improved.

A PHY-PHY forwarding with 1000 mega flows (udp,tp_src=1000-1999) and
1 million streams (tp_src=1000-1999, tp_dst=2000-2999) show more that
260% performance boost.

Note that though the heavy miniflow_extract is skipped, we still have
to do per packet checking, due to we have to check the tcp_flags.

Co-authored-by: Finn Christensen <fc@napatech.com>
Signed-off-by: Yuanhan Liu <yliu@fridaylinux.org>
Signed-off-by: Finn Christensen <fc@napatech.com>
Co-authored-by: Shahaf Shuler <shahafs@mellanox.com>
Signed-off-by: Shahaf Shuler <shahafs@mellanox.com>
Signed-off-by: Ian Stokes <ian.stokes@intel.com>
5 years agoflow: Introduce IP packet sanity checks
Yuanhan Liu [Mon, 25 Jun 2018 13:21:04 +0000 (16:21 +0300)]
flow: Introduce IP packet sanity checks

Those checks were part of the miniflow extractor. Moving them out to
act as a general helpers for packet validation.

Co-authored-by: Finn Christensen <fc@napatech.com>
Signed-off-by: Yuanhan Liu <yliu@fridaylinux.org>
Signed-off-by: Finn Christensen <fc@napatech.com>
Signed-off-by: Shahaf Shuler <shahafs@mellanox.com>
Co-authored-by: Shahaf Shuler <shahafs@mellanox.com>
Signed-off-by: Ian Stokes <ian.stokes@intel.com>
5 years agodpif-netdev: associate flow with a mark id
Yuanhan Liu [Mon, 25 Jun 2018 13:21:03 +0000 (16:21 +0300)]
dpif-netdev: associate flow with a mark id

Most modern NICs have the ability to bind a flow with a mark, so that
every packet matches such flow will have that mark present in its
descriptor.

The basic idea of doing that is, when we receives packets later, we could
directly get the flow from the mark. That could avoid some very costly
CPU operations, including (but not limiting to) miniflow_extract, emc
lookup, dpcls lookup, etc. Thus, performance could be greatly improved.

Thus, the major work of this patch is to associate a flow with a mark
id (an uint32_t number). The association in netdev datapath is done
by CMAP, while in hardware it's done by the rte_flow MARK action.

One tricky thing in OVS-DPDK is, the flow tables is per-PMD. For the
case there is only one phys port but with 2 queues, there could be 2
PMDs. In other words, even for a single mega flow (i.e. udp,tp_src=1000),
there could be 2 different dp_netdev flows, one for each PMD. That could
results to the same mega flow being offloaded twice in the hardware,
worse, we may get 2 different marks and only the last one will work.

To avoid that, a megaflow_to_mark CMAP is created. An entry will be
added for the first PMD that wants to offload a flow. For later PMDs,
it will see such megaflow is already offloaded, then the flow will not
be offloaded to HW twice.

Meanwhile, the mark to flow mapping becomes to 1:N mapping. That is
what the mark_to_flow CMAP is for. When the first PMD wants to offload
a flow, it allocates a new mark and performs the flow offload by reusing
the ->flow_put method. When it succeeds, a "mark to flow" entry will be
added. For later PMDs, it will get the corresponding mark by above
megaflow_to_mark CMAP. Then, another "mark to flow" entry will be added.

Signed-off-by: Yuanhan Liu <yliu@fridaylinux.org>
Co-authored-by: Finn Christensen <fc@napatech.com>
Signed-off-by: Finn Christensen <fc@napatech.com>
Co-authored-by: Shahaf Shuler <shahafs@mellanox.com>
Signed-off-by: Shahaf Shuler <shahafs@mellanox.com>
Signed-off-by: Ian Stokes <ian.stokes@intel.com>
5 years agodpdk: Use DPDK 17.11.3 release.
Ian Stokes [Wed, 20 Jun 2018 09:39:46 +0000 (10:39 +0100)]
dpdk: Use DPDK 17.11.3 release.

Modify travis linux build script to use the latest
DPDK stable release 17.11.3. Update docs for latest
DPDK stable releases.

Signed-off-by: Ian Stokes <ian.stokes@intel.com>
Acked-by: Shahaf Shuler <shahafs@mellanox.com>
Acked-by: Flavio Leitner <fbl@sysclose.org>
5 years agoOVN: add ICMPv6 time exceeded support to OVN logical router
Lorenzo Bianconi [Mon, 2 Jul 2018 15:19:22 +0000 (17:19 +0200)]
OVN: add ICMPv6 time exceeded support to OVN logical router

Using icmp6 action, send an ICMPv6 time exceeded frame whenever
an OVN logical router receives an IPv6 packets whose TTL has
expired (ip.ttl == {0, 1})

Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
5 years agoofp-actions: Fix undefined behavior shifting 'int' 16 places left.
Ben Pfaff [Mon, 25 Jun 2018 19:45:50 +0000 (12:45 -0700)]
ofp-actions: Fix undefined behavior shifting 'int' 16 places left.

Shifting a 16-bit signed int 16 bits is technically undefined behavior.
This fixes the problem.  (In practice this should be harmless in this
case.)

Reported-at: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=9049
Signed-off-by: Ben Pfaff <blp@ovn.org>
Acked-by: Justin Pettit <jpettit@ovn.org>
5 years agoextract-ofp-errors: Fix undefined behavior shifting 'int' 16 places left.
Ben Pfaff [Sat, 23 Jun 2018 17:29:27 +0000 (10:29 -0700)]
extract-ofp-errors: Fix undefined behavior shifting 'int' 16 places left.

Shifting a 16-bit signed int 16 bits is technically undefined behavior.
This fixes the problem.  (In practice this should be harmless in this
case.)

Reported-at; https://oss-fuzz.com/v2/testcase-detail/4730143510626304
Signed-off-by: Ben Pfaff <blp@ovn.org>
Acked-by: Justin Pettit <jpettit@ovn.org>
5 years agojson: Avoid signed integer overflow in parsing exponents.
Ben Pfaff [Mon, 25 Jun 2018 18:23:36 +0000 (11:23 -0700)]
json: Avoid signed integer overflow in parsing exponents.

This can't cause a crash and doesn't seem relevant to normal operation.

Reported-at: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=9044
Signed-off-by: Ben Pfaff <blp@ovn.org>
Acked-by: Justin Pettit <jpettit@ovn.org>
5 years agoofp-actions: Fix buffer overread in decode_LEARN_specs().
Ben Pfaff [Mon, 25 Jun 2018 18:50:51 +0000 (11:50 -0700)]
ofp-actions: Fix buffer overread in decode_LEARN_specs().

The length check was wrong for immediate arguments to "learn" actions.

Reported-at: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=9047
Signed-off-by: Ben Pfaff <blp@ovn.org>
Acked-by: Justin Pettit <jpettit@ovn.org>
5 years agoofp-actions: Avoid buffer overread in BUNDLE action decoding.
Ben Pfaff [Mon, 25 Jun 2018 20:07:43 +0000 (13:07 -0700)]
ofp-actions: Avoid buffer overread in BUNDLE action decoding.

Reported-at: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=9052
Signed-off-by: Ben Pfaff <blp@ovn.org>
Acked-by: Justin Pettit <jpettit@ovn.org>
5 years agoofproto-dpif: Let the dpif report when a port is a duplicate.
Ben Pfaff [Thu, 21 Jun 2018 22:53:53 +0000 (15:53 -0700)]
ofproto-dpif: Let the dpif report when a port is a duplicate.

The port_add() function checks whether the port about to be added to the
dpif is already present and adds it only if it is not.  This duplicates a
check also present (and necessary) in each dpif and races with it as well.
When a dpif has a large number of ports, the check can be expensive (it is
not efficiently implemented).  It would be nice to made the check cheaper,
but it also seems reasonable to do as done in this patch and just let the
dpif report the duplication.

Reported-by: Haifeng Lin <haifeng.lin@huawei.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
Acked-by: Justin Pettit <jpettit@ovn.org>
Signed-off-by: Ben Pfaff <blp@ovn.org>
5 years agonetdev-linux: Fix segfault in update_lag().
Tiago Lam [Thu, 5 Jul 2018 18:24:47 +0000 (19:24 +0100)]
netdev-linux: Fix segfault in update_lag().

A bissect shows that commit d22f892 ("netdev-linux: monitor and offload
LAG slaves to TC") introduced netdev_linux_update_lag(), which is now
triggering a crash in the "datapath - ping over bond" test in
system-userspace-testsuite:

  (gdb) bt
  #0  0x00000000009762e7 in netdev_linux_update_lag (change=0x7ffdff013750) at lib/netdev-linux.c:728
  728                 if (is_netdev_linux_class(master_netdev->netdev_class)) {

This fixes the crash by simply returning in case netdev_from_name()
returns NULL, as this should indicate the master is not attached to the
bridge.

Additionally, netdev_linux_update_lag() isn't "clearing" the netdev
reference it gets from netdev_from_name(), meaning its ref_cnt is
incremented but never decremented. Thus, also call netdev_close() before
returning.

CC: John Hurley <john.hurley@netronome.com>
Fixes: d22f8927 ("netdev-linux: monitor and offload LAG slaves to TC")
Signed-off-by: Tiago Lam <tiago.lam@intel.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
5 years agodb-ctl-base: Use boolean variable values.
Darrell Ball [Thu, 5 Jul 2018 20:38:47 +0000 (13:38 -0700)]
db-ctl-base: Use boolean variable values.

Traditionally, for boolean variables we use boolean values.
Lets keep to that tradition.
Hopefully, using false with a bool works with gcc 6.3.1;
I use both recent versions of gcc (7.3) and older
versions (4.x), but did not see the issue found in
165c1f0649af commit.

Cc: Ian Stokes<ian.stokes@intel.com>
Fixes: 165c1f0649af ("db-ctl-base: Fix compilation warnings.")
Signed-off-by: Darrell Ball <dlu998@gmail.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
5 years agotests: Add more fragmentation tests.
Darrell Ball [Fri, 29 Jun 2018 06:41:44 +0000 (23:41 -0700)]
tests: Add more fragmentation tests.

Tests are added to cover out of order fragments, overlapping fragments
and multiple extension headers in the case of IPv6.

Signed-off-by: Darrell Ball <dlu998@gmail.com>
5 years agoconntrack: Fix fragmentation checks.
Darrell Ball [Fri, 29 Jun 2018 06:39:47 +0000 (23:39 -0700)]
conntrack: Fix fragmentation checks.

The ipv4 fragmentation check is broken and allows fragments through.
There were fragile and poorly maintainable checks in extract_l3_ipv*
designed to save a few cycles.  The checks make assumptions about what
sanity checks may have been done and could be skipped based on inferring
from the value of another paramater that should be unrelated (l4
pointer needing assignment).  Since the benefit is minimal, remove
the special checks and always do sanity checks.

Four tests are added to better maintain fragmentation support.

This needs backporting to 2.9.

Fixes: c8b1ad49da68("conntrack: Reorder sanity checks in extract_l3_ipvx().")
Fixes: a489b16854b5("conntrack: New userspace connection tracker.")
Signed-off-by: Darrell Ball <dlu998@gmail.com>
5 years agoovn.at: Add stateful test for ACL on port groups.
Han Zhou [Mon, 25 Jun 2018 17:03:02 +0000 (10:03 -0700)]
ovn.at: Add stateful test for ACL on port groups.

A bug was reported on the feature of applying ACLs on port groups [1].
This bug was not detected by the original test case, because it didn't
test the return traffic and so didn't ensure the stateful feature is
working. The fix [2] causes the original test case fail, because
once the conntrack is enabled, the test packets are dropped because
the checksum in those packets are invalid and so marked with "invalid"
state by conntrack. To avoid the test case failure, the fix [2] changed
it to test stateless acl only, which leaves the scenario untested,
although it is fixed. This patch adds back the stateful ACL in the
test, and replaced the dummy/receive with inject-pkt to send the test
packets, so that checksums can be properly filled in, and it also
adds tests for the return traffic, which ensures the stateful is
working.

[1] https://mail.openvswitch.org/pipermail/ovs-discuss/2018-June/046927.html

[2] https://patchwork.ozlabs.org/patch/931913/

Signed-off-by: Han Zhou <hzhou8@ebay.com>
Acked-by: Jakub Sitnicki <jkbs@redhat.com>
Acked-by: Daniel Alvarez <dalvarez@redhat.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
5 years agoovn-northd: Apply pre ACLs when using Port Groups
Daniel Alvarez [Wed, 20 Jun 2018 02:18:59 +0000 (04:18 +0200)]
ovn-northd: Apply pre ACLs when using Port Groups

When using Port Groups, the pre ACLs were not applied so the
conntrack action was not performed. This patch takes Port Groups
into account when processing the pre ACLs.

As a follow up, we could enhance this patch by creating an index
from lswitch to port groups.

Signed-off-by: Daniel Alvarez <dalvarez@redhat.com>
Acked-by: Lucas Alvares Gomes <lucasagomes@gmail.com>
Acked-by: Han Zhou <hzhou8@ebay.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
5 years agoovndb-servers: Set connection table when using load balancer to manage ovndb clusters...
aginwala [Sat, 9 Jun 2018 01:33:13 +0000 (18:33 -0700)]
ovndb-servers: Set connection table when using load balancer to manage ovndb clusters via pacemaker.

This is will allow setting inactivity probe on the master node.
For pacemaker to manage ovndb resources via LB, we skipped creating connection
table and hence the inactivity probe was getting set to 5000 by default.
In order to over-ride it we need this table. However, we need to skip slaves
listening on local sb and nb connections table so that LB feature is
intact and only master is listening on 0.0.0.0

e.g --remote=db:OVN_Southbound,SB_Global,connections and
    --remote=db:OVN_Northbound,NB_Global,connections

will be skipped for slave SB and NB dbs respectively by unsetting
--db-sb-use-remote-in-db  and --db-nb-use-remote-in-db in ovn-ctl.

Signed-off-by: aginwala <aginwala@ebay.com>
Acked-by: Numan Siddique <nusiddiq@redhat.com>
Acked-by: Han Zhou <hzhou8@ebay.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
5 years agoovn-ctl: Support NB and SB DBs to start without using remote connections.
aginwala [Fri, 8 Jun 2018 19:32:22 +0000 (12:32 -0700)]
ovn-ctl: Support NB and SB DBs to start without using remote connections.

e.g --remote=db:OVN_Southbound,SB_Global,connections and
    --remote=db:OVN_Northbound,NB_Global,connections

can be skipped for cases where slaves do not need to listen on nb and sb db
connection tables while using pacemaker with load balancer for ovndb clusters.

Signed-off-by: aginwala <aginwala@ebay.com>
Acked-by: Han Zhou <hzhou8@ebay.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
5 years agodb-ctl-base: Fix compilation warnings.
Ian Stokes [Wed, 4 Jul 2018 14:28:33 +0000 (15:28 +0100)]
db-ctl-base: Fix compilation warnings.

This commit fixes uninitialized variable warnings in functions
cmd_create() and cmd_get() when compiling with gcc 6.3.1 and -Werror
by initializing variables 'symbol' and 'new' to NULL.

Cc: Alex Wang <alexw@nicira.com>
Fixes: 07ff77ccb82a ("db-ctl-base: Make common database command code into library.")
Signed-off-by: Ian Stokes <ian.stokes@intel.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
5 years agorconn: Suppress 'connected' log for unreliable connections.
Ilya Maximets [Wed, 20 Jun 2018 07:44:51 +0000 (10:44 +0300)]
rconn: Suppress 'connected' log for unreliable connections.

Recent assertion failure fix changed rconn workflow for unreliable
connections (such as connections from ovs-ofctl) from

    |rconn|DBG|br-int<->unix#151: entering ACTIVE
    |rconn|DBG|br-int<->unix#151: connection closed by peer
    |rconn|DBG|br-int<->unix#151: entering DISCONNECTED

To

    |rconn|DBG|br-int<->unix#200: entering CONNECTING
    |rconn|INFO|br-int<->unix#200: connected
    |rconn|DBG|br-int<->unix#200: entering ACTIVE
    |rconn|DBG|br-int<->unix#200: connection closed by peer
    |rconn|DBG|br-int<->unix#200: entering DISCONNECTED

Many monitoring/configuring tools (ex. ovs-neutron-agent) uses
ovs-ofctl frequently to check the statuses of installed flows.
This produces a lot of "connected" logs, that are useless in general.

Fix that by changing the log level to DBG for unreliable connections.

Suggested-by: Ben Pfaff <blp@ovn.org>
Fixes: c9a9b9b00bf5 ("rconn: Introduce new invariant to fix assertion failure in corner case.")
Signed-off-by: Ilya Maximets <i.maximets@samsung.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
5 years agoofproto-macros: Ignore "Dropped # log messages" in check_logs.
Ben Pfaff [Tue, 3 Jul 2018 18:32:18 +0000 (11:32 -0700)]
ofproto-macros: Ignore "Dropped # log messages" in check_logs.

check_logs ignores some log messages, but it wasn't smart enough to ignore
the messages that said that the ignored messages had been rate-limited.
This fixes the problem.

It's OK to ignore all rate-limiting messages because they only appear if at
least one message was not rate-limited, which check_logs will catch anyway.

Reported-by: Timothy Redaelli <tredaelli@redhat.com>
Reported-at: https://mail.openvswitch.org/pipermail/ovs-discuss/2018-July/046978.html
Signed-off-by: Ben Pfaff <blp@ovn.org>
Tested-By: Timothy Redaelli <tredaelli@redhat.com>
5 years agodb-ctl-base: Don't die in cmd_destroy() on error.
Jakub Sitnicki [Mon, 2 Jul 2018 10:50:19 +0000 (12:50 +0200)]
db-ctl-base: Don't die in cmd_destroy() on error.

Return the error via the context instead of calling ctl_fatal() so that
the caller can decide how to handle it.

Signed-off-by: Jakub Sitnicki <jkbs@redhat.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
5 years agodb-ctl-base: Don't die in cmd_clear() on error.
Jakub Sitnicki [Mon, 2 Jul 2018 10:50:18 +0000 (12:50 +0200)]
db-ctl-base: Don't die in cmd_clear() on error.

Return the error via the context instead of calling ctl_fatal() so that
the caller can decide how to handle it.

Signed-off-by: Jakub Sitnicki <jkbs@redhat.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
5 years agodb-ctl-base: Don't die in cmd_remove() on error.
Jakub Sitnicki [Mon, 2 Jul 2018 10:50:17 +0000 (12:50 +0200)]
db-ctl-base: Don't die in cmd_remove() on error.

Return the error via the context instead of calling ctl_fatal() so that
the caller can decide how to handle it.

Signed-off-by: Jakub Sitnicki <jkbs@redhat.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
5 years agodb-ctl-base: Don't die in cmd_get() on error.
Jakub Sitnicki [Mon, 2 Jul 2018 10:50:16 +0000 (12:50 +0200)]
db-ctl-base: Don't die in cmd_get() on error.

Return the error via the context instead of calling ctl_fatal() so that
the caller can decide how to handle it.

Signed-off-by: Jakub Sitnicki <jkbs@redhat.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
5 years agodb-ctl-base: Kill die_if_error() helper.
Jakub Sitnicki [Mon, 2 Jul 2018 10:50:15 +0000 (12:50 +0200)]
db-ctl-base: Kill die_if_error() helper.

All users are gone.

Signed-off-by: Jakub Sitnicki <jkbs@redhat.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
5 years agodb-ctl-base: Fix resource deallocation on error path in cmd_find().
Jakub Sitnicki [Mon, 2 Jul 2018 10:50:14 +0000 (12:50 +0200)]
db-ctl-base: Fix resource deallocation on error path in cmd_find().

Release resources now that we are returning to the caller on error.

Signed-off-by: Jakub Sitnicki <jkbs@redhat.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
5 years agodb-ctl-base: Fix resource deallocation on error path in cmd_list().
Jakub Sitnicki [Mon, 2 Jul 2018 10:50:13 +0000 (12:50 +0200)]
db-ctl-base: Fix resource deallocation on error path in cmd_list().

Release resources now that we are returning to the caller on error.

Signed-off-by: Jakub Sitnicki <jkbs@redhat.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
5 years agodb-ctl-base: Fix resource deallocation on error path in cmd_get().
Jakub Sitnicki [Mon, 2 Jul 2018 10:50:12 +0000 (12:50 +0200)]
db-ctl-base: Fix resource deallocation on error path in cmd_get().

Release resources now that we are returning to the caller on error.

Signed-off-by: Jakub Sitnicki <jkbs@redhat.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
5 years agodb-ctl-base: Stop using die_if_error().
Jakub Sitnicki [Mon, 2 Jul 2018 10:50:11 +0000 (12:50 +0200)]
db-ctl-base: Stop using die_if_error().

Propagate the error via the context for the caller to handle it.

Result of applying the following semantic patch (Coccinelle):

@@
expression s;
@@
- die_if_error(s);
+ ctx->error = s;
+ if (ctx->error) {
+     return;
+ }

Signed-off-by: Jakub Sitnicki <jkbs@redhat.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
5 years agodb-ctl-base: Extend ctl_context with an error message.
Jakub Sitnicki [Mon, 2 Jul 2018 10:50:10 +0000 (12:50 +0200)]
db-ctl-base: Extend ctl_context with an error message.

Prepare for the command handlers (pre_cmd_*() cmd_*() functions) to
report errors by storing them in the context.

Signed-off-by: Jakub Sitnicki <jkbs@redhat.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
5 years agodb-ctl-base: Don't die in ctl_set_column() on error.
Jakub Sitnicki [Mon, 2 Jul 2018 10:50:09 +0000 (12:50 +0200)]
db-ctl-base: Don't die in ctl_set_column() on error.

Return the error message to the caller instead of reporting it and dying
so that the caller can handle the error without terminating the process
if needed.

Signed-off-by: Jakub Sitnicki <jkbs@redhat.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
5 years agodb-ctl-base: Don't die in pre_list_columns() on error.
Jakub Sitnicki [Mon, 2 Jul 2018 10:50:08 +0000 (12:50 +0200)]
db-ctl-base: Don't die in pre_list_columns() on error.

Return the error message to the caller instead of reporting it and dying
so that the caller can handle the error without terminating the process
if needed.

Signed-off-by: Jakub Sitnicki <jkbs@redhat.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
5 years agodb-ctl-base: Don't die in pre_parse_column_key_value() on error.
Jakub Sitnicki [Mon, 2 Jul 2018 10:50:07 +0000 (12:50 +0200)]
db-ctl-base: Don't die in pre_parse_column_key_value() on error.

Return the error message to the caller instead of reporting it and dying
so that the caller can handle the error without terminating the process
if needed.

Also, we no longer return the column as it was not used by any of
existing callers.

Signed-off-by: Jakub Sitnicki <jkbs@redhat.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
5 years agodb-ctl-base: Don't die in pre_get_table() on error.
Jakub Sitnicki [Mon, 2 Jul 2018 10:50:06 +0000 (12:50 +0200)]
db-ctl-base: Don't die in pre_get_table() on error.

Return the error message to the caller instead of reporting it and dying
so that the caller can handle the error without terminating the process
if needed.

Signed-off-by: Jakub Sitnicki <jkbs@redhat.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
5 years agodb-ctl-base: Don't die in pre_get_column() on error.
Jakub Sitnicki [Mon, 2 Jul 2018 10:50:05 +0000 (12:50 +0200)]
db-ctl-base: Don't die in pre_get_column() on error.

Return the error message to the caller instead of reporting it and dying
so that the caller can handle the error without terminating the process
if needed.

Signed-off-by: Jakub Sitnicki <jkbs@redhat.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>