Make ofproto manage the revalidation set, instead of vswitchd.

In an upcoming change, ofproto will want to add revalidation entries of its
own, so it is better to have it manage a single revalidation set rather
than having two separate sets, one in ofproto and one in vswitchd.

diff --git a/secchan/ofproto.c b/secchan/ofproto.c
index a47928309b86d3a452710735961a9a13ba85e7f4..e866ba9e52e9e39de8710150d13d79639e9c07a7 100644 (file)
--- a/secchan/ofproto.c
+++ b/secchan/ofproto.c
@@ -214,6 +214,7 @@ struct ofproto {
     struct classifier cls;
     bool need_revalidate;
     long long int next_expiration;
+    struct tag_set revalidate_set;
 
     /* OpenFlow connections. */
     struct list all_conns;
@@ -317,6 +318,7 @@ ofproto_create(const char *datapath, const struct ofhooks *ofhooks, void *aux,
     classifier_init(&p->cls);
     p->need_revalidate = false;
     p->next_expiration = time_msec() + 1000;
+    tag_set_init(&p->revalidate_set);
 
     /* Initialize OpenFlow connections. */
     list_init(&p->all_conns);
@@ -718,7 +720,7 @@ ofproto_run(struct ofproto *p)
 {
     int error = ofproto_run1(p);
     if (!error) {
-        error = ofproto_run2(p, false, NULL);
+        error = ofproto_run2(p, false);
     }
     return error;
 }
@@ -839,20 +841,16 @@ struct revalidate_cbdata {
 };
 
 int
-ofproto_run2(struct ofproto *p,
-             bool revalidate_all, const struct tag_set *revalidate_set)
+ofproto_run2(struct ofproto *p, bool revalidate_all)
 {
     if (p->need_revalidate || revalidate_all
-        || (revalidate_set && !tag_set_is_empty(revalidate_set))) {
+        || !tag_set_is_empty(&p->revalidate_set)) {
         struct revalidate_cbdata cbdata;
         cbdata.ofproto = p;
         cbdata.revalidate_all = revalidate_all;
         cbdata.revalidate_subrules = p->need_revalidate;
-        if (revalidate_set) {
-            cbdata.revalidate_set = *revalidate_set;
-        } else {
-            tag_set_init(&cbdata.revalidate_set);
-        }
+        cbdata.revalidate_set = p->revalidate_set;
+        tag_set_init(&p->revalidate_set);
         classifier_for_each(&p->cls, CLS_INC_EXACT, revalidate_cb, &cbdata);
         p->need_revalidate = false;
     }
@@ -885,6 +883,9 @@ ofproto_wait(struct ofproto *p)
     if (p->executer) {
         executer_wait(p->executer);
     }
+    if (!tag_set_is_empty(&p->revalidate_set)) {
+        poll_immediate_wake();
+    }
     if (p->need_revalidate) {
         /* Shouldn't happen, but if it does just go around again. */
         VLOG_DBG_RL(&rl, "need revalidate in ofproto_wait_cb()");
@@ -900,6 +901,18 @@ ofproto_wait(struct ofproto *p)
     }
 }
 
+void
+ofproto_revalidate(struct ofproto *ofproto, tag_type tag)
+{
+    tag_set_add(&ofproto->revalidate_set, tag);
+}
+
+struct tag_set *
+ofproto_get_revalidate_set(struct ofproto *ofproto)
+{
+    return &ofproto->revalidate_set;
+}
+
 bool
 ofproto_is_alive(const struct ofproto *p)
 {

diff --git a/secchan/ofproto.h b/secchan/ofproto.h
index e4d19ab617330a06771b3c295e401309853e1163..4a16a3ca2f825642ce274e38862e954ba937e44a 100644 (file)
--- a/secchan/ofproto.h
+++ b/secchan/ofproto.h
@@ -60,8 +60,7 @@ int ofproto_create(const char *datapath, const struct ofhooks *, void *aux,
 void ofproto_destroy(struct ofproto *);
 int ofproto_run(struct ofproto *);
 int ofproto_run1(struct ofproto *);
-int ofproto_run2(struct ofproto *,
-                 bool revalidate_all, const struct tag_set *revalidate_set);
+int ofproto_run2(struct ofproto *, bool revalidate_all);
 void ofproto_wait(struct ofproto *);
 bool ofproto_is_alive(const struct ofproto *);
 
@@ -119,5 +118,7 @@ struct ofhooks {
     void (*normal_cb)(const flow_t *, bool revalidating,
                       struct odp_actions *, tag_type *, void *aux);
 };
+void ofproto_revalidate(struct ofproto *, tag_type);
+struct tag_set *ofproto_get_revalidate_set(struct ofproto *);
 
 #endif /* ofproto.h */

diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c
index 9072b99446600686330a7a323e71bf815108f3e3..eb7e92b533da143337f4ecafe639115d97ce5e4f 100644 (file)
--- a/vswitchd/bridge.c
+++ b/vswitchd/bridge.c
@@ -174,7 +174,6 @@ struct bridge {
     size_t n_ports, allocated_ports;
 
     /* Flow tracking. */
-    struct tag_set revalidate_set;
     bool flush;
 
     /* Flow statistics gathering. */
@@ -601,9 +600,6 @@ bridge_wait(void)
         }
         bond_wait(br);
         brstp_wait(br);
-        if (!tag_set_is_empty(&br->revalidate_set)) {
-            poll_immediate_wake();
-        }
     }
 }
 
@@ -663,7 +659,6 @@ bridge_create(const char *name)
 
     port_array_init(&br->ifaces);
 
-    tag_set_init(&br->revalidate_set);
     br->flush = false;
 
     list_push_back(&all_bridges, &br->node);
@@ -750,13 +745,12 @@ bridge_run_one(struct bridge *br)
     }
 
     if (br->ml) {
-        mac_learning_run(br->ml, &br->revalidate_set);
+        mac_learning_run(br->ml, ofproto_get_revalidate_set(br->ofproto));
     }
     bond_run(br);
     brstp_run(br);
 
-    error = ofproto_run2(br->ofproto, br->flush, &br->revalidate_set);
-    tag_set_init(&br->revalidate_set);
+    error = ofproto_run2(br->ofproto, br->flush);
     br->flush = false;
 
     return error;
@@ -1181,15 +1175,15 @@ bond_run(struct bridge *br)
                           iface->name,
                           iface->enabled ? "enable" : "disabled");
                 if (!iface->enabled) {
-                    tag_set_add(&br->revalidate_set, iface->tag);
+                    ofproto_revalidate(br->ofproto, iface->tag);
                     if (iface->port_ifidx == port->active_iface) {
-                        tag_set_add(&br->revalidate_set,
-                                    port->active_iface_tag);
+                        ofproto_revalidate(br->ofproto,
+                                           port->active_iface_tag);
                         bond_choose_active_iface(port);
                     }
                 } else {
                     if (port->active_iface < 0) {
-                        tag_set_add(&br->revalidate_set, port->no_ifaces_tag);
+                        ofproto_revalidate(br->ofproto, port->no_ifaces_tag);
                         bond_choose_active_iface(port);
                     }
                     iface->tag = tag_create_random();
@@ -1555,7 +1549,7 @@ process_flow(struct bridge *br, const flow_t *flow, bool revalidating,
                             "on port %s in VLAN %d",
                             br->name, ETH_ADDR_ARGS(flow->dl_src),
                             in_port->name, vlan);
-                tag_set_add(&br->revalidate_set, rev_tag);
+                ofproto_revalidate(br->ofproto, rev_tag);
             }
         }
 
@@ -1925,7 +1919,7 @@ iface_destroy(struct iface *iface)
         free(iface);
 
         if (del_active) {
-            tag_set_add(&port->bridge->revalidate_set, port->active_iface_tag);
+            ofproto_revalidate(port->bridge->ofproto, port->active_iface_tag);
             bond_choose_active_iface(port);
         }
 
@@ -2408,7 +2402,7 @@ brstp_update_port_state(struct port *p)
         if (p->stp_state == STP_DISABLED) {
             bridge_flush(br);
         } else {
-            tag_set_add(&p->bridge->revalidate_set, p->stp_state_tag);
+            ofproto_revalidate(p->bridge->ofproto, p->stp_state_tag);
         }
         p->stp_state = state;
         p->stp_state_tag = (p->stp_state == STP_DISABLED ? 0