mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-09-03 15:55:19 +00:00
Code Issues Releases Wiki Activity

ofproto: Implement OF1.4 error code for set-async-config

Browse Source 
This patch adds support for Openflow1.4 error codes for set-async-config.
In this patch, a new error type, OFPET_ASYNC_CONFIG_FAILED is introduced
that enables the switch to properly inform the controller when controller
tries to set invalid mask or unsupported configuration.

Signed-off-by: Ambika Arora <ambika.arora@tcs.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
This commit is contained in:
Ambika Arora
2015-11-30 16:52:47 +05:30
committed by Ben Pfaff
parent cd26c1dc41
commit d18cc1eec4
9 changed files with 155 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@@ -10,6 +10,7 @@ Alexey I. Froloff raorn@raorn.name
Alex Wang ee07b291@gmail.com
Alfredo Finelli alf@computationes.de
Alin Serdean aserdean@cloudbasesolutions.com
Ambika Arora ambika.arora@tcs.com
Amit Bose bose@noironetworks.com
Andrew Evans aevans@nicira.com
Andrew Kampjes a.kampjes@gmail.com

3
include/openflow/openflow-1.4.h
View File

@@ -134,6 +134,7 @@ enum ofp14_table_mod_prop_eviction_flag {
enum ofp14_table_reason {
OFPTR_VACANCY_DOWN = 3, /* Vacancy down threshold event. */
OFPTR_VACANCY_UP = 4, /* Vacancy up threshold event. */
OFPTR_N_REASONS /* Denotes number of reasons. */
};
struct ofp14_table_mod_prop_eviction {
@@ -259,6 +260,7 @@ OFP_ASSERT(sizeof(struct ofp14_async_config) == 8);
enum ofp14_requestforward_reason {
OFPRFR_GROUP_MOD = 0, /* Forward group mod requests. */
OFPRFR_METER_MOD = 1, /* Forward meter mod requests. */
OFPRFR_N_REASONS /* Denotes number of reasons. */
};
/* Async Config property types.
@@ -332,6 +334,7 @@ enum ofp14_controller_role_reason {
OFPCRR_MASTER_REQUEST = 0, /* Another controller asked to be master. */
OFPCRR_CONFIG = 1, /* Configuration changed on the switch. */
OFPCRR_EXPERIMENTER = 2, /* Experimenter data changed. */
OFPCRR_N_REASONS /* Denotes number of reasons. */
};
/* Role property types.

3
include/openflow/openflow-common.h
View File

@@ -308,7 +308,8 @@ enum ofp_flow_removed_reason {
enum ofp_port_reason {
OFPPR_ADD, /* The port was added. */
OFPPR_DELETE, /* The port was removed. */
OFPPR_MODIFY /* Some attribute of the port has changed. */
OFPPR_MODIFY, /* Some attribute of the port has changed. */
OFPPR_N_REASONS /* Denotes number of reasons. */
};
/* A physical port has changed in the datapath */

13
lib/ofp-errors.h
View File

