X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fmeta-flow.c;h=6ef564e2b6d89516fde66ec1450f185f6c610e10;hb=HEAD;hp=9f39c18387a39ee3797fc8c1acf0c58d46ed60aa;hpb=44a7e26dcc2a68c0293b38c03048f938f318f0fd;p=sliver-openvswitch.git diff --git a/lib/meta-flow.c b/lib/meta-flow.c index 9f39c1838..6ef564e2b 100644 --- a/lib/meta-flow.c +++ b/lib/meta-flow.c @@ -37,6 +37,9 @@ 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 @@ -49,6 +52,30 @@ const struct mf_field mf_fields[MFF_N_IDS] = { /* ## -------- ## */ { + 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, @@ -59,6 +86,7 @@ const struct mf_field mf_fields[MFF_N_IDS] = { 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), @@ -70,6 +98,7 @@ const struct mf_field mf_fields[MFF_N_IDS] = { 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), @@ -81,6 +110,7 @@ const struct mf_field mf_fields[MFF_N_IDS] = { 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), @@ -92,6 +122,7 @@ const struct mf_field mf_fields[MFF_N_IDS] = { 0, NULL, OFPUTIL_P_NONE, OFPUTIL_P_NONE, + -1, }, { MFF_TUN_TTL, "tun_ttl", NULL, MF_FIELD_SIZES(u8), @@ -103,6 +134,7 @@ const struct mf_field mf_fields[MFF_N_IDS] = { 0, NULL, OFPUTIL_P_NONE, OFPUTIL_P_NONE, + -1, }, { MFF_TUN_TOS, "tun_tos", NULL, MF_FIELD_SIZES(u8), @@ -114,6 +146,7 @@ const struct mf_field mf_fields[MFF_N_IDS] = { 0, NULL, OFPUTIL_P_NONE, OFPUTIL_P_NONE, + -1, }, { MFF_METADATA, "metadata", NULL, MF_FIELD_SIZES(be64), @@ -125,6 +158,7 @@ const struct mf_field mf_fields[MFF_N_IDS] = { 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), @@ -136,6 +170,7 @@ const struct mf_field mf_fields[MFF_N_IDS] = { 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), @@ -147,6 +182,7 @@ const struct mf_field mf_fields[MFF_N_IDS] = { 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), @@ -158,6 +194,7 @@ const struct mf_field mf_fields[MFF_N_IDS] = { 0, NULL, OFPUTIL_P_NONE, OFPUTIL_P_NONE, + -1, }, { MFF_PKT_MARK, "pkt_mark", NULL, MF_FIELD_SIZES(be32), @@ -169,6 +206,7 @@ const struct mf_field mf_fields[MFF_N_IDS] = { NXM_NX_PKT_MARK, "NXM_NX_PKT_MARK", OFPUTIL_P_NXM_OXM_ANY, OFPUTIL_P_NXM_OXM_ANY, + -1, }, #define REGISTER(IDX) \ @@ -183,6 +221,7 @@ const struct mf_field mf_fields[MFF_N_IDS] = { 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), @@ -227,6 +266,7 @@ const struct mf_field mf_fields[MFF_N_IDS] = { 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), @@ -238,6 +278,7 @@ const struct mf_field mf_fields[MFF_N_IDS] = { 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), @@ -249,6 +290,7 @@ const struct mf_field mf_fields[MFF_N_IDS] = { OXM_OF_ETH_TYPE, "OXM_OF_ETH_TYPE", OFPUTIL_P_ANY, OFPUTIL_P_NONE, + -1, }, { @@ -262,6 +304,7 @@ const struct mf_field mf_fields[MFF_N_IDS] = { 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, @@ -273,6 +316,7 @@ const struct mf_field mf_fields[MFF_N_IDS] = { 0, NULL, OFPUTIL_P_ANY, OFPUTIL_P_NXM_OXM_ANY, + -1, }, { MFF_VLAN_VID, "vlan_vid", NULL, sizeof(ovs_be16), 12, @@ -284,6 +328,7 @@ const struct mf_field mf_fields[MFF_N_IDS] = { 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, @@ -295,6 +340,7 @@ const struct mf_field mf_fields[MFF_N_IDS] = { 0, NULL, OFPUTIL_P_ANY, /* Will be mapped to NXM and OXM. */ OFPUTIL_P_NONE, + -1, }, { MFF_VLAN_PCP, "vlan_pcp", NULL, 1, 3, @@ -306,6 +352,7 @@ const struct mf_field mf_fields[MFF_N_IDS] = { OXM_OF_VLAN_PCP, "OXM_OF_VLAN_PCP", OFPUTIL_P_ANY, /* Will be mapped to OF10 and NXM. */ OFPUTIL_P_NONE, + -1, }, /* ## ---- ## */ @@ -322,6 +369,7 @@ const struct mf_field mf_fields[MFF_N_IDS] = { 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, @@ -333,6 +381,7 @@ const struct mf_field mf_fields[MFF_N_IDS] = { 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, @@ -344,6 +393,7 @@ const struct mf_field mf_fields[MFF_N_IDS] = { OXM_OF_MPLS_BOS, "OXM_OF_MPLS_BOS", OFPUTIL_P_NXM_OXM_ANY, OFPUTIL_P_NONE, + -1, }, /* ## -- ## */ @@ -361,6 +411,7 @@ const struct mf_field mf_fields[MFF_N_IDS] = { 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), @@ -372,6 +423,7 @@ const struct mf_field mf_fields[MFF_N_IDS] = { OXM_OF_IPV4_DST, "OXM_OF_IPV4_DST", OFPUTIL_P_ANY, OFPUTIL_P_NXM_OF11_UP, + FLOW_U32OFS(nw_dst), }, { @@ -385,6 +437,7 @@ const struct mf_field mf_fields[MFF_N_IDS] = { 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), @@ -396,6 +449,7 @@ const struct mf_field mf_fields[MFF_N_IDS] = { 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, @@ -408,6 +462,7 @@ const struct mf_field mf_fields[MFF_N_IDS] = { OXM_OF_IPV6_FLABEL, "OXM_OF_IPV6_FLABEL", OFPUTIL_P_NXM_OXM_ANY, OFPUTIL_P_NXM_OXM_ANY, + -1, }, { @@ -421,6 +476,7 @@ const struct mf_field mf_fields[MFF_N_IDS] = { 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), @@ -432,6 +488,7 @@ const struct mf_field mf_fields[MFF_N_IDS] = { NXM_OF_IP_TOS, "NXM_OF_IP_TOS", OFPUTIL_P_ANY, /* Will be shifted for OXM. */ OFPUTIL_P_NONE, + -1, }, { MFF_IP_DSCP_SHIFTED, "ip_dscp", NULL, 1, 6, @@ -443,6 +500,7 @@ const struct mf_field mf_fields[MFF_N_IDS] = { 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", "ip_ecn", 1, 2, @@ -454,6 +512,7 @@ const struct mf_field mf_fields[MFF_N_IDS] = { 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), @@ -465,6 +524,7 @@ const struct mf_field mf_fields[MFF_N_IDS] = { 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, @@ -476,6 +536,7 @@ const struct mf_field mf_fields[MFF_N_IDS] = { NXM_NX_IP_FRAG, "NXM_NX_IP_FRAG", OFPUTIL_P_NXM_OXM_ANY, OFPUTIL_P_NXM_OXM_ANY, + -1, }, { @@ -489,6 +550,7 @@ const struct mf_field mf_fields[MFF_N_IDS] = { 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), @@ -500,6 +562,7 @@ const struct mf_field mf_fields[MFF_N_IDS] = { 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), @@ -511,6 +574,7 @@ const struct mf_field mf_fields[MFF_N_IDS] = { 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), @@ -522,6 +586,7 @@ const struct mf_field mf_fields[MFF_N_IDS] = { 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), @@ -533,6 +598,7 @@ const struct mf_field mf_fields[MFF_N_IDS] = { OXM_OF_ARP_THA, "OXM_OF_ARP_THA", OFPUTIL_P_NXM_OXM_ANY, OFPUTIL_P_NXM_OXM_ANY, + -1, }, /* ## -- ## */ @@ -550,6 +616,7 @@ const struct mf_field mf_fields[MFF_N_IDS] = { 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), @@ -561,17 +628,19 @@ const struct mf_field mf_fields[MFF_N_IDS] = { 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_HEXADECIMAL, + 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, }, { @@ -585,6 +654,7 @@ const struct mf_field mf_fields[MFF_N_IDS] = { 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), @@ -596,6 +666,7 @@ const struct mf_field mf_fields[MFF_N_IDS] = { OXM_OF_UDP_DST, "OXM_OF_UDP_DST", OFPUTIL_P_ANY, OFPUTIL_P_NXM_OXM_ANY, + -1, }, { @@ -609,6 +680,7 @@ const struct mf_field mf_fields[MFF_N_IDS] = { 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), @@ -620,6 +692,7 @@ const struct mf_field mf_fields[MFF_N_IDS] = { OXM_OF_SCTP_DST, "OXM_OF_SCTP_DST", OFPUTIL_P_NXM_OF11_UP, OFPUTIL_P_NXM_OXM_ANY, + -1, }, { @@ -633,6 +706,7 @@ const struct mf_field mf_fields[MFF_N_IDS] = { 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), @@ -644,6 +718,7 @@ const struct mf_field mf_fields[MFF_N_IDS] = { OXM_OF_ICMPV4_CODE, "OXM_OF_ICMPV4_CODE", OFPUTIL_P_ANY, OFPUTIL_P_NONE, + -1, }, { @@ -657,6 +732,7 @@ const struct mf_field mf_fields[MFF_N_IDS] = { 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), @@ -668,6 +744,7 @@ const struct mf_field mf_fields[MFF_N_IDS] = { OXM_OF_ICMPV6_CODE, "OXM_OF_ICMPV6_CODE", OFPUTIL_P_NXM_OXM_ANY, OFPUTIL_P_NONE, + -1, }, /* ## ---- ## */ @@ -685,6 +762,7 @@ const struct mf_field mf_fields[MFF_N_IDS] = { 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), @@ -696,6 +774,7 @@ const struct mf_field mf_fields[MFF_N_IDS] = { 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), @@ -707,6 +786,7 @@ const struct mf_field mf_fields[MFF_N_IDS] = { OXM_OF_IPV6_ND_TLL, "OXM_OF_IPV6_ND_TLL", OFPUTIL_P_NXM_OXM_ANY, OFPUTIL_P_NXM_OXM_ANY, + -1, } }; @@ -823,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: @@ -870,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; @@ -929,7 +1013,7 @@ mf_is_all_wild(const struct mf_field *mf, const struct flow_wildcards *wc) case MFF_N_IDS: default: - NOT_REACHED(); + OVS_NOT_REACHED(); } } @@ -960,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. */ @@ -1025,7 +1095,7 @@ 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. @@ -1082,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: @@ -1164,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(); } } @@ -1175,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; @@ -1246,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: @@ -1355,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(); } } @@ -1367,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; @@ -1442,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: @@ -1551,7 +1635,7 @@ mf_set_value(const struct mf_field *mf, case MFF_N_IDS: default: - NOT_REACHED(); + OVS_NOT_REACHED(); } } @@ -1580,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; @@ -1655,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: @@ -1710,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: @@ -1767,7 +1857,7 @@ mf_set_flow_value(const struct mf_field *mf, case MFF_N_IDS: default: - NOT_REACHED(); + OVS_NOT_REACHED(); } } @@ -1792,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; @@ -1865,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: @@ -1975,7 +2073,7 @@ mf_set_wild(const struct mf_field *mf, struct match *match) case MFF_N_IDS: default: - NOT_REACHED(); + OVS_NOT_REACHED(); } } @@ -2004,6 +2102,7 @@ mf_set(const struct mf_field *mf, } switch (mf->id) { + case MFF_RECIRC_ID: case MFF_IN_PORT: case MFF_IN_PORT_OXM: case MFF_SKB_PRIORITY: @@ -2026,6 +2125,9 @@ mf_set(const struct mf_field *mf, case MFF_ICMPV6_CODE: 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; @@ -2143,7 +2245,7 @@ mf_set(const struct mf_field *mf, case MFF_N_IDS: default: - NOT_REACHED(); + OVS_NOT_REACHED(); } return mf->usable_protocols_bitwise; @@ -2215,115 +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_PKT_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_SCTP_SRC: - case MFF_SCTP_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_TCP_FLAGS: - value->be16 &= htons(0x0fff); - 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) @@ -2373,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; } @@ -2397,11 +2390,10 @@ 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); @@ -2410,7 +2402,7 @@ mf_from_ipv4_string(const struct mf_field *mf, const char *s, } else { *mask = htonl(((1u << prefix) - 1) << (32 - prefix)); } - } else if (sscanf(s, IP_SCAN_FMT, IP_SCAN_ARGS(ip)) == IP_SCAN_COUNT) { + } else if (ovs_scan(s, IP_SCAN_FMT, IP_SCAN_ARGS(ip))) { *mask = OVS_BE32_MAX; } else { return xasprintf("%s: invalid IP address", s); @@ -2548,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; } @@ -2594,9 +2585,84 @@ mf_from_tun_flags_string(const char *s, ovs_be16 *valuep, ovs_be16 *maskp) } 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 * @@ -2647,8 +2713,13 @@ mf_parse(const struct mf_field *mf, const char *s, 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: - NOT_REACHED(); + OVS_NOT_REACHED(); } if (!error && !mf_is_mask_valid(mf, mask)) { @@ -2733,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 @@ -2789,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(); } } @@ -2941,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;