#include "classifier.h"
#include "dynamic-string.h"
+#include "nx-match.h"
#include "ofp-errors.h"
#include "ofp-util.h"
#include "ovs-thread.h"
extern const struct mf_field mf_fields[MFF_N_IDS]; /* Silence a warning. */
const struct mf_field mf_fields[MFF_N_IDS] = {
- /* ## -------- ## */
- /* ## metadata ## */
- /* ## -------- ## */
-
- {
- MFF_DP_HASH, "dp_hash", NULL,
- MF_FIELD_SIZES(be32),
- MFM_FULLY,
- MFS_HEXADECIMAL,
- MFP_NONE,
- false,
- NXM_NX_DP_HASH, "NXM_NX_DP_HASH",
- NXM_NX_DP_HASH, "NXM_NX_DP_HASH", 0,
- OFPUTIL_P_NXM_OXM_ANY,
- OFPUTIL_P_NXM_OXM_ANY,
- -1,
- }, {
- MFF_RECIRC_ID, "recirc_id", NULL,
- MF_FIELD_SIZES(be32),
- MFM_NONE,
- MFS_DECIMAL,
- MFP_NONE,
- false,
- NXM_NX_RECIRC_ID, "NXM_NX_RECIRC_ID",
- NXM_NX_RECIRC_ID, "NXM_NX_RECIRC_ID", 0,
- OFPUTIL_P_NXM_OXM_ANY,
- OFPUTIL_P_NXM_OXM_ANY,
- -1,
- }, {
- MFF_TUN_ID, "tun_id", "tunnel_id",
- MF_FIELD_SIZES(be64),
- MFM_FULLY,
- MFS_HEXADECIMAL,
- MFP_NONE,
- true,
- NXM_NX_TUN_ID, "NXM_NX_TUN_ID",
- OXM_OF_TUNNEL_ID, "OXM_OF_TUNNEL_ID", OFP13_VERSION,
- OFPUTIL_P_NXM_OXM_ANY,
- OFPUTIL_P_NXM_OXM_ANY,
- FLOW_U32OFS(tunnel.tun_id),
- }, {
- MFF_TUN_SRC, "tun_src", NULL,
- MF_FIELD_SIZES(be32),
- MFM_FULLY,
- MFS_IPV4,
- MFP_NONE,
- true,
- NXM_NX_TUN_IPV4_SRC, "NXM_NX_TUN_IPV4_SRC",
- NXM_NX_TUN_IPV4_SRC, "NXM_NX_TUN_IPV4_SRC", 0,
- OFPUTIL_P_NXM_OXM_ANY,
- OFPUTIL_P_NXM_OXM_ANY,
- FLOW_U32OFS(tunnel.ip_src),
- }, {
- MFF_TUN_DST, "tun_dst", NULL,
- MF_FIELD_SIZES(be32),
- MFM_FULLY,
- MFS_IPV4,
- MFP_NONE,
- true,
- NXM_NX_TUN_IPV4_DST, "NXM_NX_TUN_IPV4_DST",
- NXM_NX_TUN_IPV4_DST, "NXM_NX_TUN_IPV4_DST", 0,
- OFPUTIL_P_NXM_OXM_ANY,
- OFPUTIL_P_NXM_OXM_ANY,
- FLOW_U32OFS(tunnel.ip_dst),
- }, {
- MFF_TUN_FLAGS, "tun_flags", NULL,
- MF_FIELD_SIZES(be16),
- MFM_NONE,
- MFS_TNL_FLAGS,
- MFP_NONE,
- false,
- 0, NULL,
- 0, NULL, 0,
- OFPUTIL_P_NONE,
- OFPUTIL_P_NONE,
- -1,
- }, {
- MFF_TUN_TTL, "tun_ttl", NULL,
- MF_FIELD_SIZES(u8),
- MFM_NONE,
- MFS_DECIMAL,
- MFP_NONE,
- false,
- 0, NULL,
- 0, NULL, 0,
- OFPUTIL_P_NONE,
- OFPUTIL_P_NONE,
- -1,
- }, {
- MFF_TUN_TOS, "tun_tos", NULL,
- MF_FIELD_SIZES(u8),
- MFM_NONE,
- MFS_DECIMAL,
- MFP_NONE,
- false,
- 0, NULL,
- 0, NULL, 0,
- OFPUTIL_P_NONE,
- OFPUTIL_P_NONE,
- -1,
- }, {
- MFF_METADATA, "metadata", NULL,
- MF_FIELD_SIZES(be64),
- MFM_FULLY,
- MFS_HEXADECIMAL,
- MFP_NONE,
- true,
- OXM_OF_METADATA, "OXM_OF_METADATA",
- OXM_OF_METADATA, "OXM_OF_METADATA", OFP12_VERSION,
- OFPUTIL_P_NXM_OF11_UP,
- OFPUTIL_P_NXM_OF11_UP,
- -1,
- }, {
- MFF_IN_PORT, "in_port", NULL,
- MF_FIELD_SIZES(be16),
- MFM_NONE,
- MFS_OFP_PORT,
- MFP_NONE,
- true,
- NXM_OF_IN_PORT, "NXM_OF_IN_PORT",
- NXM_OF_IN_PORT, "NXM_OF_IN_PORT", 0,
- OFPUTIL_P_ANY, /* OF11+ via mapping to 32 bits. */
- OFPUTIL_P_NONE,
- -1,
- }, {
- MFF_IN_PORT_OXM, "in_port_oxm", NULL,
- MF_FIELD_SIZES(be32),
- MFM_NONE,
- MFS_OFP_PORT_OXM,
- MFP_NONE,
- true,
- OXM_OF_IN_PORT, "OXM_OF_IN_PORT",
- OXM_OF_IN_PORT, "OXM_OF_IN_PORT", OFP12_VERSION,
- OFPUTIL_P_OF11_UP,
- OFPUTIL_P_NONE,
- -1,
- }, {
- MFF_SKB_PRIORITY, "skb_priority", NULL,
- MF_FIELD_SIZES(be32),
- MFM_NONE,
- MFS_HEXADECIMAL,
- MFP_NONE,
- false,
- 0, NULL,
- 0, NULL, 0,
- OFPUTIL_P_NONE,
- OFPUTIL_P_NONE,
- -1,
- }, {
- MFF_PKT_MARK, "pkt_mark", NULL,
- MF_FIELD_SIZES(be32),
- MFM_FULLY,
- MFS_HEXADECIMAL,
- MFP_NONE,
- true,
- NXM_NX_PKT_MARK, "NXM_NX_PKT_MARK",
- NXM_NX_PKT_MARK, "NXM_NX_PKT_MARK", 0,
- OFPUTIL_P_NXM_OXM_ANY,
- OFPUTIL_P_NXM_OXM_ANY,
- -1,
- },
-
-#define REGISTER(IDX) \
- { \
- MFF_REG##IDX, "reg" #IDX, NULL, \
- MF_FIELD_SIZES(be32), \
- MFM_FULLY, \
- MFS_HEXADECIMAL, \
- MFP_NONE, \
- true, \
- NXM_NX_REG(IDX), "NXM_NX_REG" #IDX, \
- NXM_NX_REG(IDX), "NXM_NX_REG" #IDX, 0, \
- OFPUTIL_P_NXM_OXM_ANY, \
- OFPUTIL_P_NXM_OXM_ANY, \
- -1, \
- }
-#if FLOW_N_REGS == 8
- REGISTER(0),
- REGISTER(1),
- REGISTER(2),
- REGISTER(3),
- REGISTER(4),
- REGISTER(5),
- REGISTER(6),
- REGISTER(7),
-#else
-#error "Need to update mf_fields[] to match FLOW_N_REGS"
-#endif
-
- /* ## -- ## */
- /* ## L2 ## */
- /* ## -- ## */
-
- {
- MFF_ETH_SRC, "eth_src", "dl_src",
- MF_FIELD_SIZES(mac),
- MFM_FULLY,
- MFS_ETHERNET,
- MFP_NONE,
- true,
- NXM_OF_ETH_SRC, "NXM_OF_ETH_SRC",
- OXM_OF_ETH_SRC, "OXM_OF_ETH_SRC", OFP12_VERSION,
- OFPUTIL_P_ANY,
- OFPUTIL_P_NXM_OF11_UP, /* Bitwise masking only with NXM and OF11+! */
- -1,
- }, {
- MFF_ETH_DST, "eth_dst", "dl_dst",
- MF_FIELD_SIZES(mac),
- MFM_FULLY,
- MFS_ETHERNET,
- MFP_NONE,
- true,
- NXM_OF_ETH_DST, "NXM_OF_ETH_DST",
- OXM_OF_ETH_DST, "OXM_OF_ETH_DST", OFP12_VERSION,
- OFPUTIL_P_ANY,
- OFPUTIL_P_NXM_OF11_UP, /* Bitwise masking only with NXM and OF11+! */
- -1,
- }, {
- MFF_ETH_TYPE, "eth_type", "dl_type",
- MF_FIELD_SIZES(be16),
- MFM_NONE,
- MFS_HEXADECIMAL,
- MFP_NONE,
- false,
- NXM_OF_ETH_TYPE, "NXM_OF_ETH_TYPE",
- OXM_OF_ETH_TYPE, "OXM_OF_ETH_TYPE", OFP12_VERSION,
- OFPUTIL_P_ANY,
- OFPUTIL_P_NONE,
- -1,
- },
-
- {
- MFF_VLAN_TCI, "vlan_tci", NULL,
- MF_FIELD_SIZES(be16),
- MFM_FULLY,
- MFS_HEXADECIMAL,
- MFP_NONE,
- true,
- NXM_OF_VLAN_TCI, "NXM_OF_VLAN_TCI",
- NXM_OF_VLAN_TCI, "NXM_OF_VLAN_TCI", 0,
- OFPUTIL_P_ANY,
- OFPUTIL_P_NXM_OXM_ANY,
- -1,
- }, {
- MFF_DL_VLAN, "dl_vlan", NULL,
- sizeof(ovs_be16), 12,
- MFM_NONE,
- MFS_DECIMAL,
- MFP_NONE,
- true,
- 0, NULL,
- 0, NULL, 0,
- OFPUTIL_P_ANY,
- OFPUTIL_P_NXM_OXM_ANY,
- -1,
- }, {
- MFF_VLAN_VID, "vlan_vid", NULL,
- sizeof(ovs_be16), 12,
- MFM_FULLY,
- MFS_DECIMAL,
- MFP_NONE,
- true,
- OXM_OF_VLAN_VID, "OXM_OF_VLAN_VID",
- OXM_OF_VLAN_VID, "OXM_OF_VLAN_VID", OFP12_VERSION,
- OFPUTIL_P_ANY,
- OFPUTIL_P_NXM_OXM_ANY,
- -1,
- }, {
- MFF_DL_VLAN_PCP, "dl_vlan_pcp", NULL,
- 1, 3,
- MFM_NONE,
- MFS_DECIMAL,
- MFP_NONE,
- true,
- 0, NULL,
- 0, NULL, 0,
- OFPUTIL_P_ANY, /* Will be mapped to NXM and OXM. */
- OFPUTIL_P_NONE,
- -1,
- }, {
- MFF_VLAN_PCP, "vlan_pcp", NULL,
- 1, 3,
- MFM_NONE,
- MFS_DECIMAL,
- MFP_VLAN_VID,
- true,
- OXM_OF_VLAN_PCP, "OXM_OF_VLAN_PCP",
- OXM_OF_VLAN_PCP, "OXM_OF_VLAN_PCP", OFP12_VERSION,
- OFPUTIL_P_ANY, /* Will be mapped to OF10 and NXM. */
- OFPUTIL_P_NONE,
- -1,
- },
-
- /* ## ---- ## */
- /* ## L2.5 ## */
- /* ## ---- ## */
- {
- MFF_MPLS_LABEL, "mpls_label", NULL,
- 4, 20,
- MFM_NONE,
- MFS_DECIMAL,
- MFP_MPLS,
- true,
- OXM_OF_MPLS_LABEL, "OXM_OF_MPLS_LABEL",
- OXM_OF_MPLS_LABEL, "OXM_OF_MPLS_LABEL", OFP12_VERSION,
- OFPUTIL_P_NXM_OF11_UP,
- OFPUTIL_P_NONE,
- -1,
- }, {
- MFF_MPLS_TC, "mpls_tc", NULL,
- 1, 3,
- MFM_NONE,
- MFS_DECIMAL,
- MFP_MPLS,
- true,
- OXM_OF_MPLS_TC, "OXM_OF_MPLS_TC",
- OXM_OF_MPLS_TC, "OXM_OF_MPLS_TC", OFP12_VERSION,
- OFPUTIL_P_NXM_OF11_UP,
- OFPUTIL_P_NONE,
- -1,
- }, {
- MFF_MPLS_BOS, "mpls_bos", NULL,
- 1, 1,
- MFM_NONE,
- MFS_DECIMAL,
- MFP_MPLS,
- false,
- OXM_OF_MPLS_BOS, "OXM_OF_MPLS_BOS",
- OXM_OF_MPLS_BOS, "OXM_OF_MPLS_BOS", OFP13_VERSION,
- OFPUTIL_P_NXM_OXM_ANY,
- OFPUTIL_P_NONE,
- -1,
- },
-
- /* ## -- ## */
- /* ## L3 ## */
- /* ## -- ## */
-
- {
- MFF_IPV4_SRC, "ip_src", "nw_src",
- MF_FIELD_SIZES(be32),
- MFM_FULLY,
- MFS_IPV4,
- MFP_IPV4,
- true,
- NXM_OF_IP_SRC, "NXM_OF_IP_SRC",
- OXM_OF_IPV4_SRC, "OXM_OF_IPV4_SRC", OFP12_VERSION,
- OFPUTIL_P_ANY,
- OFPUTIL_P_NXM_OF11_UP,
- FLOW_U32OFS(nw_src),
- }, {
- MFF_IPV4_DST, "ip_dst", "nw_dst",
- MF_FIELD_SIZES(be32),
- MFM_FULLY,
- MFS_IPV4,
- MFP_IPV4,
- true,
- NXM_OF_IP_DST, "NXM_OF_IP_DST",
- OXM_OF_IPV4_DST, "OXM_OF_IPV4_DST", OFP12_VERSION,
- OFPUTIL_P_ANY,
- OFPUTIL_P_NXM_OF11_UP,
- FLOW_U32OFS(nw_dst),
- },
-
- {
- MFF_IPV6_SRC, "ipv6_src", NULL,
- MF_FIELD_SIZES(ipv6),
- MFM_FULLY,
- MFS_IPV6,
- MFP_IPV6,
- true,
- NXM_NX_IPV6_SRC, "NXM_NX_IPV6_SRC",
- OXM_OF_IPV6_SRC, "OXM_OF_IPV6_SRC", OFP12_VERSION,
- OFPUTIL_P_NXM_OXM_ANY,
- OFPUTIL_P_NXM_OXM_ANY,
- FLOW_U32OFS(ipv6_src),
- }, {
- MFF_IPV6_DST, "ipv6_dst", NULL,
- MF_FIELD_SIZES(ipv6),
- MFM_FULLY,
- MFS_IPV6,
- MFP_IPV6,
- true,
- NXM_NX_IPV6_DST, "NXM_NX_IPV6_DST",
- OXM_OF_IPV6_DST, "OXM_OF_IPV6_DST", OFP12_VERSION,
- OFPUTIL_P_NXM_OXM_ANY,
- OFPUTIL_P_NXM_OXM_ANY,
- FLOW_U32OFS(ipv6_dst),
- },
- {
- MFF_IPV6_LABEL, "ipv6_label", NULL,
- 4, 20,
- MFM_FULLY,
- MFS_HEXADECIMAL,
- MFP_IPV6,
- false,
- NXM_NX_IPV6_LABEL, "NXM_NX_IPV6_LABEL",
- OXM_OF_IPV6_FLABEL, "OXM_OF_IPV6_FLABEL", OFP12_VERSION,
- OFPUTIL_P_NXM_OXM_ANY,
- OFPUTIL_P_NXM_OXM_ANY,
- -1,
- },
-
- {
- MFF_IP_PROTO, "nw_proto", "ip_proto",
- MF_FIELD_SIZES(u8),
- MFM_NONE,
- MFS_DECIMAL,
- MFP_IP_ANY,
- false,
- NXM_OF_IP_PROTO, "NXM_OF_IP_PROTO",
- OXM_OF_IP_PROTO, "OXM_OF_IP_PROTO", OFP12_VERSION,
- OFPUTIL_P_ANY,
- OFPUTIL_P_NONE,
- -1,
- }, {
- MFF_IP_DSCP, "nw_tos", NULL,
- MF_FIELD_SIZES(u8),
- MFM_NONE,
- MFS_DECIMAL,
- MFP_IP_ANY,
- true,
- NXM_OF_IP_TOS, "NXM_OF_IP_TOS",
- NXM_OF_IP_TOS, "NXM_OF_IP_TOS", 0,
- OFPUTIL_P_ANY, /* Will be shifted for OXM. */
- OFPUTIL_P_NONE,
- -1,
- }, {
- MFF_IP_DSCP_SHIFTED, "ip_dscp", NULL,
- 1, 6,
- MFM_NONE,
- MFS_DECIMAL,
- MFP_IP_ANY,
- true,
- OXM_OF_IP_DSCP, "OXM_OF_IP_DSCP",
- OXM_OF_IP_DSCP, "OXM_OF_IP_DSCP", OFP12_VERSION,
- OFPUTIL_P_ANY, /* Will be shifted for non-OXM. */
- OFPUTIL_P_NONE,
- -1,
- }, {
- MFF_IP_ECN, "nw_ecn", "ip_ecn",
- 1, 2,
- MFM_NONE,
- MFS_DECIMAL,
- MFP_IP_ANY,
- true,
- NXM_NX_IP_ECN, "NXM_NX_IP_ECN",
- OXM_OF_IP_ECN, "OXM_OF_IP_ECN", OFP12_VERSION,
- OFPUTIL_P_NXM_OXM_ANY,
- OFPUTIL_P_NONE,
- -1,
- }, {
- MFF_IP_TTL, "nw_ttl", NULL,
- MF_FIELD_SIZES(u8),
- MFM_NONE,
- MFS_DECIMAL,
- MFP_IP_ANY,
- true,
- NXM_NX_IP_TTL, "NXM_NX_IP_TTL",
- NXM_NX_IP_TTL, "NXM_NX_IP_TTL", 0,
- OFPUTIL_P_NXM_OXM_ANY,
- OFPUTIL_P_NONE,
- -1,
- }, {
- MFF_IP_FRAG, "ip_frag", NULL,
- 1, 2,
- MFM_FULLY,
- MFS_FRAG,
- MFP_IP_ANY,
- false,
- NXM_NX_IP_FRAG, "NXM_NX_IP_FRAG",
- NXM_NX_IP_FRAG, "NXM_NX_IP_FRAG", 0,
- OFPUTIL_P_NXM_OXM_ANY,
- OFPUTIL_P_NXM_OXM_ANY,
- -1,
- },
-
- {
- MFF_ARP_OP, "arp_op", NULL,
- MF_FIELD_SIZES(be16),
- MFM_NONE,
- MFS_DECIMAL,
- MFP_ARP,
- true,
- NXM_OF_ARP_OP, "NXM_OF_ARP_OP",
- OXM_OF_ARP_OP, "OXM_OF_ARP_OP", OFP12_VERSION,
- OFPUTIL_P_ANY,
- OFPUTIL_P_NONE,
- -1,
- }, {
- MFF_ARP_SPA, "arp_spa", NULL,
- MF_FIELD_SIZES(be32),
- MFM_FULLY,
- MFS_IPV4,
- MFP_ARP,
- true,
- NXM_OF_ARP_SPA, "NXM_OF_ARP_SPA",
- OXM_OF_ARP_SPA, "OXM_OF_ARP_SPA", OFP12_VERSION,
- OFPUTIL_P_ANY,
- OFPUTIL_P_NXM_OF11_UP,
- -1,
- }, {
- MFF_ARP_TPA, "arp_tpa", NULL,
- MF_FIELD_SIZES(be32),
- MFM_FULLY,
- MFS_IPV4,
- MFP_ARP,
- true,
- NXM_OF_ARP_TPA, "NXM_OF_ARP_TPA",
- OXM_OF_ARP_TPA, "OXM_OF_ARP_TPA", OFP12_VERSION,
- OFPUTIL_P_ANY,
- OFPUTIL_P_NXM_OF11_UP,
- -1,
- }, {
- MFF_ARP_SHA, "arp_sha", NULL,
- MF_FIELD_SIZES(mac),
- MFM_FULLY,
- MFS_ETHERNET,
- MFP_ARP,
- true,
- NXM_NX_ARP_SHA, "NXM_NX_ARP_SHA",
- OXM_OF_ARP_SHA, "OXM_OF_ARP_SHA", OFP12_VERSION,
- OFPUTIL_P_NXM_OXM_ANY,
- OFPUTIL_P_NXM_OXM_ANY,
- -1,
- }, {
- MFF_ARP_THA, "arp_tha", NULL,
- MF_FIELD_SIZES(mac),
- MFM_FULLY,
- MFS_ETHERNET,
- MFP_ARP,
- true,
- NXM_NX_ARP_THA, "NXM_NX_ARP_THA",
- OXM_OF_ARP_THA, "OXM_OF_ARP_THA", OFP12_VERSION,
- OFPUTIL_P_NXM_OXM_ANY,
- OFPUTIL_P_NXM_OXM_ANY,
- -1,
- },
-
- /* ## -- ## */
- /* ## L4 ## */
- /* ## -- ## */
-
- {
- MFF_TCP_SRC, "tcp_src", "tp_src",
- MF_FIELD_SIZES(be16),
- MFM_FULLY,
- MFS_DECIMAL,
- MFP_TCP,
- true,
- NXM_OF_TCP_SRC, "NXM_OF_TCP_SRC",
- OXM_OF_TCP_SRC, "OXM_OF_TCP_SRC", OFP12_VERSION,
- OFPUTIL_P_ANY,
- OFPUTIL_P_NXM_OXM_ANY,
- -1,
- }, {
- MFF_TCP_DST, "tcp_dst", "tp_dst",
- MF_FIELD_SIZES(be16),
- MFM_FULLY,
- MFS_DECIMAL,
- MFP_TCP,
- true,
- NXM_OF_TCP_DST, "NXM_OF_TCP_DST",
- OXM_OF_TCP_DST, "OXM_OF_TCP_DST", OFP12_VERSION,
- OFPUTIL_P_ANY,
- OFPUTIL_P_NXM_OXM_ANY,
- -1,
- }, {
- MFF_TCP_FLAGS, "tcp_flags", NULL,
- 2, 12,
- MFM_FULLY,
- MFS_TCP_FLAGS,
- MFP_TCP,
- false,
- NXM_NX_TCP_FLAGS, "NXM_NX_TCP_FLAGS",
- OXM_OF_TCP_FLAGS, "OXM_OF_TCP_FLAGS", OFP15_VERSION,
- OFPUTIL_P_NXM_OXM_ANY,
- OFPUTIL_P_NXM_OXM_ANY,
- -1,
- },
-
- {
- MFF_UDP_SRC, "udp_src", NULL,
- MF_FIELD_SIZES(be16),
- MFM_FULLY,
- MFS_DECIMAL,
- MFP_UDP,
- true,
- NXM_OF_UDP_SRC, "NXM_OF_UDP_SRC",
- OXM_OF_UDP_SRC, "OXM_OF_UDP_SRC", OFP12_VERSION,
- OFPUTIL_P_ANY,
- OFPUTIL_P_NXM_OXM_ANY,
- -1,
- }, {
- MFF_UDP_DST, "udp_dst", NULL,
- MF_FIELD_SIZES(be16),
- MFM_FULLY,
- MFS_DECIMAL,
- MFP_UDP,
- true,
- NXM_OF_UDP_DST, "NXM_OF_UDP_DST",
- OXM_OF_UDP_DST, "OXM_OF_UDP_DST", OFP12_VERSION,
- OFPUTIL_P_ANY,
- OFPUTIL_P_NXM_OXM_ANY,
- -1,
- },
-
- {
- MFF_SCTP_SRC, "sctp_src", NULL,
- MF_FIELD_SIZES(be16),
- MFM_FULLY,
- MFS_DECIMAL,
- MFP_SCTP,
- true,
- OXM_OF_SCTP_SRC, "OXM_OF_SCTP_SRC",
- OXM_OF_SCTP_SRC, "OXM_OF_SCTP_SRC", OFP12_VERSION,
- OFPUTIL_P_NXM_OF11_UP,
- OFPUTIL_P_NXM_OXM_ANY,
- -1,
- }, {
- MFF_SCTP_DST, "sctp_dst", NULL,
- MF_FIELD_SIZES(be16),
- MFM_FULLY,
- MFS_DECIMAL,
- MFP_SCTP,
- true,
- OXM_OF_SCTP_DST, "OXM_OF_SCTP_DST",
- OXM_OF_SCTP_DST, "OXM_OF_SCTP_DST", OFP12_VERSION,
- OFPUTIL_P_NXM_OF11_UP,
- OFPUTIL_P_NXM_OXM_ANY,
- -1,
- },
-
- {
- MFF_ICMPV4_TYPE, "icmp_type", NULL,
- MF_FIELD_SIZES(u8),
- MFM_NONE,
- MFS_DECIMAL,
- MFP_ICMPV4,
- false,
- NXM_OF_ICMP_TYPE, "NXM_OF_ICMP_TYPE",
- OXM_OF_ICMPV4_TYPE, "OXM_OF_ICMPV4_TYPE", OFP12_VERSION,
- OFPUTIL_P_ANY,
- OFPUTIL_P_NONE,
- -1,
- }, {
- MFF_ICMPV4_CODE, "icmp_code", NULL,
- MF_FIELD_SIZES(u8),
- MFM_NONE,
- MFS_DECIMAL,
- MFP_ICMPV4,
- false,
- NXM_OF_ICMP_CODE, "NXM_OF_ICMP_CODE",
- OXM_OF_ICMPV4_CODE, "OXM_OF_ICMPV4_CODE", OFP12_VERSION,
- OFPUTIL_P_ANY,
- OFPUTIL_P_NONE,
- -1,
- },
-
- {
- MFF_ICMPV6_TYPE, "icmpv6_type", NULL,
- MF_FIELD_SIZES(u8),
- MFM_NONE,
- MFS_DECIMAL,
- MFP_ICMPV6,
- false,
- NXM_NX_ICMPV6_TYPE, "NXM_NX_ICMPV6_TYPE",
- OXM_OF_ICMPV6_TYPE, "OXM_OF_ICMPV6_TYPE", OFP12_VERSION,
- OFPUTIL_P_NXM_OXM_ANY,
- OFPUTIL_P_NONE,
- -1,
- }, {
- MFF_ICMPV6_CODE, "icmpv6_code", NULL,
- MF_FIELD_SIZES(u8),
- MFM_NONE,
- MFS_DECIMAL,
- MFP_ICMPV6,
- false,
- NXM_NX_ICMPV6_CODE, "NXM_NX_ICMPV6_CODE",
- OXM_OF_ICMPV6_CODE, "OXM_OF_ICMPV6_CODE", OFP12_VERSION,
- OFPUTIL_P_NXM_OXM_ANY,
- OFPUTIL_P_NONE,
- -1,
- },
-
- /* ## ---- ## */
- /* ## L"5" ## */
- /* ## ---- ## */
-
- {
- MFF_ND_TARGET, "nd_target", NULL,
- MF_FIELD_SIZES(ipv6),
- MFM_FULLY,
- MFS_IPV6,
- MFP_ND,
- false,
- NXM_NX_ND_TARGET, "NXM_NX_ND_TARGET",
- OXM_OF_IPV6_ND_TARGET, "OXM_OF_IPV6_ND_TARGET", OFP12_VERSION,
- OFPUTIL_P_NXM_OXM_ANY,
- OFPUTIL_P_NXM_OXM_ANY,
- -1,
- }, {
- MFF_ND_SLL, "nd_sll", NULL,
- MF_FIELD_SIZES(mac),
- MFM_FULLY,
- MFS_ETHERNET,
- MFP_ND_SOLICIT,
- false,
- NXM_NX_ND_SLL, "NXM_NX_ND_SLL",
- OXM_OF_IPV6_ND_SLL, "OXM_OF_IPV6_ND_SLL", OFP12_VERSION,
- OFPUTIL_P_NXM_OXM_ANY,
- OFPUTIL_P_NXM_OXM_ANY,
- -1,
- }, {
- MFF_ND_TLL, "nd_tll", NULL,
- MF_FIELD_SIZES(mac),
- MFM_FULLY,
- MFS_ETHERNET,
- MFP_ND_ADVERT,
- false,
- NXM_NX_ND_TLL, "NXM_NX_ND_TLL",
- OXM_OF_IPV6_ND_TLL, "OXM_OF_IPV6_ND_TLL", OFP12_VERSION,
- OFPUTIL_P_NXM_OXM_ANY,
- OFPUTIL_P_NXM_OXM_ANY,
- -1,
- }
-};
-
-/* Maps an NXM or OXM header value to an mf_field. */
-struct nxm_field {
- struct hmap_node hmap_node; /* In 'all_fields' hmap. */
- uint32_t header; /* NXM or OXM header value. */
- const struct mf_field *mf;
+#include "meta-flow.inc"
};
-/* Contains 'struct nxm_field's. */
-static struct hmap all_fields;
-
/* Maps from an mf_field's 'name' or 'extra_name' to the mf_field. */
static struct shash mf_by_name;
* controller 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);
-const struct mf_field *mf_from_nxm_header__(uint32_t header);
static void nxm_init(void);
/* Returns the field with the given 'name', or a null pointer if no field has
return shash_find_data(&mf_by_name, name);
}
-static void
-add_nxm_field(uint32_t header, const struct mf_field *mf)
-{
- struct nxm_field *f;
-
- f = xmalloc(sizeof *f);
- hmap_insert(&all_fields, &f->hmap_node, hash_int(header, 0));
- f->header = header;
- f->mf = mf;
-}
-
-static void
-nxm_init_add_field(const struct mf_field *mf, uint32_t header)
-{
- if (header) {
- ovs_assert(!mf_from_nxm_header__(header));
- add_nxm_field(header, mf);
- if (mf->maskable != MFM_NONE) {
- add_nxm_field(NXM_MAKE_WILD_HEADER(header), mf);
- }
- }
-}
-
static void
nxm_do_init(void)
{
int i;
- hmap_init(&all_fields);
shash_init(&mf_by_name);
for (i = 0; i < MFF_N_IDS; i++) {
const struct mf_field *mf = &mf_fields[i];
ovs_assert(mf->id == i); /* Fields must be in the enum order. */
- nxm_init_add_field(mf, mf->nxm_header);
- if (mf->oxm_header != mf->nxm_header) {
- nxm_init_add_field(mf, mf->oxm_header);
- }
-
shash_add_once(&mf_by_name, mf->name, mf);
if (mf->extra_name) {
shash_add_once(&mf_by_name, mf->extra_name, mf);
pthread_once(&once, nxm_do_init);
}
-const struct mf_field *
-mf_from_nxm_header(uint32_t header)
-{
- nxm_init();
- return mf_from_nxm_header__(header);
-}
-
-const struct mf_field *
-mf_from_nxm_header__(uint32_t header)
-{
- const struct nxm_field *f;
-
- HMAP_FOR_EACH_IN_BUCKET (f, hmap_node, hash_int(header, 0), &all_fields) {
- if (f->header == header) {
- return f->mf;
- }
- }
-
- return NULL;
-}
-
-uint32_t
-mf_oxm_header(enum mf_field_id id, enum ofp_version oxm_version)
-{
- const struct mf_field *field = mf_from_id(id);
-
- return (oxm_version >= field->oxm_version
- ? field->oxm_header
- : field->nxm_header);
-}
-
/* Returns true if 'wc' wildcards all the bits in field 'mf', false if 'wc'
* specifies at least one bit in the field.
*
return !wc->masks.pkt_mark;
CASE_MFF_REGS:
return !wc->masks.regs[mf->id - MFF_REG0];
+ CASE_MFF_XREGS:
+ return !flow_get_xreg(&wc->masks, mf->id - MFF_XREG0);
case MFF_ETH_SRC:
return eth_addr_is_zero(wc->masks.dl_src);
case MFF_MPLS_LABEL:
return !(wc->masks.mpls_lse[0] & htonl(MPLS_LABEL_MASK));
case MFF_MPLS_TC:
- return !(wc->masks.mpls_lse[1] & htonl(MPLS_TC_MASK));
+ return !(wc->masks.mpls_lse[0] & htonl(MPLS_TC_MASK));
case MFF_MPLS_BOS:
- return !(wc->masks.mpls_lse[2] & htonl(MPLS_BOS_MASK));
+ return !(wc->masks.mpls_lse[0] & htonl(MPLS_BOS_MASK));
case MFF_IPV4_SRC:
return !wc->masks.nw_src;
{
switch (mf->maskable) {
case MFM_NONE:
- return (is_all_zeros((const uint8_t *) mask, mf->n_bytes) ||
- is_all_ones((const uint8_t *) mask, mf->n_bytes));
+ return (is_all_zeros(mask, mf->n_bytes) ||
+ is_all_ones(mask, mf->n_bytes));
case MFM_FULLY:
return true;
case MFF_SKB_PRIORITY:
case MFF_PKT_MARK:
CASE_MFF_REGS:
+ CASE_MFF_XREGS:
case MFF_ETH_SRC:
case MFF_ETH_DST:
case MFF_ETH_TYPE:
value->be32 = htonl(flow->regs[mf->id - MFF_REG0]);
break;
+ CASE_MFF_XREGS:
+ value->be64 = htonll(flow_get_xreg(flow, mf->id - MFF_XREG0));
+ break;
+
case MFF_ETH_SRC:
memcpy(value->mac, flow->dl_src, ETH_ADDR_LEN);
break;
match_set_reg(match, mf->id - MFF_REG0, ntohl(value->be32));
break;
+ CASE_MFF_XREGS:
+ match_set_xreg(match, mf->id - MFF_XREG0, ntohll(value->be64));
+ break;
+
case MFF_ETH_SRC:
match_set_dl_src(match, value->mac);
break;
flow->regs[mf->id - MFF_REG0] = ntohl(value->be32);
break;
+ CASE_MFF_XREGS:
+ flow_set_xreg(flow, mf->id - MFF_XREG0, ntohll(value->be64));
+ break;
+
case MFF_ETH_SRC:
memcpy(flow->dl_src, value->mac, ETH_ADDR_LEN);
break;
union mf_value value;
mf_get_value(mf, flow, &value);
- return is_all_zeros((const uint8_t *) &value, mf->n_bytes);
+ return is_all_zeros(&value, mf->n_bytes);
}
/* Makes 'match' wildcard field 'mf'.
match_set_reg_masked(match, mf->id - MFF_REG0, 0, 0);
break;
+ CASE_MFF_XREGS:
+ match_set_xreg_masked(match, mf->id - MFF_XREG0, 0, 0);
+ break;
+
case MFF_ETH_SRC:
memset(match->flow.dl_src, 0, ETH_ADDR_LEN);
memset(match->wc.masks.dl_src, 0, ETH_ADDR_LEN);
const union mf_value *value, const union mf_value *mask,
struct match *match)
{
- if (!mask || is_all_ones((const uint8_t *) mask, mf->n_bytes)) {
+ if (!mask || is_all_ones(mask, mf->n_bytes)) {
mf_set_value(mf, value, match);
- return mf->usable_protocols;
- } else if (is_all_zeros((const uint8_t *) mask, mf->n_bytes)) {
+ return mf->usable_protocols_exact;
+ } else if (is_all_zeros(mask, mf->n_bytes)) {
mf_set_wild(mf, match);
return OFPUTIL_P_ANY;
}
ntohl(value->be32), ntohl(mask->be32));
break;
+ CASE_MFF_XREGS:
+ match_set_xreg_masked(match, mf->id - MFF_XREG0,
+ ntohll(value->be64), ntohll(mask->be64));
+ break;
+
case MFF_PKT_MARK:
match_set_pkt_mark_masked(match, ntohl(value->be32),
ntohl(mask->be32));
case MFF_IPV4_SRC:
match_set_nw_src_masked(match, value->be32, mask->be32);
- goto cidr_check;
+ break;
case MFF_IPV4_DST:
match_set_nw_dst_masked(match, value->be32, mask->be32);
- goto cidr_check;
+ break;
case MFF_IPV6_SRC:
match_set_ipv6_src_masked(match, &value->ipv6, &mask->ipv6);
case MFF_ARP_SPA:
match_set_nw_src_masked(match, value->be32, mask->be32);
- goto cidr_check;
+ break;
case MFF_ARP_TPA:
match_set_nw_dst_masked(match, value->be32, mask->be32);
- goto cidr_check;
+ break;
case MFF_TCP_SRC:
case MFF_UDP_SRC:
OVS_NOT_REACHED();
}
- return mf->usable_protocols_bitwise;
-
-cidr_check:
- return ip_is_cidr(mask->be32) ? mf->usable_protocols :
- mf->usable_protocols_bitwise;
+ return ((mf->usable_protocols_bitwise == mf->usable_protocols_cidr
+ || ip_is_cidr(mask->be32))
+ ? mf->usable_protocols_cidr
+ : mf->usable_protocols_bitwise);
}
static enum ofperr
struct ds *s)
{
if (mask) {
- if (is_all_zeros((const uint8_t *) mask, mf->n_bytes)) {
+ if (is_all_zeros(mask, mf->n_bytes)) {
ds_put_cstr(s, "ANY");
return;
- } else if (is_all_ones((const uint8_t *) mask, mf->n_bytes)) {
+ } else if (is_all_ones(mask, mf->n_bytes)) {
mask = NULL;
}
}
return bitwise_get(&value, sf->field->n_bytes, sf->ofs, sf->n_bits);
}
-/* Formats 'sf' into 's' in a format normally acceptable to
- * mf_parse_subfield(). (It won't be acceptable if sf->field is NULL or if
- * sf->field has no NXM name.) */
-void
-mf_format_subfield(const struct mf_subfield *sf, struct ds *s)
-{
- if (!sf->field) {
- ds_put_cstr(s, "<unknown>");
- } else if (sf->field->nxm_name) {
- ds_put_cstr(s, sf->field->nxm_name);
- } else if (sf->field->nxm_header) {
- uint32_t header = sf->field->nxm_header;
- ds_put_format(s, "%d:%d", NXM_VENDOR(header), NXM_FIELD(header));
- } else {
- ds_put_cstr(s, sf->field->name);
- }
-
- if (sf->field && sf->ofs == 0 && sf->n_bits == sf->field->n_bits) {
- ds_put_cstr(s, "[]");
- } else if (sf->n_bits == 1) {
- ds_put_format(s, "[%d]", sf->ofs);
- } else {
- ds_put_format(s, "[%d..%d]", sf->ofs, sf->ofs + sf->n_bits - 1);
- }
-}
-
-static const struct mf_field *
-mf_parse_subfield_name(const char *name, int name_len, bool *wild)
-{
- int i;
-
- *wild = name_len > 2 && !memcmp(&name[name_len - 2], "_W", 2);
- if (*wild) {
- name_len -= 2;
- }
-
- for (i = 0; i < MFF_N_IDS; i++) {
- const struct mf_field *mf = mf_from_id(i);
-
- if (mf->nxm_name
- && !strncmp(mf->nxm_name, name, name_len)
- && mf->nxm_name[name_len] == '\0') {
- return mf;
- }
- if (mf->oxm_name
- && !strncmp(mf->oxm_name, name, name_len)
- && mf->oxm_name[name_len] == '\0') {
- return mf;
- }
- }
-
- return NULL;
-}
-
-/* Parses a subfield from the beginning of '*sp' into 'sf'. If successful,
- * returns NULL and advances '*sp' to the first byte following the parsed
- * string. On failure, returns a malloc()'d error message, does not modify
- * '*sp', and does not properly initialize 'sf'.
- *
- * The syntax parsed from '*sp' takes the form "header[start..end]" where
- * 'header' is the name of an NXM field and 'start' and 'end' are (inclusive)
- * bit indexes. "..end" may be omitted to indicate a single bit. "start..end"
- * may both be omitted (the [] are still required) to indicate an entire
- * field. */
-char * WARN_UNUSED_RESULT
-mf_parse_subfield__(struct mf_subfield *sf, const char **sp)
-{
- const struct mf_field *field;
- const char *name;
- int start, end;
- const char *s;
- int name_len;
- bool wild;
-
- s = *sp;
- name = s;
- name_len = strcspn(s, "[");
- if (s[name_len] != '[') {
- return xasprintf("%s: missing [ looking for field name", *sp);
- }
-
- field = mf_parse_subfield_name(name, name_len, &wild);
- if (!field) {
- return xasprintf("%s: unknown field `%.*s'", *sp, name_len, s);
- }
-
- s += name_len;
- if (ovs_scan(s, "[%d..%d]", &start, &end)) {
- /* Nothing to do. */
- } else if (ovs_scan(s, "[%d]", &start)) {
- end = start;
- } else if (!strncmp(s, "[]", 2)) {
- start = 0;
- end = field->n_bits - 1;
- } else {
- return xasprintf("%s: syntax error expecting [] or [<bit>] or "
- "[<start>..<end>]", *sp);
- }
- s = strchr(s, ']') + 1;
-
- if (start > end) {
- return xasprintf("%s: starting bit %d is after ending bit %d",
- *sp, start, end);
- } else if (start >= field->n_bits) {
- return xasprintf("%s: starting bit %d is not valid because field is "
- "only %d bits wide", *sp, start, field->n_bits);
- } else if (end >= field->n_bits){
- return xasprintf("%s: ending bit %d is not valid because field is "
- "only %d bits wide", *sp, end, field->n_bits);
- }
-
- sf->field = field;
- sf->ofs = start;
- sf->n_bits = end - start + 1;
-
- *sp = s;
- return NULL;
-}
-
-/* Parses a subfield from the entirety of 's' into 'sf'. Returns NULL if
- * successful, otherwise a malloc()'d string describing the error. The caller
- * is responsible for freeing the returned string.
- *
- * The syntax parsed from 's' takes the form "header[start..end]" where
- * 'header' is the name of an NXM field and 'start' and 'end' are (inclusive)
- * bit indexes. "..end" may be omitted to indicate a single bit. "start..end"
- * may both be omitted (the [] are still required) to indicate an entire
- * field. */
-char * WARN_UNUSED_RESULT
-mf_parse_subfield(struct mf_subfield *sf, const char *s)
-{
- char *error = mf_parse_subfield__(sf, &s);
- if (!error && s[0]) {
- error = xstrdup("unexpected input following field syntax");
- }
- return error;
-}
-
void
mf_format_subvalue(const union mf_subvalue *subvalue, struct ds *s)
{
projects / cascardo / ovs.git / blobdiff