From: Saloni Jain <saloni.j...@tcs.com>
On change in a table state, the controller needs to be informed with
the OFPT_TABLE_STATUS message. The message is sent with reason
OFPTR_VACANCY_DOWN or OFPTR_VACANCY_UP in case of change in remaining
space eventually crossing any one of the threshold.
Signed-off-by: Saloni Jain <saloni.j...@tcs.com>
Co-authored-by: Rishi Bamba <rishi.ba...@tcs.com>
Signed-off-by: Rishi Bamba <rishi.ba...@tcs.com>
---
Difference between v3->v4
- Rebased with latest master.
- Added Co-authored-by tag in commit message.
include/openflow/openflow-1.4.h | 8 ++++
lib/learning-switch.c | 1 +
lib/ofp-msgs.h | 6 +++
lib/ofp-print.c | 26 +++++++++++++
lib/ofp-util.c | 82 +++++++++++++++++++++++++++++++++++++++
lib/ofp-util.h | 12 ++++++
lib/rconn.c | 1 +
ofproto/connmgr.c | 31 +++++++++++++++
ofproto/connmgr.h | 3 ++
ofproto/ofproto.c | 31 +++++++++++++++
tests/ofproto.at | 20 ++++++++--
11 files changed, 218 insertions(+), 3 deletions(-)
diff --git a/include/openflow/openflow-1.4.h b/include/openflow/openflow-1.4.h
index 1ed4e39..88f2d80 100644
--- a/include/openflow/openflow-1.4.h
+++ b/include/openflow/openflow-1.4.h
@@ -172,6 +172,14 @@ struct ofp14_table_desc {
};
OFP_ASSERT(sizeof(struct ofp14_table_desc) == 8);
+/* A table config has changed in the datapath */
+struct ofp14_table_status {
+ uint8_t reason; /* One of OFPTR_*. */
+ uint8_t pad[7]; /* Pad to 64 bits */
+ /* Followed by struct ofp14_table_desc */
+};
+OFP_ASSERT(sizeof(struct ofp14_table_status) == 8);
+
/* ## ---------------- ## */
/* ## ofp14_port_stats ## */
/* ## ---------------- ## */
diff --git a/lib/learning-switch.c b/lib/learning-switch.c
index 1753cea..a78c3f9 100644
--- a/lib/learning-switch.c
+++ b/lib/learning-switch.c
@@ -419,6 +419,7 @@ lswitch_process_packet(struct lswitch *sw, const struct
ofpbuf *msg)
case OFPTYPE_ROLE_REQUEST:
case OFPTYPE_ROLE_REPLY:
case OFPTYPE_ROLE_STATUS:
+ case OFPTYPE_TABLE_STATUS:
case OFPTYPE_SET_FLOW_FORMAT:
case OFPTYPE_FLOW_MOD_TABLE_ID:
case OFPTYPE_SET_PACKET_IN_FORMAT:
diff --git a/lib/ofp-msgs.h b/lib/ofp-msgs.h
index 8558e58..d86c1c6 100644
--- a/lib/ofp-msgs.h
+++ b/lib/ofp-msgs.h
@@ -247,6 +247,9 @@ enum ofpraw {
/* OFPT 1.4+ (30): struct ofp14_role_status, uint8_t[8][]. */
OFPRAW_OFPT14_ROLE_STATUS,
+ /* OFPT 1.4+ (31): struct ofp14_table_status, uint8_t[8][]. */
+ OFPRAW_OFPT14_TABLE_STATUS,
+
/* OFPT 1.4+ (33): struct ofp14_bundle_ctrl_msg, uint8_t[8][]. */
OFPRAW_OFPT14_BUNDLE_CONTROL,
@@ -559,6 +562,9 @@ enum ofptype {
/* Controller role change event messages. */
OFPTYPE_ROLE_STATUS, /* OFPRAW_OFPT14_ROLE_STATUS. */
+ /* Asynchronous messages. */
+ OFPTYPE_TABLE_STATUS, /* OFPRAW_OFPT14_TABLE_STATUS. */
+
OFPTYPE_BUNDLE_CONTROL, /* OFPRAW_OFPT14_BUNDLE_CONTROL. */
OFPTYPE_BUNDLE_ADD_MESSAGE, /* OFPRAW_OFPT14_BUNDLE_ADD_MESSAGE. */
diff --git a/lib/ofp-print.c b/lib/ofp-print.c
index 14b2ba3..eaa4ed7 100644
--- a/lib/ofp-print.c
+++ b/lib/ofp-print.c
@@ -1068,6 +1068,28 @@ ofp_print_table_desc(struct ds *string, const struct
ofputil_table_desc *td)
}
static void
+ofp_print_table_status_message(struct ds *string, const struct ofp_header *oh)
+{
+ struct ofputil_table_status ts;
+ enum ofperr error;
+
+ error = ofputil_decode_table_status(oh, &ts);
+ if (error) {
+ ofp_print_error(string, error);
+ return;
+ }
+
+ if (ts.reason == OFPTR_VACANCY_DOWN) {
+ ds_put_format(string, " reason=VACANCY_DOWN");
+ } else if (ts.reason == OFPTR_VACANCY_UP) {
+ ds_put_format(string, " reason=VACANCY_UP");
+ }
+
+ ds_put_format(string, "\ntable_desc:-");
+ ofp_print_table_desc(string, &ts.desc);
+}
+
+static void
ofp_print_queue_get_config_request(struct ds *string,
const struct ofp_header *oh)
{
@@ -3212,6 +3234,10 @@ ofp_to_string__(const struct ofp_header *oh, enum ofpraw
raw,
ofp_print_role_status_message(string, oh);
break;
+ case OFPTYPE_TABLE_STATUS:
+ ofp_print_table_status_message(string, oh);
+ break;
+
case OFPTYPE_METER_STATS_REQUEST:
case OFPTYPE_METER_CONFIG_STATS_REQUEST:
ofp_print_stats(string, oh);
diff --git a/lib/ofp-util.c b/lib/ofp-util.c
index 199da44..0273741 100644
--- a/lib/ofp-util.c
+++ b/lib/ofp-util.c
@@ -9159,6 +9159,7 @@ ofputil_is_bundlable(enum ofptype type)
case OFPTYPE_TABLE_FEATURES_STATS_REPLY:
case OFPTYPE_TABLE_DESC_REPLY:
case OFPTYPE_ROLE_STATUS:
+ case OFPTYPE_TABLE_STATUS:
case OFPTYPE_NXT_GENEVE_TABLE_REQUEST:
case OFPTYPE_NXT_GENEVE_TABLE_REPLY:
break;
@@ -9587,3 +9588,84 @@ ofputil_encode_get_async_config(const struct ofp_header
*oh,
return buf;
}
+
+static void
+ofputil_put_ofp14_table_desc(const struct ofputil_table_desc *td,
+ struct ofpbuf *b, enum ofp_version version)
+{
+ struct ofp14_table_desc *otd;
+ struct ofp14_table_mod_prop_eviction *ote;
+ struct ofp14_table_mod_prop_vacancy *otv;
+
+ ofpbuf_prealloc_tailroom(b, sizeof *otd + sizeof *ote + sizeof *otv);
+
+ otd = ofpbuf_put_zeros(b, sizeof *otd);
+ otd->length = htons(sizeof *otd + sizeof *ote + sizeof *otv);
+ otd->table_id = td->table_id;
+ otd->config = ofputil_encode_table_config(OFPUTIL_TABLE_MISS_DEFAULT,
+ td->eviction, td->vacancy,
+ version);
+
+ ote = ofpbuf_put_zeros(b, sizeof *ote);
+ ote->type = htons(OFPTMPT14_EVICTION);
+ ote->length = htons(sizeof *ote);
+ ote->flags = htonl(td->eviction_flags);
+
+ otv = ofpbuf_put_zeros(b, sizeof *otv);
+ otv->type = htons(OFPTMPT14_VACANCY);
+ otv->length = htons(sizeof *otv);
+ otv->vacancy_down = td->table_vacancy.vacancy_down;
+ otv->vacancy_up = td->table_vacancy.vacancy_up;
+ otv->vacancy = td->table_vacancy.vacancy;
+}
+
+/* Converts the abstract form of a "table status" message in '*ts' into an
+ * OpenFlow message suitable for 'protocol', and returns that encoded form in
+ * a buffer owned by the caller. */
+struct ofpbuf *
+ofputil_encode_table_status(const struct ofputil_table_status *ts,
+ enum ofputil_protocol protocol)
+{
+ enum ofp_version version;
+ struct ofpbuf *b;
+
+ version = ofputil_protocol_to_ofp_version(protocol);
+ if (version >= OFP14_VERSION) {
+ enum ofpraw raw;
+ struct ofp14_table_status *ots;
+
+ raw = OFPRAW_OFPT14_TABLE_STATUS;
+ b = ofpraw_alloc_xid(raw, version, htonl(0), 0);
+ ots = ofpbuf_put_zeros(b, sizeof *ots);
+ ots->reason = ts->reason;
+ ofputil_put_ofp14_table_desc(&ts->desc, b, version);
+ ofpmsg_update_length(b);
+
+ return b;
+ } else {
+ return NULL;
+ }
+}
+
+/* Decodes the OpenFlow "table status" message in '*ots' into an abstract form
+ * in '*ts'. Returns 0 if successful, otherwise an OFPERR_* value. */
+enum ofperr
+ofputil_decode_table_status(const struct ofp_header *oh,
+ struct ofputil_table_status *ts)
+{
+ const struct ofp14_table_status *ots;
+ struct ofpbuf b;
+ enum ofperr error;
+
+ ofpbuf_use_const(&b, oh, ntohs(oh->length));
+ ofpraw_pull_assert(&b);
+ ots = ofpbuf_pull(&b, sizeof *ots);
+
+ if (ots->reason != OFPTR_VACANCY_DOWN && ots->reason != OFPTR_VACANCY_UP) {
+ return OFPERR_OFPBPC_BAD_VALUE;
+ }
+ ts->reason = ots->reason;
+
+ error = ofputil_decode_table_desc(&b, &ts->desc, oh->version);
+ return error;
+}
diff --git a/lib/ofp-util.h b/lib/ofp-util.h
index 2290c4c..a26b5cd 100644
--- a/lib/ofp-util.h
+++ b/lib/ofp-util.h
@@ -1278,4 +1278,16 @@ struct ofpbuf *ofputil_encode_get_async_config(const
struct ofp_header *,
uint32_t master[OAM_N_TYPES],
uint32_t slave[OAM_N_TYPES]);
+/* Abstract ofp14_table_status. */
+struct ofputil_table_status {
+ enum ofp14_table_reason reason; /* One of OFPTR_*. */
+ struct ofputil_table_desc desc; /* New table config. */
+};
+
+enum ofperr ofputil_decode_table_status(const struct ofp_header *oh,
+ struct ofputil_table_status *ts);
+
+struct ofpbuf *
+ofputil_encode_table_status(const struct ofputil_table_status *ts,
+ enum ofputil_protocol protocol);
#endif /* ofp-util.h */
diff --git a/lib/rconn.c b/lib/rconn.c
index 37adfa2..f5b096e 100644
--- a/lib/rconn.c
+++ b/lib/rconn.c
@@ -1403,6 +1403,7 @@ is_admitted_msg(const struct ofpbuf *b)
case OFPTYPE_ROLE_REQUEST:
case OFPTYPE_ROLE_REPLY:
case OFPTYPE_ROLE_STATUS:
+ case OFPTYPE_TABLE_STATUS:
case OFPTYPE_SET_FLOW_FORMAT:
case OFPTYPE_FLOW_MOD_TABLE_ID:
case OFPTYPE_SET_PACKET_IN_FORMAT:
diff --git a/ofproto/connmgr.c b/ofproto/connmgr.c
index b1ba0c6..8478bdd 100644
--- a/ofproto/connmgr.c
+++ b/ofproto/connmgr.c
@@ -1732,6 +1732,37 @@ connmgr_send_flow_removed(struct connmgr *mgr,
}
}
+/* Sends an OFPT_TABLE_STATUS message with 'reason' to appropriate controllers
+ * managed by 'mgr'. When the table state changes, the controller needs to be
+ * informed with the OFPT_TABLE_STATUS message. The reason values
+ * OFPTR_VACANCY_DOWN and OFPTR_VACANCY_UP identify a vacancy message. The
+ * vacancy events are generated when the remaining space in the flow table
+ * changes and crosses one of the vacancy thereshold specified by
+ * OFPT_TABLE_MOD. */
+void
+connmgr_send_table_status(struct connmgr *mgr,
+ const struct ofputil_table_desc *td,
+ uint8_t reason)
+{
+ struct ofputil_table_status ts;
+ struct ofconn *ofconn;
+
+ ts.reason = reason;
+ ts.desc = *td;
+
+ LIST_FOR_EACH (ofconn, node, &mgr->all_conns) {
+ if (ofconn_receives_async_msg(ofconn, OAM_TABLE_STATUS, reason)) {
+ struct ofpbuf *msg;
+
+ msg = ofputil_encode_table_status(&ts,
+ ofconn_get_protocol(ofconn));
+ if (msg) {
+ ofconn_send(ofconn, msg, NULL);
+ }
+ }
+ }
+}
+
/* Normally a send-to-controller action uses reason OFPR_ACTION. However, in
* OpenFlow 1.3 and later, packet_ins generated by a send-to-controller action
* in a "table-miss" flow (one with priority 0 and completely wildcarded) are
diff --git a/ofproto/connmgr.h b/ofproto/connmgr.h
index 7ef583a..01bb3f7 100644
--- a/ofproto/connmgr.h
+++ b/ofproto/connmgr.h
@@ -231,4 +231,7 @@ void ofmonitor_compose_refresh_updates(struct
rule_collection *rules,
struct ovs_list *msgs)
OVS_REQUIRES(ofproto_mutex);
+void connmgr_send_table_status(struct connmgr *,
+ const struct ofputil_table_desc *td,
+ uint8_t reason);
#endif /* connmgr.h */
diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c
index a569d55..17f7e68 100644
--- a/ofproto/ofproto.c
+++ b/ofproto/ofproto.c
@@ -3633,6 +3633,24 @@ handle_table_desc_request(struct ofconn *ofconn,
return 0;
}
+/* This function determines and sends the vacancy event, based on the value
+ * of current vacancy and threshold vacancy. If the current vacancy is less
+ * than vacancy_up, vacancy up events must be enabled, and when the current
+ * vacancy is greater or equal to vacancy_up, vacancy down events must be
+ * enabled. */
+static void
+send_table_status(struct ofproto *ofproto, uint8_t table_id)
+{
+ struct ofputil_table_desc td;
+
+ query_table_desc__(&td, ofproto, table_id);
+ if (td.table_vacancy.vacancy < td.table_vacancy.vacancy_up) {
+ connmgr_send_table_status(ofproto->connmgr, &td, OFPTR_VACANCY_UP);
+ } else {
+ connmgr_send_table_status(ofproto->connmgr, &td, OFPTR_VACANCY_DOWN);
+ }
+}
+
static void
append_port_stat(struct ofport *port, struct ovs_list *replies)
{
@@ -4668,6 +4686,12 @@ add_flow_finish(struct ofproto *ofproto, struct
ofproto_flow_mod *ofm,
ofmonitor_report(ofproto->connmgr, new_rule, NXFME_ADDED, 0,
req ? req->ofconn : NULL,
req ? req->request->xid : 0, NULL);
+
+ /* Send Vacancy Events for OF1.4+ when there is change in flow table.
+ * Provided OFPTC14_VACANCY_EVENTS is set for the table. */
+ if (ofproto->tables[fm->table_id].vacancy & OFPTC14_VACANCY_EVENTS) {
+ send_table_status(ofproto, fm->table_id);
+ }
}
send_buffered_packet(req, fm->buffer_id, new_rule);
@@ -5063,6 +5087,12 @@ delete_flows_finish__(struct ofproto *ofproto,
ofmonitor_report(ofproto->connmgr, rule, NXFME_DELETED, reason,
req ? req->ofconn : NULL,
req ? req->request->xid : 0, NULL);
+
+ /* Send Vacancy Events for OF1.4+ when there is change in flow table.
+ * Provided OFPTC14_VACANCY_EVENTS is set for the table. */
+ if (ofproto->tables[rule->table_id].vacancy & OFPTC14_VACANCY_EVENTS) {
+ send_table_status(ofproto, rule->table_id);
+ }
ofproto_rule_remove__(ofproto, rule);
learned_cookies_dec(ofproto, rule_get_actions(rule),
&dead_cookies);
@@ -7237,6 +7267,7 @@ handle_openflow__(struct ofconn *ofconn, const struct
ofpbuf *msg)
case OFPTYPE_TABLE_FEATURES_STATS_REPLY:
case OFPTYPE_TABLE_DESC_REPLY:
case OFPTYPE_ROLE_STATUS:
+ case OFPTYPE_TABLE_STATUS:
case OFPTYPE_NXT_GENEVE_TABLE_REPLY:
default:
if (ofpmsg_is_stat_request(oh)) {
diff --git a/tests/ofproto.at b/tests/ofproto.at
index 04df388..c4f30c3 100644
--- a/tests/ofproto.at
+++ b/tests/ofproto.at
@@ -2654,7 +2654,7 @@ OFPT_PORT_STATUS (OF1.4): MOD: ${INDEX}(test):
addr:aa:55:aa:55:00:0x
echo >>expout "OFPT_FLOW_REMOVED (OF1.4): reason=delete table_id=0"
fi
- # OFPT_FLOW_REMOVED, OFPRR_GROUP_DELETE
+ # OFPT_FLOW_REMOVED, OFPRR_GROUP_DELETE
ovs-ofctl -O OpenFlow14 add-group br0
group_id=1234,type=all,bucket=output:10
ovs-ofctl -O OpenFlow14 add-flow br0 send_flow_rem,actions=group:1234
ovs-ofctl -O OpenFlow14 --strict del-groups br0 group_id=1234
@@ -2662,6 +2662,20 @@ OFPT_PORT_STATUS (OF1.4): MOD: ${INDEX}(test):
addr:aa:55:aa:55:00:0x
echo >>expout "OFPT_FLOW_REMOVED (OF1.4): reason=group_delete
table_id=0"
fi
+ # OFPT_TABLE_STATUS, OFPTR_VACANCY_UP
+ if test X"$1" = X"OFPTR_VACANCY_UP"; then shift;
+ ovs-vsctl -- --id=@t1 create Flow_Table flow-limit=10 -- set bridge
br0 flow_tables:1=@t1
+ ovs-ofctl -O OpenFlow14 add-flow br0 table=1,in_port=1,actions=2
+ ovs-ofctl -O OpenFlow14 add-flow br0 table=1,in_port=2,actions=2
+ ovs-ofctl -O OpenFlow14 mod-table br0 1 vacancy-20..80
+ ovs-ofctl -O OpenFlow14 add-flow br0 table=1,in_port=3,actions=2
+ echo >>expout "OFPT_TABLE_STATUS (OF1.4): reason=VACANCY_UP
+table_desc:-
+ table 1:
+ eviction=off eviction_flags=OTHER|IMPORTANCE|LIFETIME
+ vacancy=on vacancy_down=20% vacancy_up=80% vacancy=30%"
+ fi
+
AT_FAIL_IF([test X"$1" != X])
ovs-appctl -t ovs-ofctl ofctl/barrier
@@ -2687,8 +2701,8 @@ ovs-appctl -t ovs-ofctl ofctl/send
051800180000000200000003000000000000000000000
check_async 3 OFPPR_ADD OFPPR_MODIFY OFPPR_DELETE
# Use OF 1.4 OFPT_SET_ASYNC to enable a patchwork of asynchronous messages.
-ovs-appctl -t ovs-ofctl ofctl/send
051c0038000000020000000800000005000100080000000200020008000000020003000800000005000400080000001c0005000800000005
-check_async 4 OFPR_INVALID_TTL OFPPR_DELETE OFPRR_DELETE OFPRR_GROUP_DELETE
+ovs-appctl -t ovs-ofctl ofctl/send
051c0040000000020000000800000005000100080000000200020008000000020003000800000005000400080000001c00050008000000050008000800000010
+check_async 4 OFPR_INVALID_TTL OFPPR_DELETE OFPRR_DELETE OFPRR_GROUP_DELETE
OFPTR_VACANCY_UP
# Set controller ID 123.
ovs-appctl -t ovs-ofctl ofctl/send
05040018000000030000232000000014000000000000007b
--
1.7.9.5
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
