X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fmeta-flow.c;h=ce061a35b6d3c81348b2bf194a478faea743f1eb;hb=fa04edcedfe5285fd8ad3a4d70fecb38df18293d;hp=101409a2cbaefcdc8458a35b2827fe0685e71b83;hpb=cc34bc8c8611868474253b8fbd9e79cd66c60c94;p=sliver-openvswitch.git diff --git a/lib/meta-flow.c b/lib/meta-flow.c index 101409a2c..ce061a35b 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 @@ -28,6 +27,7 @@ #include "dynamic-string.h" #include "ofp-errors.h" #include "ofp-util.h" +#include "ovs-thread.h" #include "packets.h" #include "random.h" #include "shash.h" @@ -49,16 +49,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_FULLY, + MFS_IPV4, + MFP_NONE, + true, + NXM_NX_TUN_IPV4_SRC, "NXM_NX_TUN_IPV4_SRC", + NXM_NX_TUN_IPV4_SRC, "NXM_NX_TUN_IPV4_SRC", + }, { + MFF_TUN_DST, "tun_dst", NULL, + MF_FIELD_SIZES(be32), + MFM_FULLY, + MFS_IPV4, + MFP_NONE, + true, + NXM_NX_TUN_IPV4_DST, "NXM_NX_TUN_IPV4_DST", + NXM_NX_TUN_IPV4_DST, "NXM_NX_TUN_IPV4_DST", + }, { + 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 +112,46 @@ 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, + true, NXM_OF_IN_PORT, "NXM_OF_IN_PORT", + NXM_OF_IN_PORT, "NXM_OF_IN_PORT", + }, { + MFF_IN_PORT_OXM, "in_port_oxm", NULL, + MF_FIELD_SIZES(be32), + MFM_NONE, + MFS_OFP_PORT_OXM, + MFP_NONE, + true, + OXM_OF_IN_PORT, "OXM_OF_IN_PORT", OXM_OF_IN_PORT, "OXM_OF_IN_PORT", + }, { + MFF_SKB_PRIORITY, "skb_priority", NULL, + MF_FIELD_SIZES(be32), + MFM_NONE, + MFS_HEXADECIMAL, + MFP_NONE, + false, + 0, NULL, + 0, NULL, + }, { + MFF_PKT_MARK, "pkt_mark", NULL, + MF_FIELD_SIZES(be32), + MFM_FULLY, + MFS_HEXADECIMAL, + MFP_NONE, + true, + NXM_NX_PKT_MARK, "NXM_NX_PKT_MARK", + NXM_NX_PKT_MARK, "NXM_NX_PKT_MARK", }, #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 +193,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 +202,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 +211,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,7 +222,7 @@ 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, @@ -159,7 +231,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { }, { MFF_DL_VLAN, "dl_vlan", NULL, sizeof(ovs_be16), 12, - MFM_NONE, 0, + MFM_NONE, MFS_DECIMAL, MFP_NONE, true, @@ -168,7 +240,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { }, { MFF_VLAN_VID, "vlan_vid", NULL, sizeof(ovs_be16), 12, - MFM_FULLY, 0, + MFM_FULLY, MFS_DECIMAL, MFP_NONE, true, @@ -177,7 +249,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { }, { MFF_DL_VLAN_PCP, "dl_vlan_pcp", NULL, 1, 3, - MFM_NONE, 0, + MFM_NONE, MFS_DECIMAL, MFP_NONE, true, @@ -186,14 +258,46 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { }, { MFF_VLAN_PCP, "vlan_pcp", NULL, 1, 3, - MFM_NONE, 0, + MFM_NONE, MFS_DECIMAL, - MFP_NONE, + 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 ## */ /* ## -- ## */ @@ -201,7 +305,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, @@ -210,7 +314,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, @@ -221,7 +325,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, @@ -230,7 +334,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, @@ -240,7 +344,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, @@ -251,7 +355,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, @@ -260,16 +364,25 @@ 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, NXM_OF_IP_TOS, "NXM_OF_IP_TOS", + NXM_OF_IP_TOS, "NXM_OF_IP_TOS", + }, { + MFF_IP_DSCP_SHIFTED, "nw_tos_shifted", NULL, + MF_FIELD_SIZES(u8), + MFM_NONE, + MFS_DECIMAL, + MFP_IP_ANY, + true, + OXM_OF_IP_DSCP, "OXM_OF_IP_DSCP", OXM_OF_IP_DSCP, "OXM_OF_IP_DSCP", }, { MFF_IP_ECN, "nw_ecn", NULL, 1, 2, - MFM_NONE, FWW_NW_ECN, + MFM_NONE, MFS_DECIMAL, MFP_IP_ANY, true, @@ -278,7 +391,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, @@ -287,7 +400,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, @@ -298,7 +411,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, @@ -307,7 +420,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, @@ -316,7 +429,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, @@ -325,7 +438,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { }, { MFF_ARP_SHA, "arp_sha", NULL, MF_FIELD_SIZES(mac), - MFM_FULLY, 0, + MFM_FULLY, MFS_ETHERNET, MFP_ARP, false, @@ -334,7 +447,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { }, { MFF_ARP_THA, "arp_tha", NULL, MF_FIELD_SIZES(mac), - MFM_FULLY, 0, + MFM_FULLY, MFS_ETHERNET, MFP_ARP, false, @@ -349,7 +462,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, @@ -358,7 +471,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, @@ -369,7 +482,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, @@ -378,7 +491,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, @@ -389,7 +502,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, @@ -398,7 +511,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, @@ -409,7 +522,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, @@ -418,7 +531,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, @@ -433,7 +546,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, @@ -442,7 +555,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { }, { MFF_ND_SLL, "nd_sll", NULL, MF_FIELD_SIZES(mac), - MFM_FULLY, 0, + MFM_FULLY, MFS_ETHERNET, MFP_ND_SOLICIT, false, @@ -451,7 +564,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { }, { MFF_ND_TLL, "nd_tll", NULL, MF_FIELD_SIZES(mac), - MFM_FULLY, 0, + MFM_FULLY, MFS_ETHERNET, MFP_ND_ADVERT, false, @@ -468,19 +581,23 @@ struct nxm_field { }; /* Contains 'struct nxm_field's. */ -static struct hmap all_fields = HMAP_INITIALIZER(&all_fields); +static struct hmap all_fields; + +/* Maps from an mf_field's 'name' or 'extra_name' to the mf_field. */ +static struct shash mf_by_name; /* Rate limit for parse errors. These always indicate a bug in an OpenFlow * controller and so there's not much point in showing a lot of them. */ static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5); const struct mf_field *mf_from_nxm_header__(uint32_t header); +static void nxm_init(void); /* Returns the field with the given 'id'. */ 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]; } @@ -489,19 +606,7 @@ mf_from_id(enum mf_field_id id) const struct mf_field * mf_from_name(const char *name) { - static struct shash mf_by_name = SHASH_INITIALIZER(&mf_by_name); - - if (shash_is_empty(&mf_by_name)) { - const struct mf_field *mf; - - for (mf = mf_fields; mf < &mf_fields[MFF_N_IDS]; mf++) { - shash_add_once(&mf_by_name, mf->name, mf); - if (mf->extra_name) { - shash_add_once(&mf_by_name, mf->extra_name, mf); - } - } - } - + nxm_init(); return shash_find_data(&mf_by_name, name); } @@ -520,7 +625,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); @@ -529,24 +634,36 @@ nxm_init_add_field(const struct mf_field *mf, uint32_t header) } static void -nxm_init(void) +nxm_do_init(void) { const struct mf_field *mf; + hmap_init(&all_fields); + shash_init(&mf_by_name); for (mf = mf_fields; mf < &mf_fields[MFF_N_IDS]; mf++) { nxm_init_add_field(mf, mf->nxm_header); if (mf->oxm_header != mf->nxm_header) { nxm_init_add_field(mf, mf->oxm_header); } + + shash_add_once(&mf_by_name, mf->name, mf); + if (mf->extra_name) { + shash_add_once(&mf_by_name, mf->extra_name, mf); + } } } +static void +nxm_init(void) +{ + static pthread_once_t once = PTHREAD_ONCE_INIT; + pthread_once(&once, nxm_do_init); +} + const struct mf_field * mf_from_nxm_header(uint32_t header) { - if (hmap_is_empty(&all_fields)) { - nxm_init(); - } + nxm_init(); return mf_from_nxm_header__(header); } @@ -573,81 +690,105 @@ 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: - assert(mf->fww_bit != 0); - return (wc->wildcards & mf->fww_bit) != 0; - + case MFF_TUN_SRC: + return !wc->masks.tunnel.ip_src; + case MFF_TUN_DST: + return !wc->masks.tunnel.ip_dst; case MFF_TUN_ID: - return !wc->tun_id_mask; + 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: + case MFF_IN_PORT_OXM: + return !wc->masks.in_port.ofp_port; + case MFF_SKB_PRIORITY: + return !wc->masks.skb_priority; + case MFF_PKT_MARK: + return !wc->masks.pkt_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->arp_sha_mask); + return eth_addr_is_zero(wc->masks.arp_sha); case MFF_ARP_THA: case MFF_ND_TLL: - return eth_addr_is_zero(wc->arp_tha_mask); + 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->vlan_tci_mask & htons(VLAN_VID_MASK)); + return !(wc->masks.vlan_tci & htons(VLAN_VID_MASK)); case MFF_VLAN_VID: - return !(wc->vlan_tci_mask & htons(VLAN_VID_MASK | VLAN_CFI)); + 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: + case MFF_IP_DSCP_SHIFTED: + 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: @@ -665,113 +806,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_ARP_OP: - 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_DL_VLAN: - mask->be16 = wc->vlan_tci_mask & htons(VLAN_VID_MASK); - break; - case MFF_VLAN_VID: - mask->be16 = wc->vlan_tci_mask & htons(VLAN_VID_MASK | VLAN_CFI); - break; - case MFF_DL_VLAN_PCP: - 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_IPV6_LABEL: - mask->be32 = wc->ipv6_label_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_ARP_SHA: - case MFF_ND_SLL: - memcpy(mask->mac, wc->arp_sha_mask, ETH_ADDR_LEN); - break; - case MFF_ARP_THA: - case MFF_ND_TLL: - memcpy(mask->mac, wc->arp_tha_mask, ETH_ADDR_LEN); - 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 @@ -791,13 +826,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) { @@ -821,11 +849,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); @@ -871,8 +904,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_PKT_MARK: CASE_MFF_REGS: case MFF_ETH_SRC: case MFF_ETH_DST: @@ -901,8 +941,15 @@ mf_is_value_valid(const struct mf_field *mf, const union mf_value *value) case MFF_ND_TLL: return true; + case MFF_IN_PORT_OXM: { + ofp_port_t port; + return !ofputil_port_from_ofp11(value->be32, &port); + } + case MFF_IP_DSCP: return !(value->u8 & ~IP_DSCP_MASK); + case MFF_IP_DSCP_SHIFTED: + return !(value->u8 & (~IP_DSCP_MASK >> 2)); case MFF_IP_ECN: return !(value->u8 & ~IP_ECN_MASK); case MFF_IP_FRAG: @@ -923,6 +970,15 @@ mf_is_value_valid(const struct mf_field *mf, const union mf_value *value) 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(); @@ -937,14 +993,41 @@ 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; case MFF_IN_PORT: - value->be16 = htons(flow->in_port); + value->be16 = htons(ofp_to_u16(flow->in_port.ofp_port)); + break; + case MFF_IN_PORT_OXM: + value->be32 = ofputil_port_to_ofp11(flow->in_port.ofp_port); + break; + + case MFF_SKB_PRIORITY: + value->be32 = htonl(flow->skb_priority); + break; + + case MFF_PKT_MARK: + value->be32 = htonl(flow->pkt_mark); break; CASE_MFF_REGS: @@ -979,6 +1062,18 @@ mf_get_value(const struct mf_field *mf, const struct flow *flow, 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; @@ -1007,6 +1102,10 @@ mf_get_value(const struct mf_field *mf, const struct flow *flow, value->u8 = flow->nw_tos & IP_DSCP_MASK; break; + case MFF_IP_DSCP_SHIFTED: + value->u8 = flow->nw_tos >> 2; + break; + case MFF_IP_ECN: value->u8 = flow->nw_tos & IP_ECN_MASK; break; @@ -1071,141 +1170,188 @@ 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, u16_to_ofp(ntohs(value->be16))); + break; + + case MFF_IN_PORT_OXM: { + ofp_port_t port; + ofputil_port_from_ofp11(value->be32, &port); + match_set_in_port(match, port); + break; + } + + case MFF_SKB_PRIORITY: + match_set_skb_priority(match, ntohl(value->be32)); + break; + + case MFF_PKT_MARK: + match_set_pkt_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: - cls_rule_set_dl_vlan(rule, value->be16); + match_set_dl_vlan(match, value->be16); break; case MFF_VLAN_VID: - cls_rule_set_vlan_vid(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_DSCP_SHIFTED: + match_set_nw_dscp(match, value->u8 << 2); 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: @@ -1214,23 +1360,53 @@ 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 - * prerequisites. */ +/* Sets 'flow' member field described by 'mf' to 'value'. The caller is + * responsible for ensuring that 'flow' meets 'mf''s prerequisites.*/ void mf_set_flow_value(const struct mf_field *mf, const union mf_value *value, struct flow *flow) { 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; case MFF_IN_PORT: - flow->in_port = ntohs(value->be16); + flow->in_port.ofp_port = u16_to_ofp(ntohs(value->be16)); + break; + + case MFF_IN_PORT_OXM: { + ofp_port_t port; + ofputil_port_from_ofp11(value->be32, &port); + flow->in_port.ofp_port = port; + break; + } + + case MFF_SKB_PRIORITY: + flow->skb_priority = ntohl(value->be32); + break; + + case MFF_PKT_MARK: + flow->pkt_mark = ntohl(value->be32); break; CASE_MFF_REGS: @@ -1265,6 +1441,18 @@ mf_set_flow_value(const struct mf_field *mf, 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; @@ -1294,6 +1482,11 @@ mf_set_flow_value(const struct mf_field *mf, flow->nw_tos |= value->u8 & IP_DSCP_MASK; break; + case MFF_IP_DSCP_SHIFTED: + flow->nw_tos &= ~IP_DSCP_MASK; + flow->nw_tos |= value->u8 << 2; + break; + case MFF_IP_ECN: flow->nw_tos &= ~IP_ECN_MASK; flow->nw_tos |= value->u8 & IP_ECN_MASK; @@ -1372,144 +1565,186 @@ 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; + case MFF_IN_PORT_OXM: + match->flow.in_port.ofp_port = 0; + match->wc.masks.in_port.ofp_port = 0; + break; + + case MFF_SKB_PRIORITY: + match->flow.skb_priority = 0; + match->wc.masks.skb_priority = 0; + break; + + case MFF_PKT_MARK: + match->flow.pkt_mark = 0; + match->wc.masks.pkt_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; + case MFF_IP_DSCP_SHIFTED: + 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: - memset(rule->flow.arp_sha, 0, ETH_ADDR_LEN); - memset(rule->wc.arp_sha_mask, 0, ETH_ADDR_LEN); + 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: - memset(rule->flow.arp_tha, 0, ETH_ADDR_LEN); - memset(rule->wc.arp_tha_mask, 0, ETH_ADDR_LEN); + 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: @@ -1518,39 +1753,45 @@ 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_IN_PORT_OXM: + case MFF_SKB_PRIORITY: case MFF_ETH_TYPE: 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_DSCP_SHIFTED: case MFF_IP_ECN: case MFF_ARP_OP: case MFF_ICMPV4_TYPE: @@ -1560,91 +1801,112 @@ mf_set(const struct mf_field *mf, 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_PKT_MARK: + match_set_pkt_mark_masked(match, 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: - cls_rule_set_arp_sha_masked(rule, value->mac, mask->mac); + match_set_arp_sha_masked(match, value->mac, mask->mac); break; case MFF_ARP_THA: case MFF_ND_TLL: - cls_rule_set_arp_tha_masked(rule, value->mac, mask->mac); + 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: - cls_rule_set_vlan_vid_masked(rule, value->be16, mask->be16); + 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: @@ -1702,14 +1964,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'. */ @@ -1720,8 +1982,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_PKT_MARK: + case MFF_SKB_PRIORITY: CASE_MFF_REGS: case MFF_ETH_SRC: case MFF_ETH_DST: @@ -1750,6 +2019,10 @@ mf_random_value(const struct mf_field *mf, union mf_value *value) 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; @@ -1758,6 +2031,10 @@ mf_random_value(const struct mf_field *mf, union mf_value *value) 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; @@ -1782,6 +2059,18 @@ mf_random_value(const struct mf_field *mf, union mf_value *value) 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(); @@ -1832,20 +2121,25 @@ mf_from_ethernet_string(const struct mf_field *mf, const char *s, uint8_t mac[ETH_ADDR_LEN], uint8_t mask[ETH_ADDR_LEN]) { - assert(mf->n_bytes == ETH_ADDR_LEN); + int n; - switch (sscanf(s, ETH_ADDR_SCAN_FMT"/"ETH_ADDR_SCAN_FMT, - ETH_ADDR_SCAN_ARGS(mac), ETH_ADDR_SCAN_ARGS(mask))){ - case ETH_ADDR_SCAN_COUNT * 2: - return NULL; + ovs_assert(mf->n_bytes == ETH_ADDR_LEN); - case ETH_ADDR_SCAN_COUNT: + n = -1; + if (sscanf(s, ETH_ADDR_SCAN_FMT"%n", ETH_ADDR_SCAN_ARGS(mac), &n) > 0 + && n == strlen(s)) { memset(mask, 0xff, ETH_ADDR_LEN); return NULL; + } - default: - return xasprintf("%s: invalid Ethernet address", s); + n = -1; + if (sscanf(s, ETH_ADDR_SCAN_FMT"/"ETH_ADDR_SCAN_FMT"%n", + ETH_ADDR_SCAN_ARGS(mac), ETH_ADDR_SCAN_ARGS(mask), &n) > 0 + && n == strlen(s)) { + return NULL; } + + return xasprintf("%s: invalid Ethernet address", s); } static char * @@ -1854,7 +2148,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) { @@ -1886,7 +2180,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; @@ -1922,17 +2216,31 @@ static char * mf_from_ofp_port_string(const struct mf_field *mf, const char *s, ovs_be16 *valuep, ovs_be16 *maskp) { - uint16_t port; + ofp_port_t port; + + ovs_assert(mf->n_bytes == sizeof(ovs_be16)); - assert(mf->n_bytes == sizeof(ovs_be16)); if (ofputil_port_from_string(s, &port)) { - *valuep = htons(port); + *valuep = htons(ofp_to_u16(port)); *maskp = htons(UINT16_MAX); return NULL; - } else { - return mf_from_integer_string(mf, s, - (uint8_t *) valuep, (uint8_t *) maskp); } + return xasprintf("%s: port value out of range for %s", s, mf->name); +} + +static char * +mf_from_ofp_port_string32(const struct mf_field *mf, const char *s, + ovs_be32 *valuep, ovs_be32 *maskp) +{ + ofp_port_t port; + + 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); + return NULL; + } + return xasprintf("%s: port value out of range for %s", s, mf->name); } struct frag_handling { @@ -1978,13 +2286,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; @@ -2008,8 +2380,15 @@ mf_parse(const struct mf_field *mf, const char *s, case MFS_OFP_PORT: return mf_from_ofp_port_string(mf, s, &value->be16, &mask->be16); + case MFS_OFP_PORT_OXM: + return mf_from_ofp_port_string32(mf, s, &value->be32, &mask->be32); + 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(); } @@ -2040,7 +2419,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++) { @@ -2068,15 +2447,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) { @@ -2087,6 +2463,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 @@ -2104,9 +2486,17 @@ mf_format(const struct mf_field *mf, } switch (mf->string) { + case MFS_OFP_PORT_OXM: + if (!mask) { + ofp_port_t port; + ofputil_port_from_ofp11(value->be32, &port); + ofputil_format_port(port, s); + break; + } + /* fall through */ case MFS_OFP_PORT: if (!mask) { - ofputil_format_port(ntohs(value->be16), s); + ofputil_format_port(u16_to_ofp(ntohs(value->be16)), s); break; } /* fall through */ @@ -2129,7 +2519,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: @@ -2137,20 +2531,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 @@ -2245,7 +2655,7 @@ mf_parse_subfield_name(const char *name, int name_len, bool *wild) * bit indexes. "..end" may be omitted to indicate a single bit. "start..end" * may both be omitted (the [] are still required) to indicate an entire * field. */ -char * +char * WARN_UNUSED_RESULT mf_parse_subfield__(struct mf_subfield *sf, const char **sp) { const struct mf_field *field; @@ -2300,22 +2710,38 @@ mf_parse_subfield__(struct mf_subfield *sf, const char **sp) return NULL; } -/* Parses a subfield from the beginning of 's' into 'sf'. Returns the first - * byte in 's' following the parsed string. - * - * Exits with an error message if 's' has incorrect syntax. +/* Parses a subfield from the entirety of 's' into 'sf'. Returns NULL if + * successful, otherwise a malloc()'d string describing the error. The caller + * is responsible for freeing the returned string. * * The syntax parsed from 's' takes the form "header[start..end]" where * 'header' is the name of an NXM field and 'start' and 'end' are (inclusive) * bit indexes. "..end" may be omitted to indicate a single bit. "start..end" * may both be omitted (the [] are still required) to indicate an entire * field. */ -const char * +char * WARN_UNUSED_RESULT mf_parse_subfield(struct mf_subfield *sf, const char *s) { - char *msg = mf_parse_subfield__(sf, &s); - if (msg) { - ovs_fatal(0, "%s", msg); + char *error = mf_parse_subfield__(sf, &s); + if (!error && s[0]) { + error = xstrdup("unexpected input following field syntax"); + } + return error; +} + +void +mf_format_subvalue(const union mf_subvalue *subvalue, struct ds *s) +{ + 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; + } } - return s; + ds_put_char(s, '0'); }