X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fnx-match.c;h=fcc1081e0347a66693d320d64eff20777d12be34;hb=37a1300c3ca05a97160d44dc34298c447b50ed9d;hp=12ea4fb8c520f9b2f2e8cd5f2b8bd0c595b80005;hpb=1e37a2d75196c6e10ac078213ad94afb4f3e219a;p=openvswitch

diff --git a/lib/nx-match.c b/lib/nx-match.c
index 12ea4fb8..fcc1081e 100644
--- a/lib/nx-match.c
+++ b/lib/nx-match.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Nicira Networks.
+ * Copyright (c) 2010, 2011 Nicira Networks.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -46,7 +46,8 @@ enum {
 /* For each NXM_* field, define NFI_NXM_* as consecutive integers starting from
  * zero. */
 enum nxm_field_index {
-#define DEFINE_FIELD(HEADER, WILDCARD, DL_TYPE, NW_PROTO) NFI_NXM_##HEADER,
+#define DEFINE_FIELD(HEADER, WILDCARD, DL_TYPE, NW_PROTO, WRITABLE) \
+        NFI_NXM_##HEADER,
 #include "nx-match.def"
     N_NXM_FIELDS
 };
@@ -55,17 +56,18 @@ struct nxm_field {
     struct hmap_node hmap_node;
     enum nxm_field_index index; /* NFI_* value. */
     uint32_t header;            /* NXM_* value. */
-    uint32_t wildcard;          /* Wildcard bit, if exactly one. */
+    flow_wildcards_t wildcard;  /* FWW_* bit, if exactly one. */
     ovs_be16 dl_type;           /* dl_type prerequisite, if nonzero. */
     uint8_t nw_proto;           /* nw_proto prerequisite, if nonzero. */
     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_TYPE, NW_PROTO) \
+#define DEFINE_FIELD(HEADER, WILDCARD, DL_TYPE, NW_PROTO, WRITABLE)     \
     { HMAP_NODE_NULL_INITIALIZER, NFI_NXM_##HEADER, NXM_##HEADER, WILDCARD, \
-      CONSTANT_HTONS(DL_TYPE), NW_PROTO, "NXM_" #HEADER },
+      CONSTANT_HTONS(DL_TYPE), NW_PROTO, "NXM_" #HEADER, WRITABLE },
 #include "nx-match.def"
 };
 
@@ -97,7 +99,7 @@ nxm_init(void)
         /* 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) \
+#define DEFINE_FIELD(HEADER, WILDCARD, DL_TYPE, NW_PROTO, WRITABLE)  \
         case NXM_##HEADER: break;
 #include "nx-match.def"
         }
@@ -123,7 +125,7 @@ nxm_field_lookup(uint32_t header)
 
 /* Returns the width of the data for a field with the given 'header', in
  * bytes. */
-static int
+int
 nxm_field_bytes(uint32_t header)
 {
     unsigned int length = NXM_LENGTH(header);
@@ -132,7 +134,7 @@ nxm_field_bytes(uint32_t header)
 
 /* Returns the width of the data for a field with the given 'header', in
  * bits. */
-static int
+int
 nxm_field_bits(uint32_t header)
 {
     return nxm_field_bytes(header) * 8;
@@ -140,17 +142,6 @@ nxm_field_bits(uint32_t header)
 
 /* nx_pull_match() and helpers. */
 
-static int
-parse_tci(struct cls_rule *rule, ovs_be16 tci, ovs_be16 mask)
-{
-    enum { OFPFW_DL_TCI = OFPFW_DL_VLAN | OFPFW_DL_VLAN_PCP };
-    if ((rule->wc.wildcards & OFPFW_DL_TCI) != OFPFW_DL_TCI) {
-        return NXM_DUP_TYPE;
-    } else {
-        return cls_rule_set_dl_tci_masked(rule, tci, mask) ? 0 : NXM_INVALID;
-    }
-}
-
 static int
 parse_nx_reg(const struct nxm_field *f,
              struct flow *flow, struct flow_wildcards *wc,
@@ -162,9 +153,9 @@ parse_nx_reg(const struct nxm_field *f,
     } else {
         flow_wildcards_set_reg_mask(wc, idx,
                                     (NXM_HASMASK(f->header)
-                                     ? ntohl(get_unaligned_u32(maskp))
+                                     ? ntohl(get_unaligned_be32(maskp))
                                      : UINT32_MAX));
-        flow->regs[idx] = ntohl(get_unaligned_u32(value));
+        flow->regs[idx] = ntohl(get_unaligned_be32(value));
         flow->regs[idx] &= wc->reg_masks[idx];
         return 0;
     }
@@ -180,7 +171,7 @@ parse_nxm_entry(struct cls_rule *rule, const struct nxm_field *f,
     switch (f->index) {
         /* Metadata. */
     case NFI_NXM_OF_IN_PORT:
-        flow->in_port = ntohs(get_unaligned_u16(value));
+        flow->in_port = ntohs(get_unaligned_be16(value));
         if (flow->in_port == OFPP_LOCAL) {
             flow->in_port = ODPP_LOCAL;
         }
@@ -188,29 +179,29 @@ parse_nxm_entry(struct cls_rule *rule, const struct nxm_field *f,
 
         /* Ethernet header. */
     case NFI_NXM_OF_ETH_DST:
-        if ((wc->wildcards & (OFPFW_DL_DST | FWW_ETH_MCAST))
-            != (OFPFW_DL_DST | FWW_ETH_MCAST)) {
+        if ((wc->wildcards & (FWW_DL_DST | FWW_ETH_MCAST))
+            != (FWW_DL_DST | FWW_ETH_MCAST)) {
             return NXM_DUP_TYPE;
         } else {
-            wc->wildcards &= ~(OFPFW_DL_DST | FWW_ETH_MCAST);
+            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 & (OFPFW_DL_DST | FWW_ETH_MCAST))
-            != (OFPFW_DL_DST | FWW_ETH_MCAST)) {
+        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;
         } else if (eth_addr_equals(mask, eth_mcast_0)) {
-            wc->wildcards &= ~OFPFW_DL_DST;
+            wc->wildcards &= ~FWW_DL_DST;
             memcpy(flow->dl_dst, value, ETH_ADDR_LEN);
             flow->dl_dst[0] &= 0xfe;
         } else if (eth_addr_equals(mask, eth_all_0s)) {
             return 0;
         } else if (eth_addr_equals(mask, eth_all_1s)) {
-            wc->wildcards &= ~(OFPFW_DL_DST | FWW_ETH_MCAST);
+            wc->wildcards &= ~(FWW_DL_DST | FWW_ETH_MCAST);
             memcpy(flow->dl_dst, value, ETH_ADDR_LEN);
             return 0;
         } else {
@@ -220,16 +211,25 @@ parse_nxm_entry(struct cls_rule *rule, const struct nxm_field *f,
         memcpy(flow->dl_src, value, ETH_ADDR_LEN);
         return 0;
     case NFI_NXM_OF_ETH_TYPE:
-        flow->dl_type = get_unaligned_u16(value);
+        flow->dl_type = ofputil_dl_type_from_openflow(get_unaligned_be16(value));
         return 0;
 
         /* 802.1Q header. */
     case NFI_NXM_OF_VLAN_TCI:
-        return parse_tci(rule, get_unaligned_u16(value), htons(UINT16_MAX));
-
+        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:
-        return parse_tci(rule, get_unaligned_u16(value),
-                         get_unaligned_u16(mask));
+        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:
@@ -249,7 +249,7 @@ parse_nxm_entry(struct cls_rule *rule, const struct nxm_field *f,
         if (wc->nw_src_mask) {
             return NXM_DUP_TYPE;
         } else {
-            cls_rule_set_nw_src(rule, get_unaligned_u32(value));
+            cls_rule_set_nw_src(rule, get_unaligned_be32(value));
             return 0;
         }
     case NFI_NXM_OF_IP_SRC_W:
@@ -257,8 +257,8 @@ parse_nxm_entry(struct cls_rule *rule, const struct nxm_field *f,
         if (wc->nw_src_mask) {
             return NXM_DUP_TYPE;
         } else {
-            ovs_be32 ip = get_unaligned_u32(value);
-            ovs_be32 netmask = get_unaligned_u32(mask);
+            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;
             }
@@ -269,7 +269,7 @@ parse_nxm_entry(struct cls_rule *rule, const struct nxm_field *f,
         if (wc->nw_dst_mask) {
             return NXM_DUP_TYPE;
         } else {
-            cls_rule_set_nw_dst(rule, get_unaligned_u32(value));
+            cls_rule_set_nw_dst(rule, get_unaligned_be32(value));
             return 0;
         }
     case NFI_NXM_OF_IP_DST_W:
@@ -277,8 +277,8 @@ parse_nxm_entry(struct cls_rule *rule, const struct nxm_field *f,
         if (wc->nw_dst_mask) {
             return NXM_DUP_TYPE;
         } else {
-            ovs_be32 ip = get_unaligned_u32(value);
-            ovs_be32 netmask = get_unaligned_u32(mask);
+            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;
             }
@@ -287,18 +287,18 @@ parse_nxm_entry(struct cls_rule *rule, const struct nxm_field *f,
 
         /* TCP header. */
     case NFI_NXM_OF_TCP_SRC:
-        flow->tp_src = get_unaligned_u16(value);
+        flow->tp_src = get_unaligned_be16(value);
         return 0;
     case NFI_NXM_OF_TCP_DST:
-        flow->tp_dst = get_unaligned_u16(value);
+        flow->tp_dst = get_unaligned_be16(value);
         return 0;
 
         /* UDP header. */
     case NFI_NXM_OF_UDP_SRC:
-        flow->tp_src = get_unaligned_u16(value);
+        flow->tp_src = get_unaligned_be16(value);
         return 0;
     case NFI_NXM_OF_UDP_DST:
-        flow->tp_dst = get_unaligned_u16(value);
+        flow->tp_dst = get_unaligned_be16(value);
         return 0;
 
         /* ICMP header. */
@@ -311,17 +311,30 @@ parse_nxm_entry(struct cls_rule *rule, const struct nxm_field *f,
 
         /* ARP header. */
     case NFI_NXM_OF_ARP_OP:
-        if (ntohs(get_unaligned_u16(value)) > 255) {
+        if (ntohs(get_unaligned_be16(value)) > 255) {
             return NXM_BAD_VALUE;
         } else {
-            flow->nw_proto = ntohs(get_unaligned_u16(value));
+            flow->nw_proto = ntohs(get_unaligned_be16(value));
             return 0;
         }
 
         /* Tunnel ID. */
     case NFI_NXM_NX_TUN_ID:
-        flow->tun_id = htonl(ntohll(get_unaligned_u64(value)));
-        return 0;
+        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:
@@ -397,7 +410,7 @@ nx_pull_match(struct ofpbuf *b, unsigned int match_len, uint16_t priority,
 
     p = ofpbuf_try_pull(b, ROUND_UP(match_len, 8));
     if (!p) {
-        VLOG_DBG_RL(&rl, "nx_match length %zu, rounded up to a "
+        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);
@@ -477,6 +490,23 @@ nxm_put_16w(struct ofpbuf *b, uint32_t header, ovs_be16 value, ovs_be16 mask)
     ofpbuf_put(b, &mask, sizeof mask);
 }
 
+static void
+nxm_put_16m(struct ofpbuf *b, uint32_t header, ovs_be16 value, ovs_be16 mask)
+{
+    switch (mask) {
+    case 0:
+        break;
+
+    case CONSTANT_HTONS(UINT16_MAX):
+        nxm_put_16(b, header, value);
+        break;
+
+    default:
+        nxm_put_16w(b, NXM_MAKE_WILD_HEADER(header), value, mask);
+        break;
+    }
+}
+
 static void
 nxm_put_32(struct ofpbuf *b, uint32_t header, ovs_be32 value)
 {
@@ -499,7 +529,7 @@ nxm_put_32m(struct ofpbuf *b, uint32_t header, ovs_be32 value, ovs_be32 mask)
     case 0:
         break;
 
-    case UINT32_MAX:
+    case CONSTANT_HTONL(UINT32_MAX):
         nxm_put_32(b, header, value);
         break;
 
@@ -516,6 +546,31 @@ nxm_put_64(struct ofpbuf *b, uint32_t header, ovs_be64 value)
     ofpbuf_put(b, &value, sizeof value);
 }
 
+static void
+nxm_put_64w(struct ofpbuf *b, uint32_t header, ovs_be64 value, ovs_be64 mask)
+{
+    nxm_put_header(b, header);
+    ofpbuf_put(b, &value, sizeof value);
+    ofpbuf_put(b, &mask, sizeof mask);
+}
+
+static void
+nxm_put_64m(struct ofpbuf *b, uint32_t header, ovs_be64 value, ovs_be64 mask)
+{
+    switch (mask) {
+    case 0:
+        break;
+
+    case CONSTANT_HTONLL(UINT64_MAX):
+        nxm_put_64(b, header, value);
+        break;
+
+    default:
+        nxm_put_64w(b, NXM_MAKE_WILD_HEADER(header), value, mask);
+        break;
+    }
+}
+
 static void
 nxm_put_eth(struct ofpbuf *b, uint32_t header,
             const uint8_t value[ETH_ADDR_LEN])
@@ -528,10 +583,10 @@ static void
 nxm_put_eth_dst(struct ofpbuf *b,
                 uint32_t wc, const uint8_t value[ETH_ADDR_LEN])
 {
-    switch (wc & (OFPFW_DL_DST | FWW_ETH_MCAST)) {
-    case OFPFW_DL_DST | FWW_ETH_MCAST:
+    switch (wc & (FWW_DL_DST | FWW_ETH_MCAST)) {
+    case FWW_DL_DST | FWW_ETH_MCAST:
         break;
-    case OFPFW_DL_DST:
+    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);
@@ -547,18 +602,27 @@ nxm_put_eth_dst(struct ofpbuf *b,
     }
 }
 
+/* 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.
+ *
+ * This function can cause 'b''s data to be reallocated.
+ *
+ * Returns the number of bytes appended to 'b', excluding padding.
+ *
+ * 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)
 {
-    const uint32_t wc = cr->wc.wildcards;
+    const flow_wildcards_t wc = cr->wc.wildcards;
     const struct flow *flow = &cr->flow;
     const size_t start_len = b->size;
-    ovs_be16 vid, pcp;
     int match_len;
     int i;
 
     /* Metadata. */
-    if (!(wc & OFPFW_IN_PORT)) {
+    if (!(wc & FWW_IN_PORT)) {
         uint16_t in_port = flow->in_port;
         if (in_port == ODPP_LOCAL) {
             in_port = OFPP_LOCAL;
@@ -568,85 +632,63 @@ nx_put_match(struct ofpbuf *b, const struct cls_rule *cr)
 
     /* Ethernet. */
     nxm_put_eth_dst(b, wc, flow->dl_dst);
-    if (!(wc & OFPFW_DL_SRC)) {
+    if (!(wc & FWW_DL_SRC)) {
         nxm_put_eth(b, NXM_OF_ETH_SRC, flow->dl_src);
     }
-    if (!(wc & OFPFW_DL_TYPE)) {
-        nxm_put_16(b, NXM_OF_ETH_TYPE, flow->dl_type);
+    if (!(wc & FWW_DL_TYPE)) {
+        nxm_put_16(b, NXM_OF_ETH_TYPE,
+                   ofputil_dl_type_to_openflow(flow->dl_type));
     }
 
     /* 802.1Q. */
-    vid = flow->dl_vlan & htons(VLAN_VID_MASK);
-    pcp = htons((flow->dl_vlan_pcp << VLAN_PCP_SHIFT) & VLAN_PCP_MASK);
-    switch (wc & (OFPFW_DL_VLAN | OFPFW_DL_VLAN_PCP)) {
-    case OFPFW_DL_VLAN | OFPFW_DL_VLAN_PCP:
-        break;
-    case OFPFW_DL_VLAN:
-        nxm_put_16w(b, NXM_OF_VLAN_TCI_W, pcp | htons(VLAN_CFI),
-                     htons(VLAN_PCP_MASK | VLAN_CFI));
-        break;
-    case OFPFW_DL_VLAN_PCP:
-        if (flow->dl_vlan == htons(OFP_VLAN_NONE)) {
-            nxm_put_16(b, NXM_OF_VLAN_TCI, 0);
-        } else {
-            nxm_put_16w(b, NXM_OF_VLAN_TCI_W, vid | htons(VLAN_CFI),
-                         htons(VLAN_VID_MASK | VLAN_CFI));
-        }
-        break;
-    case 0:
-        if (flow->dl_vlan == htons(OFP_VLAN_NONE)) {
-            nxm_put_16(b, NXM_OF_VLAN_TCI, 0);
-        } else {
-            nxm_put_16(b, NXM_OF_VLAN_TCI, vid | pcp | htons(VLAN_CFI));
-        }
-        break;
-    }
+    nxm_put_16m(b, NXM_OF_VLAN_TCI, flow->vlan_tci, cr->wc.vlan_tci_mask);
 
-    if (!(wc & OFPFW_DL_TYPE) && flow->dl_type == htons(ETH_TYPE_IP)) {
+    /* L3. */
+    if (!(wc & FWW_DL_TYPE) && flow->dl_type == htons(ETH_TYPE_IP)) {
         /* IP. */
-        if (!(wc & OFPFW_NW_TOS)) {
+        if (!(wc & FWW_NW_TOS)) {
             nxm_put_8(b, NXM_OF_IP_TOS, flow->nw_tos & 0xfc);
         }
         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);
 
-        if (!(wc & OFPFW_NW_PROTO)) {
+        if (!(wc & FWW_NW_PROTO)) {
             nxm_put_8(b, NXM_OF_IP_PROTO, flow->nw_proto);
             switch (flow->nw_proto) {
                 /* TCP. */
             case IP_TYPE_TCP:
-                if (!(wc & OFPFW_TP_SRC)) {
+                if (!(wc & FWW_TP_SRC)) {
                     nxm_put_16(b, NXM_OF_TCP_SRC, flow->tp_src);
                 }
-                if (!(wc & OFPFW_TP_DST)) {
+                if (!(wc & FWW_TP_DST)) {
                     nxm_put_16(b, NXM_OF_TCP_DST, flow->tp_dst);
                 }
                 break;
 
                 /* UDP. */
             case IP_TYPE_UDP:
-                if (!(wc & OFPFW_TP_SRC)) {
+                if (!(wc & FWW_TP_SRC)) {
                     nxm_put_16(b, NXM_OF_UDP_SRC, flow->tp_src);
                 }
-                if (!(wc & OFPFW_TP_DST)) {
+                if (!(wc & FWW_TP_DST)) {
                     nxm_put_16(b, NXM_OF_UDP_DST, flow->tp_dst);
                 }
                 break;
 
                 /* ICMP. */
             case IP_TYPE_ICMP:
-                if (!(wc & OFPFW_TP_SRC)) {
+                if (!(wc & FWW_TP_SRC)) {
                     nxm_put_8(b, NXM_OF_ICMP_TYPE, ntohs(flow->tp_src));
                 }
-                if (!(wc & OFPFW_TP_DST)) {
+                if (!(wc & FWW_TP_DST)) {
                     nxm_put_8(b, NXM_OF_ICMP_CODE, ntohs(flow->tp_dst));
                 }
                 break;
             }
         }
-    } else if (!(wc & OFPFW_DL_TYPE) && flow->dl_type == htons(ETH_TYPE_ARP)) {
+    } else if (!(wc & FWW_DL_TYPE) && flow->dl_type == htons(ETH_TYPE_ARP)) {
         /* ARP. */
-        if (!(wc & OFPFW_NW_PROTO)) {
+        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);
@@ -654,9 +696,7 @@ nx_put_match(struct ofpbuf *b, const struct cls_rule *cr)
     }
 
     /* Tunnel ID. */
-    if (!(wc & NXFW_TUN_ID)) {
-        nxm_put_64(b, NXM_NX_TUN_ID, htonll(ntohl(flow->tun_id)));
-    }
+    nxm_put_64m(b, NXM_NX_TUN_ID, flow->tun_id, cr->wc.tun_id_mask);
 
     /* Registers. */
     for (i = 0; i < FLOW_N_REGS; i++) {
@@ -671,6 +711,8 @@ nx_put_match(struct ofpbuf *b, const struct cls_rule *cr)
 
 /* nx_match_to_string() and helpers. */
 
+static void format_nxm_field_name(struct ds *, uint32_t header);
+
 char *
 nx_match_to_string(const uint8_t *p, unsigned int match_len)
 {
@@ -687,20 +729,13 @@ nx_match_to_string(const uint8_t *p, unsigned int match_len)
         unsigned int value_len = nxm_field_bytes(header);
         const uint8_t *value = p + 4;
         const uint8_t *mask = value + value_len;
-        const struct nxm_field *f;
         unsigned int i;
 
         if (s.length) {
             ds_put_cstr(&s, ", ");
         }
 
-        f = nxm_field_lookup(header);
-        if (f) {
-            ds_put_cstr(&s, f->name);
-        } else {
-            ds_put_format(&s, "%d:%d", NXM_VENDOR(header), NXM_FIELD(header));
-        }
-
+        format_nxm_field_name(&s, header);
         ds_put_char(&s, '(');
 
         for (i = 0; i < value_len; i++) {
@@ -729,39 +764,39 @@ nx_match_to_string(const uint8_t *p, unsigned int match_len)
     return ds_steal_cstr(&s);
 }
 
-static const struct nxm_field *
-lookup_nxm_field(const char *name, int name_len)
+static void
+format_nxm_field_name(struct ds *s, uint32_t header)
+{
+    const struct nxm_field *f = nxm_field_lookup(header);
+    if (f) {
+        ds_put_cstr(s, f->name);
+    } else {
+        ds_put_format(s, "%d:%d", NXM_VENDOR(header), NXM_FIELD(header));
+    }
+}
+
+static uint32_t
+parse_nxm_field_name(const char *name, int name_len)
 {
     const struct nxm_field *f;
 
+    /* Check whether it's a field name. */
     for (f = nxm_fields; f < &nxm_fields[ARRAY_SIZE(nxm_fields)]; f++) {
         if (!strncmp(f->name, name, name_len) && f->name[name_len] == '\0') {
-            return f;
+            return f->header;
         }
     }
 
-    return NULL;
-}
-
-static const char *
-parse_hex_bytes(struct ofpbuf *b, const char *s, unsigned int n)
-{
-    while (n--) {
-        int low, high;
-        uint8_t byte;
-
-        s += strspn(s, " ");
-        low = hexit_value(*s);
-        high = low < 0 ? low : hexit_value(s[1]);
-        if (low < 0 || high < 0) {
-            ovs_fatal(0, "%.2s: hex digits expected", s);
+    /* Check whether it's a 32-bit field header value as hex.
+     * (This isn't ordinarily useful except for testing error behavior.) */
+    if (name_len == 8) {
+        uint32_t header = hexits_value(name, name_len, NULL);
+        if (header != UINT_MAX) {
+            return header;
         }
-
-        byte = 16 * low + high;
-        ofpbuf_put(b, &byte, 1);
-        s += 2;
     }
-    return s;
+
+    return 0;
 }
 
 /* nx_match_from_string(). */
@@ -780,35 +815,45 @@ nx_match_from_string(const char *s, struct ofpbuf *b)
     }
 
     for (s += strspn(s, ", "); *s; s += strspn(s, ", ")) {
-        const struct nxm_field *f;
+        const char *name;
+        uint32_t header;
         int name_len;
+        size_t n;
 
+        name = s;
         name_len = strcspn(s, "(");
         if (s[name_len] != '(') {
             ovs_fatal(0, "%s: missing ( at end of nx_match", full_s);
         }
 
-        f = lookup_nxm_field(s, name_len);
-        if (!f) {
+        header = parse_nxm_field_name(name, name_len);
+        if (!header) {
             ovs_fatal(0, "%s: unknown field `%.*s'", full_s, name_len, s);
         }
 
         s += name_len + 1;
 
-        nxm_put_header(b, f->header);
-        s = parse_hex_bytes(b, s, nxm_field_bytes(f->header));
-        if (NXM_HASMASK(f->header)) {
+        nxm_put_header(b, header);
+        s = ofpbuf_put_hex(b, s, &n);
+        if (n != nxm_field_bytes(header)) {
+            ovs_fatal(0, "%.2s: hex digits expected", s);
+        }
+        if (NXM_HASMASK(header)) {
             s += strspn(s, " ");
             if (*s != '/') {
-                ovs_fatal(0, "%s: missing / in masked field %s",
-                          full_s, f->name);
+                ovs_fatal(0, "%s: missing / in masked field %.*s",
+                          full_s, name_len, name);
+            }
+            s = ofpbuf_put_hex(b, s + 1, &n);
+            if (n != nxm_field_bytes(header)) {
+                ovs_fatal(0, "%.2s: hex digits expected", s);
             }
-            s = parse_hex_bytes(b, s + 1, nxm_field_bytes(f->header));
         }
 
         s += strspn(s, " ");
         if (*s != ')') {
-            ovs_fatal(0, "%s: missing ) following field %s", full_s, f->name);
+            ovs_fatal(0, "%s: missing ) following field %.*s",
+                      full_s, name_len, name);
         }
         s++;
     }
@@ -818,6 +863,168 @@ nx_match_from_string(const char *s, struct ofpbuf *b)
     return match_len;
 }
 
+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)
+{
+    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);
+    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);
+    if (*s != '\0') {
+        ovs_fatal(0, "%s: trailing garbage following destination", full_s);
+    }
+
+    if (src_n_bits != 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);
+    }
+
+    move->type = htons(OFPAT_VENDOR);
+    move->len = htons(sizeof *move);
+    move->vendor = htonl(NX_VENDOR_ID);
+    move->subtype = htons(NXAST_REG_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)
+{
+    const char *full_s = s;
+    uint32_t dst;
+    int ofs, n_bits;
+    uint64_t value;
+
+    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);
+    if (*s != '\0') {
+        ovs_fatal(0, "%s: trailing garbage following destination", full_s);
+    }
+
+    if (n_bits < 64 && (value >> n_bits) != 0) {
+        ovs_fatal(0, "%s: value %"PRIu64" does not fit into %d bits",
+                  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);
+    load->ofs_nbits = nxm_encode_ofs_nbits(ofs, n_bits);
+    load->dst = htonl(dst);
+    load->value = htonll(value);
+}
+
+/* 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)
+{
+    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);
+    ds_put_cstr(s, "->");
+    nxm_format_field_bits(s, dst, dst_ofs, n_bits);
+}
+
+void
+nxm_format_reg_load(const struct nx_action_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);
+}
+
 /* nxm_check_reg_move(), nxm_check_reg_load(). */
 
 static bool
@@ -848,9 +1055,7 @@ nxm_check_reg_move(const struct nx_action_reg_move *action,
         return BAD_ARGUMENT;
     }
 
-    if (!NXM_IS_NX_REG(dst->header)
-        && dst->header != NXM_OF_VLAN_TCI
-        && dst->header != NXM_NX_TUN_ID) {
+    if (!dst->writable) {
         return BAD_ARGUMENT;
     }
 
@@ -864,8 +1069,8 @@ nxm_check_reg_load(const struct nx_action_reg_load *action,
     const struct nxm_field *dst;
     int ofs, n_bits;
 
-    ofs = ntohs(action->ofs_nbits) >> 6;
-    n_bits = (ntohs(action->ofs_nbits) & 0x3f) + 1;
+    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;
@@ -877,7 +1082,7 @@ nxm_check_reg_load(const struct nx_action_reg_load *action,
         return BAD_ARGUMENT;
     }
 
-    if (!NXM_IS_NX_REG(dst->header)) {
+    if (!dst->writable) {
         return BAD_ARGUMENT;
     }
 
@@ -900,16 +1105,10 @@ nxm_read_field(const struct nxm_field *src, const struct flow *flow)
         return eth_addr_to_uint64(flow->dl_src);
 
     case NFI_NXM_OF_ETH_TYPE:
-        return ntohs(flow->dl_type);
+        return ntohs(ofputil_dl_type_to_openflow(flow->dl_type));
 
     case NFI_NXM_OF_VLAN_TCI:
-        if (flow->dl_vlan == htons(OFP_VLAN_NONE)) {
-            return 0;
-        } else {
-            return (ntohs(flow->dl_vlan & htons(VLAN_VID_MASK))
-                    | ((flow->dl_vlan_pcp << VLAN_PCP_SHIFT) & VLAN_PCP_MASK)
-                    | VLAN_CFI);
-        }
+        return ntohs(flow->vlan_tci);
 
     case NFI_NXM_OF_IP_TOS:
         return flow->nw_tos;
@@ -941,7 +1140,7 @@ nxm_read_field(const struct nxm_field *src, const struct flow *flow)
         return ntohs(flow->tp_dst) & 0xff;
 
     case NFI_NXM_NX_TUN_ID:
-        return ntohl(flow->tun_id);
+        return ntohll(flow->tun_id);
 
 #define NXM_READ_REGISTER(IDX)                  \
     case NFI_NXM_NX_REG##IDX:                   \
@@ -963,6 +1162,7 @@ nxm_read_field(const struct nxm_field *src, const struct flow *flow)
 #error
 #endif
 
+    case NFI_NXM_NX_TUN_ID_W:
     case NFI_NXM_OF_ETH_DST_W:
     case NFI_NXM_OF_VLAN_TCI_W:
     case NFI_NXM_OF_IP_SRC_W:
@@ -976,6 +1176,69 @@ nxm_read_field(const struct nxm_field *src, const struct flow *flow)
     NOT_REACHED();
 }
 
+static void
+nxm_write_field(const struct nxm_field *dst, struct flow *flow,
+                uint64_t new_value)
+{
+    switch (dst->index) {
+    case NFI_NXM_OF_VLAN_TCI:
+        flow->vlan_tci = htons(new_value);
+        break;
+
+    case NFI_NXM_NX_TUN_ID:
+        flow->tun_id = htonll(new_value);
+        break;
+
+#define NXM_WRITE_REGISTER(IDX)                 \
+    case NFI_NXM_NX_REG##IDX:                   \
+        flow->regs[IDX] = new_value;            \
+        break;                                  \
+    case NFI_NXM_NX_REG##IDX##_W:               \
+        NOT_REACHED();
+
+    NXM_WRITE_REGISTER(0);
+#if FLOW_N_REGS >= 2
+    NXM_WRITE_REGISTER(1);
+#endif
+#if FLOW_N_REGS >= 3
+    NXM_WRITE_REGISTER(2);
+#endif
+#if FLOW_N_REGS >= 4
+    NXM_WRITE_REGISTER(3);
+#endif
+#if FLOW_N_REGS > 4
+#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:
+    case NFI_NXM_OF_IP_SRC:
+    case NFI_NXM_OF_ARP_SPA:
+    case NFI_NXM_OF_IP_DST:
+    case NFI_NXM_OF_ARP_TPA:
+    case NFI_NXM_OF_TCP_SRC:
+    case NFI_NXM_OF_UDP_SRC:
+    case NFI_NXM_OF_TCP_DST:
+    case NFI_NXM_OF_UDP_DST:
+    case NFI_NXM_OF_ICMP_TYPE:
+    case NFI_NXM_OF_ICMP_CODE:
+    case NFI_NXM_NX_TUN_ID_W:
+    case NFI_NXM_OF_ETH_DST_W:
+    case NFI_NXM_OF_VLAN_TCI_W:
+    case NFI_NXM_OF_IP_SRC_W:
+    case NFI_NXM_OF_IP_DST_W:
+    case NFI_NXM_OF_ARP_SPA_W:
+    case NFI_NXM_OF_ARP_TPA_W:
+    case N_NXM_FIELDS:
+        NOT_REACHED();
+    }
+}
+
 void
 nxm_execute_reg_move(const struct nx_action_reg_move *action,
                      struct flow *flow)
@@ -997,18 +1260,7 @@ nxm_execute_reg_move(const struct nx_action_reg_move *action,
     /* Get the final value. */
     uint64_t new_data = dst_data | ((src_data >> src_ofs) << dst_ofs);
 
-    /* Store the result. */
-    if (NXM_IS_NX_REG(dst->header)) {
-        flow->regs[NXM_NX_REG_IDX(dst->header)] = new_data;
-    } else if (dst->header == NXM_OF_VLAN_TCI) {
-        ovs_be16 vlan_tci = htons(new_data & VLAN_CFI ? new_data : 0);
-        flow->dl_vlan = htons(vlan_tci_to_vid(vlan_tci));
-        flow->dl_vlan_pcp = vlan_tci_to_pcp(vlan_tci);
-    } else if (dst->header == NXM_NX_TUN_ID) {
-        flow->tun_id = htonl(new_data);
-    } else {
-        NOT_REACHED();
-    }
+    nxm_write_field(dst, flow, new_data);
 }
 
 void
@@ -1016,16 +1268,19 @@ nxm_execute_reg_load(const struct nx_action_reg_load *action,
                      struct flow *flow)
 {
     /* Preparation. */
-    int n_bits = (ntohs(action->ofs_nbits) & 0x3f) + 1;
-    uint32_t mask = n_bits == 32 ? UINT32_MAX : (UINT32_C(1) << n_bits) - 1;
-    uint32_t *reg = &flow->regs[NXM_NX_REG_IDX(ntohl(action->dst))];
+    int n_bits = nxm_decode_n_bits(action->ofs_nbits);
+    uint64_t mask = n_bits == 64 ? UINT64_MAX : (UINT64_C(1) << n_bits) - 1;
 
     /* Get source data. */
-    uint32_t src_data = ntohll(action->value);
+    uint64_t src_data = ntohll(action->value);
 
     /* Get remaining bits of the destination field. */
-    int dst_ofs = ntohs(action->ofs_nbits) >> 6;
-    uint32_t dst_data = *reg & ~(mask << dst_ofs);
+    const struct nxm_field *dst = nxm_field_lookup(ntohl(action->dst));
+    int dst_ofs = nxm_decode_ofs(action->ofs_nbits);
+    uint64_t dst_data = nxm_read_field(dst, flow) & ~(mask << dst_ofs);
+
+    /* Get the final value. */
+    uint64_t new_data = dst_data | (src_data << dst_ofs);
 
-    *reg = dst_data | (src_data << dst_ofs);
+    nxm_write_field(dst, flow, new_data);
 }