X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fmeta-flow.c;h=6ef564e2b6d89516fde66ec1450f185f6c610e10;hb=HEAD;hp=11fdfaa2fd5a50487fb623bc40f0d20a036b41bc;hpb=279fb135892ad0cf2764a220ed8f660dee97c608;p=sliver-openvswitch.git diff --git a/lib/meta-flow.c b/lib/meta-flow.c index 11fdfaa2f..6ef564e2b 100644 --- a/lib/meta-flow.c +++ b/lib/meta-flow.c @@ -37,17 +37,46 @@ VLOG_DEFINE_THIS_MODULE(meta_flow); +#define FLOW_U32OFS(FIELD) \ + offsetof(struct flow, FIELD) % 4 ? -1 : offsetof(struct flow, FIELD) / 4 + #define MF_FIELD_SIZES(MEMBER) \ sizeof ((union mf_value *)0)->MEMBER, \ 8 * sizeof ((union mf_value *)0)->MEMBER -static const struct mf_field mf_fields[MFF_N_IDS] = { +extern const struct mf_field mf_fields[MFF_N_IDS]; /* Silence a warning. */ + +const struct mf_field mf_fields[MFF_N_IDS] = { /* ## -------- ## */ /* ## metadata ## */ /* ## -------- ## */ { - MFF_TUN_ID, "tun_id", NULL, + 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", + 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", + 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, @@ -55,6 +84,9 @@ 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, + FLOW_U32OFS(tunnel.tun_id), }, { MFF_TUN_SRC, "tun_src", NULL, MF_FIELD_SIZES(be32), @@ -64,6 +96,9 @@ 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, + FLOW_U32OFS(tunnel.ip_src), }, { MFF_TUN_DST, "tun_dst", NULL, MF_FIELD_SIZES(be32), @@ -73,6 +108,9 @@ 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, + FLOW_U32OFS(tunnel.ip_dst), }, { MFF_TUN_FLAGS, "tun_flags", NULL, MF_FIELD_SIZES(be16), @@ -82,8 +120,11 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { false, 0, NULL, 0, NULL, + OFPUTIL_P_NONE, + OFPUTIL_P_NONE, + -1, }, { - MFF_TUN_TOS, "tun_tos", NULL, + MFF_TUN_TTL, "tun_ttl", NULL, MF_FIELD_SIZES(u8), MFM_NONE, MFS_DECIMAL, @@ -91,8 +132,11 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { false, 0, NULL, 0, NULL, + OFPUTIL_P_NONE, + OFPUTIL_P_NONE, + -1, }, { - MFF_TUN_TTL, "tun_ttl", NULL, + MFF_TUN_TOS, "tun_tos", NULL, MF_FIELD_SIZES(u8), MFM_NONE, MFS_DECIMAL, @@ -100,6 +144,9 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { false, 0, NULL, 0, NULL, + OFPUTIL_P_NONE, + OFPUTIL_P_NONE, + -1, }, { MFF_METADATA, "metadata", NULL, MF_FIELD_SIZES(be64), @@ -109,6 +156,9 @@ 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, + -1, }, { MFF_IN_PORT, "in_port", NULL, MF_FIELD_SIZES(be16), @@ -118,6 +168,9 @@ 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, + -1, }, { MFF_IN_PORT_OXM, "in_port_oxm", NULL, MF_FIELD_SIZES(be32), @@ -127,6 +180,9 @@ 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, + -1, }, { MFF_SKB_PRIORITY, "skb_priority", NULL, MF_FIELD_SIZES(be32), @@ -136,15 +192,21 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { false, 0, NULL, 0, NULL, + OFPUTIL_P_NONE, + OFPUTIL_P_NONE, + -1, }, { - 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, + -1, }, #define REGISTER(IDX) \ @@ -157,6 +219,9 @@ 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, \ + -1, \ } #if FLOW_N_REGS > 0 REGISTER(0), @@ -199,6 +264,9 @@ 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+! */ + -1, }, { MFF_ETH_DST, "eth_dst", "dl_dst", MF_FIELD_SIZES(mac), @@ -208,6 +276,9 @@ 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+! */ + -1, }, { MFF_ETH_TYPE, "eth_type", "dl_type", MF_FIELD_SIZES(be16), @@ -217,6 +288,9 @@ 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, + -1, }, { @@ -228,6 +302,9 @@ 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, + -1, }, { MFF_DL_VLAN, "dl_vlan", NULL, sizeof(ovs_be16), 12, @@ -237,6 +314,9 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { true, 0, NULL, 0, NULL, + OFPUTIL_P_ANY, + OFPUTIL_P_NXM_OXM_ANY, + -1, }, { MFF_VLAN_VID, "vlan_vid", NULL, sizeof(ovs_be16), 12, @@ -246,6 +326,9 @@ 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, + -1, }, { MFF_DL_VLAN_PCP, "dl_vlan_pcp", NULL, 1, 3, @@ -255,6 +338,9 @@ 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, + -1, }, { MFF_VLAN_PCP, "vlan_pcp", NULL, 1, 3, @@ -264,6 +350,9 @@ 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, + -1, }, /* ## ---- ## */ @@ -278,6 +367,9 @@ 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, + -1, }, { MFF_MPLS_TC, "mpls_tc", NULL, 1, 3, @@ -287,6 +379,9 @@ 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, + -1, }, { MFF_MPLS_BOS, "mpls_bos", NULL, 1, 1, @@ -296,6 +391,9 @@ 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, + -1, }, /* ## -- ## */ @@ -311,6 +409,9 @@ 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, + FLOW_U32OFS(nw_src), }, { MFF_IPV4_DST, "ip_dst", "nw_dst", MF_FIELD_SIZES(be32), @@ -320,6 +421,9 @@ 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, + FLOW_U32OFS(nw_dst), }, { @@ -331,6 +435,9 @@ 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, + FLOW_U32OFS(ipv6_src), }, { MFF_IPV6_DST, "ipv6_dst", NULL, MF_FIELD_SIZES(ipv6), @@ -340,6 +447,9 @@ 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, + FLOW_U32OFS(ipv6_dst), }, { MFF_IPV6_LABEL, "ipv6_label", NULL, @@ -350,10 +460,13 @@ 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, + -1, }, { - MFF_IP_PROTO, "nw_proto", NULL, + MFF_IP_PROTO, "nw_proto", "ip_proto", MF_FIELD_SIZES(u8), MFM_NONE, MFS_DECIMAL, @@ -361,6 +474,9 @@ 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, + -1, }, { MFF_IP_DSCP, "nw_tos", NULL, MF_FIELD_SIZES(u8), @@ -370,17 +486,23 @@ 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, + -1, }, { - MFF_IP_DSCP_SHIFTED, "nw_tos_shifted", NULL, - MF_FIELD_SIZES(u8), + 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", + OFPUTIL_P_ANY, /* Will be shifted for non-OXM. */ + OFPUTIL_P_NONE, + -1, }, { - MFF_IP_ECN, "nw_ecn", NULL, + MFF_IP_ECN, "nw_ecn", "ip_ecn", 1, 2, MFM_NONE, MFS_DECIMAL, @@ -388,6 +510,9 @@ 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, + -1, }, { MFF_IP_TTL, "nw_ttl", NULL, MF_FIELD_SIZES(u8), @@ -397,6 +522,9 @@ 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, + -1, }, { MFF_IP_FRAG, "ip_frag", NULL, 1, 2, @@ -406,6 +534,9 @@ 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, + -1, }, { @@ -414,45 +545,60 @@ 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, + -1, }, { 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, + -1, }, { 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, + -1, }, { 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, + -1, }, { 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, + -1, }, /* ## -- ## */ @@ -468,6 +614,9 @@ 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, + -1, }, { MFF_TCP_DST, "tcp_dst", "tp_dst", MF_FIELD_SIZES(be16), @@ -477,6 +626,21 @@ 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, + -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", + NXM_NX_TCP_FLAGS, "NXM_NX_TCP_FLAGS", + OFPUTIL_P_NXM_OXM_ANY, + OFPUTIL_P_NXM_OXM_ANY, + -1, }, { @@ -488,6 +652,9 @@ 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, + -1, }, { MFF_UDP_DST, "udp_dst", NULL, MF_FIELD_SIZES(be16), @@ -497,6 +664,35 @@ 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, + -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", + 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", + OFPUTIL_P_NXM_OF11_UP, + OFPUTIL_P_NXM_OXM_ANY, + -1, }, { @@ -508,6 +704,9 @@ 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, + -1, }, { MFF_ICMPV4_CODE, "icmp_code", NULL, MF_FIELD_SIZES(u8), @@ -517,6 +716,9 @@ 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, + -1, }, { @@ -528,6 +730,9 @@ 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, + -1, }, { MFF_ICMPV6_CODE, "icmpv6_code", NULL, MF_FIELD_SIZES(u8), @@ -537,6 +742,9 @@ 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, + -1, }, /* ## ---- ## */ @@ -552,6 +760,9 @@ 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, + -1, }, { MFF_ND_SLL, "nd_sll", NULL, MF_FIELD_SIZES(mac), @@ -561,6 +772,9 @@ 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, + -1, }, { MFF_ND_TLL, "nd_tll", NULL, MF_FIELD_SIZES(mac), @@ -570,6 +784,9 @@ 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, + -1, } }; @@ -593,14 +810,6 @@ 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 'id'. */ -const struct mf_field * -mf_from_id(enum mf_field_id id) -{ - ovs_assert((unsigned int) id < MFF_N_IDS); - return &mf_fields[id]; -} - /* Returns the field with the given 'name', or a null pointer if no field has * that name. */ const struct mf_field * @@ -636,11 +845,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); @@ -690,6 +903,10 @@ bool mf_is_all_wild(const struct mf_field *mf, const struct flow_wildcards *wc) { switch (mf->id) { + case MFF_DP_HASH: + return !wc->masks.dp_hash; + case MFF_RECIRC_ID: + return !wc->masks.recirc_id; case MFF_TUN_SRC: return !wc->masks.tunnel.ip_src; case MFF_TUN_DST: @@ -706,8 +923,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]; @@ -737,11 +954,11 @@ mf_is_all_wild(const struct mf_field *mf, const struct flow_wildcards *wc) return !(wc->masks.vlan_tci & htons(VLAN_PCP_MASK)); case MFF_MPLS_LABEL: - return !(wc->masks.mpls_lse & htonl(MPLS_LABEL_MASK)); + return !(wc->masks.mpls_lse[0] & htonl(MPLS_LABEL_MASK)); case MFF_MPLS_TC: - return !(wc->masks.mpls_lse & htonl(MPLS_TC_MASK)); + return !(wc->masks.mpls_lse[1] & htonl(MPLS_TC_MASK)); case MFF_MPLS_BOS: - return !(wc->masks.mpls_lse & htonl(MPLS_BOS_MASK)); + return !(wc->masks.mpls_lse[2] & htonl(MPLS_BOS_MASK)); case MFF_IPV4_SRC: return !wc->masks.nw_src; @@ -781,18 +998,22 @@ 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; + case MFF_TCP_FLAGS: + return !wc->masks.tcp_flags; case MFF_N_IDS: default: - NOT_REACHED(); + OVS_NOT_REACHED(); } } @@ -823,21 +1044,7 @@ mf_is_mask_valid(const struct mf_field *mf, const union mf_value *mask) return true; } - NOT_REACHED(); -} - -static bool -is_icmpv4(const struct flow *flow) -{ - return (flow->dl_type == htons(ETH_TYPE_IP) - && flow->nw_proto == IPPROTO_ICMP); -} - -static bool -is_icmpv6(const struct flow *flow) -{ - return (flow->dl_type == htons(ETH_TYPE_IPV6) - && flow->nw_proto == IPPROTO_ICMPV6); + OVS_NOT_REACHED(); } /* Returns true if 'flow' meets the prerequisites for 'mf', false otherwise. */ @@ -866,6 +1073,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: @@ -886,9 +1095,49 @@ mf_are_prereqs_ok(const struct mf_field *mf, const struct flow *flow) && (flow->tp_src == htons(ND_NEIGHBOR_ADVERT))); } - NOT_REACHED(); + OVS_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. * @@ -903,6 +1152,8 @@ bool mf_is_value_valid(const struct mf_field *mf, const union mf_value *value) { switch (mf->id) { + case MFF_DP_HASH: + case MFF_RECIRC_ID: case MFF_TUN_ID: case MFF_TUN_SRC: case MFF_TUN_DST: @@ -912,7 +1163,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 +1183,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: @@ -954,6 +1207,8 @@ mf_is_value_valid(const struct mf_field *mf, const union mf_value *value) return !(value->u8 & ~IP_ECN_MASK); case MFF_IP_FRAG: return !(value->u8 & ~FLOW_NW_FRAG_MASK); + case MFF_TCP_FLAGS: + return !(value->be16 & ~htons(0x0fff)); case MFF_ARP_OP: return !(value->be16 & htons(0xff00)); @@ -981,7 +1236,7 @@ mf_is_value_valid(const struct mf_field *mf, const union mf_value *value) case MFF_N_IDS: default: - NOT_REACHED(); + OVS_NOT_REACHED(); } } @@ -992,6 +1247,12 @@ mf_get_value(const struct mf_field *mf, const struct flow *flow, union mf_value *value) { switch (mf->id) { + case MFF_DP_HASH: + value->be32 = htonl(flow->dp_hash); + break; + case MFF_RECIRC_ID: + value->be32 = htonl(flow->recirc_id); + break; case MFF_TUN_ID: value->be64 = flow->tunnel.tun_id; break; @@ -1026,8 +1287,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: @@ -1063,15 +1324,15 @@ mf_get_value(const struct mf_field *mf, const struct flow *flow, break; case MFF_MPLS_LABEL: - value->be32 = htonl(mpls_lse_to_label(flow->mpls_lse)); + value->be32 = htonl(mpls_lse_to_label(flow->mpls_lse[0])); break; case MFF_MPLS_TC: - value->u8 = mpls_lse_to_tc(flow->mpls_lse); + value->u8 = mpls_lse_to_tc(flow->mpls_lse[0]); break; case MFF_MPLS_BOS: - value->u8 = mpls_lse_to_bos(flow->mpls_lse); + value->u8 = mpls_lse_to_bos(flow->mpls_lse[0]); break; case MFF_IPV4_SRC: @@ -1142,14 +1403,20 @@ 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; + case MFF_TCP_FLAGS: + value->be16 = flow->tcp_flags; + break; + case MFF_ICMPV4_TYPE: case MFF_ICMPV6_TYPE: value->u8 = ntohs(flow->tp_src); @@ -1166,7 +1433,7 @@ mf_get_value(const struct mf_field *mf, const struct flow *flow, case MFF_N_IDS: default: - NOT_REACHED(); + OVS_NOT_REACHED(); } } @@ -1178,6 +1445,12 @@ mf_set_value(const struct mf_field *mf, const union mf_value *value, struct match *match) { switch (mf->id) { + case MFF_DP_HASH: + match_set_dp_hash(match, ntohl(value->be32)); + break; + case MFF_RECIRC_ID: + match_set_recirc_id(match, ntohl(value->be32)); + break; case MFF_TUN_ID: match_set_tun_id(match, value->be64); break; @@ -1216,8 +1489,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: @@ -1253,15 +1526,15 @@ mf_set_value(const struct mf_field *mf, break; case MFF_MPLS_LABEL: - match_set_mpls_label(match, value->be32); + match_set_mpls_label(match, 0, value->be32); break; case MFF_MPLS_TC: - match_set_mpls_tc(match, value->u8); + match_set_mpls_tc(match, 0, value->u8); break; case MFF_MPLS_BOS: - match_set_mpls_bos(match, value->u8); + match_set_mpls_bos(match, 0, value->u8); break; case MFF_IPV4_SRC: @@ -1332,14 +1605,20 @@ 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; + case MFF_TCP_FLAGS: + match_set_tcp_flags(match, value->be16); + break; + case MFF_ICMPV4_TYPE: case MFF_ICMPV6_TYPE: match_set_icmp_type(match, value->u8); @@ -1356,7 +1635,25 @@ mf_set_value(const struct mf_field *mf, case MFF_N_IDS: default: - NOT_REACHED(); + OVS_NOT_REACHED(); + } +} + +/* 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); } } @@ -1367,6 +1664,12 @@ mf_set_flow_value(const struct mf_field *mf, const union mf_value *value, struct flow *flow) { switch (mf->id) { + case MFF_DP_HASH: + flow->dp_hash = ntohl(value->be32); + break; + case MFF_RECIRC_ID: + flow->recirc_id = ntohl(value->be32); + break; case MFF_TUN_ID: flow->tunnel.tun_id = value->be64; break; @@ -1405,8 +1708,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: @@ -1442,15 +1745,15 @@ mf_set_flow_value(const struct mf_field *mf, break; case MFF_MPLS_LABEL: - flow_set_mpls_label(flow, value->be32); + flow_set_mpls_label(flow, 0, value->be32); break; case MFF_MPLS_TC: - flow_set_mpls_tc(flow, value->u8); + flow_set_mpls_tc(flow, 0, value->u8); break; case MFF_MPLS_BOS: - flow_set_mpls_bos(flow, value->u8); + flow_set_mpls_bos(flow, 0, value->u8); break; case MFF_IPV4_SRC: @@ -1497,7 +1800,7 @@ mf_set_flow_value(const struct mf_field *mf, break; case MFF_IP_FRAG: - flow->nw_frag &= value->u8; + flow->nw_frag = value->u8 & FLOW_NW_FRAG_MASK; break; case MFF_ARP_OP: @@ -1524,14 +1827,20 @@ 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; + case MFF_TCP_FLAGS: + flow->tcp_flags = value->be16; + break; + case MFF_ICMPV4_TYPE: case MFF_ICMPV6_TYPE: flow->tp_src = htons(value->u8); @@ -1548,7 +1857,7 @@ mf_set_flow_value(const struct mf_field *mf, case MFF_N_IDS: default: - NOT_REACHED(); + OVS_NOT_REACHED(); } } @@ -1573,6 +1882,14 @@ void mf_set_wild(const struct mf_field *mf, struct match *match) { switch (mf->id) { + case MFF_DP_HASH: + match->flow.dp_hash = 0; + match->wc.masks.dp_hash = 0; + break; + case MFF_RECIRC_ID: + match->flow.recirc_id = 0; + match->wc.masks.recirc_id = 0; + break; case MFF_TUN_ID: match_set_tun_id_masked(match, htonll(0), htonll(0)); break; @@ -1607,9 +1924,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: @@ -1646,15 +1963,15 @@ mf_set_wild(const struct mf_field *mf, struct match *match) break; case MFF_MPLS_LABEL: - match_set_any_mpls_label(match); + match_set_any_mpls_label(match, 0); break; case MFF_MPLS_TC: - match_set_any_mpls_tc(match); + match_set_any_mpls_tc(match, 0); break; case MFF_MPLS_BOS: - match_set_any_mpls_bos(match); + match_set_any_mpls_bos(match, 0); break; case MFF_IPV4_SRC: @@ -1727,6 +2044,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,12 +2053,18 @@ 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); match->flow.tp_dst = htons(0); break; + case MFF_TCP_FLAGS: + match->wc.masks.tcp_flags = htons(0); + match->flow.tcp_flags = htons(0); + break; + case MFF_ND_TARGET: memset(&match->wc.masks.nd_target, 0, sizeof match->wc.masks.nd_target); @@ -1749,7 +2073,7 @@ mf_set_wild(const struct mf_field *mf, struct match *match) case MFF_N_IDS: default: - NOT_REACHED(); + OVS_NOT_REACHED(); } } @@ -1764,23 +2088,23 @@ 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_RECIRC_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: @@ -1799,8 +2123,11 @@ mf_set(const struct mf_field *mf, case MFF_ICMPV4_CODE: case MFF_ICMPV6_TYPE: case MFF_ICMPV6_CODE: - NOT_REACHED(); + return OFPUTIL_P_NONE; + case MFF_DP_HASH: + match_set_dp_hash_masked(match, ntohl(value->be32), ntohl(mask->be32)); + break; case MFF_TUN_ID: match_set_tun_id_masked(match, value->be64, mask->be64); break; @@ -1829,6 +2156,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 +2189,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,26 +2221,38 @@ 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; + case MFF_TCP_FLAGS: + match_set_tcp_flags_masked(match, value->be16, mask->be16); + break; + case MFF_N_IDS: default: - NOT_REACHED(); + OVS_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 +2261,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 +2302,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; } @@ -1970,109 +2317,6 @@ mf_get(const struct mf_field *mf, const struct match *match, mf_get_mask(mf, &match->wc, mask); } -/* Assigns a random value for field 'mf' to 'value'. */ -void -mf_random_value(const struct mf_field *mf, union mf_value *value) -{ - random_bytes(value, mf->n_bytes); - - switch (mf->id) { - case MFF_TUN_ID: - case MFF_TUN_SRC: - case MFF_TUN_DST: - case MFF_TUN_TOS: - case MFF_TUN_TTL: - case MFF_TUN_FLAGS: - case MFF_METADATA: - case MFF_IN_PORT: - case MFF_SKB_MARK: - case MFF_SKB_PRIORITY: - CASE_MFF_REGS: - case MFF_ETH_SRC: - case MFF_ETH_DST: - case MFF_ETH_TYPE: - case MFF_VLAN_TCI: - case MFF_IPV4_SRC: - case MFF_IPV4_DST: - case MFF_IPV6_SRC: - case MFF_IPV6_DST: - case MFF_IP_PROTO: - case MFF_IP_TTL: - case MFF_ARP_SPA: - case MFF_ARP_TPA: - case MFF_ARP_SHA: - case MFF_ARP_THA: - case MFF_TCP_SRC: - case MFF_TCP_DST: - case MFF_UDP_SRC: - case MFF_UDP_DST: - case MFF_ICMPV4_TYPE: - case MFF_ICMPV4_CODE: - case MFF_ICMPV6_TYPE: - case MFF_ICMPV6_CODE: - case MFF_ND_TARGET: - case MFF_ND_SLL: - case MFF_ND_TLL: - break; - - case MFF_IN_PORT_OXM: - value->be32 = ofputil_port_to_ofp11(u16_to_ofp(ntohs(value->be16))); - break; - - case MFF_IPV6_LABEL: - value->be32 &= ~htonl(IPV6_LABEL_MASK); - break; - - case MFF_IP_DSCP: - value->u8 &= IP_DSCP_MASK; - break; - - case MFF_IP_DSCP_SHIFTED: - value->u8 &= IP_DSCP_MASK >> 2; - break; - - case MFF_IP_ECN: - value->u8 &= IP_ECN_MASK; - break; - - case MFF_IP_FRAG: - value->u8 &= FLOW_NW_FRAG_MASK; - break; - - case MFF_ARP_OP: - value->be16 &= htons(0xff); - break; - - case MFF_DL_VLAN: - value->be16 &= htons(VLAN_VID_MASK); - break; - case MFF_VLAN_VID: - value->be16 &= htons(VLAN_VID_MASK | VLAN_CFI); - break; - - case MFF_DL_VLAN_PCP: - case MFF_VLAN_PCP: - value->u8 &= 0x07; - break; - - case MFF_MPLS_LABEL: - value->be32 &= htonl(MPLS_LABEL_MASK >> MPLS_LABEL_SHIFT); - break; - - case MFF_MPLS_TC: - value->u8 &= MPLS_TC_MASK >> MPLS_TC_SHIFT; - break; - - case MFF_MPLS_BOS: - value->u8 &= MPLS_BOS_MASK >> MPLS_BOS_SHIFT; - break; - - case MFF_N_IDS: - default: - NOT_REACHED(); - } -} - static char * mf_from_integer_string(const struct mf_field *mf, const char *s, uint8_t *valuep, uint8_t *maskp) @@ -2122,15 +2366,15 @@ mf_from_ethernet_string(const struct mf_field *mf, const char *s, ovs_assert(mf->n_bytes == ETH_ADDR_LEN); n = -1; - if (sscanf(s, ETH_ADDR_SCAN_FMT"%n", ETH_ADDR_SCAN_ARGS(mac), &n) > 0 + if (ovs_scan(s, ETH_ADDR_SCAN_FMT"%n", ETH_ADDR_SCAN_ARGS(mac), &n) && n == strlen(s)) { memset(mask, 0xff, ETH_ADDR_LEN); return NULL; } 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 + if (ovs_scan(s, ETH_ADDR_SCAN_FMT"/"ETH_ADDR_SCAN_FMT"%n", + ETH_ADDR_SCAN_ARGS(mac), ETH_ADDR_SCAN_ARGS(mask), &n) && n == strlen(s)) { return NULL; } @@ -2146,21 +2390,20 @@ mf_from_ipv4_string(const struct mf_field *mf, const char *s, ovs_assert(mf->n_bytes == sizeof *ip); - if (sscanf(s, IP_SCAN_FMT"/"IP_SCAN_FMT, - IP_SCAN_ARGS(ip), IP_SCAN_ARGS(mask)) == IP_SCAN_COUNT * 2) { + if (ovs_scan(s, IP_SCAN_FMT"/"IP_SCAN_FMT, + IP_SCAN_ARGS(ip), IP_SCAN_ARGS(mask))) { /* OK. */ - } else if (sscanf(s, IP_SCAN_FMT"/%d", - IP_SCAN_ARGS(ip), &prefix) == IP_SCAN_COUNT + 1) { + } else if (ovs_scan(s, IP_SCAN_FMT"/%d", IP_SCAN_ARGS(ip), &prefix)) { if (prefix <= 0 || prefix > 32) { 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); + } else if (ovs_scan(s, IP_SCAN_FMT, IP_SCAN_ARGS(ip))) { + *mask = OVS_BE32_MAX; } else { return xasprintf("%s: invalid IP address", s); } @@ -2218,7 +2461,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); @@ -2233,7 +2476,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); @@ -2297,9 +2540,8 @@ parse_flow_tun_flags(const char *s_, const char *(*bit_to_string)(uint32_t), int name_len; unsigned long long int flags; uint32_t bit; - int n0; - if (sscanf(name, "%lli%n", &flags, &n0) > 0 && n0 > 0) { + if (ovs_scan(name, "%lli", &flags)) { result |= flags; continue; } @@ -2338,20 +2580,97 @@ 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; } return xasprintf("%s: unknown tunnel flags (valid flags are \"df\", " - "\"csum\", \"key\"", s); + "\"csum\", \"key\")", s); +} + +static char * +mf_from_tcp_flags_string(const char *s, ovs_be16 *flagsp, ovs_be16 *maskp) +{ + uint16_t flags = 0; + uint16_t mask = 0; + uint16_t bit; + int n; + + if (ovs_scan(s, "%"SCNi16"/%"SCNi16"%n", &flags, &mask, &n) && !s[n]) { + *flagsp = htons(flags); + *maskp = htons(mask); + return NULL; + } + if (ovs_scan(s, "%"SCNi16"%n", &flags, &n) && !s[n]) { + *flagsp = htons(flags); + *maskp = OVS_BE16_MAX; + return NULL; + } + + while (*s != '\0') { + bool set; + int name_len; + + switch (*s) { + case '+': + set = true; + break; + case '-': + set = false; + break; + default: + return xasprintf("%s: TCP flag must be preceded by '+' (for SET) " + "or '-' (NOT SET)", s); + } + s++; + + name_len = strcspn(s,"+-"); + + for (bit = 1; bit; bit <<= 1) { + const char *fname = packet_tcp_flag_to_string(bit); + size_t len; + + if (!fname) { + continue; + } + + len = strlen(fname); + if (len != name_len) { + continue; + } + if (!strncmp(s, fname, len)) { + if (mask & bit) { + return xasprintf("%s: Each TCP flag can be specified only " + "once", s); + } + if (set) { + flags |= bit; + } + mask |= bit; + break; + } + } + + if (!bit) { + return xasprintf("%s: unknown TCP flag(s)", s); + } + s += name_len; + } + + *flagsp = htons(flags); + *maskp = htons(mask); + return NULL; } + /* Parses 's', a string value for field 'mf', into 'value' and 'mask'. Returns * NULL if successful, otherwise a malloc()'d string describing the error. */ char * mf_parse(const struct mf_field *mf, const char *s, union mf_value *value, union mf_value *mask) { + char *error; + if (!strcmp(s, "*")) { memset(value, 0, mf->n_bytes); memset(mask, 0, mf->n_bytes); @@ -2361,32 +2680,52 @@ mf_parse(const struct mf_field *mf, const char *s, switch (mf->string) { case MFS_DECIMAL: case MFS_HEXADECIMAL: - return mf_from_integer_string(mf, s, - (uint8_t *) value, (uint8_t *) mask); + error = mf_from_integer_string(mf, s, + (uint8_t *) value, (uint8_t *) mask); + break; case MFS_ETHERNET: - return mf_from_ethernet_string(mf, s, value->mac, mask->mac); + error = mf_from_ethernet_string(mf, s, value->mac, mask->mac); + break; case MFS_IPV4: - return mf_from_ipv4_string(mf, s, &value->be32, &mask->be32); + error = mf_from_ipv4_string(mf, s, &value->be32, &mask->be32); + break; case MFS_IPV6: - return mf_from_ipv6_string(mf, s, &value->ipv6, &mask->ipv6); + error = mf_from_ipv6_string(mf, s, &value->ipv6, &mask->ipv6); + break; case MFS_OFP_PORT: - return mf_from_ofp_port_string(mf, s, &value->be16, &mask->be16); + error = mf_from_ofp_port_string(mf, s, &value->be16, &mask->be16); + break; case MFS_OFP_PORT_OXM: - return mf_from_ofp_port_string32(mf, s, &value->be32, &mask->be32); + error = mf_from_ofp_port_string32(mf, s, &value->be32, &mask->be32); + break; case MFS_FRAG: - return mf_from_frag_string(s, &value->u8, &mask->u8); + error = mf_from_frag_string(s, &value->u8, &mask->u8); + break; case MFS_TNL_FLAGS: ovs_assert(mf->n_bytes == sizeof(ovs_be16)); - return mf_from_tun_flags_string(s, &value->be16, &mask->be16); + error = mf_from_tun_flags_string(s, &value->be16, &mask->be16); + break; + + case MFS_TCP_FLAGS: + ovs_assert(mf->n_bytes == sizeof(ovs_be16)); + error = mf_from_tcp_flags_string(s, &value->be16, &mask->be16); + break; + + default: + OVS_NOT_REACHED(); } - NOT_REACHED(); + + if (!error && !mf_is_mask_valid(mf, mask)) { + error = xasprintf("%s: invalid mask for field %s", s, mf->name); + } + return error; } /* Parses 's', a string value for field 'mf', into 'value'. Returns NULL if @@ -2465,6 +2804,13 @@ mf_format_tnl_flags_string(const ovs_be16 *valuep, struct ds *s) format_flags(s, flow_tun_flag_to_string, ntohs(*valuep), '|'); } +static void +mf_format_tcp_flags_string(ovs_be16 value, ovs_be16 mask, struct ds *s) +{ + format_flags_masked(s, NULL, packet_tcp_flag_to_string, ntohs(value), + TCP_FLAGS(mask)); +} + /* Appends to 's' a string representation of field 'mf' whose value is in * 'value' and 'mask'. 'mask' may be NULL to indicate an exact match. */ void @@ -2506,8 +2852,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: @@ -2522,8 +2867,13 @@ mf_format(const struct mf_field *mf, mf_format_tnl_flags_string(&value->be16, s); break; + case MFS_TCP_FLAGS: + mf_format_tcp_flags_string(value->be16, + mask ? mask->be16 : OVS_BE16_MAX, s); + break; + default: - NOT_REACHED(); + OVS_NOT_REACHED(); } } @@ -2674,9 +3024,9 @@ mf_parse_subfield__(struct mf_subfield *sf, const char **sp) } s += name_len; - if (sscanf(s, "[%d..%d]", &start, &end) == 2) { + if (ovs_scan(s, "[%d..%d]", &start, &end)) { /* Nothing to do. */ - } else if (sscanf(s, "[%d]", &start) == 1) { + } else if (ovs_scan(s, "[%d]", &start)) { end = start; } else if (!strncmp(s, "[]", 2)) { start = 0;