X-Git-Url: http://git.cascardo.eti.br/?a=blobdiff_plain;f=lib%2Fmeta-flow.c;h=6c899e1fd5a85f76d54a03f7919516955d5a1203;hb=HEAD;hp=69d5140393d1b9406820dcf64af1e5e3756a036c;hpb=216a32dd505cc56bb88bf7b79541dc4a37ba8d2d;p=cascardo%2Fovs.git diff --git a/lib/meta-flow.c b/lib/meta-flow.c index 69d514039..6c899e1fd 100644 --- a/lib/meta-flow.c +++ b/lib/meta-flow.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012, 2013 Nicira, Inc. + * Copyright (c) 2011, 2012, 2013, 2014, 2015, 2016 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,6 +25,7 @@ #include "classifier.h" #include "dynamic-string.h" +#include "nx-match.h" #include "ofp-errors.h" #include "ofp-util.h" #include "ovs-thread.h" @@ -32,681 +33,26 @@ #include "random.h" #include "shash.h" #include "socket-util.h" +#include "tun-metadata.h" #include "unaligned.h" -#include "vlog.h" +#include "util.h" +#include "openvswitch/vlog.h" VLOG_DEFINE_THIS_MODULE(meta_flow); +#define FLOW_U32OFS(FIELD) \ + offsetof(struct flow, FIELD) % 4 ? -1 : offsetof(struct flow, FIELD) / 4 + #define MF_FIELD_SIZES(MEMBER) \ sizeof ((union mf_value *)0)->MEMBER, \ 8 * sizeof ((union mf_value *)0)->MEMBER -static const struct mf_field mf_fields[MFF_N_IDS] = { - /* ## -------- ## */ - /* ## metadata ## */ - /* ## -------- ## */ - - { - MFF_TUN_ID, "tun_id", NULL, - MF_FIELD_SIZES(be64), - MFM_FULLY, - MFS_HEXADECIMAL, - MFP_NONE, - true, - NXM_NX_TUN_ID, "NXM_NX_TUN_ID", - OXM_OF_TUNNEL_ID, "OXM_OF_TUNNEL_ID", - OFPUTIL_P_NXM_OXM_ANY, - OFPUTIL_P_NXM_OXM_ANY, - }, { - MFF_TUN_SRC, "tun_src", NULL, - MF_FIELD_SIZES(be32), - 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", - OFPUTIL_P_NXM_OXM_ANY, - OFPUTIL_P_NXM_OXM_ANY, - }, { - 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", - OFPUTIL_P_NXM_OXM_ANY, - OFPUTIL_P_NXM_OXM_ANY, - }, { - MFF_TUN_FLAGS, "tun_flags", NULL, - MF_FIELD_SIZES(be16), - MFM_NONE, - MFS_TNL_FLAGS, - MFP_NONE, - false, - 0, NULL, - 0, NULL, - OFPUTIL_P_NONE, - OFPUTIL_P_NONE, - }, { - MFF_TUN_TTL, "tun_ttl", NULL, - MF_FIELD_SIZES(u8), - MFM_NONE, - MFS_DECIMAL, - MFP_NONE, - false, - 0, NULL, - 0, NULL, - OFPUTIL_P_NONE, - OFPUTIL_P_NONE, - }, { - MFF_TUN_TOS, "tun_tos", NULL, - MF_FIELD_SIZES(u8), - MFM_NONE, - MFS_DECIMAL, - MFP_NONE, - false, - 0, NULL, - 0, NULL, - OFPUTIL_P_NONE, - OFPUTIL_P_NONE, - }, { - MFF_METADATA, "metadata", NULL, - MF_FIELD_SIZES(be64), - MFM_FULLY, - MFS_HEXADECIMAL, - MFP_NONE, - true, - OXM_OF_METADATA, "OXM_OF_METADATA", - OXM_OF_METADATA, "OXM_OF_METADATA", - OFPUTIL_P_NXM_OF11_UP, - OFPUTIL_P_NXM_OF11_UP, - }, { - MFF_IN_PORT, "in_port", NULL, - MF_FIELD_SIZES(be16), - MFM_NONE, - MFS_OFP_PORT, - MFP_NONE, - true, - NXM_OF_IN_PORT, "NXM_OF_IN_PORT", - NXM_OF_IN_PORT, "NXM_OF_IN_PORT", - OFPUTIL_P_ANY, /* OF11+ via mapping to 32 bits. */ - OFPUTIL_P_NONE, - }, { - MFF_IN_PORT_OXM, "in_port_oxm", NULL, - MF_FIELD_SIZES(be32), - 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", - OFPUTIL_P_OF11_UP, - OFPUTIL_P_NONE, - }, { - MFF_SKB_PRIORITY, "skb_priority", NULL, - MF_FIELD_SIZES(be32), - MFM_NONE, - MFS_HEXADECIMAL, - MFP_NONE, - false, - 0, NULL, - 0, NULL, - OFPUTIL_P_NONE, - OFPUTIL_P_NONE, - }, { - 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", - OFPUTIL_P_NXM_OXM_ANY, - OFPUTIL_P_NXM_OXM_ANY, - }, - -#define REGISTER(IDX) \ - { \ - MFF_REG##IDX, "reg" #IDX, NULL, \ - MF_FIELD_SIZES(be32), \ - MFM_FULLY, \ - MFS_HEXADECIMAL, \ - MFP_NONE, \ - true, \ - NXM_NX_REG(IDX), "NXM_NX_REG" #IDX, \ - NXM_NX_REG(IDX), "NXM_NX_REG" #IDX, \ - OFPUTIL_P_NXM_OXM_ANY, \ - OFPUTIL_P_NXM_OXM_ANY, \ - } -#if FLOW_N_REGS > 0 - REGISTER(0), -#endif -#if FLOW_N_REGS > 1 - REGISTER(1), -#endif -#if FLOW_N_REGS > 2 - REGISTER(2), -#endif -#if FLOW_N_REGS > 3 - REGISTER(3), -#endif -#if FLOW_N_REGS > 4 - REGISTER(4), -#endif -#if FLOW_N_REGS > 5 - REGISTER(5), -#endif -#if FLOW_N_REGS > 6 - REGISTER(6), -#endif -#if FLOW_N_REGS > 7 - REGISTER(7), -#endif -#if FLOW_N_REGS > 8 -#error -#endif - - /* ## -- ## */ - /* ## L2 ## */ - /* ## -- ## */ - - { - MFF_ETH_SRC, "eth_src", "dl_src", - MF_FIELD_SIZES(mac), - MFM_FULLY, - MFS_ETHERNET, - MFP_NONE, - true, - NXM_OF_ETH_SRC, "NXM_OF_ETH_SRC", - OXM_OF_ETH_SRC, "OXM_OF_ETH_SRC", - OFPUTIL_P_ANY, - OFPUTIL_P_NXM_OF11_UP, /* Bitwise masking only with NXM and OF11+! */ - }, { - MFF_ETH_DST, "eth_dst", "dl_dst", - MF_FIELD_SIZES(mac), - MFM_FULLY, - MFS_ETHERNET, - MFP_NONE, - true, - NXM_OF_ETH_DST, "NXM_OF_ETH_DST", - OXM_OF_ETH_DST, "OXM_OF_ETH_DST", - OFPUTIL_P_ANY, - OFPUTIL_P_NXM_OF11_UP, /* Bitwise masking only with NXM and OF11+! */ - }, { - MFF_ETH_TYPE, "eth_type", "dl_type", - MF_FIELD_SIZES(be16), - MFM_NONE, - MFS_HEXADECIMAL, - MFP_NONE, - false, - NXM_OF_ETH_TYPE, "NXM_OF_ETH_TYPE", - OXM_OF_ETH_TYPE, "OXM_OF_ETH_TYPE", - OFPUTIL_P_ANY, - OFPUTIL_P_NONE, - }, - - { - MFF_VLAN_TCI, "vlan_tci", NULL, - MF_FIELD_SIZES(be16), - MFM_FULLY, - MFS_HEXADECIMAL, - MFP_NONE, - true, - NXM_OF_VLAN_TCI, "NXM_OF_VLAN_TCI", - NXM_OF_VLAN_TCI, "NXM_OF_VLAN_TCI", - OFPUTIL_P_ANY, - OFPUTIL_P_NXM_OXM_ANY, - }, { - MFF_DL_VLAN, "dl_vlan", NULL, - sizeof(ovs_be16), 12, - MFM_NONE, - MFS_DECIMAL, - MFP_NONE, - true, - 0, NULL, - 0, NULL, - OFPUTIL_P_ANY, - OFPUTIL_P_NXM_OXM_ANY, - }, { - MFF_VLAN_VID, "vlan_vid", NULL, - sizeof(ovs_be16), 12, - MFM_FULLY, - MFS_DECIMAL, - MFP_NONE, - true, - OXM_OF_VLAN_VID, "OXM_OF_VLAN_VID", - OXM_OF_VLAN_VID, "OXM_OF_VLAN_VID", - OFPUTIL_P_ANY, - OFPUTIL_P_NXM_OXM_ANY, - }, { - MFF_DL_VLAN_PCP, "dl_vlan_pcp", NULL, - 1, 3, - MFM_NONE, - MFS_DECIMAL, - MFP_NONE, - true, - 0, NULL, - 0, NULL, - OFPUTIL_P_ANY, /* Will be mapped to NXM and OXM. */ - OFPUTIL_P_NONE, - }, { - MFF_VLAN_PCP, "vlan_pcp", NULL, - 1, 3, - MFM_NONE, - MFS_DECIMAL, - MFP_VLAN_VID, - true, - OXM_OF_VLAN_PCP, "OXM_OF_VLAN_PCP", - OXM_OF_VLAN_PCP, "OXM_OF_VLAN_PCP", - OFPUTIL_P_ANY, /* Will be mapped to OF10 and NXM. */ - OFPUTIL_P_NONE, - }, - - /* ## ---- ## */ - /* ## 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", - OFPUTIL_P_NXM_OF11_UP, - OFPUTIL_P_NONE, - }, { - 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", - OFPUTIL_P_NXM_OF11_UP, - OFPUTIL_P_NONE, - }, { - 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", - OFPUTIL_P_NXM_OXM_ANY, - OFPUTIL_P_NONE, - }, - - /* ## -- ## */ - /* ## L3 ## */ - /* ## -- ## */ - - { - MFF_IPV4_SRC, "ip_src", "nw_src", - MF_FIELD_SIZES(be32), - MFM_FULLY, - MFS_IPV4, - MFP_IPV4, - true, - NXM_OF_IP_SRC, "NXM_OF_IP_SRC", - OXM_OF_IPV4_SRC, "OXM_OF_IPV4_SRC", - OFPUTIL_P_ANY, - OFPUTIL_P_NXM_OF11_UP, - }, { - MFF_IPV4_DST, "ip_dst", "nw_dst", - MF_FIELD_SIZES(be32), - MFM_FULLY, - MFS_IPV4, - MFP_IPV4, - true, - NXM_OF_IP_DST, "NXM_OF_IP_DST", - OXM_OF_IPV4_DST, "OXM_OF_IPV4_DST", - OFPUTIL_P_ANY, - OFPUTIL_P_NXM_OF11_UP, - }, - - { - MFF_IPV6_SRC, "ipv6_src", NULL, - MF_FIELD_SIZES(ipv6), - MFM_FULLY, - MFS_IPV6, - MFP_IPV6, - true, - NXM_NX_IPV6_SRC, "NXM_NX_IPV6_SRC", - OXM_OF_IPV6_SRC, "OXM_OF_IPV6_SRC", - OFPUTIL_P_NXM_OXM_ANY, - OFPUTIL_P_NXM_OXM_ANY, - }, { - MFF_IPV6_DST, "ipv6_dst", NULL, - MF_FIELD_SIZES(ipv6), - MFM_FULLY, - MFS_IPV6, - MFP_IPV6, - true, - NXM_NX_IPV6_DST, "NXM_NX_IPV6_DST", - OXM_OF_IPV6_DST, "OXM_OF_IPV6_DST", - OFPUTIL_P_NXM_OXM_ANY, - OFPUTIL_P_NXM_OXM_ANY, - }, - { - MFF_IPV6_LABEL, "ipv6_label", NULL, - 4, 20, - MFM_FULLY, - MFS_HEXADECIMAL, - MFP_IPV6, - false, - NXM_NX_IPV6_LABEL, "NXM_NX_IPV6_LABEL", - OXM_OF_IPV6_FLABEL, "OXM_OF_IPV6_FLABEL", - OFPUTIL_P_NXM_OXM_ANY, - OFPUTIL_P_NXM_OXM_ANY, - }, - - { - MFF_IP_PROTO, "nw_proto", NULL, - MF_FIELD_SIZES(u8), - MFM_NONE, - MFS_DECIMAL, - MFP_IP_ANY, - false, - NXM_OF_IP_PROTO, "NXM_OF_IP_PROTO", - OXM_OF_IP_PROTO, "OXM_OF_IP_PROTO", - OFPUTIL_P_ANY, - OFPUTIL_P_NONE, - }, { - MFF_IP_DSCP, "nw_tos", NULL, - MF_FIELD_SIZES(u8), - MFM_NONE, - MFS_DECIMAL, - MFP_IP_ANY, - true, - NXM_OF_IP_TOS, "NXM_OF_IP_TOS", - NXM_OF_IP_TOS, "NXM_OF_IP_TOS", - OFPUTIL_P_ANY, /* Will be shifted for OXM. */ - OFPUTIL_P_NONE, - }, { - MFF_IP_DSCP_SHIFTED, "nw_tos_shifted", NULL, - MF_FIELD_SIZES(u8), - MFM_NONE, - MFS_DECIMAL, - MFP_IP_ANY, - true, - OXM_OF_IP_DSCP, "OXM_OF_IP_DSCP", - OXM_OF_IP_DSCP, "OXM_OF_IP_DSCP", - OFPUTIL_P_ANY, /* Will be shifted for non-OXM. */ - OFPUTIL_P_NONE, - }, { - MFF_IP_ECN, "nw_ecn", NULL, - 1, 2, - MFM_NONE, - MFS_DECIMAL, - MFP_IP_ANY, - true, - NXM_NX_IP_ECN, "NXM_NX_IP_ECN", - OXM_OF_IP_ECN, "OXM_OF_IP_ECN", - OFPUTIL_P_NXM_OXM_ANY, - OFPUTIL_P_NONE, - }, { - MFF_IP_TTL, "nw_ttl", NULL, - MF_FIELD_SIZES(u8), - MFM_NONE, - MFS_DECIMAL, - MFP_IP_ANY, - true, - NXM_NX_IP_TTL, "NXM_NX_IP_TTL", - NXM_NX_IP_TTL, "NXM_NX_IP_TTL", - OFPUTIL_P_NXM_OXM_ANY, - OFPUTIL_P_NONE, - }, { - MFF_IP_FRAG, "ip_frag", NULL, - 1, 2, - MFM_FULLY, - MFS_FRAG, - MFP_IP_ANY, - false, - NXM_NX_IP_FRAG, "NXM_NX_IP_FRAG", - NXM_NX_IP_FRAG, "NXM_NX_IP_FRAG", - OFPUTIL_P_NXM_OXM_ANY, - OFPUTIL_P_NXM_OXM_ANY, - }, - - { - MFF_ARP_OP, "arp_op", NULL, - MF_FIELD_SIZES(be16), - MFM_NONE, - MFS_DECIMAL, - MFP_ARP, - true, - NXM_OF_ARP_OP, "NXM_OF_ARP_OP", - OXM_OF_ARP_OP, "OXM_OF_ARP_OP", - OFPUTIL_P_ANY, - OFPUTIL_P_NONE, - }, { - MFF_ARP_SPA, "arp_spa", NULL, - MF_FIELD_SIZES(be32), - MFM_FULLY, - MFS_IPV4, - MFP_ARP, - true, - NXM_OF_ARP_SPA, "NXM_OF_ARP_SPA", - OXM_OF_ARP_SPA, "OXM_OF_ARP_SPA", - OFPUTIL_P_ANY, - OFPUTIL_P_NXM_OF11_UP, - }, { - MFF_ARP_TPA, "arp_tpa", NULL, - MF_FIELD_SIZES(be32), - MFM_FULLY, - MFS_IPV4, - MFP_ARP, - true, - NXM_OF_ARP_TPA, "NXM_OF_ARP_TPA", - OXM_OF_ARP_TPA, "OXM_OF_ARP_TPA", - OFPUTIL_P_ANY, - OFPUTIL_P_NXM_OF11_UP, - }, { - MFF_ARP_SHA, "arp_sha", NULL, - MF_FIELD_SIZES(mac), - MFM_FULLY, - MFS_ETHERNET, - MFP_ARP, - true, - NXM_NX_ARP_SHA, "NXM_NX_ARP_SHA", - OXM_OF_ARP_SHA, "OXM_OF_ARP_SHA", - OFPUTIL_P_NXM_OXM_ANY, - OFPUTIL_P_NXM_OXM_ANY, - }, { - MFF_ARP_THA, "arp_tha", NULL, - MF_FIELD_SIZES(mac), - MFM_FULLY, - MFS_ETHERNET, - MFP_ARP, - true, - NXM_NX_ARP_THA, "NXM_NX_ARP_THA", - OXM_OF_ARP_THA, "OXM_OF_ARP_THA", - OFPUTIL_P_NXM_OXM_ANY, - OFPUTIL_P_NXM_OXM_ANY, - }, - - /* ## -- ## */ - /* ## L4 ## */ - /* ## -- ## */ - - { - MFF_TCP_SRC, "tcp_src", "tp_src", - MF_FIELD_SIZES(be16), - MFM_FULLY, - MFS_DECIMAL, - MFP_TCP, - true, - NXM_OF_TCP_SRC, "NXM_OF_TCP_SRC", - OXM_OF_TCP_SRC, "OXM_OF_TCP_SRC", - OFPUTIL_P_ANY, - OFPUTIL_P_NXM_OXM_ANY, - }, { - MFF_TCP_DST, "tcp_dst", "tp_dst", - MF_FIELD_SIZES(be16), - MFM_FULLY, - MFS_DECIMAL, - MFP_TCP, - true, - NXM_OF_TCP_DST, "NXM_OF_TCP_DST", - OXM_OF_TCP_DST, "OXM_OF_TCP_DST", - OFPUTIL_P_ANY, - OFPUTIL_P_NXM_OXM_ANY, - }, - - { - MFF_UDP_SRC, "udp_src", NULL, - MF_FIELD_SIZES(be16), - MFM_FULLY, - MFS_DECIMAL, - MFP_UDP, - true, - NXM_OF_UDP_SRC, "NXM_OF_UDP_SRC", - OXM_OF_UDP_SRC, "OXM_OF_UDP_SRC", - OFPUTIL_P_ANY, - OFPUTIL_P_NXM_OXM_ANY, - }, { - MFF_UDP_DST, "udp_dst", NULL, - MF_FIELD_SIZES(be16), - MFM_FULLY, - MFS_DECIMAL, - MFP_UDP, - true, - NXM_OF_UDP_DST, "NXM_OF_UDP_DST", - OXM_OF_UDP_DST, "OXM_OF_UDP_DST", - OFPUTIL_P_ANY, - OFPUTIL_P_NXM_OXM_ANY, - }, - - { - MFF_SCTP_SRC, "sctp_src", NULL, - MF_FIELD_SIZES(be16), - MFM_FULLY, - MFS_DECIMAL, - MFP_SCTP, - true, - OXM_OF_SCTP_SRC, "OXM_OF_SCTP_SRC", - OXM_OF_SCTP_SRC, "OXM_OF_SCTP_SRC", - OFPUTIL_P_NXM_OF11_UP, - OFPUTIL_P_NXM_OXM_ANY, - }, { - MFF_SCTP_DST, "sctp_dst", NULL, - MF_FIELD_SIZES(be16), - MFM_FULLY, - MFS_DECIMAL, - MFP_SCTP, - true, - OXM_OF_SCTP_DST, "OXM_OF_SCTP_DST", - OXM_OF_SCTP_DST, "OXM_OF_SCTP_DST", - OFPUTIL_P_NXM_OF11_UP, - OFPUTIL_P_NXM_OXM_ANY, - }, - - { - MFF_ICMPV4_TYPE, "icmp_type", NULL, - MF_FIELD_SIZES(u8), - MFM_NONE, - MFS_DECIMAL, - MFP_ICMPV4, - false, - NXM_OF_ICMP_TYPE, "NXM_OF_ICMP_TYPE", - OXM_OF_ICMPV4_TYPE, "OXM_OF_ICMPV4_TYPE", - OFPUTIL_P_ANY, - OFPUTIL_P_NONE, - }, { - MFF_ICMPV4_CODE, "icmp_code", NULL, - MF_FIELD_SIZES(u8), - MFM_NONE, - MFS_DECIMAL, - MFP_ICMPV4, - false, - NXM_OF_ICMP_CODE, "NXM_OF_ICMP_CODE", - OXM_OF_ICMPV4_CODE, "OXM_OF_ICMPV4_CODE", - OFPUTIL_P_ANY, - OFPUTIL_P_NONE, - }, - - { - MFF_ICMPV6_TYPE, "icmpv6_type", NULL, - MF_FIELD_SIZES(u8), - MFM_NONE, - MFS_DECIMAL, - MFP_ICMPV6, - false, - NXM_NX_ICMPV6_TYPE, "NXM_NX_ICMPV6_TYPE", - OXM_OF_ICMPV6_TYPE, "OXM_OF_ICMPV6_TYPE", - OFPUTIL_P_NXM_OXM_ANY, - OFPUTIL_P_NONE, - }, { - MFF_ICMPV6_CODE, "icmpv6_code", NULL, - MF_FIELD_SIZES(u8), - MFM_NONE, - MFS_DECIMAL, - MFP_ICMPV6, - false, - NXM_NX_ICMPV6_CODE, "NXM_NX_ICMPV6_CODE", - OXM_OF_ICMPV6_CODE, "OXM_OF_ICMPV6_CODE", - OFPUTIL_P_NXM_OXM_ANY, - OFPUTIL_P_NONE, - }, - - /* ## ---- ## */ - /* ## L"5" ## */ - /* ## ---- ## */ - - { - MFF_ND_TARGET, "nd_target", NULL, - MF_FIELD_SIZES(ipv6), - MFM_FULLY, - MFS_IPV6, - MFP_ND, - false, - NXM_NX_ND_TARGET, "NXM_NX_ND_TARGET", - OXM_OF_IPV6_ND_TARGET, "OXM_OF_IPV6_ND_TARGET", - OFPUTIL_P_NXM_OXM_ANY, - OFPUTIL_P_NXM_OXM_ANY, - }, { - MFF_ND_SLL, "nd_sll", NULL, - MF_FIELD_SIZES(mac), - MFM_FULLY, - MFS_ETHERNET, - MFP_ND_SOLICIT, - false, - NXM_NX_ND_SLL, "NXM_NX_ND_SLL", - OXM_OF_IPV6_ND_SLL, "OXM_OF_IPV6_ND_SLL", - OFPUTIL_P_NXM_OXM_ANY, - OFPUTIL_P_NXM_OXM_ANY, - }, { - MFF_ND_TLL, "nd_tll", NULL, - MF_FIELD_SIZES(mac), - MFM_FULLY, - MFS_ETHERNET, - MFP_ND_ADVERT, - false, - NXM_NX_ND_TLL, "NXM_NX_ND_TLL", - OXM_OF_IPV6_ND_TLL, "OXM_OF_IPV6_ND_TLL", - OFPUTIL_P_NXM_OXM_ANY, - OFPUTIL_P_NXM_OXM_ANY, - } -}; +extern const struct mf_field mf_fields[MFF_N_IDS]; /* Silence a warning. */ -/* Maps an NXM or OXM header value to an mf_field. */ -struct nxm_field { - struct hmap_node hmap_node; /* In 'all_fields' hmap. */ - uint32_t header; /* NXM or OXM header value. */ - const struct mf_field *mf; +const struct mf_field mf_fields[MFF_N_IDS] = { +#include "meta-flow.inc" }; -/* Contains 'struct nxm_field's. */ -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; @@ -714,16 +60,16 @@ static struct shash mf_by_name; * 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); +#define MF_VALUE_EXACT_8 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff +#define MF_VALUE_EXACT_16 MF_VALUE_EXACT_8, MF_VALUE_EXACT_8 +#define MF_VALUE_EXACT_32 MF_VALUE_EXACT_16, MF_VALUE_EXACT_16 +#define MF_VALUE_EXACT_64 MF_VALUE_EXACT_32, MF_VALUE_EXACT_32 +#define MF_VALUE_EXACT_128 MF_VALUE_EXACT_64, MF_VALUE_EXACT_64 +#define MF_VALUE_EXACT_INITIALIZER { .tun_metadata = { MF_VALUE_EXACT_128 } } -/* Returns the field with the given 'id'. */ -const struct mf_field * -mf_from_id(enum mf_field_id id) -{ - ovs_assert((unsigned int) id < MFF_N_IDS); - return &mf_fields[id]; -} +const union mf_value exact_match_mask = MF_VALUE_EXACT_INITIALIZER; + +static void nxm_init(void); /* Returns the field with the given 'name', or a null pointer if no field has * that name. */ @@ -734,46 +80,17 @@ mf_from_name(const char *name) return shash_find_data(&mf_by_name, name); } -static void -add_nxm_field(uint32_t header, const struct mf_field *mf) -{ - struct nxm_field *f; - - f = xmalloc(sizeof *f); - hmap_insert(&all_fields, &f->hmap_node, hash_int(header, 0)); - f->header = header; - f->mf = mf; -} - -static void -nxm_init_add_field(const struct mf_field *mf, uint32_t header) -{ - if (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); - } - } -} - static void nxm_do_init(void) { int i; - hmap_init(&all_fields); shash_init(&mf_by_name); for (i = 0; i < MFF_N_IDS; i++) { const struct mf_field *mf = &mf_fields[i]; ovs_assert(mf->id == i); /* Fields must be in the enum order. */ - nxm_init_add_field(mf, mf->nxm_header); - if (mf->oxm_header != mf->nxm_header) { - nxm_init_add_field(mf, mf->oxm_header); - } - shash_add_once(&mf_by_name, mf->name, mf); if (mf->extra_name) { shash_add_once(&mf_by_name, mf->extra_name, mf); @@ -788,25 +105,77 @@ nxm_init(void) pthread_once(&once, nxm_do_init); } -const struct mf_field * -mf_from_nxm_header(uint32_t header) +/* Consider the two value/mask pairs 'a_value/a_mask' and 'b_value/b_mask' as + * restrictions on a field's value. Then, this function initializes + * 'dst_value/dst_mask' such that it combines the restrictions of both pairs. + * This is not always possible, i.e. if one pair insists on a value of 0 in + * some bit and the other pair insists on a value of 1 in that bit. This + * function returns false in a case where the combined restriction is + * impossible (in which case 'dst_value/dst_mask' is not fully initialized), + * true otherwise. + * + * (As usually true for value/mask pairs in OVS, any 1-bit in a value must have + * a corresponding 1-bit in its mask.) */ +bool +mf_subvalue_intersect(const union mf_subvalue *a_value, + const union mf_subvalue *a_mask, + const union mf_subvalue *b_value, + const union mf_subvalue *b_mask, + union mf_subvalue *dst_value, + union mf_subvalue *dst_mask) { - nxm_init(); - return mf_from_nxm_header__(header); + for (int i = 0; i < ARRAY_SIZE(a_value->be64); i++) { + ovs_be64 av = a_value->be64[i]; + ovs_be64 am = a_mask->be64[i]; + ovs_be64 bv = b_value->be64[i]; + ovs_be64 bm = b_mask->be64[i]; + ovs_be64 *dv = &dst_value->be64[i]; + ovs_be64 *dm = &dst_mask->be64[i]; + + if ((av ^ bv) & (am & bm)) { + return false; + } + *dv = av | bv; + *dm = am | bm; + } + return true; } -const struct mf_field * -mf_from_nxm_header__(uint32_t header) +/* Returns the "number of bits" in 'v', e.g. 1 if only the lowest-order bit is + * set, 2 if the second-lowest-order bit is set, and so on. */ +int +mf_subvalue_width(const union mf_subvalue *v) { - const struct nxm_field *f; + return 1 + bitwise_rscan(v, sizeof *v, true, sizeof *v * 8 - 1, -1); +} - HMAP_FOR_EACH_IN_BUCKET (f, hmap_node, hash_int(header, 0), &all_fields) { - if (f->header == header) { - return f->mf; +/* For positive 'n', shifts the bits in 'value' 'n' bits to the left, and for + * negative 'n', shifts the bits '-n' bits to the right. */ +void +mf_subvalue_shift(union mf_subvalue *value, int n) +{ + if (n) { + union mf_subvalue tmp; + memset(&tmp, 0, sizeof tmp); + + if (n > 0 && n < 8 * sizeof tmp) { + bitwise_copy(value, sizeof *value, 0, + &tmp, sizeof tmp, n, + 8 * sizeof tmp - n); + } else if (n < 0 && n > -8 * sizeof tmp) { + bitwise_copy(value, sizeof *value, -n, + &tmp, sizeof tmp, 0, + 8 * sizeof tmp + n); } + *value = tmp; } +} - return NULL; +/* Appends a formatted representation of 'sv' to 's'. */ +void +mf_subvalue_format(const union mf_subvalue *sv, struct ds *s) +{ + ds_put_hex(s, sv, sizeof *sv); } /* Returns true if 'wc' wildcards all the bits in field 'mf', false if 'wc' @@ -818,15 +187,35 @@ bool mf_is_all_wild(const struct mf_field *mf, const struct flow_wildcards *wc) { switch (mf->id) { + case MFF_DP_HASH: + return !wc->masks.dp_hash; + case MFF_RECIRC_ID: + return !wc->masks.recirc_id; + case MFF_CONJ_ID: + return !wc->masks.conj_id; case MFF_TUN_SRC: return !wc->masks.tunnel.ip_src; case MFF_TUN_DST: return !wc->masks.tunnel.ip_dst; + case MFF_TUN_IPV6_SRC: + return ipv6_mask_is_any(&wc->masks.tunnel.ipv6_src); + case MFF_TUN_IPV6_DST: + return ipv6_mask_is_any(&wc->masks.tunnel.ipv6_dst); case MFF_TUN_ID: + return !wc->masks.tunnel.tun_id; case MFF_TUN_TOS: + return !wc->masks.tunnel.ip_tos; case MFF_TUN_TTL: + return !wc->masks.tunnel.ip_ttl; case MFF_TUN_FLAGS: - return !wc->masks.tunnel.tun_id; + return !(wc->masks.tunnel.flags & FLOW_TNL_PUB_F_MASK); + case MFF_TUN_GBP_ID: + return !wc->masks.tunnel.gbp_id; + case MFF_TUN_GBP_FLAGS: + return !wc->masks.tunnel.gbp_flags; + CASE_MFF_TUN_METADATA: + return !ULLONG_GET(wc->masks.tunnel.metadata.present.map, + mf->id - MFF_TUN_METADATA0); case MFF_METADATA: return !wc->masks.metadata; case MFF_IN_PORT: @@ -836,8 +225,20 @@ mf_is_all_wild(const struct mf_field *mf, const struct flow_wildcards *wc) return !wc->masks.skb_priority; case MFF_PKT_MARK: return !wc->masks.pkt_mark; + case MFF_CT_STATE: + return !wc->masks.ct_state; + case MFF_CT_ZONE: + return !wc->masks.ct_zone; + case MFF_CT_MARK: + return !wc->masks.ct_mark; + case MFF_CT_LABEL: + return ovs_u128_is_zero(&wc->masks.ct_label); CASE_MFF_REGS: return !wc->masks.regs[mf->id - MFF_REG0]; + CASE_MFF_XREGS: + return !flow_get_xreg(&wc->masks, mf->id - MFF_XREG0); + case MFF_ACTSET_OUTPUT: + return !wc->masks.actset_output; case MFF_ETH_SRC: return eth_addr_is_zero(wc->masks.dl_src); @@ -865,11 +266,13 @@ mf_is_all_wild(const struct mf_field *mf, const struct flow_wildcards *wc) return !(wc->masks.vlan_tci & htons(VLAN_PCP_MASK)); case MFF_MPLS_LABEL: - return !(wc->masks.mpls_lse & htonl(MPLS_LABEL_MASK)); + return !(wc->masks.mpls_lse[0] & htonl(MPLS_LABEL_MASK)); case MFF_MPLS_TC: - return !(wc->masks.mpls_lse & htonl(MPLS_TC_MASK)); + return !(wc->masks.mpls_lse[0] & htonl(MPLS_TC_MASK)); case MFF_MPLS_BOS: - return !(wc->masks.mpls_lse & htonl(MPLS_BOS_MASK)); + return !(wc->masks.mpls_lse[0] & htonl(MPLS_BOS_MASK)); + case MFF_MPLS_TTL: + return !(wc->masks.mpls_lse[0] & htonl(MPLS_TTL_MASK)); case MFF_IPV4_SRC: return !wc->masks.nw_src; @@ -919,10 +322,12 @@ mf_is_all_wild(const struct mf_field *mf, const struct flow_wildcards *wc) case MFF_ICMPV4_CODE: case MFF_ICMPV6_CODE: return !wc->masks.tp_dst; + case MFF_TCP_FLAGS: + return !wc->masks.tcp_flags; case MFF_N_IDS: default: - NOT_REACHED(); + OVS_NOT_REACHED(); } } @@ -946,28 +351,14 @@ mf_is_mask_valid(const struct mf_field *mf, const union mf_value *mask) { switch (mf->maskable) { case MFM_NONE: - return (is_all_zeros((const uint8_t *) mask, mf->n_bytes) || - is_all_ones((const uint8_t *) mask, mf->n_bytes)); + return (is_all_zeros(mask, mf->n_bytes) || + is_all_ones(mask, mf->n_bytes)); case MFM_FULLY: return true; } - NOT_REACHED(); -} - -static bool -is_icmpv4(const struct flow *flow) -{ - return (flow->dl_type == htons(ETH_TYPE_IP) - && flow->nw_proto == IPPROTO_ICMP); -} - -static bool -is_icmpv6(const struct flow *flow) -{ - return (flow->dl_type == htons(ETH_TYPE_IPV6) - && flow->nw_proto == IPPROTO_ICMPV6); + OVS_NOT_REACHED(); } /* Returns true if 'flow' meets the prerequisites for 'mf', false otherwise. */ @@ -993,11 +384,14 @@ mf_are_prereqs_ok(const struct mf_field *mf, const struct flow *flow) return is_ip_any(flow); case MFP_TCP: - return is_ip_any(flow) && flow->nw_proto == IPPROTO_TCP; + return is_ip_any(flow) && flow->nw_proto == IPPROTO_TCP + && !(flow->nw_frag & FLOW_NW_FRAG_LATER); case MFP_UDP: - return is_ip_any(flow) && flow->nw_proto == IPPROTO_UDP; + return is_ip_any(flow) && flow->nw_proto == IPPROTO_UDP + && !(flow->nw_frag & FLOW_NW_FRAG_LATER); case MFP_SCTP: - return is_ip_any(flow) && flow->nw_proto == IPPROTO_SCTP; + return is_ip_any(flow) && flow->nw_proto == IPPROTO_SCTP + && !(flow->nw_frag & FLOW_NW_FRAG_LATER); case MFP_ICMPV4: return is_icmpv4(flow); case MFP_ICMPV6: @@ -1018,7 +412,81 @@ mf_are_prereqs_ok(const struct mf_field *mf, const struct flow *flow) && (flow->tp_src == htons(ND_NEIGHBOR_ADVERT))); } - NOT_REACHED(); + OVS_NOT_REACHED(); +} + +/* Set field and it's prerequisities in the mask. + * This is only ever called for writeable 'mf's, but we do not make the + * distinction here. */ +void +mf_mask_field_and_prereqs(const struct mf_field *mf, struct flow_wildcards *wc) +{ + mf_set_flow_value(mf, &exact_match_mask, &wc->masks); + + switch (mf->prereqs) { + case MFP_ND: + case MFP_ND_SOLICIT: + case MFP_ND_ADVERT: + WC_MASK_FIELD(wc, tp_src); + WC_MASK_FIELD(wc, tp_dst); + /* Fall through. */ + case MFP_TCP: + case MFP_UDP: + case MFP_SCTP: + case MFP_ICMPV4: + case MFP_ICMPV6: + /* nw_frag always unwildcarded. */ + WC_MASK_FIELD(wc, nw_proto); + /* Fall through. */ + case MFP_ARP: + case MFP_IPV4: + case MFP_IPV6: + case MFP_MPLS: + case MFP_IP_ANY: + /* dl_type always unwildcarded. */ + break; + case MFP_VLAN_VID: + WC_MASK_FIELD_MASK(wc, vlan_tci, htons(VLAN_CFI)); + break; + case MFP_NONE: + break; + } +} + +/* Set bits of 'bm' corresponding to the field 'mf' and it's prerequisities. */ +void +mf_bitmap_set_field_and_prereqs(const struct mf_field *mf, struct mf_bitmap *bm) +{ + bitmap_set1(bm->bm, mf->id); + + switch (mf->prereqs) { + case MFP_ND: + case MFP_ND_SOLICIT: + case MFP_ND_ADVERT: + bitmap_set1(bm->bm, MFF_TCP_SRC); + bitmap_set1(bm->bm, MFF_TCP_DST); + /* Fall through. */ + case MFP_TCP: + case MFP_UDP: + case MFP_SCTP: + case MFP_ICMPV4: + case MFP_ICMPV6: + /* nw_frag always unwildcarded. */ + bitmap_set1(bm->bm, MFF_IP_PROTO); + /* Fall through. */ + case MFP_ARP: + case MFP_IPV4: + case MFP_IPV6: + case MFP_MPLS: + case MFP_IP_ANY: + bitmap_set1(bm->bm, MFF_ETH_TYPE); + break; + case MFP_VLAN_VID: + bitmap_set1(bm->bm, MFF_VLAN_TCI); + break; + case MFP_NONE: + break; + } } /* Returns true if 'value' may be a valid value *as part of a masked match*, @@ -1035,21 +503,33 @@ bool mf_is_value_valid(const struct mf_field *mf, const union mf_value *value) { switch (mf->id) { + case MFF_DP_HASH: + case MFF_RECIRC_ID: + case MFF_CONJ_ID: case MFF_TUN_ID: case MFF_TUN_SRC: case MFF_TUN_DST: + case MFF_TUN_IPV6_SRC: + case MFF_TUN_IPV6_DST: case MFF_TUN_TOS: case MFF_TUN_TTL: - case MFF_TUN_FLAGS: + case MFF_TUN_GBP_ID: + case MFF_TUN_GBP_FLAGS: + CASE_MFF_TUN_METADATA: case MFF_METADATA: case MFF_IN_PORT: case MFF_SKB_PRIORITY: case MFF_PKT_MARK: + case MFF_CT_ZONE: + case MFF_CT_MARK: + case MFF_CT_LABEL: CASE_MFF_REGS: + CASE_MFF_XREGS: case MFF_ETH_SRC: case MFF_ETH_DST: case MFF_ETH_TYPE: case MFF_VLAN_TCI: + case MFF_MPLS_TTL: case MFF_IPV4_SRC: case MFF_IPV4_DST: case MFF_IPV6_SRC: @@ -1075,7 +555,8 @@ 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: { + case MFF_IN_PORT_OXM: + case MFF_ACTSET_OUTPUT: { ofp_port_t port; return !ofputil_port_from_ofp11(value->be32, &port); } @@ -1088,6 +569,8 @@ mf_is_value_valid(const struct mf_field *mf, const union mf_value *value) return !(value->u8 & ~IP_ECN_MASK); case MFF_IP_FRAG: return !(value->u8 & ~FLOW_NW_FRAG_MASK); + case MFF_TCP_FLAGS: + return !(value->be16 & ~htons(0x0fff)); case MFF_ARP_OP: return !(value->be16 & htons(0xff00)); @@ -1113,9 +596,15 @@ mf_is_value_valid(const struct mf_field *mf, const union mf_value *value) case MFF_MPLS_BOS: return !(value->u8 & ~(MPLS_BOS_MASK >> MPLS_BOS_SHIFT)); + case MFF_TUN_FLAGS: + return !(value->be16 & ~htons(FLOW_TNL_PUB_F_MASK)); + + case MFF_CT_STATE: + return !(value->be32 & ~htonl(CS_SUPPORTED_MASK)); + case MFF_N_IDS: default: - NOT_REACHED(); + OVS_NOT_REACHED(); } } @@ -1126,6 +615,15 @@ mf_get_value(const struct mf_field *mf, const struct flow *flow, union mf_value *value) { switch (mf->id) { + case MFF_DP_HASH: + value->be32 = htonl(flow->dp_hash); + break; + case MFF_RECIRC_ID: + value->be32 = htonl(flow->recirc_id); + break; + case MFF_CONJ_ID: + value->be32 = htonl(flow->conj_id); + break; case MFF_TUN_ID: value->be64 = flow->tunnel.tun_id; break; @@ -1135,8 +633,20 @@ mf_get_value(const struct mf_field *mf, const struct flow *flow, case MFF_TUN_DST: value->be32 = flow->tunnel.ip_dst; break; + case MFF_TUN_IPV6_SRC: + value->ipv6 = flow->tunnel.ipv6_src; + break; + case MFF_TUN_IPV6_DST: + value->ipv6 = flow->tunnel.ipv6_dst; + break; case MFF_TUN_FLAGS: - value->be16 = htons(flow->tunnel.flags); + value->be16 = htons(flow->tunnel.flags & FLOW_TNL_PUB_F_MASK); + break; + case MFF_TUN_GBP_ID: + value->be16 = flow->tunnel.gbp_id; + break; + case MFF_TUN_GBP_FLAGS: + value->u8 = flow->tunnel.gbp_flags; break; case MFF_TUN_TTL: value->u8 = flow->tunnel.ip_ttl; @@ -1144,6 +654,9 @@ mf_get_value(const struct mf_field *mf, const struct flow *flow, case MFF_TUN_TOS: value->u8 = flow->tunnel.ip_tos; break; + CASE_MFF_TUN_METADATA: + tun_metadata_read(&flow->tunnel, mf, value); + break; case MFF_METADATA: value->be64 = flow->metadata; @@ -1155,6 +668,9 @@ mf_get_value(const struct mf_field *mf, const struct flow *flow, case MFF_IN_PORT_OXM: value->be32 = ofputil_port_to_ofp11(flow->in_port.ofp_port); break; + case MFF_ACTSET_OUTPUT: + value->be32 = ofputil_port_to_ofp11(flow->actset_output); + break; case MFF_SKB_PRIORITY: value->be32 = htonl(flow->skb_priority); @@ -1164,16 +680,36 @@ mf_get_value(const struct mf_field *mf, const struct flow *flow, value->be32 = htonl(flow->pkt_mark); break; + case MFF_CT_STATE: + value->be32 = htonl(flow->ct_state); + break; + + case MFF_CT_ZONE: + value->be16 = htons(flow->ct_zone); + break; + + case MFF_CT_MARK: + value->be32 = htonl(flow->ct_mark); + break; + + case MFF_CT_LABEL: + value->be128 = hton128(flow->ct_label); + break; + CASE_MFF_REGS: value->be32 = htonl(flow->regs[mf->id - MFF_REG0]); break; + CASE_MFF_XREGS: + value->be64 = htonll(flow_get_xreg(flow, mf->id - MFF_XREG0)); + break; + case MFF_ETH_SRC: - memcpy(value->mac, flow->dl_src, ETH_ADDR_LEN); + value->mac = flow->dl_src; break; case MFF_ETH_DST: - memcpy(value->mac, flow->dl_dst, ETH_ADDR_LEN); + value->mac = flow->dl_dst; break; case MFF_ETH_TYPE: @@ -1197,15 +733,19 @@ mf_get_value(const struct mf_field *mf, const struct flow *flow, break; case MFF_MPLS_LABEL: - value->be32 = htonl(mpls_lse_to_label(flow->mpls_lse)); + value->be32 = htonl(mpls_lse_to_label(flow->mpls_lse[0])); break; case MFF_MPLS_TC: - value->u8 = mpls_lse_to_tc(flow->mpls_lse); + value->u8 = mpls_lse_to_tc(flow->mpls_lse[0]); break; case MFF_MPLS_BOS: - value->u8 = mpls_lse_to_bos(flow->mpls_lse); + value->u8 = mpls_lse_to_bos(flow->mpls_lse[0]); + break; + + case MFF_MPLS_TTL: + value->u8 = mpls_lse_to_ttl(flow->mpls_lse[0]); break; case MFF_IPV4_SRC: @@ -1266,12 +806,12 @@ mf_get_value(const struct mf_field *mf, const struct flow *flow, case MFF_ARP_SHA: case MFF_ND_SLL: - memcpy(value->mac, flow->arp_sha, ETH_ADDR_LEN); + value->mac = flow->arp_sha; break; case MFF_ARP_THA: case MFF_ND_TLL: - memcpy(value->mac, flow->arp_tha, ETH_ADDR_LEN); + value->mac = flow->arp_tha; break; case MFF_TCP_SRC: @@ -1286,6 +826,10 @@ mf_get_value(const struct mf_field *mf, const struct flow *flow, value->be16 = flow->tp_dst; break; + case MFF_TCP_FLAGS: + value->be16 = flow->tcp_flags; + break; + case MFF_ICMPV4_TYPE: case MFF_ICMPV6_TYPE: value->u8 = ntohs(flow->tp_src); @@ -1302,18 +846,35 @@ mf_get_value(const struct mf_field *mf, const struct flow *flow, case MFF_N_IDS: default: - NOT_REACHED(); + OVS_NOT_REACHED(); } } /* 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. */ + * prerequisites. + * + * If non-NULL, 'err_str' returns a malloc'ed string describing any errors + * with the request or NULL if there is no error. The caller is reponsible + * for freeing the string. */ void mf_set_value(const struct mf_field *mf, - const union mf_value *value, struct match *match) + const union mf_value *value, struct match *match, char **err_str) { + if (err_str) { + *err_str = NULL; + } + switch (mf->id) { + case MFF_DP_HASH: + match_set_dp_hash(match, ntohl(value->be32)); + break; + case MFF_RECIRC_ID: + match_set_recirc_id(match, ntohl(value->be32)); + break; + case MFF_CONJ_ID: + match_set_conj_id(match, ntohl(value->be32)); + break; case MFF_TUN_ID: match_set_tun_id(match, value->be64); break; @@ -1323,15 +884,30 @@ mf_set_value(const struct mf_field *mf, case MFF_TUN_DST: match_set_tun_dst(match, value->be32); break; + case MFF_TUN_IPV6_SRC: + match_set_tun_ipv6_src(match, &value->ipv6); + break; + case MFF_TUN_IPV6_DST: + match_set_tun_ipv6_dst(match, &value->ipv6); + break; case MFF_TUN_FLAGS: match_set_tun_flags(match, ntohs(value->be16)); break; + case MFF_TUN_GBP_ID: + match_set_tun_gbp_id(match, value->be16); + break; + case MFF_TUN_GBP_FLAGS: + match_set_tun_gbp_flags(match, value->u8); + 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_TUN_METADATA: + tun_metadata_set_match(mf, value, NULL, match, err_str); + break; case MFF_METADATA: match_set_metadata(match, value->be64); @@ -1347,6 +923,12 @@ mf_set_value(const struct mf_field *mf, match_set_in_port(match, port); break; } + case MFF_ACTSET_OUTPUT: { + ofp_port_t port; + ofputil_port_from_ofp11(value->be32, &port); + match_set_actset_output(match, port); + break; + } case MFF_SKB_PRIORITY: match_set_skb_priority(match, ntohl(value->be32)); @@ -1356,10 +938,30 @@ mf_set_value(const struct mf_field *mf, match_set_pkt_mark(match, ntohl(value->be32)); break; + case MFF_CT_STATE: + match_set_ct_state(match, ntohl(value->be32)); + break; + + case MFF_CT_ZONE: + match_set_ct_zone(match, ntohs(value->be16)); + break; + + case MFF_CT_MARK: + match_set_ct_mark(match, ntohl(value->be32)); + break; + + case MFF_CT_LABEL: + match_set_ct_label(match, ntoh128(value->be128)); + break; + CASE_MFF_REGS: match_set_reg(match, mf->id - MFF_REG0, ntohl(value->be32)); break; + CASE_MFF_XREGS: + match_set_xreg(match, mf->id - MFF_XREG0, ntohll(value->be64)); + break; + case MFF_ETH_SRC: match_set_dl_src(match, value->mac); break; @@ -1389,15 +991,19 @@ mf_set_value(const struct mf_field *mf, break; case MFF_MPLS_LABEL: - match_set_mpls_label(match, value->be32); + match_set_mpls_label(match, 0, value->be32); break; case MFF_MPLS_TC: - match_set_mpls_tc(match, value->u8); + match_set_mpls_tc(match, 0, value->u8); break; case MFF_MPLS_BOS: - match_set_mpls_bos(match, value->u8); + match_set_mpls_bos(match, 0, value->u8); + break; + + case MFF_MPLS_TTL: + match_set_mpls_ttl(match, 0, value->u8); break; case MFF_IPV4_SRC: @@ -1478,6 +1084,10 @@ mf_set_value(const struct mf_field *mf, match_set_tp_dst(match, value->be16); break; + case MFF_TCP_FLAGS: + match_set_tcp_flags(match, value->be16); + break; + case MFF_ICMPV4_TYPE: case MFF_ICMPV6_TYPE: match_set_icmp_type(match, value->u8); @@ -1494,8 +1104,75 @@ mf_set_value(const struct mf_field *mf, case MFF_N_IDS: default: - NOT_REACHED(); + OVS_NOT_REACHED(); + } +} + +/* Unwildcard 'mask' member field described by 'mf'. The caller is + * responsible for ensuring that 'mask' meets 'mf''s prerequisites. */ +void +mf_mask_field(const struct mf_field *mf, struct flow *mask) +{ + /* For MFF_DL_VLAN, we cannot send a all 1's to flow_set_dl_vlan() + * as that will be considered as OFP10_VLAN_NONE. So consider it as a + * special case. For the rest, calling mf_set_flow_value() is good + * enough. */ + if (mf->id == MFF_DL_VLAN) { + flow_set_dl_vlan(mask, htons(VLAN_VID_MASK)); + } else { + mf_set_flow_value(mf, &exact_match_mask, mask); + } +} + +static int +field_len(const struct mf_field *mf, const union mf_value *value_) +{ + const uint8_t *value = &value_->u8; + int i; + + if (!mf->variable_len) { + return mf->n_bytes; + } + + if (!value) { + return 0; + } + + for (i = 0; i < mf->n_bytes; i++) { + if (value[i] != 0) { + break; + } + } + + return mf->n_bytes - i; +} + +/* Returns the effective length of the field. For fixed length fields, + * this is just the defined length. For variable length fields, it is + * the minimum size encoding that retains the same meaning (i.e. + * discarding leading zeros). + * + * 'is_masked' returns (if non-NULL) whether the original contained + * a mask. Otherwise, a mask that is the same length as the value + * might be misinterpreted as an exact match. */ +int +mf_field_len(const struct mf_field *mf, const union mf_value *value, + const union mf_value *mask, bool *is_masked_) +{ + int len, mask_len; + bool is_masked = mask && !is_all_ones(mask, mf->n_bytes); + + len = field_len(mf, value); + if (is_masked) { + mask_len = field_len(mf, mask); + len = MAX(len, mask_len); + } + + if (is_masked_) { + *is_masked_ = is_masked; } + + return len; } /* Sets 'flow' member field described by 'mf' to 'value'. The caller is @@ -1505,6 +1182,15 @@ mf_set_flow_value(const struct mf_field *mf, const union mf_value *value, struct flow *flow) { switch (mf->id) { + case MFF_DP_HASH: + flow->dp_hash = ntohl(value->be32); + break; + case MFF_RECIRC_ID: + flow->recirc_id = ntohl(value->be32); + break; + case MFF_CONJ_ID: + flow->conj_id = ntohl(value->be32); + break; case MFF_TUN_ID: flow->tunnel.tun_id = value->be64; break; @@ -1514,8 +1200,21 @@ mf_set_flow_value(const struct mf_field *mf, case MFF_TUN_DST: flow->tunnel.ip_dst = value->be32; break; + case MFF_TUN_IPV6_SRC: + flow->tunnel.ipv6_src = value->ipv6; + break; + case MFF_TUN_IPV6_DST: + flow->tunnel.ipv6_dst = value->ipv6; + break; case MFF_TUN_FLAGS: - flow->tunnel.flags = ntohs(value->be16); + flow->tunnel.flags = (flow->tunnel.flags & ~FLOW_TNL_PUB_F_MASK) | + ntohs(value->be16); + break; + case MFF_TUN_GBP_ID: + flow->tunnel.gbp_id = value->be16; + break; + case MFF_TUN_GBP_FLAGS: + flow->tunnel.gbp_flags = value->u8; break; case MFF_TUN_TOS: flow->tunnel.ip_tos = value->u8; @@ -1523,7 +1222,9 @@ mf_set_flow_value(const struct mf_field *mf, case MFF_TUN_TTL: flow->tunnel.ip_ttl = value->u8; break; - + CASE_MFF_TUN_METADATA: + tun_metadata_write(&flow->tunnel, mf, value); + break; case MFF_METADATA: flow->metadata = value->be64; break; @@ -1532,12 +1233,12 @@ mf_set_flow_value(const struct mf_field *mf, 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; + case MFF_IN_PORT_OXM: + ofputil_port_from_ofp11(value->be32, &flow->in_port.ofp_port); + break; + case MFF_ACTSET_OUTPUT: + ofputil_port_from_ofp11(value->be32, &flow->actset_output); break; - } case MFF_SKB_PRIORITY: flow->skb_priority = ntohl(value->be32); @@ -1547,16 +1248,36 @@ mf_set_flow_value(const struct mf_field *mf, flow->pkt_mark = ntohl(value->be32); break; + case MFF_CT_STATE: + flow->ct_state = ntohl(value->be32); + break; + + case MFF_CT_ZONE: + flow->ct_zone = ntohs(value->be16); + break; + + case MFF_CT_MARK: + flow->ct_mark = ntohl(value->be32); + break; + + case MFF_CT_LABEL: + flow->ct_label = ntoh128(value->be128); + break; + CASE_MFF_REGS: flow->regs[mf->id - MFF_REG0] = ntohl(value->be32); break; + CASE_MFF_XREGS: + flow_set_xreg(flow, mf->id - MFF_XREG0, ntohll(value->be64)); + break; + case MFF_ETH_SRC: - memcpy(flow->dl_src, value->mac, ETH_ADDR_LEN); + flow->dl_src = value->mac; break; case MFF_ETH_DST: - memcpy(flow->dl_dst, value->mac, ETH_ADDR_LEN); + flow->dl_dst = value->mac; break; case MFF_ETH_TYPE: @@ -1580,15 +1301,19 @@ mf_set_flow_value(const struct mf_field *mf, break; case MFF_MPLS_LABEL: - flow_set_mpls_label(flow, value->be32); + flow_set_mpls_label(flow, 0, value->be32); break; case MFF_MPLS_TC: - flow_set_mpls_tc(flow, value->u8); + flow_set_mpls_tc(flow, 0, value->u8); break; case MFF_MPLS_BOS: - flow_set_mpls_bos(flow, value->u8); + flow_set_mpls_bos(flow, 0, value->u8); + break; + + case MFF_MPLS_TTL: + flow_set_mpls_ttl(flow, 0, value->u8); break; case MFF_IPV4_SRC: @@ -1608,7 +1333,7 @@ mf_set_flow_value(const struct mf_field *mf, break; case MFF_IPV6_LABEL: - flow->ipv6_label = value->be32 & ~htonl(IPV6_LABEL_MASK); + flow->ipv6_label = value->be32 & htonl(IPV6_LABEL_MASK); break; case MFF_IP_PROTO: @@ -1635,7 +1360,7 @@ mf_set_flow_value(const struct mf_field *mf, break; case MFF_IP_FRAG: - flow->nw_frag &= value->u8; + flow->nw_frag = value->u8 & FLOW_NW_FRAG_MASK; break; case MFF_ARP_OP: @@ -1652,12 +1377,12 @@ mf_set_flow_value(const struct mf_field *mf, case MFF_ARP_SHA: case MFF_ND_SLL: - memcpy(flow->arp_sha, value->mac, ETH_ADDR_LEN); + flow->arp_sha = value->mac; break; case MFF_ARP_THA: case MFF_ND_TLL: - memcpy(flow->arp_tha, value->mac, ETH_ADDR_LEN); + flow->arp_tha = value->mac; break; case MFF_TCP_SRC: @@ -1672,6 +1397,10 @@ mf_set_flow_value(const struct mf_field *mf, flow->tp_dst = value->be16; break; + case MFF_TCP_FLAGS: + flow->tcp_flags = value->be16; + break; + case MFF_ICMPV4_TYPE: case MFF_ICMPV6_TYPE: flow->tp_src = htons(value->u8); @@ -1688,31 +1417,94 @@ mf_set_flow_value(const struct mf_field *mf, case MFF_N_IDS: default: - NOT_REACHED(); + OVS_NOT_REACHED(); + } +} + +/* Consider each of 'src', 'mask', and 'dst' as if they were arrays of 8*n + * bits. Then, for each 0 <= i < 8 * n such that mask[i] == 1, sets dst[i] = + * src[i]. */ +static void +apply_mask(const uint8_t *src, const uint8_t *mask, uint8_t *dst, size_t n) +{ + size_t i; + + for (i = 0; i < n; i++) { + dst[i] = (src[i] & mask[i]) | (dst[i] & ~mask[i]); } } -/* Returns true if 'mf' has a zero value in 'flow', false if it is nonzero. +/* Sets 'flow' member field described by 'field' to 'value', except that bits + * for which 'mask' has a 0-bit keep their existing values. The caller is + * responsible for ensuring that 'flow' meets 'field''s prerequisites.*/ +void +mf_set_flow_value_masked(const struct mf_field *field, + const union mf_value *value, + const union mf_value *mask, + struct flow *flow) +{ + union mf_value tmp; + + mf_get_value(field, flow, &tmp); + apply_mask((const uint8_t *) value, (const uint8_t *) mask, + (uint8_t *) &tmp, field->n_bytes); + mf_set_flow_value(field, &tmp, flow); +} + +bool +mf_is_tun_metadata(const struct mf_field *mf) +{ + return mf->id >= MFF_TUN_METADATA0 && + mf->id < MFF_TUN_METADATA0 + TUN_METADATA_NUM_OPTS; +} + +/* Returns true if 'mf' has previously been set in 'flow', false if + * it contains a non-default value. * * The caller is responsible for ensuring that 'flow' meets 'mf''s * prerequisites. */ bool -mf_is_zero(const struct mf_field *mf, const struct flow *flow) +mf_is_set(const struct mf_field *mf, const struct flow *flow) { - union mf_value value; + if (!mf_is_tun_metadata(mf)) { + union mf_value value; - mf_get_value(mf, flow, &value); - return is_all_zeros((const uint8_t *) &value, mf->n_bytes); + mf_get_value(mf, flow, &value); + return !is_all_zeros(&value, mf->n_bytes); + } else { + return ULLONG_GET(flow->tunnel.metadata.present.map, + mf->id - MFF_TUN_METADATA0); + } } /* Makes 'match' wildcard field 'mf'. * * The caller is responsible for ensuring that 'match' meets 'mf''s - * prerequisites. */ + * prerequisites. + * + * If non-NULL, 'err_str' returns a malloc'ed string describing any errors + * with the request or NULL if there is no error. The caller is reponsible + * for freeing the string. */ void -mf_set_wild(const struct mf_field *mf, struct match *match) +mf_set_wild(const struct mf_field *mf, struct match *match, char **err_str) { + if (err_str) { + *err_str = NULL; + } + switch (mf->id) { + case MFF_DP_HASH: + match->flow.dp_hash = 0; + match->wc.masks.dp_hash = 0; + break; + case MFF_RECIRC_ID: + match->flow.recirc_id = 0; + match->wc.masks.recirc_id = 0; + break; + case MFF_CONJ_ID: + match->flow.conj_id = 0; + match->wc.masks.conj_id = 0; + break; case MFF_TUN_ID: match_set_tun_id_masked(match, htonll(0), htonll(0)); break; @@ -1722,15 +1514,36 @@ mf_set_wild(const struct mf_field *mf, struct match *match) case MFF_TUN_DST: match_set_tun_dst_masked(match, htonl(0), htonl(0)); break; + case MFF_TUN_IPV6_SRC: + memset(&match->wc.masks.tunnel.ipv6_src, 0, + sizeof match->wc.masks.tunnel.ipv6_src); + memset(&match->flow.tunnel.ipv6_src, 0, + sizeof match->flow.tunnel.ipv6_src); + break; + case MFF_TUN_IPV6_DST: + memset(&match->wc.masks.tunnel.ipv6_dst, 0, + sizeof match->wc.masks.tunnel.ipv6_dst); + memset(&match->flow.tunnel.ipv6_dst, 0, + sizeof match->flow.tunnel.ipv6_dst); + break; case MFF_TUN_FLAGS: match_set_tun_flags_masked(match, 0, 0); break; + case MFF_TUN_GBP_ID: + match_set_tun_gbp_id_masked(match, 0, 0); + break; + case MFF_TUN_GBP_FLAGS: + match_set_tun_gbp_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_TUN_METADATA: + tun_metadata_set_match(mf, NULL, NULL, match, err_str); + break; case MFF_METADATA: match_set_metadata_masked(match, htonll(0), htonll(0)); @@ -1741,6 +1554,10 @@ mf_set_wild(const struct mf_field *mf, struct match *match) match->flow.in_port.ofp_port = 0; match->wc.masks.in_port.ofp_port = 0; break; + case MFF_ACTSET_OUTPUT: + match->flow.actset_output = 0; + match->wc.masks.actset_output = 0; + break; case MFF_SKB_PRIORITY: match->flow.skb_priority = 0; @@ -1752,18 +1569,42 @@ mf_set_wild(const struct mf_field *mf, struct match *match) match->wc.masks.pkt_mark = 0; break; + case MFF_CT_STATE: + match->flow.ct_state = 0; + match->wc.masks.ct_state = 0; + break; + + case MFF_CT_ZONE: + match->flow.ct_zone = 0; + match->wc.masks.ct_zone = 0; + break; + + case MFF_CT_MARK: + match->flow.ct_mark = 0; + match->wc.masks.ct_mark = 0; + break; + + case MFF_CT_LABEL: + memset(&match->flow.ct_label, 0, sizeof(match->flow.ct_label)); + memset(&match->wc.masks.ct_label, 0, sizeof(match->wc.masks.ct_label)); + break; + CASE_MFF_REGS: match_set_reg_masked(match, mf->id - MFF_REG0, 0, 0); break; + CASE_MFF_XREGS: + match_set_xreg_masked(match, mf->id - MFF_XREG0, 0, 0); + break; + case MFF_ETH_SRC: - memset(match->flow.dl_src, 0, ETH_ADDR_LEN); - memset(match->wc.masks.dl_src, 0, ETH_ADDR_LEN); + match->flow.dl_src = eth_addr_zero; + match->wc.masks.dl_src = eth_addr_zero; break; case MFF_ETH_DST: - memset(match->flow.dl_dst, 0, ETH_ADDR_LEN); - memset(match->wc.masks.dl_dst, 0, ETH_ADDR_LEN); + match->flow.dl_dst = eth_addr_zero; + match->wc.masks.dl_dst = eth_addr_zero; break; case MFF_ETH_TYPE: @@ -1786,15 +1627,19 @@ mf_set_wild(const struct mf_field *mf, struct match *match) break; case MFF_MPLS_LABEL: - match_set_any_mpls_label(match); + match_set_any_mpls_label(match, 0); break; case MFF_MPLS_TC: - match_set_any_mpls_tc(match); + match_set_any_mpls_tc(match, 0); break; case MFF_MPLS_BOS: - match_set_any_mpls_bos(match); + match_set_any_mpls_bos(match, 0); + break; + + case MFF_MPLS_TTL: + match_set_any_mpls_ttl(match, 0); break; case MFF_IPV4_SRC: @@ -1844,7 +1689,7 @@ mf_set_wild(const struct mf_field *mf, struct match *match) break; case MFF_IP_FRAG: - match->wc.masks.nw_frag |= FLOW_NW_FRAG_MASK; + match->wc.masks.nw_frag &= ~FLOW_NW_FRAG_MASK; match->flow.nw_frag &= ~FLOW_NW_FRAG_MASK; break; @@ -1855,14 +1700,14 @@ mf_set_wild(const struct mf_field *mf, struct match *match) case MFF_ARP_SHA: case MFF_ND_SLL: - memset(match->flow.arp_sha, 0, ETH_ADDR_LEN); - memset(match->wc.masks.arp_sha, 0, ETH_ADDR_LEN); + match->flow.arp_sha = eth_addr_zero; + match->wc.masks.arp_sha = eth_addr_zero; break; case MFF_ARP_THA: case MFF_ND_TLL: - memset(match->flow.arp_tha, 0, ETH_ADDR_LEN); - memset(match->wc.masks.arp_tha, 0, ETH_ADDR_LEN); + match->flow.arp_tha = eth_addr_zero; + match->wc.masks.arp_tha = eth_addr_zero; break; case MFF_TCP_SRC: @@ -1883,6 +1728,11 @@ mf_set_wild(const struct mf_field *mf, struct match *match) match->flow.tp_dst = htons(0); break; + case MFF_TCP_FLAGS: + match->wc.masks.tcp_flags = htons(0); + match->flow.tcp_flags = htons(0); + break; + case MFF_ND_TARGET: memset(&match->wc.masks.nd_target, 0, sizeof match->wc.masks.nd_target); @@ -1891,7 +1741,7 @@ mf_set_wild(const struct mf_field *mf, struct match *match) case MFF_N_IDS: default: - NOT_REACHED(); + OVS_NOT_REACHED(); } } @@ -1905,23 +1755,41 @@ mf_set_wild(const struct mf_field *mf, struct match *match) * 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 'match' meets 'mf''s prerequisites. */ -enum ofputil_protocol + * is responsible for ensuring that 'match' meets 'mf''s prerequisites. + * + * If non-NULL, 'err_str' returns a malloc'ed string describing any errors + * with the request or NULL if there is no error. The caller is reponsible + * for freeing the string. + * + * Return a set of enum ofputil_protocol bits (as an uint32_t to avoid circular + * dependency on enum ofputil_protocol definition) indicating which OpenFlow + * protocol versions can support this functionality. */ +uint32_t mf_set(const struct mf_field *mf, const union mf_value *value, const union mf_value *mask, - struct match *match) + struct match *match, char **err_str) { - if (!mask || is_all_ones((const uint8_t *) mask, mf->n_bytes)) { - mf_set_value(mf, value, match); - return mf->usable_protocols; - } else if (is_all_zeros((const uint8_t *) mask, mf->n_bytes)) { - mf_set_wild(mf, match); + if (!mask || is_all_ones(mask, mf->n_bytes)) { + mf_set_value(mf, value, match, err_str); + return mf->usable_protocols_exact; + } else if (is_all_zeros(mask, mf->n_bytes) && !mf_is_tun_metadata(mf)) { + /* Tunnel metadata matches on the existence of the field itself, so + * it still needs to be encoded even if the value is wildcarded. */ + mf_set_wild(mf, match, err_str); return OFPUTIL_P_ANY; } + if (err_str) { + *err_str = NULL; + } + switch (mf->id) { + case MFF_CT_ZONE: + case MFF_RECIRC_ID: + case MFF_CONJ_ID: case MFF_IN_PORT: case MFF_IN_PORT_OXM: + case MFF_ACTSET_OUTPUT: case MFF_SKB_PRIORITY: case MFF_ETH_TYPE: case MFF_DL_VLAN: @@ -1930,6 +1798,7 @@ mf_set(const struct mf_field *mf, case MFF_MPLS_LABEL: case MFF_MPLS_TC: case MFF_MPLS_BOS: + case MFF_MPLS_TTL: case MFF_IP_PROTO: case MFF_IP_TTL: case MFF_IP_DSCP: @@ -1940,8 +1809,11 @@ mf_set(const struct mf_field *mf, case MFF_ICMPV4_CODE: case MFF_ICMPV6_TYPE: case MFF_ICMPV6_CODE: - NOT_REACHED(); + return OFPUTIL_P_NONE; + case MFF_DP_HASH: + match_set_dp_hash_masked(match, ntohl(value->be32), ntohl(mask->be32)); + break; case MFF_TUN_ID: match_set_tun_id_masked(match, value->be64, mask->be64); break; @@ -1951,15 +1823,30 @@ mf_set(const struct mf_field *mf, case MFF_TUN_DST: match_set_tun_dst_masked(match, value->be32, mask->be32); break; + case MFF_TUN_IPV6_SRC: + match_set_tun_ipv6_src_masked(match, &value->ipv6, &mask->ipv6); + break; + case MFF_TUN_IPV6_DST: + match_set_tun_ipv6_dst_masked(match, &value->ipv6, &mask->ipv6); + break; case MFF_TUN_FLAGS: match_set_tun_flags_masked(match, ntohs(value->be16), ntohs(mask->be16)); break; + case MFF_TUN_GBP_ID: + match_set_tun_gbp_id_masked(match, value->be16, mask->be16); + break; + case MFF_TUN_GBP_FLAGS: + match_set_tun_gbp_flags_masked(match, value->u8, mask->u8); + 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_TUN_METADATA: + tun_metadata_set_match(mf, value, mask, match, err_str); + break; case MFF_METADATA: match_set_metadata_masked(match, value->be64, mask->be64); @@ -1970,11 +1857,29 @@ mf_set(const struct mf_field *mf, ntohl(value->be32), ntohl(mask->be32)); break; + CASE_MFF_XREGS: + match_set_xreg_masked(match, mf->id - MFF_XREG0, + ntohll(value->be64), ntohll(mask->be64)); + break; + case MFF_PKT_MARK: match_set_pkt_mark_masked(match, ntohl(value->be32), ntohl(mask->be32)); break; + case MFF_CT_STATE: + match_set_ct_state_masked(match, ntohl(value->be32), ntohl(mask->be32)); + break; + + case MFF_CT_MARK: + match_set_ct_mark_masked(match, ntohl(value->be32), ntohl(mask->be32)); + break; + + case MFF_CT_LABEL: + match_set_ct_label_masked(match, ntoh128(value->be128), + mask ? ntoh128(mask->be128) : OVS_U128_MAX); + break; + case MFF_ETH_DST: match_set_dl_dst_masked(match, value->mac, mask->mac); break; @@ -2003,11 +1908,11 @@ mf_set(const struct mf_field *mf, case MFF_IPV4_SRC: match_set_nw_src_masked(match, value->be32, mask->be32); - goto cidr_check; + break; case MFF_IPV4_DST: match_set_nw_dst_masked(match, value->be32, mask->be32); - goto cidr_check; + break; case MFF_IPV6_SRC: match_set_ipv6_src_masked(match, &value->ipv6, &mask->ipv6); @@ -2019,7 +1924,7 @@ mf_set(const struct mf_field *mf, case MFF_IPV6_LABEL: if ((mask->be32 & htonl(IPV6_LABEL_MASK)) == htonl(IPV6_LABEL_MASK)) { - mf_set_value(mf, value, match); + mf_set_value(mf, value, match, err_str); } else { match_set_ipv6_label_masked(match, value->be32, mask->be32); } @@ -2035,11 +1940,11 @@ mf_set(const struct mf_field *mf, case MFF_ARP_SPA: match_set_nw_src_masked(match, value->be32, mask->be32); - goto cidr_check; + break; case MFF_ARP_TPA: match_set_nw_dst_masked(match, value->be32, mask->be32); - goto cidr_check; + break; case MFF_TCP_SRC: case MFF_UDP_SRC: @@ -2053,16 +1958,19 @@ mf_set(const struct mf_field *mf, match_set_tp_dst_masked(match, value->be16, mask->be16); break; + case MFF_TCP_FLAGS: + match_set_tcp_flags_masked(match, value->be16, mask->be16); + break; + case MFF_N_IDS: default: - NOT_REACHED(); + OVS_NOT_REACHED(); } - return mf->usable_protocols_bitwise; - -cidr_check: - return ip_is_cidr(mask->be32) ? mf->usable_protocols : - mf->usable_protocols_bitwise; + return ((mf->usable_protocols_bitwise == mf->usable_protocols_cidr + || ip_is_cidr(mask->be32)) + ? mf->usable_protocols_cidr + : mf->usable_protocols_bitwise); } static enum ofperr @@ -2127,169 +2035,59 @@ mf_get(const struct mf_field *mf, const struct match *match, mf_get_mask(mf, &match->wc, mask); } -/* Assigns a random value for field 'mf' to 'value'. */ -void -mf_random_value(const struct mf_field *mf, union mf_value *value) -{ - random_bytes(value, mf->n_bytes); - - switch (mf->id) { - case MFF_TUN_ID: - case MFF_TUN_SRC: - case MFF_TUN_DST: - case MFF_TUN_TOS: - case MFF_TUN_TTL: - case MFF_TUN_FLAGS: - case MFF_METADATA: - case MFF_IN_PORT: - case MFF_PKT_MARK: - case MFF_SKB_PRIORITY: - CASE_MFF_REGS: - case MFF_ETH_SRC: - case MFF_ETH_DST: - case MFF_ETH_TYPE: - case MFF_VLAN_TCI: - case MFF_IPV4_SRC: - case MFF_IPV4_DST: - case MFF_IPV6_SRC: - case MFF_IPV6_DST: - case MFF_IP_PROTO: - case MFF_IP_TTL: - case MFF_ARP_SPA: - case MFF_ARP_TPA: - case MFF_ARP_SHA: - case MFF_ARP_THA: - case MFF_TCP_SRC: - case MFF_TCP_DST: - case MFF_UDP_SRC: - case MFF_UDP_DST: - case MFF_SCTP_SRC: - case MFF_SCTP_DST: - case MFF_ICMPV4_TYPE: - case MFF_ICMPV4_CODE: - case MFF_ICMPV6_TYPE: - case MFF_ICMPV6_CODE: - case MFF_ND_TARGET: - case MFF_ND_SLL: - case MFF_ND_TLL: - break; - - case MFF_IN_PORT_OXM: - value->be32 = ofputil_port_to_ofp11(u16_to_ofp(ntohs(value->be16))); - break; - - case MFF_IPV6_LABEL: - value->be32 &= htonl(IPV6_LABEL_MASK); - break; - - case MFF_IP_DSCP: - value->u8 &= IP_DSCP_MASK; - break; - - case MFF_IP_DSCP_SHIFTED: - value->u8 &= IP_DSCP_MASK >> 2; - break; - - case MFF_IP_ECN: - value->u8 &= IP_ECN_MASK; - break; - - case MFF_IP_FRAG: - value->u8 &= FLOW_NW_FRAG_MASK; - break; - - case MFF_ARP_OP: - value->be16 &= htons(0xff); - break; - - case MFF_DL_VLAN: - value->be16 &= htons(VLAN_VID_MASK); - break; - case MFF_VLAN_VID: - value->be16 &= htons(VLAN_VID_MASK | VLAN_CFI); - break; - - case MFF_DL_VLAN_PCP: - case MFF_VLAN_PCP: - value->u8 &= 0x07; - break; - - case MFF_MPLS_LABEL: - value->be32 &= htonl(MPLS_LABEL_MASK >> MPLS_LABEL_SHIFT); - break; - - case MFF_MPLS_TC: - value->u8 &= MPLS_TC_MASK >> MPLS_TC_SHIFT; - break; - - case MFF_MPLS_BOS: - value->u8 &= MPLS_BOS_MASK >> MPLS_BOS_SHIFT; - break; - - case MFF_N_IDS: - default: - NOT_REACHED(); - } -} - static char * mf_from_integer_string(const struct mf_field *mf, const char *s, uint8_t *valuep, uint8_t *maskp) { - unsigned long long int integer, mask; char *tail; - int i; + const char *err_str = ""; + int err; - errno = 0; - integer = strtoull(s, &tail, 0); - if (errno || (*tail != '\0' && *tail != '/')) { + err = parse_int_string(s, valuep, mf->n_bytes, &tail); + if (err || (*tail != '\0' && *tail != '/')) { + err_str = "value"; goto syntax_error; } if (*tail == '/') { - mask = strtoull(tail + 1, &tail, 0); - if (errno || *tail != '\0') { + err = parse_int_string(tail + 1, maskp, mf->n_bytes, &tail); + if (err || *tail != '\0') { + err_str = "mask"; goto syntax_error; } } else { - mask = ULLONG_MAX; + memset(maskp, 0xff, mf->n_bytes); } - for (i = mf->n_bytes - 1; i >= 0; i--) { - valuep[i] = integer; - maskp[i] = mask; - integer >>= 8; - mask >>= 8; - } - if (integer) { - return xasprintf("%s: value too large for %u-byte field %s", - s, mf->n_bytes, mf->name); - } return NULL; syntax_error: - return xasprintf("%s: bad syntax for %s", s, mf->name); + if (err == ERANGE) { + return xasprintf("%s: %s too large for %u-byte field %s", + s, err_str, mf->n_bytes, mf->name); + } else { + return xasprintf("%s: bad syntax for %s %s", s, mf->name, err_str); + } } static char * mf_from_ethernet_string(const struct mf_field *mf, const char *s, - uint8_t mac[ETH_ADDR_LEN], - uint8_t mask[ETH_ADDR_LEN]) + struct eth_addr *mac, struct eth_addr *mask) { int n; ovs_assert(mf->n_bytes == ETH_ADDR_LEN); n = -1; - if (sscanf(s, ETH_ADDR_SCAN_FMT"%n", ETH_ADDR_SCAN_ARGS(mac), &n) > 0 + if (ovs_scan(s, ETH_ADDR_SCAN_FMT"%n", ETH_ADDR_SCAN_ARGS(*mac), &n) && n == strlen(s)) { - memset(mask, 0xff, ETH_ADDR_LEN); + *mask = eth_addr_exact; return NULL; } n = -1; - if (sscanf(s, ETH_ADDR_SCAN_FMT"/"ETH_ADDR_SCAN_FMT"%n", - ETH_ADDR_SCAN_ARGS(mac), ETH_ADDR_SCAN_ARGS(mask), &n) > 0 + if (ovs_scan(s, ETH_ADDR_SCAN_FMT"/"ETH_ADDR_SCAN_FMT"%n", + ETH_ADDR_SCAN_ARGS(*mac), ETH_ADDR_SCAN_ARGS(*mask), &n) && n == strlen(s)) { return NULL; } @@ -2301,70 +2099,16 @@ static char * mf_from_ipv4_string(const struct mf_field *mf, const char *s, ovs_be32 *ip, ovs_be32 *mask) { - int prefix; - 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) { - /* OK. */ - } else if (sscanf(s, IP_SCAN_FMT"/%d", - IP_SCAN_ARGS(ip), &prefix) == IP_SCAN_COUNT + 1) { - if (prefix <= 0 || prefix > 32) { - return xasprintf("%s: network prefix bits not between 1 and " - "32", s); - } else if (prefix == 32) { - *mask = OVS_BE32_MAX; - } else { - *mask = htonl(((1u << prefix) - 1) << (32 - prefix)); - } - } else if (sscanf(s, IP_SCAN_FMT, IP_SCAN_ARGS(ip)) == IP_SCAN_COUNT) { - *mask = OVS_BE32_MAX; - } else { - return xasprintf("%s: invalid IP address", s); - } - return NULL; + return ip_parse_masked(s, ip, mask); } static char * mf_from_ipv6_string(const struct mf_field *mf, const char *s, - struct in6_addr *value, struct in6_addr *mask) + struct in6_addr *ipv6, struct in6_addr *mask) { - char *str = xstrdup(s); - char *save_ptr = NULL; - const char *name, *netmask; - int retval; - - ovs_assert(mf->n_bytes == sizeof *value); - - name = strtok_r(str, "/", &save_ptr); - retval = name ? lookup_ipv6(name, value) : EINVAL; - if (retval) { - char *err; - - err = xasprintf("%s: could not convert to IPv6 address", str); - free(str); - - return err; - } - - netmask = strtok_r(NULL, "/", &save_ptr); - if (netmask) { - if (inet_pton(AF_INET6, netmask, mask) != 1) { - int prefix = atoi(netmask); - if (prefix <= 0 || prefix > 128) { - free(str); - return xasprintf("%s: prefix bits not between 1 and 128", s); - } else { - *mask = ipv6_create_mask(prefix); - } - } - } else { - *mask = in6addr_exact; - } - free(str); - - return NULL; + ovs_assert(mf->n_bytes == sizeof *ipv6); + return ipv6_parse_masked(s, ipv6, mask); } static char * @@ -2441,68 +2185,62 @@ 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) +static char * +parse_mf_flags(const char *s, const char *(*bit_to_string)(uint32_t), + const char *field_name, ovs_be16 *flagsp, ovs_be16 allowed, + ovs_be16 *maskp) { - 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; - } - } + int err; + char *err_str; + uint32_t flags, mask; + + err = parse_flags(s, bit_to_string, '\0', field_name, &err_str, + &flags, ntohs(allowed), maskp ? &mask : NULL); + if (err < 0) { + return err_str; + } - if (!bit) { - rc = -ENOENT; - goto out; - } + *flagsp = htons(flags); + if (maskp) { + *maskp = htons(mask); } - *res = htons(result); -out: - free(s); - return rc; + return NULL; } static char * -mf_from_tun_flags_string(const char *s, ovs_be16 *valuep, ovs_be16 *maskp) +mf_from_tcp_flags_string(const char *s, ovs_be16 *flagsp, ovs_be16 *maskp) { - if (!parse_flow_tun_flags(s, flow_tun_flag_to_string, valuep)) { - *maskp = OVS_BE16_MAX; - return NULL; + return parse_mf_flags(s, packet_tcp_flag_to_string, "TCP", flagsp, + TCP_FLAGS_BE16(OVS_BE16_MAX), maskp); +} + +static char * +mf_from_tun_flags_string(const char *s, ovs_be16 *flagsp, ovs_be16 *maskp) +{ + return parse_mf_flags(s, flow_tun_flag_to_string, "tunnel", flagsp, + htons(FLOW_TNL_PUB_F_MASK), maskp); +} + +static char * +mf_from_ct_state_string(const char *s, ovs_be32 *flagsp, ovs_be32 *maskp) +{ + int err; + char *err_str; + uint32_t flags, mask; + + err = parse_flags(s, ct_state_to_string, '\0', "ct_state", &err_str, + &flags, CS_SUPPORTED_MASK, maskp ? &mask : NULL); + if (err < 0) { + return err_str; + } + + *flagsp = htonl(flags); + if (maskp) { + *maskp = htonl(mask); } - return xasprintf("%s: unknown tunnel flags (valid flags are \"df\", " - "\"csum\", \"key\"", s); + return NULL; } /* Parses 's', a string value for field 'mf', into 'value' and 'mask'. Returns @@ -2511,6 +2249,8 @@ char * mf_parse(const struct mf_field *mf, const char *s, union mf_value *value, union mf_value *mask) { + char *error; + if (!strcmp(s, "*")) { memset(value, 0, mf->n_bytes); memset(mask, 0, mf->n_bytes); @@ -2520,32 +2260,57 @@ mf_parse(const struct mf_field *mf, const char *s, switch (mf->string) { case MFS_DECIMAL: case MFS_HEXADECIMAL: - return mf_from_integer_string(mf, s, - (uint8_t *) value, (uint8_t *) mask); + error = mf_from_integer_string(mf, s, + (uint8_t *) value, (uint8_t *) mask); + break; + + case MFS_CT_STATE: + ovs_assert(mf->n_bytes == sizeof(ovs_be32)); + error = mf_from_ct_state_string(s, &value->be32, &mask->be32); + break; case MFS_ETHERNET: - return mf_from_ethernet_string(mf, s, value->mac, mask->mac); + error = mf_from_ethernet_string(mf, s, &value->mac, &mask->mac); + break; case MFS_IPV4: - return mf_from_ipv4_string(mf, s, &value->be32, &mask->be32); + error = mf_from_ipv4_string(mf, s, &value->be32, &mask->be32); + break; case MFS_IPV6: - return mf_from_ipv6_string(mf, s, &value->ipv6, &mask->ipv6); + error = mf_from_ipv6_string(mf, s, &value->ipv6, &mask->ipv6); + break; case MFS_OFP_PORT: - return mf_from_ofp_port_string(mf, s, &value->be16, &mask->be16); + error = mf_from_ofp_port_string(mf, s, &value->be16, &mask->be16); + break; case MFS_OFP_PORT_OXM: - return mf_from_ofp_port_string32(mf, s, &value->be32, &mask->be32); + error = mf_from_ofp_port_string32(mf, s, &value->be32, &mask->be32); + break; case MFS_FRAG: - return mf_from_frag_string(s, &value->u8, &mask->u8); + error = mf_from_frag_string(s, &value->u8, &mask->u8); + break; case MFS_TNL_FLAGS: ovs_assert(mf->n_bytes == sizeof(ovs_be16)); - return mf_from_tun_flags_string(s, &value->be16, &mask->be16); + error = mf_from_tun_flags_string(s, &value->be16, &mask->be16); + break; + + case MFS_TCP_FLAGS: + ovs_assert(mf->n_bytes == sizeof(ovs_be16)); + error = mf_from_tcp_flags_string(s, &value->be16, &mask->be16); + break; + + default: + OVS_NOT_REACHED(); + } + + if (!error && !mf_is_mask_valid(mf, mask)) { + error = xasprintf("%s: invalid mask for field %s", s, mf->name); } - NOT_REACHED(); + return error; } /* Parses 's', a string value for field 'mf', into 'value'. Returns NULL if @@ -2571,33 +2336,25 @@ static void mf_format_integer_string(const struct mf_field *mf, const uint8_t *valuep, const uint8_t *maskp, struct ds *s) { - unsigned long long int integer; - int i; - - ovs_assert(mf->n_bytes <= 8); - - integer = 0; - for (i = 0; i < mf->n_bytes; i++) { - integer = (integer << 8) | valuep[i]; - } if (mf->string == MFS_HEXADECIMAL) { - ds_put_format(s, "%#llx", integer); + ds_put_hex(s, valuep, mf->n_bytes); } else { - ds_put_format(s, "%lld", integer); - } + unsigned long long int integer = 0; + int i; - if (maskp) { - unsigned long long int mask; - - mask = 0; + ovs_assert(mf->n_bytes <= 8); for (i = 0; i < mf->n_bytes; i++) { - mask = (mask << 8) | maskp[i]; + integer = (integer << 8) | valuep[i]; } + ds_put_format(s, "%lld", integer); + } + if (maskp) { /* I guess we could write the mask in decimal for MFS_DECIMAL but I'm * not sure that that a bit-mask written in decimal is ever easier to * understand than the same bit-mask written in hexadecimal. */ - ds_put_format(s, "/%#llx", mask); + ds_put_char(s, '/'); + ds_put_hex(s, maskp, mf->n_bytes); } } @@ -2619,9 +2376,24 @@ mf_format_frag_string(uint8_t value, uint8_t mask, struct ds *s) } static void -mf_format_tnl_flags_string(const ovs_be16 *valuep, struct ds *s) +mf_format_tnl_flags_string(ovs_be16 value, ovs_be16 mask, struct ds *s) { - format_flags(s, flow_tun_flag_to_string, ntohs(*valuep), '|'); + format_flags_masked(s, NULL, flow_tun_flag_to_string, ntohs(value), + ntohs(mask) & FLOW_TNL_PUB_F_MASK, FLOW_TNL_PUB_F_MASK); +} + +static void +mf_format_tcp_flags_string(ovs_be16 value, ovs_be16 mask, struct ds *s) +{ + format_flags_masked(s, NULL, packet_tcp_flag_to_string, ntohs(value), + TCP_FLAGS(mask), TCP_FLAGS(OVS_BE16_MAX)); +} + +static void +mf_format_ct_state_string(ovs_be32 value, ovs_be32 mask, struct ds *s) +{ + format_flags_masked(s, NULL, ct_state_to_string, ntohl(value), + ntohl(mask), UINT16_MAX); } /* Appends to 's' a string representation of field 'mf' whose value is in @@ -2632,10 +2404,10 @@ mf_format(const struct mf_field *mf, struct ds *s) { if (mask) { - if (is_all_zeros((const uint8_t *) mask, mf->n_bytes)) { + if (is_all_zeros(mask, mf->n_bytes)) { ds_put_cstr(s, "ANY"); return; - } else if (is_all_ones((const uint8_t *) mask, mf->n_bytes)) { + } else if (is_all_ones(mask, mf->n_bytes)) { mask = NULL; } } @@ -2660,8 +2432,13 @@ mf_format(const struct mf_field *mf, mf_format_integer_string(mf, (uint8_t *) value, (uint8_t *) mask, s); break; + case MFS_CT_STATE: + mf_format_ct_state_string(value->be32, + mask ? mask->be32 : OVS_BE32_MAX, s); + break; + case MFS_ETHERNET: - eth_format_masked(value->mac, mask->mac, s); + eth_format_masked(value->mac, mask ? &mask->mac : NULL, s); break; case MFS_IPV4: @@ -2669,7 +2446,7 @@ mf_format(const struct mf_field *mf, break; case MFS_IPV6: - print_ipv6_masked(s, &value->ipv6, mask ? &mask->ipv6 : NULL); + ipv6_format_masked(&value->ipv6, mask ? &mask->ipv6 : NULL, s); break; case MFS_FRAG: @@ -2677,11 +2454,17 @@ mf_format(const struct mf_field *mf, break; case MFS_TNL_FLAGS: - mf_format_tnl_flags_string(&value->be16, s); + mf_format_tnl_flags_string(value->be16, + mask ? mask->be16 : OVS_BE16_MAX, s); + break; + + case MFS_TCP_FLAGS: + mf_format_tcp_flags_string(value->be16, + mask ? mask->be16 : OVS_BE16_MAX, s); break; default: - NOT_REACHED(); + OVS_NOT_REACHED(); } } @@ -2714,7 +2497,23 @@ mf_write_subfield(const struct mf_subfield *sf, const union mf_subvalue *x, 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, match); + mf_set(field, &value, &mask, match, NULL); +} + +/* 'v' and 'm' correspond to values of 'field'. This function copies them into + * 'match' in the correspond positions. */ +void +mf_mask_subfield(const struct mf_field *field, + const union mf_subvalue *v, + const union mf_subvalue *m, + struct match *match) +{ + union mf_value value, mask; + + mf_get(field, match, &value, &mask); + bitwise_copy(v, sizeof *v, 0, &value, field->n_bytes, 0, field->n_bits); + bitwise_copy(m, sizeof *m, 0, &mask, field->n_bytes, 0, field->n_bits); + mf_set(field, &value, &mask, match, NULL); } /* Initializes 'x' to the value of 'sf' within 'flow'. 'sf' must be valid for @@ -2745,157 +2544,17 @@ mf_get_subfield(const struct mf_subfield *sf, const struct flow *flow) return bitwise_get(&value, sf->field->n_bytes, sf->ofs, sf->n_bits); } -/* Formats 'sf' into 's' in a format normally acceptable to - * mf_parse_subfield(). (It won't be acceptable if sf->field is NULL or if - * sf->field has no NXM name.) */ void -mf_format_subfield(const struct mf_subfield *sf, struct ds *s) -{ - if (!sf->field) { - ds_put_cstr(s, ""); - } else if (sf->field->nxm_name) { - ds_put_cstr(s, sf->field->nxm_name); - } else if (sf->field->nxm_header) { - uint32_t header = sf->field->nxm_header; - ds_put_format(s, "%d:%d", NXM_VENDOR(header), NXM_FIELD(header)); - } else { - ds_put_cstr(s, sf->field->name); - } - - if (sf->field && sf->ofs == 0 && sf->n_bits == sf->field->n_bits) { - ds_put_cstr(s, "[]"); - } else if (sf->n_bits == 1) { - ds_put_format(s, "[%d]", sf->ofs); - } else { - ds_put_format(s, "[%d..%d]", sf->ofs, sf->ofs + sf->n_bits - 1); - } -} - -static const struct mf_field * -mf_parse_subfield_name(const char *name, int name_len, bool *wild) -{ - int i; - - *wild = name_len > 2 && !memcmp(&name[name_len - 2], "_W", 2); - if (*wild) { - name_len -= 2; - } - - for (i = 0; i < MFF_N_IDS; i++) { - const struct mf_field *mf = mf_from_id(i); - - if (mf->nxm_name - && !strncmp(mf->nxm_name, name, name_len) - && mf->nxm_name[name_len] == '\0') { - return mf; - } - if (mf->oxm_name - && !strncmp(mf->oxm_name, name, name_len) - && mf->oxm_name[name_len] == '\0') { - return mf; - } - } - - return NULL; -} - -/* Parses a subfield from the beginning of '*sp' into 'sf'. If successful, - * returns NULL and advances '*sp' to the first byte following the parsed - * string. On failure, returns a malloc()'d error message, does not modify - * '*sp', and does not properly initialize 'sf'. - * - * The syntax parsed from '*sp' 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. */ -char * WARN_UNUSED_RESULT -mf_parse_subfield__(struct mf_subfield *sf, const char **sp) -{ - const struct mf_field *field; - const char *name; - int start, end; - const char *s; - int name_len; - bool wild; - - s = *sp; - name = s; - name_len = strcspn(s, "["); - if (s[name_len] != '[') { - return xasprintf("%s: missing [ looking for field name", *sp); - } - - field = mf_parse_subfield_name(name, name_len, &wild); - if (!field) { - return xasprintf("%s: unknown field `%.*s'", *sp, name_len, s); - } - - s += name_len; - if (sscanf(s, "[%d..%d]", &start, &end) == 2) { - /* Nothing to do. */ - } else if (sscanf(s, "[%d]", &start) == 1) { - end = start; - } else if (!strncmp(s, "[]", 2)) { - start = 0; - end = field->n_bits - 1; - } else { - return xasprintf("%s: syntax error expecting [] or [] or " - "[..]", *sp); - } - s = strchr(s, ']') + 1; - - if (start > end) { - return xasprintf("%s: starting bit %d is after ending bit %d", - *sp, start, end); - } else if (start >= field->n_bits) { - return xasprintf("%s: starting bit %d is not valid because field is " - "only %d bits wide", *sp, start, field->n_bits); - } else if (end >= field->n_bits){ - return xasprintf("%s: ending bit %d is not valid because field is " - "only %d bits wide", *sp, end, field->n_bits); - } - - sf->field = field; - sf->ofs = start; - sf->n_bits = end - start + 1; - - *sp = s; - return NULL; -} - -/* 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. */ -char * WARN_UNUSED_RESULT -mf_parse_subfield(struct mf_subfield *sf, const char *s) +mf_format_subvalue(const union mf_subvalue *subvalue, struct ds *s) { - char *error = mf_parse_subfield__(sf, &s); - if (!error && s[0]) { - error = xstrdup("unexpected input following field syntax"); - } - return error; + ds_put_hex(s, subvalue->u8, sizeof subvalue->u8); } void -mf_format_subvalue(const union mf_subvalue *subvalue, struct ds *s) +field_array_set(enum mf_field_id id, const union mf_value *value, + struct field_array *fa) { - 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'); + ovs_assert(id < MFF_N_IDS); + bitmap_set1(fa->used.bm, id); + fa->value[id] = *value; }