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

ofp-msgs: Add support for ONF extension messages.

Browse Source 
ONF introduced a number of "standard extensions" that use its own
vendor (experimenter) ID.  This commit adds support for such extensions to
ofp-msgs.

These extensions were already half-supported, so there's barely any change
to build-aux/extract-ofp-msgs.

This isn't fully tested, since nothing adds support for such a message yet.

Requested-by: Jarno Rajahalme <jarno@ovn.org>
Signed-off-by: Ben Pfaff <blp@ovn.org>
Acked-by: Jarno Rajahalme <jarno@ovn.org>
This commit is contained in:
Ben Pfaff
2016-01-27 15:46:41 -08:00
parent 4077f060cc
commit 2123bc8c09
6 changed files with 56 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build-aux/extract-ofp-msgs
View File

@@ -161,7 +161,7 @@ def extract_ofp_msgs(output_file_name):
hdrs = (version, OFPT10_STATS_REPLY, number, 0, 0) hdrs = (version, OFPT10_STATS_REPLY, number, 0, 0)
else: else:
hdrs = (version, OFPT11_STATS_REPLY, number, 0, 0) hdrs = (version, OFPT11_STATS_REPLY, number, 0, 0)
elif type_ == 'ONF': elif type_ == 'ONFT':
hdrs = (version, OFPT_VENDOR, 0, ONF_VENDOR_ID, number) hdrs = (version, OFPT_VENDOR, 0, ONF_VENDOR_ID, number)
elif type_ == 'ONFST' and name.endswith('_REQUEST'): elif type_ == 'ONFST' and name.endswith('_REQUEST'):
if version == VERSION["1.0"]: if version == VERSION["1.0"]:

16
include/openflow/nicira-ext.h
View File

