ovs-vswitchd: Fix high cpu utilization when acquire idl lock fails.

[cascardo/ovs.git] / vswitchd / vswitch.xml

diff --git a/vswitchd/vswitch.xml b/vswitchd/vswitch.xml
index a351813..79a2b5a 100644 (file)
--- a/vswitchd/vswitch.xml
+++ b/vswitchd/vswitch.xml
@@ -588,15 +588,17 @@
        </p>
 
        <p>
-         The current implementation of OpenFlow 1.4 support is not safe:
-         <code>ovs-vswitchd</code> will abort when certain unimplemented
-         features are tested.  Thus, for now it is suitable only for
-         experimental use.  For this reason, OpenFlow 1.4 is supported only
-         if, in addition to specifying <code>OpenFlow14</code> in this field,
-         <code>ovs-vswitchd</code> is invoked with the
-         <code>--enable-of14</code> option.  (When support becomes safe, this
-         option will be removed.)
+         OpenFlow 1.4 is not enabled by default because its implementation is
+         missing features.
        </p>
+
+        <p>
+          OpenFlow 1.5 has the same risks as OpenFlow 1.4, but it is even more
+          experimental because the OpenFlow 1.5 specification is still under
+          development and thus subject to change.  Pass
+          <code>--enable-of15</code> to <code>ovs-vswitchd</code> to allow
+          OpenFlow 1.5 to be enabled.
+        </p>
       </column>
     </group>
 
@@ -1223,6 +1225,13 @@
           STP role of the port.
         </p>
       </column>
+
+      <column name="status" key="bond_active_slave">
+        <p>
+          For a bonded port, record the mac address of the current active slave.
+        </p>
+      </column>
+
     </group>
 
     <group title="Port Statistics">
@@ -1956,7 +1965,8 @@
        </p>
 
        <column name="bfd" key="enable" type='{"type": "boolean"}'>
-          True to enable BFD on this <ref table="Interface"/>.
+          True to enable BFD on this <ref table="Interface"/>.  If not
+          specified, BFD will not be enabled by default.
        </column>
 
        <column name="bfd" key="min_rx"
@@ -2011,22 +2021,37 @@
           tunnel key.
        </column>
 
-       <column name="bfd" key="bfd_dst_mac">
+       <column name="bfd" key="bfd_local_src_mac">
+         Set to an Ethernet address in the form
+         <var>xx</var>:<var>xx</var>:<var>xx</var>:<var>xx</var>:<var>xx</var>:<var>xx</var>
+         to set the MAC used as source for transmitted BFD packets.  The
+         default is the mac address of the BFD enabled interface.
+       </column>
+
+       <column name="bfd" key="bfd_local_dst_mac">
+         Set to an Ethernet address in the form
+         <var>xx</var>:<var>xx</var>:<var>xx</var>:<var>xx</var>:<var>xx</var>:<var>xx</var>
+         to set the MAC used as destination for transmitted BFD packets.  The
+         default is <code>00:23:20:00:00:01</code>.
+       </column>
+
+       <column name="bfd" key="bfd_remote_dst_mac">
          Set to an Ethernet address in the form
          <var>xx</var>:<var>xx</var>:<var>xx</var>:<var>xx</var>:<var>xx</var>:<var>xx</var>
-         to set the MAC used as destination for transmitted BFD packets and
-         expected as destination for received BFD packets.  The default is
-         <code>00:23:20:00:00:01</code>.
+         to set the MAC used for checking the destination of received BFD packets.
+         Packets with different destination MAC will not be considered as BFD packets.
+         If not specified the destination MAC address of received BFD packets
+         are not checked.
        </column>
 
        <column name="bfd" key="bfd_src_ip">
           Set to an IPv4 address to set the IP address used as source for
-          transmitted BFD packets.  The default is <code>169.254.1.0</code>.
+          transmitted BFD packets.  The default is <code>169.254.1.1</code>.
        </column>
 
        <column name="bfd" key="bfd_dst_ip">
           Set to an IPv4 address to set the IP address used as destination
-          for transmitted BFD packets.  The default is <code>169.254.1.1</code>.
+          for transmitted BFD packets.  The default is <code>169.254.1.0</code>.
        </column>
       </group>
 
@@ -2053,8 +2078,9 @@
        </column>
 
        <column name="bfd_status" key="diagnostic">
-         In case of a problem, set to a short message that reports what the
-         local BFD session thinks is wrong.
+         In case of a problem, set to an error message that reports what the
+         local BFD session thinks is wrong.  The error messages are defined
+         in section 4.1 of [RFC 5880].
        </column>
 
        <column name="bfd_status" key="remote_state"
@@ -2064,8 +2090,9 @@
        </column>
 
        <column name="bfd_status" key="remote_diagnostic">
-         In case of a problem, set to a short message that reports what the
-         remote endpoint's BFD session thinks is wrong.
+         In case of a problem, set to an error message that reports what the
+         remote endpoint's BFD session thinks is wrong.  The error messages
+         are defined in section 4.1 of [RFC 5880].
        </column>
 
         <column name="bfd_status" key="flap_count"