@@ -623,6 +623,19 @@ enum ofperr {
/* ONF1.3(4448), OF1.4+(14,8). Permissions error. */
OFPERR_OFPBPC_EPERM,
/* ## -------------------------- ## */
/* ## OFPET_ASYNC_CONFIG_FAILED ## */
/* ## -------------------------- ## */
/* OF1.4+(15,0). One mask is invalid. */
OFPERR_OFPACFC_INVALID,
/* OF1.4+(15,1). Requested configuration not supported. */
OFPERR_OFPACFC_UNSUPPORTED,
/* OF1.4+(15,2). Permissions error. */
OFPERR_OFPACFC_EPERM,
/* ## -------------------- ## */
/* ## OFPET_BUNDLE_FAILED ## */
/* ## -------------------- ## */

22
lib/ofp-print.c
View File

@@ -1879,6 +1879,7 @@ ofp_print_role_status_message(struct ds *string, const struct ofp_header *oh)
case OFPCRR_EXPERIMENTER:
ds_put_cstr(string, "experimenter_data_changed");
break;
case OFPCRR_N_REASONS:
default:
OVS_NOT_REACHED();
}
@@ -1937,6 +1938,7 @@ ofp_port_reason_to_string(enum ofp_port_reason reason,
case OFPPR_MODIFY:
return "modify";
case OFPPR_N_REASONS:
default:
snprintf(reasonbuf, bufsize, "%d", (int) reason);
return reasonbuf;
@@ -1960,6 +1962,7 @@ ofp_role_reason_to_string(enum ofp14_controller_role_reason reason,
case OFPCRR_EXPERIMENTER:
return "experimenter_data_changed";
case OFPCRR_N_REASONS:
default:
snprintf(reasonbuf, bufsize, "%d", (int) reason);
return reasonbuf;
@@ -1980,6 +1983,7 @@ ofp_table_reason_to_string(enum ofp14_table_reason reason,
case OFPTR_VACANCY_UP:
return "vacancy_up";
case OFPTR_N_REASONS:
default:
snprintf(reasonbuf, bufsize, "%d", (int) reason);
return reasonbuf;
@@ -2000,6 +2004,7 @@ ofp_requestforward_reason_to_string(enum ofp14_requestforward_reason reason,
case OFPRFR_METER_MOD:
return "meter_mod_request";
case OFPRFR_N_REASONS:
default:
snprintf(reasonbuf, bufsize, "%d", (int) reason);
return reasonbuf;
@@ -2106,10 +2111,22 @@ ofp_print_nxt_set_async_config(struct ds *string,
}
} else if (raw == OFPRAW_OFPT14_SET_ASYNC ||
raw == OFPRAW_OFPT14_GET_ASYNC_REPLY) {
enum ofperr error = 0;
uint32_t role[2][OAM_N_TYPES] = {{0}};
uint32_t type;
ofputil_decode_set_async_config(oh, role[0], role[1], true);
if (raw == OFPRAW_OFPT14_GET_ASYNC_REPLY) {
error = ofputil_decode_set_async_config(oh, role[0], role[1], true);
}
else if (raw == OFPRAW_OFPT14_SET_ASYNC) {
error = ofputil_decode_set_async_config(oh, role[0], role[1],
false);
}
if (error) {
ofp_print_error(string, error);
return;
}
for (i = 0; i < 2; i++) {
ds_put_format(string, "\n %s:\n", i == 0 ? "master" : "slave");
@@ -3118,6 +3135,9 @@ ofp_print_requestforward(struct ds *string, const struct ofp_header *oh)
ds_put_cstr(string, "meter_mod");
ofp_print_meter_mod__(string, rf.meter_mod);
break;
case OFPRFR_N_REASONS:
OVS_NOT_REACHED();
}
ofputil_destroy_requestforward(&rf);
}

75
lib/ofp-util.c
View File

@@ -137,6 +137,56 @@ log_property(bool loose, const char *message, ...)
}
}
static enum ofperr
ofputil_check_mask(uint16_t type, uint32_t mask)
{
switch (type) {
case OFPACPT_PACKET_IN_SLAVE:
case OFPACPT_PACKET_IN_MASTER:
if (mask > MAXIMUM_MASK_PACKET_IN) {
return OFPERR_OFPACFC_INVALID;
}
break;
case OFPACPT_FLOW_REMOVED_SLAVE:
case OFPACPT_FLOW_REMOVED_MASTER:
if (mask > MAXIMUM_MASK_FLOW_REMOVED) {
return OFPERR_OFPACFC_INVALID;
}
break;
case OFPACPT_PORT_STATUS_SLAVE:
case OFPACPT_PORT_STATUS_MASTER:
if (mask > MAXIMUM_MASK_PORT_STATUS) {
return OFPERR_OFPACFC_INVALID;
}
break;
case OFPACPT_ROLE_STATUS_SLAVE:
case OFPACPT_ROLE_STATUS_MASTER:
if (mask > MAXIMUM_MASK_ROLE_STATUS) {
return OFPERR_OFPACFC_INVALID;
}
break;
case OFPACPT_TABLE_STATUS_SLAVE:
case OFPACPT_TABLE_STATUS_MASTER:
if ((mask < MINIMUM_MASK_TABLE_STATUS && mask != 0) |
(mask > MAXIMUM_MASK_TABLE_STATUS)) {
return OFPERR_OFPACFC_INVALID;
}
break;
case OFPACPT_REQUESTFORWARD_SLAVE:
case OFPACPT_REQUESTFORWARD_MASTER:
if (mask > MAXIMUM_MASK_REQUESTFORWARD) {
return OFPERR_OFPACFC_INVALID;
}
break;
}
return 0;
}
static size_t
start_property(struct ofpbuf *msg, uint16_t type)
{
@@ -5501,6 +5551,7 @@ ofputil_encode_requestforward(const struct ofputil_requestforward *rf,
inner = ofputil_encode_meter_mod(ofp_version, rf->meter_mod);
break;
case OFPRFR_N_REASONS:
default:
OVS_NOT_REACHED();
}
@@ -5599,6 +5650,10 @@ ofputil_destroy_requestforward(struct ofputil_requestforward *rf)
case OFPRFR_METER_MOD:
ofpbuf_uninit(&rf->bands);
free(rf->meter_mod);
break;
case OFPRFR_N_REASONS:
OVS_NOT_REACHED();
}
}
@@ -9517,7 +9572,13 @@ ofputil_uninit_geneve_table(struct ovs_list *mappings)
* treats unknown properties and values as an error, as a switch would want to
* do when interpreting a configuration request made by a controller.
*
* Returns 0 if successful, otherwise an OFPERR_* value. */
* Returns 0 if successful, otherwise an OFPERR_* value.
*
* Returns error code OFPERR_OFPACFC_INVALID if the value of mask is not in
* the valid range of mask.
*
* Returns error code OFPERR_OFPACFC_UNSUPPORTED if the configuration is not
* supported.*/
enum ofperr
ofputil_decode_set_async_config(const struct ofp_header *oh,
uint32_t master[OAM_N_TYPES],
@@ -9563,6 +9624,13 @@ ofputil_decode_set_async_config(const struct ofp_header *oh,
return OFPERR_OFPBRC_BAD_LEN;
}
if (!loose) {
error = ofputil_check_mask(type, ntohl(msg->mask));
if (error) {
return error;
}
}
switch (type) {
case OFPACPT_PACKET_IN_SLAVE:
slave[OAM_PACKET_IN] = ntohl(msg->mask);
@@ -9613,10 +9681,7 @@ ofputil_decode_set_async_config(const struct ofp_header *oh,
break;
default:
error = loose ? 0 : OFPERR_OFPBPC_BAD_TYPE;
break;
}
if (error) {
error = loose ? 0 : OFPERR_OFPACFC_UNSUPPORTED;
return error;
}
}

16
lib/ofp-util.h
View File

@@ -140,6 +140,22 @@ enum ofputil_protocol {
OFPUTIL_P_ANY_OXM)
};
/* Valid value of mask for asynchronous messages. */
#define MAXIMUM_MASK_PACKET_IN ((1 << OFPR_N_REASONS) - 1)
#define MAXIMUM_MASK_FLOW_REMOVED ((1 << OVS_OFPRR_NONE) - 1)
#define MAXIMUM_MASK_PORT_STATUS ((1 << OFPPR_N_REASONS) - 1)
#define MAXIMUM_MASK_ROLE_STATUS ((1 << OFPCRR_N_REASONS) - 1)
#define MINIMUM_MASK_TABLE_STATUS (1 << OFPTR_VACANCY_DOWN)
#define MAXIMUM_MASK_TABLE_STATUS ((1 << OFPTR_N_REASONS) - \
MINIMUM_MASK_TABLE_STATUS)
#define MAXIMUM_MASK_REQUESTFORWARD ((1 << OFPRFR_N_REASONS) - 1)
/* Protocols to use for flow dumps, from most to least preferred. */
extern enum ofputil_protocol ofputil_flow_dump_protocols[];
extern size_t ofputil_n_flow_dump_protocols;