@@ -68,14 +68,6 @@ struct nx_vendor_error {
/* Nicira vendor requests and replies. */ /* Nicira vendor requests and replies. */
/* Header for Nicira vendor requests and replies. */
struct nicira_header {
struct ofp_header header;
ovs_be32 vendor; /* NX_VENDOR_ID. */
ovs_be32 subtype; /* See the NXT numbers in ofp-msgs.h. */
};
OFP_ASSERT(sizeof(struct nicira_header) == 16);
/* Header for Nicira vendor stats request and reply messages in OpenFlow /* Header for Nicira vendor stats request and reply messages in OpenFlow
* 1.0. */ * 1.0. */
struct nicira10_stats_msg { struct nicira10_stats_msg {
@@ -85,14 +77,6 @@ struct nicira10_stats_msg {
}; };
OFP_ASSERT(sizeof(struct nicira10_stats_msg) == 24); OFP_ASSERT(sizeof(struct nicira10_stats_msg) == 24);
/* Header for Nicira vendor stats request and reply messages in OpenFlow
* 1.1. */
struct nicira11_stats_msg {
struct ofp11_vendor_stats_msg vsm; /* Vendor NX_VENDOR_ID. */
ovs_be32 subtype; /* One of NXST_* below. */
};
OFP_ASSERT(sizeof(struct nicira11_stats_msg) == 24);
/* Fields to use when hashing flows. */ /* Fields to use when hashing flows. */
enum nx_hash_fields { enum nx_hash_fields {
/* Ethernet source address (NXM_OF_ETH_SRC) only. */ /* Ethernet source address (NXM_OF_ETH_SRC) only. */

11
include/openflow/openflow-1.1.h
View File

@@ -391,17 +391,6 @@ struct ofp11_stats_msg {
}; };
OFP_ASSERT(sizeof(struct ofp11_stats_msg) == 16); OFP_ASSERT(sizeof(struct ofp11_stats_msg) == 16);
/* Vendor extension stats message. */
struct ofp11_vendor_stats_msg {
struct ofp11_stats_msg osm; /* Type OFPST_VENDOR. */
ovs_be32 vendor; /* Vendor ID:
* - MSB 0: low-order bytes are IEEE OUI.
* - MSB != 0: defined by OpenFlow
* consortium. */
/* Followed by vendor-defined arbitrary additional data. */
};
OFP_ASSERT(sizeof(struct ofp11_vendor_stats_msg) == 20);
/* Stats request of type OFPST_FLOW. */ /* Stats request of type OFPST_FLOW. */
struct ofp11_flow_stats_request { struct ofp11_flow_stats_request {
uint8_t table_id; /* ID of table to read (from ofp_table_stats), uint8_t table_id; /* ID of table to read (from ofp_table_stats),

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

@@ -428,17 +428,6 @@ struct ofp_hello_elem_header {
}; };
OFP_ASSERT(sizeof(struct ofp_hello_elem_header) == 4); OFP_ASSERT(sizeof(struct ofp_hello_elem_header) == 4);
/* Vendor extension. */
struct ofp_vendor_header {
struct ofp_header header; /* Type OFPT_VENDOR or OFPT_EXPERIMENTER. */
ovs_be32 vendor; /* Vendor ID:
* - MSB 0: low-order bytes are IEEE OUI.
* - MSB != 0: defined by OpenFlow
* consortium. */
/* Vendor-defined arbitrary additional data. */
};
OFP_ASSERT(sizeof(struct ofp_vendor_header) == 12);
/* Table numbering. Tables can use any number up to OFPT_MAX. */ /* Table numbering. Tables can use any number up to OFPT_MAX. */
enum ofp_table { enum ofp_table {
/* Last usable table number. */ /* Last usable table number. */

75
lib/ofp-msgs.c
View File

@@ -35,6 +35,39 @@ VLOG_DEFINE_THIS_MODULE(ofp_msgs);
#define OFPT11_STATS_REPLY 19 #define OFPT11_STATS_REPLY 19
#define OFPST_VENDOR 0xffff #define OFPST_VENDOR 0xffff
/* Vendor extension message. */
struct ofp_vendor_header {
struct ofp_header header; /* OFPT_VENDOR. */
ovs_be32 vendor; /* Vendor ID:
* - MSB 0: low-order bytes are IEEE OUI.
* - MSB != 0: defined by OpenFlow
* consortium. */
/* In theory everything after 'vendor' is vendor specific. In practice,
* the vendors we support put a 32-bit subtype here. We'll change this
* structure if we start adding support for other vendor formats. */
ovs_be32 subtype; /* Vendor-specific subtype. */
/* Followed by vendor-defined additional data. */
};
OFP_ASSERT(sizeof(struct ofp_vendor_header) == 16);
/* Vendor extension stats message. */
struct ofp11_vendor_stats_msg {
struct ofp11_stats_msg osm; /* Type OFPST_VENDOR. */
ovs_be32 vendor; /* Vendor ID:
* - MSB 0: low-order bytes are IEEE OUI.
* - MSB != 0: defined by OpenFlow
* consortium. */
/* In theory everything after 'vendor' is vendor specific. In practice,
* the vendors we support put a 32-bit subtype here. We'll change this
* structure if we start adding support for other vendor formats. */
ovs_be32 subtype; /* Vendor-specific subtype. */
/* Followed by vendor-defined additional data. */
};
OFP_ASSERT(sizeof(struct ofp11_vendor_stats_msg) == 24);
/* A thin abstraction of OpenFlow headers: /* A thin abstraction of OpenFlow headers:
* *
* - 'version' and 'type' come straight from struct ofp_header, so these are * - 'version' and 'type' come straight from struct ofp_header, so these are
@@ -159,15 +192,8 @@ ofphdrs_decode(struct ofphdrs *hdrs,
ovh = (const struct ofp_vendor_header *) oh; ovh = (const struct ofp_vendor_header *) oh;
hdrs->vendor = ntohl(ovh->vendor); hdrs->vendor = ntohl(ovh->vendor);
if (hdrs->vendor == NX_VENDOR_ID) { if (hdrs->vendor == NX_VENDOR_ID || hdrs->vendor == ONF_VENDOR_ID) {
/* Get Nicira message subtype (NXT_*). */ hdrs->subtype = ntohl(ovh->subtype);
const struct nicira_header *nh;
if (length < sizeof *nh) {
return OFPERR_OFPBRC_BAD_LEN;
}
nh = (const struct nicira_header *) oh;
hdrs->subtype = ntohl(nh->subtype);
} else { } else {
log_bad_vendor(hdrs->vendor); log_bad_vendor(hdrs->vendor);
return OFPERR_OFPBRC_BAD_VENDOR; return OFPERR_OFPBRC_BAD_VENDOR;
@@ -230,15 +256,9 @@ ofphdrs_decode(struct ofphdrs *hdrs,
ovsm = (const struct ofp11_vendor_stats_msg *) oh; ovsm = (const struct ofp11_vendor_stats_msg *) oh;
hdrs->vendor = ntohl(ovsm->vendor); hdrs->vendor = ntohl(ovsm->vendor);
if (hdrs->vendor == NX_VENDOR_ID) { if (hdrs->vendor == NX_VENDOR_ID ||
/* Get Nicira statistic type (NXST_*). */ hdrs->vendor == ONF_VENDOR_ID) {
const struct nicira11_stats_msg *nsm; hdrs->subtype = ntohl(ovsm->subtype);
if (length < sizeof *nsm) {
return OFPERR_OFPBRC_BAD_LEN;
}
nsm = (const struct nicira11_stats_msg *) oh;
hdrs->subtype = ntohl(nsm->subtype);
} else { } else {
log_bad_vendor(hdrs->vendor); log_bad_vendor(hdrs->vendor);
return OFPERR_OFPBRC_BAD_VENDOR; return OFPERR_OFPBRC_BAD_VENDOR;
@@ -308,7 +328,7 @@ size_t
ofphdrs_len(const struct ofphdrs *hdrs) ofphdrs_len(const struct ofphdrs *hdrs)
{ {
if (hdrs->type == OFPT_VENDOR) { if (hdrs->type == OFPT_VENDOR) {
return sizeof(struct nicira_header); return sizeof(struct ofp_vendor_header);
} }
switch ((enum ofp_version) hdrs->version) { switch ((enum ofp_version) hdrs->version) {
@@ -329,7 +349,7 @@ ofphdrs_len(const struct ofphdrs *hdrs)
if (hdrs->type == OFPT11_STATS_REQUEST || if (hdrs->type == OFPT11_STATS_REQUEST ||
hdrs->type == OFPT11_STATS_REPLY) { hdrs->type == OFPT11_STATS_REPLY) {
return (hdrs->stat == OFPST_VENDOR return (hdrs->stat == OFPST_VENDOR
? sizeof(struct nicira11_stats_msg) ? sizeof(struct ofp11_vendor_stats_msg)
: sizeof(struct ofp11_stats_msg)); : sizeof(struct ofp11_stats_msg));
} }
break; break;
@@ -675,11 +695,10 @@ ofpraw_put__(enum ofpraw raw, uint8_t version, ovs_be32 xid,
oh->xid = xid; oh->xid = xid;
if (hdrs->type == OFPT_VENDOR) { if (hdrs->type == OFPT_VENDOR) {
struct nicira_header *nh = buf->header; struct ofp_vendor_header *ovh = buf->header;
ovs_assert(hdrs->vendor == NX_VENDOR_ID); ovh->vendor = htonl(hdrs->vendor);
nh->vendor = htonl(hdrs->vendor); ovh->subtype = htonl(hdrs->subtype);
nh->subtype = htonl(hdrs->subtype);
} else if (version == OFP10_VERSION } else if (version == OFP10_VERSION
&& (hdrs->type == OFPT10_STATS_REQUEST || && (hdrs->type == OFPT10_STATS_REQUEST ||
hdrs->type == OFPT10_STATS_REPLY)) { hdrs->type == OFPT10_STATS_REPLY)) {
@@ -714,13 +733,7 @@ ofpraw_put__(enum ofpraw raw, uint8_t version, ovs_be32 xid,
struct ofp11_vendor_stats_msg *ovsm = buf->header; struct ofp11_vendor_stats_msg *ovsm = buf->header;
ovsm->vendor = htonl(hdrs->vendor); ovsm->vendor = htonl(hdrs->vendor);
if (hdrs->vendor == NX_VENDOR_ID) { ovsm->subtype = htonl(hdrs->subtype);
struct nicira11_stats_msg *nsm = buf->header;
nsm->subtype = htonl(hdrs->subtype);
} else {
OVS_NOT_REACHED();
}
} }
} }
} }

17
lib/ofp-msgs.h
View File

@@ -60,9 +60,14 @@ struct ovs_list;
* *
* where the syntax of each part is: * where the syntax of each part is:
* *
* - type: One of OFPT (standard OpenFlow message), OFPST (standard OpenFlow * - type: One of the following:
* statistics message), NXT (Nicira extension message), or NXST (Nicira *
* extension statistics message). * * OFPT: standard OpenFlow message.
* * OFPST: standard OpenFlow statistics or multipart message.
* * NXT: Nicira extension message.
* * NXST: Nicira extension statistics or multipart message.
* * ONFT: Open Networking Foundation extension message.
* * ONFST: Open Networking Foundation multipart message.
* *
* As new vendors implement extensions it will make sense to expand the * As new vendors implement extensions it will make sense to expand the
* dictionary of possible types. * dictionary of possible types.
@@ -73,9 +78,9 @@ struct ovs_list;
* - number: * - number:
* For OFPT, the 'type' in struct ofp_header. * For OFPT, the 'type' in struct ofp_header.
* For OFPST, the 'type' in struct ofp_stats_msg or ofp11_stats_msg. * For OFPST, the 'type' in struct ofp_stats_msg or ofp11_stats_msg.
* For NXT, the 'subtype' in struct nicira_header. * For NXT or ONFT, the 'subtype' in struct ofp_vendor_header.
* For NXST, the 'subtype' in struct nicira10_stats_msg or * For NXST or ONFST, the 'subtype' in an appropriate vendor stats
* nicira11_stats_msg. * struct.
* *
* - arguments: The types of data that follow the OpenFlow headers (the * - arguments: The types of data that follow the OpenFlow headers (the
* message "body"). This can be "void" if the message has no body. * message "body"). This can be "void" if the message has no body.