X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fmeta-flow.c;h=12811ef0747240abe8c65cf05e37f5baa6dec617;hb=2431be1b68d386bd616378d2c528242775c4d54a;hp=8f67b94c63ae1c51edac2f01aa8f504c73f1ac91;hpb=cc36576070df622d0fc7a6e26ce01027e12b5b59;p=sliver-openvswitch.git diff --git a/lib/meta-flow.c b/lib/meta-flow.c index 8f67b94c6..12811ef07 100644 --- a/lib/meta-flow.c +++ b/lib/meta-flow.c @@ -55,6 +55,8 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { true, NXM_NX_TUN_ID, "NXM_NX_TUN_ID", OXM_OF_TUNNEL_ID, "OXM_OF_TUNNEL_ID", + OFPUTIL_P_NXM_OXM_ANY, + OFPUTIL_P_NXM_OXM_ANY, }, { MFF_TUN_SRC, "tun_src", NULL, MF_FIELD_SIZES(be32), @@ -64,6 +66,8 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { true, NXM_NX_TUN_IPV4_SRC, "NXM_NX_TUN_IPV4_SRC", NXM_NX_TUN_IPV4_SRC, "NXM_NX_TUN_IPV4_SRC", + OFPUTIL_P_NXM_OXM_ANY, + OFPUTIL_P_NXM_OXM_ANY, }, { MFF_TUN_DST, "tun_dst", NULL, MF_FIELD_SIZES(be32), @@ -73,6 +77,8 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { true, NXM_NX_TUN_IPV4_DST, "NXM_NX_TUN_IPV4_DST", NXM_NX_TUN_IPV4_DST, "NXM_NX_TUN_IPV4_DST", + OFPUTIL_P_NXM_OXM_ANY, + OFPUTIL_P_NXM_OXM_ANY, }, { MFF_TUN_FLAGS, "tun_flags", NULL, MF_FIELD_SIZES(be16), @@ -82,8 +88,10 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { false, 0, NULL, 0, NULL, + OFPUTIL_P_NONE, + OFPUTIL_P_NONE, }, { - MFF_TUN_TOS, "tun_tos", NULL, + MFF_TUN_TTL, "tun_ttl", NULL, MF_FIELD_SIZES(u8), MFM_NONE, MFS_DECIMAL, @@ -91,8 +99,10 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { false, 0, NULL, 0, NULL, + OFPUTIL_P_NONE, + OFPUTIL_P_NONE, }, { - MFF_TUN_TTL, "tun_ttl", NULL, + MFF_TUN_TOS, "tun_tos", NULL, MF_FIELD_SIZES(u8), MFM_NONE, MFS_DECIMAL, @@ -100,6 +110,8 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { false, 0, NULL, 0, NULL, + OFPUTIL_P_NONE, + OFPUTIL_P_NONE, }, { MFF_METADATA, "metadata", NULL, MF_FIELD_SIZES(be64), @@ -109,6 +121,8 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { true, OXM_OF_METADATA, "OXM_OF_METADATA", OXM_OF_METADATA, "OXM_OF_METADATA", + OFPUTIL_P_NXM_OF11_UP, + OFPUTIL_P_NXM_OF11_UP, }, { MFF_IN_PORT, "in_port", NULL, MF_FIELD_SIZES(be16), @@ -118,6 +132,8 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { true, NXM_OF_IN_PORT, "NXM_OF_IN_PORT", NXM_OF_IN_PORT, "NXM_OF_IN_PORT", + OFPUTIL_P_ANY, /* OF11+ via mapping to 32 bits. */ + OFPUTIL_P_NONE, }, { MFF_IN_PORT_OXM, "in_port_oxm", NULL, MF_FIELD_SIZES(be32), @@ -127,6 +143,8 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { true, OXM_OF_IN_PORT, "OXM_OF_IN_PORT", OXM_OF_IN_PORT, "OXM_OF_IN_PORT", + OFPUTIL_P_OF11_UP, + OFPUTIL_P_NONE, }, { MFF_SKB_PRIORITY, "skb_priority", NULL, MF_FIELD_SIZES(be32), @@ -136,15 +154,19 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { false, 0, NULL, 0, NULL, + OFPUTIL_P_NONE, + OFPUTIL_P_NONE, }, { - MFF_SKB_MARK, "skb_mark", NULL, + MFF_PKT_MARK, "pkt_mark", NULL, MF_FIELD_SIZES(be32), - MFM_NONE, + MFM_FULLY, MFS_HEXADECIMAL, MFP_NONE, - false, - 0, NULL, - 0, NULL, + true, + NXM_NX_PKT_MARK, "NXM_NX_PKT_MARK", + NXM_NX_PKT_MARK, "NXM_NX_PKT_MARK", + OFPUTIL_P_NXM_OXM_ANY, + OFPUTIL_P_NXM_OXM_ANY, }, #define REGISTER(IDX) \ @@ -157,6 +179,8 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { true, \ NXM_NX_REG(IDX), "NXM_NX_REG" #IDX, \ NXM_NX_REG(IDX), "NXM_NX_REG" #IDX, \ + OFPUTIL_P_NXM_OXM_ANY, \ + OFPUTIL_P_NXM_OXM_ANY, \ } #if FLOW_N_REGS > 0 REGISTER(0), @@ -199,6 +223,8 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { true, NXM_OF_ETH_SRC, "NXM_OF_ETH_SRC", OXM_OF_ETH_SRC, "OXM_OF_ETH_SRC", + OFPUTIL_P_ANY, + OFPUTIL_P_NXM_OF11_UP, /* Bitwise masking only with NXM and OF11+! */ }, { MFF_ETH_DST, "eth_dst", "dl_dst", MF_FIELD_SIZES(mac), @@ -208,6 +234,8 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { true, NXM_OF_ETH_DST, "NXM_OF_ETH_DST", OXM_OF_ETH_DST, "OXM_OF_ETH_DST", + OFPUTIL_P_ANY, + OFPUTIL_P_NXM_OF11_UP, /* Bitwise masking only with NXM and OF11+! */ }, { MFF_ETH_TYPE, "eth_type", "dl_type", MF_FIELD_SIZES(be16), @@ -217,6 +245,8 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { false, NXM_OF_ETH_TYPE, "NXM_OF_ETH_TYPE", OXM_OF_ETH_TYPE, "OXM_OF_ETH_TYPE", + OFPUTIL_P_ANY, + OFPUTIL_P_NONE, }, { @@ -228,6 +258,8 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { true, NXM_OF_VLAN_TCI, "NXM_OF_VLAN_TCI", NXM_OF_VLAN_TCI, "NXM_OF_VLAN_TCI", + OFPUTIL_P_ANY, + OFPUTIL_P_NXM_OXM_ANY, }, { MFF_DL_VLAN, "dl_vlan", NULL, sizeof(ovs_be16), 12, @@ -237,6 +269,8 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { true, 0, NULL, 0, NULL, + OFPUTIL_P_ANY, + OFPUTIL_P_NXM_OXM_ANY, }, { MFF_VLAN_VID, "vlan_vid", NULL, sizeof(ovs_be16), 12, @@ -246,6 +280,8 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { true, OXM_OF_VLAN_VID, "OXM_OF_VLAN_VID", OXM_OF_VLAN_VID, "OXM_OF_VLAN_VID", + OFPUTIL_P_ANY, + OFPUTIL_P_NXM_OXM_ANY, }, { MFF_DL_VLAN_PCP, "dl_vlan_pcp", NULL, 1, 3, @@ -255,6 +291,8 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { true, 0, NULL, 0, NULL, + OFPUTIL_P_ANY, /* Will be mapped to NXM and OXM. */ + OFPUTIL_P_NONE, }, { MFF_VLAN_PCP, "vlan_pcp", NULL, 1, 3, @@ -264,6 +302,8 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { true, OXM_OF_VLAN_PCP, "OXM_OF_VLAN_PCP", OXM_OF_VLAN_PCP, "OXM_OF_VLAN_PCP", + OFPUTIL_P_ANY, /* Will be mapped to OF10 and NXM. */ + OFPUTIL_P_NONE, }, /* ## ---- ## */ @@ -278,6 +318,8 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { true, OXM_OF_MPLS_LABEL, "OXM_OF_MPLS_LABEL", OXM_OF_MPLS_LABEL, "OXM_OF_MPLS_LABEL", + OFPUTIL_P_NXM_OF11_UP, + OFPUTIL_P_NONE, }, { MFF_MPLS_TC, "mpls_tc", NULL, 1, 3, @@ -287,6 +329,8 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { true, OXM_OF_MPLS_TC, "OXM_OF_MPLS_TC", OXM_OF_MPLS_TC, "OXM_OF_MPLS_TC", + OFPUTIL_P_NXM_OF11_UP, + OFPUTIL_P_NONE, }, { MFF_MPLS_BOS, "mpls_bos", NULL, 1, 1, @@ -296,6 +340,8 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { false, OXM_OF_MPLS_BOS, "OXM_OF_MPLS_BOS", OXM_OF_MPLS_BOS, "OXM_OF_MPLS_BOS", + OFPUTIL_P_NXM_OXM_ANY, + OFPUTIL_P_NONE, }, /* ## -- ## */ @@ -311,6 +357,8 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { true, NXM_OF_IP_SRC, "NXM_OF_IP_SRC", OXM_OF_IPV4_SRC, "OXM_OF_IPV4_SRC", + OFPUTIL_P_ANY, + OFPUTIL_P_NXM_OF11_UP, }, { MFF_IPV4_DST, "ip_dst", "nw_dst", MF_FIELD_SIZES(be32), @@ -320,6 +368,8 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { true, NXM_OF_IP_DST, "NXM_OF_IP_DST", OXM_OF_IPV4_DST, "OXM_OF_IPV4_DST", + OFPUTIL_P_ANY, + OFPUTIL_P_NXM_OF11_UP, }, { @@ -331,6 +381,8 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { true, NXM_NX_IPV6_SRC, "NXM_NX_IPV6_SRC", OXM_OF_IPV6_SRC, "OXM_OF_IPV6_SRC", + OFPUTIL_P_NXM_OXM_ANY, + OFPUTIL_P_NXM_OXM_ANY, }, { MFF_IPV6_DST, "ipv6_dst", NULL, MF_FIELD_SIZES(ipv6), @@ -340,6 +392,8 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { true, NXM_NX_IPV6_DST, "NXM_NX_IPV6_DST", OXM_OF_IPV6_DST, "OXM_OF_IPV6_DST", + OFPUTIL_P_NXM_OXM_ANY, + OFPUTIL_P_NXM_OXM_ANY, }, { MFF_IPV6_LABEL, "ipv6_label", NULL, @@ -350,6 +404,8 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { false, NXM_NX_IPV6_LABEL, "NXM_NX_IPV6_LABEL", OXM_OF_IPV6_FLABEL, "OXM_OF_IPV6_FLABEL", + OFPUTIL_P_NXM_OXM_ANY, + OFPUTIL_P_NXM_OXM_ANY, }, { @@ -361,6 +417,8 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { false, NXM_OF_IP_PROTO, "NXM_OF_IP_PROTO", OXM_OF_IP_PROTO, "OXM_OF_IP_PROTO", + OFPUTIL_P_ANY, + OFPUTIL_P_NONE, }, { MFF_IP_DSCP, "nw_tos", NULL, MF_FIELD_SIZES(u8), @@ -370,6 +428,8 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { true, NXM_OF_IP_TOS, "NXM_OF_IP_TOS", NXM_OF_IP_TOS, "NXM_OF_IP_TOS", + OFPUTIL_P_ANY, /* Will be shifted for OXM. */ + OFPUTIL_P_NONE, }, { MFF_IP_DSCP_SHIFTED, "nw_tos_shifted", NULL, MF_FIELD_SIZES(u8), @@ -379,6 +439,8 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { true, OXM_OF_IP_DSCP, "OXM_OF_IP_DSCP", OXM_OF_IP_DSCP, "OXM_OF_IP_DSCP", + OFPUTIL_P_ANY, /* Will be shifted for non-OXM. */ + OFPUTIL_P_NONE, }, { MFF_IP_ECN, "nw_ecn", NULL, 1, 2, @@ -388,6 +450,8 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { true, NXM_NX_IP_ECN, "NXM_NX_IP_ECN", OXM_OF_IP_ECN, "OXM_OF_IP_ECN", + OFPUTIL_P_NXM_OXM_ANY, + OFPUTIL_P_NONE, }, { MFF_IP_TTL, "nw_ttl", NULL, MF_FIELD_SIZES(u8), @@ -397,6 +461,8 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { true, NXM_NX_IP_TTL, "NXM_NX_IP_TTL", NXM_NX_IP_TTL, "NXM_NX_IP_TTL", + OFPUTIL_P_NXM_OXM_ANY, + OFPUTIL_P_NONE, }, { MFF_IP_FRAG, "ip_frag", NULL, 1, 2, @@ -406,6 +472,8 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { false, NXM_NX_IP_FRAG, "NXM_NX_IP_FRAG", NXM_NX_IP_FRAG, "NXM_NX_IP_FRAG", + OFPUTIL_P_NXM_OXM_ANY, + OFPUTIL_P_NXM_OXM_ANY, }, { @@ -414,45 +482,55 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { MFM_NONE, MFS_DECIMAL, MFP_ARP, - false, + true, NXM_OF_ARP_OP, "NXM_OF_ARP_OP", OXM_OF_ARP_OP, "OXM_OF_ARP_OP", + OFPUTIL_P_ANY, + OFPUTIL_P_NONE, }, { MFF_ARP_SPA, "arp_spa", NULL, MF_FIELD_SIZES(be32), MFM_FULLY, MFS_IPV4, MFP_ARP, - false, + true, NXM_OF_ARP_SPA, "NXM_OF_ARP_SPA", OXM_OF_ARP_SPA, "OXM_OF_ARP_SPA", + OFPUTIL_P_ANY, + OFPUTIL_P_NXM_OF11_UP, }, { MFF_ARP_TPA, "arp_tpa", NULL, MF_FIELD_SIZES(be32), MFM_FULLY, MFS_IPV4, MFP_ARP, - false, + true, NXM_OF_ARP_TPA, "NXM_OF_ARP_TPA", OXM_OF_ARP_TPA, "OXM_OF_ARP_TPA", + OFPUTIL_P_ANY, + OFPUTIL_P_NXM_OF11_UP, }, { MFF_ARP_SHA, "arp_sha", NULL, MF_FIELD_SIZES(mac), MFM_FULLY, MFS_ETHERNET, MFP_ARP, - false, + true, NXM_NX_ARP_SHA, "NXM_NX_ARP_SHA", OXM_OF_ARP_SHA, "OXM_OF_ARP_SHA", + OFPUTIL_P_NXM_OXM_ANY, + OFPUTIL_P_NXM_OXM_ANY, }, { MFF_ARP_THA, "arp_tha", NULL, MF_FIELD_SIZES(mac), MFM_FULLY, MFS_ETHERNET, MFP_ARP, - false, + true, NXM_NX_ARP_THA, "NXM_NX_ARP_THA", OXM_OF_ARP_THA, "OXM_OF_ARP_THA", + OFPUTIL_P_NXM_OXM_ANY, + OFPUTIL_P_NXM_OXM_ANY, }, /* ## -- ## */ @@ -468,6 +546,8 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { true, NXM_OF_TCP_SRC, "NXM_OF_TCP_SRC", OXM_OF_TCP_SRC, "OXM_OF_TCP_SRC", + OFPUTIL_P_ANY, + OFPUTIL_P_NXM_OXM_ANY, }, { MFF_TCP_DST, "tcp_dst", "tp_dst", MF_FIELD_SIZES(be16), @@ -477,6 +557,8 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { true, NXM_OF_TCP_DST, "NXM_OF_TCP_DST", OXM_OF_TCP_DST, "OXM_OF_TCP_DST", + OFPUTIL_P_ANY, + OFPUTIL_P_NXM_OXM_ANY, }, { @@ -488,6 +570,8 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { true, NXM_OF_UDP_SRC, "NXM_OF_UDP_SRC", OXM_OF_UDP_SRC, "OXM_OF_UDP_SRC", + OFPUTIL_P_ANY, + OFPUTIL_P_NXM_OXM_ANY, }, { MFF_UDP_DST, "udp_dst", NULL, MF_FIELD_SIZES(be16), @@ -497,6 +581,32 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { true, NXM_OF_UDP_DST, "NXM_OF_UDP_DST", OXM_OF_UDP_DST, "OXM_OF_UDP_DST", + OFPUTIL_P_ANY, + OFPUTIL_P_NXM_OXM_ANY, + }, + + { + 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", + OFPUTIL_P_NXM_OF11_UP, + OFPUTIL_P_NXM_OXM_ANY, + }, { + 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", + OFPUTIL_P_NXM_OF11_UP, + OFPUTIL_P_NXM_OXM_ANY, }, { @@ -508,6 +618,8 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { false, NXM_OF_ICMP_TYPE, "NXM_OF_ICMP_TYPE", OXM_OF_ICMPV4_TYPE, "OXM_OF_ICMPV4_TYPE", + OFPUTIL_P_ANY, + OFPUTIL_P_NONE, }, { MFF_ICMPV4_CODE, "icmp_code", NULL, MF_FIELD_SIZES(u8), @@ -517,6 +629,8 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { false, NXM_OF_ICMP_CODE, "NXM_OF_ICMP_CODE", OXM_OF_ICMPV4_CODE, "OXM_OF_ICMPV4_CODE", + OFPUTIL_P_ANY, + OFPUTIL_P_NONE, }, { @@ -528,6 +642,8 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { false, NXM_NX_ICMPV6_TYPE, "NXM_NX_ICMPV6_TYPE", OXM_OF_ICMPV6_TYPE, "OXM_OF_ICMPV6_TYPE", + OFPUTIL_P_NXM_OXM_ANY, + OFPUTIL_P_NONE, }, { MFF_ICMPV6_CODE, "icmpv6_code", NULL, MF_FIELD_SIZES(u8), @@ -537,6 +653,8 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { false, NXM_NX_ICMPV6_CODE, "NXM_NX_ICMPV6_CODE", OXM_OF_ICMPV6_CODE, "OXM_OF_ICMPV6_CODE", + OFPUTIL_P_NXM_OXM_ANY, + OFPUTIL_P_NONE, }, /* ## ---- ## */ @@ -552,6 +670,8 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { false, NXM_NX_ND_TARGET, "NXM_NX_ND_TARGET", OXM_OF_IPV6_ND_TARGET, "OXM_OF_IPV6_ND_TARGET", + OFPUTIL_P_NXM_OXM_ANY, + OFPUTIL_P_NXM_OXM_ANY, }, { MFF_ND_SLL, "nd_sll", NULL, MF_FIELD_SIZES(mac), @@ -561,6 +681,8 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { false, NXM_NX_ND_SLL, "NXM_NX_ND_SLL", OXM_OF_IPV6_ND_SLL, "OXM_OF_IPV6_ND_SLL", + OFPUTIL_P_NXM_OXM_ANY, + OFPUTIL_P_NXM_OXM_ANY, }, { MFF_ND_TLL, "nd_tll", NULL, MF_FIELD_SIZES(mac), @@ -570,6 +692,8 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { false, NXM_NX_ND_TLL, "NXM_NX_ND_TLL", OXM_OF_IPV6_ND_TLL, "OXM_OF_IPV6_ND_TLL", + OFPUTIL_P_NXM_OXM_ANY, + OFPUTIL_P_NXM_OXM_ANY, } }; @@ -636,11 +760,15 @@ nxm_init_add_field(const struct mf_field *mf, uint32_t header) static void nxm_do_init(void) { - const struct mf_field *mf; + int i; hmap_init(&all_fields); shash_init(&mf_by_name); - for (mf = mf_fields; mf < &mf_fields[MFF_N_IDS]; mf++) { + 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); @@ -706,8 +834,8 @@ mf_is_all_wild(const struct mf_field *mf, const struct flow_wildcards *wc) return !wc->masks.in_port.ofp_port; case MFF_SKB_PRIORITY: return !wc->masks.skb_priority; - case MFF_SKB_MARK: - return !wc->masks.skb_mark; + case MFF_PKT_MARK: + return !wc->masks.pkt_mark; CASE_MFF_REGS: return !wc->masks.regs[mf->id - MFF_REG0]; @@ -781,11 +909,13 @@ mf_is_all_wild(const struct mf_field *mf, const struct flow_wildcards *wc) case MFF_TCP_SRC: case MFF_UDP_SRC: + case MFF_SCTP_SRC: case MFF_ICMPV4_TYPE: case MFF_ICMPV6_TYPE: return !wc->masks.tp_src; case MFF_TCP_DST: case MFF_UDP_DST: + case MFF_SCTP_DST: case MFF_ICMPV4_CODE: case MFF_ICMPV6_CODE: return !wc->masks.tp_dst; @@ -866,6 +996,8 @@ mf_are_prereqs_ok(const struct mf_field *mf, const struct flow *flow) return is_ip_any(flow) && flow->nw_proto == IPPROTO_TCP; case MFP_UDP: return is_ip_any(flow) && flow->nw_proto == IPPROTO_UDP; + case MFP_SCTP: + return is_ip_any(flow) && flow->nw_proto == IPPROTO_SCTP; case MFP_ICMPV4: return is_icmpv4(flow); case MFP_ICMPV6: @@ -889,6 +1021,46 @@ mf_are_prereqs_ok(const struct mf_field *mf, const struct flow *flow) NOT_REACHED(); } +/* Set field and it's prerequisities in the mask. + * This is only ever called for writeable 'mf's, but we do not make the + * distinction here. */ +void +mf_mask_field_and_prereqs(const struct mf_field *mf, struct flow *mask) +{ + static const union mf_value exact_match_mask = MF_EXACT_MASK_INITIALIZER; + + mf_set_flow_value(mf, &exact_match_mask, mask); + + switch (mf->prereqs) { + case MFP_ND: + case MFP_ND_SOLICIT: + case MFP_ND_ADVERT: + mask->tp_src = OVS_BE16_MAX; + mask->tp_dst = OVS_BE16_MAX; + /* Fall through. */ + case MFP_TCP: + case MFP_UDP: + case MFP_SCTP: + case MFP_ICMPV4: + case MFP_ICMPV6: + mask->nw_proto = 0xff; + /* Fall through. */ + case MFP_ARP: + case MFP_IPV4: + case MFP_IPV6: + case MFP_MPLS: + case MFP_IP_ANY: + mask->dl_type = OVS_BE16_MAX; + break; + case MFP_VLAN_VID: + mask->vlan_tci |= htons(VLAN_CFI); + break; + case MFP_NONE: + break; + } +} + + /* Returns true if 'value' may be a valid value *as part of a masked match*, * false otherwise. * @@ -912,7 +1084,7 @@ mf_is_value_valid(const struct mf_field *mf, const union mf_value *value) case MFF_METADATA: case MFF_IN_PORT: case MFF_SKB_PRIORITY: - case MFF_SKB_MARK: + case MFF_PKT_MARK: CASE_MFF_REGS: case MFF_ETH_SRC: case MFF_ETH_DST: @@ -932,6 +1104,8 @@ mf_is_value_valid(const struct mf_field *mf, const union mf_value *value) case MFF_TCP_DST: case MFF_UDP_SRC: case MFF_UDP_DST: + case MFF_SCTP_SRC: + case MFF_SCTP_DST: case MFF_ICMPV4_TYPE: case MFF_ICMPV4_CODE: case MFF_ICMPV6_TYPE: @@ -1026,8 +1200,8 @@ mf_get_value(const struct mf_field *mf, const struct flow *flow, value->be32 = htonl(flow->skb_priority); break; - case MFF_SKB_MARK: - value->be32 = htonl(flow->skb_mark); + case MFF_PKT_MARK: + value->be32 = htonl(flow->pkt_mark); break; CASE_MFF_REGS: @@ -1142,11 +1316,13 @@ mf_get_value(const struct mf_field *mf, const struct flow *flow, case MFF_TCP_SRC: case MFF_UDP_SRC: + case MFF_SCTP_SRC: value->be16 = flow->tp_src; break; case MFF_TCP_DST: case MFF_UDP_DST: + case MFF_SCTP_DST: value->be16 = flow->tp_dst; break; @@ -1216,8 +1392,8 @@ mf_set_value(const struct mf_field *mf, match_set_skb_priority(match, ntohl(value->be32)); break; - case MFF_SKB_MARK: - match_set_skb_mark(match, ntohl(value->be32)); + case MFF_PKT_MARK: + match_set_pkt_mark(match, ntohl(value->be32)); break; CASE_MFF_REGS: @@ -1332,11 +1508,13 @@ mf_set_value(const struct mf_field *mf, case MFF_TCP_SRC: case MFF_UDP_SRC: + case MFF_SCTP_SRC: match_set_tp_src(match, value->be16); break; case MFF_TCP_DST: case MFF_UDP_DST: + case MFF_SCTP_DST: match_set_tp_dst(match, value->be16); break; @@ -1360,6 +1538,24 @@ mf_set_value(const struct mf_field *mf, } } +/* Unwildcard 'mask' member field described by 'mf'. The caller is + * responsible for ensuring that 'mask' meets 'mf''s prerequisites. */ +void +mf_mask_field(const struct mf_field *mf, struct flow *mask) +{ + static const union mf_value exact_match_mask = MF_EXACT_MASK_INITIALIZER; + + /* For MFF_DL_VLAN, we cannot send a all 1's to flow_set_dl_vlan() + * as that will be considered as OFP10_VLAN_NONE. So consider it as a + * special case. For the rest, calling mf_set_flow_value() is good + * enough. */ + if (mf->id == MFF_DL_VLAN) { + flow_set_dl_vlan(mask, htons(VLAN_VID_MASK)); + } else { + mf_set_flow_value(mf, &exact_match_mask, mask); + } +} + /* Sets 'flow' member field described by 'mf' to 'value'. The caller is * responsible for ensuring that 'flow' meets 'mf''s prerequisites.*/ void @@ -1405,8 +1601,8 @@ mf_set_flow_value(const struct mf_field *mf, flow->skb_priority = ntohl(value->be32); break; - case MFF_SKB_MARK: - flow->skb_mark = ntohl(value->be32); + case MFF_PKT_MARK: + flow->pkt_mark = ntohl(value->be32); break; CASE_MFF_REGS: @@ -1524,11 +1720,13 @@ mf_set_flow_value(const struct mf_field *mf, case MFF_TCP_SRC: case MFF_UDP_SRC: + case MFF_SCTP_SRC: flow->tp_src = value->be16; break; case MFF_TCP_DST: case MFF_UDP_DST: + case MFF_SCTP_DST: flow->tp_dst = value->be16; break; @@ -1607,9 +1805,9 @@ mf_set_wild(const struct mf_field *mf, struct match *match) match->wc.masks.skb_priority = 0; break; - case MFF_SKB_MARK: - match->flow.skb_mark = 0; - match->wc.masks.skb_mark = 0; + case MFF_PKT_MARK: + match->flow.pkt_mark = 0; + match->wc.masks.pkt_mark = 0; break; CASE_MFF_REGS: @@ -1727,6 +1925,7 @@ mf_set_wild(const struct mf_field *mf, struct match *match) case MFF_TCP_SRC: case MFF_UDP_SRC: + case MFF_SCTP_SRC: case MFF_ICMPV4_TYPE: case MFF_ICMPV6_TYPE: match->wc.masks.tp_src = htons(0); @@ -1735,6 +1934,7 @@ mf_set_wild(const struct mf_field *mf, struct match *match) case MFF_TCP_DST: case MFF_UDP_DST: + case MFF_SCTP_DST: case MFF_ICMPV4_CODE: case MFF_ICMPV6_CODE: match->wc.masks.tp_dst = htons(0); @@ -1764,23 +1964,22 @@ mf_set_wild(const struct mf_field *mf, struct match *match) * * 'mask' must be a valid mask for 'mf' (see mf_is_mask_valid()). The caller * is responsible for ensuring that 'match' meets 'mf''s prerequisites. */ -void +enum ofputil_protocol mf_set(const struct mf_field *mf, 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)) { mf_set_value(mf, value, match); - return; + return mf->usable_protocols; } else if (is_all_zeros((const uint8_t *) mask, mf->n_bytes)) { mf_set_wild(mf, match); - return; + return OFPUTIL_P_ANY; } switch (mf->id) { case MFF_IN_PORT: case MFF_IN_PORT_OXM: - case MFF_SKB_MARK: case MFF_SKB_PRIORITY: case MFF_ETH_TYPE: case MFF_DL_VLAN: @@ -1829,6 +2028,11 @@ mf_set(const struct mf_field *mf, ntohl(value->be32), ntohl(mask->be32)); break; + case MFF_PKT_MARK: + match_set_pkt_mark_masked(match, ntohl(value->be32), + ntohl(mask->be32)); + break; + case MFF_ETH_DST: match_set_dl_dst_masked(match, value->mac, mask->mac); break; @@ -1857,11 +2061,11 @@ mf_set(const struct mf_field *mf, case MFF_IPV4_SRC: match_set_nw_src_masked(match, value->be32, mask->be32); - break; + goto cidr_check; case MFF_IPV4_DST: match_set_nw_dst_masked(match, value->be32, mask->be32); - break; + goto cidr_check; case MFF_IPV6_SRC: match_set_ipv6_src_masked(match, &value->ipv6, &mask->ipv6); @@ -1889,19 +2093,21 @@ mf_set(const struct mf_field *mf, case MFF_ARP_SPA: match_set_nw_src_masked(match, value->be32, mask->be32); - break; + goto cidr_check; case MFF_ARP_TPA: match_set_nw_dst_masked(match, value->be32, mask->be32); - break; + goto cidr_check; case MFF_TCP_SRC: case MFF_UDP_SRC: + case MFF_SCTP_SRC: match_set_tp_src_masked(match, value->be16, mask->be16); break; case MFF_TCP_DST: case MFF_UDP_DST: + case MFF_SCTP_DST: match_set_tp_dst_masked(match, value->be16, mask->be16); break; @@ -1909,6 +2115,12 @@ mf_set(const struct mf_field *mf, default: NOT_REACHED(); } + + return mf->usable_protocols_bitwise; + +cidr_check: + return ip_is_cidr(mask->be32) ? mf->usable_protocols : + mf->usable_protocols_bitwise; } static enum ofperr @@ -1917,23 +2129,26 @@ mf_check__(const struct mf_subfield *sf, const struct flow *flow, { if (!sf->field) { VLOG_WARN_RL(&rl, "unknown %s field", type); + return OFPERR_OFPBAC_BAD_SET_TYPE; } else if (!sf->n_bits) { VLOG_WARN_RL(&rl, "zero bit %s field %s", type, sf->field->name); + return OFPERR_OFPBAC_BAD_SET_LEN; } else if (sf->ofs >= sf->field->n_bits) { VLOG_WARN_RL(&rl, "bit offset %d exceeds %d-bit width of %s field %s", sf->ofs, sf->field->n_bits, type, sf->field->name); + return OFPERR_OFPBAC_BAD_SET_LEN; } else if (sf->ofs + sf->n_bits > sf->field->n_bits) { VLOG_WARN_RL(&rl, "bit offset %d and width %d exceeds %d-bit width " "of %s field %s", sf->ofs, sf->n_bits, sf->field->n_bits, type, sf->field->name); + return OFPERR_OFPBAC_BAD_SET_LEN; } else if (flow && !mf_are_prereqs_ok(sf->field, flow)) { VLOG_WARN_RL(&rl, "%s field %s lacks correct prerequisites", type, sf->field->name); + return OFPERR_OFPBAC_MATCH_INCONSISTENT; } else { return 0; } - - return OFPERR_OFPBAC_BAD_ARGUMENT; } /* Checks whether 'sf' is valid for reading a subfield out of 'flow'. Returns @@ -1955,7 +2170,7 @@ mf_check_dst(const struct mf_subfield *sf, const struct flow *flow) if (!error && !sf->field->writable) { VLOG_WARN_RL(&rl, "destination field %s is not writable", sf->field->name); - return OFPERR_OFPBAC_BAD_ARGUMENT; + return OFPERR_OFPBAC_BAD_SET_ARGUMENT; } return error; } @@ -1985,7 +2200,7 @@ mf_random_value(const struct mf_field *mf, union mf_value *value) case MFF_TUN_FLAGS: case MFF_METADATA: case MFF_IN_PORT: - case MFF_SKB_MARK: + case MFF_PKT_MARK: case MFF_SKB_PRIORITY: CASE_MFF_REGS: case MFF_ETH_SRC: @@ -2006,6 +2221,8 @@ mf_random_value(const struct mf_field *mf, union mf_value *value) case MFF_TCP_DST: case MFF_UDP_SRC: case MFF_UDP_DST: + case MFF_SCTP_SRC: + case MFF_SCTP_DST: case MFF_ICMPV4_TYPE: case MFF_ICMPV4_CODE: case MFF_ICMPV6_TYPE: @@ -2020,7 +2237,7 @@ mf_random_value(const struct mf_field *mf, union mf_value *value) break; case MFF_IPV6_LABEL: - value->be32 &= ~htonl(IPV6_LABEL_MASK); + value->be32 &= htonl(IPV6_LABEL_MASK); break; case MFF_IP_DSCP: @@ -2117,20 +2334,25 @@ mf_from_ethernet_string(const struct mf_field *mf, const char *s, uint8_t mac[ETH_ADDR_LEN], uint8_t mask[ETH_ADDR_LEN]) { - ovs_assert(mf->n_bytes == ETH_ADDR_LEN); + int n; - switch (sscanf(s, ETH_ADDR_SCAN_FMT"/"ETH_ADDR_SCAN_FMT, - ETH_ADDR_SCAN_ARGS(mac), ETH_ADDR_SCAN_ARGS(mask))){ - case ETH_ADDR_SCAN_COUNT * 2: - return NULL; + ovs_assert(mf->n_bytes == ETH_ADDR_LEN); - case ETH_ADDR_SCAN_COUNT: + n = -1; + if (sscanf(s, ETH_ADDR_SCAN_FMT"%n", ETH_ADDR_SCAN_ARGS(mac), &n) > 0 + && n == strlen(s)) { memset(mask, 0xff, ETH_ADDR_LEN); return NULL; + } - default: - return xasprintf("%s: invalid Ethernet address", s); + n = -1; + if (sscanf(s, ETH_ADDR_SCAN_FMT"/"ETH_ADDR_SCAN_FMT"%n", + ETH_ADDR_SCAN_ARGS(mac), ETH_ADDR_SCAN_ARGS(mask), &n) > 0 + && n == strlen(s)) { + return NULL; } + + return xasprintf("%s: invalid Ethernet address", s); } static char * @@ -2150,12 +2372,12 @@ mf_from_ipv4_string(const struct mf_field *mf, const char *s, return xasprintf("%s: network prefix bits not between 1 and " "32", s); } else if (prefix == 32) { - *mask = htonl(UINT32_MAX); + *mask = OVS_BE32_MAX; } else { *mask = htonl(((1u << prefix) - 1) << (32 - prefix)); } } else if (sscanf(s, IP_SCAN_FMT, IP_SCAN_ARGS(ip)) == IP_SCAN_COUNT) { - *mask = htonl(UINT32_MAX); + *mask = OVS_BE32_MAX; } else { return xasprintf("%s: invalid IP address", s); } @@ -2213,7 +2435,7 @@ mf_from_ofp_port_string(const struct mf_field *mf, const char *s, if (ofputil_port_from_string(s, &port)) { *valuep = htons(ofp_to_u16(port)); - *maskp = htons(UINT16_MAX); + *maskp = OVS_BE16_MAX; return NULL; } return xasprintf("%s: port value out of range for %s", s, mf->name); @@ -2228,7 +2450,7 @@ mf_from_ofp_port_string32(const struct mf_field *mf, const char *s, ovs_assert(mf->n_bytes == sizeof(ovs_be32)); if (ofputil_port_from_string(s, &port)) { *valuep = ofputil_port_to_ofp11(port); - *maskp = htonl(UINT32_MAX); + *maskp = OVS_BE32_MAX; return NULL; } return xasprintf("%s: port value out of range for %s", s, mf->name); @@ -2333,7 +2555,7 @@ static char * mf_from_tun_flags_string(const char *s, ovs_be16 *valuep, ovs_be16 *maskp) { if (!parse_flow_tun_flags(s, flow_tun_flag_to_string, valuep)) { - *maskp = htons(UINT16_MAX); + *maskp = OVS_BE16_MAX; return NULL; } @@ -2501,8 +2723,7 @@ mf_format(const struct mf_field *mf, break; case MFS_IPV4: - ip_format_masked(value->be32, mask ? mask->be32 : htonl(UINT32_MAX), - s); + ip_format_masked(value->be32, mask ? mask->be32 : OVS_BE32_MAX, s); break; case MFS_IPV6: