dpif-netlink: Fix issues of the offloaded flows counter.

[mirror_ovs.git] / ofproto / fail-open.c

diff --git a/ofproto/fail-open.c b/ofproto/fail-open.c
index 38e775acefd70a8170f1737542192e7669d63743..5b105ba880a385aa686904592239869b7dedc694 100644 (file)
--- a/ofproto/fail-open.c
+++ b/ofproto/fail-open.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2015 Nicira, Inc.
+ * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2015, 2016 Nicira, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,26 +15,24 @@
  */
 
 #include <config.h>
-#include "fail-open.h"
 #include <inttypes.h>
 #include <stdlib.h>
 #include "classifier.h"
 #include "connmgr.h"
+#include "dp-packet.h"
+#include "fail-open.h"
 #include "flow.h"
 #include "mac-learning.h"
 #include "odp-util.h"
-#include "ofpbuf.h"
-#include "ofp-actions.h"
-#include "ofp-util.h"
+#include "openvswitch/ofp-actions.h"
+#include "openvswitch/ofpbuf.h"
+#include "openvswitch/vconn.h"
+#include "openvswitch/vlog.h"
 #include "ofproto.h"
 #include "ofproto-provider.h"
-#include "pktbuf.h"
-#include "dp-packet.h"
-#include "poll-loop.h"
-#include "rconn.h"
+#include "openvswitch/poll-loop.h"
+#include "openvswitch/rconn.h"
 #include "timeval.h"
-#include "openvswitch/vconn.h"
-#include "openvswitch/vlog.h"
 
 VLOG_DEFINE_THIS_MODULE(fail_open);
 
@@ -80,7 +78,7 @@ struct fail_open {
     bool fail_open_active;
 };
 
-static void fail_open_recover(struct fail_open *);
+static void fail_open_recover(struct fail_open *) OVS_REQUIRES(ofproto_mutex);
 
 /* Returns the number of seconds of disconnection after which fail-open mode
  * should activate. */
@@ -118,7 +116,6 @@ fail_open_is_active(const struct fail_open *fo)
 static void
 send_bogus_packet_ins(struct fail_open *fo)
 {
-    struct ofproto_packet_in pin;
     struct eth_addr mac;
     struct dp_packet b;
 
@@ -126,19 +123,56 @@ send_bogus_packet_ins(struct fail_open *fo)
     eth_addr_nicira_random(&mac);
     compose_rarp(&b, mac);
 
-    memset(&pin, 0, sizeof pin);
-    pin.up.packet = dp_packet_data(&b);
-    pin.up.packet_len = dp_packet_size(&b);
-    pin.up.reason = OFPR_NO_MATCH;
-    match_init_catchall(&pin.up.flow_metadata);
-    match_set_in_port(&pin.up.flow_metadata, OFPP_LOCAL);
-    pin.send_len = dp_packet_size(&b);
-    pin.miss_type = OFPROTO_PACKET_IN_NO_MISS;
-    connmgr_send_packet_in(fo->connmgr, &pin);
+    struct ofproto_async_msg am = {
+        .oam = OAM_PACKET_IN,
+        .pin = {
+            .up = {
+                .base = {
+                    .packet = dp_packet_data(&b),
+                    .packet_len = dp_packet_size(&b),
+                    .flow_metadata.flow.in_port.ofp_port = OFPP_LOCAL,
+                    .flow_metadata.wc.masks.in_port.ofp_port
+                    = u16_to_ofp(UINT16_MAX),
+                    .reason = OFPR_NO_MATCH,
+                    .cookie = OVS_BE64_MAX,
+                },
+            },
+            .max_len = UINT16_MAX,
+        }
+    };
+    connmgr_send_async_msg(fo->connmgr, &am);
 
     dp_packet_uninit(&b);
 }
 
+static void
+fail_open_del_normal_flow(struct fail_open *fo)
+    OVS_REQUIRES(ofproto_mutex)
+{
+    struct match match;
+
+    match_init_catchall(&match);
+    ofproto_delete_flow(fo->ofproto, &match, FAIL_OPEN_PRIORITY);
+}
+
+static void
+fail_open_add_normal_flow(struct fail_open *fo)
+{
+    struct ofpbuf ofpacts;
+    struct match match;
+
+    /* Set up a flow that matches every packet and directs them to
+     * OFPP_NORMAL. */
+    ofpbuf_init(&ofpacts, sizeof(struct ofpact_output));
+    ofpact_put_OUTPUT(&ofpacts)->port = OFPP_NORMAL;
+
+    match_init_catchall(&match);
+    ofproto_add_flow(fo->ofproto, &match, FAIL_OPEN_PRIORITY,
+            ofpacts.data, ofpacts.size);
+
+    ofpbuf_uninit(&ofpacts);
+}
+
 /* Enter fail-open mode if we should be in it. */
 void
 fail_open_run(struct fail_open *fo)
@@ -189,22 +223,21 @@ fail_open_maybe_recover(struct fail_open *fo)
 {
     if (fail_open_is_active(fo)
         && connmgr_is_any_controller_admitted(fo->connmgr)) {
+        ovs_mutex_lock(&ofproto_mutex);
         fail_open_recover(fo);
+        ovs_mutex_unlock(&ofproto_mutex);
     }
 }
 
 static void
 fail_open_recover(struct fail_open *fo)
-    OVS_EXCLUDED(ofproto_mutex)
+    OVS_REQUIRES(ofproto_mutex)
 {
-    struct match match;
-
     VLOG_WARN("No longer in fail-open mode");
     fo->last_disconn_secs = 0;
     fo->next_bogus_packet_in = LLONG_MAX;
 
-    match_init_catchall(&match);
-    ofproto_delete_flow(fo->ofproto, &match, FAIL_OPEN_PRIORITY);
+    fail_open_del_normal_flow(fo);
 }
 
 void
@@ -222,20 +255,7 @@ fail_open_flushed(struct fail_open *fo)
     int disconn_secs = connmgr_failure_duration(fo->connmgr);
     bool open = disconn_secs >= trigger_duration(fo);
     if (open) {
-        struct ofpbuf ofpacts;
-        struct match match;
-
-        /* Set up a flow that matches every packet and directs them to
-         * OFPP_NORMAL. */
-        ofpbuf_init(&ofpacts, OFPACT_OUTPUT_SIZE);
-        ofpact_put_OUTPUT(&ofpacts)->port = OFPP_NORMAL;
-        ofpact_pad(&ofpacts);
-
-        match_init_catchall(&match);
-        ofproto_add_flow(fo->ofproto, &match, FAIL_OPEN_PRIORITY,
-                         ofpacts.data, ofpacts.size);
-
-        ofpbuf_uninit(&ofpacts);
+        fail_open_add_normal_flow(fo);
     }
     fo->fail_open_active = open;
 }
@@ -265,7 +285,7 @@ fail_open_create(struct ofproto *ofproto, struct connmgr *mgr)
 /* Destroys 'fo'. */
 void
 fail_open_destroy(struct fail_open *fo)
-    OVS_EXCLUDED(ofproto_mutex)
+    OVS_REQUIRES(ofproto_mutex)
 {
     if (fo) {
         if (fail_open_is_active(fo)) {