/*
- * Copyright (c) 2008-2017 Nicira, Inc.
+ * Copyright (c) 2008-2017, 2019-2020 Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*/
#include <config.h>
+
+#include <sys/types.h>
#include <netinet/in.h>
#include "bundle.h"
#include "openvswitch/dynamic-string.h"
#include "openvswitch/meta-flow.h"
#include "openvswitch/ofp-actions.h"
-#include "openvswitch/ofp-util.h"
+#include "openvswitch/ofp-packet.h"
#include "openvswitch/ofp-parse.h"
+#include "openvswitch/ofp-port.h"
#include "openvswitch/ofp-prop.h"
+#include "openvswitch/ofp-table.h"
#include "openvswitch/ofpbuf.h"
#include "openvswitch/vlog.h"
#include "unaligned.h"
/* NX1.0-1.4(6): struct nx_action_reg_move, ... VLMFF */
NXAST_RAW_REG_MOVE,
+ /* OF1.5+(29): uint32_t. */
+ OFPAT_RAW15_METER,
+
/* ## ------------------------- ## */
/* ## Nicira extension actions. ## */
/* ## ------------------------- ## */
/* NX1.0+(43): void. */
NXAST_RAW_CT_CLEAR,
+ /* NX1.3+(46): struct nx_action_encap, ... */
+ NXAST_RAW_ENCAP,
+
+ /* NX1.3+(47): struct nx_action_decap, ... */
+ NXAST_RAW_DECAP,
+
+ /* NX1.3+(48): void. */
+ NXAST_RAW_DEC_NSH_TTL,
+
+ /* NX1.0+(49): struct nx_action_check_pkt_larger, ... VLMFF */
+ NXAST_RAW_CHECK_PKT_LARGER,
+
+ /* NX1.0+(50): struct nx_action_delete_field. VLMFF */
+ NXAST_RAW_DELETE_FIELD,
+
/* ## ------------------ ## */
/* ## Debugging actions. ## */
/* ## ------------------ ## */
/* These are intentionally undocumented, subject to change, and ovs-vswitchd */
/* accepts them only if started with --enable-dummy. */
+ /* NX1.0+(254): void. */
+ NXAST_RAW_DEBUG_SLOW,
+
/* NX1.0+(255): void. */
NXAST_RAW_DEBUG_RECIRC,
};
static void pad_ofpat(struct ofpbuf *openflow, size_t start_ofs);
static enum ofperr ofpacts_verify(const struct ofpact[], size_t ofpacts_len,
- uint32_t allowed_ovsinsts,
- enum ofpact_type outer_action);
+ enum ofp_version, uint32_t allowed_ovsinsts,
+ enum ofpact_type outer_action,
+ char **errorp);
static void put_set_field(struct ofpbuf *openflow, enum ofp_version,
enum mf_field_id, uint64_t value);
enum ofp_raw_action_type, uint64_t arg);
static char *OVS_WARN_UNUSED_RESULT ofpacts_parse(
- char *str, struct ofpbuf *ofpacts, enum ofputil_protocol *usable_protocols,
+ char *str, const struct ofpact_parse_params *pp,
bool allow_instructions, enum ofpact_type outer_action);
static enum ofperr ofpacts_pull_openflow_actions__(
struct ofpbuf *openflow, unsigned int actions_len,
struct ofpbuf *ofpacts, enum ofpact_type outer_action,
const struct vl_mff_map *vl_mff_map, uint64_t *ofpacts_tlv_bitmap);
static char * OVS_WARN_UNUSED_RESULT ofpacts_parse_copy(
- const char *s_, struct ofpbuf *ofpacts,
- enum ofputil_protocol *usable_protocols,
+ const char *s_, const struct ofpact_parse_params *pp,
bool allow_instructions, enum ofpact_type outer_action);
+static void inconsistent_match(enum ofputil_protocol *usable_protocols);
+
/* Returns the ofpact following 'ofpact', except that if 'ofpact' contains
* nested ofpacts it returns the first one. */
struct ofpact *
case OFPACT_UNROLL_XLATE:
case OFPACT_CT_CLEAR:
case OFPACT_DEBUG_RECIRC:
+ case OFPACT_DEBUG_SLOW:
case OFPACT_METER:
case OFPACT_CLEAR_ACTIONS:
case OFPACT_WRITE_METADATA:
case OFPACT_GOTO_TABLE:
case OFPACT_NAT:
+ case OFPACT_ENCAP:
+ case OFPACT_DECAP:
+ case OFPACT_DEC_NSH_TTL:
+ case OFPACT_CHECK_PKT_LARGER:
+ case OFPACT_DELETE_FIELD:
return ofpact_next(ofpact);
case OFPACT_CLONE:
}
static char * OVS_WARN_UNUSED_RESULT
-parse_truncate_subfield(struct ofpact_output_trunc *output_trunc,
- const char *arg_)
+parse_truncate_subfield(const char *arg_,
+ const struct ofpact_parse_params *pp,
+ struct ofpact_output_trunc *output_trunc)
{
char *key, *value;
char *arg = CONST_CAST(char *, arg_);
while (ofputil_parse_key_value(&arg, &key, &value)) {
if (!strcmp(key, "port")) {
- if (!ofputil_port_from_string(value, &output_trunc->port)) {
+ if (!ofputil_port_from_string(value, pp->port_map,
+ &output_trunc->port)) {
return xasprintf("output to unknown truncate port: %s",
value);
}
if (err) {
return err;
}
+
+ if (output_trunc->max_len < ETH_HEADER_LEN) {
+ return xasprintf("max_len %"PRIu32" is less than the minimum "
+ "value %d",
+ output_trunc->max_len, ETH_HEADER_LEN);
+ }
} else {
return xasprintf("invalid key '%s' in output_trunc argument",
key);
}
static char * OVS_WARN_UNUSED_RESULT
-parse_OUTPUT(const char *arg, struct ofpbuf *ofpacts,
- enum ofputil_protocol *usable_protocols OVS_UNUSED)
+parse_OUTPUT(const char *arg, const struct ofpact_parse_params *pp)
{
if (strstr(arg, "port") && strstr(arg, "max_len")) {
struct ofpact_output_trunc *output_trunc;
- output_trunc = ofpact_put_OUTPUT_TRUNC(ofpacts);
- return parse_truncate_subfield(output_trunc, arg);
- } else {
- struct mf_subfield src;
- char *error = mf_parse_subfield(&src, arg);
- if (!error) {
- struct ofpact_output_reg *output_reg;
+ output_trunc = ofpact_put_OUTPUT_TRUNC(pp->ofpacts);
+ return parse_truncate_subfield(arg, pp, output_trunc);
+ }
- output_reg = ofpact_put_OUTPUT_REG(ofpacts);
- output_reg->max_len = UINT16_MAX;
- output_reg->src = src;
- } else {
- free(error);
- struct ofpact_output *output;
+ ofp_port_t port;
+ if (ofputil_port_from_string(arg, pp->port_map, &port)) {
+ struct ofpact_output *output = ofpact_put_OUTPUT(pp->ofpacts);
+ output->port = port;
+ output->max_len = output->port == OFPP_CONTROLLER ? UINT16_MAX : 0;
+ return NULL;
+ }
- output = ofpact_put_OUTPUT(ofpacts);
- if (!ofputil_port_from_string(arg, &output->port)) {
- return xasprintf("%s: output to unknown port", arg);
- }
- output->max_len = output->port == OFPP_CONTROLLER ? UINT16_MAX : 0;
- }
+ struct mf_subfield src;
+ char *error = mf_parse_subfield(&src, arg);
+ if (!error) {
+ struct ofpact_output_reg *output_reg;
+
+ output_reg = ofpact_put_OUTPUT_REG(pp->ofpacts);
+ output_reg->max_len = UINT16_MAX;
+ output_reg->src = src;
return NULL;
}
+ free(error);
+
+ return xasprintf("%s: output to unknown port", arg);
}
static void
-format_OUTPUT(const struct ofpact_output *a, struct ds *s)
+format_OUTPUT(const struct ofpact_output *a,
+ const struct ofpact_format_params *fp)
{
if (ofp_to_u16(a->port) < ofp_to_u16(OFPP_MAX)) {
- ds_put_format(s, "%soutput:%s%"PRIu32,
- colors.special, colors.end, a->port);
- } else {
- ofputil_format_port(a->port, s);
- if (a->port == OFPP_CONTROLLER) {
- ds_put_format(s, ":%"PRIu16, a->max_len);
- }
+ ds_put_format(fp->s, "%soutput:%s", colors.special, colors.end);
}
+ ofputil_format_port(a->port, fp->port_map, fp->s);
+ if (a->port == OFPP_CONTROLLER) {
+ ds_put_format(fp->s, ":%"PRIu16, a->max_len);
+ }
+}
+
+static enum ofperr
+check_OUTPUT(const struct ofpact_output *a,
+ const struct ofpact_check_params *cp)
+{
+ return ofpact_check_output_port(a->port, cp->max_ports);
}
\f
/* Group actions. */
}
static char * OVS_WARN_UNUSED_RESULT
-parse_GROUP(char *arg, struct ofpbuf *ofpacts,
- enum ofputil_protocol *usable_protocols OVS_UNUSED)
+parse_GROUP(char *arg, const struct ofpact_parse_params *pp)
{
- return str_to_u32(arg, &ofpact_put_GROUP(ofpacts)->group_id);
+ return str_to_u32(arg, &ofpact_put_GROUP(pp->ofpacts)->group_id);
}
static void
-format_GROUP(const struct ofpact_group *a, struct ds *s)
+format_GROUP(const struct ofpact_group *a,
+ const struct ofpact_format_params *fp)
{
- ds_put_format(s, "%sgroup:%s%"PRIu32,
+ ds_put_format(fp->s, "%sgroup:%s%"PRIu32,
colors.special, colors.end, a->group_id);
}
+
+static enum ofperr
+check_GROUP(const struct ofpact_group *a OVS_UNUSED,
+ const struct ofpact_check_params *cp OVS_UNUSED)
+{
+ return 0;
+}
\f
/* Action structure for NXAST_CONTROLLER.
*
NXAC2PT_REASON, /* uint8_t reason (OFPR_*), default 0. */
NXAC2PT_USERDATA, /* Data to copy into NXPINT_USERDATA. */
NXAC2PT_PAUSE, /* Flag to pause pipeline to resume later. */
+ NXAC2PT_METER_ID, /* ovs_b32 meter (default NX_CTLR_NO_METER). */
};
/* The action structure for NXAST_CONTROLLER2 is "struct ext_action_header",
oc->max_len = ntohs(nac->max_len);
oc->controller_id = ntohs(nac->controller_id);
oc->reason = nac->reason;
+ oc->meter_id = NX_CTLR_NO_METER;
ofpact_finish_CONTROLLER(out, &oc);
return 0;
oc->ofpact.raw = NXAST_RAW_CONTROLLER2;
oc->max_len = UINT16_MAX;
oc->reason = OFPR_ACTION;
+ oc->meter_id = NX_CTLR_NO_METER;
struct ofpbuf properties;
ofpbuf_use_const(&properties, eah, ntohs(eah->len));
}
case NXAC2PT_USERDATA:
- out->size = start_ofs + OFPACT_CONTROLLER_SIZE;
+ out->size = start_ofs + sizeof(struct ofpact_controller);
ofpbuf_put(out, payload.msg, ofpbuf_msgsize(&payload));
oc = ofpbuf_at_assert(out, start_ofs, sizeof *oc);
oc->userdata_len = ofpbuf_msgsize(&payload);
oc->pause = true;
break;
+ case NXAC2PT_METER_ID:
+ error = ofpprop_parse_u32(&payload, &oc->meter_id);
+ break;
+
default:
error = OFPPROP_UNKNOWN(false, "NXAST_RAW_CONTROLLER2", type);
break;
{
if (controller->userdata_len
|| controller->pause
+ || controller->meter_id != NX_CTLR_NO_METER
|| controller->ofpact.raw == NXAST_RAW_CONTROLLER2) {
size_t start_ofs = out->size;
put_NXAST_CONTROLLER2(out);
if (controller->pause) {
ofpprop_put_flag(out, NXAC2PT_PAUSE);
}
+ if (controller->meter_id != NX_CTLR_NO_METER) {
+ ofpprop_put_u32(out, NXAC2PT_METER_ID, controller->meter_id);
+ }
pad_ofpat(out, start_ofs);
} else {
struct nx_action_controller *nac;
}
static char * OVS_WARN_UNUSED_RESULT
-parse_CONTROLLER(char *arg, struct ofpbuf *ofpacts,
- enum ofputil_protocol *usable_protocols OVS_UNUSED)
+parse_CONTROLLER(char *arg, const struct ofpact_parse_params *pp)
{
enum ofp_packet_in_reason reason = OFPR_ACTION;
uint16_t controller_id = 0;
uint16_t max_len = UINT16_MAX;
+ uint32_t meter_id = NX_CTLR_NO_METER;
const char *userdata = NULL;
bool pause = false;
userdata = value;
} else if (!strcmp(name, "pause")) {
pause = true;
+ } else if (!strcmp(name, "meter_id")) {
+ char *error = str_to_u32(value, &meter_id);
+ if (error) {
+ return error;
+ }
} else {
return xasprintf("unknown key \"%s\" parsing controller "
"action", name);
}
}
- if (reason == OFPR_ACTION && controller_id == 0 && !userdata && !pause) {
+ if (reason == OFPR_ACTION && controller_id == 0 && !userdata && !pause
+ && meter_id == NX_CTLR_NO_METER) {
struct ofpact_output *output;
- output = ofpact_put_OUTPUT(ofpacts);
+ output = ofpact_put_OUTPUT(pp->ofpacts);
output->port = OFPP_CONTROLLER;
output->max_len = max_len;
} else {
struct ofpact_controller *controller;
- controller = ofpact_put_CONTROLLER(ofpacts);
+ controller = ofpact_put_CONTROLLER(pp->ofpacts);
controller->max_len = max_len;
controller->reason = reason;
controller->controller_id = controller_id;
controller->pause = pause;
+ controller->meter_id = meter_id;
if (userdata) {
- size_t start_ofs = ofpacts->size;
- const char *end = ofpbuf_put_hex(ofpacts, userdata, NULL);
+ size_t start_ofs = pp->ofpacts->size;
+ const char *end = ofpbuf_put_hex(pp->ofpacts, userdata, NULL);
if (*end) {
return xstrdup("bad hex digit in `controller' "
"action `userdata'");
}
- size_t userdata_len = ofpacts->size - start_ofs;
- controller = ofpacts->header;
+ size_t userdata_len = pp->ofpacts->size - start_ofs;
+ controller = pp->ofpacts->header;
controller->userdata_len = userdata_len;
}
- ofpact_finish_CONTROLLER(ofpacts, &controller);
+
+ if (ofpbuf_oversized(pp->ofpacts)) {
+ return xasprintf("input too big");
+ }
+
+ ofpact_finish_CONTROLLER(pp->ofpacts, &controller);
}
return NULL;
}
static void
-format_CONTROLLER(const struct ofpact_controller *a, struct ds *s)
+format_CONTROLLER(const struct ofpact_controller *a,
+ const struct ofpact_format_params *fp)
{
if (a->reason == OFPR_ACTION && !a->controller_id && !a->userdata_len
- && !a->pause) {
- ds_put_format(s, "%sCONTROLLER:%s%"PRIu16,
+ && !a->pause && a->meter_id == NX_CTLR_NO_METER) {
+ ds_put_format(fp->s, "%sCONTROLLER:%s%"PRIu16,
colors.special, colors.end, a->max_len);
} else {
enum ofp_packet_in_reason reason = a->reason;
- ds_put_format(s, "%scontroller(%s", colors.paren, colors.end);
+ ds_put_format(fp->s, "%scontroller(%s", colors.paren, colors.end);
if (reason != OFPR_ACTION) {
char reasonbuf[OFPUTIL_PACKET_IN_REASON_BUFSIZE];
- ds_put_format(s, "%sreason=%s%s,", colors.param, colors.end,
+ ds_put_format(fp->s, "%sreason=%s%s,", colors.param, colors.end,
ofputil_packet_in_reason_to_string(
reason, reasonbuf, sizeof reasonbuf));
}
if (a->max_len != UINT16_MAX) {
- ds_put_format(s, "%smax_len=%s%"PRIu16",",
+ ds_put_format(fp->s, "%smax_len=%s%"PRIu16",",
colors.param, colors.end, a->max_len);
}
if (a->controller_id != 0) {
- ds_put_format(s, "%sid=%s%"PRIu16",",
+ ds_put_format(fp->s, "%sid=%s%"PRIu16",",
colors.param, colors.end, a->controller_id);
}
if (a->userdata_len) {
- ds_put_format(s, "%suserdata=%s", colors.param, colors.end);
- format_hex_arg(s, a->userdata, a->userdata_len);
- ds_put_char(s, ',');
+ ds_put_format(fp->s, "%suserdata=%s", colors.param, colors.end);
+ format_hex_arg(fp->s, a->userdata, a->userdata_len);
+ ds_put_char(fp->s, ',');
}
if (a->pause) {
- ds_put_format(s, "%spause%s,", colors.value, colors.end);
+ ds_put_format(fp->s, "%spause%s,", colors.value, colors.end);
}
- ds_chomp(s, ',');
- ds_put_format(s, "%s)%s", colors.paren, colors.end);
+ if (a->meter_id != NX_CTLR_NO_METER) {
+ ds_put_format(fp->s, "%smeter_id=%s%"PRIu32",",
+ colors.param, colors.end, a->meter_id);
+ }
+ ds_chomp(fp->s, ',');
+ ds_put_format(fp->s, "%s)%s", colors.paren, colors.end);
}
}
+
+static enum ofperr
+check_CONTROLLER(const struct ofpact_controller *a OVS_UNUSED,
+ const struct ofpact_check_params *cp OVS_UNUSED)
+{
+ return 0;
+}
\f
/* Enqueue action. */
struct ofp10_action_enqueue {
}
static char * OVS_WARN_UNUSED_RESULT
-parse_ENQUEUE(char *arg, struct ofpbuf *ofpacts,
- enum ofputil_protocol *usable_protocols OVS_UNUSED)
+parse_ENQUEUE(char *arg, const struct ofpact_parse_params *pp)
{
char *sp = NULL;
char *port = strtok_r(arg, ":q,", &sp);
"\"enqueue(PORT,QUEUE)\"");
}
- enqueue = ofpact_put_ENQUEUE(ofpacts);
- if (!ofputil_port_from_string(port, &enqueue->port)) {
+ enqueue = ofpact_put_ENQUEUE(pp->ofpacts);
+ if (!ofputil_port_from_string(port, pp->port_map, &enqueue->port)) {
return xasprintf("%s: enqueue to unknown port", port);
}
return str_to_u32(queue, &enqueue->queue);
}
static void
-format_ENQUEUE(const struct ofpact_enqueue *a, struct ds *s)
+format_ENQUEUE(const struct ofpact_enqueue *a,
+ const struct ofpact_format_params *fp)
+{
+ ds_put_format(fp->s, "%senqueue:%s", colors.param, colors.end);
+ ofputil_format_port(a->port, fp->port_map, fp->s);
+ ds_put_format(fp->s, ":%"PRIu32, a->queue);
+}
+
+static enum ofperr
+check_ENQUEUE(const struct ofpact_enqueue *a,
+ const struct ofpact_check_params *cp)
{
- ds_put_format(s, "%senqueue:%s", colors.param, colors.end);
- ofputil_format_port(a->port, s);
- ds_put_format(s, ":%"PRIu32, a->queue);
+ if (ofp_to_u16(a->port) >= ofp_to_u16(cp->max_ports)
+ && a->port != OFPP_IN_PORT
+ && a->port != OFPP_LOCAL) {
+ return OFPERR_OFPBAC_BAD_OUT_PORT;
+ }
+ return 0;
}
\f
/* Action structure for NXAST_OUTPUT_REG.
}
static char * OVS_WARN_UNUSED_RESULT
-parse_OUTPUT_REG(const char *arg, struct ofpbuf *ofpacts,
- enum ofputil_protocol *usable_protocols OVS_UNUSED)
+parse_OUTPUT_REG(const char *arg, const struct ofpact_parse_params *pp)
{
- return parse_OUTPUT(arg, ofpacts, usable_protocols);
+ return parse_OUTPUT(arg, pp);
}
static void
-format_OUTPUT_REG(const struct ofpact_output_reg *a, struct ds *s)
+format_OUTPUT_REG(const struct ofpact_output_reg *a,
+ const struct ofpact_format_params *fp)
+{
+ ds_put_format(fp->s, "%soutput:%s", colors.special, colors.end);
+ mf_format_subfield(&a->src, fp->s);
+}
+
+static enum ofperr
+check_OUTPUT_REG(const struct ofpact_output_reg *a,
+ const struct ofpact_check_params *cp)
{
- ds_put_format(s, "%soutput:%s", colors.special, colors.end);
- mf_format_subfield(&a->src, s);
+ return mf_check_src(&a->src, cp->match);
}
\f
/* Action structure for NXAST_BUNDLE and NXAST_BUNDLE_LOAD.
*
- * The bundle actions choose a slave from a supplied list of options.
+ * The bundle actions choose a member from a supplied list of options.
* NXAST_BUNDLE outputs to its selection. NXAST_BUNDLE_LOAD writes its
* selection to a register.
*
- * The list of possible slaves follows the nx_action_bundle structure. The size
- * of each slave is governed by its type as indicated by the 'slave_type'
- * parameter. The list of slaves should be padded at its end with zeros to make
- * the total length of the action a multiple of 8.
+ * The list of possible members follows the nx_action_bundle structure. The
+ * size of each member is governed by its type as indicated by the
+ * 'member_type' parameter. The list of members should be padded at its end
+ * with zeros to make the total length of the action a multiple of 8.
*
- * Switches infer from the 'slave_type' parameter the size of each slave. All
- * implementations must support the NXM_OF_IN_PORT 'slave_type' which indicates
- * that the slaves are OpenFlow port numbers with NXM_LENGTH(NXM_OF_IN_PORT) ==
- * 2 byte width. Switches should reject actions which indicate unknown or
- * unsupported slave types.
+ * Switches infer from the 'member_type' parameter the size of each member.
+ * All implementations must support the NXM_OF_IN_PORT 'member_type' which
+ * indicates that the members are OpenFlow port numbers with
+ * NXM_LENGTH(NXM_OF_IN_PORT) == 2 byte width. Switches should reject actions
+ * which indicate unknown or unsupported member types.
*
* Switches use a strategy dictated by the 'algorithm' parameter to choose a
- * slave. If the switch does not support the specified 'algorithm' parameter,
+ * member. If the switch does not support the specified 'algorithm' parameter,
* it should reject the action.
*
- * Several algorithms take into account liveness when selecting slaves. The
- * liveness of a slave is implementation defined (with one exception), but will
- * generally take into account things like its carrier status and the results
- * of any link monitoring protocols which happen to be running on it. In order
- * to give controllers a place-holder value, the OFPP_NONE port is always
- * considered live, that is, NXAST_BUNDLE_LOAD stores OFPP_NONE in the output
- * register if no slave is live.
- *
- * Some slave selection strategies require the use of a hash function, in which
- * case the 'fields' and 'basis' parameters should be populated. The 'fields'
- * parameter (one of NX_HASH_FIELDS_*) designates which parts of the flow to
- * hash. Refer to the definition of "enum nx_hash_fields" for details. The
- * 'basis' parameter is used as a universal hash parameter. Different values
- * of 'basis' yield different hash results.
+ * Several algorithms take into account liveness when selecting members. The
+ * liveness of a member is implementation defined (with one exception), but
+ * will generally take into account things like its carrier status and the
+ * results of any link monitoring protocols which happen to be running on it.
+ * In order to give controllers a place-holder value, the OFPP_NONE port is
+ * always considered live, that is, NXAST_BUNDLE_LOAD stores OFPP_NONE in the
+ * output register if no member is live.
+ *
+ * Some member selection strategies require the use of a hash function, in
+ * which case the 'fields' and 'basis' parameters should be populated. The
+ * 'fields' parameter (one of NX_HASH_FIELDS_*) designates which parts of the
+ * flow to hash. Refer to the definition of "enum nx_hash_fields" for details.
+ * The 'basis' parameter is used as a universal hash parameter. Different
+ * values of 'basis' yield different hash results.
*
* The 'zero' parameter at the end of the action structure is reserved for
* future use. Switches are required to reject actions which have nonzero
* NXAST_BUNDLE actions should have 'ofs_nbits' and 'dst' zeroed. Switches
* should reject actions which have nonzero bytes in either of these fields.
*
- * NXAST_BUNDLE_LOAD stores the OpenFlow port number of the selected slave in
+ * NXAST_BUNDLE_LOAD stores the OpenFlow port number of the selected member in
* dst[ofs:ofs+n_bits]. The format and semantics of 'dst' and 'ofs_nbits' are
* similar to those for the NXAST_REG_LOAD action. */
struct nx_action_bundle {
ovs_be16 type; /* OFPAT_VENDOR. */
- ovs_be16 len; /* Length including slaves. */
+ ovs_be16 len; /* Length including members. */
ovs_be32 vendor; /* NX_VENDOR_ID. */
ovs_be16 subtype; /* NXAST_BUNDLE or NXAST_BUNDLE_LOAD. */
- /* Slave choice algorithm to apply to hash value. */
+ /* Member choice algorithm to apply to hash value. */
ovs_be16 algorithm; /* One of NX_BD_ALG_*. */
/* What fields to hash and how. */
ovs_be16 fields; /* One of NX_HASH_FIELDS_*. */
ovs_be16 basis; /* Universal hash parameter. */
- ovs_be32 slave_type; /* NXM_OF_IN_PORT. */
- ovs_be16 n_slaves; /* Number of slaves. */
+ ovs_be32 member_type; /* NXM_OF_IN_PORT. */
+ ovs_be16 n_members; /* Number of members. */
ovs_be16 ofs_nbits; /* (ofs << 6) | (n_bits - 1). */
ovs_be32 dst; /* Destination. */
const struct vl_mff_map *vl_mff_map, uint64_t *tlv_bitmap,
struct ofpbuf *ofpacts)
{
- static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5);
+ static struct vlog_rate_limit rll = VLOG_RATE_LIMIT_INIT(1, 5);
struct ofpact_bundle *bundle;
- uint32_t slave_type;
- size_t slaves_size, i;
+ uint32_t member_type;
+ size_t members_size, i;
enum ofperr error;
bundle = ofpact_put_BUNDLE(ofpacts);
- bundle->n_slaves = ntohs(nab->n_slaves);
+ bundle->n_members = ntohs(nab->n_members);
bundle->basis = ntohs(nab->basis);
bundle->fields = ntohs(nab->fields);
bundle->algorithm = ntohs(nab->algorithm);
- slave_type = ntohl(nab->slave_type);
- slaves_size = ntohs(nab->len) - sizeof *nab;
+ member_type = ntohl(nab->member_type);
+ members_size = ntohs(nab->len) - sizeof *nab;
error = OFPERR_OFPBAC_BAD_ARGUMENT;
if (!flow_hash_fields_valid(bundle->fields)) {
- VLOG_WARN_RL(&rl, "unsupported fields %d", (int) bundle->fields);
- } else if (bundle->n_slaves > BUNDLE_MAX_SLAVES) {
- VLOG_WARN_RL(&rl, "too many slaves");
+ VLOG_WARN_RL(&rll, "unsupported fields %d", (int) bundle->fields);
+ } else if (bundle->n_members > BUNDLE_MAX_MEMBERS) {
+ VLOG_WARN_RL(&rll, "too many members");
} else if (bundle->algorithm != NX_BD_ALG_HRW
&& bundle->algorithm != NX_BD_ALG_ACTIVE_BACKUP) {
- VLOG_WARN_RL(&rl, "unsupported algorithm %d", (int) bundle->algorithm);
- } else if (slave_type != mf_nxm_header(MFF_IN_PORT)) {
- VLOG_WARN_RL(&rl, "unsupported slave type %"PRIu16, slave_type);
+ VLOG_WARN_RL(&rll, "unsupported algorithm %d", (int) bundle->algorithm);
+ } else if (member_type != mf_nxm_header(MFF_IN_PORT)) {
+ VLOG_WARN_RL(&rll, "unsupported member type %"PRIu32, member_type);
} else {
error = 0;
}
if (!is_all_zeros(nab->zero, sizeof nab->zero)) {
- VLOG_WARN_RL(&rl, "reserved field is nonzero");
+ VLOG_WARN_RL(&rll, "reserved field is nonzero");
error = OFPERR_OFPBAC_BAD_ARGUMENT;
}
}
if (bundle->dst.n_bits < 16) {
- VLOG_WARN_RL(&rl, "bundle_load action requires at least 16 bit "
+ VLOG_WARN_RL(&rll, "bundle_load action requires at least 16 bit "
"destination.");
error = OFPERR_OFPBAC_BAD_ARGUMENT;
}
} else {
if (nab->ofs_nbits || nab->dst) {
- VLOG_WARN_RL(&rl, "bundle action has nonzero reserved fields");
+ VLOG_WARN_RL(&rll, "bundle action has nonzero reserved fields");
error = OFPERR_OFPBAC_BAD_ARGUMENT;
}
}
- if (slaves_size < bundle->n_slaves * sizeof(ovs_be16)) {
- VLOG_WARN_RL(&rl, "Nicira action %s only has %"PRIuSIZE" bytes "
- "allocated for slaves. %"PRIuSIZE" bytes are required "
- "for %"PRIu16" slaves.",
- load ? "bundle_load" : "bundle", slaves_size,
- bundle->n_slaves * sizeof(ovs_be16), bundle->n_slaves);
+ if (members_size < bundle->n_members * sizeof(ovs_be16)) {
+ VLOG_WARN_RL(&rll, "Nicira action %s only has %"PRIuSIZE" bytes "
+ "allocated for members. %"PRIuSIZE" bytes are "
+ "required for %u members.",
+ load ? "bundle_load" : "bundle", members_size,
+ bundle->n_members * sizeof(ovs_be16), bundle->n_members);
error = OFPERR_OFPBAC_BAD_LEN;
- }
-
- for (i = 0; i < bundle->n_slaves; i++) {
- ofp_port_t ofp_port = u16_to_ofp(ntohs(((ovs_be16 *)(nab + 1))[i]));
- ofpbuf_put(ofpacts, &ofp_port, sizeof ofp_port);
- bundle = ofpacts->header;
+ } else {
+ for (i = 0; i < bundle->n_members; i++) {
+ ofp_port_t ofp_port
+ = u16_to_ofp(ntohs(((ovs_be16 *)(nab + 1))[i]));
+ ofpbuf_put(ofpacts, &ofp_port, sizeof ofp_port);
+ bundle = ofpacts->header;
+ }
}
ofpact_finish_BUNDLE(ofpacts, &bundle);
enum ofp_version ofp_version OVS_UNUSED,
struct ofpbuf *out)
{
- int slaves_len = ROUND_UP(2 * bundle->n_slaves, OFP_ACTION_ALIGN);
+ int members_len = ROUND_UP(2 * bundle->n_members, OFP_ACTION_ALIGN);
struct nx_action_bundle *nab;
- ovs_be16 *slaves;
+ ovs_be16 *members;
size_t i;
nab = (bundle->dst.field
? put_NXAST_BUNDLE_LOAD(out)
: put_NXAST_BUNDLE(out));
- nab->len = htons(ntohs(nab->len) + slaves_len);
+ nab->len = htons(ntohs(nab->len) + members_len);
nab->algorithm = htons(bundle->algorithm);
nab->fields = htons(bundle->fields);
nab->basis = htons(bundle->basis);
- nab->slave_type = htonl(mf_nxm_header(MFF_IN_PORT));
- nab->n_slaves = htons(bundle->n_slaves);
+ nab->member_type = htonl(mf_nxm_header(MFF_IN_PORT));
+ nab->n_members = htons(bundle->n_members);
if (bundle->dst.field) {
nab->ofs_nbits = nxm_encode_ofs_nbits(bundle->dst.ofs,
bundle->dst.n_bits);
nab->dst = htonl(nxm_header_from_mff(bundle->dst.field));
}
- slaves = ofpbuf_put_zeros(out, slaves_len);
- for (i = 0; i < bundle->n_slaves; i++) {
- slaves[i] = htons(ofp_to_u16(bundle->slaves[i]));
+ members = ofpbuf_put_zeros(out, members_len);
+ for (i = 0; i < bundle->n_members; i++) {
+ members[i] = htons(ofp_to_u16(bundle->members[i]));
}
}
static char * OVS_WARN_UNUSED_RESULT
-parse_BUNDLE(const char *arg, struct ofpbuf *ofpacts,
- enum ofputil_protocol *usable_protocols OVS_UNUSED)
+parse_BUNDLE(const char *arg, const struct ofpact_parse_params *pp)
{
- return bundle_parse(arg, ofpacts);
+ return bundle_parse(arg, pp->port_map, pp->ofpacts);
}
static char * OVS_WARN_UNUSED_RESULT
-parse_bundle_load(const char *arg, struct ofpbuf *ofpacts)
+parse_bundle_load(const char *arg, const struct ofpact_parse_params *pp)
{
- return bundle_parse_load(arg, ofpacts);
+ return bundle_parse_load(arg, pp->port_map, pp->ofpacts);
}
static void
-format_BUNDLE(const struct ofpact_bundle *a, struct ds *s)
+format_BUNDLE(const struct ofpact_bundle *a,
+ const struct ofpact_format_params *fp)
+{
+ bundle_format(a, fp->port_map, fp->s);
+}
+
+static enum ofperr
+check_BUNDLE(const struct ofpact_bundle *a,
+ const struct ofpact_check_params *cp)
{
- bundle_format(a, s);
+ return bundle_check(a, cp->max_ports, cp->match);
}
\f
/* Set VLAN actions. */
}
static char * OVS_WARN_UNUSED_RESULT
-parse_set_vlan_vid(char *arg, struct ofpbuf *ofpacts, bool push_vlan_if_needed)
+parse_set_vlan_vid(char *arg, bool push_vlan_if_needed,
+ const struct ofpact_parse_params *pp)
{
struct ofpact_vlan_vid *vlan_vid;
uint16_t vid;
if (vid & ~VLAN_VID_MASK) {
return xasprintf("%s: not a valid VLAN VID", arg);
}
- vlan_vid = ofpact_put_SET_VLAN_VID(ofpacts);
+ vlan_vid = ofpact_put_SET_VLAN_VID(pp->ofpacts);
vlan_vid->vlan_vid = vid;
vlan_vid->push_vlan_if_needed = push_vlan_if_needed;
return NULL;
}
static char * OVS_WARN_UNUSED_RESULT
-parse_SET_VLAN_VID(char *arg, struct ofpbuf *ofpacts,
- enum ofputil_protocol *usable_protocols OVS_UNUSED)
+parse_SET_VLAN_VID(char *arg, const struct ofpact_parse_params *pp)
{
- return parse_set_vlan_vid(arg, ofpacts, false);
+ return parse_set_vlan_vid(arg, false, pp);
}
static void
-format_SET_VLAN_VID(const struct ofpact_vlan_vid *a, struct ds *s)
+format_SET_VLAN_VID(const struct ofpact_vlan_vid *a,
+ const struct ofpact_format_params *fp)
{
- ds_put_format(s, "%s%s:%s%"PRIu16, colors.param,
+ ds_put_format(fp->s, "%s%s:%s%"PRIu16, colors.param,
a->push_vlan_if_needed ? "mod_vlan_vid" : "set_vlan_vid",
colors.end, a->vlan_vid);
}
+
+static enum ofperr
+check_SET_VLAN_VID(struct ofpact_vlan_vid *a, struct ofpact_check_params *cp)
+{
+ /* Remember if we saw a vlan tag in the flow to aid translating to OpenFlow
+ * 1.1+ if need be. */
+ ovs_be16 *tci = &cp->match->flow.vlans[0].tci;
+ a->flow_has_vlan = (*tci & htons(VLAN_CFI)) != 0;
+ if (!a->flow_has_vlan && !a->push_vlan_if_needed) {
+ inconsistent_match(&cp->usable_protocols);
+ }
+
+ /* Temporarily mark that we have a vlan tag. */
+ *tci |= htons(VLAN_CFI);
+
+ return 0;
+}
\f
/* Set PCP actions. */
}
static char * OVS_WARN_UNUSED_RESULT
-parse_set_vlan_pcp(char *arg, struct ofpbuf *ofpacts, bool push_vlan_if_needed)
+parse_set_vlan_pcp(char *arg, bool push_vlan_if_needed,
+ const struct ofpact_parse_params *pp)
{
struct ofpact_vlan_pcp *vlan_pcp;
uint8_t pcp;
if (pcp & ~7) {
return xasprintf("%s: not a valid VLAN PCP", arg);
}
- vlan_pcp = ofpact_put_SET_VLAN_PCP(ofpacts);
+ vlan_pcp = ofpact_put_SET_VLAN_PCP(pp->ofpacts);
vlan_pcp->vlan_pcp = pcp;
vlan_pcp->push_vlan_if_needed = push_vlan_if_needed;
return NULL;
}
static char * OVS_WARN_UNUSED_RESULT
-parse_SET_VLAN_PCP(char *arg, struct ofpbuf *ofpacts,
- enum ofputil_protocol *usable_protocols OVS_UNUSED)
+parse_SET_VLAN_PCP(char *arg, const struct ofpact_parse_params *pp)
{
- return parse_set_vlan_pcp(arg, ofpacts, false);
+ return parse_set_vlan_pcp(arg, false, pp);
}
static void
-format_SET_VLAN_PCP(const struct ofpact_vlan_pcp *a, struct ds *s)
+format_SET_VLAN_PCP(const struct ofpact_vlan_pcp *a,
+ const struct ofpact_format_params *fp)
{
- ds_put_format(s, "%s%s:%s%"PRIu8, colors.param,
+ ds_put_format(fp->s, "%s%s:%s%"PRIu8, colors.param,
a->push_vlan_if_needed ? "mod_vlan_pcp" : "set_vlan_pcp",
colors.end, a->vlan_pcp);
}
+
+static enum ofperr
+check_SET_VLAN_PCP(struct ofpact_vlan_pcp *a, struct ofpact_check_params *cp)
+{
+ /* Remember if we saw a vlan tag in the flow to aid translating to OpenFlow
+ * 1.1+ if need be. */
+ ovs_be16 *tci = &cp->match->flow.vlans[0].tci;
+ a->flow_has_vlan = (*tci & htons(VLAN_CFI)) != 0;
+ if (!a->flow_has_vlan && !a->push_vlan_if_needed) {
+ inconsistent_match(&cp->usable_protocols);
+ }
+
+ /* Temporarily mark that we have a vlan tag. */
+ *tci |= htons(VLAN_CFI);
+
+ return 0;
+}
\f
/* Strip VLAN actions. */
}
static char * OVS_WARN_UNUSED_RESULT
-parse_STRIP_VLAN(char *arg OVS_UNUSED, struct ofpbuf *ofpacts,
- enum ofputil_protocol *usable_protocols OVS_UNUSED)
+parse_STRIP_VLAN(char *arg OVS_UNUSED, const struct ofpact_parse_params *pp)
{
- ofpact_put_STRIP_VLAN(ofpacts)->ofpact.raw = OFPAT_RAW10_STRIP_VLAN;
+ ofpact_put_STRIP_VLAN(pp->ofpacts)->ofpact.raw = OFPAT_RAW10_STRIP_VLAN;
return NULL;
}
static char * OVS_WARN_UNUSED_RESULT
-parse_pop_vlan(struct ofpbuf *ofpacts)
+parse_pop_vlan(const struct ofpact_parse_params *pp)
{
- ofpact_put_STRIP_VLAN(ofpacts)->ofpact.raw = OFPAT_RAW11_POP_VLAN;
+ ofpact_put_STRIP_VLAN(pp->ofpacts)->ofpact.raw = OFPAT_RAW11_POP_VLAN;
return NULL;
}
static void
-format_STRIP_VLAN(const struct ofpact_null *a, struct ds *s)
+format_STRIP_VLAN(const struct ofpact_null *a,
+ const struct ofpact_format_params *fp)
{
- ds_put_format(s, (a->ofpact.raw == OFPAT_RAW11_POP_VLAN
+ ds_put_format(fp->s, (a->ofpact.raw == OFPAT_RAW11_POP_VLAN
? "%spop_vlan%s"
: "%sstrip_vlan%s"),
colors.value, colors.end);
}
+
+static enum ofperr
+check_STRIP_VLAN(const struct ofpact_null *a OVS_UNUSED,
+ struct ofpact_check_params *cp)
+{
+ if (!(cp->match->flow.vlans[0].tci & htons(VLAN_CFI))) {
+ inconsistent_match(&cp->usable_protocols);
+ }
+ flow_pop_vlan(&cp->match->flow, NULL);
+ return 0;
+}
\f
/* Push VLAN action. */
}
static char * OVS_WARN_UNUSED_RESULT
-parse_PUSH_VLAN(char *arg, struct ofpbuf *ofpacts,
- enum ofputil_protocol *usable_protocols OVS_UNUSED)
+parse_PUSH_VLAN(char *arg, const struct ofpact_parse_params *pp)
{
struct ofpact_push_vlan *push_vlan;
uint16_t ethertype;
char *error;
- *usable_protocols &= OFPUTIL_P_OF11_UP;
+ *pp->usable_protocols &= OFPUTIL_P_OF11_UP;
error = str_to_u16(arg, "ethertype", ðertype);
if (error) {
return error;
if (!eth_type_vlan(htons(ethertype))) {
return xasprintf("%s: not a valid VLAN ethertype", arg);
}
- push_vlan = ofpact_put_PUSH_VLAN(ofpacts);
+ push_vlan = ofpact_put_PUSH_VLAN(pp->ofpacts);
push_vlan->ethertype = htons(ethertype);
return NULL;
}
static void
-format_PUSH_VLAN(const struct ofpact_push_vlan *push_vlan, struct ds *s)
+format_PUSH_VLAN(const struct ofpact_push_vlan *push_vlan,
+ const struct ofpact_format_params *fp)
{
- ds_put_format(s, "%spush_vlan:%s%#"PRIx16,
+ ds_put_format(fp->s, "%spush_vlan:%s%#"PRIx16,
colors.param, colors.end, ntohs(push_vlan->ethertype));
}
+
+static enum ofperr
+check_PUSH_VLAN(const struct ofpact_push_vlan *a OVS_UNUSED,
+ struct ofpact_check_params *cp)
+{
+ struct flow *flow = &cp->match->flow;
+ if (flow->vlans[FLOW_MAX_VLAN_HEADERS - 1].tci & htons(VLAN_CFI)) {
+ /* Support maximum (FLOW_MAX_VLAN_HEADERS) VLAN headers. */
+ return OFPERR_OFPBAC_BAD_TAG;
+ }
+ /* Temporary mark that we have a vlan tag. */
+ flow_push_vlan_uninit(flow, NULL);
+ flow->vlans[0].tci |= htons(VLAN_CFI);
+ return 0;
+}
\f
/* Action structure for OFPAT10_SET_DL_SRC/DST and OFPAT11_SET_DL_SRC/DST. */
struct ofp_action_dl_addr {
}
static char * OVS_WARN_UNUSED_RESULT
-parse_SET_ETH_SRC(char *arg, struct ofpbuf *ofpacts,
- enum ofputil_protocol *usable_protocols OVS_UNUSED)
+parse_SET_ETH_SRC(char *arg, const struct ofpact_parse_params *pp)
{
- return str_to_mac(arg, &ofpact_put_SET_ETH_SRC(ofpacts)->mac);
+ return str_to_mac(arg, &ofpact_put_SET_ETH_SRC(pp->ofpacts)->mac);
}
static char * OVS_WARN_UNUSED_RESULT
-parse_SET_ETH_DST(char *arg, struct ofpbuf *ofpacts,
- enum ofputil_protocol *usable_protocols OVS_UNUSED)
+parse_SET_ETH_DST(char *arg, const struct ofpact_parse_params *pp)
{
- return str_to_mac(arg, &ofpact_put_SET_ETH_DST(ofpacts)->mac);
+ return str_to_mac(arg, &ofpact_put_SET_ETH_DST(pp->ofpacts)->mac);
}
static void
-format_SET_ETH_SRC(const struct ofpact_mac *a, struct ds *s)
+format_SET_ETH_SRC(const struct ofpact_mac *a,
+ const struct ofpact_format_params *fp)
{
- ds_put_format(s, "%smod_dl_src:%s"ETH_ADDR_FMT,
+ ds_put_format(fp->s, "%smod_dl_src:%s"ETH_ADDR_FMT,
colors.param, colors.end, ETH_ADDR_ARGS(a->mac));
}
static void
-format_SET_ETH_DST(const struct ofpact_mac *a, struct ds *s)
+format_SET_ETH_DST(const struct ofpact_mac *a,
+ const struct ofpact_format_params *fp)
{
- ds_put_format(s, "%smod_dl_dst:%s"ETH_ADDR_FMT,
+ ds_put_format(fp->s, "%smod_dl_dst:%s"ETH_ADDR_FMT,
colors.param, colors.end, ETH_ADDR_ARGS(a->mac));
}
+
+static enum ofperr
+check_SET_ETH_SRC(const struct ofpact_mac *a OVS_UNUSED,
+ const struct ofpact_check_params *cp OVS_UNUSED)
+{
+ return 0;
+}
+
+static enum ofperr
+check_SET_ETH_DST(const struct ofpact_mac *a OVS_UNUSED,
+ const struct ofpact_check_params *cp OVS_UNUSED)
+{
+ return 0;
+}
\f
/* Set IPv4 address actions. */
}
static char * OVS_WARN_UNUSED_RESULT
-parse_SET_IPV4_SRC(char *arg, struct ofpbuf *ofpacts,
- enum ofputil_protocol *usable_protocols OVS_UNUSED)
+parse_SET_IPV4_SRC(char *arg, const struct ofpact_parse_params *pp)
{
- return str_to_ip(arg, &ofpact_put_SET_IPV4_SRC(ofpacts)->ipv4);
+ return str_to_ip(arg, &ofpact_put_SET_IPV4_SRC(pp->ofpacts)->ipv4);
}
static char * OVS_WARN_UNUSED_RESULT
-parse_SET_IPV4_DST(char *arg, struct ofpbuf *ofpacts,
- enum ofputil_protocol *usable_protocols OVS_UNUSED)
+parse_SET_IPV4_DST(char *arg, const struct ofpact_parse_params *pp)
{
- return str_to_ip(arg, &ofpact_put_SET_IPV4_DST(ofpacts)->ipv4);
+ return str_to_ip(arg, &ofpact_put_SET_IPV4_DST(pp->ofpacts)->ipv4);
}
static void
-format_SET_IPV4_SRC(const struct ofpact_ipv4 *a, struct ds *s)
+format_SET_IPV4_SRC(const struct ofpact_ipv4 *a,
+ const struct ofpact_format_params *fp)
{
- ds_put_format(s, "%smod_nw_src:%s"IP_FMT,
+ ds_put_format(fp->s, "%smod_nw_src:%s"IP_FMT,
colors.param, colors.end, IP_ARGS(a->ipv4));
}
static void
-format_SET_IPV4_DST(const struct ofpact_ipv4 *a, struct ds *s)
+format_SET_IPV4_DST(const struct ofpact_ipv4 *a,
+ const struct ofpact_format_params *fp)
{
- ds_put_format(s, "%smod_nw_dst:%s"IP_FMT,
+ ds_put_format(fp->s, "%smod_nw_dst:%s"IP_FMT,
colors.param, colors.end, IP_ARGS(a->ipv4));
}
+
+static enum ofperr
+check_set_ipv4(struct ofpact_check_params *cp)
+{
+ ovs_be16 dl_type = get_dl_type(&cp->match->flow);
+ if (dl_type != htons(ETH_TYPE_IP)) {
+ inconsistent_match(&cp->usable_protocols);
+ }
+ return 0;
+}
+
+static enum ofperr
+check_SET_IPV4_SRC(const struct ofpact_ipv4 *a OVS_UNUSED,
+ struct ofpact_check_params *cp)
+{
+ return check_set_ipv4(cp);
+}
+
+static enum ofperr
+check_SET_IPV4_DST(const struct ofpact_ipv4 *a OVS_UNUSED,
+ struct ofpact_check_params *cp)
+{
+ return check_set_ipv4(cp);
+}
\f
/* Set IPv4/v6 TOS actions. */
}
static char * OVS_WARN_UNUSED_RESULT
-parse_SET_IP_DSCP(char *arg, struct ofpbuf *ofpacts,
- enum ofputil_protocol *usable_protocols OVS_UNUSED)
+parse_SET_IP_DSCP(char *arg, const struct ofpact_parse_params *pp)
+
{
uint8_t tos;
char *error;
if (tos & ~IP_DSCP_MASK) {
return xasprintf("%s: not a valid TOS", arg);
}
- ofpact_put_SET_IP_DSCP(ofpacts)->dscp = tos;
+ ofpact_put_SET_IP_DSCP(pp->ofpacts)->dscp = tos;
return NULL;
}
static void
-format_SET_IP_DSCP(const struct ofpact_dscp *a, struct ds *s)
+format_SET_IP_DSCP(const struct ofpact_dscp *a,
+ const struct ofpact_format_params *fp)
+{
+ ds_put_format(fp->s, "%smod_nw_tos:%s%d",
+ colors.param, colors.end, a->dscp);
+}
+
+static enum ofperr
+check_set_ip(struct ofpact_check_params *cp)
+{
+ if (!is_ip_any(&cp->match->flow)) {
+ inconsistent_match(&cp->usable_protocols);
+ }
+ return 0;
+}
+
+static enum ofperr
+check_SET_IP_DSCP(const struct ofpact_dscp *a OVS_UNUSED,
+ struct ofpact_check_params *cp)
{
- ds_put_format(s, "%smod_nw_tos:%s%d", colors.param, colors.end, a->dscp);
+ return check_set_ip(cp);
}
\f
/* Set IPv4/v6 ECN actions. */
}
static char * OVS_WARN_UNUSED_RESULT
-parse_SET_IP_ECN(char *arg, struct ofpbuf *ofpacts,
- enum ofputil_protocol *usable_protocols OVS_UNUSED)
+parse_SET_IP_ECN(char *arg, const struct ofpact_parse_params *pp)
{
uint8_t ecn;
char *error;
if (ecn & ~IP_ECN_MASK) {
return xasprintf("%s: not a valid ECN", arg);
}
- ofpact_put_SET_IP_ECN(ofpacts)->ecn = ecn;
+ ofpact_put_SET_IP_ECN(pp->ofpacts)->ecn = ecn;
return NULL;
}
static void
-format_SET_IP_ECN(const struct ofpact_ecn *a, struct ds *s)
+format_SET_IP_ECN(const struct ofpact_ecn *a,
+ const struct ofpact_format_params *fp)
{
- ds_put_format(s, "%smod_nw_ecn:%s%d",
+ ds_put_format(fp->s, "%smod_nw_ecn:%s%d",
colors.param, colors.end, a->ecn);
}
+
+static enum ofperr
+check_SET_IP_ECN(const struct ofpact_ecn *a OVS_UNUSED,
+ struct ofpact_check_params *cp)
+{
+ return check_set_ip(cp);
+}
\f
/* Set IPv4/v6 TTL actions. */
}
static char * OVS_WARN_UNUSED_RESULT
-parse_SET_IP_TTL(char *arg, struct ofpbuf *ofpacts,
- enum ofputil_protocol *usable_protocols OVS_UNUSED)
+parse_SET_IP_TTL(char *arg, const struct ofpact_parse_params *pp)
+
{
uint8_t ttl;
char *error;
return error;
}
- ofpact_put_SET_IP_TTL(ofpacts)->ttl = ttl;
+ ofpact_put_SET_IP_TTL(pp->ofpacts)->ttl = ttl;
return NULL;
}
static void
-format_SET_IP_TTL(const struct ofpact_ip_ttl *a, struct ds *s)
+format_SET_IP_TTL(const struct ofpact_ip_ttl *a,
+ const struct ofpact_format_params *fp)
+{
+ ds_put_format(fp->s, "%smod_nw_ttl:%s%d",
+ colors.param, colors.end, a->ttl);
+}
+
+static enum ofperr
+check_SET_IP_TTL(const struct ofpact_ip_ttl *a OVS_UNUSED,
+ struct ofpact_check_params *cp)
{
- ds_put_format(s, "%smod_nw_ttl:%s%d", colors.param, colors.end, a->ttl);
+ return check_set_ip(cp);
}
\f
/* Set TCP/UDP/SCTP port actions. */
}
static char * OVS_WARN_UNUSED_RESULT
-parse_SET_L4_SRC_PORT(char *arg, struct ofpbuf *ofpacts,
- enum ofputil_protocol *usable_protocols OVS_UNUSED)
+parse_SET_L4_SRC_PORT(char *arg, const struct ofpact_parse_params *pp)
{
return str_to_u16(arg, "source port",
- &ofpact_put_SET_L4_SRC_PORT(ofpacts)->port);
+ &ofpact_put_SET_L4_SRC_PORT(pp->ofpacts)->port);
}
static char * OVS_WARN_UNUSED_RESULT
-parse_SET_L4_DST_PORT(char *arg, struct ofpbuf *ofpacts,
- enum ofputil_protocol *usable_protocols OVS_UNUSED)
+parse_SET_L4_DST_PORT(char *arg, const struct ofpact_parse_params *pp)
{
return str_to_u16(arg, "destination port",
- &ofpact_put_SET_L4_DST_PORT(ofpacts)->port);
+ &ofpact_put_SET_L4_DST_PORT(pp->ofpacts)->port);
}
static void
-format_SET_L4_SRC_PORT(const struct ofpact_l4_port *a, struct ds *s)
+format_SET_L4_SRC_PORT(const struct ofpact_l4_port *a,
+ const struct ofpact_format_params *fp)
{
- ds_put_format(s, "%smod_tp_src:%s%d", colors.param, colors.end, a->port);
+ ds_put_format(fp->s, "%smod_tp_src:%s%d",
+ colors.param, colors.end, a->port);
}
static void
-format_SET_L4_DST_PORT(const struct ofpact_l4_port *a, struct ds *s)
+format_SET_L4_DST_PORT(const struct ofpact_l4_port *a,
+ const struct ofpact_format_params *fp)
+{
+ ds_put_format(fp->s, "%smod_tp_dst:%s%d",
+ colors.param, colors.end, a->port);
+}
+
+static enum ofperr
+check_set_l4_port(struct ofpact_l4_port *a, struct ofpact_check_params *cp)
+{
+ const struct flow *flow = &cp->match->flow;
+ if (!is_ip_any(flow)
+ || flow->nw_frag & FLOW_NW_FRAG_LATER
+ || (flow->nw_proto != IPPROTO_TCP &&
+ flow->nw_proto != IPPROTO_UDP &&
+ flow->nw_proto != IPPROTO_SCTP)) {
+ inconsistent_match(&cp->usable_protocols);
+ }
+
+ /* Note the transport protocol in use, to allow this action to be converted
+ * to an OF1.2 set_field action later if necessary. */
+ a->flow_ip_proto = flow->nw_proto;
+
+ return 0;
+}
+
+static enum ofperr
+check_SET_L4_SRC_PORT(struct ofpact_l4_port *a, struct ofpact_check_params *cp)
+{
+ return check_set_l4_port(a, cp);
+}
+
+static enum ofperr
+check_SET_L4_DST_PORT(struct ofpact_l4_port *a, struct ofpact_check_params *cp)
{
- ds_put_format(s, "%smod_tp_dst:%s%d", colors.param, colors.end, a->port);
+ return check_set_l4_port(a, cp);
}
\f
/* Action structure for OFPAT_COPY_FIELD. */
}
static char * OVS_WARN_UNUSED_RESULT
-parse_REG_MOVE(const char *arg, struct ofpbuf *ofpacts,
- enum ofputil_protocol *usable_protocols OVS_UNUSED)
+parse_REG_MOVE(const char *arg, const struct ofpact_parse_params *pp)
{
- struct ofpact_reg_move *move = ofpact_put_REG_MOVE(ofpacts);
+ struct ofpact_reg_move *move = ofpact_put_REG_MOVE(pp->ofpacts);
return nxm_parse_reg_move(move, arg);
}
static void
-format_REG_MOVE(const struct ofpact_reg_move *a, struct ds *s)
+format_REG_MOVE(const struct ofpact_reg_move *a,
+ const struct ofpact_format_params *fp)
+{
+ nxm_format_reg_move(a, fp->s);
+}
+
+static enum ofperr
+check_REG_MOVE(const struct ofpact_reg_move *a,
+ const struct ofpact_check_params *cp)
{
- nxm_format_reg_move(a, s);
+ return nxm_reg_move_check(a, cp->match);
}
\f
/* Action structure for OFPAT12_SET_FIELD. */
&& (!(mask.be16 & htons(OFPVID12_PRESENT))
|| !(value.be16 & htons(OFPVID12_PRESENT))))) {
struct ds ds = DS_EMPTY_INITIALIZER;
- mf_format(field, &value, NULL, &ds);
+ mf_format(field, &value, NULL, NULL, &ds);
VLOG_WARN_RL(&rl, "Invalid value for set field %s: %s",
field->name, ds_cstr(&ds));
ds_destroy(&ds);
}
/* Parses a "set_field" action with argument 'arg', appending the parsed
- * action to 'ofpacts'.
+ * action to 'pp->ofpacts'.
*
* Returns NULL if successful, otherwise a malloc()'d string describing the
* error. The caller is responsible for freeing the returned string. */
static char * OVS_WARN_UNUSED_RESULT
-set_field_parse__(char *arg, struct ofpbuf *ofpacts,
- enum ofputil_protocol *usable_protocols)
+set_field_parse__(char *arg, const struct ofpact_parse_params *pp)
{
char *value;
char *delim;
}
delim[0] = '\0';
- error = mf_parse(mf, value, &sf_value, &sf_mask);
+ error = mf_parse(mf, value, pp->port_map, &sf_value, &sf_mask);
if (error) {
return error;
}
return xasprintf("%s is not a valid value for field %s", value, key);
}
- *usable_protocols &= mf->usable_protocols_exact;
+ *pp->usable_protocols &= mf->usable_protocols_exact;
- ofpact_put_set_field(ofpacts, mf, &sf_value, &sf_mask);
+ ofpact_put_set_field(pp->ofpacts, mf, &sf_value, &sf_mask);
return NULL;
}
/* Parses 'arg' as the argument to a "set_field" action, and appends such an
- * action to 'ofpacts'.
+ * action to 'pp->ofpacts'.
*
* Returns NULL if successful, otherwise a malloc()'d string describing the
* error. The caller is responsible for freeing the returned string. */
static char * OVS_WARN_UNUSED_RESULT
-parse_SET_FIELD(const char *arg, struct ofpbuf *ofpacts,
- enum ofputil_protocol *usable_protocols)
+parse_SET_FIELD(const char *arg, const struct ofpact_parse_params *pp)
{
char *copy = xstrdup(arg);
- char *error = set_field_parse__(copy, ofpacts, usable_protocols);
+ char *error = set_field_parse__(copy, pp);
free(copy);
return error;
}
static char * OVS_WARN_UNUSED_RESULT
-parse_reg_load(char *arg, struct ofpbuf *ofpacts)
+parse_reg_load(char *arg, const struct ofpact_parse_params *pp)
{
struct mf_subfield dst;
char *key, *value_str;
struct ds ds;
ds_init(&ds);
- mf_format(dst.field, &value, NULL, &ds);
+ mf_format(dst.field, &value, NULL, NULL, &ds);
error = xasprintf("%s: value %s does not fit into %d bits",
arg, ds_cstr(&ds), dst.n_bits);
ds_destroy(&ds);
return error;
}
- struct ofpact_set_field *sf = ofpact_put_reg_load(ofpacts, dst.field, NULL,
- NULL);
+ struct ofpact_set_field *sf = ofpact_put_reg_load(pp->ofpacts, dst.field,
+ NULL, NULL);
bitwise_copy(&value, dst.field->n_bytes, 0, sf->value,
dst.field->n_bytes, dst.ofs, dst.n_bits);
}
static void
-format_SET_FIELD(const struct ofpact_set_field *a, struct ds *s)
+format_SET_FIELD(const struct ofpact_set_field *a,
+ const struct ofpact_format_params *fp)
{
if (a->ofpact.raw == NXAST_RAW_REG_LOAD) {
struct mf_subfield dst;
dst.ofs = dst.n_bits = 0;
while (next_load_segment(a, &dst, &value)) {
- ds_put_format(s, "%sload:%s%#"PRIx64"%s->%s",
+ ds_put_format(fp->s, "%sload:%s%#"PRIx64"%s->%s",
colors.special, colors.end, value,
colors.special, colors.end);
- mf_format_subfield(&dst, s);
- ds_put_char(s, ',');
+ mf_format_subfield(&dst, fp->s);
+ ds_put_char(fp->s, ',');
}
- ds_chomp(s, ',');
+ ds_chomp(fp->s, ',');
} else {
- ds_put_format(s, "%sset_field:%s", colors.special, colors.end);
- mf_format(a->field, a->value, ofpact_set_field_mask(a), s);
- ds_put_format(s, "%s->%s%s",
+ ds_put_format(fp->s, "%sset_field:%s", colors.special, colors.end);
+ mf_format(a->field, a->value, ofpact_set_field_mask(a),
+ fp->port_map, fp->s);
+ ds_put_format(fp->s, "%s->%s%s",
colors.special, colors.end, a->field->name);
}
}
+static enum ofperr
+check_SET_FIELD(struct ofpact_set_field *a,
+ const struct ofpact_check_params *cp)
+{
+ const struct mf_field *mf = a->field;
+ struct flow *flow = &cp->match->flow;
+ ovs_be16 *tci = &flow->vlans[0].tci;
+
+ /* Require OXM_OF_VLAN_VID to have an existing VLAN header. */
+ if (!mf_are_prereqs_ok(mf, flow, NULL)
+ || (mf->id == MFF_VLAN_VID && !(*tci & htons(VLAN_CFI)))) {
+ VLOG_WARN_RL(&rl, "set_field %s lacks correct prerequisites",
+ mf->name);
+ return OFPERR_OFPBAC_MATCH_INCONSISTENT;
+ }
+
+ /* Remember if we saw a VLAN tag in the flow, to aid translating to
+ * OpenFlow 1.1 if need be. */
+ a->flow_has_vlan = (*tci & htons(VLAN_CFI)) != 0;
+ if (mf->id == MFF_VLAN_TCI) {
+ /* The set field may add or remove the VLAN tag,
+ * Mark the status temporarily. */
+ *tci = a->value->be16;
+ }
+
+ return 0;
+}
+
/* Appends an OFPACT_SET_FIELD ofpact with enough space for the value and mask
* for the 'field' to 'ofpacts' and returns it. Fills in the value from
* 'value', if non-NULL, and mask from 'mask' if non-NULL. If 'value' is
}
static char * OVS_WARN_UNUSED_RESULT
-parse_STACK_PUSH(char *arg, struct ofpbuf *ofpacts,
- enum ofputil_protocol *usable_protocols OVS_UNUSED)
+parse_STACK_PUSH(char *arg, const struct ofpact_parse_params *pp)
{
- return nxm_parse_stack_action(ofpact_put_STACK_PUSH(ofpacts), arg);
+ return nxm_parse_stack_action(ofpact_put_STACK_PUSH(pp->ofpacts), arg);
}
static char * OVS_WARN_UNUSED_RESULT
-parse_STACK_POP(char *arg, struct ofpbuf *ofpacts,
- enum ofputil_protocol *usable_protocols OVS_UNUSED)
+parse_STACK_POP(char *arg, const struct ofpact_parse_params *pp)
{
- return nxm_parse_stack_action(ofpact_put_STACK_POP(ofpacts), arg);
+ return nxm_parse_stack_action(ofpact_put_STACK_POP(pp->ofpacts), arg);
}
static void
-format_STACK_PUSH(const struct ofpact_stack *a, struct ds *s)
+format_STACK_PUSH(const struct ofpact_stack *a,
+ const struct ofpact_format_params *fp)
{
- nxm_format_stack_push(a, s);
+ nxm_format_stack_push(a, fp->s);
}
static void
-format_STACK_POP(const struct ofpact_stack *a, struct ds *s)
+format_STACK_POP(const struct ofpact_stack *a,
+ const struct ofpact_format_params *fp)
+{
+ nxm_format_stack_pop(a, fp->s);
+}
+
+static enum ofperr
+check_STACK_PUSH(const struct ofpact_stack *a,
+ const struct ofpact_check_params *cp)
+{
+ return nxm_stack_push_check(a, cp->match);
+}
+
+static enum ofperr
+check_STACK_POP(const struct ofpact_stack *a,
+ const struct ofpact_check_params *cp)
{
- nxm_format_stack_pop(a, s);
+ return nxm_stack_pop_check(a, cp->match);
}
\f
/* Action structure for NXAST_DEC_TTL_CNT_IDS.
*/
struct nx_action_cnt_ids {
ovs_be16 type; /* OFPAT_VENDOR. */
- ovs_be16 len; /* Length including slaves. */
+ ovs_be16 len; /* Length including cnt_ids. */
ovs_be32 vendor; /* NX_VENDOR_ID. */
ovs_be16 subtype; /* NXAST_DEC_TTL_CNT_IDS. */
ovs_be16 n_controllers; /* Number of controllers. */
uint8_t zeros[4]; /* Must be zero. */
- /* Followed by 1 or more controller ids.
+ /* Followed by 1 or more controller ids:
*
- * uint16_t cnt_ids[]; // Controller ids.
- * uint8_t pad[]; // Must be 0 to 8-byte align cnt_ids[].
+ * uint16_t cnt_ids[]; -- Controller ids.
+ * uint8_t pad[]; -- Must be 0 to 8-byte align cnt_ids[].
*/
};
OFP_ASSERT(sizeof(struct nx_action_cnt_ids) == 16);
if (ids_size < ids->n_controllers * sizeof(ovs_be16)) {
VLOG_WARN_RL(&rl, "Nicira action dec_ttl_cnt_ids only has %"PRIuSIZE" "
"bytes allocated for controller ids. %"PRIuSIZE" bytes "
- "are required for %"PRIu16" controllers.",
+ "are required for %u controllers.",
ids_size, ids->n_controllers * sizeof(ovs_be16),
ids->n_controllers);
return OFPERR_OFPBAC_BAD_LEN;
}
static void
-parse_noargs_dec_ttl(struct ofpbuf *ofpacts)
+parse_noargs_dec_ttl(const struct ofpact_parse_params *pp)
{
struct ofpact_cnt_ids *ids;
uint16_t id = 0;
- ofpact_put_DEC_TTL(ofpacts);
- ofpbuf_put(ofpacts, &id, sizeof id);
- ids = ofpacts->header;
+ ofpact_put_DEC_TTL(pp->ofpacts);
+ ofpbuf_put(pp->ofpacts, &id, sizeof id);
+ ids = pp->ofpacts->header;
ids->n_controllers++;
- ofpact_finish_DEC_TTL(ofpacts, &ids);
+ ofpact_finish_DEC_TTL(pp->ofpacts, &ids);
}
static char * OVS_WARN_UNUSED_RESULT
-parse_DEC_TTL(char *arg, struct ofpbuf *ofpacts,
- enum ofputil_protocol *usable_protocols OVS_UNUSED)
+parse_DEC_TTL(char *arg, const struct ofpact_parse_params *pp)
{
if (*arg == '\0') {
- parse_noargs_dec_ttl(ofpacts);
+ parse_noargs_dec_ttl(pp);
} else {
struct ofpact_cnt_ids *ids;
char *cntr;
- ids = ofpact_put_DEC_TTL(ofpacts);
+ ids = ofpact_put_DEC_TTL(pp->ofpacts);
ids->ofpact.raw = NXAST_RAW_DEC_TTL_CNT_IDS;
for (cntr = strtok_r(arg, ", ", &arg); cntr != NULL;
cntr = strtok_r(NULL, ", ", &arg)) {
uint16_t id = atoi(cntr);
- ofpbuf_put(ofpacts, &id, sizeof id);
- ids = ofpacts->header;
+ ofpbuf_put(pp->ofpacts, &id, sizeof id);
+ ids = pp->ofpacts->header;
ids->n_controllers++;
}
if (!ids->n_controllers) {
return xstrdup("dec_ttl_cnt_ids: expected at least one controller "
"id.");
}
- ofpact_finish_DEC_TTL(ofpacts, &ids);
+
+ if (ofpbuf_oversized(pp->ofpacts)) {
+ return xasprintf("input too big");
+ }
+
+ ofpact_finish_DEC_TTL(pp->ofpacts, &ids);
}
return NULL;
}
static void
-format_DEC_TTL(const struct ofpact_cnt_ids *a, struct ds *s)
+format_DEC_TTL(const struct ofpact_cnt_ids *a,
+ const struct ofpact_format_params *fp)
{
size_t i;
- ds_put_format(s, "%sdec_ttl%s", colors.paren, colors.end);
+ ds_put_format(fp->s, "%sdec_ttl%s", colors.paren, colors.end);
if (a->ofpact.raw == NXAST_RAW_DEC_TTL_CNT_IDS) {
- ds_put_format(s, "%s(%s", colors.paren, colors.end);
+ ds_put_format(fp->s, "%s(%s", colors.paren, colors.end);
for (i = 0; i < a->n_controllers; i++) {
if (i) {
- ds_put_cstr(s, ",");
+ ds_put_cstr(fp->s, ",");
}
- ds_put_format(s, "%"PRIu16, a->cnt_ids[i]);
+ ds_put_format(fp->s, "%"PRIu16, a->cnt_ids[i]);
}
- ds_put_format(s, "%s)%s", colors.paren, colors.end);
+ ds_put_format(fp->s, "%s)%s", colors.paren, colors.end);
}
}
+
+static enum ofperr
+check_DEC_TTL(const struct ofpact_cnt_ids *a OVS_UNUSED,
+ struct ofpact_check_params *cp)
+{
+ return check_set_ip(cp);
+}
\f
/* Set MPLS label actions. */
}
static char * OVS_WARN_UNUSED_RESULT
-parse_SET_MPLS_LABEL(char *arg, struct ofpbuf *ofpacts,
- enum ofputil_protocol *usable_protocols OVS_UNUSED)
+parse_SET_MPLS_LABEL(char *arg, const struct ofpact_parse_params *pp)
{
- struct ofpact_mpls_label *mpls_label = ofpact_put_SET_MPLS_LABEL(ofpacts);
+ struct ofpact_mpls_label *mpls_label
+ = ofpact_put_SET_MPLS_LABEL(pp->ofpacts);
if (*arg == '\0') {
return xstrdup("set_mpls_label: expected label.");
}
}
static void
-format_SET_MPLS_LABEL(const struct ofpact_mpls_label *a, struct ds *s)
+format_SET_MPLS_LABEL(const struct ofpact_mpls_label *a,
+ const struct ofpact_format_params *fp)
{
- ds_put_format(s, "%sset_mpls_label(%s%"PRIu32"%s)%s",
+ ds_put_format(fp->s, "%sset_mpls_label(%s%"PRIu32"%s)%s",
colors.paren, colors.end, ntohl(a->label),
colors.paren, colors.end);
}
+
+static enum ofperr
+check_set_mpls(struct ofpact_check_params *cp)
+{
+ ovs_be16 dl_type = get_dl_type(&cp->match->flow);
+ if (!eth_type_mpls(dl_type)) {
+ inconsistent_match(&cp->usable_protocols);
+ }
+ return 0;
+}
+
+static enum ofperr
+check_SET_MPLS_LABEL(const struct ofpact_mpls_label *a OVS_UNUSED,
+ struct ofpact_check_params *cp)
+{
+ return check_set_mpls(cp);
+}
\f
/* Set MPLS TC actions. */
}
static char * OVS_WARN_UNUSED_RESULT
-parse_SET_MPLS_TC(char *arg, struct ofpbuf *ofpacts,
- enum ofputil_protocol *usable_protocols OVS_UNUSED)
+parse_SET_MPLS_TC(char *arg, const struct ofpact_parse_params *pp)
{
- struct ofpact_mpls_tc *mpls_tc = ofpact_put_SET_MPLS_TC(ofpacts);
+ struct ofpact_mpls_tc *mpls_tc = ofpact_put_SET_MPLS_TC(pp->ofpacts);
if (*arg == '\0') {
return xstrdup("set_mpls_tc: expected tc.");
}
static void
-format_SET_MPLS_TC(const struct ofpact_mpls_tc *a, struct ds *s)
+format_SET_MPLS_TC(const struct ofpact_mpls_tc *a,
+ const struct ofpact_format_params *fp)
{
- ds_put_format(s, "%sset_mpls_ttl(%s%"PRIu8"%s)%s",
+ ds_put_format(fp->s, "%sset_mpls_ttl(%s%"PRIu8"%s)%s",
colors.paren, colors.end, a->tc,
colors.paren, colors.end);
}
+
+static enum ofperr
+check_SET_MPLS_TC(const struct ofpact_mpls_tc *a OVS_UNUSED,
+ struct ofpact_check_params *cp)
+{
+ return check_set_mpls(cp);
+}
\f
/* Set MPLS TTL actions. */
}
/* Parses 'arg' as the argument to a "set_mpls_ttl" action, and appends such an
- * action to 'ofpacts'.
+ * action to 'pp->ofpacts'.
*
* Returns NULL if successful, otherwise a malloc()'d string describing the
* error. The caller is responsible for freeing the returned string. */
static char * OVS_WARN_UNUSED_RESULT
-parse_SET_MPLS_TTL(char *arg, struct ofpbuf *ofpacts,
- enum ofputil_protocol *usable_protocols OVS_UNUSED)
+parse_SET_MPLS_TTL(char *arg, const struct ofpact_parse_params *pp)
{
- struct ofpact_mpls_ttl *mpls_ttl = ofpact_put_SET_MPLS_TTL(ofpacts);
+ struct ofpact_mpls_ttl *mpls_ttl = ofpact_put_SET_MPLS_TTL(pp->ofpacts);
if (*arg == '\0') {
return xstrdup("set_mpls_ttl: expected ttl.");
}
static void
-format_SET_MPLS_TTL(const struct ofpact_mpls_ttl *a, struct ds *s)
+format_SET_MPLS_TTL(const struct ofpact_mpls_ttl *a,
+ const struct ofpact_format_params *fp)
{
- ds_put_format(s, "%sset_mpls_ttl(%s%"PRIu8"%s)%s",
+ ds_put_format(fp->s, "%sset_mpls_ttl(%s%"PRIu8"%s)%s",
colors.paren, colors.end, a->ttl,
colors.paren, colors.end);
}
+
+static enum ofperr
+check_SET_MPLS_TTL(const struct ofpact_mpls_ttl *a OVS_UNUSED,
+ struct ofpact_check_params *cp)
+{
+ return check_set_mpls(cp);
+}
\f
/* Decrement MPLS TTL actions. */
}
static char * OVS_WARN_UNUSED_RESULT
-parse_DEC_MPLS_TTL(char *arg OVS_UNUSED, struct ofpbuf *ofpacts,
- enum ofputil_protocol *usable_protocols OVS_UNUSED)
+parse_DEC_MPLS_TTL(char *arg OVS_UNUSED, const struct ofpact_parse_params *pp)
{
- ofpact_put_DEC_MPLS_TTL(ofpacts);
+ ofpact_put_DEC_MPLS_TTL(pp->ofpacts);
return NULL;
}
static void
-format_DEC_MPLS_TTL(const struct ofpact_null *a OVS_UNUSED, struct ds *s)
+format_DEC_MPLS_TTL(const struct ofpact_null *a OVS_UNUSED,
+ const struct ofpact_format_params *fp)
+{
+ ds_put_format(fp->s, "%sdec_mpls_ttl%s", colors.value, colors.end);
+}
+
+static enum ofperr
+check_DEC_MPLS_TTL(const struct ofpact_null *a OVS_UNUSED,
+ struct ofpact_check_params *cp)
{
- ds_put_format(s, "%sdec_mpls_ttl%s", colors.value, colors.end);
+ return check_set_mpls(cp);
}
\f
/* Push MPLS label action. */
}
static char * OVS_WARN_UNUSED_RESULT
-parse_PUSH_MPLS(char *arg, struct ofpbuf *ofpacts,
- enum ofputil_protocol *usable_protocols OVS_UNUSED)
+parse_PUSH_MPLS(char *arg, const struct ofpact_parse_params *pp)
{
uint16_t ethertype;
char *error;
error = str_to_u16(arg, "push_mpls", ðertype);
if (!error) {
- ofpact_put_PUSH_MPLS(ofpacts)->ethertype = htons(ethertype);
+ ofpact_put_PUSH_MPLS(pp->ofpacts)->ethertype = htons(ethertype);
}
return error;
}
static void
-format_PUSH_MPLS(const struct ofpact_push_mpls *a, struct ds *s)
+format_PUSH_MPLS(const struct ofpact_push_mpls *a,
+ const struct ofpact_format_params *fp)
{
- ds_put_format(s, "%spush_mpls:%s0x%04"PRIx16,
+ ds_put_format(fp->s, "%spush_mpls:%s0x%04"PRIx16,
colors.param, colors.end, ntohs(a->ethertype));
}
+
+static enum ofperr
+check_PUSH_MPLS(const struct ofpact_push_mpls *a,
+ struct ofpact_check_params *cp)
+{
+ struct flow *flow = &cp->match->flow;
+
+ if (flow->packet_type != htonl(PT_ETH)) {
+ inconsistent_match(&cp->usable_protocols);
+ }
+ flow->dl_type = a->ethertype;
+
+ /* The packet is now MPLS and the MPLS payload is opaque.
+ * Thus nothing can be assumed about the network protocol.
+ * Temporarily mark that we have no nw_proto. */
+ flow->nw_proto = 0;
+
+ return 0;
+}
\f
/* Pop MPLS label action. */
}
static char * OVS_WARN_UNUSED_RESULT
-parse_POP_MPLS(char *arg, struct ofpbuf *ofpacts,
- enum ofputil_protocol *usable_protocols OVS_UNUSED)
+parse_POP_MPLS(char *arg, const struct ofpact_parse_params *pp)
{
uint16_t ethertype;
char *error;
error = str_to_u16(arg, "pop_mpls", ðertype);
if (!error) {
- ofpact_put_POP_MPLS(ofpacts)->ethertype = htons(ethertype);
+ ofpact_put_POP_MPLS(pp->ofpacts)->ethertype = htons(ethertype);
}
return error;
}
static void
-format_POP_MPLS(const struct ofpact_pop_mpls *a, struct ds *s)
+format_POP_MPLS(const struct ofpact_pop_mpls *a,
+ const struct ofpact_format_params *fp)
{
- ds_put_format(s, "%spop_mpls:%s0x%04"PRIx16,
+ ds_put_format(fp->s, "%spop_mpls:%s0x%04"PRIx16,
colors.param, colors.end, ntohs(a->ethertype));
}
+
+static enum ofperr
+check_POP_MPLS(const struct ofpact_pop_mpls *a, struct ofpact_check_params *cp)
+{
+ struct flow *flow = &cp->match->flow;
+ ovs_be16 dl_type = get_dl_type(flow);
+
+ if (flow->packet_type != htonl(PT_ETH) || !eth_type_mpls(dl_type)) {
+ inconsistent_match(&cp->usable_protocols);
+ }
+ flow->dl_type = a->ethertype;
+ return 0;
+}
\f
/* Set tunnel ID actions. */
}
static char * OVS_WARN_UNUSED_RESULT
-parse_set_tunnel(char *arg, struct ofpbuf *ofpacts,
- enum ofp_raw_action_type raw)
+parse_set_tunnel(char *arg, enum ofp_raw_action_type raw,
+ const struct ofpact_parse_params *pp)
{
struct ofpact_tunnel *tunnel;
- tunnel = ofpact_put_SET_TUNNEL(ofpacts);
+ tunnel = ofpact_put_SET_TUNNEL(pp->ofpacts);
tunnel->ofpact.raw = raw;
return str_to_u64(arg, &tunnel->tun_id);
}
static char * OVS_WARN_UNUSED_RESULT
-parse_SET_TUNNEL(char *arg, struct ofpbuf *ofpacts,
- enum ofputil_protocol *usable_protocols OVS_UNUSED)
+parse_SET_TUNNEL(char *arg, const struct ofpact_parse_params *pp)
{
- return parse_set_tunnel(arg, ofpacts, NXAST_RAW_SET_TUNNEL);
+ return parse_set_tunnel(arg, NXAST_RAW_SET_TUNNEL, pp);
}
static void
-format_SET_TUNNEL(const struct ofpact_tunnel *a, struct ds *s)
+format_SET_TUNNEL(const struct ofpact_tunnel *a,
+ const struct ofpact_format_params *fp)
{
- ds_put_format(s, "%sset_tunnel%s:%s%#"PRIx64, colors.param,
+ ds_put_format(fp->s, "%sset_tunnel%s:%s%#"PRIx64, colors.param,
(a->tun_id > UINT32_MAX
|| a->ofpact.raw == NXAST_RAW_SET_TUNNEL64 ? "64" : ""),
colors.end, a->tun_id);
}
+
+static enum ofperr
+check_SET_TUNNEL(const struct ofpact_tunnel *a OVS_UNUSED,
+ const struct ofpact_check_params *cp OVS_UNUSED)
+{
+ return 0;
+}
\f
-/* Set queue action. */
+/* Delete field action. */
+
+/* Action structure for DELETE_FIELD */
+struct nx_action_delete_field {
+ ovs_be16 type; /* OFPAT_VENDOR */
+ ovs_be16 len; /* Length is 24. */
+ ovs_be32 vendor; /* NX_VENDOR_ID. */
+ ovs_be16 subtype; /* NXAST_DELETE_FIELD. */
+ /* Followed by:
+ * - OXM/NXM header for field to delete (4 or 8 bytes).
+ * - Enough 0-bytes to pad out the action to 24 bytes. */
+ uint8_t pad[14];
+};
+OFP_ASSERT(sizeof(struct nx_action_delete_field ) == 24);
static enum ofperr
-decode_OFPAT_RAW_SET_QUEUE(uint32_t queue_id,
- enum ofp_version ofp_version OVS_UNUSED,
- struct ofpbuf *out)
+decode_NXAST_RAW_DELETE_FIELD(const struct nx_action_delete_field *nadf,
+ enum ofp_version ofp_version OVS_UNUSED,
+ const struct vl_mff_map *vl_mff_map,
+ uint64_t *tlv_bitmap, struct ofpbuf *out)
{
- ofpact_put_SET_QUEUE(out)->queue_id = queue_id;
+ struct ofpact_delete_field *delete_field;
+ enum ofperr err;
+
+ delete_field = ofpact_put_DELETE_FIELD(out);
+ delete_field->ofpact.raw = NXAST_RAW_DELETE_FIELD;
+
+ struct ofpbuf b = ofpbuf_const_initializer(nadf, ntohs(nadf->len));
+ ofpbuf_pull(&b, OBJECT_OFFSETOF(nadf, pad));
+
+ err = mf_vl_mff_nx_pull_header(&b, vl_mff_map, &delete_field->field,
+ NULL, tlv_bitmap);
+ if (err) {
+ return err;
+ }
+
return 0;
}
static void
-encode_SET_QUEUE(const struct ofpact_queue *queue,
- enum ofp_version ofp_version, struct ofpbuf *out)
+encode_DELETE_FIELD(const struct ofpact_delete_field *delete_field,
+ enum ofp_version ofp_version OVS_UNUSED,
+ struct ofpbuf *out)
{
- put_OFPAT_SET_QUEUE(out, ofp_version, queue->queue_id);
+ struct nx_action_delete_field *nadf = put_NXAST_DELETE_FIELD(out);
+ size_t size = out->size;
+
+ out->size = size - sizeof nadf->pad;
+ nx_put_mff_header(out, delete_field->field, 0, false);
+ out->size = size;
}
static char * OVS_WARN_UNUSED_RESULT
-parse_SET_QUEUE(char *arg, struct ofpbuf *ofpacts,
- enum ofputil_protocol *usable_protocols OVS_UNUSED)
+parse_DELETE_FIELD(char *arg, const struct ofpact_parse_params *pp)
{
- return str_to_u32(arg, &ofpact_put_SET_QUEUE(ofpacts)->queue_id);
+ struct ofpact_delete_field *delete_field;
+
+ delete_field = ofpact_put_DELETE_FIELD(pp->ofpacts);
+ return mf_parse_field(&delete_field->field, arg);
}
static void
-format_SET_QUEUE(const struct ofpact_queue *a, struct ds *s)
+format_DELETE_FIELD(const struct ofpact_delete_field *odf,
+ const struct ofpact_format_params *fp)
{
- ds_put_format(s, "%sset_queue:%s%"PRIu32,
- colors.param, colors.end, a->queue_id);
+ ds_put_format(fp->s, "%sdelete_field:%s", colors.param,
+ colors.end);
+ ds_put_format(fp->s, "%s", odf->field->name);
}
-\f
+
+static enum ofperr
+check_DELETE_FIELD(const struct ofpact_delete_field *odf,
+ struct ofpact_check_params *cp OVS_UNUSED)
+{
+ if (odf->field->id < MFF_TUN_METADATA0 ||
+ odf->field->id > MFF_TUN_METADATA63) {
+ return OFPERR_OFPBAC_BAD_ARGUMENT;
+ }
+ return 0;
+}
+\f
+/* Set queue action. */
+
+static enum ofperr
+decode_OFPAT_RAW_SET_QUEUE(uint32_t queue_id,
+ enum ofp_version ofp_version OVS_UNUSED,
+ struct ofpbuf *out)
+{
+ ofpact_put_SET_QUEUE(out)->queue_id = queue_id;
+ return 0;
+}
+
+static void
+encode_SET_QUEUE(const struct ofpact_queue *queue,
+ enum ofp_version ofp_version, struct ofpbuf *out)
+{
+ put_OFPAT_SET_QUEUE(out, ofp_version, queue->queue_id);
+}
+
+static char * OVS_WARN_UNUSED_RESULT
+parse_SET_QUEUE(char *arg, const struct ofpact_parse_params *pp)
+{
+ return str_to_u32(arg, &ofpact_put_SET_QUEUE(pp->ofpacts)->queue_id);
+}
+
+static void
+format_SET_QUEUE(const struct ofpact_queue *a,
+ const struct ofpact_format_params *fp)
+{
+ ds_put_format(fp->s, "%sset_queue:%s%"PRIu32,
+ colors.param, colors.end, a->queue_id);
+}
+
+static enum ofperr
+check_SET_QUEUE(const struct ofpact_queue *a OVS_UNUSED,
+ const struct ofpact_check_params *cp OVS_UNUSED)
+{
+ return 0;
+}
+\f
/* Pop queue action. */
static enum ofperr
}
static char * OVS_WARN_UNUSED_RESULT
-parse_POP_QUEUE(const char *arg OVS_UNUSED, struct ofpbuf *ofpacts,
- enum ofputil_protocol *usable_protocols OVS_UNUSED)
+parse_POP_QUEUE(const char *arg OVS_UNUSED,
+ const struct ofpact_parse_params *pp)
{
- ofpact_put_POP_QUEUE(ofpacts);
+ ofpact_put_POP_QUEUE(pp->ofpacts);
return NULL;
}
static void
-format_POP_QUEUE(const struct ofpact_null *a OVS_UNUSED, struct ds *s)
+format_POP_QUEUE(const struct ofpact_null *a OVS_UNUSED,
+ const struct ofpact_format_params *fp)
{
- ds_put_format(s, "%spop_queue%s", colors.value, colors.end);
+ ds_put_format(fp->s, "%spop_queue%s", colors.value, colors.end);
+}
+
+static enum ofperr
+check_POP_QUEUE(const struct ofpact_null *a OVS_UNUSED,
+ const struct ofpact_check_params *cp OVS_UNUSED)
+{
+ return 0;
}
\f
/* Action structure for NXAST_FIN_TIMEOUT.
}
static char * OVS_WARN_UNUSED_RESULT
-parse_FIN_TIMEOUT(char *arg, struct ofpbuf *ofpacts,
- enum ofputil_protocol *usable_protocols OVS_UNUSED)
+parse_FIN_TIMEOUT(char *arg, const struct ofpact_parse_params *pp)
{
- struct ofpact_fin_timeout *oft = ofpact_put_FIN_TIMEOUT(ofpacts);
+ struct ofpact_fin_timeout *oft = ofpact_put_FIN_TIMEOUT(pp->ofpacts);
char *key, *value;
while (ofputil_parse_key_value(&arg, &key, &value)) {
}
static void
-format_FIN_TIMEOUT(const struct ofpact_fin_timeout *a, struct ds *s)
+format_FIN_TIMEOUT(const struct ofpact_fin_timeout *a,
+ const struct ofpact_format_params *fp)
{
- ds_put_format(s, "%sfin_timeout(%s", colors.paren, colors.end);
+ ds_put_format(fp->s, "%sfin_timeout(%s", colors.paren, colors.end);
if (a->fin_idle_timeout) {
- ds_put_format(s, "%sidle_timeout=%s%"PRIu16",",
+ ds_put_format(fp->s, "%sidle_timeout=%s%"PRIu16",",
colors.param, colors.end, a->fin_idle_timeout);
}
if (a->fin_hard_timeout) {
- ds_put_format(s, "%shard_timeout=%s%"PRIu16",",
+ ds_put_format(fp->s, "%shard_timeout=%s%"PRIu16",",
colors.param, colors.end, a->fin_hard_timeout);
}
- ds_chomp(s, ',');
- ds_put_format(s, "%s)%s", colors.paren, colors.end);
+ ds_chomp(fp->s, ',');
+ ds_put_format(fp->s, "%s)%s", colors.paren, colors.end);
+}
+
+
+static enum ofperr
+check_FIN_TIMEOUT(const struct ofpact_fin_timeout *a OVS_UNUSED,
+ struct ofpact_check_params *cp)
+{
+ if (cp->match->flow.nw_proto != IPPROTO_TCP) {
+ inconsistent_match(&cp->usable_protocols);
+ }
+ return 0;
+}
+\f
+/* Action structure for NXAST_ENCAP */
+struct nx_action_encap {
+ ovs_be16 type; /* OFPAT_VENDOR. */
+ ovs_be16 len; /* Total size including any property TLVs. */
+ ovs_be32 vendor; /* NX_VENDOR_ID. */
+ ovs_be16 subtype; /* NXAST_ENCAP. */
+ ovs_be16 hdr_size; /* Header size in bytes, 0 = 'not specified'.*/
+ ovs_be32 new_pkt_type; /* Header type to add and PACKET_TYPE of result. */
+ struct ofp_ed_prop_header props[]; /* Encap TLV properties. */
+};
+OFP_ASSERT(sizeof(struct nx_action_encap) == 16);
+
+static enum ofperr
+decode_NXAST_RAW_ENCAP(const struct nx_action_encap *nae,
+ enum ofp_version ofp_version OVS_UNUSED,
+ struct ofpbuf *out)
+{
+ struct ofpact_encap *encap;
+ const struct ofp_ed_prop_header *ofp_prop;
+ size_t props_len;
+ uint16_t n_props = 0;
+ int err;
+
+ encap = ofpact_put_ENCAP(out);
+ encap->ofpact.raw = NXAST_RAW_ENCAP;
+ switch (ntohl(nae->new_pkt_type)) {
+ case PT_ETH:
+ case PT_NSH:
+ /* Add supported encap header types here. */
+ break;
+ default:
+ return OFPERR_NXBAC_BAD_HEADER_TYPE;
+ }
+ encap->new_pkt_type = nae->new_pkt_type;
+ encap->hdr_size = ntohs(nae->hdr_size);
+
+ ofp_prop = nae->props;
+ props_len = ntohs(nae->len) - offsetof(struct nx_action_encap, props);
+ n_props = 0;
+ while (props_len > 0) {
+ err = decode_ed_prop(&ofp_prop, out, &props_len);
+ if (err) {
+ return err;
+ }
+ n_props++;
+ }
+ encap->n_props = n_props;
+ out->header = &encap->ofpact;
+ ofpact_finish_ENCAP(out, &encap);
+
+ return 0;
+}
+
+static void
+encode_ENCAP(const struct ofpact_encap *encap,
+ enum ofp_version ofp_version OVS_UNUSED,
+ struct ofpbuf *out)
+{
+ size_t start_ofs = out->size;
+ struct nx_action_encap *nae = put_NXAST_ENCAP(out);
+ int i;
+
+ nae->new_pkt_type = encap->new_pkt_type;
+ nae->hdr_size = htons(encap->hdr_size);
+ const struct ofpact_ed_prop *prop = encap->props;
+ for (i = 0; i < encap->n_props; i++) {
+ encode_ed_prop(&prop, out);
+ }
+ pad_ofpat(out, start_ofs);
+}
+
+static bool
+parse_encap_header(const char *hdr, ovs_be32 *packet_type)
+{
+ if (strcmp(hdr, "ethernet") == 0) {
+ *packet_type = htonl(PT_ETH);
+ } else if (strcmp(hdr, "nsh") == 0) {
+ *packet_type = htonl(PT_NSH);
+ } else {
+ return false;
+ }
+ return true;
+}
+
+static char *
+parse_ed_props(const uint16_t prop_class, char **arg, int *n_props, struct ofpbuf *out)
+{
+ char *key, *value, *err;
+ uint8_t prop_type;
+
+ while (ofputil_parse_key_value(arg, &key, &value)) {
+ if (!parse_ed_prop_type(prop_class, key, &prop_type)) {
+ return xasprintf("Invalid property: %s", key);
+ }
+ if (value == NULL) {
+ return xasprintf("Missing the value for property: %s", key);
+ }
+ err = parse_ed_prop_value(prop_class, prop_type, value, out);
+ if (err != NULL) {
+ return err;
+ }
+ (*n_props)++;
+ }
+ return NULL;
+}
+
+/* The string representation of the encap action is
+ * encap(header_type(prop=<value>,tlv(<class>,<type>,<value>),...))
+ */
+
+static char * OVS_WARN_UNUSED_RESULT
+parse_ENCAP(char *arg, const struct ofpact_parse_params *pp)
+{
+ *pp->usable_protocols &= OFPUTIL_P_OF13_UP;
+
+ struct ofpact_encap *encap;
+ char *key, *value, *str;
+ char *error = NULL;
+ uint16_t prop_class;
+ int n_props = 0;
+
+ encap = ofpact_put_ENCAP(pp->ofpacts);
+ encap->hdr_size = 0;
+ /* Parse encap header type. */
+ str = arg;
+ if (!ofputil_parse_key_value(&arg, &key, &value)) {
+ return xasprintf("Missing encap hdr: %s", str);
+ }
+ if (!parse_encap_header(key, &encap->new_pkt_type)) {
+ return xasprintf("Encap hdr not supported: %s", value);
+ }
+ if (!parse_ed_prop_class(key, &prop_class)) {
+ return xasprintf("Invalid encap prop class: %s", key);
+ }
+ /* Parse encap properties. */
+ error = parse_ed_props(prop_class, &value, &n_props, pp->ofpacts);
+ if (error != NULL) {
+ return error;
+ }
+ /* ofpbuf may have been re-allocated. */
+ encap = pp->ofpacts->header;
+ encap->n_props = n_props;
+
+ if (ofpbuf_oversized(pp->ofpacts)) {
+ return xasprintf("input too big");
+ }
+
+ ofpact_finish_ENCAP(pp->ofpacts, &encap);
+ return NULL;
+}
+
+static char *
+format_encap_pkt_type(const ovs_be32 pkt_type)
+{
+ switch (ntohl(pkt_type)) {
+ case PT_ETH:
+ return "ethernet";
+ case PT_NSH:
+ return "nsh";
+ default:
+ return "UNKNOWN";
+ }
+}
+
+static void
+format_ed_props(struct ds *s, uint16_t n_props,
+ const struct ofpact_ed_prop *prop)
+{
+ const uint8_t *p = (uint8_t *) prop;
+ int i;
+
+ if (n_props == 0) {
+ return;
+ }
+ for (i = 0; i < n_props; i++) {
+ format_ed_prop(s, prop);
+ ds_put_char(s, ',');
+ p += ROUND_UP(prop->len, 8);
+ prop = ALIGNED_CAST(const struct ofpact_ed_prop *, p);
+ }
+ if (n_props > 0) {
+ ds_chomp(s, ',');
+ }
+}
+
+static void
+format_ENCAP(const struct ofpact_encap *a,
+ const struct ofpact_format_params *fp)
+{
+ ds_put_format(fp->s, "%sencap(%s", colors.paren, colors.end);
+ ds_put_format(fp->s, "%s", format_encap_pkt_type(a->new_pkt_type));
+ if (a->n_props > 0) {
+ ds_put_format(fp->s, "%s(%s", colors.paren, colors.end);
+ format_ed_props(fp->s, a->n_props, a->props);
+ ds_put_format(fp->s, "%s)%s", colors.paren, colors.end);
+ }
+ ds_put_format(fp->s, "%s)%s", colors.paren, colors.end);
+}
+
+static enum ofperr
+check_ENCAP(const struct ofpact_encap *a, struct ofpact_check_params *cp)
+{
+ struct flow *flow = &cp->match->flow;
+ flow->packet_type = a->new_pkt_type;
+ if (pt_ns(flow->packet_type) == OFPHTN_ETHERTYPE) {
+ flow->dl_type = htons(pt_ns_type(flow->packet_type));
+ }
+ if (!is_ip_any(flow)) {
+ flow->nw_proto = 0;
+ }
+ return 0;
+}
+\f
+/* Action structure for NXAST_DECAP */
+struct nx_action_decap {
+ ovs_be16 type; /* OFPAT_VENDOR. */
+ ovs_be16 len; /* Total size including any property TLVs. */
+ ovs_be32 vendor; /* NX_VENDOR_ID. */
+ ovs_be16 subtype; /* NXAST_DECAP. */
+ uint8_t pad[2]; /* 2 bytes padding */
+
+ /* Packet type or result.
+ *
+ * The special value (0,0xFFFE) "Use next proto"
+ * is used to request OVS to automatically set the new packet type based
+ * on the decap'ed header's next protocol.
+ */
+ ovs_be32 new_pkt_type;
+};
+OFP_ASSERT(sizeof(struct nx_action_decap) == 16);
+
+static enum ofperr
+decode_NXAST_RAW_DECAP(const struct nx_action_decap *nad,
+ enum ofp_version ofp_version OVS_UNUSED,
+ struct ofpbuf *ofpacts)
+{
+ struct ofpact_decap * decap;
+
+ if (ntohs(nad->len) > sizeof *nad) {
+ /* No properties supported yet. */
+ return OFPERR_NXBAC_UNKNOWN_ED_PROP;
+ }
+
+ decap = ofpact_put_DECAP(ofpacts);
+ decap->ofpact.raw = NXAST_RAW_DECAP;
+ decap->new_pkt_type = nad->new_pkt_type;
+ return 0;
+}
+
+static void
+encode_DECAP(const struct ofpact_decap *decap,
+ enum ofp_version ofp_version OVS_UNUSED, struct ofpbuf *out)
+{
+ struct nx_action_decap *nad = put_NXAST_DECAP(out);
+
+ nad->len = htons(sizeof(struct nx_action_decap));
+ nad->new_pkt_type = decap->new_pkt_type;
+}
+
+static char * OVS_WARN_UNUSED_RESULT
+parse_DECAP(char *arg, const struct ofpact_parse_params *pp)
+{
+ struct ofpact_decap *decap;
+ char *key, *value, *pos;
+ char *error = NULL;
+ uint16_t ns, type;
+
+ decap = ofpact_put_DECAP(pp->ofpacts);
+ /* Default next packet_type is PT_USE_NEXT_PROTO. */
+ decap->new_pkt_type = htonl(PT_USE_NEXT_PROTO);
+
+ /* Parse decap packet_type if given. */
+ if (ofputil_parse_key_value(&arg, &key, &value)) {
+ if (strcmp(key, "packet_type") == 0) {
+ pos = value;
+ if (!ofputil_parse_key_value(&pos, &key, &value)
+ || strcmp(key, "ns") != 0) {
+ return xstrdup("Missing packet_type attribute ns");
+ }
+ error = str_to_u16(value, "ns", &ns);
+ if (error) {
+ return error;
+ }
+ if (ns >= OFPHTN_N_TYPES) {
+ return xasprintf("Unsupported ns value: %"PRIu16, ns);
+ }
+ if (!ofputil_parse_key_value(&pos, &key, &value)
+ || strcmp(key, "type") != 0) {
+ return xstrdup("Missing packet_type attribute type");
+ }
+ error = str_to_u16(value, "type", &type);
+ if (error) {
+ return error;
+ }
+ decap->new_pkt_type = htonl(PACKET_TYPE(ns, type));
+ } else {
+ return xasprintf("Invalid decap argument: %s", key);
+ }
+ }
+ return NULL;
+}
+
+static void
+format_DECAP(const struct ofpact_decap *a,
+ const struct ofpact_format_params *fp)
+{
+ ds_put_format(fp->s, "%sdecap(%s", colors.paren, colors.end);
+ if (a->new_pkt_type != htonl(PT_USE_NEXT_PROTO)) {
+ ds_put_format(fp->s, "packet_type(ns=%"PRIu16",type=%#"PRIx16")",
+ pt_ns(a->new_pkt_type),
+ pt_ns_type(a->new_pkt_type));
+ }
+ ds_put_format(fp->s, "%s)%s", colors.paren, colors.end);
+}
+
+static enum ofperr
+check_DECAP(const struct ofpact_decap *a OVS_UNUSED,
+ struct ofpact_check_params *cp)
+{
+ struct flow *flow = &cp->match->flow;
+ if (flow->packet_type == htonl(PT_ETH)) {
+ /* Adjust the packet_type to allow subsequent actions. */
+ flow->packet_type = PACKET_TYPE_BE(OFPHTN_ETHERTYPE,
+ ntohs(flow->dl_type));
+ } else {
+ /* The actual packet_type is only known after decapsulation.
+ * Do not allow subsequent actions that depend on packet headers. */
+ flow->packet_type = htonl(PT_UNKNOWN);
+ flow->dl_type = OVS_BE16_MAX;
+ }
+ return 0;
+}
+
+/* Action dec_nsh_ttl */
+
+static enum ofperr
+decode_NXAST_RAW_DEC_NSH_TTL(struct ofpbuf *out)
+{
+ ofpact_put_DEC_NSH_TTL(out);
+ return 0;
+}
+
+static void
+encode_DEC_NSH_TTL(const struct ofpact_null *null OVS_UNUSED,
+ enum ofp_version ofp_version OVS_UNUSED, struct ofpbuf *out)
+{
+ put_NXAST_DEC_NSH_TTL(out);
+}
+
+static char * OVS_WARN_UNUSED_RESULT
+parse_DEC_NSH_TTL(char *arg OVS_UNUSED, const struct ofpact_parse_params *pp)
+{
+ ofpact_put_DEC_NSH_TTL(pp->ofpacts);
+ return NULL;
+}
+
+static void
+format_DEC_NSH_TTL(const struct ofpact_null *a OVS_UNUSED,
+ const struct ofpact_format_params *fp)
+{
+ ds_put_format(fp->s, "%sdec_nsh_ttl%s", colors.special, colors.end);
+}
+
+static enum ofperr
+check_DEC_NSH_TTL(const struct ofpact_null *a OVS_UNUSED,
+ struct ofpact_check_params *cp)
+{
+ struct flow *flow = &cp->match->flow;
+ if (flow->packet_type != htonl(PT_NSH) &&
+ flow->dl_type != htons(ETH_TYPE_NSH)) {
+ inconsistent_match(&cp->usable_protocols);
+ }
+ return 0;
}
\f
/* Action structures for NXAST_RESUBMIT, NXAST_RESUBMIT_TABLE, and
}
static char * OVS_WARN_UNUSED_RESULT
-parse_RESUBMIT(char *arg, struct ofpbuf *ofpacts,
- enum ofputil_protocol *usable_protocols OVS_UNUSED)
+parse_RESUBMIT(char *arg, const struct ofpact_parse_params *pp)
{
struct ofpact_resubmit *resubmit;
char *in_port_s, *table_s, *ct_s;
- resubmit = ofpact_put_RESUBMIT(ofpacts);
+ resubmit = ofpact_put_RESUBMIT(pp->ofpacts);
in_port_s = strsep(&arg, ",");
if (in_port_s && in_port_s[0]) {
- if (!ofputil_port_from_string(in_port_s, &resubmit->in_port)) {
+ if (!ofputil_port_from_string(in_port_s, pp->port_map,
+ &resubmit->in_port)) {
return xasprintf("%s: resubmit to unknown port", in_port_s);
}
} else {
table_s = strsep(&arg, ",");
if (table_s && table_s[0]) {
- uint32_t table_id = 0;
- char *error;
-
- error = str_to_u32(table_s, &table_id);
- if (error) {
- return error;
+ if (!ofputil_table_from_string(table_s, pp->table_map,
+ &resubmit->table_id)) {
+ return xasprintf("%s: resubmit to unknown table", table_s);
}
- resubmit->table_id = table_id;
} else {
resubmit->table_id = 255;
}
if (resubmit->in_port == OFPP_IN_PORT && resubmit->table_id == 255) {
return xstrdup("at least one \"in_port\" or \"table\" must be "
- "specified on resubmit");
+ "specified on resubmit");
}
return NULL;
}
static void
-format_RESUBMIT(const struct ofpact_resubmit *a, struct ds *s)
+format_RESUBMIT(const struct ofpact_resubmit *a,
+ const struct ofpact_format_params *fp)
{
if (a->in_port != OFPP_IN_PORT && a->table_id == 255) {
- ds_put_format(s, "%sresubmit:%s", colors.special, colors.end);
- ofputil_format_port(a->in_port, s);
+ ds_put_format(fp->s, "%sresubmit:%s", colors.special, colors.end);
+ ofputil_format_port(a->in_port, fp->port_map, fp->s);
} else {
- ds_put_format(s, "%sresubmit(%s", colors.paren, colors.end);
+ ds_put_format(fp->s, "%sresubmit(%s", colors.paren, colors.end);
if (a->in_port != OFPP_IN_PORT) {
- ofputil_format_port(a->in_port, s);
+ ofputil_format_port(a->in_port, fp->port_map, fp->s);
}
- ds_put_char(s, ',');
+ ds_put_char(fp->s, ',');
if (a->table_id != 255) {
- ds_put_format(s, "%"PRIu8, a->table_id);
+ ofputil_format_table(a->table_id, fp->table_map, fp->s);
}
if (a->with_ct_orig) {
- ds_put_cstr(s, ",ct");
+ ds_put_cstr(fp->s, ",ct");
}
- ds_put_format(s, "%s)%s", colors.paren, colors.end);
+ ds_put_format(fp->s, "%s)%s", colors.paren, colors.end);
+ }
+}
+
+static enum ofperr
+check_RESUBMIT(const struct ofpact_resubmit *a,
+ const struct ofpact_check_params *cp)
+{
+ if (a->with_ct_orig && !is_ct_valid(&cp->match->flow, &cp->match->wc,
+ NULL)) {
+ return OFPERR_OFPBAC_MATCH_INCONSISTENT;
}
+ return 0;
}
\f
/* Action structure for NXAST_LEARN and NXAST_LEARN2.
struct nx_action_learn2 {
struct nx_action_learn up; /* The wire format includes nx_action_learn. */
- ovs_be32 limit; /* Maximum number of learned flows. */
+ ovs_be32 limit; /* Maximum number of learned flows.
+ * 0 indicates unlimited. */
/* Where to store the result. */
ovs_be16 result_dst_ofs; /* Starting bit offset in destination. */
min_len += sizeof(ovs_be32); /* src_field */
min_len += sizeof(ovs_be16); /* src_ofs */
} else {
- min_len += DIV_ROUND_UP(n_bits, 16);
+ min_len += 2 * DIV_ROUND_UP(n_bits, 16);
}
if (dst_type == NX_LEARN_DST_MATCH ||
dst_type == NX_LEARN_DST_LOAD) {
static enum ofperr
decode_LEARN_common(const struct nx_action_learn *nal,
+ enum ofp_raw_action_type raw,
struct ofpact_learn *learn)
{
if (nal->pad) {
return OFPERR_OFPBAC_BAD_ARGUMENT;
}
+ learn->ofpact.raw = raw;
learn->idle_timeout = ntohs(nal->idle_timeout);
learn->hard_timeout = ntohs(nal->hard_timeout);
learn->priority = ntohs(nal->priority);
learn = ofpact_put_LEARN(ofpacts);
- error = decode_LEARN_common(nal, learn);
+ error = decode_LEARN_common(nal, NXAST_RAW_LEARN, learn);
if (error) {
return error;
}
}
learn = ofpact_put_LEARN(ofpacts);
- error = decode_LEARN_common(&nal->up, learn);
+ error = decode_LEARN_common(&nal->up, NXAST_RAW_LEARN2, learn);
if (error) {
return error;
}
}
static char * OVS_WARN_UNUSED_RESULT
-parse_LEARN(char *arg, struct ofpbuf *ofpacts,
- enum ofputil_protocol *usable_protocols OVS_UNUSED)
+parse_LEARN(char *arg, const struct ofpact_parse_params *pp)
{
- return learn_parse(arg, ofpacts);
+ return learn_parse(arg, pp->port_map, pp->table_map, pp->ofpacts);
}
static void
-format_LEARN(const struct ofpact_learn *a, struct ds *s)
+format_LEARN(const struct ofpact_learn *a,
+ const struct ofpact_format_params *fp)
+{
+ learn_format(a, fp->port_map, fp->table_map, fp->s);
+}
+
+static enum ofperr
+check_LEARN(const struct ofpact_learn *a,
+ const struct ofpact_check_params *cp)
{
- learn_format(a, s);
+ return learn_check(a, cp->match);
}
\f
/* Action structure for NXAST_CONJUNCTION. */
}
static void
-format_CONJUNCTION(const struct ofpact_conjunction *oc, struct ds *s)
+format_CONJUNCTION(const struct ofpact_conjunction *oc,
+ const struct ofpact_format_params *fp)
{
- ds_put_format(s, "%sconjunction(%s%"PRIu32",%"PRIu8"/%"PRIu8"%s)%s",
+ ds_put_format(fp->s, "%sconjunction(%s%"PRIu32",%d/%"PRIu8"%s)%s",
colors.paren, colors.end,
oc->id, oc->clause + 1, oc->n_clauses,
colors.paren, colors.end);
}
static char * OVS_WARN_UNUSED_RESULT
-parse_CONJUNCTION(const char *arg, struct ofpbuf *ofpacts,
- enum ofputil_protocol *usable_protocols OVS_UNUSED)
+parse_CONJUNCTION(const char *arg, const struct ofpact_parse_params *pp)
{
uint8_t n_clauses;
uint8_t clause;
"number of clauses");
}
- add_conjunction(ofpacts, id, clause - 1, n_clauses);
+ add_conjunction(pp->ofpacts, id, clause - 1, n_clauses);
return NULL;
}
+
+static enum ofperr
+check_CONJUNCTION(const struct ofpact_conjunction *a OVS_UNUSED,
+ const struct ofpact_check_params *cp OVS_UNUSED)
+{
+ return 0;
+}
\f
/* Action structure for NXAST_MULTIPATH.
*
}
static char * OVS_WARN_UNUSED_RESULT
-parse_MULTIPATH(const char *arg, struct ofpbuf *ofpacts,
- enum ofputil_protocol *usable_protocols OVS_UNUSED)
+parse_MULTIPATH(const char *arg, const struct ofpact_parse_params *pp)
{
- return multipath_parse(ofpact_put_MULTIPATH(ofpacts), arg);
+ return multipath_parse(ofpact_put_MULTIPATH(pp->ofpacts), arg);
}
static void
-format_MULTIPATH(const struct ofpact_multipath *a, struct ds *s)
+format_MULTIPATH(const struct ofpact_multipath *a,
+ const struct ofpact_format_params *fp)
+{
+ multipath_format(a, fp->s);
+}
+
+static enum ofperr
+check_MULTIPATH(const struct ofpact_multipath *a,
+ const struct ofpact_check_params *cp)
{
- multipath_format(a, s);
+ return multipath_check(a, cp->match);
}
\f
/* Action structure for NXAST_NOTE.
}
static char * OVS_WARN_UNUSED_RESULT
-parse_NOTE(const char *arg, struct ofpbuf *ofpacts,
- enum ofputil_protocol *usable_protocols OVS_UNUSED)
+parse_NOTE(const char *arg, const struct ofpact_parse_params *pp)
{
- size_t start_ofs = ofpacts->size;
- ofpact_put_NOTE(ofpacts);
- arg = ofpbuf_put_hex(ofpacts, arg, NULL);
+ size_t start_ofs = pp->ofpacts->size;
+ ofpact_put_NOTE(pp->ofpacts);
+ arg = ofpbuf_put_hex(pp->ofpacts, arg, NULL);
if (arg[0]) {
return xstrdup("bad hex digit in `note' argument");
}
- struct ofpact_note *note = ofpbuf_at_assert(ofpacts, start_ofs,
+ struct ofpact_note *note = ofpbuf_at_assert(pp->ofpacts, start_ofs,
sizeof *note);
- note->length = ofpacts->size - (start_ofs + sizeof *note);
- ofpact_finish_NOTE(ofpacts, ¬e);
+ note->length = pp->ofpacts->size - (start_ofs + sizeof *note);
+
+ if (ofpbuf_oversized(pp->ofpacts)) {
+ return xasprintf("input too big");
+ }
+
+ ofpact_finish_NOTE(pp->ofpacts, ¬e);
return NULL;
}
static void
-format_NOTE(const struct ofpact_note *a, struct ds *s)
+format_NOTE(const struct ofpact_note *a,
+ const struct ofpact_format_params *fp)
+{
+ ds_put_format(fp->s, "%snote:%s", colors.param, colors.end);
+ format_hex_arg(fp->s, a->data, a->length);
+}
+
+static enum ofperr
+check_NOTE(const struct ofpact_note *a OVS_UNUSED,
+ const struct ofpact_check_params *cp OVS_UNUSED)
{
- ds_put_format(s, "%snote:%s", colors.param, colors.end);
- format_hex_arg(s, a->data, a->length);
+ return 0;
}
\f
/* Exit action. */
}
static char * OVS_WARN_UNUSED_RESULT
-parse_EXIT(char *arg OVS_UNUSED, struct ofpbuf *ofpacts,
- enum ofputil_protocol *usable_protocols OVS_UNUSED)
+parse_EXIT(char *arg OVS_UNUSED, const struct ofpact_parse_params *pp)
{
- ofpact_put_EXIT(ofpacts);
+ ofpact_put_EXIT(pp->ofpacts);
return NULL;
}
static void
-format_EXIT(const struct ofpact_null *a OVS_UNUSED, struct ds *s)
+format_EXIT(const struct ofpact_null *a OVS_UNUSED,
+ const struct ofpact_format_params *fp)
+{
+ ds_put_format(fp->s, "%sexit%s", colors.special, colors.end);
+}
+
+static enum ofperr
+check_EXIT(const struct ofpact_null *a OVS_UNUSED,
+ const struct ofpact_check_params *cp OVS_UNUSED)
{
- ds_put_format(s, "%sexit%s", colors.special, colors.end);
+ return 0;
}
\f
/* Unroll xlate action. */
}
static char * OVS_WARN_UNUSED_RESULT
-parse_UNROLL_XLATE(char *arg OVS_UNUSED, struct ofpbuf *ofpacts OVS_UNUSED,
- enum ofputil_protocol *usable_protocols OVS_UNUSED)
+parse_UNROLL_XLATE(char *arg OVS_UNUSED,
+ const struct ofpact_parse_params *pp OVS_UNUSED)
{
- OVS_NOT_REACHED();
- return NULL;
+ return xasprintf("UNROLL is an internal action "
+ "that shouldn't be used via OpenFlow");
}
static void
-format_UNROLL_XLATE(const struct ofpact_unroll_xlate *a, struct ds *s)
+format_UNROLL_XLATE(const struct ofpact_unroll_xlate *a,
+ const struct ofpact_format_params *fp)
{
- ds_put_format(s, "%sunroll_xlate(%s%stable=%s%"PRIu8
- ", %scookie=%s%"PRIu64"%s)%s",
+ ds_put_format(fp->s, "%sunroll_xlate(%s%stable=%s",
colors.paren, colors.end,
- colors.special, colors.end, a->rule_table_id,
+ colors.special, colors.end);
+ ofputil_format_table(a->rule_table_id, fp->table_map, fp->s);
+ ds_put_format(fp->s, ", %scookie=%s%"PRIu64"%s)%s",
colors.param, colors.end, ntohll(a->rule_cookie),
colors.paren, colors.end);
}
-\f
-/* The NXAST_CLONE action is "struct ext_action_header", followed by zero or
+
+static enum ofperr
+check_UNROLL_XLATE(const struct ofpact_unroll_xlate *a OVS_UNUSED,
+ const struct ofpact_check_params *cp OVS_UNUSED)
+{
+ /* UNROLL is an internal action that should never be seen via OpenFlow. */
+ return OFPERR_OFPBAC_BAD_TYPE;
+}
+\f
+/* The NXAST_CLONE action is "struct ext_action_header", followed by zero or
* more embedded OpenFlow actions. */
static enum ofperr
ofp_version,
1u << OVSINST_OFPIT11_APPLY_ACTIONS,
out, 0, vl_mff_map, tlv_bitmap);
+ if (error) {
+ return error;
+ }
clone = ofpbuf_push_uninit(out, sizeof *clone);
out->header = &clone->ofpact;
ofpact_finish_CLONE(out, &clone);
const size_t ofs = out->size;
struct ext_action_header *eah;
- eah = put_NXAST_CLONE(out);
+ put_NXAST_CLONE(out);
len = ofpacts_put_openflow_actions(clone->actions,
ofpact_nest_get_action_len(clone),
out, ofp_version);
}
static char * OVS_WARN_UNUSED_RESULT
-parse_CLONE(char *arg, struct ofpbuf *ofpacts,
- enum ofputil_protocol *usable_protocols)
+parse_CLONE(char *arg, const struct ofpact_parse_params *pp)
{
- const size_t clone_offset = ofpacts_pull(ofpacts);
- struct ofpact_nest *clone = ofpact_put_CLONE(ofpacts);
+ const size_t clone_offset = ofpacts_pull(pp->ofpacts);
+ struct ofpact_nest *clone = ofpact_put_CLONE(pp->ofpacts);
char *error;
- ofpbuf_pull(ofpacts, sizeof *clone);
- error = ofpacts_parse_copy(arg, ofpacts, usable_protocols, false, 0);
+ ofpbuf_pull(pp->ofpacts, sizeof *clone);
+ error = ofpacts_parse_copy(arg, pp, false, OFPACT_CLONE);
/* header points to the action list */
- ofpacts->header = ofpbuf_push_uninit(ofpacts, sizeof *clone);
- clone = ofpacts->header;
+ pp->ofpacts->header = ofpbuf_push_uninit(pp->ofpacts, sizeof *clone);
+ clone = pp->ofpacts->header;
- ofpact_finish_CLONE(ofpacts, &clone);
- ofpbuf_push_uninit(ofpacts, clone_offset);
+ if (ofpbuf_oversized(pp->ofpacts)) {
+ free(error);
+ return xasprintf("input too big");
+ }
+
+ ofpact_finish_CLONE(pp->ofpacts, &clone);
+ ofpbuf_push_uninit(pp->ofpacts, clone_offset);
return error;
}
static void
-format_CLONE(const struct ofpact_nest *a, struct ds *s)
+format_CLONE(const struct ofpact_nest *a,
+ const struct ofpact_format_params *fp)
+{
+ ds_put_format(fp->s, "%sclone(%s", colors.paren, colors.end);
+ ofpacts_format(a->actions, ofpact_nest_get_action_len(a), fp);
+ ds_put_format(fp->s, "%s)%s", colors.paren, colors.end);
+}
+
+static enum ofperr
+check_subactions(struct ofpact *ofpacts, size_t ofpacts_len,
+ struct ofpact_check_params *cp)
+{
+ struct ofpact_check_params sub = *cp;
+ enum ofperr error = ofpacts_check(ofpacts, ofpacts_len, &sub);
+ cp->usable_protocols &= sub.usable_protocols;
+ return error;
+}
+
+static enum ofperr
+check_CLONE(struct ofpact_nest *a, struct ofpact_check_params *cp)
{
- ds_put_format(s, "%sclone(%s", colors.paren, colors.end);
- ofpacts_format(a->actions, ofpact_nest_get_action_len(a), s);
- ds_put_format(s, "%s)%s", colors.paren, colors.end);
+ return check_subactions(a->actions, ofpact_nest_get_action_len(a), cp);
}
\f
/* Action structure for NXAST_SAMPLE.
}
/* Parses 'arg' as the argument to a "sample" action, and appends such an
- * action to 'ofpacts'.
+ * action to 'pp->ofpacts'.
*
* Returns NULL if successful, otherwise a malloc()'d string describing the
* error. The caller is responsible for freeing the returned string. */
static char * OVS_WARN_UNUSED_RESULT
-parse_SAMPLE(char *arg, struct ofpbuf *ofpacts,
- enum ofputil_protocol *usable_protocols OVS_UNUSED)
+parse_SAMPLE(char *arg, const struct ofpact_parse_params *pp)
{
- struct ofpact_sample *os = ofpact_put_SAMPLE(ofpacts);
+ struct ofpact_sample *os = ofpact_put_SAMPLE(pp->ofpacts);
os->sampling_port = OFPP_NONE;
os->direction = NX_ACTION_SAMPLE_DEFAULT;
} else if (!strcmp(key, "obs_point_id")) {
error = str_to_u32(value, &os->obs_point_id);
} else if (!strcmp(key, "sampling_port")) {
- if (!ofputil_port_from_string(value, &os->sampling_port)) {
+ if (!ofputil_port_from_string(value, pp->port_map,
+ &os->sampling_port)) {
error = xasprintf("%s: unknown port", value);
}
} else if (!strcmp(key, "ingress")) {
}
static void
-format_SAMPLE(const struct ofpact_sample *a, struct ds *s)
+format_SAMPLE(const struct ofpact_sample *a,
+ const struct ofpact_format_params *fp)
{
- ds_put_format(s, "%ssample(%s%sprobability=%s%"PRIu16
+ ds_put_format(fp->s, "%ssample(%s%sprobability=%s%"PRIu16
",%scollector_set_id=%s%"PRIu32
",%sobs_domain_id=%s%"PRIu32
",%sobs_point_id=%s%"PRIu32,
colors.param, colors.end, a->obs_domain_id,
colors.param, colors.end, a->obs_point_id);
if (a->sampling_port != OFPP_NONE) {
- ds_put_format(s, ",%ssampling_port=%s%"PRIu32,
- colors.param, colors.end, a->sampling_port);
+ ds_put_format(fp->s, ",%ssampling_port=%s", colors.param, colors.end);
+ ofputil_format_port(a->sampling_port, fp->port_map, fp->s);
}
if (a->direction == NX_ACTION_SAMPLE_INGRESS) {
- ds_put_format(s, ",%singress%s", colors.param, colors.end);
+ ds_put_format(fp->s, ",%singress%s", colors.param, colors.end);
} else if (a->direction == NX_ACTION_SAMPLE_EGRESS) {
- ds_put_format(s, ",%segress%s", colors.param, colors.end);
+ ds_put_format(fp->s, ",%segress%s", colors.param, colors.end);
}
- ds_put_format(s, "%s)%s", colors.paren, colors.end);
+ ds_put_format(fp->s, "%s)%s", colors.paren, colors.end);
+}
+
+static enum ofperr
+check_SAMPLE(const struct ofpact_sample *a OVS_UNUSED,
+ const struct ofpact_check_params *cp OVS_UNUSED)
+{
+ return 0;
}
\f
-/* debug_recirc instruction. */
+/* debug instructions. */
static bool enable_debug;
}
static char * OVS_WARN_UNUSED_RESULT
-parse_DEBUG_RECIRC(char *arg OVS_UNUSED, struct ofpbuf *ofpacts,
- enum ofputil_protocol *usable_protocols OVS_UNUSED)
+parse_DEBUG_RECIRC(char *arg OVS_UNUSED, const struct ofpact_parse_params *pp)
+{
+ ofpact_put_DEBUG_RECIRC(pp->ofpacts);
+ return NULL;
+}
+
+static void
+format_DEBUG_RECIRC(const struct ofpact_null *a OVS_UNUSED,
+ const struct ofpact_format_params *fp)
+{
+ ds_put_format(fp->s, "%sdebug_recirc%s", colors.value, colors.end);
+}
+
+static enum ofperr
+check_DEBUG_RECIRC(const struct ofpact_null *a OVS_UNUSED,
+ const struct ofpact_check_params *cp OVS_UNUSED)
+{
+ return 0;
+}
+
+static enum ofperr
+decode_NXAST_RAW_DEBUG_SLOW(struct ofpbuf *out)
+{
+ if (!enable_debug) {
+ return OFPERR_OFPBAC_BAD_VENDOR_TYPE;
+ }
+
+ ofpact_put_DEBUG_SLOW(out);
+ return 0;
+}
+
+static void
+encode_DEBUG_SLOW(const struct ofpact_null *n OVS_UNUSED,
+ enum ofp_version ofp_version OVS_UNUSED,
+ struct ofpbuf *out)
+{
+ put_NXAST_DEBUG_SLOW(out);
+}
+
+static char * OVS_WARN_UNUSED_RESULT
+parse_DEBUG_SLOW(char *arg OVS_UNUSED, const struct ofpact_parse_params *pp)
{
- ofpact_put_DEBUG_RECIRC(ofpacts);
+ ofpact_put_DEBUG_SLOW(pp->ofpacts);
return NULL;
}
static void
-format_DEBUG_RECIRC(const struct ofpact_null *a OVS_UNUSED, struct ds *s)
+format_DEBUG_SLOW(const struct ofpact_null *a OVS_UNUSED,
+ const struct ofpact_format_params *fp)
{
- ds_put_format(s, "%sdebug_recirc%s", colors.value, colors.end);
+ ds_put_format(fp->s, "%sdebug_slow%s", colors.value, colors.end);
+}
+
+static enum ofperr
+check_DEBUG_SLOW(const struct ofpact_null *a OVS_UNUSED,
+ const struct ofpact_check_params *cp OVS_UNUSED)
+{
+ return 0;
}
/* Action structure for NXAST_CT.
*
* - Packet State:
*
- * Untracked packets have not yet passed through the connection tracker,
- * and the connection state for such packets is unknown. In most cases,
- * packets entering the OpenFlow pipeline will initially be in the
- * untracked state. Untracked packets may become tracked by executing
- * NXAST_CT with a "recirc_table" specified. This makes various aspects
- * about the connection available, in particular the connection state.
+ * Untracked packets have an unknown connection state. In most
+ * cases, packets entering the OpenFlow pipeline will initially be
+ * in the untracked state. Untracked packets may become tracked by
+ * executing NXAST_CT with a "recirc_table" specified. This makes
+ * various aspects about the connection available, in particular
+ * the connection state.
*
- * Tracked packets have previously passed through the connection tracker.
- * These packets will remain tracked through until the end of the OpenFlow
- * pipeline. Tracked packets which have NXAST_CT executed with a
- * "recirc_table" specified will return to the tracked state.
- *
- * The packet state is only significant for the duration of packet
- * processing within the OpenFlow pipeline.
+ * An NXAST_CT action always puts the packet into an untracked
+ * state for the current processing path. If "recirc_table" is
+ * set, execution is forked and the packet passes through the
+ * connection tracker. The specified table's processing path is
+ * able to match on Connection state until the end of the OpenFlow
+ * pipeline or NXAST_CT is called again.
*
* - Connection State:
*
out, OFPACT_CT, vl_mff_map,
tlv_bitmap);
if (error) {
- goto out;
+ return error;
}
conntrack = ofpbuf_push_uninit(out, sizeof(*conntrack));
nac->len = htons(len);
}
-static char * OVS_WARN_UNUSED_RESULT parse_NAT(char *arg, struct ofpbuf *,
- enum ofputil_protocol * OVS_UNUSED);
+static char *OVS_WARN_UNUSED_RESULT
+parse_NAT(char *arg, const struct ofpact_parse_params *pp);
/* Parses 'arg' as the argument to a "ct" action, and appends such an
- * action to 'ofpacts'.
+ * action to 'pp->ofpacts'.
*
* Returns NULL if successful, otherwise a malloc()'d string describing the
* error. The caller is responsible for freeing the returned string. */
static char * OVS_WARN_UNUSED_RESULT
-parse_CT(char *arg, struct ofpbuf *ofpacts,
- enum ofputil_protocol *usable_protocols)
+parse_CT(char *arg, const struct ofpact_parse_params *pp)
{
- const size_t ct_offset = ofpacts_pull(ofpacts);
+ const size_t ct_offset = ofpacts_pull(pp->ofpacts);
struct ofpact_conntrack *oc;
char *error = NULL;
char *key, *value;
- oc = ofpact_put_CT(ofpacts);
+ oc = ofpact_put_CT(pp->ofpacts);
oc->flags = 0;
oc->recirc_table = NX_CT_RECIRC_NONE;
while (ofputil_parse_key_value(&arg, &key, &value)) {
} else if (!strcmp(key, "force")) {
oc->flags |= NX_CT_F_FORCE;
} else if (!strcmp(key, "table")) {
- error = str_to_u8(value, "recirc_table", &oc->recirc_table);
- if (!error && oc->recirc_table == NX_CT_RECIRC_NONE) {
- error = xasprintf("invalid table %#"PRIx16, oc->recirc_table);
+ if (!ofputil_table_from_string(value, pp->table_map,
+ &oc->recirc_table)) {
+ error = xasprintf("unknown table %s", value);
+ } else if (oc->recirc_table == NX_CT_RECIRC_NONE) {
+ error = xasprintf("invalid table %#"PRIx8, oc->recirc_table);
}
} else if (!strcmp(key, "zone")) {
error = str_to_u16(value, "zone", &oc->zone_imm);
} else if (!strcmp(key, "alg")) {
error = str_to_connhelper(value, &oc->alg);
} else if (!strcmp(key, "nat")) {
- const size_t nat_offset = ofpacts_pull(ofpacts);
+ const size_t nat_offset = ofpacts_pull(pp->ofpacts);
- error = parse_NAT(value, ofpacts, usable_protocols);
+ error = parse_NAT(value, pp);
/* Update CT action pointer and length. */
- ofpacts->header = ofpbuf_push_uninit(ofpacts, nat_offset);
- oc = ofpacts->header;
+ pp->ofpacts->header = ofpbuf_push_uninit(pp->ofpacts, nat_offset);
+ oc = pp->ofpacts->header;
} else if (!strcmp(key, "exec")) {
/* Hide existing actions from ofpacts_parse_copy(), so the
* nesting can be handled transparently. */
enum ofputil_protocol usable_protocols2;
- const size_t exec_offset = ofpacts_pull(ofpacts);
+ const size_t exec_offset = ofpacts_pull(pp->ofpacts);
/* Initializes 'usable_protocol2', fold it back to
* '*usable_protocols' afterwards, so that we do not lose
* restrictions already in there. */
- error = ofpacts_parse_copy(value, ofpacts, &usable_protocols2,
- false, OFPACT_CT);
- *usable_protocols &= usable_protocols2;
- ofpacts->header = ofpbuf_push_uninit(ofpacts, exec_offset);
- oc = ofpacts->header;
+ struct ofpact_parse_params pp2 = *pp;
+ pp2.usable_protocols = &usable_protocols2;
+ error = ofpacts_parse_copy(value, &pp2, false, OFPACT_CT);
+ *pp->usable_protocols &= usable_protocols2;
+ pp->ofpacts->header = ofpbuf_push_uninit(pp->ofpacts, exec_offset);
+ oc = pp->ofpacts->header;
} else {
error = xasprintf("invalid argument to \"ct\" action: `%s'", key);
}
break;
}
}
- if (oc->flags & NX_CT_F_FORCE && !(oc->flags & NX_CT_F_COMMIT)) {
+ if (!error && oc->flags & NX_CT_F_FORCE && !(oc->flags & NX_CT_F_COMMIT)) {
error = xasprintf("\"force\" flag requires \"commit\" flag.");
}
- ofpact_finish_CT(ofpacts, &oc);
- ofpbuf_push_uninit(ofpacts, ct_offset);
+
+ if (ofpbuf_oversized(pp->ofpacts)) {
+ free(error);
+ return xasprintf("input too big");
+ }
+
+ ofpact_finish_CT(pp->ofpacts, &oc);
+ ofpbuf_push_uninit(pp->ofpacts, ct_offset);
return error;
}
}
}
-static void format_NAT(const struct ofpact_nat *a, struct ds *ds);
+static void format_NAT(const struct ofpact_nat *,
+ const struct ofpact_format_params *fp);
static void
-format_CT(const struct ofpact_conntrack *a, struct ds *s)
+format_CT(const struct ofpact_conntrack *a,
+ const struct ofpact_format_params *fp)
{
- ds_put_format(s, "%sct(%s", colors.paren, colors.end);
+ ds_put_format(fp->s, "%sct(%s", colors.paren, colors.end);
if (a->flags & NX_CT_F_COMMIT) {
- ds_put_format(s, "%scommit%s,", colors.value, colors.end);
+ ds_put_format(fp->s, "%scommit%s,", colors.value, colors.end);
}
if (a->flags & NX_CT_F_FORCE) {
- ds_put_format(s, "%sforce%s,", colors.value, colors.end);
+ ds_put_format(fp->s, "%sforce%s,", colors.value, colors.end);
}
if (a->recirc_table != NX_CT_RECIRC_NONE) {
- ds_put_format(s, "%stable=%s%"PRIu8",",
- colors.special, colors.end, a->recirc_table);
+ ds_put_format(fp->s, "%stable=%s", colors.special, colors.end);
+ ofputil_format_table(a->recirc_table, fp->table_map, fp->s);
+ ds_put_char(fp->s, ',');
}
if (a->zone_src.field) {
- ds_put_format(s, "%szone=%s", colors.param, colors.end);
- mf_format_subfield(&a->zone_src, s);
- ds_put_char(s, ',');
+ ds_put_format(fp->s, "%szone=%s", colors.param, colors.end);
+ mf_format_subfield(&a->zone_src, fp->s);
+ ds_put_char(fp->s, ',');
} else if (a->zone_imm) {
- ds_put_format(s, "%szone=%s%"PRIu16",",
+ ds_put_format(fp->s, "%szone=%s%"PRIu16",",
colors.param, colors.end, a->zone_imm);
}
/* If the first action is a NAT action, format it outside of the 'exec'
const struct ofpact *action = a->actions;
size_t actions_len = ofpact_ct_get_action_len(a);
if (actions_len && action->type == OFPACT_NAT) {
- format_NAT(ofpact_get_NAT(action), s);
- ds_put_char(s, ',');
+ format_NAT(ofpact_get_NAT(action), fp);
+ ds_put_char(fp->s, ',');
actions_len -= OFPACT_ALIGN(action->len);
action = ofpact_next(action);
}
if (actions_len) {
- ds_put_format(s, "%sexec(%s", colors.paren, colors.end);
- ofpacts_format(action, actions_len, s);
- ds_put_format(s, "%s),%s", colors.paren, colors.end);
+ ds_put_format(fp->s, "%sexec(%s", colors.paren, colors.end);
+ ofpacts_format(action, actions_len, fp);
+ ds_put_format(fp->s, "%s),%s", colors.paren, colors.end);
}
- format_alg(a->alg, s);
- ds_chomp(s, ',');
- ds_put_format(s, "%s)%s", colors.paren, colors.end);
+ format_alg(a->alg, fp->s);
+ ds_chomp(fp->s, ',');
+ ds_put_format(fp->s, "%s)%s", colors.paren, colors.end);
+}
+
+static enum ofperr
+check_CT(struct ofpact_conntrack *a, struct ofpact_check_params *cp)
+{
+ struct flow *flow = &cp->match->flow;
+
+ if (!dl_type_is_ip_any(get_dl_type(flow))
+ || (flow->ct_state & CS_INVALID && a->flags & NX_CT_F_COMMIT)
+ || (a->alg == IPPORT_FTP && flow->nw_proto != IPPROTO_TCP)
+ || (a->alg == IPPORT_TFTP && flow->nw_proto != IPPROTO_UDP)) {
+ /* We can't downgrade to OF1.0 and expect inconsistent CT actions
+ * be silently discarded. Instead, datapath flow install fails, so
+ * it is better to flag inconsistent CT actions as hard errors. */
+ return OFPERR_OFPBAC_MATCH_INCONSISTENT;
+ }
+
+ if (a->zone_src.field) {
+ return mf_check_src(&a->zone_src, cp->match);
+ }
+
+ return check_subactions(a->actions, ofpact_ct_get_action_len(a), cp);
}
\f
/* ct_clear action. */
}
static char * OVS_WARN_UNUSED_RESULT
-parse_CT_CLEAR(char *arg OVS_UNUSED, struct ofpbuf *ofpacts,
- enum ofputil_protocol *usable_protocols OVS_UNUSED)
+parse_CT_CLEAR(char *arg OVS_UNUSED, const struct ofpact_parse_params *pp)
{
- ofpact_put_CT_CLEAR(ofpacts);
+ ofpact_put_CT_CLEAR(pp->ofpacts);
return NULL;
}
static void
-format_CT_CLEAR(const struct ofpact_null *a OVS_UNUSED, struct ds *s)
+format_CT_CLEAR(const struct ofpact_null *a OVS_UNUSED,
+ const struct ofpact_format_params *fp)
+{
+ ds_put_format(fp->s, "%sct_clear%s", colors.value, colors.end);
+}
+
+static enum ofperr
+check_CT_CLEAR(const struct ofpact_null *a OVS_UNUSED,
+ const struct ofpact_check_params *cp OVS_UNUSED)
{
- ds_put_format(s, "%sct_clear%s", colors.value, colors.end);
-}\f
+ return 0;
+}
+\f
/* NAT action. */
/* Which optional fields are present? */
}
static void
-format_NAT(const struct ofpact_nat *a, struct ds *ds)
+format_NAT(const struct ofpact_nat *a, const struct ofpact_format_params *fp)
{
- ds_put_format(ds, "%snat%s", colors.paren, colors.end);
+ ds_put_format(fp->s, "%snat%s", colors.paren, colors.end);
if (a->flags & (NX_NAT_F_SRC | NX_NAT_F_DST)) {
- ds_put_format(ds, "%s(%s", colors.paren, colors.end);
- ds_put_format(ds, a->flags & NX_NAT_F_SRC ? "%ssrc%s" : "%sdst%s",
+ ds_put_format(fp->s, "%s(%s", colors.paren, colors.end);
+ ds_put_format(fp->s, a->flags & NX_NAT_F_SRC ? "%ssrc%s" : "%sdst%s",
colors.param, colors.end);
if (a->range_af != AF_UNSPEC) {
- ds_put_format(ds, "%s=%s", colors.param, colors.end);
+ ds_put_format(fp->s, "%s=%s", colors.param, colors.end);
if (a->range_af == AF_INET) {
- ds_put_format(ds, IP_FMT, IP_ARGS(a->range.addr.ipv4.min));
+ ds_put_format(fp->s, IP_FMT, IP_ARGS(a->range.addr.ipv4.min));
if (a->range.addr.ipv4.max
&& a->range.addr.ipv4.max != a->range.addr.ipv4.min) {
- ds_put_format(ds, "-"IP_FMT,
+ ds_put_format(fp->s, "-"IP_FMT,
IP_ARGS(a->range.addr.ipv4.max));
}
} else if (a->range_af == AF_INET6) {
- ipv6_format_addr_bracket(&a->range.addr.ipv6.min, ds,
+ ipv6_format_addr_bracket(&a->range.addr.ipv6.min, fp->s,
a->range.proto.min);
if (!ipv6_mask_is_any(&a->range.addr.ipv6.max)
&& memcmp(&a->range.addr.ipv6.max, &a->range.addr.ipv6.min,
sizeof(struct in6_addr)) != 0) {
- ds_put_char(ds, '-');
- ipv6_format_addr_bracket(&a->range.addr.ipv6.max, ds,
+ ds_put_char(fp->s, '-');
+ ipv6_format_addr_bracket(&a->range.addr.ipv6.max, fp->s,
a->range.proto.min);
}
}
if (a->range.proto.min) {
- ds_put_char(ds, ':');
- ds_put_format(ds, "%"PRIu16, a->range.proto.min);
+ ds_put_char(fp->s, ':');
+ ds_put_format(fp->s, "%"PRIu16, a->range.proto.min);
if (a->range.proto.max
&& a->range.proto.max != a->range.proto.min) {
- ds_put_format(ds, "-%"PRIu16, a->range.proto.max);
+ ds_put_format(fp->s, "-%"PRIu16, a->range.proto.max);
}
}
- ds_put_char(ds, ',');
+ ds_put_char(fp->s, ',');
if (a->flags & NX_NAT_F_PERSISTENT) {
- ds_put_format(ds, "%spersistent%s,",
+ ds_put_format(fp->s, "%spersistent%s,",
colors.value, colors.end);
}
if (a->flags & NX_NAT_F_PROTO_HASH) {
- ds_put_format(ds, "%shash%s,", colors.value, colors.end);
+ ds_put_format(fp->s, "%shash%s,", colors.value, colors.end);
}
if (a->flags & NX_NAT_F_PROTO_RANDOM) {
- ds_put_format(ds, "%srandom%s,", colors.value, colors.end);
+ ds_put_format(fp->s, "%srandom%s,", colors.value, colors.end);
}
}
- ds_chomp(ds, ',');
- ds_put_format(ds, "%s)%s", colors.paren, colors.end);
+ ds_chomp(fp->s, ',');
+ ds_put_format(fp->s, "%s)%s", colors.paren, colors.end);
}
}
/* Parses 'arg' as the argument to a "nat" action, and appends such an
- * action to 'ofpacts'.
+ * action to 'pp->ofpacts'.
*
* Returns NULL if successful, otherwise a malloc()'d string describing the
* error. The caller is responsible for freeing the returned string. */
static char * OVS_WARN_UNUSED_RESULT
-parse_NAT(char *arg, struct ofpbuf *ofpacts,
- enum ofputil_protocol *usable_protocols OVS_UNUSED)
+parse_NAT(char *arg, const struct ofpact_parse_params *pp)
{
- struct ofpact_nat *on = ofpact_put_NAT(ofpacts);
+ struct ofpact_nat *on = ofpact_put_NAT(pp->ofpacts);
char *key, *value;
on->flags = 0;
return NULL;
}
+static enum ofperr
+check_NAT(const struct ofpact_nat *a, const struct ofpact_check_params *cp)
+{
+ ovs_be16 dl_type = get_dl_type(&cp->match->flow);
+ if (!dl_type_is_ip_any(dl_type) ||
+ (a->range_af == AF_INET && dl_type != htons(ETH_TYPE_IP)) ||
+ (a->range_af == AF_INET6 && dl_type != htons(ETH_TYPE_IPV6))) {
+ return OFPERR_OFPBAC_MATCH_INCONSISTENT;
+ }
+ return 0;
+}
+\f
/* Truncate output action. */
struct nx_action_output_trunc {
ovs_be16 type; /* OFPAT_VENDOR. */
}
static char * OVS_WARN_UNUSED_RESULT
-parse_OUTPUT_TRUNC(const char *arg, struct ofpbuf *ofpacts OVS_UNUSED,
- enum ofputil_protocol *usable_protocols OVS_UNUSED)
+parse_OUTPUT_TRUNC(const char *arg,
+ const struct ofpact_parse_params *pp OVS_UNUSED)
{
/* Disable output_trunc parsing. Expose as output(port=N,max_len=M) and
* reuse parse_OUTPUT to parse output_trunc action. */
}
static void
-format_OUTPUT_TRUNC(const struct ofpact_output_trunc *a, struct ds *s)
+format_OUTPUT_TRUNC(const struct ofpact_output_trunc *a,
+ const struct ofpact_format_params *fp)
{
- ds_put_format(s, "%soutput%s(port=%"PRIu32",max_len=%"PRIu32")",
- colors.special, colors.end, a->port, a->max_len);
+ ds_put_format(fp->s, "%soutput%s(port=", colors.special, colors.end);
+ ofputil_format_port(a->port, fp->port_map, fp->s);
+ ds_put_format(fp->s, ",max_len=%"PRIu32")", a->max_len);
}
+static enum ofperr
+check_OUTPUT_TRUNC(const struct ofpact_output_trunc *a,
+ const struct ofpact_check_params *cp)
+{
+ return ofpact_check_output_port(a->port, cp->max_ports);
+}
\f
-/* Meter instruction. */
+/* Meter.
+ *
+ * In OpenFlow 1.3 and 1.4, "meter" is an instruction.
+ * In OpenFlow 1.5 and later, "meter" is an action.
+ *
+ * OpenFlow 1.5 */
+
+static enum ofperr
+decode_OFPAT_RAW15_METER(uint32_t meter_id,
+ enum ofp_version ofp_version OVS_UNUSED,
+ struct ofpbuf *out)
+{
+ struct ofpact_meter *om = ofpact_put_METER(out);
+ om->meter_id = meter_id;
+ om->provider_meter_id = UINT32_MAX; /* No provider meter ID. */
+ return 0;
+}
static void
encode_METER(const struct ofpact_meter *meter,
enum ofp_version ofp_version, struct ofpbuf *out)
{
- if (ofp_version >= OFP13_VERSION) {
+ if (ofp_version == OFP13_VERSION || ofp_version == OFP14_VERSION) {
instruction_put_OFPIT13_METER(out)->meter_id = htonl(meter->meter_id);
+ } else if (ofp_version >= OFP15_VERSION) {
+ put_OFPAT15_METER(out, meter->meter_id);
}
}
static char * OVS_WARN_UNUSED_RESULT
-parse_METER(char *arg, struct ofpbuf *ofpacts,
- enum ofputil_protocol *usable_protocols)
+parse_METER(char *arg, const struct ofpact_parse_params *pp)
{
- *usable_protocols &= OFPUTIL_P_OF13_UP;
- return str_to_u32(arg, &ofpact_put_METER(ofpacts)->meter_id);
+ *pp->usable_protocols &= OFPUTIL_P_OF13_UP;
+ return str_to_u32(arg, &ofpact_put_METER(pp->ofpacts)->meter_id);
}
static void
-format_METER(const struct ofpact_meter *a, struct ds *s)
+format_METER(const struct ofpact_meter *a,
+ const struct ofpact_format_params *fp)
{
- ds_put_format(s, "%smeter:%s%"PRIu32,
+ ds_put_format(fp->s, "%smeter:%s%"PRIu32,
colors.param, colors.end, a->meter_id);
}
+
+static enum ofperr
+check_METER(const struct ofpact_meter *a,
+ const struct ofpact_check_params *cp OVS_UNUSED)
+{
+ uint32_t mid = a->meter_id;
+ return mid == 0 || mid > OFPM13_MAX ? OFPERR_OFPMMFC_INVALID_METER : 0;
+}
\f
/* Clear-Actions instruction. */
}
static char * OVS_WARN_UNUSED_RESULT
-parse_CLEAR_ACTIONS(char *arg OVS_UNUSED, struct ofpbuf *ofpacts,
- enum ofputil_protocol *usable_protocols OVS_UNUSED)
+parse_CLEAR_ACTIONS(char *arg OVS_UNUSED, const struct ofpact_parse_params *pp)
{
- ofpact_put_CLEAR_ACTIONS(ofpacts);
+ ofpact_put_CLEAR_ACTIONS(pp->ofpacts);
return NULL;
}
static void
-format_CLEAR_ACTIONS(const struct ofpact_null *a OVS_UNUSED, struct ds *s)
+format_CLEAR_ACTIONS(const struct ofpact_null *a OVS_UNUSED,
+ const struct ofpact_format_params *fp)
{
- ds_put_format(s, "%sclear_actions%s", colors.value, colors.end);
+ ds_put_format(fp->s, "%sclear_actions%s", colors.value, colors.end);
+}
+
+static enum ofperr
+check_CLEAR_ACTIONS(const struct ofpact_null *a OVS_UNUSED,
+ const struct ofpact_check_params *cp OVS_UNUSED)
+{
+ return 0;
}
\f
/* Write-Actions instruction. */
}
static char * OVS_WARN_UNUSED_RESULT
-parse_WRITE_ACTIONS(char *arg, struct ofpbuf *ofpacts,
- enum ofputil_protocol *usable_protocols)
+parse_WRITE_ACTIONS(char *arg, const struct ofpact_parse_params *pp)
{
- size_t ofs = ofpacts_pull(ofpacts);
+ size_t ofs = ofpacts_pull(pp->ofpacts);
struct ofpact_nest *on;
char *error;
/* Add a Write-Actions instruction and then pull it off. */
- ofpact_put(ofpacts, OFPACT_WRITE_ACTIONS, sizeof *on);
- ofpbuf_pull(ofpacts, sizeof *on);
+ ofpact_put(pp->ofpacts, OFPACT_WRITE_ACTIONS, sizeof *on);
+ ofpbuf_pull(pp->ofpacts, sizeof *on);
/* Parse nested actions.
*
* that it doesn't actually include the nested actions. That means that
* ofpacts_parse() would reject them as being part of an Apply-Actions that
* follows a Write-Actions, which is an invalid order. */
- error = ofpacts_parse(arg, ofpacts, usable_protocols, false,
- OFPACT_WRITE_ACTIONS);
+ error = ofpacts_parse(arg, pp, false, OFPACT_WRITE_ACTIONS);
/* Put the Write-Actions back on and update its length. */
- on = ofpbuf_push_uninit(ofpacts, sizeof *on);
- on->ofpact.len = ofpacts->size;
+ on = ofpbuf_push_uninit(pp->ofpacts, sizeof *on);
+ on->ofpact.len = pp->ofpacts->size;
/* Put any previous actions or instructions back on. */
- ofpbuf_push_uninit(ofpacts, ofs);
+ ofpbuf_push_uninit(pp->ofpacts, ofs);
return error;
}
static void
-format_WRITE_ACTIONS(const struct ofpact_nest *a, struct ds *s)
+format_WRITE_ACTIONS(const struct ofpact_nest *a,
+ const struct ofpact_format_params *fp)
{
- ds_put_format(s, "%swrite_actions(%s", colors.paren, colors.end);
- ofpacts_format(a->actions, ofpact_nest_get_action_len(a), s);
- ds_put_format(s, "%s)%s", colors.paren, colors.end);
+ ds_put_format(fp->s, "%swrite_actions(%s", colors.paren, colors.end);
+ ofpacts_format(a->actions, ofpact_nest_get_action_len(a), fp);
+ ds_put_format(fp->s, "%s)%s", colors.paren, colors.end);
+}
+
+static enum ofperr
+check_WRITE_ACTIONS(struct ofpact_nest *a,
+ const struct ofpact_check_params *cp)
+{
+ /* Use a temporary copy of 'cp' to avoid updating 'cp->usable_protocols',
+ * since we can't check consistency of an action set. */
+ struct ofpact_check_params tmp = *cp;
+ return ofpacts_check(a->actions, ofpact_nest_get_action_len(a), &tmp);
}
\f
/* Action structure for NXAST_WRITE_METADATA.
}
static char * OVS_WARN_UNUSED_RESULT
-parse_WRITE_METADATA(char *arg, struct ofpbuf *ofpacts,
- enum ofputil_protocol *usable_protocols)
+parse_WRITE_METADATA(char *arg, const struct ofpact_parse_params *pp)
{
struct ofpact_metadata *om;
char *mask = strchr(arg, '/');
- *usable_protocols &= OFPUTIL_P_NXM_OF11_UP;
+ *pp->usable_protocols &= OFPUTIL_P_NXM_OF11_UP;
- om = ofpact_put_WRITE_METADATA(ofpacts);
+ om = ofpact_put_WRITE_METADATA(pp->ofpacts);
if (mask) {
char *error;
}
static void
-format_WRITE_METADATA(const struct ofpact_metadata *a, struct ds *s)
+format_WRITE_METADATA(const struct ofpact_metadata *a,
+ const struct ofpact_format_params *fp)
{
- ds_put_format(s, "%swrite_metadata:%s%#"PRIx64,
+ ds_put_format(fp->s, "%swrite_metadata:%s%#"PRIx64,
colors.param, colors.end, ntohll(a->metadata));
if (a->mask != OVS_BE64_MAX) {
- ds_put_format(s, "/%#"PRIx64, ntohll(a->mask));
+ ds_put_format(fp->s, "/%#"PRIx64, ntohll(a->mask));
}
}
+
+static enum ofperr
+check_WRITE_METADATA(const struct ofpact_metadata *a OVS_UNUSED,
+ const struct ofpact_check_params *cp OVS_UNUSED)
+{
+ return 0;
+}
\f
+/* Check packet length action. */
+
+struct nx_action_check_pkt_larger {
+ ovs_be16 type; /* OFPAT_VENDOR. */
+ ovs_be16 len; /* 24. */
+ ovs_be32 vendor; /* NX_VENDOR_ID. */
+ ovs_be16 subtype; /* NXAST_OUTPUT_REG. */
+ ovs_be16 pkt_len; /* Length of the packet to check. */
+ ovs_be16 offset; /* Result bit offset in destination. */
+ /* Followed by:
+ * - 'dst', as an OXM/NXM header (either 4 or 8 bytes).
+ * - Enough 0-bytes to pad the action out to 24 bytes. */
+ uint8_t pad[10];
+};
+
+OFP_ASSERT(sizeof(struct nx_action_check_pkt_larger) == 24);
+
+static enum ofperr
+decode_NXAST_RAW_CHECK_PKT_LARGER(
+ const struct nx_action_check_pkt_larger *ncpl,
+ enum ofp_version ofp_version OVS_UNUSED,
+ const struct vl_mff_map *vl_mff_map, uint64_t *tlv_bitmap,
+ struct ofpbuf *out)
+{
+ struct ofpact_check_pkt_larger *check_pkt_larger;
+ enum ofperr error;
+
+ check_pkt_larger = ofpact_put_CHECK_PKT_LARGER(out);
+ check_pkt_larger->pkt_len = ntohs(ncpl->pkt_len);
+ check_pkt_larger->dst.ofs = ntohs(ncpl->offset);
+ check_pkt_larger->dst.n_bits = 1;
+
+ struct ofpbuf b = ofpbuf_const_initializer(ncpl, ntohs(ncpl->len));
+ ofpbuf_pull(&b, OBJECT_OFFSETOF(ncpl, pad));
+
+ error = mf_vl_mff_nx_pull_header(&b, vl_mff_map,
+ &check_pkt_larger->dst.field,
+ NULL, tlv_bitmap);
+ if (error) {
+ return error;
+ }
+
+ if (!is_all_zeros(b.data, b.size)) {
+ return OFPERR_NXBRC_MUST_BE_ZERO;
+ }
+
+ return mf_check_dst(&check_pkt_larger->dst, NULL);
+}
+
+static void
+encode_CHECK_PKT_LARGER(const struct ofpact_check_pkt_larger *check_pkt_larger,
+ enum ofp_version ofp_version OVS_UNUSED,
+ struct ofpbuf *out)
+{
+ struct nx_action_check_pkt_larger *ncpl = put_NXAST_CHECK_PKT_LARGER(out);
+ ncpl->pkt_len = htons(check_pkt_larger->pkt_len);
+ ncpl->offset = htons(check_pkt_larger->dst.ofs);
+
+ if (check_pkt_larger->dst.field) {
+ size_t size = out->size;
+ out->size = size - sizeof ncpl->pad;
+ nx_put_mff_header(out, check_pkt_larger->dst.field, 0, false);
+ out->size = size;
+ }
+}
+
+static char * OVS_WARN_UNUSED_RESULT
+parse_CHECK_PKT_LARGER(char *arg, const struct ofpact_parse_params *pp)
+{
+ char *value;
+ char *delim;
+ char *key;
+ char *error = set_field_split_str(arg, &key, &value, &delim);
+ if (error) {
+ return error;
+ }
+
+ delim[0] = '\0';
+ if (value[strlen(value) - 1] == ')') {
+ value[strlen(value) - 1] = '\0';
+ }
+ struct mf_subfield dst;
+ error = mf_parse_subfield(&dst, key);
+ if (error) {
+ return error;
+ }
+
+ if (dst.n_bits != 1) {
+ return xstrdup("Only 1-bit destination field is allowed");
+ }
+
+ struct ofpact_check_pkt_larger *check_pkt_larger =
+ ofpact_put_CHECK_PKT_LARGER(pp->ofpacts);
+ error = str_to_u16(value, NULL, &check_pkt_larger->pkt_len);
+ if (error) {
+ return error;
+ }
+ check_pkt_larger->dst = dst;
+ return NULL;
+}
+
+static void
+format_CHECK_PKT_LARGER(const struct ofpact_check_pkt_larger *a,
+ const struct ofpact_format_params *fp)
+{
+ ds_put_format(fp->s, "%scheck_pkt_larger(%s%"PRIu32")->",
+ colors.param, colors.end, a->pkt_len);
+ mf_format_subfield(&a->dst, fp->s);
+}
+
+static enum ofperr
+check_CHECK_PKT_LARGER(const struct ofpact_check_pkt_larger *a OVS_UNUSED,
+ const struct ofpact_check_params *cp OVS_UNUSED)
+{
+ return 0;
+}
+\f
+
/* Goto-Table instruction. */
static void
}
static char * OVS_WARN_UNUSED_RESULT
-parse_GOTO_TABLE(char *arg, struct ofpbuf *ofpacts,
- enum ofputil_protocol *usable_protocols OVS_UNUSED)
+parse_GOTO_TABLE(char *arg, const struct ofpact_parse_params *pp)
{
- struct ofpact_goto_table *ogt = ofpact_put_GOTO_TABLE(ofpacts);
- char *table_s = strsep(&arg, ",");
- if (!table_s || !table_s[0]) {
- return xstrdup("instruction goto-table needs table id");
+ struct ofpact_goto_table *ogt = ofpact_put_GOTO_TABLE(pp->ofpacts);
+ if (!ofputil_table_from_string(arg, pp->table_map, &ogt->table_id)) {
+ return xasprintf("unknown table \"%s\"", arg);
}
- return str_to_u8(table_s, "table", &ogt->table_id);
+ return NULL;
}
static void
-format_GOTO_TABLE(const struct ofpact_goto_table *a, struct ds *s)
+format_GOTO_TABLE(const struct ofpact_goto_table *a,
+ const struct ofpact_format_params *fp)
{
- ds_put_format(s, "%sgoto_table:%s%"PRIu8,
- colors.param, colors.end, a->table_id);
+ ds_put_format(fp->s, "%sgoto_table:%s", colors.param, colors.end);
+ ofputil_format_table(a->table_id, fp->table_map, fp->s);
+}
+
+static enum ofperr
+check_GOTO_TABLE(const struct ofpact_goto_table *a,
+ const struct ofpact_check_params *cp)
+{
+ if ((cp->table_id != 255 && a->table_id <= cp->table_id)
+ || (cp->n_tables != 255 && a->table_id >= cp->n_tables)) {
+ return OFPERR_OFPBIC_BAD_TABLE_ID;
+ }
+ return 0;
}
\f
static void
uint64_t *ofpacts_tlv_bitmap)
{
const struct ofp_action_header *actions;
- size_t orig_size = ofpacts->size;
enum ofperr error;
if (actions_len % OFP_ACTION_ALIGN != 0) {
error = ofpacts_decode(actions, actions_len, version, vl_mff_map,
ofpacts_tlv_bitmap, ofpacts);
- if (error) {
- ofpacts->size = orig_size;
- return error;
+ if (!error) {
+ error = ofpacts_verify(ofpacts->data, ofpacts->size, version,
+ allowed_ovsinsts, outer_action, NULL);
}
-
- error = ofpacts_verify(ofpacts->data, ofpacts->size, allowed_ovsinsts,
- outer_action);
if (error) {
- ofpacts->size = orig_size;
+ ofpbuf_clear(ofpacts);
}
return error;
}
/* Attempts to convert 'actions_len' bytes of OpenFlow actions from the front
* of 'openflow' into ofpacts. On success, appends the converted actions to
- * 'ofpacts'; on failure, 'ofpacts' is unchanged (but might be reallocated) .
- * Returns 0 if successful, otherwise an OpenFlow error.
+ * 'ofpacts'; on failure, clears 'ofpacts'. Returns 0 if successful, otherwise
+ * an OpenFlow error.
*
* Actions are processed according to their OpenFlow version which
* is provided in the 'version' parameter.
uint64_t *ofpacts_tlv_bitmap,
struct ofpbuf *ofpacts)
{
- return ofpacts_pull_openflow_actions__(openflow, actions_len, version,
- 1u << OVSINST_OFPIT11_APPLY_ACTIONS,
- ofpacts, 0, vl_mff_map,
- ofpacts_tlv_bitmap);
+ return ofpacts_pull_openflow_actions__(
+ openflow, actions_len, version,
+ (1u << OVSINST_OFPIT11_APPLY_ACTIONS) | (1u << OVSINST_OFPIT13_METER),
+ ofpacts, 0, vl_mff_map, ofpacts_tlv_bitmap);
}
\f
-/* OpenFlow 1.1 actions. */
-
+/* OpenFlow 1.1 action sets. */
-/* True if an action sets the value of a field
- * in a way that is compatibile with the action set.
- * The field can be set via either a set or a move action.
- * False otherwise. */
-static bool
-ofpact_is_set_or_move_action(const struct ofpact *a)
+/* Append ofpact 'a' onto the tail of 'out' */
+static void
+ofpact_copy(struct ofpbuf *out, const struct ofpact *a)
{
- switch (a->type) {
- case OFPACT_SET_FIELD:
- case OFPACT_REG_MOVE:
- case OFPACT_SET_ETH_DST:
- case OFPACT_SET_ETH_SRC:
- case OFPACT_SET_IP_DSCP:
- case OFPACT_SET_IP_ECN:
- case OFPACT_SET_IP_TTL:
- case OFPACT_SET_IPV4_DST:
- case OFPACT_SET_IPV4_SRC:
- case OFPACT_SET_L4_DST_PORT:
- case OFPACT_SET_L4_SRC_PORT:
- case OFPACT_SET_MPLS_LABEL:
- case OFPACT_SET_MPLS_TC:
- case OFPACT_SET_MPLS_TTL:
- case OFPACT_SET_QUEUE:
- case OFPACT_SET_TUNNEL:
- case OFPACT_SET_VLAN_PCP:
- case OFPACT_SET_VLAN_VID:
- return true;
- case OFPACT_BUNDLE:
- case OFPACT_CLEAR_ACTIONS:
- case OFPACT_CT:
- case OFPACT_CT_CLEAR:
- case OFPACT_CLONE:
- case OFPACT_NAT:
- case OFPACT_CONTROLLER:
- case OFPACT_DEC_MPLS_TTL:
- case OFPACT_DEC_TTL:
- case OFPACT_ENQUEUE:
- case OFPACT_EXIT:
- case OFPACT_UNROLL_XLATE:
- case OFPACT_FIN_TIMEOUT:
- case OFPACT_GOTO_TABLE:
- case OFPACT_GROUP:
- case OFPACT_LEARN:
- case OFPACT_CONJUNCTION:
- case OFPACT_METER:
- case OFPACT_MULTIPATH:
- case OFPACT_NOTE:
- case OFPACT_OUTPUT:
- case OFPACT_OUTPUT_REG:
- case OFPACT_OUTPUT_TRUNC:
- case OFPACT_POP_MPLS:
- case OFPACT_POP_QUEUE:
- case OFPACT_PUSH_MPLS:
- case OFPACT_PUSH_VLAN:
- case OFPACT_RESUBMIT:
- case OFPACT_SAMPLE:
- case OFPACT_STACK_POP:
- case OFPACT_STACK_PUSH:
- case OFPACT_STRIP_VLAN:
- case OFPACT_WRITE_ACTIONS:
- case OFPACT_WRITE_METADATA:
- case OFPACT_DEBUG_RECIRC:
- return false;
- default:
- OVS_NOT_REACHED();
- }
+ ofpbuf_put(out, a, OFPACT_ALIGN(a->len));
}
-/* True if an action is allowed in the action set.
- * False otherwise. */
-static bool
-ofpact_is_allowed_in_actions_set(const struct ofpact *a)
-{
- switch (a->type) {
- case OFPACT_DEC_MPLS_TTL:
- case OFPACT_DEC_TTL:
- case OFPACT_GROUP:
- case OFPACT_OUTPUT:
- case OFPACT_OUTPUT_TRUNC:
- case OFPACT_POP_MPLS:
- case OFPACT_PUSH_MPLS:
- case OFPACT_PUSH_VLAN:
- case OFPACT_REG_MOVE:
+/* The order in which actions in an action set get executed. This is only for
+ * the actions where only the last instance added is used. */
+#define ACTION_SET_ORDER \
+ SLOT(OFPACT_STRIP_VLAN) \
+ SLOT(OFPACT_POP_MPLS) \
+ SLOT(OFPACT_DECAP) \
+ SLOT(OFPACT_ENCAP) \
+ SLOT(OFPACT_PUSH_MPLS) \
+ SLOT(OFPACT_PUSH_VLAN) \
+ SLOT(OFPACT_DEC_TTL) \
+ SLOT(OFPACT_DEC_MPLS_TTL) \
+ SLOT(OFPACT_DEC_NSH_TTL)
+
+/* Priority for "final actions" in an action set. An action set only gets
+ * executed at all if at least one of these actions is present. If more than
+ * one is present, then only the one later in this list is executed (and if
+ * more than one of a given type, the one later in the action set). */
+#define ACTION_SET_FINAL_PRIORITY \
+ FINAL(OFPACT_CT) \
+ FINAL(OFPACT_CT_CLEAR) \
+ FINAL(OFPACT_RESUBMIT) \
+ FINAL(OFPACT_OUTPUT) \
+ FINAL(OFPACT_GROUP)
+
+enum action_set_class {
+ /* Actions that individually can usefully appear only once in an action
+ * set. If they do appear more than once, then only the last instance is
+ * honored. */
+#define SLOT(OFPACT) ACTION_SLOT_##OFPACT,
+ ACTION_SET_ORDER
+#undef SLOT
+
+ /* Final actions. */
+#define FINAL(OFPACT) ACTION_SLOT_##OFPACT,
+ ACTION_SET_FINAL_PRIORITY
+#undef FINAL
+
+ /* Actions that can appear in an action set more than once and are executed
+ * in order. */
+ ACTION_SLOT_SET_OR_MOVE,
+
+ /* Actions that shouldn't appear in the action set at all. */
+ ACTION_SLOT_INVALID
+};
+
+/* Count the action set slots. */
+#define SLOT(OFPACT) +1
+enum { N_ACTION_SLOTS = ACTION_SET_ORDER };
+#undef SLOT
+
+static enum action_set_class
+action_set_classify(const struct ofpact *a)
+{
+ switch (a->type) {
+#define SLOT(OFPACT) case OFPACT: return ACTION_SLOT_##OFPACT;
+ ACTION_SET_ORDER
+#undef SLOT
+
+#define FINAL(OFPACT) case OFPACT: return ACTION_SLOT_##OFPACT;
+ ACTION_SET_FINAL_PRIORITY
+#undef FINAL
+
case OFPACT_SET_FIELD:
+ case OFPACT_REG_MOVE:
case OFPACT_SET_ETH_DST:
case OFPACT_SET_ETH_SRC:
case OFPACT_SET_IP_DSCP:
case OFPACT_SET_TUNNEL:
case OFPACT_SET_VLAN_PCP:
case OFPACT_SET_VLAN_VID:
- case OFPACT_STRIP_VLAN:
- return true;
+ return ACTION_SLOT_SET_OR_MOVE;
- /* In general these actions are excluded because they are not part of
- * the OpenFlow specification nor map to actions that are defined in
- * the specification. Thus the order in which they should be applied
- * in the action set is undefined. */
case OFPACT_BUNDLE:
+ case OFPACT_CLEAR_ACTIONS:
case OFPACT_CLONE:
- case OFPACT_CONTROLLER:
- case OFPACT_CT:
- case OFPACT_CT_CLEAR:
case OFPACT_NAT:
+ case OFPACT_CONTROLLER:
case OFPACT_ENQUEUE:
case OFPACT_EXIT:
case OFPACT_UNROLL_XLATE:
case OFPACT_FIN_TIMEOUT:
+ case OFPACT_GOTO_TABLE:
case OFPACT_LEARN:
case OFPACT_CONJUNCTION:
+ case OFPACT_METER:
case OFPACT_MULTIPATH:
case OFPACT_NOTE:
case OFPACT_OUTPUT_REG:
+ case OFPACT_OUTPUT_TRUNC:
case OFPACT_POP_QUEUE:
- case OFPACT_RESUBMIT:
case OFPACT_SAMPLE:
case OFPACT_STACK_POP:
case OFPACT_STACK_PUSH:
- case OFPACT_DEBUG_RECIRC:
-
- /* The action set may only include actions and thus
- * may not include any instructions */
- case OFPACT_CLEAR_ACTIONS:
- case OFPACT_GOTO_TABLE:
- case OFPACT_METER:
case OFPACT_WRITE_ACTIONS:
case OFPACT_WRITE_METADATA:
- return false;
+ case OFPACT_DEBUG_RECIRC:
+ case OFPACT_DEBUG_SLOW:
+ case OFPACT_CHECK_PKT_LARGER:
+ case OFPACT_DELETE_FIELD:
+ return ACTION_SLOT_INVALID;
+
default:
OVS_NOT_REACHED();
}
}
-/* Append ofpact 'a' onto the tail of 'out' */
-static void
-ofpact_copy(struct ofpbuf *out, const struct ofpact *a)
-{
- ofpbuf_put(out, a, OFPACT_ALIGN(a->len));
-}
-
-/* Copies the last ofpact whose type is 'filter' from 'in' to 'out'. */
+/* True if an action is allowed in the action set.
+ * False otherwise. */
static bool
-ofpacts_copy_last(struct ofpbuf *out, const struct ofpbuf *in,
- enum ofpact_type filter)
-{
- const struct ofpact *target;
- const struct ofpact *a;
-
- target = NULL;
- OFPACT_FOR_EACH (a, in->data, in->size) {
- if (a->type == filter) {
- target = a;
- }
- }
- if (target) {
- ofpact_copy(out, target);
- }
- return target != NULL;
-}
-
-/* Append all ofpacts, for which 'filter' returns true, from 'in' to 'out'.
- * The order of appended ofpacts is preserved between 'in' and 'out' */
-static void
-ofpacts_copy_all(struct ofpbuf *out, const struct ofpbuf *in,
- bool (*filter)(const struct ofpact *))
+ofpact_is_allowed_in_actions_set(const struct ofpact *a)
{
- const struct ofpact *a;
-
- OFPACT_FOR_EACH (a, in->data, in->size) {
- if (filter(a)) {
- ofpact_copy(out, a);
- }
- }
+ return action_set_classify(a) != ACTION_SLOT_INVALID;
}
/* Reads 'action_set', which contains ofpacts accumulated by
ofpacts_execute_action_set(struct ofpbuf *action_list,
const struct ofpbuf *action_set)
{
- /* The OpenFlow spec "Action Set" section specifies this order. */
- ofpacts_copy_last(action_list, action_set, OFPACT_STRIP_VLAN);
- ofpacts_copy_last(action_list, action_set, OFPACT_POP_MPLS);
- ofpacts_copy_last(action_list, action_set, OFPACT_PUSH_MPLS);
- ofpacts_copy_last(action_list, action_set, OFPACT_PUSH_VLAN);
- ofpacts_copy_last(action_list, action_set, OFPACT_DEC_TTL);
- ofpacts_copy_last(action_list, action_set, OFPACT_DEC_MPLS_TTL);
- ofpacts_copy_all(action_list, action_set, ofpact_is_set_or_move_action);
- ofpacts_copy_last(action_list, action_set, OFPACT_SET_QUEUE);
-
- /* If both OFPACT_GROUP and OFPACT_OUTPUT are present, OpenFlow says that
- * we should execute only OFPACT_GROUP.
- *
- * If neither OFPACT_GROUP nor OFPACT_OUTPUT is present, then we can drop
- * all the actions because there's no point in modifying a packet that will
- * not be sent anywhere. */
- if (!ofpacts_copy_last(action_list, action_set, OFPACT_GROUP) &&
- !ofpacts_copy_last(action_list, action_set, OFPACT_OUTPUT) &&
- !ofpacts_copy_last(action_list, action_set, OFPACT_RESUBMIT) &&
- !ofpacts_copy_last(action_list, action_set, OFPACT_CT)) {
- ofpbuf_clear(action_list);
+ const struct ofpact *slots[N_ACTION_SLOTS] = {NULL, };
+
+ struct ofpbuf set_or_move;
+ ofpbuf_init(&set_or_move, 0);
+
+ const struct ofpact *final_action = NULL;
+ enum action_set_class final_class = 0;
+
+ const struct ofpact *cursor;
+ OFPACT_FOR_EACH (cursor, action_set->data, action_set->size) {
+ int class = action_set_classify(cursor);
+ if (class < N_ACTION_SLOTS) {
+ slots[class] = cursor;
+ } else if (class < ACTION_SLOT_SET_OR_MOVE) {
+ if (class >= final_class) {
+ final_action = cursor;
+ final_class = class;
+ }
+ } else if (class == ACTION_SLOT_SET_OR_MOVE) {
+ ofpact_copy(&set_or_move, cursor);
+ } else {
+ ovs_assert(class == ACTION_SLOT_INVALID);
+ }
+ }
+
+ if (final_action) {
+ for (int i = 0; i < N_ACTION_SLOTS; i++) {
+ if (slots[i]) {
+ ofpact_copy(action_list, slots[i]);
+ }
+ }
+ ofpbuf_put(action_list, set_or_move.data, set_or_move.size);
+ ofpact_copy(action_list, final_action);
}
+ ofpbuf_uninit(&set_or_move);
}
const char *
ovs_instruction_name_from_type(enum ovs_instruction_type type)
{
- return inst_info[type].name;
+ return type < ARRAY_SIZE(inst_info) ? inst_info[type].name : NULL;
}
int
}
enum ovs_instruction_type
-ovs_instruction_type_from_ofpact_type(enum ofpact_type type)
+ovs_instruction_type_from_ofpact_type(enum ofpact_type type,
+ enum ofp_version version)
{
switch (type) {
case OFPACT_METER:
- return OVSINST_OFPIT13_METER;
+ return (version >= OFP15_VERSION
+ ? OVSINST_OFPIT11_APPLY_ACTIONS
+ : OVSINST_OFPIT13_METER);
case OFPACT_CLEAR_ACTIONS:
return OVSINST_OFPIT11_CLEAR_ACTIONS;
case OFPACT_WRITE_ACTIONS:
case OFPACT_UNROLL_XLATE:
case OFPACT_SAMPLE:
case OFPACT_DEBUG_RECIRC:
+ case OFPACT_DEBUG_SLOW:
case OFPACT_CT:
case OFPACT_CT_CLEAR:
case OFPACT_NAT:
+ case OFPACT_ENCAP:
+ case OFPACT_DECAP:
+ case OFPACT_DEC_NSH_TTL:
+ case OFPACT_CHECK_PKT_LARGER:
+ case OFPACT_DELETE_FIELD:
default:
return OVSINST_OFPIT11_APPLY_ACTIONS;
}
static const struct ovsinst_map *
get_ovsinst_map(enum ofp_version version)
{
- /* OpenFlow 1.1 and 1.2 instructions. */
+ /* OpenFlow 1.1, 1.2, and 1.5 instructions. */
static const struct ovsinst_map of11[] = {
{ OVSINST_OFPIT11_GOTO_TABLE, 1 },
{ OVSINST_OFPIT11_WRITE_METADATA, 2 },
{ 0, -1 },
};
- /* OpenFlow 1.3+ instructions. */
+ /* OpenFlow 1.3 and 1.4 instructions. */
static const struct ovsinst_map of13[] = {
{ OVSINST_OFPIT11_GOTO_TABLE, 1 },
{ OVSINST_OFPIT11_WRITE_METADATA, 2 },
{ 0, -1 },
};
- return version < OFP13_VERSION ? of11 : of13;
+ return version == OFP13_VERSION || version == OFP14_VERSION ? of13 : of11;
}
/* Converts 'ovsinst_bitmap', a bitmap whose bits correspond to OVSINST_*
static enum ofperr
decode_openflow11_instructions(const struct ofp11_instruction insts[],
- size_t n_insts,
+ size_t n_insts, enum ofp_version version,
const struct ofp11_instruction *out[])
{
const struct ofp11_instruction *inst;
return error;
}
+ if (type == OVSINST_OFPIT13_METER && version >= OFP15_VERSION) {
+ /* "meter" is an action, not an instruction, in OpenFlow 1.5. */
+ return OFPERR_OFPBIC_UNKNOWN_INST;
+ }
+
if (out[type]) {
return OFPERR_OFPBIC_DUP_INST;
}
}
error = decode_openflow11_instructions(
- instructions, instructions_len / OFP11_INSTRUCTION_ALIGN,
+ instructions, instructions_len / OFP11_INSTRUCTION_ALIGN, version,
insts);
if (error) {
goto exit;
ogt->table_id = oigt->table_id;
}
- error = ofpacts_verify(ofpacts->data, ofpacts->size,
- (1u << N_OVS_INSTRUCTIONS) - 1, 0);
+ error = ofpacts_verify(ofpacts->data, ofpacts->size, version,
+ (1u << N_OVS_INSTRUCTIONS) - 1, 0, NULL);
exit:
if (error) {
ofpbuf_clear(ofpacts);
*usable_protocols &= OFPUTIL_P_OF10_ANY;
}
-/* May modify flow->dl_type, flow->nw_proto and flow->vlan_tci,
- * caller must restore them.
+/* May modify flow->packet_type, flow->dl_type, flow->nw_proto and
+ * flow->vlan_tci, caller must restore them.
*
* Modifies some actions, filling in fields that could not be properly set
* without context. */
static enum ofperr
-ofpact_check__(enum ofputil_protocol *usable_protocols, struct ofpact *a,
- struct match *match, ofp_port_t max_ports,
- uint8_t table_id, uint8_t n_tables)
+ofpact_check__(struct ofpact *a, struct ofpact_check_params *cp)
{
- struct flow *flow = &match->flow;
- const struct ofpact_enqueue *enqueue;
- const struct mf_field *mf;
-
switch (a->type) {
- case OFPACT_OUTPUT:
- return ofpact_check_output_port(ofpact_get_OUTPUT(a)->port,
- max_ports);
-
- case OFPACT_CONTROLLER:
- return 0;
-
- case OFPACT_ENQUEUE:
- enqueue = ofpact_get_ENQUEUE(a);
- if (ofp_to_u16(enqueue->port) >= ofp_to_u16(max_ports)
- && enqueue->port != OFPP_IN_PORT
- && enqueue->port != OFPP_LOCAL) {
- return OFPERR_OFPBAC_BAD_OUT_PORT;
- }
- return 0;
-
- case OFPACT_OUTPUT_REG:
- return mf_check_src(&ofpact_get_OUTPUT_REG(a)->src, match);
-
- case OFPACT_OUTPUT_TRUNC:
- return ofpact_check_output_port(ofpact_get_OUTPUT_TRUNC(a)->port,
- max_ports);
-
- case OFPACT_BUNDLE:
- return bundle_check(ofpact_get_BUNDLE(a), max_ports, match);
-
- case OFPACT_SET_VLAN_VID:
- /* Remember if we saw a vlan tag in the flow to aid translating to
- * OpenFlow 1.1+ if need be. */
- ofpact_get_SET_VLAN_VID(a)->flow_has_vlan =
- (flow->vlans[0].tci & htons(VLAN_CFI)) == htons(VLAN_CFI);
- if (!(flow->vlans[0].tci & htons(VLAN_CFI)) &&
- !ofpact_get_SET_VLAN_VID(a)->push_vlan_if_needed) {
- inconsistent_match(usable_protocols);
- }
- /* Temporary mark that we have a vlan tag. */
- flow->vlans[0].tci |= htons(VLAN_CFI);
- return 0;
-
- case OFPACT_SET_VLAN_PCP:
- /* Remember if we saw a vlan tag in the flow to aid translating to
- * OpenFlow 1.1+ if need be. */
- ofpact_get_SET_VLAN_PCP(a)->flow_has_vlan =
- (flow->vlans[0].tci & htons(VLAN_CFI)) == htons(VLAN_CFI);
- if (!(flow->vlans[0].tci & htons(VLAN_CFI)) &&
- !ofpact_get_SET_VLAN_PCP(a)->push_vlan_if_needed) {
- inconsistent_match(usable_protocols);
- }
- /* Temporary mark that we have a vlan tag. */
- flow->vlans[0].tci |= htons(VLAN_CFI);
- return 0;
-
- case OFPACT_STRIP_VLAN:
- if (!(flow->vlans[0].tci & htons(VLAN_CFI))) {
- inconsistent_match(usable_protocols);
- }
- flow_pop_vlan(flow, NULL);
- return 0;
-
- case OFPACT_PUSH_VLAN:
- if (flow->vlans[FLOW_MAX_VLAN_HEADERS - 1].tci & htons(VLAN_CFI)) {
- /* Support maximum (FLOW_MAX_VLAN_HEADERS) VLAN headers. */
- return OFPERR_OFPBAC_BAD_TAG;
- }
- /* Temporary mark that we have a vlan tag. */
- flow_push_vlan_uninit(flow, NULL);
- flow->vlans[0].tci |= htons(VLAN_CFI);
- return 0;
-
- case OFPACT_SET_ETH_SRC:
- case OFPACT_SET_ETH_DST:
- return 0;
-
- case OFPACT_SET_IPV4_SRC:
- case OFPACT_SET_IPV4_DST:
- if (flow->dl_type != htons(ETH_TYPE_IP)) {
- inconsistent_match(usable_protocols);
- }
- return 0;
-
- case OFPACT_SET_IP_DSCP:
- case OFPACT_SET_IP_ECN:
- case OFPACT_SET_IP_TTL:
- case OFPACT_DEC_TTL:
- if (!is_ip_any(flow)) {
- inconsistent_match(usable_protocols);
- }
- return 0;
-
- case OFPACT_SET_L4_SRC_PORT:
- case OFPACT_SET_L4_DST_PORT:
- if (!is_ip_any(flow) || (flow->nw_frag & FLOW_NW_FRAG_LATER) ||
- (flow->nw_proto != IPPROTO_TCP && flow->nw_proto != IPPROTO_UDP
- && flow->nw_proto != IPPROTO_SCTP)) {
- inconsistent_match(usable_protocols);
- }
- /* Note on which transport protocol the port numbers are set.
- * This allows this set action to be converted to an OF1.2 set field
- * action. */
- if (a->type == OFPACT_SET_L4_SRC_PORT) {
- ofpact_get_SET_L4_SRC_PORT(a)->flow_ip_proto = flow->nw_proto;
- } else {
- ofpact_get_SET_L4_DST_PORT(a)->flow_ip_proto = flow->nw_proto;
- }
- return 0;
-
- case OFPACT_REG_MOVE:
- return nxm_reg_move_check(ofpact_get_REG_MOVE(a), match);
-
- case OFPACT_SET_FIELD:
- mf = ofpact_get_SET_FIELD(a)->field;
- /* Require OXM_OF_VLAN_VID to have an existing VLAN header. */
- if (!mf_are_prereqs_ok(mf, flow, NULL) ||
- (mf->id == MFF_VLAN_VID &&
- !(flow->vlans[0].tci & htons(VLAN_CFI)))) {
- VLOG_WARN_RL(&rl, "set_field %s lacks correct prerequisities",
- mf->name);
- return OFPERR_OFPBAC_MATCH_INCONSISTENT;
- }
- /* Remember if we saw a vlan tag in the flow to aid translating to
- * OpenFlow 1.1 if need be. */
- ofpact_get_SET_FIELD(a)->flow_has_vlan =
- (flow->vlans[0].tci & htons(VLAN_CFI)) == htons(VLAN_CFI);
- if (mf->id == MFF_VLAN_TCI) {
- /* The set field may add or remove the vlan tag,
- * Mark the status temporarily. */
- flow->vlans[0].tci = ofpact_get_SET_FIELD(a)->value->be16;
- }
- return 0;
-
- case OFPACT_STACK_PUSH:
- return nxm_stack_push_check(ofpact_get_STACK_PUSH(a), match);
-
- case OFPACT_STACK_POP:
- return nxm_stack_pop_check(ofpact_get_STACK_POP(a), match);
-
- case OFPACT_SET_MPLS_LABEL:
- case OFPACT_SET_MPLS_TC:
- case OFPACT_SET_MPLS_TTL:
- case OFPACT_DEC_MPLS_TTL:
- if (!eth_type_mpls(flow->dl_type)) {
- inconsistent_match(usable_protocols);
- }
- return 0;
-
- case OFPACT_SET_TUNNEL:
- case OFPACT_SET_QUEUE:
- case OFPACT_POP_QUEUE:
- return 0;
-
- case OFPACT_RESUBMIT: {
- struct ofpact_resubmit *resubmit = ofpact_get_RESUBMIT(a);
-
- if (resubmit->with_ct_orig && !is_ct_valid(flow, &match->wc, NULL)) {
- return OFPERR_OFPBAC_MATCH_INCONSISTENT;
- }
- return 0;
- }
- case OFPACT_FIN_TIMEOUT:
- if (flow->nw_proto != IPPROTO_TCP) {
- inconsistent_match(usable_protocols);
- }
- return 0;
-
- case OFPACT_LEARN:
- return learn_check(ofpact_get_LEARN(a), match);
-
- case OFPACT_CONJUNCTION:
- return 0;
-
- case OFPACT_MULTIPATH:
- return multipath_check(ofpact_get_MULTIPATH(a), match);
-
- case OFPACT_NOTE:
- case OFPACT_EXIT:
- return 0;
-
- case OFPACT_PUSH_MPLS:
- flow->dl_type = ofpact_get_PUSH_MPLS(a)->ethertype;
- /* The packet is now MPLS and the MPLS payload is opaque.
- * Thus nothing can be assumed about the network protocol.
- * Temporarily mark that we have no nw_proto. */
- flow->nw_proto = 0;
- return 0;
-
- case OFPACT_POP_MPLS:
- if (!eth_type_mpls(flow->dl_type)) {
- inconsistent_match(usable_protocols);
- }
- flow->dl_type = ofpact_get_POP_MPLS(a)->ethertype;
- return 0;
-
- case OFPACT_SAMPLE:
- return 0;
-
- case OFPACT_CLONE: {
- struct ofpact_nest *on = ofpact_get_CLONE(a);
- return ofpacts_check(on->actions, ofpact_nest_get_action_len(on),
- match, max_ports, table_id, n_tables,
- usable_protocols);
- }
-
- case OFPACT_CT: {
- struct ofpact_conntrack *oc = ofpact_get_CT(a);
-
- if (!dl_type_is_ip_any(flow->dl_type)
- || (flow->ct_state & CS_INVALID && oc->flags & NX_CT_F_COMMIT)
- || (oc->alg == IPPORT_FTP && flow->nw_proto != IPPROTO_TCP)
- || (oc->alg == IPPORT_TFTP && flow->nw_proto != IPPROTO_UDP)) {
- /* We can't downgrade to OF1.0 and expect inconsistent CT actions
- * be silently discarded. Instead, datapath flow install fails, so
- * it is better to flag inconsistent CT actions as hard errors. */
- return OFPERR_OFPBAC_MATCH_INCONSISTENT;
- }
-
- if (oc->zone_src.field) {
- return mf_check_src(&oc->zone_src, match);
- }
-
- return ofpacts_check(oc->actions, ofpact_ct_get_action_len(oc),
- match, max_ports, table_id, n_tables,
- usable_protocols);
- }
-
- case OFPACT_CT_CLEAR:
- return 0;
-
- case OFPACT_NAT: {
- struct ofpact_nat *on = ofpact_get_NAT(a);
-
- if (!dl_type_is_ip_any(flow->dl_type) ||
- (on->range_af == AF_INET && flow->dl_type != htons(ETH_TYPE_IP)) ||
- (on->range_af == AF_INET6
- && flow->dl_type != htons(ETH_TYPE_IPV6))) {
- return OFPERR_OFPBAC_MATCH_INCONSISTENT;
- }
- return 0;
- }
-
- case OFPACT_CLEAR_ACTIONS:
- return 0;
-
- case OFPACT_WRITE_ACTIONS: {
- /* Use a temporary copy of 'usable_protocols' because we can't check
- * consistency of an action set. */
- struct ofpact_nest *on = ofpact_get_WRITE_ACTIONS(a);
- enum ofputil_protocol p = *usable_protocols;
- return ofpacts_check(on->actions, ofpact_nest_get_action_len(on),
- match, max_ports, table_id, n_tables, &p);
- }
-
- case OFPACT_WRITE_METADATA:
- return 0;
-
- case OFPACT_METER: {
- uint32_t mid = ofpact_get_METER(a)->meter_id;
- if (mid == 0 || mid > OFPM13_MAX) {
- return OFPERR_OFPMMFC_INVALID_METER;
- }
- return 0;
- }
-
- case OFPACT_GOTO_TABLE: {
- uint8_t goto_table = ofpact_get_GOTO_TABLE(a)->table_id;
- if ((table_id != 255 && goto_table <= table_id)
- || (n_tables != 255 && goto_table >= n_tables)) {
- return OFPERR_OFPBIC_BAD_TABLE_ID;
- }
- return 0;
- }
-
- case OFPACT_GROUP:
- return 0;
-
- case OFPACT_UNROLL_XLATE:
- /* UNROLL is an internal action that should never be seen via
- * OpenFlow. */
- return OFPERR_OFPBAC_BAD_TYPE;
-
- case OFPACT_DEBUG_RECIRC:
- return 0;
-
+#define OFPACT(ENUM, STRUCT, MEMBER, NAME) \
+ case OFPACT_##ENUM: \
+ return check_##ENUM(ofpact_get_##ENUM(a), cp);
+ OFPACTS
+#undef OFPACT
default:
OVS_NOT_REACHED();
}
* returning. */
enum ofperr
ofpacts_check(struct ofpact ofpacts[], size_t ofpacts_len,
- struct match *match, ofp_port_t max_ports,
- uint8_t table_id, uint8_t n_tables,
- enum ofputil_protocol *usable_protocols)
+ struct ofpact_check_params *cp)
{
- struct ofpact *a;
- ovs_be16 dl_type = match->flow.dl_type;
- uint8_t nw_proto = match->flow.nw_proto;
- enum ofperr error = 0;
+ /* Save fields that might temporarily be modified. */
+ struct flow *flow = &cp->match->flow;
+ ovs_be32 packet_type = flow->packet_type;
+ ovs_be16 dl_type = flow->dl_type;
+ uint8_t nw_proto = flow->nw_proto;
union flow_vlan_hdr vlans[FLOW_MAX_VLAN_HEADERS];
+ memcpy(vlans, flow->vlans, sizeof vlans);
- memcpy(&vlans, &match->flow.vlans, sizeof(vlans));
-
+ /* Check all the actions. */
+ cp->usable_protocols = OFPUTIL_P_ANY;
+ enum ofperr error = 0;
+ struct ofpact *a;
OFPACT_FOR_EACH (a, ofpacts, ofpacts_len) {
- error = ofpact_check__(usable_protocols, a, match,
- max_ports, table_id, n_tables);
+ error = ofpact_check__(a, cp);
if (error) {
break;
}
}
+
/* Restore fields that may have been modified. */
- match->flow.dl_type = dl_type;
- memcpy(&match->flow.vlans, &vlans, sizeof(vlans));
- match->flow.nw_proto = nw_proto;
+ flow->packet_type = packet_type;
+ flow->dl_type = dl_type;
+ memcpy(flow->vlans, vlans, sizeof vlans);
+ flow->nw_proto = nw_proto;
+
return error;
}
* OFPERR_OFPBAC_MATCH_INCONSISTENT rather than clearing bits. */
enum ofperr
ofpacts_check_consistency(struct ofpact ofpacts[], size_t ofpacts_len,
- struct match *match, ofp_port_t max_ports,
- uint8_t table_id, uint8_t n_tables,
- enum ofputil_protocol usable_protocols)
+ enum ofputil_protocol needed_protocols,
+ struct ofpact_check_params *cp)
{
- enum ofputil_protocol p = usable_protocols;
- enum ofperr error;
-
- error = ofpacts_check(ofpacts, ofpacts_len, match, max_ports,
- table_id, n_tables, &p);
- return (error ? error
- : p != usable_protocols ? OFPERR_OFPBAC_MATCH_INCONSISTENT
- : 0);
+ enum ofperr error = ofpacts_check(ofpacts, ofpacts_len, cp);
+ if (!error && needed_protocols & ~cp->usable_protocols) {
+ return OFPERR_OFPBAC_MATCH_INCONSISTENT;
+ }
+ return error;
}
/* Returns the destination field that 'ofpact' would write to, or NULL
return NULL;
}
+static void OVS_PRINTF_FORMAT(2, 3)
+verify_error(char **errorp, const char *format, ...)
+{
+ va_list args;
+ va_start(args, format);
+ char *error = xvasprintf(format, args);
+ va_end(args);
+
+ if (errorp) {
+ *errorp = error;
+ } else {
+ VLOG_WARN("%s", error);
+ free(error);
+ }
+}
+
static enum ofperr
-unsupported_nesting(enum ofpact_type action, enum ofpact_type outer_action)
+unsupported_nesting(enum ofpact_type action, enum ofpact_type outer_action,
+ char **errorp)
{
- VLOG_WARN("%s action doesn't support nested action %s",
- ofpact_name(outer_action), ofpact_name(action));
+ verify_error(errorp, "%s action doesn't support nested action %s",
+ ofpact_name(outer_action), ofpact_name(action));
return OFPERR_OFPBAC_BAD_ARGUMENT;
}
/* Apply nesting constraints for actions */
static enum ofperr
-ofpacts_verify_nested(const struct ofpact *a, enum ofpact_type outer_action)
+ofpacts_verify_nested(const struct ofpact *a, enum ofpact_type outer_action,
+ char **errorp)
{
const struct mf_field *field = ofpact_get_mf_dst(a);
if (field && field_requires_ct(field->id) && outer_action != OFPACT_CT) {
- VLOG_WARN("cannot set CT fields outside of ct action");
+ verify_error(errorp, "cannot set CT fields outside of ct action");
return OFPERR_OFPBAC_BAD_SET_ARGUMENT;
}
if (a->type == OFPACT_NAT) {
if (outer_action != OFPACT_CT) {
- VLOG_WARN("Cannot have NAT action outside of \"ct\" action");
+ verify_error(errorp,
+ "Cannot have NAT action outside of \"ct\" action");
return OFPERR_OFPBAC_BAD_SET_ARGUMENT;
}
return 0;
if (outer_action) {
ovs_assert(outer_action == OFPACT_WRITE_ACTIONS
- || outer_action == OFPACT_CT);
+ || outer_action == OFPACT_CT
+ || outer_action == OFPACT_CLONE);
if (outer_action == OFPACT_CT) {
if (!field) {
- return unsupported_nesting(a->type, outer_action);
+ return unsupported_nesting(a->type, outer_action, errorp);
} else if (!field_requires_ct(field->id)) {
- VLOG_WARN("%s action doesn't support nested modification "
- "of %s", ofpact_name(outer_action), field->name);
+ verify_error(errorp,
+ "%s action doesn't support nested modification "
+ "of %s", ofpact_name(outer_action), field->name);
return OFPERR_OFPBAC_BAD_ARGUMENT;
}
}
+
+ if (a->type == OFPACT_METER) {
+ return unsupported_nesting(a->type, outer_action, errorp);
+ }
}
return 0;
* appropriate order as defined by the OpenFlow spec and as required by Open
* vSwitch.
*
+ * The 'version' is relevant only for error reporting: Open vSwitch enforces
+ * the same rules for every version of OpenFlow, but different versions require
+ * different error codes.
+ *
* 'allowed_ovsinsts' is a bitmap of OVSINST_* values, in which 1-bits indicate
* instructions that are allowed within 'ofpacts[]'.
*
* within another action of type 'outer_action'. */
static enum ofperr
ofpacts_verify(const struct ofpact ofpacts[], size_t ofpacts_len,
- uint32_t allowed_ovsinsts, enum ofpact_type outer_action)
+ enum ofp_version version, uint32_t allowed_ovsinsts,
+ enum ofpact_type outer_action, char **errorp)
{
const struct ofpact *a;
enum ovs_instruction_type inst;
if (a->type == OFPACT_CONJUNCTION) {
OFPACT_FOR_EACH (a, ofpacts, ofpacts_len) {
if (a->type != OFPACT_CONJUNCTION && a->type != OFPACT_NOTE) {
- VLOG_WARN("\"conjunction\" actions may be used along with "
- "\"note\" but not any other kind of action "
- "(such as the \"%s\" action used here)",
- ofpact_name(a->type));
+ verify_error(errorp, "\"conjunction\" actions may be used "
+ "along with \"note\" but not any other kind "
+ "of action (such as the \"%s\" action used "
+ "here)", ofpact_name(a->type));
return OFPERR_NXBAC_BAD_CONJUNCTION;
}
}
return 0;
}
- error = ofpacts_verify_nested(a, outer_action);
+ error = ofpacts_verify_nested(a, outer_action, errorp);
if (error) {
return error;
}
- next = ovs_instruction_type_from_ofpact_type(a->type);
+ next = ovs_instruction_type_from_ofpact_type(a->type, version);
if (a > ofpacts
&& (inst == OVSINST_OFPIT11_APPLY_ACTIONS
? next < inst
const char *next_name = ovs_instruction_name_from_type(next);
if (next == inst) {
- VLOG_WARN("duplicate %s instruction not allowed, for OpenFlow "
- "1.1+ compatibility", name);
+ verify_error(errorp, "duplicate %s instruction not allowed, "
+ "for OpenFlow 1.1+ compatibility", name);
} else {
- VLOG_WARN("invalid instruction ordering: %s must appear "
- "before %s, for OpenFlow 1.1+ compatibility",
- next_name, name);
+ verify_error(errorp, "invalid instruction ordering: "
+ "%s must appear before %s, "
+ "for OpenFlow 1.1+ compatibility",
+ next_name, name);
}
return OFPERR_OFPBAC_UNSUPPORTED_ORDER;
}
if (!((1u << next) & allowed_ovsinsts)) {
const char *name = ovs_instruction_name_from_type(next);
- VLOG_WARN("%s instruction not allowed here", name);
- return OFPERR_OFPBIC_UNSUP_INST;
+ if (next == OVSINST_OFPIT13_METER && version >= OFP15_VERSION) {
+ verify_error(errorp, "%s action not allowed here", name);
+ return OFPERR_OFPBAC_BAD_TYPE;
+ } else {
+ verify_error(errorp, "%s instruction not allowed here", name);
+ return OFPERR_OFPBIC_UNSUP_INST;
+ }
}
inst = next;
}
static enum ovs_instruction_type
-ofpact_is_apply_actions(const struct ofpact *a)
+ofpact_is_apply_actions(const struct ofpact *a, enum ofp_version version)
{
- return (ovs_instruction_type_from_ofpact_type(a->type)
+ return (ovs_instruction_type_from_ofpact_type(a->type, version)
== OVSINST_OFPIT11_APPLY_ACTIONS);
}
a = ofpacts;
while (a < end) {
- if (ofpact_is_apply_actions(a)) {
+ if (ofpact_is_apply_actions(a, ofp_version)) {
size_t ofs = openflow->size;
instruction_put_OFPIT11_APPLY_ACTIONS(openflow);
do {
encode_ofpact(a, ofp_version, openflow);
a = ofpact_next(a);
- } while (a < end && ofpact_is_apply_actions(a));
+ } while (a < end && ofpact_is_apply_actions(a, ofp_version));
ofpacts_update_instruction_actions(openflow, ofs);
} else {
encode_ofpact(a, ofp_version, openflow);
case OFP13_VERSION:
case OFP14_VERSION:
case OFP15_VERSION:
- case OFP16_VERSION:
default:
return of12;
}
case OFPACT_METER:
case OFPACT_GROUP:
case OFPACT_DEBUG_RECIRC:
+ case OFPACT_DEBUG_SLOW:
case OFPACT_CT:
case OFPACT_CT_CLEAR:
case OFPACT_NAT:
+ case OFPACT_ENCAP:
+ case OFPACT_DECAP:
+ case OFPACT_DEC_NSH_TTL:
+ case OFPACT_CHECK_PKT_LARGER:
+ case OFPACT_DELETE_FIELD:
default:
return false;
}
return false;
}
+/* Returns true if the 'a_len' bytes of actions in 'a' and the 'b_len' bytes of
+ * actions in 'b' are bytewise identical. */
bool
ofpacts_equal(const struct ofpact *a, size_t a_len,
const struct ofpact *b, size_t b_len)
return a_len == b_len && !memcmp(a, b, a_len);
}
+/* Returns true if the 'a_len' bytes of actions in 'a' and the 'b_len' bytes of
+ * actions in 'b' are identical when formatted as strings. (Converting actions
+ * to string form suppresses some rarely meaningful differences, such as the
+ * 'compat' member of actions.) */
+bool
+ofpacts_equal_stringwise(const struct ofpact *a, size_t a_len,
+ const struct ofpact *b, size_t b_len)
+{
+ struct ds a_s = DS_EMPTY_INITIALIZER;
+ struct ofpact_format_params a_fp = { .s = &a_s };
+ ofpacts_format(a, a_len, &a_fp);
+
+ struct ds b_s = DS_EMPTY_INITIALIZER;
+ struct ofpact_format_params b_fp = { .s = &b_s };
+ ofpacts_format(b, b_len, &b_fp);
+
+ bool equal = !strcmp(ds_cstr(&a_s), ds_cstr(&b_s));
+
+ ds_destroy(&a_s);
+ ds_destroy(&b_s);
+
+ return equal;
+}
+
/* Finds the OFPACT_METER action, if any, in the 'ofpacts_len' bytes of
* 'ofpacts'. If found, returns its meter ID; if not, returns 0.
*
const struct ofpact *a;
OFPACT_FOR_EACH (a, ofpacts, ofpacts_len) {
- enum ovs_instruction_type inst;
-
- inst = ovs_instruction_type_from_ofpact_type(a->type);
if (a->type == OFPACT_METER) {
return ofpact_get_METER(a)->meter_id;
- } else if (inst > OVSINST_OFPIT13_METER) {
+ }
+
+ enum ovs_instruction_type inst
+ = ovs_instruction_type_from_ofpact_type(a->type, 0);
+ if (inst > OVSINST_OFPIT13_METER) {
break;
}
}
/* Formatting ofpacts. */
static void
-ofpact_format(const struct ofpact *a, struct ds *s)
+ofpact_format(const struct ofpact *a,
+ const struct ofpact_format_params *fp)
{
switch (a->type) {
#define OFPACT(ENUM, STRUCT, MEMBER, NAME) \
case OFPACT_##ENUM: \
- format_##ENUM(ALIGNED_CAST(const struct STRUCT *, a), s); \
+ format_##ENUM(ALIGNED_CAST(const struct STRUCT *, a), fp); \
break;
OFPACTS
#undef OFPACT
}
/* Appends a string representing the 'ofpacts_len' bytes of ofpacts in
- * 'ofpacts' to 'string'. */
+ * 'ofpacts' to 'fp->s'. If 'port_map' is nonnull, uses it to translate port
+ * numbers to names in output. */
void
ofpacts_format(const struct ofpact *ofpacts, size_t ofpacts_len,
- struct ds *string)
+ const struct ofpact_format_params *fp)
{
if (!ofpacts_len) {
- ds_put_format(string, "%sdrop%s", colors.drop, colors.end);
+ ds_put_format(fp->s, "%sdrop%s", colors.drop, colors.end);
} else {
const struct ofpact *a;
OFPACT_FOR_EACH (a, ofpacts, ofpacts_len) {
if (a != ofpacts) {
- ds_put_char(string, ',');
+ ds_put_char(fp->s, ',');
}
- ofpact_format(a, string);
+ ofpact_format(a, fp);
}
}
}
}
\f
static char * OVS_WARN_UNUSED_RESULT
-ofpact_parse(enum ofpact_type type, char *value, struct ofpbuf *ofpacts,
- enum ofputil_protocol *usable_protocols)
+ofpact_parse(enum ofpact_type type, char *value,
+ const struct ofpact_parse_params *pp)
{
switch (type) {
-#define OFPACT(ENUM, STRUCT, MEMBER, NAME) \
+#define OFPACT(ENUM, STRUCT, MEMBER, NAME) \
case OFPACT_##ENUM: \
- return parse_##ENUM(value, ofpacts, usable_protocols);
+ return parse_##ENUM(value, pp);
OFPACTS
#undef OFPACT
default:
* If 'outer_action' is specified, indicates that the actions being parsed
* are nested within another action of the type specified in 'outer_action'. */
static char * OVS_WARN_UNUSED_RESULT
-ofpacts_parse__(char *str, struct ofpbuf *ofpacts,
- enum ofputil_protocol *usable_protocols,
+ofpacts_parse__(char *str, const struct ofpact_parse_params *pp,
bool allow_instructions, enum ofpact_type outer_action)
{
- int prev_inst = -1;
- enum ofperr retval;
char *key, *value;
bool drop = false;
char *pos;
pos = str;
while (ofputil_parse_key_value(&pos, &key, &value)) {
- enum ovs_instruction_type inst = OVSINST_OFPIT11_APPLY_ACTIONS;
enum ofpact_type type;
char *error = NULL;
ofp_port_t port;
-
if (ofpact_type_from_name(key, &type)) {
- error = ofpact_parse(type, value, ofpacts, usable_protocols);
- inst = ovs_instruction_type_from_ofpact_type(type);
+ error = ofpact_parse(type, value, pp);
+
+ if (type == OFPACT_METER && !allow_instructions) {
+ /* Meter is an action in OF1.5 and it's being used in a
+ * context where instructions aren't allowed. Therefore,
+ * this must be OF1.5+. */
+ *pp->usable_protocols &= OFPUTIL_P_OF15_UP;
+ }
} else if (!strcasecmp(key, "mod_vlan_vid")) {
- error = parse_set_vlan_vid(value, ofpacts, true);
+ error = parse_set_vlan_vid(value, true, pp);
} else if (!strcasecmp(key, "mod_vlan_pcp")) {
- error = parse_set_vlan_pcp(value, ofpacts, true);
+ error = parse_set_vlan_pcp(value, true, pp);
} else if (!strcasecmp(key, "set_nw_ttl")) {
- error = parse_SET_IP_TTL(value, ofpacts, usable_protocols);
+ error = parse_SET_IP_TTL(value, pp);
} else if (!strcasecmp(key, "pop_vlan")) {
- error = parse_pop_vlan(ofpacts);
+ error = parse_pop_vlan(pp);
} else if (!strcasecmp(key, "set_tunnel64")) {
- error = parse_set_tunnel(value, ofpacts,
- NXAST_RAW_SET_TUNNEL64);
+ error = parse_set_tunnel(value, NXAST_RAW_SET_TUNNEL64, pp);
} else if (!strcasecmp(key, "load")) {
- error = parse_reg_load(value, ofpacts);
+ error = parse_reg_load(value, pp);
} else if (!strcasecmp(key, "bundle_load")) {
- error = parse_bundle_load(value, ofpacts);
+ error = parse_bundle_load(value, pp);
} else if (!strcasecmp(key, "drop")) {
drop = true;
} else if (!strcasecmp(key, "apply_actions")) {
return xstrdup("apply_actions is the default instruction");
- } else if (ofputil_port_from_string(key, &port)) {
- ofpact_put_OUTPUT(ofpacts)->port = port;
+ } else if (ofputil_port_from_string(key, pp->port_map, &port)) {
+ ofpact_put_OUTPUT(pp->ofpacts)->port = port;
} else {
return xasprintf("unknown action %s", key);
}
if (error) {
return error;
}
-
- if (inst != OVSINST_OFPIT11_APPLY_ACTIONS) {
- if (!allow_instructions) {
- return xasprintf("only actions are allowed here (not "
- "instruction %s)",
- ovs_instruction_name_from_type(inst));
- }
- if (inst == prev_inst) {
- return xasprintf("instruction %s may be specified only once",
- ovs_instruction_name_from_type(inst));
- }
- }
- if (prev_inst != -1 && inst < prev_inst) {
- return xasprintf("instruction %s must be specified before %s",
- ovs_instruction_name_from_type(inst),
- ovs_instruction_name_from_type(prev_inst));
- }
- prev_inst = inst;
}
- if (drop && ofpacts->size) {
+ if (drop && pp->ofpacts->size) {
return xstrdup("\"drop\" must not be accompanied by any other action "
"or instruction");
}
- retval = ofpacts_verify(ofpacts->data, ofpacts->size,
- (allow_instructions
- ? (1u << N_OVS_INSTRUCTIONS) - 1
- : 1u << OVSINST_OFPIT11_APPLY_ACTIONS),
- outer_action);
- if (retval) {
- return xstrdup("Incorrect instruction ordering");
+ char *error = NULL;
+ ofpacts_verify(pp->ofpacts->data, pp->ofpacts->size, OFP11_VERSION,
+ (allow_instructions
+ ? (1u << N_OVS_INSTRUCTIONS) - 1
+ : ((1u << OVSINST_OFPIT11_APPLY_ACTIONS)
+ | (1u << OVSINST_OFPIT13_METER))),
+ outer_action, &error);
+ if (error) {
+ return error;
}
return NULL;
}
static char * OVS_WARN_UNUSED_RESULT
-ofpacts_parse(char *str, struct ofpbuf *ofpacts,
- enum ofputil_protocol *usable_protocols, bool allow_instructions,
- enum ofpact_type outer_action)
+ofpacts_parse(char *str, const struct ofpact_parse_params *pp,
+ bool allow_instructions, enum ofpact_type outer_action)
{
- uint32_t orig_size = ofpacts->size;
- char *error = ofpacts_parse__(str, ofpacts, usable_protocols,
- allow_instructions, outer_action);
+ if (pp->depth >= MAX_OFPACT_PARSE_DEPTH) {
+ return xstrdup("Action nested too deeply");
+ }
+ CONST_CAST(struct ofpact_parse_params *, pp)->depth++;
+ uint32_t orig_size = pp->ofpacts->size;
+ char *error = ofpacts_parse__(str, pp, allow_instructions, outer_action);
if (error) {
- ofpacts->size = orig_size;
+ pp->ofpacts->size = orig_size;
}
+ CONST_CAST(struct ofpact_parse_params *, pp)->depth--;
return error;
}
static char * OVS_WARN_UNUSED_RESULT
-ofpacts_parse_copy(const char *s_, struct ofpbuf *ofpacts,
- enum ofputil_protocol *usable_protocols,
+ofpacts_parse_copy(const char *s_, const struct ofpact_parse_params *pp,
bool allow_instructions, enum ofpact_type outer_action)
{
char *error, *s;
- *usable_protocols = OFPUTIL_P_ANY;
+ *pp->usable_protocols = OFPUTIL_P_ANY;
s = xstrdup(s_);
- error = ofpacts_parse(s, ofpacts, usable_protocols, allow_instructions,
- outer_action);
+ error = ofpacts_parse(s, pp, allow_instructions, outer_action);
free(s);
return error;
* Returns NULL if successful, otherwise a malloc()'d string describing the
* error. The caller is responsible for freeing the returned string. */
char * OVS_WARN_UNUSED_RESULT
-ofpacts_parse_actions(const char *s, struct ofpbuf *ofpacts,
- enum ofputil_protocol *usable_protocols)
+ofpacts_parse_actions(const char *s, const struct ofpact_parse_params *pp)
{
- return ofpacts_parse_copy(s, ofpacts, usable_protocols, false, 0);
+ return ofpacts_parse_copy(s, pp, false, 0);
}
/* Parses 's' as a set of OpenFlow instructions and appends the instructions to
* Returns NULL if successful, otherwise a malloc()'d string describing the
* error. The caller is responsible for freeing the returned string. */
char * OVS_WARN_UNUSED_RESULT
-ofpacts_parse_instructions(const char *s, struct ofpbuf *ofpacts,
- enum ofputil_protocol *usable_protocols)
+ofpacts_parse_instructions(const char *s, const struct ofpact_parse_params *pp)
{
- return ofpacts_parse_copy(s, ofpacts, usable_protocols, true, 0);
+ return ofpacts_parse_copy(s, pp, true, 0);
}
const char *
static uint32_t
ofpact_hdrs_hash(const struct ofpact_hdrs *hdrs)
{
- return hash_2words(hdrs->vendor, (hdrs->type << 16) | hdrs->ofp_version);
+ return hash_2words(hdrs->vendor,
+ ((uint32_t) hdrs->type << 16) | hdrs->ofp_version);
}
#include "ofp-actions.inc2"
}
}
+ VLOG_WARN_RL(&rl, "unknown %s action for vendor %#"PRIx32" and "
+ "type %"PRIu16, ofputil_version_to_string(ofp_version),
+ hdrs.vendor, hdrs.type);
return (hdrs.vendor
? OFPERR_OFPBAC_BAD_VENDOR_TYPE
: OFPERR_OFPBAC_BAD_TYPE);
projects / mirror_ovs.git / blobdiff