#include "classifier.h"
#include "dynamic-string.h"
+#include "meta-flow.h"
#include "ofp-util.h"
#include "ofpbuf.h"
#include "openflow/nicira-ext.h"
/* For each NXM_* field, define NFI_NXM_* as consecutive integers starting from
* zero. */
enum nxm_field_index {
-#define DEFINE_FIELD(HEADER, WILDCARD, DL_TYPES, NW_PROTO, WRITABLE) \
+#define DEFINE_FIELD(HEADER, MFF_ID, WRITABLE) \
NFI_NXM_##HEADER,
#include "nx-match.def"
N_NXM_FIELDS
struct hmap_node hmap_node;
enum nxm_field_index index; /* NFI_* value. */
uint32_t header; /* NXM_* value. */
- flow_wildcards_t wildcard; /* FWW_* bit, if exactly one. */
- ovs_be16 dl_type[N_NXM_DL_TYPES]; /* dl_type prerequisites. */
- uint8_t nw_proto; /* nw_proto prerequisite, if nonzero. */
+ enum mf_field_id mf_id; /* MFF_* value. */
+ const struct mf_field *mf;
const char *name; /* "NXM_*" string. */
bool writable; /* Writable with NXAST_REG_{MOVE,LOAD}? */
};
-
/* All the known fields. */
static struct nxm_field nxm_fields[N_NXM_FIELDS] = {
-#define DEFINE_FIELD(HEADER, WILDCARD, DL_TYPES, NW_PROTO, WRITABLE) \
- { HMAP_NODE_NULL_INITIALIZER, NFI_NXM_##HEADER, NXM_##HEADER, WILDCARD, \
- DL_CONVERT DL_TYPES, NW_PROTO, "NXM_" #HEADER, WRITABLE },
-#define DL_CONVERT(T1, T2) { CONSTANT_HTONS(T1), CONSTANT_HTONS(T2) }
+#define DEFINE_FIELD(HEADER, MFF_ID, WRITABLE) \
+ { HMAP_NODE_NULL_INITIALIZER, NFI_NXM_##HEADER, NXM_##HEADER, \
+ MFF_ID, NULL, "NXM_" #HEADER, WRITABLE },
#include "nx-match.def"
};
/* Hash table of 'nxm_fields'. */
static struct hmap all_nxm_fields = HMAP_INITIALIZER(&all_nxm_fields);
-/* Possible masks for NXM_OF_ETH_DST_W. */
-static const uint8_t eth_all_0s[ETH_ADDR_LEN]
- = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-static const uint8_t eth_all_1s[ETH_ADDR_LEN]
- = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
-static const uint8_t eth_mcast_1[ETH_ADDR_LEN]
- = {0x01, 0x00, 0x00, 0x00, 0x00, 0x00};
-static const uint8_t eth_mcast_0[ETH_ADDR_LEN]
- = {0xfe, 0xff, 0xff, 0xff, 0xff, 0xff};
-
static void
nxm_init(void)
{
struct nxm_field *f = &nxm_fields[i];
hmap_insert(&all_nxm_fields, &f->hmap_node,
hash_int(f->header, 0));
+ f->mf = mf_from_id(f->mf_id);
}
/* Verify that the header values are unique (duplicate "case" values
* cause a compile error). */
switch (0) {
-#define DEFINE_FIELD(HEADER, WILDCARD, DL_TYPE, NW_PROTO, WRITABLE) \
+#define DEFINE_FIELD(HEADER, MFF_ID, WRITABLE) \
case NXM_##HEADER: break;
#include "nx-match.def"
}
{
return nxm_field_bytes(header) * 8;
}
-\f
-/* nx_pull_match() and helpers. */
-
-static int
-parse_nx_reg(const struct nxm_field *f,
- struct flow *flow, struct flow_wildcards *wc,
- const void *value, const void *maskp)
-{
- int idx = NXM_NX_REG_IDX(f->header);
- if (wc->reg_masks[idx]) {
- return NXM_DUP_TYPE;
- } else {
- flow_wildcards_set_reg_mask(wc, idx,
- (NXM_HASMASK(f->header)
- ? ntohl(get_unaligned_be32(maskp))
- : UINT32_MAX));
- flow->regs[idx] = ntohl(get_unaligned_be32(value));
- flow->regs[idx] &= wc->reg_masks[idx];
- return 0;
- }
-}
-
-static int
-parse_nxm_entry(struct cls_rule *rule, const struct nxm_field *f,
- const void *value, const void *mask)
-{
- struct flow_wildcards *wc = &rule->wc;
- struct flow *flow = &rule->flow;
-
- switch (f->index) {
- /* Metadata. */
- case NFI_NXM_OF_IN_PORT:
- flow->in_port = ntohs(get_unaligned_be16(value));
- return 0;
-
- /* Ethernet header. */
- case NFI_NXM_OF_ETH_DST:
- if ((wc->wildcards & (FWW_DL_DST | FWW_ETH_MCAST))
- != (FWW_DL_DST | FWW_ETH_MCAST)) {
- return NXM_DUP_TYPE;
- } else {
- wc->wildcards &= ~(FWW_DL_DST | FWW_ETH_MCAST);
- memcpy(flow->dl_dst, value, ETH_ADDR_LEN);
- return 0;
- }
- case NFI_NXM_OF_ETH_DST_W:
- if ((wc->wildcards & (FWW_DL_DST | FWW_ETH_MCAST))
- != (FWW_DL_DST | FWW_ETH_MCAST)) {
- return NXM_DUP_TYPE;
- } else if (eth_addr_equals(mask, eth_mcast_1)) {
- wc->wildcards &= ~FWW_ETH_MCAST;
- flow->dl_dst[0] = *(uint8_t *) value & 0x01;
- return 0;
- } else if (eth_addr_equals(mask, eth_mcast_0)) {
- wc->wildcards &= ~FWW_DL_DST;
- memcpy(flow->dl_dst, value, ETH_ADDR_LEN);
- flow->dl_dst[0] &= 0xfe;
- return 0;
- } else if (eth_addr_equals(mask, eth_all_0s)) {
- return 0;
- } else if (eth_addr_equals(mask, eth_all_1s)) {
- wc->wildcards &= ~(FWW_DL_DST | FWW_ETH_MCAST);
- memcpy(flow->dl_dst, value, ETH_ADDR_LEN);
- return 0;
- } else {
- return NXM_BAD_MASK;
- }
- case NFI_NXM_OF_ETH_SRC:
- memcpy(flow->dl_src, value, ETH_ADDR_LEN);
- return 0;
- case NFI_NXM_OF_ETH_TYPE:
- flow->dl_type = ofputil_dl_type_from_openflow(get_unaligned_be16(value));
- return 0;
-
- /* 802.1Q header. */
- case NFI_NXM_OF_VLAN_TCI:
- if (wc->vlan_tci_mask) {
- return NXM_DUP_TYPE;
- } else {
- cls_rule_set_dl_tci(rule, get_unaligned_be16(value));
- return 0;
- }
- case NFI_NXM_OF_VLAN_TCI_W:
- if (wc->vlan_tci_mask) {
- return NXM_DUP_TYPE;
- } else {
- cls_rule_set_dl_tci_masked(rule, get_unaligned_be16(value),
- get_unaligned_be16(mask));
- return 0;
- }
-
- /* IP header. */
- case NFI_NXM_OF_IP_TOS:
- if (*(uint8_t *) value & 0x03) {
- return NXM_BAD_VALUE;
- } else {
- flow->nw_tos = *(uint8_t *) value;
- return 0;
- }
- case NFI_NXM_OF_IP_PROTO:
- flow->nw_proto = *(uint8_t *) value;
- return 0;
-
- /* IP addresses in IP and ARP headers. */
- case NFI_NXM_OF_IP_SRC:
- case NFI_NXM_OF_ARP_SPA:
- if (wc->nw_src_mask) {
- return NXM_DUP_TYPE;
- } else {
- cls_rule_set_nw_src(rule, get_unaligned_be32(value));
- return 0;
- }
- case NFI_NXM_OF_IP_SRC_W:
- case NFI_NXM_OF_ARP_SPA_W:
- if (wc->nw_src_mask) {
- return NXM_DUP_TYPE;
- } else {
- ovs_be32 ip = get_unaligned_be32(value);
- ovs_be32 netmask = get_unaligned_be32(mask);
- if (!cls_rule_set_nw_src_masked(rule, ip, netmask)) {
- return NXM_BAD_MASK;
- }
- return 0;
- }
- case NFI_NXM_OF_IP_DST:
- case NFI_NXM_OF_ARP_TPA:
- if (wc->nw_dst_mask) {
- return NXM_DUP_TYPE;
- } else {
- cls_rule_set_nw_dst(rule, get_unaligned_be32(value));
- return 0;
- }
- case NFI_NXM_OF_IP_DST_W:
- case NFI_NXM_OF_ARP_TPA_W:
- if (wc->nw_dst_mask) {
- return NXM_DUP_TYPE;
- } else {
- ovs_be32 ip = get_unaligned_be32(value);
- ovs_be32 netmask = get_unaligned_be32(mask);
- if (!cls_rule_set_nw_dst_masked(rule, ip, netmask)) {
- return NXM_BAD_MASK;
- }
- return 0;
- }
-
- /* IPv6 addresses. */
- case NFI_NXM_NX_IPV6_SRC:
- if (!ipv6_mask_is_any(&wc->ipv6_src_mask)) {
- return NXM_DUP_TYPE;
- } else {
- struct in6_addr ipv6;
- memcpy(&ipv6, value, sizeof ipv6);
- cls_rule_set_ipv6_src(rule, &ipv6);
- return 0;
- }
- case NFI_NXM_NX_IPV6_SRC_W:
- if (!ipv6_mask_is_any(&wc->ipv6_src_mask)) {
- return NXM_DUP_TYPE;
- } else {
- struct in6_addr ipv6, netmask;
- memcpy(&ipv6, value, sizeof ipv6);
- memcpy(&netmask, mask, sizeof netmask);
- if (!cls_rule_set_ipv6_src_masked(rule, &ipv6, &netmask)) {
- return NXM_BAD_MASK;
- }
- return 0;
- }
- case NFI_NXM_NX_IPV6_DST:
- if (!ipv6_mask_is_any(&wc->ipv6_dst_mask)) {
- return NXM_DUP_TYPE;
- } else {
- struct in6_addr ipv6;
- memcpy(&ipv6, value, sizeof ipv6);
- cls_rule_set_ipv6_dst(rule, &ipv6);
- return 0;
- }
- case NFI_NXM_NX_IPV6_DST_W:
- if (!ipv6_mask_is_any(&wc->ipv6_dst_mask)) {
- return NXM_DUP_TYPE;
- } else {
- struct in6_addr ipv6, netmask;
- memcpy(&ipv6, value, sizeof ipv6);
- memcpy(&netmask, mask, sizeof netmask);
- if (!cls_rule_set_ipv6_dst_masked(rule, &ipv6, &netmask)) {
- return NXM_BAD_MASK;
- }
- return 0;
- }
-
- /* TCP header. */
- case NFI_NXM_OF_TCP_SRC:
- flow->tp_src = get_unaligned_be16(value);
- return 0;
- case NFI_NXM_OF_TCP_DST:
- flow->tp_dst = get_unaligned_be16(value);
- return 0;
-
- /* UDP header. */
- case NFI_NXM_OF_UDP_SRC:
- flow->tp_src = get_unaligned_be16(value);
- return 0;
- case NFI_NXM_OF_UDP_DST:
- flow->tp_dst = get_unaligned_be16(value);
- return 0;
-
- /* ICMP header. */
- case NFI_NXM_OF_ICMP_TYPE:
- flow->tp_src = htons(*(uint8_t *) value);
- return 0;
- case NFI_NXM_OF_ICMP_CODE:
- flow->tp_dst = htons(*(uint8_t *) value);
- return 0;
-
- /* ICMPv6 header. */
- case NFI_NXM_NX_ICMPV6_TYPE:
- flow->tp_src = htons(*(uint8_t *) value);
- return 0;
- case NFI_NXM_NX_ICMPV6_CODE:
- flow->tp_dst = htons(*(uint8_t *) value);
- return 0;
-
- /* IPv6 Neighbor Discovery. */
- case NFI_NXM_NX_ND_TARGET:
- /* We've already verified that it's an ICMPv6 message. */
- if ((flow->tp_src != htons(ND_NEIGHBOR_SOLICIT))
- && (flow->tp_src != htons(ND_NEIGHBOR_ADVERT))) {
- return NXM_BAD_PREREQ;
- }
- memcpy(&flow->nd_target, value, sizeof flow->nd_target);
- return 0;
- case NFI_NXM_NX_ND_SLL:
- /* We've already verified that it's an ICMPv6 message. */
- if (flow->tp_src != htons(ND_NEIGHBOR_SOLICIT)) {
- return NXM_BAD_PREREQ;
- }
- memcpy(flow->arp_sha, value, ETH_ADDR_LEN);
- return 0;
- case NFI_NXM_NX_ND_TLL:
- /* We've already verified that it's an ICMPv6 message. */
- if (flow->tp_src != htons(ND_NEIGHBOR_ADVERT)) {
- return NXM_BAD_PREREQ;
- }
- memcpy(flow->arp_tha, value, ETH_ADDR_LEN);
- return 0;
-
- /* ARP header. */
- case NFI_NXM_OF_ARP_OP:
- if (ntohs(get_unaligned_be16(value)) > 255) {
- return NXM_BAD_VALUE;
- } else {
- flow->nw_proto = ntohs(get_unaligned_be16(value));
- return 0;
- }
-
- case NFI_NXM_NX_ARP_SHA:
- memcpy(flow->arp_sha, value, ETH_ADDR_LEN);
- return 0;
- case NFI_NXM_NX_ARP_THA:
- memcpy(flow->arp_tha, value, ETH_ADDR_LEN);
- return 0;
-
- /* Tunnel ID. */
- case NFI_NXM_NX_TUN_ID:
- if (wc->tun_id_mask) {
- return NXM_DUP_TYPE;
- } else {
- cls_rule_set_tun_id(rule, get_unaligned_be64(value));
- return 0;
- }
- case NFI_NXM_NX_TUN_ID_W:
- if (wc->tun_id_mask) {
- return NXM_DUP_TYPE;
- } else {
- ovs_be64 tun_id = get_unaligned_be64(value);
- ovs_be64 tun_mask = get_unaligned_be64(mask);
- cls_rule_set_tun_id_masked(rule, tun_id, tun_mask);
- return 0;
- }
-
- /* Registers. */
- case NFI_NXM_NX_REG0:
- case NFI_NXM_NX_REG0_W:
-#if FLOW_N_REGS >= 2
- case NFI_NXM_NX_REG1:
- case NFI_NXM_NX_REG1_W:
-#endif
-#if FLOW_N_REGS >= 3
- case NFI_NXM_NX_REG2:
- case NFI_NXM_NX_REG2_W:
-#endif
-#if FLOW_N_REGS >= 4
- case NFI_NXM_NX_REG3:
- case NFI_NXM_NX_REG3_W:
-#endif
-#if FLOW_N_REGS > 4
-#error
-#endif
- return parse_nx_reg(f, flow, wc, value, mask);
-
- case N_NXM_FIELDS:
- NOT_REACHED();
- }
- NOT_REACHED();
-}
-static bool
-nxm_prereqs_ok(const struct nxm_field *field, const struct flow *flow)
+const struct mf_field *
+nxm_field_to_mf_field(uint32_t header)
{
- if (field->nw_proto && field->nw_proto != flow->nw_proto) {
- return false;
- }
-
- if (!field->dl_type[0]) {
- return true;
- } else if (field->dl_type[0] == flow->dl_type) {
- return true;
- } else if (field->dl_type[1] && field->dl_type[1] == flow->dl_type) {
- return true;
- }
-
- return false;
+ const struct nxm_field *f = nxm_field_lookup(header);
+ return f ? f->mf : NULL;
}
+\f
+/* nx_pull_match() and helpers. */
static uint32_t
nx_entry_ok(const void *p, unsigned int match_len)
f = nxm_field_lookup(header);
if (!f) {
error = NXM_BAD_TYPE;
- } else if (!nxm_prereqs_ok(f, &rule->flow)) {
+ } else if (!mf_are_prereqs_ok(f->mf, &rule->flow)) {
error = NXM_BAD_PREREQ;
- } else if (f->wildcard && !(rule->wc.wildcards & f->wildcard)) {
+ } else if (!mf_is_all_wild(f->mf, &rule->wc)) {
error = NXM_DUP_TYPE;
} else {
- /* 'hasmask' and 'length' are known to be correct at this point
- * because they are included in 'header' and nxm_field_lookup()
- * checked them already. */
- rule->wc.wildcards &= ~f->wildcard;
- error = parse_nxm_entry(rule, f, p + 4, p + 4 + length / 2);
+ unsigned int width = f->mf->n_bytes;
+ union mf_value value;
+
+ memcpy(&value, p + 4, width);
+ if (!mf_is_value_valid(f->mf, &value)) {
+ error = NXM_BAD_VALUE;
+ } else if (!NXM_HASMASK(header)) {
+ error = 0;
+ mf_set_value(f->mf, &value, rule);
+ } else {
+ union mf_value mask;
+
+ memcpy(&mask, p + 4 + width, width);
+ if (!mf_is_mask_valid(f->mf, &mask)) {
+ error = NXM_BAD_MASK;
+ } else {
+ error = 0;
+ mf_set(f->mf, &value, &mask, rule);
+ }
+ }
}
+
if (error) {
VLOG_DBG_RL(&rl, "bad nxm_entry with vendor=%"PRIu32", "
"field=%"PRIu32", hasmask=%"PRIu32", type=%"PRIu32" "
return error;
}
-
p += 4 + length;
match_len -= 4 + length;
}
static void
nxm_put_eth_dst(struct ofpbuf *b,
- uint32_t wc, const uint8_t value[ETH_ADDR_LEN])
+ flow_wildcards_t wc, const uint8_t value[ETH_ADDR_LEN])
{
switch (wc & (FWW_DL_DST | FWW_ETH_MCAST)) {
case FWW_DL_DST | FWW_ETH_MCAST:
break;
- case FWW_DL_DST:
- nxm_put_header(b, NXM_OF_ETH_DST_W);
- ofpbuf_put(b, value, ETH_ADDR_LEN);
- ofpbuf_put(b, eth_mcast_1, ETH_ADDR_LEN);
- break;
- case FWW_ETH_MCAST:
+ default:
nxm_put_header(b, NXM_OF_ETH_DST_W);
ofpbuf_put(b, value, ETH_ADDR_LEN);
- ofpbuf_put(b, eth_mcast_0, 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);
int match_len;
int i;
+ BUILD_ASSERT_DECL(FLOW_WC_SEQ == 1);
+
/* Metadata. */
if (!(wc & FWW_IN_PORT)) {
uint16_t in_port = flow->in_port;
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));
}
- if (!(wc & FWW_ND_TARGET)) {
- nxm_put_ipv6(b, NXM_NX_ND_TARGET, &flow->nd_target,
- &in6addr_exact);
- }
- if (!(wc & FWW_ARP_SHA)) {
- nxm_put_eth(b, NXM_NX_ND_SLL, flow->arp_sha);
- }
- if (!(wc & FWW_ARP_THA)) {
- nxm_put_eth(b, NXM_NX_ND_TLL, flow->arp_tha);
- }
break;
}
}
"%d bits wide", full_s, src_n_bits, dst_n_bits);
}
- move->type = htons(OFPAT_VENDOR);
- move->len = htons(sizeof *move);
- move->vendor = htonl(NX_VENDOR_ID);
- move->subtype = htons(NXAST_REG_MOVE);
+ 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);
full_s, value, n_bits);
}
- load->type = htons(OFPAT_VENDOR);
- load->len = htons(sizeof *load);
- load->vendor = htonl(NX_VENDOR_ID);
- load->subtype = htons(NXAST_REG_LOAD);
+ ofputil_init_NXAST_REG_LOAD(load);
load->ofs_nbits = nxm_encode_ofs_nbits(ofs, n_bits);
load->dst = htonl(dst);
load->value = htonll(value);
static bool
field_ok(const struct nxm_field *f, const struct flow *flow, int size)
{
- return (f && !NXM_HASMASK(f->header)
- && nxm_prereqs_ok(f, flow) && size <= nxm_field_bits(f->header));
+ return (f
+ && !NXM_HASMASK(f->header)
+ && mf_are_prereqs_ok(f->mf, flow)
+ && size <= nxm_field_bits(f->header));
}
int
nxm_check_reg_move(const struct nx_action_reg_move *action,
const struct flow *flow)
{
- const struct nxm_field *src;
- const struct nxm_field *dst;
+ int src_ofs, dst_ofs, n_bits;
+ int error;
- if (action->n_bits == htons(0)) {
- return BAD_ARGUMENT;
- }
+ n_bits = ntohs(action->n_bits);
+ src_ofs = ntohs(action->src_ofs);
+ dst_ofs = ntohs(action->dst_ofs);
- src = nxm_field_lookup(ntohl(action->src));
- if (!field_ok(src, flow, ntohs(action->src_ofs) + ntohs(action->n_bits))) {
- return BAD_ARGUMENT;
+ error = nxm_src_check(action->src, src_ofs, n_bits, flow);
+ if (error) {
+ return error;
}
- dst = nxm_field_lookup(ntohl(action->dst));
- if (!field_ok(dst, flow, ntohs(action->dst_ofs) + ntohs(action->n_bits))) {
- return BAD_ARGUMENT;
+ return nxm_dst_check(action->dst, dst_ofs, n_bits, flow);
+}
+
+/* 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)
+{
+ const struct nxm_field *src = nxm_field_lookup(ntohl(src_header));
+
+ if (!n_bits) {
+ VLOG_WARN_RL(&rl, "zero bit source field");
+ } else if (!field_ok(src, flow, ofs + n_bits)) {
+ VLOG_WARN_RL(&rl, "invalid source field");
+ } else {
+ return 0;
}
- if (!dst->writable) {
- return BAD_ARGUMENT;
+ return BAD_ARGUMENT;
+}
+
+/* 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)
+{
+ const struct nxm_field *dst = nxm_field_lookup(ntohl(dst_header));
+
+ if (!n_bits) {
+ VLOG_WARN_RL(&rl, "zero bit destination field");
+ } else if (!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;
}
- return 0;
+ return BAD_ARGUMENT;
}
int
nxm_check_reg_load(const struct nx_action_reg_load *action,
const struct flow *flow)
{
- const struct nxm_field *dst;
- int ofs, n_bits;
+ unsigned int ofs = nxm_decode_ofs(action->ofs_nbits);
+ unsigned int n_bits = nxm_decode_n_bits(action->ofs_nbits);
+ int error;
- ofs = nxm_decode_ofs(action->ofs_nbits);
- n_bits = nxm_decode_n_bits(action->ofs_nbits);
- dst = nxm_field_lookup(ntohl(action->dst));
- if (!field_ok(dst, flow, ofs + n_bits)) {
- return BAD_ARGUMENT;
+ error = nxm_dst_check(action->dst, ofs, n_bits, flow);
+ if (error) {
+ return error;
}
/* Reject 'action' if a bit numbered 'n_bits' or higher is set to 1 in
return BAD_ARGUMENT;
}
- if (!dst->writable) {
- return BAD_ARGUMENT;
- }
-
return 0;
}
\f
NOT_REACHED();
}
+/* 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)
+{
+ int n_bits = nxm_decode_n_bits(ofs_nbits);
+ int ofs = nxm_decode_ofs(ofs_nbits);
+ uint64_t mask, data;
+
+ mask = n_bits == 64 ? UINT64_MAX : (UINT64_C(1) << n_bits) - 1;
+ data = nxm_read_field(nxm_field_lookup(ntohl(header)), flow);
+ data = (data >> ofs) & mask;
+
+ return data;
+}
+
static void
nxm_write_field(const struct nxm_field *dst, struct flow *flow,
uint64_t new_value)
{
switch (dst->index) {
+ case NFI_NXM_OF_ETH_DST:
+ eth_addr_from_uint64(new_value, flow->dl_dst);
+ break;
+
+ case NFI_NXM_OF_ETH_SRC:
+ eth_addr_from_uint64(new_value, flow->dl_src);
+ break;
+
case NFI_NXM_OF_VLAN_TCI:
flow->vlan_tci = htons(new_value);
break;
#error
#endif
- case NFI_NXM_OF_IN_PORT:
- case NFI_NXM_OF_ETH_DST:
- case NFI_NXM_OF_ETH_SRC:
- case NFI_NXM_OF_ETH_TYPE:
case NFI_NXM_OF_IP_TOS:
- case NFI_NXM_OF_IP_PROTO:
- case NFI_NXM_OF_ARP_OP:
+ flow->nw_tos = new_value & IP_DSCP_MASK;
+ break;
+
case NFI_NXM_OF_IP_SRC:
- case NFI_NXM_OF_ARP_SPA:
+ flow->nw_src = htonl(new_value);
+ break;
+
case NFI_NXM_OF_IP_DST:
- case NFI_NXM_OF_ARP_TPA:
+ flow->nw_dst = htonl(new_value);
+ break;
+
case NFI_NXM_OF_TCP_SRC:
case NFI_NXM_OF_UDP_SRC:
+ flow->tp_src = htons(new_value);
+ break;
+
case NFI_NXM_OF_TCP_DST:
case NFI_NXM_OF_UDP_DST:
+ flow->tp_dst = htons(new_value);
+ break;
+
+ case NFI_NXM_OF_IN_PORT:
+ case NFI_NXM_OF_ETH_TYPE:
+ case NFI_NXM_OF_IP_PROTO:
+ case NFI_NXM_OF_ARP_OP:
+ case NFI_NXM_OF_ARP_SPA:
+ case NFI_NXM_OF_ARP_TPA:
case NFI_NXM_OF_ICMP_TYPE:
case NFI_NXM_OF_ICMP_CODE:
case NFI_NXM_NX_TUN_ID_W:
nxm_execute_reg_move(const struct nx_action_reg_move *action,
struct flow *flow)
{
- /* Preparation. */
- int n_bits = ntohs(action->n_bits);
- uint64_t mask = n_bits == 64 ? UINT64_MAX : (UINT64_C(1) << n_bits) - 1;
-
- /* Get the interesting bits of the source field. */
- const struct nxm_field *src = nxm_field_lookup(ntohl(action->src));
- int src_ofs = ntohs(action->src_ofs);
- uint64_t src_data = nxm_read_field(src, flow) & (mask << src_ofs);
-
- /* Get the remaining bits of the destination field. */
- const struct nxm_field *dst = nxm_field_lookup(ntohl(action->dst));
- int dst_ofs = ntohs(action->dst_ofs);
- uint64_t dst_data = nxm_read_field(dst, flow) & ~(mask << dst_ofs);
+ ovs_be16 src_ofs_nbits, dst_ofs_nbits;
+ uint64_t src_data;
+ int n_bits;
- /* Get the final value. */
- uint64_t new_data = dst_data | ((src_data >> src_ofs) << dst_ofs);
+ n_bits = ntohs(action->n_bits);
+ src_ofs_nbits = nxm_encode_ofs_nbits(ntohs(action->src_ofs), n_bits);
+ dst_ofs_nbits = nxm_encode_ofs_nbits(ntohs(action->dst_ofs), n_bits);
- nxm_write_field(dst, flow, new_data);
+ src_data = nxm_read_field_bits(action->src, src_ofs_nbits, flow);
+ nxm_reg_load(action->dst, dst_ofs_nbits, src_data, flow);
}
void
nxm_execute_reg_load(const struct nx_action_reg_load *action,
struct flow *flow)
{
- /* Preparation. */
- int n_bits = nxm_decode_n_bits(action->ofs_nbits);
- uint64_t mask = n_bits == 64 ? UINT64_MAX : (UINT64_C(1) << n_bits) - 1;
+ nxm_reg_load(action->dst, action->ofs_nbits, ntohll(action->value), flow);
+}
- /* Get source data. */
- uint64_t src_data = ntohll(action->value);
+/* 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,
+ struct flow *flow)
+{
+ int n_bits = nxm_decode_n_bits(ofs_nbits);
+ int dst_ofs = nxm_decode_ofs(ofs_nbits);
+ uint64_t mask = n_bits == 64 ? UINT64_MAX : (UINT64_C(1) << n_bits) - 1;
/* Get remaining bits of the destination field. */
- const struct nxm_field *dst = nxm_field_lookup(ntohl(action->dst));
- int dst_ofs = nxm_decode_ofs(action->ofs_nbits);
+ const struct nxm_field *dst = nxm_field_lookup(ntohl(dst_header));
uint64_t dst_data = nxm_read_field(dst, flow) & ~(mask << dst_ofs);
/* Get the final value. */
git://git.onelab.eu / sliver-openvswitch.git / blobdiff