6
ofproto/ofproto.c
View File

@@ -5413,10 +5413,14 @@ handle_nxt_set_packet_in_format(struct ofconn *ofconn,
static enum ofperr
handle_nxt_set_async_config(struct ofconn *ofconn, const struct ofp_header *oh)
{
enum ofperr error;
uint32_t master[OAM_N_TYPES] = {0};
uint32_t slave[OAM_N_TYPES] = {0};
ofputil_decode_set_async_config(oh, master, slave, false);
error = ofputil_decode_set_async_config(oh, master, slave, false);
if (error) {
return error;
}
ofconn_set_async_config(ofconn, master, slave);
if (ofconn_get_type(ofconn) == OFCONN_SERVICE &&

24
tests/ofp-print.at
View File

@@ -2824,6 +2824,30 @@ OFPT_SET_ASYNC (OF1.4) (xid=0x2):
])
AT_CLEANUP
AT_SETUP([OFPT_SET_ASYNC_CONFIG - invalid mask - OF1.4])
AT_KEYWORDS([ofp-print])
AT_CHECK([ovs-ofctl ofp-print "\
05 1c 00 38 00 00 00 02 00 00 00 08 00 00 00 40 \
00 01 00 08 00 00 00 02 00 02 00 08 00 00 00 02 \
00 03 00 08 00 00 00 05 00 04 00 08 00 00 00 1c \
00 05 00 08 00 00 00 05 \
"], [0], [dnl
OFPT_SET_ASYNC (OF1.4) (xid=0x2): ***decode error: OFPACFC_INVALID***
])
AT_CLEANUP
AT_SETUP([OFPT_SET_ASYNC_CONFIG - unsupported configuration - OF1.4])
AT_KEYWORDS([ofp-print])
AT_CHECK([ovs-ofctl ofp-print "\
05 1c 00 38 00 00 00 02 00 00 00 08 00 00 00 05 \
00 11 00 08 00 00 00 02 00 02 00 08 00 00 00 02 \
00 03 00 08 00 00 00 05 00 04 00 08 00 00 00 1c \
00 05 00 08 00 00 00 05\
"], [0], [dnl
OFPT_SET_ASYNC (OF1.4) (xid=0x2): ***decode error: OFPACFC_UNSUPPORTED***
])
AT_CLEANUP
AT_SETUP([NXT_SET_CONTROLLER_ID])
AT_KEYWORDS([ofp-print])
AT_CHECK([ovs-ofctl ofp-print "\