/*
- * Copyright (c) 2010, 2011 Nicira Networks.
+ * Copyright (c) 2010, 2011, 2012 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 "classifier.h"
#include "dynamic-string.h"
#include "meta-flow.h"
+#include "ofp-actions.h"
+#include "ofp-errors.h"
#include "ofp-util.h"
#include "ofpbuf.h"
#include "openflow/nicira-ext.h"
#include "packets.h"
#include "unaligned.h"
+#include "util.h"
#include "vlog.h"
VLOG_DEFINE_THIS_MODULE(nx_match);
* peer and so there's not much point in showing a lot of them. */
static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5);
-enum {
- NXM_INVALID = OFP_MKERR_NICIRA(OFPET_BAD_REQUEST, NXBRC_NXM_INVALID),
- NXM_BAD_TYPE = OFP_MKERR_NICIRA(OFPET_BAD_REQUEST, NXBRC_NXM_BAD_TYPE),
- NXM_BAD_VALUE = OFP_MKERR_NICIRA(OFPET_BAD_REQUEST, NXBRC_NXM_BAD_VALUE),
- NXM_BAD_MASK = OFP_MKERR_NICIRA(OFPET_BAD_REQUEST, NXBRC_NXM_BAD_MASK),
- NXM_BAD_PREREQ = OFP_MKERR_NICIRA(OFPET_BAD_REQUEST, NXBRC_NXM_BAD_PREREQ),
- NXM_DUP_TYPE = OFP_MKERR_NICIRA(OFPET_BAD_REQUEST, NXBRC_NXM_DUP_TYPE),
- BAD_ARGUMENT = OFP_MKERR(OFPET_BAD_ACTION, OFPBAC_BAD_ARGUMENT)
-};
-
/* Returns the width of the data for a field with the given 'header', in
* bytes. */
int
if (match_len < 4) {
if (match_len) {
- VLOG_DBG_RL(&rl, "nx_match ends with partial nxm_header");
+ VLOG_DBG_RL(&rl, "nx_match ends with partial (%u-byte) nxm_header",
+ match_len);
}
return 0;
}
return header;
}
-static int
+static enum ofperr
nx_pull_match__(struct ofpbuf *b, unsigned int match_len, bool strict,
uint16_t priority, struct cls_rule *rule,
ovs_be64 *cookie, ovs_be64 *cookie_mask)
assert((cookie != NULL) == (cookie_mask != NULL));
+ cls_rule_init_catchall(rule, priority);
+ if (cookie) {
+ *cookie = *cookie_mask = htonll(0);
+ }
+ if (!match_len) {
+ return 0;
+ }
+
p = ofpbuf_try_pull(b, ROUND_UP(match_len, 8));
if (!p) {
VLOG_DBG_RL(&rl, "nx_match length %u, rounded up to a "
"multiple of 8, is longer than space in message (max "
"length %zu)", match_len, b->size);
- return ofp_mkerr(OFPET_BAD_REQUEST, OFPBRC_BAD_LEN);
+ return OFPERR_OFPBMC_BAD_LEN;
}
- cls_rule_init_catchall(rule, priority);
- if (cookie) {
- *cookie = *cookie_mask = htonll(0);
- }
for (;
(header = nx_entry_ok(p, match_len)) != 0;
p += 4 + NXM_LENGTH(header), match_len -= 4 + NXM_LENGTH(header)) {
const struct mf_field *mf;
- int error;
+ enum ofperr error;
mf = mf_from_nxm_header(header);
if (!mf) {
if (strict) {
- error = NXM_BAD_TYPE;
+ error = OFPERR_OFPBMC_BAD_FIELD;
} else {
continue;
}
} else if (!mf_are_prereqs_ok(mf, &rule->flow)) {
- error = NXM_BAD_PREREQ;
+ error = OFPERR_OFPBMC_BAD_PREREQ;
} else if (!mf_is_all_wild(mf, &rule->wc)) {
- error = NXM_DUP_TYPE;
- } else {
+ error = OFPERR_OFPBMC_DUP_FIELD;
+ } else if (header != OXM_OF_IN_PORT) {
unsigned int width = mf->n_bytes;
union mf_value value;
memcpy(&value, p + 4, width);
if (!mf_is_value_valid(mf, &value)) {
- error = NXM_BAD_VALUE;
+ error = OFPERR_OFPBMC_BAD_VALUE;
} else if (!NXM_HASMASK(header)) {
error = 0;
mf_set_value(mf, &value, rule);
memcpy(&mask, p + 4 + width, width);
if (!mf_is_mask_valid(mf, &mask)) {
- error = NXM_BAD_MASK;
+ error = OFPERR_OFPBMC_BAD_MASK;
} else {
error = 0;
mf_set(mf, &value, &mask, rule);
}
}
+ } else {
+ /* Special case for 32bit ports when using OXM,
+ * ports are 16 bits wide otherwise. */
+ ovs_be32 port_of11;
+ uint16_t port;
+
+ memcpy(&port_of11, p + 4, sizeof port_of11);
+ error = ofputil_port_from_ofp11(port_of11, &port);
+ if (!error) {
+ cls_rule_set_in_port(rule, port);
+ }
}
/* Check if the match is for a cookie rather than a classifier rule. */
if ((header == NXM_NX_COOKIE || header == NXM_NX_COOKIE_W) && cookie) {
if (*cookie_mask) {
- error = NXM_DUP_TYPE;
+ error = OFPERR_OFPBMC_DUP_FIELD;
} else {
unsigned int width = sizeof *cookie;
}
if (error) {
- char *msg = ofputil_error_to_string(error);
VLOG_DBG_RL(&rl, "bad nxm_entry %#08"PRIx32" (vendor=%"PRIu32", "
"field=%"PRIu32", hasmask=%"PRIu32", len=%"PRIu32"), "
"(%s)", header,
NXM_VENDOR(header), NXM_FIELD(header),
NXM_HASMASK(header), NXM_LENGTH(header),
- msg);
- free(msg);
-
+ ofperr_to_string(error));
return error;
}
}
- return match_len ? NXM_INVALID : 0;
+ return match_len ? OFPERR_OFPBMC_BAD_LEN : 0;
}
/* Parses the nx_match formatted match description in 'b' with length
* Fails with an error when encountering unknown NXM headers.
*
* Returns 0 if successful, otherwise an OpenFlow error code. */
-int
+enum ofperr
nx_pull_match(struct ofpbuf *b, unsigned int match_len,
uint16_t priority, struct cls_rule *rule,
ovs_be64 *cookie, ovs_be64 *cookie_mask)
/* Behaves the same as nx_pull_match() with one exception. Skips over unknown
* NXM headers instead of failing with an error when they are encountered. */
-int
+enum ofperr
nx_pull_match_loose(struct ofpbuf *b, unsigned int match_len,
uint16_t priority, struct cls_rule *rule,
ovs_be64 *cookie, ovs_be64 *cookie_mask)
}
static void
-nxm_put_eth_dst(struct ofpbuf *b,
- flow_wildcards_t wc, const uint8_t value[ETH_ADDR_LEN])
+nxm_put_eth_masked(struct ofpbuf *b, uint32_t header,
+ const uint8_t value[ETH_ADDR_LEN],
+ const uint8_t mask[ETH_ADDR_LEN])
{
- switch (wc & (FWW_DL_DST | FWW_ETH_MCAST)) {
- case FWW_DL_DST | FWW_ETH_MCAST:
- break;
- default:
- nxm_put_header(b, NXM_OF_ETH_DST_W);
- ofpbuf_put(b, value, ETH_ADDR_LEN);
- ofpbuf_put(b, flow_wildcards_to_dl_dst_mask(wc), ETH_ADDR_LEN);
- break;
- case 0:
- nxm_put_eth(b, NXM_OF_ETH_DST, value);
- break;
+ if (!eth_addr_is_zero(mask)) {
+ if (eth_mask_is_exact(mask)) {
+ nxm_put_eth(b, header, value);
+ } else {
+ nxm_put_header(b, NXM_MAKE_WILD_HEADER(header));
+ ofpbuf_put(b, value, ETH_ADDR_LEN);
+ ofpbuf_put(b, mask, ETH_ADDR_LEN);
+ }
}
}
}
}
+static void
+nxm_put_ip(struct ofpbuf *b, const struct cls_rule *cr,
+ uint8_t icmp_proto, uint32_t icmp_type, uint32_t icmp_code,
+ bool oxm)
+{
+ const flow_wildcards_t wc = cr->wc.wildcards;
+ const struct flow *flow = &cr->flow;
+
+ nxm_put_frag(b, cr);
+
+ if (!(wc & FWW_NW_DSCP)) {
+ nxm_put_8(b, oxm ? OXM_OF_IP_DSCP : NXM_OF_IP_TOS,
+ flow->nw_tos & IP_DSCP_MASK);
+ }
+
+ if (!(wc & FWW_NW_ECN)) {
+ nxm_put_8(b, oxm ? OXM_OF_IP_ECN : NXM_NX_IP_ECN,
+ flow->nw_tos & IP_ECN_MASK);
+ }
+
+ if (!oxm && !(wc & FWW_NW_TTL)) {
+ nxm_put_8(b, NXM_NX_IP_TTL, flow->nw_ttl);
+ }
+
+ if (!(wc & FWW_NW_PROTO)) {
+ nxm_put_8(b, oxm ? OXM_OF_IP_PROTO : NXM_OF_IP_PROTO, flow->nw_proto);
+
+ if (flow->nw_proto == IPPROTO_TCP) {
+ nxm_put_16m(b, oxm ? OXM_OF_TCP_SRC : NXM_OF_TCP_SRC,
+ flow->tp_src, cr->wc.tp_src_mask);
+ nxm_put_16m(b, oxm ? OXM_OF_TCP_DST : NXM_OF_TCP_DST,
+ flow->tp_dst, cr->wc.tp_dst_mask);
+ } else if (flow->nw_proto == IPPROTO_UDP) {
+ nxm_put_16m(b, oxm ? OXM_OF_UDP_SRC : NXM_OF_UDP_SRC,
+ flow->tp_src, cr->wc.tp_src_mask);
+ nxm_put_16m(b, oxm ? OXM_OF_UDP_DST : NXM_OF_UDP_DST,
+ flow->tp_dst, cr->wc.tp_dst_mask);
+ } else if (flow->nw_proto == icmp_proto) {
+ if (cr->wc.tp_src_mask) {
+ nxm_put_8(b, icmp_type, ntohs(flow->tp_src));
+ }
+ if (cr->wc.tp_dst_mask) {
+ nxm_put_8(b, icmp_code, ntohs(flow->tp_dst));
+ }
+ }
+ }
+}
+
/* Appends to 'b' the nx_match format that expresses 'cr' (except for
* 'cr->priority', because priority is not part of nx_match), plus enough
* zero bytes to pad the nx_match out to a multiple of 8. For Flow Mod
* If 'cr' is a catch-all rule that matches every packet, then this function
* appends nothing to 'b' and returns 0. */
int
-nx_put_match(struct ofpbuf *b, const struct cls_rule *cr,
+nx_put_match(struct ofpbuf *b, bool oxm, const struct cls_rule *cr,
ovs_be64 cookie, ovs_be64 cookie_mask)
{
const flow_wildcards_t wc = cr->wc.wildcards;
int match_len;
int i;
- BUILD_ASSERT_DECL(FLOW_WC_SEQ == 7);
+ BUILD_ASSERT_DECL(FLOW_WC_SEQ == 14);
/* Metadata. */
if (!(wc & FWW_IN_PORT)) {
uint16_t in_port = flow->in_port;
- nxm_put_16(b, NXM_OF_IN_PORT, htons(in_port));
+ if (oxm) {
+ nxm_put_32(b, OXM_OF_IN_PORT, ofputil_port_to_ofp11(in_port));
+ } else {
+ nxm_put_16(b, NXM_OF_IN_PORT, htons(in_port));
+ }
}
/* Ethernet. */
- nxm_put_eth_dst(b, wc, flow->dl_dst);
- if (!(wc & FWW_DL_SRC)) {
- nxm_put_eth(b, NXM_OF_ETH_SRC, flow->dl_src);
- }
+ nxm_put_eth_masked(b, oxm ? OXM_OF_ETH_SRC : NXM_OF_ETH_SRC,
+ flow->dl_src, cr->wc.dl_src_mask);
+ nxm_put_eth_masked(b, oxm ? OXM_OF_ETH_DST : NXM_OF_ETH_DST,
+ flow->dl_dst, cr->wc.dl_dst_mask);
if (!(wc & FWW_DL_TYPE)) {
- nxm_put_16(b, NXM_OF_ETH_TYPE,
+ nxm_put_16(b, oxm ? OXM_OF_ETH_TYPE : NXM_OF_ETH_TYPE,
ofputil_dl_type_to_openflow(flow->dl_type));
}
/* 802.1Q. */
- nxm_put_16m(b, NXM_OF_VLAN_TCI, flow->vlan_tci, cr->wc.vlan_tci_mask);
-
- /* L3. */
- if (!(wc & FWW_DL_TYPE) && flow->dl_type == htons(ETH_TYPE_IP)) {
- /* IP. */
- nxm_put_32m(b, NXM_OF_IP_SRC, flow->nw_src, cr->wc.nw_src_mask);
- nxm_put_32m(b, NXM_OF_IP_DST, flow->nw_dst, cr->wc.nw_dst_mask);
- nxm_put_frag(b, cr);
+ if (oxm) {
+ ovs_be16 vid = flow->vlan_tci & htons(VLAN_VID_MASK | VLAN_CFI);
+ ovs_be16 mask = cr->wc.vlan_tci_mask & htons(VLAN_VID_MASK | VLAN_CFI);
- if (!(wc & FWW_NW_DSCP)) {
- nxm_put_8(b, NXM_OF_IP_TOS, flow->nw_tos & IP_DSCP_MASK);
+ if (mask == htons(VLAN_VID_MASK | VLAN_CFI)) {
+ nxm_put_16(b, OXM_OF_VLAN_VID, vid);
+ } else if (mask) {
+ nxm_put_16m(b, OXM_OF_VLAN_VID, vid, mask);
}
- if (!(wc & FWW_NW_ECN)) {
- nxm_put_8(b, NXM_NX_IP_ECN, flow->nw_tos & IP_ECN_MASK);
+ if (vid && vlan_tci_to_pcp(cr->wc.vlan_tci_mask)) {
+ nxm_put_8(b, OXM_OF_VLAN_PCP, vlan_tci_to_pcp(flow->vlan_tci));
}
- if (!(wc & FWW_NW_TTL)) {
- nxm_put_8(b, NXM_NX_IP_TTL, flow->nw_ttl);
- }
-
- if (!(wc & FWW_NW_PROTO)) {
- nxm_put_8(b, NXM_OF_IP_PROTO, flow->nw_proto);
- switch (flow->nw_proto) {
- /* TCP. */
- case IPPROTO_TCP:
- if (!(wc & FWW_TP_SRC)) {
- nxm_put_16(b, NXM_OF_TCP_SRC, flow->tp_src);
- }
- if (!(wc & FWW_TP_DST)) {
- nxm_put_16(b, NXM_OF_TCP_DST, flow->tp_dst);
- }
- break;
-
- /* UDP. */
- case IPPROTO_UDP:
- if (!(wc & FWW_TP_SRC)) {
- nxm_put_16(b, NXM_OF_UDP_SRC, flow->tp_src);
- }
- if (!(wc & FWW_TP_DST)) {
- nxm_put_16(b, NXM_OF_UDP_DST, flow->tp_dst);
- }
- break;
+ } else {
+ nxm_put_16m(b, NXM_OF_VLAN_TCI, flow->vlan_tci, cr->wc.vlan_tci_mask);
+ }
- /* ICMP. */
- case IPPROTO_ICMP:
- if (!(wc & FWW_TP_SRC)) {
- nxm_put_8(b, NXM_OF_ICMP_TYPE, ntohs(flow->tp_src));
- }
- if (!(wc & FWW_TP_DST)) {
- nxm_put_8(b, NXM_OF_ICMP_CODE, ntohs(flow->tp_dst));
- }
- break;
- }
- }
+ /* L3. */
+ if (!(wc & FWW_DL_TYPE) && flow->dl_type == htons(ETH_TYPE_IP)) {
+ /* IP. */
+ nxm_put_32m(b, oxm ? OXM_OF_IPV4_SRC : NXM_OF_IP_SRC,
+ flow->nw_src, cr->wc.nw_src_mask);
+ nxm_put_32m(b, oxm ? OXM_OF_IPV4_DST : NXM_OF_IP_DST,
+ flow->nw_dst, cr->wc.nw_dst_mask);
+ nxm_put_ip(b, cr, IPPROTO_ICMP,
+ oxm ? OXM_OF_ICMPV4_TYPE : NXM_OF_ICMP_TYPE,
+ oxm ? OXM_OF_ICMPV4_CODE : NXM_OF_ICMP_CODE, oxm);
} else if (!(wc & FWW_DL_TYPE) && flow->dl_type == htons(ETH_TYPE_IPV6)) {
/* IPv6. */
- nxm_put_ipv6(b, NXM_NX_IPV6_SRC, &flow->ipv6_src,
- &cr->wc.ipv6_src_mask);
- nxm_put_ipv6(b, NXM_NX_IPV6_DST, &flow->ipv6_dst,
- &cr->wc.ipv6_dst_mask);
- nxm_put_frag(b, cr);
-
- if (!(wc & FWW_IPV6_LABEL)) {
- nxm_put_32(b, NXM_NX_IPV6_LABEL, flow->ipv6_label);
- }
-
- if (!(wc & FWW_NW_DSCP)) {
- nxm_put_8(b, NXM_OF_IP_TOS, flow->nw_tos & IP_DSCP_MASK);
- }
-
- if (!(wc & FWW_NW_ECN)) {
- nxm_put_8(b, NXM_NX_IP_ECN, flow->nw_tos & IP_ECN_MASK);
- }
-
- if (!(wc & FWW_NW_TTL)) {
- nxm_put_8(b, NXM_NX_IP_TTL, flow->nw_ttl);
- }
-
- if (!(wc & FWW_NW_PROTO)) {
- nxm_put_8(b, NXM_OF_IP_PROTO, flow->nw_proto);
- switch (flow->nw_proto) {
- /* TCP. */
- case IPPROTO_TCP:
- if (!(wc & FWW_TP_SRC)) {
- nxm_put_16(b, NXM_OF_TCP_SRC, flow->tp_src);
- }
- if (!(wc & FWW_TP_DST)) {
- nxm_put_16(b, NXM_OF_TCP_DST, flow->tp_dst);
- }
- break;
-
- /* UDP. */
- case IPPROTO_UDP:
- if (!(wc & FWW_TP_SRC)) {
- nxm_put_16(b, NXM_OF_UDP_SRC, flow->tp_src);
- }
- if (!(wc & FWW_TP_DST)) {
- nxm_put_16(b, NXM_OF_UDP_DST, flow->tp_dst);
- }
- break;
-
- /* ICMPv6. */
- case IPPROTO_ICMPV6:
- if (!(wc & FWW_TP_SRC)) {
- nxm_put_8(b, NXM_NX_ICMPV6_TYPE, ntohs(flow->tp_src));
-
- if (flow->tp_src == htons(ND_NEIGHBOR_SOLICIT) ||
- flow->tp_src == htons(ND_NEIGHBOR_ADVERT)) {
- if (!(wc & FWW_ND_TARGET)) {
- nxm_put_ipv6(b, NXM_NX_ND_TARGET, &flow->nd_target,
- &in6addr_exact);
- }
- if (!(wc & FWW_ARP_SHA)
- && flow->tp_src == htons(ND_NEIGHBOR_SOLICIT)) {
- nxm_put_eth(b, NXM_NX_ND_SLL, flow->arp_sha);
- }
- if (!(wc & FWW_ARP_THA)
- && flow->tp_src == htons(ND_NEIGHBOR_ADVERT)) {
- nxm_put_eth(b, NXM_NX_ND_TLL, flow->arp_tha);
- }
- }
- }
- if (!(wc & FWW_TP_DST)) {
- nxm_put_8(b, NXM_NX_ICMPV6_CODE, ntohs(flow->tp_dst));
- }
- break;
+ nxm_put_ipv6(b, oxm ? OXM_OF_IPV6_SRC : NXM_NX_IPV6_SRC,
+ &flow->ipv6_src, &cr->wc.ipv6_src_mask);
+ nxm_put_ipv6(b, oxm ? OXM_OF_IPV6_DST : NXM_NX_IPV6_DST,
+ &flow->ipv6_dst, &cr->wc.ipv6_dst_mask);
+ nxm_put_ip(b, cr, IPPROTO_ICMPV6,
+ oxm ? OXM_OF_ICMPV6_TYPE : NXM_NX_ICMPV6_TYPE,
+ oxm ? OXM_OF_ICMPV6_CODE : NXM_NX_ICMPV6_CODE, oxm);
+
+ nxm_put_32m(b, oxm ? OXM_OF_IPV6_FLABEL : NXM_NX_IPV6_LABEL,
+ flow->ipv6_label, cr->wc.ipv6_label_mask);
+
+ if (flow->nw_proto == IPPROTO_ICMPV6
+ && (flow->tp_src == htons(ND_NEIGHBOR_SOLICIT) ||
+ flow->tp_src == htons(ND_NEIGHBOR_ADVERT))) {
+ nxm_put_ipv6(b, oxm ? OXM_OF_IPV6_ND_TARGET : NXM_NX_ND_TARGET,
+ &flow->nd_target, &cr->wc.nd_target_mask);
+ if (flow->tp_src == htons(ND_NEIGHBOR_SOLICIT)) {
+ nxm_put_eth_masked(b, oxm ? OXM_OF_IPV6_ND_SLL : NXM_NX_ND_SLL,
+ flow->arp_sha, cr->wc.arp_sha_mask);
+ }
+ if (flow->tp_src == htons(ND_NEIGHBOR_ADVERT)) {
+ nxm_put_eth_masked(b, oxm ? OXM_OF_IPV6_ND_TLL : NXM_NX_ND_TLL,
+ flow->arp_tha, cr->wc.arp_tha_mask);
}
}
} else if (!(wc & FWW_DL_TYPE) && flow->dl_type == htons(ETH_TYPE_ARP)) {
/* ARP. */
if (!(wc & FWW_NW_PROTO)) {
- nxm_put_16(b, NXM_OF_ARP_OP, htons(flow->nw_proto));
- }
- nxm_put_32m(b, NXM_OF_ARP_SPA, flow->nw_src, cr->wc.nw_src_mask);
- nxm_put_32m(b, NXM_OF_ARP_TPA, flow->nw_dst, cr->wc.nw_dst_mask);
- if (!(wc & FWW_ARP_SHA)) {
- nxm_put_eth(b, NXM_NX_ARP_SHA, flow->arp_sha);
- }
- if (!(wc & FWW_ARP_THA)) {
- nxm_put_eth(b, NXM_NX_ARP_THA, flow->arp_tha);
+ nxm_put_16(b, oxm ? OXM_OF_ARP_OP : NXM_OF_ARP_OP,
+ htons(flow->nw_proto));
}
+ nxm_put_32m(b, oxm ? OXM_OF_ARP_SPA : NXM_OF_ARP_SPA,
+ flow->nw_src, cr->wc.nw_src_mask);
+ nxm_put_32m(b, oxm ? OXM_OF_ARP_TPA : NXM_OF_ARP_TPA,
+ flow->nw_dst, cr->wc.nw_dst_mask);
+ nxm_put_eth_masked(b, oxm ? OXM_OF_ARP_SHA : NXM_NX_ARP_SHA,
+ flow->arp_sha, cr->wc.arp_sha_mask);
+ nxm_put_eth_masked(b, oxm ? OXM_OF_ARP_THA : NXM_NX_ARP_THA,
+ flow->arp_tha, cr->wc.arp_tha_mask);
}
/* Tunnel ID. */
htonl(flow->regs[i]), htonl(cr->wc.reg_masks[i]));
}
+ /* OpenFlow 1.1+ Metadata. */
+ nxm_put_64m(b, OXM_OF_METADATA, flow->metadata, cr->wc.metadata_mask);
+
/* Cookie. */
nxm_put_64m(b, NXM_NX_COOKIE, cookie, cookie_mask);
{
const struct mf_field *mf = mf_from_nxm_header(header);
if (mf) {
- ds_put_cstr(s, mf->nxm_name);
+ ds_put_cstr(s, IS_OXM_HEADER(header) ? mf->oxm_name : mf->nxm_name);
if (NXM_HASMASK(header)) {
ds_put_cstr(s, "_W");
}
for (i = 0; i < MFF_N_IDS; i++) {
const struct mf_field *mf = mf_from_id(i);
+ uint32_t header;
- if (mf->nxm_name
- && !strncmp(mf->nxm_name, name, name_len)
- && mf->nxm_name[name_len] == '\0') {
- if (!wild) {
- return mf->nxm_header;
- } else if (mf->maskable != MFM_NONE) {
- return NXM_MAKE_WILD_HEADER(mf->nxm_header);
- }
+ if (mf->nxm_name &&
+ !strncmp(mf->nxm_name, name, name_len) &&
+ mf->nxm_name[name_len] == '\0') {
+ header = mf->nxm_header;
+ } else if (mf->oxm_name &&
+ !strncmp(mf->oxm_name, name, name_len) &&
+ mf->oxm_name[name_len] == '\0') {
+ header = mf->oxm_header;
+ } else {
+ continue;
+ }
+
+ if (!wild) {
+ return header;
+ } else if (mf->maskable != MFM_NONE) {
+ return NXM_MAKE_WILD_HEADER(header);
}
}
- if (!strncmp("NXM_NX_COOKIE", name, name_len)
- && (name_len == strlen("NXM_NX_COOKIE"))) {
+ if (!strncmp("NXM_NX_COOKIE", name, name_len) &&
+ (name_len == strlen("NXM_NX_COOKIE"))) {
if (!wild) {
return NXM_NX_COOKIE;
} else {
return match_len;
}
\f
-const char *
-nxm_parse_field_bits(const char *s, uint32_t *headerp, int *ofsp, int *n_bitsp)
-{
- const char *full_s = s;
- const char *name;
- uint32_t header;
- int start, end;
- int name_len;
- int width;
-
- name = s;
- name_len = strcspn(s, "[");
- if (s[name_len] != '[') {
- ovs_fatal(0, "%s: missing [ looking for field name", full_s);
- }
-
- header = parse_nxm_field_name(name, name_len);
- if (!header) {
- ovs_fatal(0, "%s: unknown field `%.*s'", full_s, name_len, s);
- }
- width = nxm_field_bits(header);
-
- s += name_len;
- if (sscanf(s, "[%d..%d]", &start, &end) == 2) {
- /* Nothing to do. */
- } else if (sscanf(s, "[%d]", &start) == 1) {
- end = start;
- } else if (!strncmp(s, "[]", 2)) {
- start = 0;
- end = width - 1;
- } else {
- ovs_fatal(0, "%s: syntax error expecting [] or [<bit>] or "
- "[<start>..<end>]", full_s);
- }
- s = strchr(s, ']') + 1;
-
- if (start > end) {
- ovs_fatal(0, "%s: starting bit %d is after ending bit %d",
- full_s, start, end);
- } else if (start >= width) {
- ovs_fatal(0, "%s: starting bit %d is not valid because field is only "
- "%d bits wide", full_s, start, width);
- } else if (end >= width){
- ovs_fatal(0, "%s: ending bit %d is not valid because field is only "
- "%d bits wide", full_s, end, width);
- }
-
- *headerp = header;
- *ofsp = start;
- *n_bitsp = end - start + 1;
-
- return s;
-}
-
void
-nxm_parse_reg_move(struct nx_action_reg_move *move, const char *s)
+nxm_parse_reg_move(struct ofpact_reg_move *move, const char *s)
{
const char *full_s = s;
- uint32_t src, dst;
- int src_ofs, dst_ofs;
- int src_n_bits, dst_n_bits;
- s = nxm_parse_field_bits(s, &src, &src_ofs, &src_n_bits);
+ s = mf_parse_subfield(&move->src, s);
if (strncmp(s, "->", 2)) {
ovs_fatal(0, "%s: missing `->' following source", full_s);
}
s += 2;
- s = nxm_parse_field_bits(s, &dst, &dst_ofs, &dst_n_bits);
+ s = mf_parse_subfield(&move->dst, s);
if (*s != '\0') {
ovs_fatal(0, "%s: trailing garbage following destination", full_s);
}
- if (src_n_bits != dst_n_bits) {
+ if (move->src.n_bits != move->dst.n_bits) {
ovs_fatal(0, "%s: source field is %d bits wide but destination is "
- "%d bits wide", full_s, src_n_bits, dst_n_bits);
+ "%d bits wide", full_s,
+ move->src.n_bits, move->dst.n_bits);
}
-
- ofputil_init_NXAST_REG_MOVE(move);
- move->n_bits = htons(src_n_bits);
- move->src_ofs = htons(src_ofs);
- move->dst_ofs = htons(dst_ofs);
- move->src = htonl(src);
- move->dst = htonl(dst);
}
void
-nxm_parse_reg_load(struct nx_action_reg_load *load, const char *s)
+nxm_parse_reg_load(struct ofpact_reg_load *load, const char *s)
{
const char *full_s = s;
- uint32_t dst;
- int ofs, n_bits;
- uint64_t value;
- value = strtoull(s, (char **) &s, 0);
+ load->value = strtoull(s, (char **) &s, 0);
if (strncmp(s, "->", 2)) {
ovs_fatal(0, "%s: missing `->' following value", full_s);
}
s += 2;
- s = nxm_parse_field_bits(s, &dst, &ofs, &n_bits);
+ s = mf_parse_subfield(&load->dst, s);
if (*s != '\0') {
ovs_fatal(0, "%s: trailing garbage following destination", full_s);
}
- if (n_bits < 64 && (value >> n_bits) != 0) {
+ if (load->dst.n_bits < 64 && (load->value >> load->dst.n_bits) != 0) {
ovs_fatal(0, "%s: value %"PRIu64" does not fit into %d bits",
- full_s, value, n_bits);
+ full_s, load->value, load->dst.n_bits);
}
-
- ofputil_init_NXAST_REG_LOAD(load);
- load->ofs_nbits = nxm_encode_ofs_nbits(ofs, n_bits);
- load->dst = htonl(dst);
- load->value = htonll(value);
}
\f
/* nxm_format_reg_move(), nxm_format_reg_load(). */
void
-nxm_format_field_bits(struct ds *s, uint32_t header, int ofs, int n_bits)
-{
- format_nxm_field_name(s, header);
- if (ofs == 0 && n_bits == nxm_field_bits(header)) {
- ds_put_cstr(s, "[]");
- } else if (n_bits == 1) {
- ds_put_format(s, "[%d]", ofs);
- } else {
- ds_put_format(s, "[%d..%d]", ofs, ofs + n_bits - 1);
- }
-}
-
-void
-nxm_format_reg_move(const struct nx_action_reg_move *move, struct ds *s)
+nxm_format_reg_move(const struct ofpact_reg_move *move, struct ds *s)
{
- int n_bits = ntohs(move->n_bits);
- int src_ofs = ntohs(move->src_ofs);
- int dst_ofs = ntohs(move->dst_ofs);
- uint32_t src = ntohl(move->src);
- uint32_t dst = ntohl(move->dst);
-
ds_put_format(s, "move:");
- nxm_format_field_bits(s, src, src_ofs, n_bits);
+ mf_format_subfield(&move->src, s);
ds_put_cstr(s, "->");
- nxm_format_field_bits(s, dst, dst_ofs, n_bits);
+ mf_format_subfield(&move->dst, s);
}
void
-nxm_format_reg_load(const struct nx_action_reg_load *load, struct ds *s)
+nxm_format_reg_load(const struct ofpact_reg_load *load, struct ds *s)
{
- int ofs = nxm_decode_ofs(load->ofs_nbits);
- int n_bits = nxm_decode_n_bits(load->ofs_nbits);
- uint32_t dst = ntohl(load->dst);
- uint64_t value = ntohll(load->value);
-
- ds_put_format(s, "load:%#"PRIx64"->", value);
- nxm_format_field_bits(s, dst, ofs, n_bits);
+ ds_put_format(s, "load:%#"PRIx64"->", load->value);
+ mf_format_subfield(&load->dst, s);
}
\f
-/* nxm_check_reg_move(), nxm_check_reg_load(). */
-
-static bool
-field_ok(const struct mf_field *mf, const struct flow *flow, int size)
-{
- return (mf
- && mf_are_prereqs_ok(mf, flow)
- && size <= nxm_field_bits(mf->nxm_header));
-}
-
-int
-nxm_check_reg_move(const struct nx_action_reg_move *action,
- const struct flow *flow)
+enum ofperr
+nxm_reg_move_from_openflow(const struct nx_action_reg_move *narm,
+ struct ofpbuf *ofpacts)
{
- int src_ofs, dst_ofs, n_bits;
- int error;
-
- n_bits = ntohs(action->n_bits);
- src_ofs = ntohs(action->src_ofs);
- dst_ofs = ntohs(action->dst_ofs);
+ struct ofpact_reg_move *move;
- error = nxm_src_check(action->src, src_ofs, n_bits, flow);
- if (error) {
- return error;
- }
+ move = ofpact_put_REG_MOVE(ofpacts);
+ move->src.field = mf_from_nxm_header(ntohl(narm->src));
+ move->src.ofs = ntohs(narm->src_ofs);
+ move->src.n_bits = ntohs(narm->n_bits);
+ move->dst.field = mf_from_nxm_header(ntohl(narm->dst));
+ move->dst.ofs = ntohs(narm->dst_ofs);
+ move->dst.n_bits = ntohs(narm->n_bits);
- return nxm_dst_check(action->dst, dst_ofs, n_bits, flow);
+ return nxm_reg_move_check(move, NULL);
}
-/* Given a flow, checks that the source field represented by 'src_header'
- * in the range ['ofs', 'ofs' + 'n_bits') is valid. */
-int
-nxm_src_check(ovs_be32 src_header_, unsigned int ofs, unsigned int n_bits,
- const struct flow *flow)
+enum ofperr
+nxm_reg_load_from_openflow(const struct nx_action_reg_load *narl,
+ struct ofpbuf *ofpacts)
{
- uint32_t src_header = ntohl(src_header_);
- const struct mf_field *src = mf_from_nxm_header(src_header);
+ struct ofpact_reg_load *load;
- if (!n_bits) {
- VLOG_WARN_RL(&rl, "zero bit source field");
- } else if (NXM_HASMASK(src_header) || !field_ok(src, flow, ofs + n_bits)) {
- VLOG_WARN_RL(&rl, "invalid source field");
- } else {
- return 0;
- }
-
- return BAD_ARGUMENT;
-}
+ load = ofpact_put_REG_LOAD(ofpacts);
+ load->dst.field = mf_from_nxm_header(ntohl(narl->dst));
+ load->dst.ofs = nxm_decode_ofs(narl->ofs_nbits);
+ load->dst.n_bits = nxm_decode_n_bits(narl->ofs_nbits);
+ load->value = ntohll(narl->value);
-/* Given a flow, checks that the destination field represented by 'dst_header'
- * in the range ['ofs', 'ofs' + 'n_bits') is valid. */
-int
-nxm_dst_check(ovs_be32 dst_header_, unsigned int ofs, unsigned int n_bits,
- const struct flow *flow)
-{
- uint32_t dst_header = ntohl(dst_header_);
- const struct mf_field *dst = mf_from_nxm_header(dst_header);
-
- if (!n_bits) {
- VLOG_WARN_RL(&rl, "zero bit destination field");
- } else if (NXM_HASMASK(dst_header) || !field_ok(dst, flow, ofs + n_bits)) {
- VLOG_WARN_RL(&rl, "invalid destination field");
- } else if (!dst->writable) {
- VLOG_WARN_RL(&rl, "destination field is not writable");
- } else {
- return 0;
+ /* Reject 'narl' if a bit numbered 'n_bits' or higher is set to 1 in
+ * narl->value. */
+ if (load->dst.n_bits < 64 && load->value >> load->dst.n_bits) {
+ return OFPERR_OFPBAC_BAD_ARGUMENT;
}
- return BAD_ARGUMENT;
+ return nxm_reg_load_check(load, NULL);
}
-
-int
-nxm_check_reg_load(const struct nx_action_reg_load *action,
- const struct flow *flow)
+\f
+enum ofperr
+nxm_reg_move_check(const struct ofpact_reg_move *move, const struct flow *flow)
{
- unsigned int ofs = nxm_decode_ofs(action->ofs_nbits);
- unsigned int n_bits = nxm_decode_n_bits(action->ofs_nbits);
- int error;
+ enum ofperr error;
- error = nxm_dst_check(action->dst, ofs, n_bits, flow);
+ error = mf_check_src(&move->src, flow);
if (error) {
return error;
}
- /* Reject 'action' if a bit numbered 'n_bits' or higher is set to 1 in
- * action->value. */
- if (n_bits < 64 && ntohll(action->value) >> n_bits) {
- return BAD_ARGUMENT;
- }
+ return mf_check_dst(&move->dst, NULL);
+}
- return 0;
+enum ofperr
+nxm_reg_load_check(const struct ofpact_reg_load *load, const struct flow *flow)
+{
+ return mf_check_dst(&load->dst, flow);
}
\f
-/* nxm_execute_reg_move(), nxm_execute_reg_load(). */
-
-static void
-bitwise_copy(const void *src_, unsigned int src_len, unsigned int src_ofs,
- void *dst_, unsigned int dst_len, unsigned int dst_ofs,
- unsigned int n_bits)
+void
+nxm_reg_move_to_nxast(const struct ofpact_reg_move *move,
+ struct ofpbuf *openflow)
{
- const uint8_t *src = src_;
- uint8_t *dst = dst_;
+ struct nx_action_reg_move *narm;
- src += src_len - (src_ofs / 8 + 1);
- src_ofs %= 8;
-
- dst += dst_len - (dst_ofs / 8 + 1);
- dst_ofs %= 8;
-
- if (src_ofs == 0 && dst_ofs == 0) {
- unsigned int n_bytes = n_bits / 8;
- if (n_bytes) {
- dst -= n_bytes - 1;
- src -= n_bytes - 1;
- memcpy(dst, src, n_bytes);
-
- n_bits %= 8;
- src--;
- dst--;
- }
- if (n_bits) {
- uint8_t mask = (1 << n_bits) - 1;
- *dst = (*dst & ~mask) | (*src & mask);
- }
- } else {
- while (n_bits > 0) {
- unsigned int max_copy = 8 - MAX(src_ofs, dst_ofs);
- unsigned int chunk = MIN(n_bits, max_copy);
- uint8_t mask = ((1 << chunk) - 1) << dst_ofs;
-
- *dst &= ~mask;
- *dst |= ((*src >> src_ofs) << dst_ofs) & mask;
-
- src_ofs += chunk;
- if (src_ofs == 8) {
- src--;
- src_ofs = 0;
- }
- dst_ofs += chunk;
- if (dst_ofs == 8) {
- dst--;
- dst_ofs = 0;
- }
- n_bits -= chunk;
- }
- }
+ narm = ofputil_put_NXAST_REG_MOVE(openflow);
+ narm->n_bits = htons(move->dst.n_bits);
+ narm->src_ofs = htons(move->src.ofs);
+ narm->dst_ofs = htons(move->dst.ofs);
+ narm->src = htonl(move->src.field->nxm_header);
+ narm->dst = htonl(move->dst.field->nxm_header);
}
-/* Returns the value of the NXM field corresponding to 'header' at 'ofs_nbits'
- * in 'flow'. */
-uint64_t
-nxm_read_field_bits(ovs_be32 header, ovs_be16 ofs_nbits,
- const struct flow *flow)
+void
+nxm_reg_load_to_nxast(const struct ofpact_reg_load *load,
+ struct ofpbuf *openflow)
{
- const struct mf_field *field = mf_from_nxm_header(ntohl(header));
- union mf_value value;
- union mf_value bits;
-
- mf_get_value(field, flow, &value);
- bits.be64 = htonll(0);
- bitwise_copy(&value, field->n_bytes, nxm_decode_ofs(ofs_nbits),
- &bits, sizeof bits.be64, 0,
- nxm_decode_n_bits(ofs_nbits));
- return ntohll(bits.be64);
+ struct nx_action_reg_load *narl;
+
+ narl = ofputil_put_NXAST_REG_LOAD(openflow);
+ narl->ofs_nbits = nxm_encode_ofs_nbits(load->dst.ofs, load->dst.n_bits);
+ narl->dst = htonl(load->dst.field->nxm_header);
+ narl->value = htonll(load->value);
}
+\f
+/* nxm_execute_reg_move(), nxm_execute_reg_load(). */
void
-nxm_execute_reg_move(const struct nx_action_reg_move *action,
+nxm_execute_reg_move(const struct ofpact_reg_move *move,
struct flow *flow)
{
- const struct mf_field *src = mf_from_nxm_header(ntohl(action->src));
- const struct mf_field *dst = mf_from_nxm_header(ntohl(action->dst));
union mf_value src_value;
union mf_value dst_value;
- mf_get_value(dst, flow, &dst_value);
- mf_get_value(src, flow, &src_value);
- bitwise_copy(&src_value, src->n_bytes, ntohs(action->src_ofs),
- &dst_value, dst->n_bytes, ntohs(action->dst_ofs),
- ntohs(action->n_bits));
- mf_set_flow_value(dst, &dst_value, flow);
+ mf_get_value(move->dst.field, flow, &dst_value);
+ mf_get_value(move->src.field, flow, &src_value);
+ bitwise_copy(&src_value, move->src.field->n_bytes, move->src.ofs,
+ &dst_value, move->dst.field->n_bytes, move->dst.ofs,
+ move->src.n_bits);
+ mf_set_flow_value(move->dst.field, &dst_value, flow);
}
void
-nxm_execute_reg_load(const struct nx_action_reg_load *action,
- struct flow *flow)
+nxm_execute_reg_load(const struct ofpact_reg_load *load, struct flow *flow)
{
- nxm_reg_load(action->dst, action->ofs_nbits, ntohll(action->value), flow);
+ nxm_reg_load(&load->dst, load->value, flow);
}
-/* Calculates ofs and n_bits from the given 'ofs_nbits' parameter, and copies
- * 'src_data'[0:n_bits] to 'dst_header'[ofs:ofs+n_bits] in the given 'flow'. */
void
-nxm_reg_load(ovs_be32 dst_header, ovs_be16 ofs_nbits, uint64_t src_data,
+nxm_reg_load(const struct mf_subfield *dst, uint64_t src_data,
struct flow *flow)
{
- const struct mf_field *dst = mf_from_nxm_header(ntohl(dst_header));
- int n_bits = nxm_decode_n_bits(ofs_nbits);
- int dst_ofs = nxm_decode_ofs(ofs_nbits);
union mf_value dst_value;
union mf_value src_value;
- mf_get_value(dst, flow, &dst_value);
+ mf_get_value(dst->field, flow, &dst_value);
src_value.be64 = htonll(src_data);
bitwise_copy(&src_value, sizeof src_value.be64, 0,
- &dst_value, dst->n_bytes, dst_ofs,
- n_bits);
- mf_set_flow_value(dst, &dst_value, flow);
+ &dst_value, dst->field->n_bytes, dst->ofs,
+ dst->n_bits);
+ mf_set_flow_value(dst->field, &dst_value, flow);
}
projects / openvswitch / blobdiff