From: Daniel Baluta Date: Wed, 11 Sep 2013 21:56:53 +0000 (+0300) Subject: ofproto: update flow_stats flags on flow_stats_request X-Git-Tag: sliver-openvswitch-2.0.90-1~15^2 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=3f517bcd0548f6729bbbc3fa8cb34eab8d18b8b8;p=sliver-openvswitch.git ofproto: update flow_stats flags on flow_stats_request This is a first step in implementing 'on demand flow counters'. We save relevant flow_mod flags (OFPUTIL_FF_SEND_FLOW_REM, OFPUTIL_FF_NO_PKT_COUNTS, OFPUTIL_FF_NO_BYT_COUNTS) into newly created rule when a new flow is added, and echo them back in the flow stats request. Notice that we remove send_flow_removed flag from struct rule/struct ofoperation and we replace it with an enum tracking all ofputil_flow_mod_flags. Signed-off-by: Daniel Baluta Signed-off-by: Ben Pfaff --- diff --git a/lib/ofp-util.h b/lib/ofp-util.h index 0ca483c52..d5f34d72d 100644 --- a/lib/ofp-util.h +++ b/lib/ofp-util.h @@ -227,12 +227,20 @@ struct ofpbuf *ofputil_make_flow_mod_table_id(bool flow_mod_table_id); /* Protocol-independent flow_mod flags. */ enum ofputil_flow_mod_flags { + /* Flags that are maintained with a flow as part of its state. + * + * (OFPUTIL_FF_EMERG would be here too, if OVS supported it.) */ OFPUTIL_FF_SEND_FLOW_REM = 1 << 0, /* All versions. */ - OFPUTIL_FF_CHECK_OVERLAP = 1 << 1, /* All versions. */ - OFPUTIL_FF_EMERG = 1 << 2, /* OpenFlow 1.0 only. */ - OFPUTIL_FF_RESET_COUNTS = 1 << 3, /* OpenFlow 1.2+. */ - OFPUTIL_FF_NO_PKT_COUNTS = 1 << 4, /* OpenFlow 1.3+. */ - OFPUTIL_FF_NO_BYT_COUNTS = 1 << 5 /* OpenFlow 1.3+. */ + OFPUTIL_FF_NO_PKT_COUNTS = 1 << 1, /* OpenFlow 1.3+. */ + OFPUTIL_FF_NO_BYT_COUNTS = 1 << 2, /* OpenFlow 1.3+. */ +#define OFPUTIL_FF_STATE (OFPUTIL_FF_SEND_FLOW_REM \ + | OFPUTIL_FF_NO_PKT_COUNTS \ + | OFPUTIL_FF_NO_BYT_COUNTS) + + /* Flags that affect flow_mod behavior but are not part of flow state. */ + OFPUTIL_FF_CHECK_OVERLAP = 1 << 3, /* All versions. */ + OFPUTIL_FF_EMERG = 1 << 4, /* OpenFlow 1.0 only. */ + OFPUTIL_FF_RESET_COUNTS = 1 << 5, /* OpenFlow 1.2+. */ }; /* Protocol-independent flow_mod. diff --git a/ofproto/ofproto-provider.h b/ofproto/ofproto-provider.h index 0b8a5e5bb..4cbf47ff1 100644 --- a/ofproto/ofproto-provider.h +++ b/ofproto/ofproto-provider.h @@ -231,7 +231,7 @@ struct rule { long long int modified; /* Time of last modification. */ long long int used; /* Last use; time created if never used. */ uint8_t table_id; /* Index in ofproto's 'tables' array. */ - bool send_flow_removed; /* Send a flow removed message? */ + enum ofputil_flow_mod_flags flags; struct ovs_mutex timeout_mutex; uint16_t hard_timeout OVS_GUARDED; /* In seconds from ->modified. */ diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c index abf14f295..9605baab2 100644 --- a/ofproto/ofproto.c +++ b/ofproto/ofproto.c @@ -131,11 +131,11 @@ struct ofoperation { /* OFOPERATION_DELETE. */ enum ofp_flow_removed_reason reason; /* Reason flow was removed. */ - ovs_be64 flow_cookie; /* Rule's old flow cookie. */ - uint16_t idle_timeout; /* Rule's old idle timeout. */ - uint16_t hard_timeout; /* Rule's old hard timeout. */ - bool send_flow_removed; /* Rule's old 'send_flow_removed'. */ - enum ofperr error; /* 0 if no error. */ + ovs_be64 flow_cookie; /* Rule's old flow cookie. */ + uint16_t idle_timeout; /* Rule's old idle timeout. */ + uint16_t hard_timeout; /* Rule's old hard timeout. */ + enum ofputil_flow_mod_flags flags; /* Rule's old flags. */ + enum ofperr error; /* 0 if no error. */ }; static struct ofoperation *ofoperation_create(struct ofopgroup *, @@ -3155,12 +3155,8 @@ handle_flow_stats_request(struct ofconn *ofconn, fs.hard_timeout = rule->hard_timeout; ovs_mutex_unlock(&rule->timeout_mutex); - fs.flags = 0; - if (rule->send_flow_removed) { - fs.flags |= OFPUTIL_FF_SEND_FLOW_REM; - /* FIXME: Implement OFPUTIL_FF_NO_PKT_COUNTS and - OFPUTIL_FF_NO_BYT_COUNTS. */ - } + fs.flags = rule->flags; + ofputil_append_flow_stats_reply(&fs, &replies); } ofconn_send_replies(ofconn, &replies); @@ -3576,7 +3572,8 @@ add_flow(struct ofproto *ofproto, struct ofconn *ofconn, ovs_mutex_unlock(&rule->timeout_mutex); rule->table_id = table - ofproto->tables; - rule->send_flow_removed = (fm->flags & OFPUTIL_FF_SEND_FLOW_REM) != 0; + rule->flags = fm->flags & OFPUTIL_FF_STATE; + rule->ofpacts = xmemdup(fm->ofpacts, fm->ofpacts_len); rule->ofpacts_len = fm->ofpacts_len; rule->meter_id = find_meter(rule->ofpacts, rule->ofpacts_len); @@ -3663,9 +3660,7 @@ modify_flows__(struct ofproto *ofproto, struct ofconn *ofconn, rule->hard_timeout = fm->hard_timeout; ovs_mutex_unlock(&rule->timeout_mutex); - rule->send_flow_removed = (fm->flags - & OFPUTIL_FF_SEND_FLOW_REM) != 0; - + rule->flags = fm->flags & OFPUTIL_FF_STATE; if (fm->idle_timeout || fm->hard_timeout) { if (!rule->eviction_group) { eviction_group_add_rule(rule); @@ -3838,7 +3833,8 @@ ofproto_rule_send_removed(struct rule *rule, uint8_t reason) { struct ofputil_flow_removed fr; - if (ofproto_rule_is_hidden(rule) || !rule->send_flow_removed) { + if (ofproto_rule_is_hidden(rule) || + !(rule->flags & OFPUTIL_FF_SEND_FLOW_REM)) { return; } @@ -5553,7 +5549,7 @@ ofopgroup_complete(struct ofopgroup *group) op->ofpacts = NULL; op->ofpacts_len = 0; } - rule->send_flow_removed = op->send_flow_removed; + rule->flags = op->flags; } break; @@ -5611,7 +5607,7 @@ ofoperation_create(struct ofopgroup *group, struct rule *rule, op->idle_timeout = rule->idle_timeout; op->hard_timeout = rule->hard_timeout; ovs_mutex_unlock(&rule->timeout_mutex); - op->send_flow_removed = rule->send_flow_removed; + op->flags = rule->flags; group->n_running++;