/* Add implicit allowance for OpenFlow 1.4. */
add_allowed_ofp_versions(ofputil_protocols_to_version_bitmap(
OFPUTIL_P_OF14_OXM));
+ /* Remove all prior versions. */
+ mask_allowed_ofp_versions(ofputil_protocols_to_version_bitmap(
+ OFPUTIL_P_OF14_UP));
}
versions = get_allowed_ofp_versions();
version_protocols = ofputil_protocols_from_version_bitmap(versions);
" mod-port SWITCH IFACE ACT modify port behavior\n"
" mod-table SWITCH MOD modify flow table behavior\n"
" OF1.1/1.2 MOD: controller, continue, drop\n"
- " OF1.4+ MOD: evict, noevict\n"
+ " OF1.4+ MOD: evict, noevict, vacancy:low,high, novacancy\n"
" get-frags SWITCH print fragment handling behavior\n"
" set-frags SWITCH FRAG_MODE set fragment handling behavior\n"
" FRAG_MODE: normal, drop, reassemble, nx-match\n"
" dump-meters SWITCH print all meter configuration\n"
" meter-stats SWITCH [METER] print meter statistics\n"
" meter-features SWITCH print meter features\n"
- " add-geneve-map SWITCH MAP add Geneve option MAPpings\n"
- " del-geneve-map SWITCH [MAP] delete Geneve option MAPpings\n"
- " dump-geneve-map SWITCH print Geneve option mappings\n"
+ " add-tlv-map SWITCH MAP add TLV option MAPpings\n"
+ " del-tlv-map SWITCH [MAP] delete TLV option MAPpings\n"
+ " dump-tlv-map SWITCH print TLV option mappings\n"
"\nFor OpenFlow switches and controllers:\n"
" probe TARGET probe whether TARGET is up\n"
" ping TARGET [N] latency of N-byte echos\n"
vconn_close(vconn);
}
+/* This function uses OFPMP14_TABLE_DESC request to get the current
+ * table configuration from switch. The function then modifies
+ * only that table-config property, which has been requested. */
+static void
+fetch_table_desc(struct vconn *vconn, struct ofputil_table_mod *tm,
+ struct ofputil_table_desc *td)
+{
+ struct ofpbuf *request;
+ ovs_be32 send_xid;
+ bool done = false;
+ bool found = false;
+
+ request = ofputil_encode_table_desc_request(vconn_get_version(vconn));
+ send_xid = ((struct ofp_header *) request->data)->xid;
+ send_openflow_buffer(vconn, request);
+ while (!done) {
+ ovs_be32 recv_xid;
+ struct ofpbuf *reply;
+
+ run(vconn_recv_block(vconn, &reply), "OpenFlow packet receive failed");
+ recv_xid = ((struct ofp_header *) reply->data)->xid;
+ if (send_xid == recv_xid) {
+ struct ofp_header *oh = reply->data;
+ enum ofptype type;
+ struct ofpbuf b;
+ uint16_t flags;
+
+ ofpbuf_use_const(&b, oh, ntohs(oh->length));
+ if (ofptype_pull(&type, &b)
+ || type != OFPTYPE_TABLE_DESC_REPLY) {
+ ovs_fatal(0, "received bad reply: %s",
+ ofp_to_string(reply->data, reply->size,
+ verbosity + 1));
+ }
+ flags = ofpmp_flags(oh);
+ done = !(flags & OFPSF_REPLY_MORE);
+ if (found) {
+ /* We've already found the table desc consisting of current
+ * table configuration, but we need to drain the queue of
+ * any other replies for this request. */
+ continue;
+ }
+ while (!ofputil_decode_table_desc(&b, td, oh->version)) {
+ if (td->table_id == tm->table_id) {
+ found = true;
+ break;
+ }
+ }
+ } else {
+ VLOG_DBG("received reply with xid %08"PRIx32" "
+ "!= expected %08"PRIx32, recv_xid, send_xid);
+ }
+ ofpbuf_delete(reply);
+ }
+ if (tm->eviction != OFPUTIL_TABLE_EVICTION_DEFAULT) {
+ tm->vacancy = td->vacancy;
+ tm->table_vacancy.vacancy_down = td->table_vacancy.vacancy_down;
+ tm->table_vacancy.vacancy_up = td->table_vacancy.vacancy_up;
+ } else if (tm->vacancy != OFPUTIL_TABLE_VACANCY_DEFAULT) {
+ tm->eviction = td->eviction;
+ tm->eviction_flags = td->eviction_flags;
+ }
+}
+
static void
ofctl_mod_table(struct ovs_cmdl_context *ctx)
{
struct ofputil_table_mod tm;
struct vconn *vconn;
char *error;
+ int i;
error = parse_ofp_table_mod(&tm, ctx->argv[2], ctx->argv[3],
&usable_versions);
uint32_t allowed_versions = get_allowed_ofp_versions();
if (!(allowed_versions & usable_versions)) {
struct ds versions = DS_EMPTY_INITIALIZER;
- ofputil_format_version_bitmap_names(&versions, allowed_versions);
+ ofputil_format_version_bitmap_names(&versions, usable_versions);
ovs_fatal(0, "table_mod '%s' requires one of the OpenFlow "
- "versions %s but none is enabled (use -O)",
+ "versions %s",
ctx->argv[3], ds_cstr(&versions));
}
mask_allowed_ofp_versions(usable_versions);
-
enum ofputil_protocol protocol = open_vconn(ctx->argv[1], &vconn);
- transact_noreply(vconn, ofputil_encode_table_mod(&tm, protocol));
+
+ /* For OpenFlow 1.4+, ovs-ofctl mod-table should not affect table-config
+ * properties that the user didn't ask to change, so it is necessary to
+ * restore the current configuration of table-config parameters using
+ * OFPMP14_TABLE_DESC request. */
+ if ((allowed_versions & (1u << OFP14_VERSION)) ||
+ (allowed_versions & (1u << OFP15_VERSION))) {
+ struct ofputil_table_desc td;
+
+ if (tm.table_id == OFPTT_ALL) {
+ for (i = 0; i < OFPTT_MAX; i++) {
+ tm.table_id = i;
+ fetch_table_desc(vconn, &tm, &td);
+ transact_noreply(vconn,
+ ofputil_encode_table_mod(&tm, protocol));
+ }
+ } else {
+ fetch_table_desc(vconn, &tm, &td);
+ transact_noreply(vconn, ofputil_encode_table_mod(&tm, protocol));
+ }
+ } else {
+ transact_noreply(vconn, ofputil_encode_table_mod(&tm, protocol));
+ }
vconn_close(vconn);
}
open_vconn(ctx->argv[1], &vconn);
if (ctx->argc < 3 || !ofputil_group_from_string(ctx->argv[2], &group_id)) {
- group_id = OFPG11_ALL;
+ group_id = OFPG_ALL;
}
request = ofputil_encode_group_desc_request(vconn_get_version(vconn),
}
static void
-ofctl_geneve_mod(struct ovs_cmdl_context *ctx, uint16_t command)
+ofctl_tlv_mod(struct ovs_cmdl_context *ctx, uint16_t command)
{
enum ofputil_protocol usable_protocols;
enum ofputil_protocol protocol;
- struct ofputil_geneve_table_mod gtm;
+ struct ofputil_tlv_table_mod ttm;
char *error;
enum ofp_version version;
struct ofpbuf *request;
struct vconn *vconn;
- error = parse_ofp_geneve_table_mod_str(>m, command, ctx->argc > 2 ?
+ error = parse_ofp_tlv_table_mod_str(&ttm, command, ctx->argc > 2 ?
ctx->argv[2] : "",
&usable_protocols);
if (error) {
protocol = open_vconn_for_flow_mod(ctx->argv[1], &vconn, usable_protocols);
version = ofputil_protocol_to_ofp_version(protocol);
- request = ofputil_encode_geneve_table_mod(version, >m);
+ request = ofputil_encode_tlv_table_mod(version, &ttm);
if (request) {
transact_noreply(vconn, request);
}
vconn_close(vconn);
- ofputil_uninit_geneve_table(>m.mappings);
+ ofputil_uninit_tlv_table(&ttm.mappings);
}
static void
-ofctl_add_geneve_map(struct ovs_cmdl_context *ctx)
+ofctl_add_tlv_map(struct ovs_cmdl_context *ctx)
{
- ofctl_geneve_mod(ctx, NXGTMC_ADD);
+ ofctl_tlv_mod(ctx, NXTTMC_ADD);
}
static void
-ofctl_del_geneve_map(struct ovs_cmdl_context *ctx)
+ofctl_del_tlv_map(struct ovs_cmdl_context *ctx)
{
- ofctl_geneve_mod(ctx, ctx->argc > 2 ? NXGTMC_DELETE : NXGTMC_CLEAR);
+ ofctl_tlv_mod(ctx, ctx->argc > 2 ? NXTTMC_DELETE : NXTTMC_CLEAR);
}
static void
-ofctl_dump_geneve_map(struct ovs_cmdl_context *ctx)
+ofctl_dump_tlv_map(struct ovs_cmdl_context *ctx)
{
- dump_trivial_transaction(ctx->argv[1], OFPRAW_NXT_GENEVE_TABLE_REQUEST);
+ dump_trivial_transaction(ctx->argv[1], OFPRAW_NXT_TLV_TABLE_REQUEST);
}
static void
\f
/* replace-flows and diff-flows commands. */
+struct flow_tables {
+ struct classifier tables[OFPTT_MAX + 1];
+};
+
+#define FOR_EACH_TABLE(CLS, TABLES) \
+ for ((CLS) = (TABLES)->tables; \
+ (CLS) < &(TABLES)->tables[ARRAY_SIZE((TABLES)->tables)]; \
+ (CLS)++)
+
+static void
+flow_tables_init(struct flow_tables *tables)
+{
+ struct classifier *cls;
+
+ FOR_EACH_TABLE (cls, tables) {
+ classifier_init(cls, NULL);
+ }
+}
+
+static void
+flow_tables_defer(struct flow_tables *tables)
+{
+ struct classifier *cls;
+
+ FOR_EACH_TABLE (cls, tables) {
+ classifier_defer(cls);
+ }
+}
+
+static void
+flow_tables_publish(struct flow_tables *tables)
+{
+ struct classifier *cls;
+
+ FOR_EACH_TABLE (cls, tables) {
+ classifier_publish(cls);
+ }
+}
+
/* A flow table entry, possibly with two different versions. */
struct fte {
struct cls_rule rule; /* Within a "struct classifier". */
uint16_t flags;
struct ofpact *ofpacts;
size_t ofpacts_len;
+ uint8_t table_id;
};
/* Frees 'version' and the data that it owns. */
&& a->idle_timeout == b->idle_timeout
&& a->hard_timeout == b->hard_timeout
&& a->importance == b->importance
+ && a->table_id == b->table_id
&& ofpacts_equal(a->ofpacts, a->ofpacts_len,
b->ofpacts, b->ofpacts_len));
}
return;
}
+ if (version->table_id) {
+ ds_put_format(s, "table=%"PRIu8" ", version->table_id);
+ }
cls_rule_format(&fte->rule, s);
if (version->cookie != htonll(0)) {
ds_put_format(s, " cookie=0x%"PRIx64, ntohll(version->cookie));
}
}
-/* Frees all of the FTEs within 'cls'. */
+/* Frees all of the FTEs within 'tables'. */
static void
-fte_free_all(struct classifier *cls)
+fte_free_all(struct flow_tables *tables)
{
- struct fte *fte;
+ struct classifier *cls;
+
+ FOR_EACH_TABLE (cls, tables) {
+ struct fte *fte;
- classifier_defer(cls);
- CLS_FOR_EACH (fte, rule, cls) {
- classifier_remove(cls, &fte->rule);
- ovsrcu_postpone(fte_free, fte);
+ classifier_defer(cls);
+ CLS_FOR_EACH (fte, rule, cls) {
+ classifier_remove(cls, &fte->rule);
+ ovsrcu_postpone(fte_free, fte);
+ }
+ classifier_destroy(cls);
}
- classifier_destroy(cls);
}
-/* Searches 'cls' for an FTE matching 'rule', inserting a new one if
+/* Searches 'tables' for an FTE matching 'rule', inserting a new one if
* necessary. Sets 'version' as the version of that rule with the given
* 'index', replacing any existing version, if any.
*
* Takes ownership of 'version'. */
static void
-fte_insert(struct classifier *cls, const struct match *match,
+fte_insert(struct flow_tables *tables, const struct match *match,
int priority, struct fte_version *version, int index)
{
+ struct classifier *cls = &tables->tables[version->table_id];
struct fte *old, *fte;
fte = xzalloc(sizeof *fte);
}
}
-/* Reads the flows in 'filename' as flow table entries in 'cls' for the version
- * with the specified 'index'. Returns the flow formats able to represent the
- * flows that were read. */
+/* Reads the flows in 'filename' as flow table entries in 'tables' for the
+ * version with the specified 'index'. Returns the flow formats able to
+ * represent the flows that were read. */
static enum ofputil_protocol
-read_flows_from_file(const char *filename, struct classifier *cls, int index)
+read_flows_from_file(const char *filename, struct flow_tables *tables,
+ int index)
{
enum ofputil_protocol usable_protocols;
int line_number;
ds_init(&s);
usable_protocols = OFPUTIL_P_ANY;
line_number = 0;
- classifier_defer(cls);
+ flow_tables_defer(tables);
while (!ds_get_preprocessed_line(&s, file, &line_number)) {
struct fte_version *version;
struct ofputil_flow_mod fm;
| OFPUTIL_FF_EMERG);
version->ofpacts = fm.ofpacts;
version->ofpacts_len = fm.ofpacts_len;
+ version->table_id = fm.table_id != OFPTT_ALL ? fm.table_id : 0;
- fte_insert(cls, &fm.match, fm.priority, version, index);
+ fte_insert(tables, &fm.match, fm.priority, version, index);
}
- classifier_publish(cls);
+ flow_tables_publish(tables);
ds_destroy(&s);
if (file != stdin) {
}
/* Reads the OpenFlow flow table from 'vconn', which has currently active flow
- * format 'protocol', and adds them as flow table entries in 'cls' for the
+ * format 'protocol', and adds them as flow table entries in 'tables' for the
* version with the specified 'index'. */
static void
read_flows_from_switch(struct vconn *vconn,
enum ofputil_protocol protocol,
- struct classifier *cls, int index)
+ struct flow_tables *tables, int index)
{
struct ofputil_flow_stats_request fsr;
struct ofputil_flow_stats fs;
reply = NULL;
ofpbuf_init(&ofpacts, 0);
- classifier_defer(cls);
+ flow_tables_defer(tables);
while (recv_flow_stats_reply(vconn, send_xid, &reply, &fs, &ofpacts)) {
struct fte_version *version;
version->flags = 0;
version->ofpacts_len = fs.ofpacts_len;
version->ofpacts = xmemdup(fs.ofpacts, fs.ofpacts_len);
+ version->table_id = fs.table_id;
- fte_insert(cls, &fs.match, fs.priority, version, index);
+ fte_insert(tables, &fs.match, fs.priority, version, index);
}
- classifier_publish(cls);
+ flow_tables_publish(tables);
ofpbuf_uninit(&ofpacts);
}
fm.cookie_mask = htonll(0);
fm.new_cookie = version->cookie;
fm.modify_cookie = true;
- fm.table_id = 0xff;
+ fm.table_id = version->table_id;
fm.command = command;
fm.idle_timeout = version->idle_timeout;
fm.hard_timeout = version->hard_timeout;
{
enum { FILE_IDX = 0, SWITCH_IDX = 1 };
enum ofputil_protocol usable_protocols, protocol;
- struct classifier cls;
+ struct flow_tables tables;
+ struct classifier *cls;
struct ovs_list requests;
struct vconn *vconn;
struct fte *fte;
- classifier_init(&cls, NULL);
- usable_protocols = read_flows_from_file(ctx->argv[2], &cls, FILE_IDX);
+ flow_tables_init(&tables);
+ usable_protocols = read_flows_from_file(ctx->argv[2], &tables, FILE_IDX);
protocol = open_vconn(ctx->argv[1], &vconn);
protocol = set_protocol_for_flow_dump(vconn, protocol, usable_protocols);
- read_flows_from_switch(vconn, protocol, &cls, SWITCH_IDX);
+ read_flows_from_switch(vconn, protocol, &tables, SWITCH_IDX);
list_init(&requests);
- /* Delete flows that exist on the switch but not in the file. */
- CLS_FOR_EACH (fte, rule, &cls) {
- struct fte_version *file_ver = fte->versions[FILE_IDX];
- struct fte_version *sw_ver = fte->versions[SWITCH_IDX];
+ FOR_EACH_TABLE (cls, &tables) {
+ /* Delete flows that exist on the switch but not in the file. */
+ CLS_FOR_EACH (fte, rule, cls) {
+ struct fte_version *file_ver = fte->versions[FILE_IDX];
+ struct fte_version *sw_ver = fte->versions[SWITCH_IDX];
- if (sw_ver && !file_ver) {
- fte_make_flow_mod(fte, SWITCH_IDX, OFPFC_DELETE_STRICT,
- protocol, &requests);
+ if (sw_ver && !file_ver) {
+ fte_make_flow_mod(fte, SWITCH_IDX, OFPFC_DELETE_STRICT,
+ protocol, &requests);
+ }
}
- }
- /* Add flows that exist in the file but not on the switch.
- * Update flows that exist in both places but differ. */
- CLS_FOR_EACH (fte, rule, &cls) {
- struct fte_version *file_ver = fte->versions[FILE_IDX];
- struct fte_version *sw_ver = fte->versions[SWITCH_IDX];
+ /* Add flows that exist in the file but not on the switch.
+ * Update flows that exist in both places but differ. */
+ CLS_FOR_EACH (fte, rule, cls) {
+ struct fte_version *file_ver = fte->versions[FILE_IDX];
+ struct fte_version *sw_ver = fte->versions[SWITCH_IDX];
- if (file_ver
- && (readd || !sw_ver || !fte_version_equals(sw_ver, file_ver))) {
- fte_make_flow_mod(fte, FILE_IDX, OFPFC_ADD, protocol, &requests);
+ if (file_ver &&
+ (readd || !sw_ver || !fte_version_equals(sw_ver, file_ver))) {
+ fte_make_flow_mod(fte, FILE_IDX, OFPFC_ADD, protocol,
+ &requests);
+ }
}
}
if (bundle) {
}
vconn_close(vconn);
- fte_free_all(&cls);
+ fte_free_all(&tables);
}
static void
-read_flows_from_source(const char *source, struct classifier *cls, int index)
+read_flows_from_source(const char *source, struct flow_tables *tables,
+ int index)
{
struct stat s;
if (source[0] == '/' || source[0] == '.'
|| (!strchr(source, ':') && !stat(source, &s))) {
- read_flows_from_file(source, cls, index);
+ read_flows_from_file(source, tables, index);
} else {
enum ofputil_protocol protocol;
struct vconn *vconn;
protocol = open_vconn(source, &vconn);
protocol = set_protocol_for_flow_dump(vconn, protocol, OFPUTIL_P_ANY);
- read_flows_from_switch(vconn, protocol, cls, index);
+ read_flows_from_switch(vconn, protocol, tables, index);
vconn_close(vconn);
}
}
ofctl_diff_flows(struct ovs_cmdl_context *ctx)
{
bool differences = false;
- struct classifier cls;
+ struct flow_tables tables;
+ struct classifier *cls;
struct ds a_s, b_s;
struct fte *fte;
- classifier_init(&cls, NULL);
- read_flows_from_source(ctx->argv[1], &cls, 0);
- read_flows_from_source(ctx->argv[2], &cls, 1);
+ flow_tables_init(&tables);
+ read_flows_from_source(ctx->argv[1], &tables, 0);
+ read_flows_from_source(ctx->argv[2], &tables, 1);
ds_init(&a_s);
ds_init(&b_s);
- CLS_FOR_EACH (fte, rule, &cls) {
- struct fte_version *a = fte->versions[0];
- struct fte_version *b = fte->versions[1];
-
- if (!a || !b || !fte_version_equals(a, b)) {
- fte_version_format(fte, 0, &a_s);
- fte_version_format(fte, 1, &b_s);
- if (strcmp(ds_cstr(&a_s), ds_cstr(&b_s))) {
- if (a_s.length) {
- printf("-%s", ds_cstr(&a_s));
- }
- if (b_s.length) {
- printf("+%s", ds_cstr(&b_s));
+ FOR_EACH_TABLE (cls, &tables) {
+ CLS_FOR_EACH (fte, rule, cls) {
+ struct fte_version *a = fte->versions[0];
+ struct fte_version *b = fte->versions[1];
+
+ if (!a || !b || !fte_version_equals(a, b)) {
+ fte_version_format(fte, 0, &a_s);
+ fte_version_format(fte, 1, &b_s);
+ if (strcmp(ds_cstr(&a_s), ds_cstr(&b_s))) {
+ if (a_s.length) {
+ printf("-%s", ds_cstr(&a_s));
+ }
+ if (b_s.length) {
+ printf("+%s", ds_cstr(&b_s));
+ }
+ differences = true;
}
- differences = true;
}
}
}
ds_destroy(&a_s);
ds_destroy(&b_s);
- fte_free_all(&cls);
+ fte_free_all(&tables);
if (differences) {
exit(2);
protocol = open_vconn_for_flow_mod(bridge, &vconn, usable_protocols);
version = ofputil_protocol_to_ofp_version(protocol);
- transact_noreply(vconn, ofputil_encode_meter_request(version,
- type,
- mm.meter.meter_id));
+ dump_stats_transaction(vconn,
+ ofputil_encode_meter_request(version, type,
+ mm.meter.meter_id));
vconn_close(vconn);
}
error = ofpacts_check_consistency(ofpacts.data, ofpacts.size,
&flow, OFPP_MAX,
table_id ? atoi(table_id) : 0,
- 255, protocol);
+ OFPTT_MAX + 1, protocol);
}
if (error) {
printf("bad %s %s: %s\n\n",
1, 2, ofctl_dump_group_stats },
{ "dump-group-features", "switch",
1, 1, ofctl_dump_group_features },
- { "add-geneve-map", "switch map",
- 2, 2, ofctl_add_geneve_map },
- { "del-geneve-map", "switch [map]",
- 1, 2, ofctl_del_geneve_map },
- { "dump-geneve-map", "switch",
- 1, 1, ofctl_dump_geneve_map },
+ { "add-tlv-map", "switch map",
+ 2, 2, ofctl_add_tlv_map },
+ { "del-tlv-map", "switch [map]",
+ 1, 2, ofctl_del_tlv_map },
+ { "dump-tlv-map", "switch",
+ 1, 1, ofctl_dump_tlv_map },
{ "help", NULL, 0, INT_MAX, ofctl_help },
{ "list-commands", NULL, 0, INT_MAX, ofctl_list_commands },