gre: Disable checksums by default.

GRE checksums aren't really all that useful because they only
add value for the GRE and inner Ethernet header.  However, they
are expensive since they cover the entire packet, even though
most of the data is protected by L3 and L4 checksums.  Therefore
disable checksumming by default to improve performance.  In addition,
since CAPWAP doesn't support checksums this makes it consistent with
GRE.

Signed-off-by: Jesse Gross <jesse@nicira.com>

diff --git a/lib/netdev-gre.c b/lib/netdev-gre.c
index aecc77edf6da11b5deabbe1b0009006fed9b95df..69411dbd7bf97e1e8148b12dd5a5af7113096a1d 100644 (file)
--- a/lib/netdev-gre.c
+++ b/lib/netdev-gre.c
@@ -61,8 +61,6 @@ parse_config(const char *name, const struct shash *args,
 
     memset(config, 0, sizeof *config);
 
-    config->flags |= GRE_F_IN_CSUM;
-    config->flags |= GRE_F_OUT_CSUM;
     config->flags |= GRE_F_PMTUD;
 
     SHASH_FOR_EACH (node, args) {
@@ -112,9 +110,9 @@ parse_config(const char *name, const struct shash *args,
                 config->ttl = atoi(node->data);
             }
         } else if (!strcmp(node->name, "csum")) {
-            if (!strcmp(node->data, "false")) {
-                config->flags &= ~GRE_F_IN_CSUM;
-                config->flags &= ~GRE_F_OUT_CSUM;
+            if (!strcmp(node->data, "true")) {
+                config->flags |= GRE_F_IN_CSUM;
+                config->flags |= GRE_F_OUT_CSUM;
             }
         } else if (!strcmp(node->name, "pmtud")) {
             if (!strcmp(node->data, "false")) {

diff --git a/vswitchd/vswitch.xml b/vswitchd/vswitch.xml
index 3b500151133182670fcffbf3f70ce50fe2e1198d..f3864047410923531947128fb0e726941a5bf6a3 100644 (file)
--- a/vswitchd/vswitch.xml
+++ b/vswitchd/vswitch.xml
@@ -442,7 +442,7 @@
           <dt><code>tap</code></dt>
           <dd>A TUN/TAP device managed by Open vSwitch.</dd>
           <dt><code>gre</code></dt>
-          <dd>An Ethernet over RFC 1702 Generic Routing Encapsulation over IPv4
+          <dd>An Ethernet over RFC 2890 Generic Routing Encapsulation over IPv4
              tunnel.  Each tunnel must be uniquely identified by the
              combination of <code>remote_ip</code>, <code>local_ip</code>, and
              <code>in_key</code>.  Note that if two ports are defined that are
@@ -506,8 +506,12 @@
             <dl>
               <dt><code>csum</code></dt>
               <dd>Optional.  Compute GRE checksums for outgoing packets and
-                require checksums for incoming packets.  Default is enabled,
-                set to <code>false</code> to disable.</dd>
+                require checksums for incoming packets.  Note that GRE checksums
+                impose a significant performance penalty as they cover the
+                entire packet.  As the contents of the packet is typically
+                covered by L3 and L4 checksums, this additional checksum only
+                adds value for the GRE and encapsulated Ethernet headers.
+                Default is disabled, set to <code>true</code> to enable.</dd>
             </dl>
             <dl>
               <dt><code>pmtud</code></dt>