X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fmeta-flow.c;h=6f7a3aac48142b6f38057efd370571f25df5d374;hb=d978fa4832bbc5176e05edd05bcdf2452a8dded2;hp=8bc3d1a59e89d6bc057ee5a74c99e5fa72b0a4cd;hpb=32455024044444678a8d500d716dad7fb77e18d0;p=sliver-openvswitch.git diff --git a/lib/meta-flow.c b/lib/meta-flow.c index 8bc3d1a59..6f7a3aac4 100644 --- a/lib/meta-flow.c +++ b/lib/meta-flow.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012 Nicira, Inc. + * Copyright (c) 2011, 2012, 2013 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,7 +18,6 @@ #include "meta-flow.h" -#include #include #include #include @@ -49,16 +48,61 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { { MFF_TUN_ID, "tun_id", NULL, MF_FIELD_SIZES(be64), - MFM_FULLY, 0, + MFM_FULLY, MFS_HEXADECIMAL, MFP_NONE, true, NXM_NX_TUN_ID, "NXM_NX_TUN_ID", - NXM_NX_TUN_ID, "NXM_NX_TUN_ID", + OXM_OF_TUNNEL_ID, "OXM_OF_TUNNEL_ID", + }, { + MFF_TUN_SRC, "tun_src", NULL, + MF_FIELD_SIZES(be32), + MFM_NONE, + MFS_IPV4, + MFP_NONE, + false, + 0, NULL, + 0, NULL, + }, { + MFF_TUN_DST, "tun_dst", NULL, + MF_FIELD_SIZES(be32), + MFM_NONE, + MFS_IPV4, + MFP_NONE, + false, + 0, NULL, + 0, NULL, + }, { + MFF_TUN_FLAGS, "tun_flags", NULL, + MF_FIELD_SIZES(be16), + MFM_NONE, + MFS_TNL_FLAGS, + MFP_NONE, + false, + 0, NULL, + 0, NULL, + }, { + MFF_TUN_TOS, "tun_tos", NULL, + MF_FIELD_SIZES(u8), + MFM_NONE, + MFS_DECIMAL, + MFP_NONE, + false, + 0, NULL, + 0, NULL, + }, { + MFF_TUN_TTL, "tun_ttl", NULL, + MF_FIELD_SIZES(u8), + MFM_NONE, + MFS_DECIMAL, + MFP_NONE, + false, + 0, NULL, + 0, NULL, }, { MFF_METADATA, "metadata", NULL, MF_FIELD_SIZES(be64), - MFM_FULLY, 0, + MFM_FULLY, MFS_HEXADECIMAL, MFP_NONE, true, @@ -67,19 +111,37 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { }, { MFF_IN_PORT, "in_port", NULL, MF_FIELD_SIZES(be16), - MFM_NONE, FWW_IN_PORT, + MFM_NONE, MFS_OFP_PORT, MFP_NONE, false, NXM_OF_IN_PORT, "NXM_OF_IN_PORT", OXM_OF_IN_PORT, "OXM_OF_IN_PORT", + }, { + MFF_SKB_PRIORITY, "skb_priority", NULL, + MF_FIELD_SIZES(be32), + MFM_NONE, + MFS_HEXADECIMAL, + MFP_NONE, + false, + 0, NULL, + 0, NULL, + }, { + MFF_SKB_MARK, "skb_mark", NULL, + MF_FIELD_SIZES(be32), + MFM_NONE, + MFS_HEXADECIMAL, + MFP_NONE, + false, + 0, NULL, + 0, NULL, }, #define REGISTER(IDX) \ { \ MFF_REG##IDX, "reg" #IDX, NULL, \ MF_FIELD_SIZES(be32), \ - MFM_FULLY, 0, \ + MFM_FULLY, \ MFS_HEXADECIMAL, \ MFP_NONE, \ true, \ @@ -121,7 +183,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { { MFF_ETH_SRC, "eth_src", "dl_src", MF_FIELD_SIZES(mac), - MFM_FULLY, 0, + MFM_FULLY, MFS_ETHERNET, MFP_NONE, true, @@ -130,7 +192,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { }, { MFF_ETH_DST, "eth_dst", "dl_dst", MF_FIELD_SIZES(mac), - MFM_FULLY, 0, + MFM_FULLY, MFS_ETHERNET, MFP_NONE, true, @@ -139,7 +201,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { }, { MFF_ETH_TYPE, "eth_type", "dl_type", MF_FIELD_SIZES(be16), - MFM_NONE, FWW_DL_TYPE, + MFM_NONE, MFS_HEXADECIMAL, MFP_NONE, false, @@ -150,32 +212,82 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { { MFF_VLAN_TCI, "vlan_tci", NULL, MF_FIELD_SIZES(be16), - MFM_FULLY, 0, + MFM_FULLY, MFS_HEXADECIMAL, MFP_NONE, true, NXM_OF_VLAN_TCI, "NXM_OF_VLAN_TCI", NXM_OF_VLAN_TCI, "NXM_OF_VLAN_TCI", }, { - MFF_VLAN_VID, "dl_vlan", NULL, + MFF_DL_VLAN, "dl_vlan", NULL, + sizeof(ovs_be16), 12, + MFM_NONE, + MFS_DECIMAL, + MFP_NONE, + true, + 0, NULL, + 0, NULL, + }, { + MFF_VLAN_VID, "vlan_vid", NULL, sizeof(ovs_be16), 12, - MFM_NONE, 0, + MFM_FULLY, MFS_DECIMAL, MFP_NONE, true, OXM_OF_VLAN_VID, "OXM_OF_VLAN_VID", OXM_OF_VLAN_VID, "OXM_OF_VLAN_VID", }, { - MFF_VLAN_PCP, "dl_vlan_pcp", NULL, + MFF_DL_VLAN_PCP, "dl_vlan_pcp", NULL, 1, 3, - MFM_NONE, 0, + MFM_NONE, MFS_DECIMAL, MFP_NONE, true, + 0, NULL, + 0, NULL, + }, { + MFF_VLAN_PCP, "vlan_pcp", NULL, + 1, 3, + MFM_NONE, + MFS_DECIMAL, + MFP_VLAN_VID, + true, OXM_OF_VLAN_PCP, "OXM_OF_VLAN_PCP", OXM_OF_VLAN_PCP, "OXM_OF_VLAN_PCP", }, + /* ## ---- ## */ + /* ## L2.5 ## */ + /* ## ---- ## */ + { + MFF_MPLS_LABEL, "mpls_label", NULL, + 4, 20, + MFM_NONE, + MFS_DECIMAL, + MFP_MPLS, + true, + OXM_OF_MPLS_LABEL, "OXM_OF_MPLS_LABEL", + OXM_OF_MPLS_LABEL, "OXM_OF_MPLS_LABEL", + }, { + MFF_MPLS_TC, "mpls_tc", NULL, + 1, 3, + MFM_NONE, + MFS_DECIMAL, + MFP_MPLS, + true, + OXM_OF_MPLS_TC, "OXM_OF_MPLS_TC", + OXM_OF_MPLS_TC, "OXM_OF_MPLS_TC", + }, { + MFF_MPLS_BOS, "mpls_bos", NULL, + 1, 1, + MFM_NONE, + MFS_DECIMAL, + MFP_MPLS, + false, + OXM_OF_MPLS_BOS, "OXM_OF_MPLS_BOS", + OXM_OF_MPLS_BOS, "OXM_OF_MPLS_BOS", + }, + /* ## -- ## */ /* ## L3 ## */ /* ## -- ## */ @@ -183,7 +295,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { { MFF_IPV4_SRC, "ip_src", "nw_src", MF_FIELD_SIZES(be32), - MFM_FULLY, 0, + MFM_FULLY, MFS_IPV4, MFP_IPV4, true, @@ -192,7 +304,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { }, { MFF_IPV4_DST, "ip_dst", "nw_dst", MF_FIELD_SIZES(be32), - MFM_FULLY, 0, + MFM_FULLY, MFS_IPV4, MFP_IPV4, true, @@ -203,7 +315,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { { MFF_IPV6_SRC, "ipv6_src", NULL, MF_FIELD_SIZES(ipv6), - MFM_FULLY, 0, + MFM_FULLY, MFS_IPV6, MFP_IPV6, true, @@ -212,7 +324,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { }, { MFF_IPV6_DST, "ipv6_dst", NULL, MF_FIELD_SIZES(ipv6), - MFM_FULLY, 0, + MFM_FULLY, MFS_IPV6, MFP_IPV6, true, @@ -222,7 +334,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { { MFF_IPV6_LABEL, "ipv6_label", NULL, 4, 20, - MFM_FULLY, 0, + MFM_FULLY, MFS_HEXADECIMAL, MFP_IPV6, false, @@ -233,7 +345,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { { MFF_IP_PROTO, "nw_proto", NULL, MF_FIELD_SIZES(u8), - MFM_NONE, FWW_NW_PROTO, + MFM_NONE, MFS_DECIMAL, MFP_IP_ANY, false, @@ -242,7 +354,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { }, { MFF_IP_DSCP, "nw_tos", NULL, MF_FIELD_SIZES(u8), - MFM_NONE, FWW_NW_DSCP, + MFM_NONE, MFS_DECIMAL, MFP_IP_ANY, true, @@ -251,7 +363,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { }, { MFF_IP_ECN, "nw_ecn", NULL, 1, 2, - MFM_NONE, FWW_NW_ECN, + MFM_NONE, MFS_DECIMAL, MFP_IP_ANY, true, @@ -260,7 +372,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { }, { MFF_IP_TTL, "nw_ttl", NULL, MF_FIELD_SIZES(u8), - MFM_NONE, FWW_NW_TTL, + MFM_NONE, MFS_DECIMAL, MFP_IP_ANY, true, @@ -269,7 +381,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { }, { MFF_IP_FRAG, "ip_frag", NULL, 1, 2, - MFM_FULLY, 0, + MFM_FULLY, MFS_FRAG, MFP_IP_ANY, false, @@ -280,7 +392,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { { MFF_ARP_OP, "arp_op", NULL, MF_FIELD_SIZES(be16), - MFM_NONE, FWW_NW_PROTO, + MFM_NONE, MFS_DECIMAL, MFP_ARP, false, @@ -289,7 +401,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { }, { MFF_ARP_SPA, "arp_spa", NULL, MF_FIELD_SIZES(be32), - MFM_FULLY, 0, + MFM_FULLY, MFS_IPV4, MFP_ARP, false, @@ -298,7 +410,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { }, { MFF_ARP_TPA, "arp_tpa", NULL, MF_FIELD_SIZES(be32), - MFM_FULLY, 0, + MFM_FULLY, MFS_IPV4, MFP_ARP, false, @@ -307,7 +419,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { }, { MFF_ARP_SHA, "arp_sha", NULL, MF_FIELD_SIZES(mac), - MFM_NONE, FWW_ARP_SHA, + MFM_FULLY, MFS_ETHERNET, MFP_ARP, false, @@ -316,7 +428,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { }, { MFF_ARP_THA, "arp_tha", NULL, MF_FIELD_SIZES(mac), - MFM_NONE, FWW_ARP_THA, + MFM_FULLY, MFS_ETHERNET, MFP_ARP, false, @@ -331,7 +443,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { { MFF_TCP_SRC, "tcp_src", "tp_src", MF_FIELD_SIZES(be16), - MFM_FULLY, 0, + MFM_FULLY, MFS_DECIMAL, MFP_TCP, true, @@ -340,7 +452,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { }, { MFF_TCP_DST, "tcp_dst", "tp_dst", MF_FIELD_SIZES(be16), - MFM_FULLY, 0, + MFM_FULLY, MFS_DECIMAL, MFP_TCP, true, @@ -351,7 +463,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { { MFF_UDP_SRC, "udp_src", NULL, MF_FIELD_SIZES(be16), - MFM_FULLY, 0, + MFM_FULLY, MFS_DECIMAL, MFP_UDP, true, @@ -360,7 +472,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { }, { MFF_UDP_DST, "udp_dst", NULL, MF_FIELD_SIZES(be16), - MFM_FULLY, 0, + MFM_FULLY, MFS_DECIMAL, MFP_UDP, true, @@ -371,7 +483,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { { MFF_ICMPV4_TYPE, "icmp_type", NULL, MF_FIELD_SIZES(u8), - MFM_NONE, 0, + MFM_NONE, MFS_DECIMAL, MFP_ICMPV4, false, @@ -380,7 +492,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { }, { MFF_ICMPV4_CODE, "icmp_code", NULL, MF_FIELD_SIZES(u8), - MFM_NONE, 0, + MFM_NONE, MFS_DECIMAL, MFP_ICMPV4, false, @@ -391,7 +503,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { { MFF_ICMPV6_TYPE, "icmpv6_type", NULL, MF_FIELD_SIZES(u8), - MFM_NONE, 0, + MFM_NONE, MFS_DECIMAL, MFP_ICMPV6, false, @@ -400,7 +512,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { }, { MFF_ICMPV6_CODE, "icmpv6_code", NULL, MF_FIELD_SIZES(u8), - MFM_NONE, 0, + MFM_NONE, MFS_DECIMAL, MFP_ICMPV6, false, @@ -415,7 +527,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { { MFF_ND_TARGET, "nd_target", NULL, MF_FIELD_SIZES(ipv6), - MFM_FULLY, 0, + MFM_FULLY, MFS_IPV6, MFP_ND, false, @@ -424,7 +536,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { }, { MFF_ND_SLL, "nd_sll", NULL, MF_FIELD_SIZES(mac), - MFM_NONE, FWW_ARP_SHA, + MFM_FULLY, MFS_ETHERNET, MFP_ND_SOLICIT, false, @@ -433,7 +545,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { }, { MFF_ND_TLL, "nd_tll", NULL, MF_FIELD_SIZES(mac), - MFM_NONE, FWW_ARP_THA, + MFM_FULLY, MFS_ETHERNET, MFP_ND_ADVERT, false, @@ -462,7 +574,7 @@ const struct mf_field *mf_from_nxm_header__(uint32_t header); const struct mf_field * mf_from_id(enum mf_field_id id) { - assert((unsigned int) id < MFF_N_IDS); + ovs_assert((unsigned int) id < MFF_N_IDS); return &mf_fields[id]; } @@ -502,7 +614,7 @@ static void nxm_init_add_field(const struct mf_field *mf, uint32_t header) { if (header) { - assert(!mf_from_nxm_header__(header)); + ovs_assert(!mf_from_nxm_header__(header)); add_nxm_field(header, mf); if (mf->maskable != MFM_NONE) { add_nxm_field(NXM_MAKE_WILD_HEADER(header), mf); @@ -555,74 +667,101 @@ bool mf_is_all_wild(const struct mf_field *mf, const struct flow_wildcards *wc) { switch (mf->id) { - case MFF_IN_PORT: - case MFF_ETH_TYPE: - case MFF_IP_PROTO: - case MFF_IP_DSCP: - case MFF_IP_ECN: - case MFF_IP_TTL: - case MFF_ARP_OP: - case MFF_ARP_SHA: - case MFF_ARP_THA: - case MFF_ND_SLL: - case MFF_ND_TLL: - assert(mf->fww_bit != 0); - return (wc->wildcards & mf->fww_bit) != 0; - case MFF_TUN_ID: - return !wc->tun_id_mask; + case MFF_TUN_SRC: + case MFF_TUN_DST: + case MFF_TUN_TOS: + case MFF_TUN_TTL: + case MFF_TUN_FLAGS: + return !wc->masks.tunnel.tun_id; case MFF_METADATA: - return !wc->metadata_mask; - + return !wc->masks.metadata; + case MFF_IN_PORT: + return !wc->masks.in_port; + case MFF_SKB_PRIORITY: + return !wc->masks.skb_priority; + case MFF_SKB_MARK: + return !wc->masks.skb_mark; CASE_MFF_REGS: - return !wc->reg_masks[mf->id - MFF_REG0]; + return !wc->masks.regs[mf->id - MFF_REG0]; case MFF_ETH_SRC: - return eth_addr_is_zero(wc->dl_src_mask); + return eth_addr_is_zero(wc->masks.dl_src); case MFF_ETH_DST: - return eth_addr_is_zero(wc->dl_dst_mask); + return eth_addr_is_zero(wc->masks.dl_dst); + case MFF_ETH_TYPE: + return !wc->masks.dl_type; + + case MFF_ARP_SHA: + case MFF_ND_SLL: + return eth_addr_is_zero(wc->masks.arp_sha); + + case MFF_ARP_THA: + case MFF_ND_TLL: + return eth_addr_is_zero(wc->masks.arp_tha); case MFF_VLAN_TCI: - return !wc->vlan_tci_mask; + return !wc->masks.vlan_tci; + case MFF_DL_VLAN: + return !(wc->masks.vlan_tci & htons(VLAN_VID_MASK)); case MFF_VLAN_VID: - return !(wc->vlan_tci_mask & htons(VLAN_VID_MASK)); + return !(wc->masks.vlan_tci & htons(VLAN_VID_MASK | VLAN_CFI)); + case MFF_DL_VLAN_PCP: case MFF_VLAN_PCP: - return !(wc->vlan_tci_mask & htons(VLAN_PCP_MASK)); + return !(wc->masks.vlan_tci & htons(VLAN_PCP_MASK)); + + case MFF_MPLS_LABEL: + return !(wc->masks.mpls_lse & htonl(MPLS_LABEL_MASK)); + case MFF_MPLS_TC: + return !(wc->masks.mpls_lse & htonl(MPLS_TC_MASK)); + case MFF_MPLS_BOS: + return !(wc->masks.mpls_lse & htonl(MPLS_BOS_MASK)); case MFF_IPV4_SRC: - return !wc->nw_src_mask; + return !wc->masks.nw_src; case MFF_IPV4_DST: - return !wc->nw_dst_mask; + return !wc->masks.nw_dst; case MFF_IPV6_SRC: - return ipv6_mask_is_any(&wc->ipv6_src_mask); + return ipv6_mask_is_any(&wc->masks.ipv6_src); case MFF_IPV6_DST: - return ipv6_mask_is_any(&wc->ipv6_dst_mask); + return ipv6_mask_is_any(&wc->masks.ipv6_dst); case MFF_IPV6_LABEL: - return !wc->ipv6_label_mask; + return !wc->masks.ipv6_label; + + case MFF_IP_PROTO: + return !wc->masks.nw_proto; + case MFF_IP_DSCP: + return !(wc->masks.nw_tos & IP_DSCP_MASK); + case MFF_IP_ECN: + return !(wc->masks.nw_tos & IP_ECN_MASK); + case MFF_IP_TTL: + return !wc->masks.nw_ttl; case MFF_ND_TARGET: - return ipv6_mask_is_any(&wc->nd_target_mask); + return ipv6_mask_is_any(&wc->masks.nd_target); case MFF_IP_FRAG: - return !(wc->nw_frag_mask & FLOW_NW_FRAG_MASK); + return !(wc->masks.nw_frag & FLOW_NW_FRAG_MASK); + case MFF_ARP_OP: + return !wc->masks.nw_proto; case MFF_ARP_SPA: - return !wc->nw_src_mask; + return !wc->masks.nw_src; case MFF_ARP_TPA: - return !wc->nw_dst_mask; + return !wc->masks.nw_dst; case MFF_TCP_SRC: case MFF_UDP_SRC: case MFF_ICMPV4_TYPE: case MFF_ICMPV6_TYPE: - return !wc->tp_src_mask; + return !wc->masks.tp_src; case MFF_TCP_DST: case MFF_UDP_DST: case MFF_ICMPV4_CODE: case MFF_ICMPV6_CODE: - return !wc->tp_dst_mask; + return !wc->masks.tp_dst; case MFF_N_IDS: default: @@ -640,103 +779,7 @@ void mf_get_mask(const struct mf_field *mf, const struct flow_wildcards *wc, union mf_value *mask) { - switch (mf->id) { - case MFF_IN_PORT: - case MFF_ETH_TYPE: - case MFF_IP_PROTO: - case MFF_IP_DSCP: - case MFF_IP_ECN: - case MFF_IP_TTL: - case MFF_IPV6_LABEL: - case MFF_ARP_OP: - case MFF_ARP_SHA: - case MFF_ARP_THA: - case MFF_ND_SLL: - case MFF_ND_TLL: - assert(mf->fww_bit != 0); - memset(mask, wc->wildcards & mf->fww_bit ? 0x00 : 0xff, mf->n_bytes); - break; - - case MFF_TUN_ID: - mask->be64 = wc->tun_id_mask; - break; - case MFF_METADATA: - mask->be64 = wc->metadata_mask; - break; - - CASE_MFF_REGS: - mask->be32 = htonl(wc->reg_masks[mf->id - MFF_REG0]); - break; - - case MFF_ETH_DST: - memcpy(mask->mac, wc->dl_dst_mask, ETH_ADDR_LEN); - break; - - case MFF_ETH_SRC: - memcpy(mask->mac, wc->dl_src_mask, ETH_ADDR_LEN); - break; - - case MFF_VLAN_TCI: - mask->be16 = wc->vlan_tci_mask; - break; - case MFF_VLAN_VID: - mask->be16 = wc->vlan_tci_mask & htons(VLAN_VID_MASK); - break; - case MFF_VLAN_PCP: - mask->u8 = vlan_tci_to_pcp(wc->vlan_tci_mask); - break; - - case MFF_IPV4_SRC: - mask->be32 = wc->nw_src_mask; - break; - case MFF_IPV4_DST: - mask->be32 = wc->nw_dst_mask; - break; - - case MFF_IPV6_SRC: - mask->ipv6 = wc->ipv6_src_mask; - break; - case MFF_IPV6_DST: - mask->ipv6 = wc->ipv6_dst_mask; - break; - - case MFF_ND_TARGET: - mask->ipv6 = wc->nd_target_mask; - break; - - case MFF_IP_FRAG: - mask->u8 = wc->nw_frag_mask & FLOW_NW_FRAG_MASK; - break; - - case MFF_ARP_SPA: - mask->be32 = wc->nw_src_mask; - break; - case MFF_ARP_TPA: - mask->be32 = wc->nw_dst_mask; - break; - - case MFF_TCP_SRC: - case MFF_UDP_SRC: - mask->be16 = wc->tp_src_mask; - break; - case MFF_TCP_DST: - case MFF_UDP_DST: - mask->be16 = wc->tp_dst_mask; - break; - - case MFF_ICMPV4_TYPE: - case MFF_ICMPV6_TYPE: - mask->u8 = ntohs(wc->tp_src_mask); - break; - case MFF_ICMPV4_CODE: - case MFF_ICMPV6_CODE: - mask->u8 = ntohs(wc->tp_dst_mask); - break; - - case MFF_N_IDS: - default: - NOT_REACHED(); - } + mf_get_value(mf, &wc->masks, mask); } /* Tests whether 'mask' is a valid wildcard bit pattern for 'mf'. Returns true @@ -756,13 +799,6 @@ mf_is_mask_valid(const struct mf_field *mf, const union mf_value *mask) NOT_REACHED(); } -static bool -is_ip_any(const struct flow *flow) -{ - return (flow->dl_type == htons(ETH_TYPE_IP) || - flow->dl_type == htons(ETH_TYPE_IPV6)); -} - static bool is_icmpv4(const struct flow *flow) { @@ -786,11 +822,16 @@ mf_are_prereqs_ok(const struct mf_field *mf, const struct flow *flow) return true; case MFP_ARP: - return flow->dl_type == htons(ETH_TYPE_ARP); + return (flow->dl_type == htons(ETH_TYPE_ARP) || + flow->dl_type == htons(ETH_TYPE_RARP)); case MFP_IPV4: return flow->dl_type == htons(ETH_TYPE_IP); case MFP_IPV6: return flow->dl_type == htons(ETH_TYPE_IPV6); + case MFP_VLAN_VID: + return (flow->vlan_tci & htons(VLAN_CFI)) != 0; + case MFP_MPLS: + return eth_type_mpls(flow->dl_type); case MFP_IP_ANY: return is_ip_any(flow); @@ -836,8 +877,15 @@ mf_is_value_valid(const struct mf_field *mf, const union mf_value *value) { 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_PRIORITY: + case MFF_SKB_MARK: CASE_MFF_REGS: case MFF_ETH_SRC: case MFF_ETH_DST: @@ -876,15 +924,27 @@ mf_is_value_valid(const struct mf_field *mf, const union mf_value *value) case MFF_ARP_OP: return !(value->be16 & htons(0xff00)); - case MFF_VLAN_VID: + case MFF_DL_VLAN: return !(value->be16 & htons(VLAN_CFI | VLAN_PCP_MASK)); + case MFF_VLAN_VID: + return !(value->be16 & htons(VLAN_PCP_MASK)); + case MFF_DL_VLAN_PCP: case MFF_VLAN_PCP: return !(value->u8 & ~(VLAN_PCP_MASK >> VLAN_PCP_SHIFT)); case MFF_IPV6_LABEL: return !(value->be32 & ~htonl(IPV6_LABEL_MASK)); + case MFF_MPLS_LABEL: + return !(value->be32 & ~htonl(MPLS_LABEL_MASK >> MPLS_LABEL_SHIFT)); + + case MFF_MPLS_TC: + return !(value->u8 & ~(MPLS_TC_MASK >> MPLS_TC_SHIFT)); + + case MFF_MPLS_BOS: + return !(value->u8 & ~(MPLS_BOS_MASK >> MPLS_BOS_SHIFT)); + case MFF_N_IDS: default: NOT_REACHED(); @@ -899,8 +959,24 @@ mf_get_value(const struct mf_field *mf, const struct flow *flow, { switch (mf->id) { case MFF_TUN_ID: - value->be64 = flow->tun_id; + value->be64 = flow->tunnel.tun_id; + break; + case MFF_TUN_SRC: + value->be32 = flow->tunnel.ip_src; + break; + case MFF_TUN_DST: + value->be32 = flow->tunnel.ip_dst; break; + case MFF_TUN_FLAGS: + value->be16 = htons(flow->tunnel.flags); + break; + case MFF_TUN_TTL: + value->u8 = flow->tunnel.ip_ttl; + break; + case MFF_TUN_TOS: + value->u8 = flow->tunnel.ip_tos; + break; + case MFF_METADATA: value->be64 = flow->metadata; break; @@ -909,6 +985,14 @@ mf_get_value(const struct mf_field *mf, const struct flow *flow, value->be16 = htons(flow->in_port); break; + case MFF_SKB_PRIORITY: + value->be32 = htonl(flow->skb_priority); + break; + + case MFF_SKB_MARK: + value->be32 = htonl(flow->skb_mark); + break; + CASE_MFF_REGS: value->be32 = htonl(flow->regs[mf->id - MFF_REG0]); break; @@ -929,14 +1013,30 @@ mf_get_value(const struct mf_field *mf, const struct flow *flow, value->be16 = flow->vlan_tci; break; - case MFF_VLAN_VID: + case MFF_DL_VLAN: value->be16 = flow->vlan_tci & htons(VLAN_VID_MASK); break; + case MFF_VLAN_VID: + value->be16 = flow->vlan_tci & htons(VLAN_VID_MASK | VLAN_CFI); + break; + case MFF_DL_VLAN_PCP: case MFF_VLAN_PCP: value->u8 = vlan_tci_to_pcp(flow->vlan_tci); break; + case MFF_MPLS_LABEL: + value->be32 = htonl(mpls_lse_to_label(flow->mpls_lse)); + break; + + case MFF_MPLS_TC: + value->u8 = mpls_lse_to_tc(flow->mpls_lse); + break; + + case MFF_MPLS_BOS: + value->u8 = mpls_lse_to_bos(flow->mpls_lse); + break; + case MFF_IPV4_SRC: value->be32 = flow->nw_src; break; @@ -1029,137 +1129,177 @@ mf_get_value(const struct mf_field *mf, const struct flow *flow, } } -/* Makes 'rule' match field 'mf' exactly, with the value matched taken from - * 'value'. The caller is responsible for ensuring that 'rule' meets 'mf''s +/* Makes 'match' match field 'mf' exactly, with the value matched taken from + * 'value'. The caller is responsible for ensuring that 'match' meets 'mf''s * prerequisites. */ void mf_set_value(const struct mf_field *mf, - const union mf_value *value, struct cls_rule *rule) + const union mf_value *value, struct match *match) { switch (mf->id) { case MFF_TUN_ID: - cls_rule_set_tun_id(rule, value->be64); + match_set_tun_id(match, value->be64); + break; + case MFF_TUN_SRC: + match_set_tun_src(match, value->be32); + break; + case MFF_TUN_DST: + match_set_tun_dst(match, value->be32); + break; + case MFF_TUN_FLAGS: + match_set_tun_flags(match, ntohs(value->be16)); break; + case MFF_TUN_TOS: + match_set_tun_tos(match, value->u8); + break; + case MFF_TUN_TTL: + match_set_tun_ttl(match, value->u8); + break; + case MFF_METADATA: - cls_rule_set_metadata(rule, value->be64); + match_set_metadata(match, value->be64); break; case MFF_IN_PORT: - cls_rule_set_in_port(rule, ntohs(value->be16)); + match_set_in_port(match, ntohs(value->be16)); + break; + + case MFF_SKB_PRIORITY: + match_set_skb_priority(match, ntohl(value->be32)); + break; + + case MFF_SKB_MARK: + match_set_skb_mark(match, ntohl(value->be32)); break; CASE_MFF_REGS: - cls_rule_set_reg(rule, mf->id - MFF_REG0, ntohl(value->be32)); + match_set_reg(match, mf->id - MFF_REG0, ntohl(value->be32)); break; case MFF_ETH_SRC: - cls_rule_set_dl_src(rule, value->mac); + match_set_dl_src(match, value->mac); break; case MFF_ETH_DST: - cls_rule_set_dl_dst(rule, value->mac); + match_set_dl_dst(match, value->mac); break; case MFF_ETH_TYPE: - cls_rule_set_dl_type(rule, value->be16); + match_set_dl_type(match, value->be16); break; case MFF_VLAN_TCI: - cls_rule_set_dl_tci(rule, value->be16); + match_set_dl_tci(match, value->be16); break; + case MFF_DL_VLAN: + match_set_dl_vlan(match, value->be16); + break; case MFF_VLAN_VID: - cls_rule_set_dl_vlan(rule, value->be16); + match_set_vlan_vid(match, value->be16); break; + case MFF_DL_VLAN_PCP: case MFF_VLAN_PCP: - cls_rule_set_dl_vlan_pcp(rule, value->u8); + match_set_dl_vlan_pcp(match, value->u8); + break; + + case MFF_MPLS_LABEL: + match_set_mpls_label(match, value->be32); + break; + + case MFF_MPLS_TC: + match_set_mpls_tc(match, value->u8); + break; + + case MFF_MPLS_BOS: + match_set_mpls_bos(match, value->u8); break; case MFF_IPV4_SRC: - cls_rule_set_nw_src(rule, value->be32); + match_set_nw_src(match, value->be32); break; case MFF_IPV4_DST: - cls_rule_set_nw_dst(rule, value->be32); + match_set_nw_dst(match, value->be32); break; case MFF_IPV6_SRC: - cls_rule_set_ipv6_src(rule, &value->ipv6); + match_set_ipv6_src(match, &value->ipv6); break; case MFF_IPV6_DST: - cls_rule_set_ipv6_dst(rule, &value->ipv6); + match_set_ipv6_dst(match, &value->ipv6); break; case MFF_IPV6_LABEL: - cls_rule_set_ipv6_label(rule, value->be32); + match_set_ipv6_label(match, value->be32); break; case MFF_IP_PROTO: - cls_rule_set_nw_proto(rule, value->u8); + match_set_nw_proto(match, value->u8); break; case MFF_IP_DSCP: - cls_rule_set_nw_dscp(rule, value->u8); + match_set_nw_dscp(match, value->u8); break; case MFF_IP_ECN: - cls_rule_set_nw_ecn(rule, value->u8); + match_set_nw_ecn(match, value->u8); break; case MFF_IP_TTL: - cls_rule_set_nw_ttl(rule, value->u8); + match_set_nw_ttl(match, value->u8); break; case MFF_IP_FRAG: - cls_rule_set_nw_frag(rule, value->u8); + match_set_nw_frag(match, value->u8); break; case MFF_ARP_OP: - cls_rule_set_nw_proto(rule, ntohs(value->be16)); + match_set_nw_proto(match, ntohs(value->be16)); break; case MFF_ARP_SPA: - cls_rule_set_nw_src(rule, value->be32); + match_set_nw_src(match, value->be32); break; case MFF_ARP_TPA: - cls_rule_set_nw_dst(rule, value->be32); + match_set_nw_dst(match, value->be32); break; case MFF_ARP_SHA: case MFF_ND_SLL: - cls_rule_set_arp_sha(rule, value->mac); + match_set_arp_sha(match, value->mac); break; case MFF_ARP_THA: case MFF_ND_TLL: - cls_rule_set_arp_tha(rule, value->mac); + match_set_arp_tha(match, value->mac); break; case MFF_TCP_SRC: case MFF_UDP_SRC: - cls_rule_set_tp_src(rule, value->be16); + match_set_tp_src(match, value->be16); break; case MFF_TCP_DST: case MFF_UDP_DST: - cls_rule_set_tp_dst(rule, value->be16); + match_set_tp_dst(match, value->be16); break; case MFF_ICMPV4_TYPE: case MFF_ICMPV6_TYPE: - cls_rule_set_icmp_type(rule, value->u8); + match_set_icmp_type(match, value->u8); break; case MFF_ICMPV4_CODE: case MFF_ICMPV6_CODE: - cls_rule_set_icmp_code(rule, value->u8); + match_set_icmp_code(match, value->u8); break; case MFF_ND_TARGET: - cls_rule_set_nd_target(rule, &value->ipv6); + match_set_nd_target(match, &value->ipv6); break; case MFF_N_IDS: @@ -1168,8 +1308,8 @@ mf_set_value(const struct mf_field *mf, } } -/* Makes 'rule' match field 'mf' exactly, with the value matched taken from - * 'value'. The caller is responsible for ensuring that 'rule' meets 'mf''s +/* Makes 'match' match field 'mf' exactly, with the value matched taken from + * 'value'. The caller is responsible for ensuring that 'match' meets 'mf''s * prerequisites. */ void mf_set_flow_value(const struct mf_field *mf, @@ -1177,8 +1317,24 @@ mf_set_flow_value(const struct mf_field *mf, { switch (mf->id) { case MFF_TUN_ID: - flow->tun_id = value->be64; + flow->tunnel.tun_id = value->be64; + break; + case MFF_TUN_SRC: + flow->tunnel.ip_src = value->be32; break; + case MFF_TUN_DST: + flow->tunnel.ip_dst = value->be32; + break; + case MFF_TUN_FLAGS: + flow->tunnel.flags = ntohs(value->be16); + break; + case MFF_TUN_TOS: + flow->tunnel.ip_tos = value->u8; + break; + case MFF_TUN_TTL: + flow->tunnel.ip_ttl = value->u8; + break; + case MFF_METADATA: flow->metadata = value->be64; break; @@ -1187,6 +1343,14 @@ mf_set_flow_value(const struct mf_field *mf, flow->in_port = ntohs(value->be16); break; + case MFF_SKB_PRIORITY: + flow->skb_priority = ntohl(value->be32); + break; + + case MFF_SKB_MARK: + flow->skb_mark = ntohl(value->be32); + break; + CASE_MFF_REGS: flow->regs[mf->id - MFF_REG0] = ntohl(value->be32); break; @@ -1207,14 +1371,30 @@ mf_set_flow_value(const struct mf_field *mf, flow->vlan_tci = value->be16; break; + case MFF_DL_VLAN: + flow_set_dl_vlan(flow, value->be16); + break; case MFF_VLAN_VID: flow_set_vlan_vid(flow, value->be16); break; + case MFF_DL_VLAN_PCP: case MFF_VLAN_PCP: flow_set_vlan_pcp(flow, value->u8); break; + case MFF_MPLS_LABEL: + flow_set_mpls_label(flow, value->be32); + break; + + case MFF_MPLS_TC: + flow_set_mpls_tc(flow, value->u8); + break; + + case MFF_MPLS_BOS: + flow_set_mpls_bos(flow, value->u8); + break; + case MFF_IPV4_SRC: flow->nw_src = value->be32; break; @@ -1322,142 +1502,184 @@ mf_is_zero(const struct mf_field *mf, const struct flow *flow) return is_all_zeros((const uint8_t *) &value, mf->n_bytes); } -/* Makes 'rule' wildcard field 'mf'. +/* Makes 'match' wildcard field 'mf'. * - * The caller is responsible for ensuring that 'rule' meets 'mf''s + * The caller is responsible for ensuring that 'match' meets 'mf''s * prerequisites. */ void -mf_set_wild(const struct mf_field *mf, struct cls_rule *rule) +mf_set_wild(const struct mf_field *mf, struct match *match) { switch (mf->id) { case MFF_TUN_ID: - cls_rule_set_tun_id_masked(rule, htonll(0), htonll(0)); + match_set_tun_id_masked(match, htonll(0), htonll(0)); + break; + case MFF_TUN_SRC: + match_set_tun_src_masked(match, htonl(0), htonl(0)); + break; + case MFF_TUN_DST: + match_set_tun_dst_masked(match, htonl(0), htonl(0)); + break; + case MFF_TUN_FLAGS: + match_set_tun_flags_masked(match, 0, 0); + break; + case MFF_TUN_TOS: + match_set_tun_tos_masked(match, 0, 0); break; + case MFF_TUN_TTL: + match_set_tun_ttl_masked(match, 0, 0); + break; + case MFF_METADATA: - cls_rule_set_metadata_masked(rule, htonll(0), htonll(0)); + match_set_metadata_masked(match, htonll(0), htonll(0)); + break; case MFF_IN_PORT: - rule->wc.wildcards |= FWW_IN_PORT; - rule->flow.in_port = 0; + match->flow.in_port = 0; + match->wc.masks.in_port = 0; + break; + + case MFF_SKB_PRIORITY: + match->flow.skb_priority = 0; + match->wc.masks.skb_priority = 0; + break; + + case MFF_SKB_MARK: + match->flow.skb_mark = 0; + match->wc.masks.skb_mark = 0; break; CASE_MFF_REGS: - cls_rule_set_reg_masked(rule, mf->id - MFF_REG0, 0, 0); + match_set_reg_masked(match, mf->id - MFF_REG0, 0, 0); break; case MFF_ETH_SRC: - memset(rule->flow.dl_src, 0, ETH_ADDR_LEN); - memset(rule->wc.dl_src_mask, 0, ETH_ADDR_LEN); + memset(match->flow.dl_src, 0, ETH_ADDR_LEN); + memset(match->wc.masks.dl_src, 0, ETH_ADDR_LEN); break; case MFF_ETH_DST: - memset(rule->flow.dl_dst, 0, ETH_ADDR_LEN); - memset(rule->wc.dl_dst_mask, 0, ETH_ADDR_LEN); + memset(match->flow.dl_dst, 0, ETH_ADDR_LEN); + memset(match->wc.masks.dl_dst, 0, ETH_ADDR_LEN); break; case MFF_ETH_TYPE: - rule->wc.wildcards |= FWW_DL_TYPE; - rule->flow.dl_type = htons(0); + match->flow.dl_type = htons(0); + match->wc.masks.dl_type = htons(0); break; case MFF_VLAN_TCI: - cls_rule_set_dl_tci_masked(rule, htons(0), htons(0)); + match_set_dl_tci_masked(match, htons(0), htons(0)); break; + case MFF_DL_VLAN: case MFF_VLAN_VID: - cls_rule_set_any_vid(rule); + match_set_any_vid(match); break; + case MFF_DL_VLAN_PCP: case MFF_VLAN_PCP: - cls_rule_set_any_pcp(rule); + match_set_any_pcp(match); + break; + + case MFF_MPLS_LABEL: + match_set_any_mpls_label(match); + break; + + case MFF_MPLS_TC: + match_set_any_mpls_tc(match); + break; + + case MFF_MPLS_BOS: + match_set_any_mpls_bos(match); break; case MFF_IPV4_SRC: case MFF_ARP_SPA: - cls_rule_set_nw_src_masked(rule, htonl(0), htonl(0)); + match_set_nw_src_masked(match, htonl(0), htonl(0)); break; case MFF_IPV4_DST: case MFF_ARP_TPA: - cls_rule_set_nw_dst_masked(rule, htonl(0), htonl(0)); + match_set_nw_dst_masked(match, htonl(0), htonl(0)); break; case MFF_IPV6_SRC: - memset(&rule->wc.ipv6_src_mask, 0, sizeof rule->wc.ipv6_src_mask); - memset(&rule->flow.ipv6_src, 0, sizeof rule->flow.ipv6_src); + memset(&match->wc.masks.ipv6_src, 0, sizeof match->wc.masks.ipv6_src); + memset(&match->flow.ipv6_src, 0, sizeof match->flow.ipv6_src); break; case MFF_IPV6_DST: - memset(&rule->wc.ipv6_dst_mask, 0, sizeof rule->wc.ipv6_dst_mask); - memset(&rule->flow.ipv6_dst, 0, sizeof rule->flow.ipv6_dst); + memset(&match->wc.masks.ipv6_dst, 0, sizeof match->wc.masks.ipv6_dst); + memset(&match->flow.ipv6_dst, 0, sizeof match->flow.ipv6_dst); break; case MFF_IPV6_LABEL: - rule->wc.ipv6_label_mask = 0; - rule->flow.ipv6_label = 0; + match->wc.masks.ipv6_label = htonl(0); + match->flow.ipv6_label = htonl(0); break; case MFF_IP_PROTO: - rule->wc.wildcards |= FWW_NW_PROTO; - rule->flow.nw_proto = 0; + match->wc.masks.nw_proto = 0; + match->flow.nw_proto = 0; break; case MFF_IP_DSCP: - rule->wc.wildcards |= FWW_NW_DSCP; - rule->flow.nw_tos &= ~IP_DSCP_MASK; + match->wc.masks.nw_tos &= ~IP_DSCP_MASK; + match->flow.nw_tos &= ~IP_DSCP_MASK; break; case MFF_IP_ECN: - rule->wc.wildcards |= FWW_NW_ECN; - rule->flow.nw_tos &= ~IP_ECN_MASK; + match->wc.masks.nw_tos &= ~IP_ECN_MASK; + match->flow.nw_tos &= ~IP_ECN_MASK; break; case MFF_IP_TTL: - rule->wc.wildcards |= FWW_NW_TTL; - rule->flow.nw_ttl = 0; + match->wc.masks.nw_ttl = 0; + match->flow.nw_ttl = 0; break; case MFF_IP_FRAG: - rule->wc.nw_frag_mask |= FLOW_NW_FRAG_MASK; - rule->flow.nw_frag &= ~FLOW_NW_FRAG_MASK; + match->wc.masks.nw_frag |= FLOW_NW_FRAG_MASK; + match->flow.nw_frag &= ~FLOW_NW_FRAG_MASK; break; case MFF_ARP_OP: - rule->wc.wildcards |= FWW_NW_PROTO; - rule->flow.nw_proto = 0; + match->wc.masks.nw_proto = 0; + match->flow.nw_proto = 0; break; case MFF_ARP_SHA: case MFF_ND_SLL: - rule->wc.wildcards |= FWW_ARP_SHA; - memset(rule->flow.arp_sha, 0, sizeof rule->flow.arp_sha); + memset(match->flow.arp_sha, 0, ETH_ADDR_LEN); + memset(match->wc.masks.arp_sha, 0, ETH_ADDR_LEN); break; case MFF_ARP_THA: case MFF_ND_TLL: - rule->wc.wildcards |= FWW_ARP_THA; - memset(rule->flow.arp_tha, 0, sizeof rule->flow.arp_tha); + memset(match->flow.arp_tha, 0, ETH_ADDR_LEN); + memset(match->wc.masks.arp_tha, 0, ETH_ADDR_LEN); break; case MFF_TCP_SRC: case MFF_UDP_SRC: case MFF_ICMPV4_TYPE: case MFF_ICMPV6_TYPE: - rule->wc.tp_src_mask = htons(0); - rule->flow.tp_src = htons(0); + match->wc.masks.tp_src = htons(0); + match->flow.tp_src = htons(0); break; case MFF_TCP_DST: case MFF_UDP_DST: case MFF_ICMPV4_CODE: case MFF_ICMPV6_CODE: - rule->wc.tp_dst_mask = htons(0); - rule->flow.tp_dst = htons(0); + match->wc.masks.tp_dst = htons(0); + match->flow.tp_dst = htons(0); break; case MFF_ND_TARGET: - memset(&rule->wc.nd_target_mask, 0, sizeof rule->wc.nd_target_mask); - memset(&rule->flow.nd_target, 0, sizeof rule->flow.nd_target); + memset(&match->wc.masks.nd_target, 0, + sizeof match->wc.masks.nd_target); + memset(&match->flow.nd_target, 0, sizeof match->flow.nd_target); break; case MFF_N_IDS: @@ -1466,122 +1688,154 @@ mf_set_wild(const struct mf_field *mf, struct cls_rule *rule) } } -/* Makes 'rule' match field 'mf' with the specified 'value' and 'mask'. +/* Makes 'match' match field 'mf' with the specified 'value' and 'mask'. * 'value' specifies a value to match and 'mask' specifies a wildcard pattern, * with a 1-bit indicating that the corresponding value bit must match and a * 0-bit indicating a don't-care. * * If 'mask' is NULL or points to all-1-bits, then this call is equivalent to - * mf_set_value(mf, value, rule). If 'mask' points to all-0-bits, then this - * call is equivalent to mf_set_wild(mf, rule). + * mf_set_value(mf, value, match). If 'mask' points to all-0-bits, then this + * call is equivalent to mf_set_wild(mf, match). * * 'mask' must be a valid mask for 'mf' (see mf_is_mask_valid()). The caller - * is responsible for ensuring that 'rule' meets 'mf''s prerequisites. */ + * is responsible for ensuring that 'match' meets 'mf''s prerequisites. */ void mf_set(const struct mf_field *mf, const union mf_value *value, const union mf_value *mask, - struct cls_rule *rule) + struct match *match) { if (!mask || is_all_ones((const uint8_t *) mask, mf->n_bytes)) { - mf_set_value(mf, value, rule); + mf_set_value(mf, value, match); return; } else if (is_all_zeros((const uint8_t *) mask, mf->n_bytes)) { - mf_set_wild(mf, rule); + mf_set_wild(mf, match); return; } switch (mf->id) { case MFF_IN_PORT: + case MFF_SKB_MARK: + case MFF_SKB_PRIORITY: case MFF_ETH_TYPE: - case MFF_VLAN_VID: + case MFF_DL_VLAN: + case MFF_DL_VLAN_PCP: case MFF_VLAN_PCP: + case MFF_MPLS_LABEL: + case MFF_MPLS_TC: + case MFF_MPLS_BOS: case MFF_IP_PROTO: case MFF_IP_TTL: case MFF_IP_DSCP: case MFF_IP_ECN: case MFF_ARP_OP: - case MFF_ARP_SHA: - case MFF_ARP_THA: case MFF_ICMPV4_TYPE: case MFF_ICMPV4_CODE: case MFF_ICMPV6_TYPE: case MFF_ICMPV6_CODE: - case MFF_ND_SLL: - case MFF_ND_TLL: NOT_REACHED(); case MFF_TUN_ID: - cls_rule_set_tun_id_masked(rule, value->be64, mask->be64); + match_set_tun_id_masked(match, value->be64, mask->be64); + break; + case MFF_TUN_SRC: + match_set_tun_src_masked(match, value->be32, mask->be32); + break; + case MFF_TUN_DST: + match_set_tun_dst_masked(match, value->be32, mask->be32); break; + case MFF_TUN_FLAGS: + match_set_tun_flags_masked(match, ntohs(value->be16), ntohs(mask->be16)); + break; + case MFF_TUN_TTL: + match_set_tun_ttl_masked(match, value->u8, mask->u8); + break; + case MFF_TUN_TOS: + match_set_tun_tos_masked(match, value->u8, mask->u8); + break; + case MFF_METADATA: - cls_rule_set_metadata_masked(rule, value->be64, mask->be64); + match_set_metadata_masked(match, value->be64, mask->be64); break; CASE_MFF_REGS: - cls_rule_set_reg_masked(rule, mf->id - MFF_REG0, - ntohl(value->be32), ntohl(mask->be32)); + match_set_reg_masked(match, mf->id - MFF_REG0, + ntohl(value->be32), ntohl(mask->be32)); break; case MFF_ETH_DST: - cls_rule_set_dl_dst_masked(rule, value->mac, mask->mac); + match_set_dl_dst_masked(match, value->mac, mask->mac); break; case MFF_ETH_SRC: - cls_rule_set_dl_src_masked(rule, value->mac, mask->mac); + match_set_dl_src_masked(match, value->mac, mask->mac); + break; + + case MFF_ARP_SHA: + case MFF_ND_SLL: + match_set_arp_sha_masked(match, value->mac, mask->mac); + break; + + case MFF_ARP_THA: + case MFF_ND_TLL: + match_set_arp_tha_masked(match, value->mac, mask->mac); break; case MFF_VLAN_TCI: - cls_rule_set_dl_tci_masked(rule, value->be16, mask->be16); + match_set_dl_tci_masked(match, value->be16, mask->be16); + break; + + case MFF_VLAN_VID: + match_set_vlan_vid_masked(match, value->be16, mask->be16); break; case MFF_IPV4_SRC: - cls_rule_set_nw_src_masked(rule, value->be32, mask->be32); + match_set_nw_src_masked(match, value->be32, mask->be32); break; case MFF_IPV4_DST: - cls_rule_set_nw_dst_masked(rule, value->be32, mask->be32); + match_set_nw_dst_masked(match, value->be32, mask->be32); break; case MFF_IPV6_SRC: - cls_rule_set_ipv6_src_masked(rule, &value->ipv6, &mask->ipv6); + match_set_ipv6_src_masked(match, &value->ipv6, &mask->ipv6); break; case MFF_IPV6_DST: - cls_rule_set_ipv6_dst_masked(rule, &value->ipv6, &mask->ipv6); + match_set_ipv6_dst_masked(match, &value->ipv6, &mask->ipv6); break; case MFF_IPV6_LABEL: if ((mask->be32 & htonl(IPV6_LABEL_MASK)) == htonl(IPV6_LABEL_MASK)) { - mf_set_value(mf, value, rule); + mf_set_value(mf, value, match); } else { - cls_rule_set_ipv6_label_masked(rule, value->be32, mask->be32); + match_set_ipv6_label_masked(match, value->be32, mask->be32); } break; case MFF_ND_TARGET: - cls_rule_set_nd_target_masked(rule, &value->ipv6, &mask->ipv6); + match_set_nd_target_masked(match, &value->ipv6, &mask->ipv6); break; case MFF_IP_FRAG: - cls_rule_set_nw_frag_masked(rule, value->u8, mask->u8); + match_set_nw_frag_masked(match, value->u8, mask->u8); break; case MFF_ARP_SPA: - cls_rule_set_nw_src_masked(rule, value->be32, mask->be32); + match_set_nw_src_masked(match, value->be32, mask->be32); break; case MFF_ARP_TPA: - cls_rule_set_nw_dst_masked(rule, value->be32, mask->be32); + match_set_nw_dst_masked(match, value->be32, mask->be32); break; case MFF_TCP_SRC: case MFF_UDP_SRC: - cls_rule_set_tp_src_masked(rule, value->be16, mask->be16); + match_set_tp_src_masked(match, value->be16, mask->be16); break; case MFF_TCP_DST: case MFF_UDP_DST: - cls_rule_set_tp_dst_masked(rule, value->be16, mask->be16); + match_set_tp_dst_masked(match, value->be16, mask->be16); break; case MFF_N_IDS: @@ -1639,14 +1893,14 @@ mf_check_dst(const struct mf_subfield *sf, const struct flow *flow) return error; } -/* Copies the value and wildcard bit pattern for 'mf' from 'rule' into the +/* Copies the value and wildcard bit pattern for 'mf' from 'match' into the * 'value' and 'mask', respectively. */ void -mf_get(const struct mf_field *mf, const struct cls_rule *rule, +mf_get(const struct mf_field *mf, const struct match *match, union mf_value *value, union mf_value *mask) { - mf_get_value(mf, &rule->flow, value); - mf_get_mask(mf, &rule->wc, mask); + mf_get_value(mf, &match->flow, value); + mf_get_mask(mf, &match->wc, mask); } /* Assigns a random value for field 'mf' to 'value'. */ @@ -1657,8 +1911,15 @@ mf_random_value(const struct mf_field *mf, union mf_value *value) 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: @@ -1707,14 +1968,30 @@ mf_random_value(const struct mf_field *mf, union mf_value *value) value->be16 &= htons(0xff); break; - case MFF_VLAN_VID: + 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(); @@ -1765,7 +2042,7 @@ mf_from_ethernet_string(const struct mf_field *mf, const char *s, uint8_t mac[ETH_ADDR_LEN], uint8_t mask[ETH_ADDR_LEN]) { - assert(mf->n_bytes == ETH_ADDR_LEN); + ovs_assert(mf->n_bytes == ETH_ADDR_LEN); switch (sscanf(s, ETH_ADDR_SCAN_FMT"/"ETH_ADDR_SCAN_FMT, ETH_ADDR_SCAN_ARGS(mac), ETH_ADDR_SCAN_ARGS(mask))){ @@ -1787,7 +2064,7 @@ mf_from_ipv4_string(const struct mf_field *mf, const char *s, { int prefix; - assert(mf->n_bytes == sizeof *ip); + 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) { @@ -1819,7 +2096,7 @@ mf_from_ipv6_string(const struct mf_field *mf, const char *s, const char *name, *netmask; int retval; - assert(mf->n_bytes == sizeof *value); + ovs_assert(mf->n_bytes == sizeof *value); name = strtok_r(str, "/", &save_ptr); retval = name ? lookup_ipv6(name, value) : EINVAL; @@ -1857,8 +2134,11 @@ mf_from_ofp_port_string(const struct mf_field *mf, const char *s, { uint16_t port; - assert(mf->n_bytes == sizeof(ovs_be16)); - if (ofputil_port_from_string(s, &port)) { + ovs_assert(mf->n_bytes == sizeof(ovs_be16)); + if (*s == '-') { + return xasprintf("%s: negative values not supported for %s", + s, mf->name); + } else if (ofputil_port_from_string(s, &port)) { *valuep = htons(port); *maskp = htons(UINT16_MAX); return NULL; @@ -1911,13 +2191,77 @@ mf_from_frag_string(const char *s, uint8_t *valuep, uint8_t *maskp) "\"yes\", \"first\", \"later\", \"not_first\"", s); } +static int +parse_flow_tun_flags(const char *s_, const char *(*bit_to_string)(uint32_t), + ovs_be16 *res) +{ + uint32_t result = 0; + char *save_ptr = NULL; + char *name; + int rc = 0; + char *s = xstrdup(s_); + + for (name = strtok_r((char *)s, " |", &save_ptr); name; + name = strtok_r(NULL, " |", &save_ptr)) { + int name_len; + unsigned long long int flags; + uint32_t bit; + int n0; + + if (sscanf(name, "%lli%n", &flags, &n0) > 0 && n0 > 0) { + result |= flags; + continue; + } + name_len = strlen(name); + for (bit = 1; bit; bit <<= 1) { + const char *fname = bit_to_string(bit); + size_t len; + + if (!fname) { + continue; + } + + len = strlen(fname); + if (len != name_len) { + continue; + } + if (!strncmp(name, fname, len)) { + result |= bit; + break; + } + } + + if (!bit) { + rc = -ENOENT; + goto out; + } + } + + *res = htons(result); +out: + free(s); + return rc; +} + +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); + return NULL; + } + + return xasprintf("%s: unknown tunnel flags (valid flags are \"df\", " + "\"csum\", \"key\"", s); +} + /* 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) { - if (!strcasecmp(s, "any") || !strcmp(s, "*")) { + if (!strcmp(s, "*")) { memset(value, 0, mf->n_bytes); memset(mask, 0, mf->n_bytes); return NULL; @@ -1943,6 +2287,10 @@ mf_parse(const struct mf_field *mf, const char *s, case MFS_FRAG: return mf_from_frag_string(s, &value->u8, &mask->u8); + + case MFS_TNL_FLAGS: + ovs_assert(mf->n_bytes == sizeof(ovs_be16)); + return mf_from_tun_flags_string(s, &value->be16, &mask->be16); } NOT_REACHED(); } @@ -1973,7 +2321,7 @@ mf_format_integer_string(const struct mf_field *mf, const uint8_t *valuep, unsigned long long int integer; int i; - assert(mf->n_bytes <= 8); + ovs_assert(mf->n_bytes <= 8); integer = 0; for (i = 0; i < mf->n_bytes; i++) { @@ -2001,15 +2349,12 @@ mf_format_integer_string(const struct mf_field *mf, const uint8_t *valuep, } static void -mf_format_frag_string(const uint8_t *valuep, const uint8_t *maskp, - struct ds *s) +mf_format_frag_string(uint8_t value, uint8_t mask, struct ds *s) { const struct frag_handling *h; - uint8_t value = *valuep; - uint8_t mask = *maskp; - value &= mask; mask &= FLOW_NW_FRAG_MASK; + value &= mask; for (h = all_frags; h < &all_frags[ARRAY_SIZE(all_frags)]; h++) { if (value == h->value && mask == h->mask) { @@ -2020,6 +2365,12 @@ mf_format_frag_string(const uint8_t *valuep, const uint8_t *maskp, ds_put_cstr(s, ""); } +static void +mf_format_tnl_flags_string(const ovs_be16 *valuep, struct ds *s) +{ + format_flags(s, flow_tun_flag_to_string, ntohs(*valuep), '|'); +} + /* 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 @@ -2062,7 +2413,11 @@ mf_format(const struct mf_field *mf, break; case MFS_FRAG: - mf_format_frag_string(&value->u8, &mask->u8, s); + mf_format_frag_string(value->u8, mask ? mask->u8 : UINT8_MAX, s); + break; + + case MFS_TNL_FLAGS: + mf_format_tnl_flags_string(&value->be16, s); break; default: @@ -2070,20 +2425,36 @@ mf_format(const struct mf_field *mf, } } -/* Makes subfield 'sf' within 'rule' exactly match the 'sf->n_bits' +/* Makes subfield 'sf' within 'flow' exactly match the 'sf->n_bits' + * least-significant bits in 'x'. + */ +void +mf_write_subfield_flow(const struct mf_subfield *sf, + const union mf_subvalue *x, struct flow *flow) +{ + const struct mf_field *field = sf->field; + union mf_value value; + + mf_get_value(field, flow, &value); + bitwise_copy(x, sizeof *x, 0, &value, field->n_bytes, + sf->ofs, sf->n_bits); + mf_set_flow_value(field, &value, flow); +} + +/* Makes subfield 'sf' within 'match' exactly match the 'sf->n_bits' * least-significant bits in 'x'. */ void mf_write_subfield(const struct mf_subfield *sf, const union mf_subvalue *x, - struct cls_rule *rule) + struct match *match) { const struct mf_field *field = sf->field; union mf_value value, mask; - mf_get(field, rule, &value, &mask); + mf_get(field, match, &value, &mask); bitwise_copy(x, sizeof *x, 0, &value, field->n_bytes, sf->ofs, sf->n_bits); bitwise_one ( &mask, field->n_bytes, sf->ofs, sf->n_bits); - mf_set(field, &value, &mask, rule); + mf_set(field, &value, &mask, match); } /* Initializes 'x' to the value of 'sf' within 'flow'. 'sf' must be valid for @@ -2252,3 +2623,20 @@ mf_parse_subfield(struct mf_subfield *sf, const char *s) } return s; } + +void +mf_format_subvalue(const union mf_subvalue *subvalue, struct ds *s) +{ + int i; + + for (i = 0; i < ARRAY_SIZE(subvalue->u8); i++) { + if (subvalue->u8[i]) { + ds_put_format(s, "0x%"PRIx8, subvalue->u8[i]); + for (i++; i < ARRAY_SIZE(subvalue->u8); i++) { + ds_put_format(s, "%02"PRIx8, subvalue->u8[i]); + } + return; + } + } + ds_put_char(s, '0'); +}