X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fodp-util.c;h=af464a0409508a354fe1e16135dce342bfa2d424;hb=61abba807febc0954acc0d23aeb75b081ad9d77a;hp=0574c9f359b80463a9db2d717932334bc879a12e;hpb=2508ac16defd417b94fb69689b6b1da4fbc76282;p=sliver-openvswitch.git diff --git a/lib/odp-util.c b/lib/odp-util.c index 0574c9f35..af464a040 100644 --- a/lib/odp-util.c +++ b/lib/odp-util.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, 2011, 2012 Nicira, Inc. + * Copyright (c) 2009, 2010, 2011, 2012, 2013, 2014 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,8 +14,8 @@ * limitations under the License. */ -#include #include +#include #include "odp-util.h" #include #include @@ -26,6 +26,7 @@ #include #include "byte-order.h" #include "coverage.h" +#include "dpif.h" #include "dynamic-string.h" #include "flow.h" #include "netlink.h" @@ -48,9 +49,12 @@ VLOG_DEFINE_THIS_MODULE(odp_util); * from another. */ static const char *delimiters = ", \t\r\n"; -static int parse_odp_key_attr(const char *, const struct simap *port_names, - struct ofpbuf *); -static void format_odp_key_attr(const struct nlattr *a, struct ds *ds); +static int parse_odp_key_mask_attr(const char *, const struct simap *port_names, + struct ofpbuf *, struct ofpbuf *); +static void format_odp_key_attr(const struct nlattr *a, + const struct nlattr *ma, + const struct hmap *portno_names, struct ds *ds, + bool verbose); /* Returns one the following for the action with the given OVS_ACTION_ATTR_* * 'type': @@ -73,6 +77,10 @@ odp_action_len(uint16_t type) case OVS_ACTION_ATTR_USERSPACE: return -2; case OVS_ACTION_ATTR_PUSH_VLAN: return sizeof(struct ovs_action_push_vlan); case OVS_ACTION_ATTR_POP_VLAN: return 0; + case OVS_ACTION_ATTR_PUSH_MPLS: return sizeof(struct ovs_action_push_mpls); + case OVS_ACTION_ATTR_POP_MPLS: return sizeof(ovs_be16); + case OVS_ACTION_ATTR_RECIRC: return sizeof(uint32_t); + case OVS_ACTION_ATTR_HASH: return sizeof(struct ovs_action_hash); case OVS_ACTION_ATTR_SET: return -2; case OVS_ACTION_ATTR_SAMPLE: return -2; @@ -84,15 +92,19 @@ odp_action_len(uint16_t type) return -1; } +/* Returns a string form of 'attr'. The return value is either a statically + * allocated constant string or the 'bufsize'-byte buffer 'namebuf'. 'bufsize' + * should be at least OVS_KEY_ATTR_BUFSIZE. */ +enum { OVS_KEY_ATTR_BUFSIZE = 3 + INT_STRLEN(unsigned int) + 1 }; static const char * -ovs_key_attr_to_string(enum ovs_key_attr attr) +ovs_key_attr_to_string(enum ovs_key_attr attr, char *namebuf, size_t bufsize) { - static char unknown_attr[3 + INT_STRLEN(unsigned int) + 1]; - switch (attr) { case OVS_KEY_ATTR_UNSPEC: return "unspec"; case OVS_KEY_ATTR_ENCAP: return "encap"; - case OVS_KEY_ATTR_PRIORITY: return "priority"; + case OVS_KEY_ATTR_PRIORITY: return "skb_priority"; + case OVS_KEY_ATTR_SKB_MARK: return "skb_mark"; + case OVS_KEY_ATTR_TUNNEL: return "tunnel"; case OVS_KEY_ATTR_IN_PORT: return "in_port"; case OVS_KEY_ATTR_ETHERNET: return "eth"; case OVS_KEY_ATTR_VLAN: return "vlan"; @@ -100,18 +112,21 @@ ovs_key_attr_to_string(enum ovs_key_attr attr) case OVS_KEY_ATTR_IPV4: return "ipv4"; case OVS_KEY_ATTR_IPV6: return "ipv6"; case OVS_KEY_ATTR_TCP: return "tcp"; + case OVS_KEY_ATTR_TCP_FLAGS: return "tcp_flags"; case OVS_KEY_ATTR_UDP: return "udp"; + case OVS_KEY_ATTR_SCTP: return "sctp"; case OVS_KEY_ATTR_ICMP: return "icmp"; case OVS_KEY_ATTR_ICMPV6: return "icmpv6"; case OVS_KEY_ATTR_ARP: return "arp"; case OVS_KEY_ATTR_ND: return "nd"; - case OVS_KEY_ATTR_TUN_ID: return "tun_id"; + case OVS_KEY_ATTR_MPLS: return "mpls"; + case OVS_KEY_ATTR_DP_HASH: return "dp_hash"; + case OVS_KEY_ATTR_RECIRC_ID: return "recirc_id"; case __OVS_KEY_ATTR_MAX: default: - snprintf(unknown_attr, sizeof unknown_attr, "key%u", - (unsigned int) attr); - return unknown_attr; + snprintf(namebuf, bufsize, "key%u", (unsigned int) attr); + return namebuf; } } @@ -166,49 +181,77 @@ format_odp_sample_action(struct ds *ds, const struct nlattr *attr) } static const char * -slow_path_reason_to_string(enum slow_path_reason bit) -{ - switch (bit) { - case SLOW_CFM: - return "cfm"; - case SLOW_LACP: - return "lacp"; - case SLOW_STP: - return "stp"; - case SLOW_IN_BAND: - return "in_band"; - case SLOW_CONTROLLER: - return "controller"; - case SLOW_MATCH: - return "match"; - default: - return NULL; +slow_path_reason_to_string(uint32_t reason) +{ + switch ((enum slow_path_reason) reason) { +#define SPR(ENUM, STRING, EXPLANATION) case ENUM: return STRING; + SLOW_PATH_REASONS +#undef SPR } + + return NULL; } -static void -format_slow_path_reason(struct ds *ds, uint32_t slow) +const char * +slow_path_reason_to_explanation(enum slow_path_reason reason) { - uint32_t bad = 0; + switch (reason) { +#define SPR(ENUM, STRING, EXPLANATION) case ENUM: return EXPLANATION; + SLOW_PATH_REASONS +#undef SPR + } - while (slow) { - uint32_t bit = rightmost_1bit(slow); - const char *s; + return ""; +} - s = slow_path_reason_to_string(bit); - if (s) { - ds_put_format(ds, "%s,", s); - } else { - bad |= bit; - } +static int +parse_flags(const char *s, const char *(*bit_to_string)(uint32_t), + uint32_t *res) +{ + uint32_t result = 0; + int n = 0; - slow &= ~bit; + if (s[n] != '(') { + return -EINVAL; } + n++; + + while (s[n] != ')') { + unsigned long long int flags; + uint32_t bit; + int n0; - if (bad) { - ds_put_format(ds, "0x%"PRIx32",", bad); + if (ovs_scan(&s[n], "%lli%n", &flags, &n0)) { + n += n0 + (s[n + n0] == ','); + result |= flags; + continue; + } + + for (bit = 1; bit; bit <<= 1) { + const char *name = bit_to_string(bit); + size_t len; + + if (!name) { + continue; + } + + len = strlen(name); + if (!strncmp(s + n, name, len) && + (s[n + len] == ',' || s[n + len] == ')')) { + result |= bit; + n += len + (s[n + len] == ','); + break; + } + } + + if (!bit) { + return -EINVAL; + } } - ds_chomp(ds, ','); + n++; + + *res = result; + return n; } static void @@ -216,9 +259,11 @@ format_odp_userspace_action(struct ds *ds, const struct nlattr *attr) { static const struct nl_policy ovs_userspace_policy[] = { [OVS_USERSPACE_ATTR_PID] = { .type = NL_A_U32 }, - [OVS_USERSPACE_ATTR_USERDATA] = { .type = NL_A_U64, .optional = true }, + [OVS_USERSPACE_ATTR_USERDATA] = { .type = NL_A_UNSPEC, + .optional = true }, }; struct nlattr *a[ARRAY_SIZE(ovs_userspace_policy)]; + const struct nlattr *userdata_attr; if (!nl_parse_nested(attr, ovs_userspace_policy, a, ARRAY_SIZE(a))) { ds_put_cstr(ds, "userspace(error)"); @@ -228,33 +273,60 @@ format_odp_userspace_action(struct ds *ds, const struct nlattr *attr) ds_put_format(ds, "userspace(pid=%"PRIu32, nl_attr_get_u32(a[OVS_USERSPACE_ATTR_PID])); - if (a[OVS_USERSPACE_ATTR_USERDATA]) { - uint64_t userdata = nl_attr_get_u64(a[OVS_USERSPACE_ATTR_USERDATA]); - union user_action_cookie cookie; + userdata_attr = a[OVS_USERSPACE_ATTR_USERDATA]; - memcpy(&cookie, &userdata, sizeof cookie); + if (userdata_attr) { + const uint8_t *userdata = nl_attr_get(userdata_attr); + size_t userdata_len = nl_attr_get_size(userdata_attr); + bool userdata_unspec = true; + union user_action_cookie cookie; - switch (cookie.type) { - case USER_ACTION_COOKIE_SFLOW: - ds_put_format(ds, ",sFlow(" - "vid=%"PRIu16",pcp=%"PRIu8",output=%"PRIu32")", - vlan_tci_to_vid(cookie.sflow.vlan_tci), - vlan_tci_to_pcp(cookie.sflow.vlan_tci), - cookie.sflow.output); - break; + if (userdata_len >= sizeof cookie.type + && userdata_len <= sizeof cookie) { + + memset(&cookie, 0, sizeof cookie); + memcpy(&cookie, userdata, userdata_len); + + userdata_unspec = false; + + if (userdata_len == sizeof cookie.sflow + && cookie.type == USER_ACTION_COOKIE_SFLOW) { + ds_put_format(ds, ",sFlow(" + "vid=%"PRIu16",pcp=%"PRIu8",output=%"PRIu32")", + vlan_tci_to_vid(cookie.sflow.vlan_tci), + vlan_tci_to_pcp(cookie.sflow.vlan_tci), + cookie.sflow.output); + } else if (userdata_len == sizeof cookie.slow_path + && cookie.type == USER_ACTION_COOKIE_SLOW_PATH) { + ds_put_cstr(ds, ",slow_path("); + format_flags(ds, slow_path_reason_to_string, + cookie.slow_path.reason, ','); + ds_put_format(ds, ")"); + } else if (userdata_len == sizeof cookie.flow_sample + && cookie.type == USER_ACTION_COOKIE_FLOW_SAMPLE) { + ds_put_format(ds, ",flow_sample(probability=%"PRIu16 + ",collector_set_id=%"PRIu32 + ",obs_domain_id=%"PRIu32 + ",obs_point_id=%"PRIu32")", + cookie.flow_sample.probability, + cookie.flow_sample.collector_set_id, + cookie.flow_sample.obs_domain_id, + cookie.flow_sample.obs_point_id); + } else if (userdata_len >= sizeof cookie.ipfix + && cookie.type == USER_ACTION_COOKIE_IPFIX) { + ds_put_format(ds, ",ipfix"); + } else { + userdata_unspec = true; + } + } - case USER_ACTION_COOKIE_SLOW_PATH: - ds_put_cstr(ds, ",slow_path("); - if (cookie.slow_path.reason) { - format_slow_path_reason(ds, cookie.slow_path.reason); + if (userdata_unspec) { + size_t i; + ds_put_format(ds, ",userdata("); + for (i = 0; i < userdata_len; i++) { + ds_put_format(ds, "%02x", userdata[i]); } ds_put_char(ds, ')'); - break; - - case USER_ACTION_COOKIE_UNSPEC: - default: - ds_put_format(ds, ",userdata=0x%"PRIx64, userdata); - break; } } @@ -272,6 +344,69 @@ format_vlan_tci(struct ds *ds, ovs_be16 vlan_tci) } } +static void +format_mpls_lse(struct ds *ds, ovs_be32 mpls_lse) +{ + ds_put_format(ds, "label=%"PRIu32",tc=%d,ttl=%d,bos=%d", + mpls_lse_to_label(mpls_lse), + mpls_lse_to_tc(mpls_lse), + mpls_lse_to_ttl(mpls_lse), + mpls_lse_to_bos(mpls_lse)); +} + +static void +format_mpls(struct ds *ds, const struct ovs_key_mpls *mpls_key, + const struct ovs_key_mpls *mpls_mask, int n) +{ + if (n == 1) { + ovs_be32 key = mpls_key->mpls_lse; + + if (mpls_mask == NULL) { + format_mpls_lse(ds, key); + } else { + ovs_be32 mask = mpls_mask->mpls_lse; + + ds_put_format(ds, "label=%"PRIu32"/0x%x,tc=%d/%x,ttl=%d/0x%x,bos=%d/%x", + mpls_lse_to_label(key), mpls_lse_to_label(mask), + mpls_lse_to_tc(key), mpls_lse_to_tc(mask), + mpls_lse_to_ttl(key), mpls_lse_to_ttl(mask), + mpls_lse_to_bos(key), mpls_lse_to_bos(mask)); + } + } else { + int i; + + for (i = 0; i < n; i++) { + ds_put_format(ds, "lse%d=%#"PRIx32, + i, ntohl(mpls_key[i].mpls_lse)); + if (mpls_mask) { + ds_put_format(ds, "/%#"PRIx32, ntohl(mpls_mask[i].mpls_lse)); + } + ds_put_char(ds, ','); + } + ds_chomp(ds, ','); + } +} + +static void +format_odp_recirc_action(struct ds *ds, uint32_t recirc_id) +{ + ds_put_format(ds, "recirc(%"PRIu32")", recirc_id); +} + +static void +format_odp_hash_action(struct ds *ds, const struct ovs_action_hash *hash_act) +{ + ds_put_format(ds, "hash("); + + if (hash_act->hash_alg == OVS_HASH_ALG_L4) { + ds_put_format(ds, "hash_l4(%"PRIu32")", hash_act->hash_basis); + } else { + ds_put_format(ds, "Unknown hash algorithm(%"PRIu32")", + hash_act->hash_alg); + } + ds_put_format(ds, ")"); +} + static void format_odp_action(struct ds *ds, const struct nlattr *a) { @@ -281,7 +416,7 @@ format_odp_action(struct ds *ds, const struct nlattr *a) expected_len = odp_action_len(nl_attr_type(a)); if (expected_len != -2 && nl_attr_get_size(a) != expected_len) { - ds_put_format(ds, "bad length %zu, expected %d for: ", + ds_put_format(ds, "bad length %"PRIuSIZE", expected %d for: ", nl_attr_get_size(a), expected_len); format_generic_odp_action(ds, a); return; @@ -289,14 +424,20 @@ format_odp_action(struct ds *ds, const struct nlattr *a) switch (type) { case OVS_ACTION_ATTR_OUTPUT: - ds_put_format(ds, "%"PRIu16, nl_attr_get_u32(a)); + ds_put_format(ds, "%"PRIu32, nl_attr_get_u32(a)); break; case OVS_ACTION_ATTR_USERSPACE: format_odp_userspace_action(ds, a); break; + case OVS_ACTION_ATTR_RECIRC: + format_odp_recirc_action(ds, nl_attr_get_u32(a)); + break; + case OVS_ACTION_ATTR_HASH: + format_odp_hash_action(ds, nl_attr_get(a)); + break; case OVS_ACTION_ATTR_SET: ds_put_cstr(ds, "set("); - format_odp_key_attr(nl_attr_get(a), ds); + format_odp_key_attr(nl_attr_get(a), NULL, NULL, ds, true); ds_put_cstr(ds, ")"); break; case OVS_ACTION_ATTR_PUSH_VLAN: @@ -311,6 +452,18 @@ format_odp_action(struct ds *ds, const struct nlattr *a) case OVS_ACTION_ATTR_POP_VLAN: ds_put_cstr(ds, "pop_vlan"); break; + case OVS_ACTION_ATTR_PUSH_MPLS: { + const struct ovs_action_push_mpls *mpls = nl_attr_get(a); + ds_put_cstr(ds, "push_mpls("); + format_mpls_lse(ds, mpls->mpls_lse); + ds_put_format(ds, ",eth_type=0x%"PRIx16")", ntohs(mpls->mpls_ethertype)); + break; + } + case OVS_ACTION_ATTR_POP_MPLS: { + ovs_be16 ethertype = nl_attr_get_be16(a); + ds_put_format(ds, "pop_mpls(eth_type=0x%"PRIx16")", ntohs(ethertype)); + break; + } case OVS_ACTION_ATTR_SAMPLE: format_odp_sample_action(ds, a); break; @@ -357,21 +510,11 @@ static int parse_odp_action(const char *s, const struct simap *port_names, struct ofpbuf *actions) { - /* Many of the sscanf calls in this function use oversized destination - * fields because some sscanf() implementations truncate the range of %i - * directives, so that e.g. "%"SCNi16 interprets input of "0xfedc" as a - * value of 0x7fff. The other alternatives are to allow only a single - * radix (e.g. decimal or hexadecimal) or to write more sophisticated - * parsers. - * - * The tun_id parser has to use an alternative approach because there is no - * type larger than 64 bits. */ - { - unsigned long long int port; - int n = -1; + uint32_t port; + int n; - if (sscanf(s, "%lli%n", &port, &n) > 0 && n > 0) { + if (ovs_scan(s, "%"SCNi32"%n", &port, &n)) { nl_msg_put_u32(actions, OVS_ACTION_ATTR_OUTPUT, port); return n; } @@ -389,18 +532,21 @@ parse_odp_action(const char *s, const struct simap *port_names, } { - unsigned long long int pid; - unsigned long long int output; - char userdata_s[32]; + uint32_t pid; + uint32_t output; + uint32_t probability; + uint32_t collector_set_id; + uint32_t obs_domain_id; + uint32_t obs_point_id; int vid, pcp; int n = -1; - if (sscanf(s, "userspace(pid=%lli)%n", &pid, &n) > 0 && n > 0) { - odp_put_userspace_action(pid, NULL, actions); + if (ovs_scan(s, "userspace(pid=%"SCNi32")%n", &pid, &n)) { + odp_put_userspace_action(pid, NULL, 0, actions); return n; - } else if (sscanf(s, "userspace(pid=%lli,sFlow(vid=%i," - "pcp=%i,output=%lli))%n", - &pid, &vid, &pcp, &output, &n) > 0 && n > 0) { + } else if (ovs_scan(s, "userspace(pid=%"SCNi32",sFlow(vid=%i," + "pcp=%i,output=%"SCNi32"))%n", + &pid, &vid, &pcp, &output, &n)) { union user_action_cookie cookie; uint16_t tci; @@ -412,54 +558,68 @@ parse_odp_action(const char *s, const struct simap *port_names, cookie.type = USER_ACTION_COOKIE_SFLOW; cookie.sflow.vlan_tci = htons(tci); cookie.sflow.output = output; - odp_put_userspace_action(pid, &cookie, actions); + odp_put_userspace_action(pid, &cookie, sizeof cookie.sflow, + actions); return n; - } else if (sscanf(s, "userspace(pid=%lli,slow_path(%n", &pid, &n) > 0 - && n > 0) { + } else if (ovs_scan(s, "userspace(pid=%"SCNi32",slow_path%n", + &pid, &n)) { union user_action_cookie cookie; + int res; cookie.type = USER_ACTION_COOKIE_SLOW_PATH; cookie.slow_path.unused = 0; cookie.slow_path.reason = 0; - while (s[n] != ')') { - uint32_t bit; - - for (bit = 1; bit; bit <<= 1) { - const char *reason = slow_path_reason_to_string(bit); - size_t len = strlen(reason); - - if (reason - && !strncmp(s + n, reason, len) - && (s[n + len] == ',' || s[n + len] == ')')) - { - cookie.slow_path.reason |= bit; - n += len + (s[n + len] == ','); - break; - } - } - - if (!bit) { - return -EINVAL; - } + res = parse_flags(&s[n], slow_path_reason_to_string, + &cookie.slow_path.reason); + if (res < 0) { + return res; } - if (s[n + 1] != ')') { + n += res; + if (s[n] != ')') { return -EINVAL; } - n += 2; + n++; - odp_put_userspace_action(pid, &cookie, actions); + odp_put_userspace_action(pid, &cookie, sizeof cookie.slow_path, + actions); return n; - } else if (sscanf(s, "userspace(pid=%lli,userdata=" - "%31[x0123456789abcdefABCDEF])%n", &pid, userdata_s, - &n) > 0 && n > 0) { + } else if (ovs_scan(s, "userspace(pid=%"SCNi32"," + "flow_sample(probability=%"SCNi32"," + "collector_set_id=%"SCNi32"," + "obs_domain_id=%"SCNi32"," + "obs_point_id=%"SCNi32"))%n", + &pid, &probability, &collector_set_id, + &obs_domain_id, &obs_point_id, &n)) { union user_action_cookie cookie; - uint64_t userdata; - userdata = strtoull(userdata_s, NULL, 0); - memcpy(&cookie, &userdata, sizeof cookie); - odp_put_userspace_action(pid, &cookie, actions); + cookie.type = USER_ACTION_COOKIE_FLOW_SAMPLE; + cookie.flow_sample.probability = probability; + cookie.flow_sample.collector_set_id = collector_set_id; + cookie.flow_sample.obs_domain_id = obs_domain_id; + cookie.flow_sample.obs_point_id = obs_point_id; + odp_put_userspace_action(pid, &cookie, sizeof cookie.flow_sample, + actions); return n; + } else if (ovs_scan(s, "userspace(pid=%"SCNi32",ipfix)%n", &pid, &n)) { + union user_action_cookie cookie; + + cookie.type = USER_ACTION_COOKIE_IPFIX; + odp_put_userspace_action(pid, &cookie, sizeof cookie.ipfix, + actions); + return n; + } else if (ovs_scan(s, "userspace(pid=%"SCNi32",userdata(%n", + &pid, &n)) { + struct ofpbuf buf; + char *end; + + ofpbuf_init(&buf, 16); + end = ofpbuf_put_hex(&buf, &s[n], NULL); + if (end[0] == ')' && end[1] == ')') { + odp_put_userspace_action(pid, ofpbuf_data(&buf), ofpbuf_size(&buf), actions); + ofpbuf_uninit(&buf); + return (end + 2) - s; + } } } @@ -468,7 +628,7 @@ parse_odp_action(const char *s, const struct simap *port_names, int retval; start_ofs = nl_msg_start_nested(actions, OVS_ACTION_ATTR_SET); - retval = parse_odp_key_attr(s + 4, port_names, actions); + retval = parse_odp_key_mask_attr(s + 4, port_names, actions, NULL); if (retval < 0) { return retval; } @@ -486,14 +646,13 @@ parse_odp_action(const char *s, const struct simap *port_names, int cfi = 1; int n = -1; - if ((sscanf(s, "push_vlan(vid=%i,pcp=%i)%n", &vid, &pcp, &n) > 0 - && n > 0) - || (sscanf(s, "push_vlan(vid=%i,pcp=%i,cfi=%i)%n", - &vid, &pcp, &cfi, &n) > 0 && n > 0) - || (sscanf(s, "push_vlan(tpid=%i,vid=%i,pcp=%i)%n", - &tpid, &vid, &pcp, &n) > 0 && n > 0) - || (sscanf(s, "push_vlan(tpid=%i,vid=%i,pcp=%i,cfi=%i)%n", - &tpid, &vid, &pcp, &cfi, &n) > 0 && n > 0)) { + if (ovs_scan(s, "push_vlan(vid=%i,pcp=%i)%n", &vid, &pcp, &n) + || ovs_scan(s, "push_vlan(vid=%i,pcp=%i,cfi=%i)%n", + &vid, &pcp, &cfi, &n) + || ovs_scan(s, "push_vlan(tpid=%i,vid=%i,pcp=%i)%n", + &tpid, &vid, &pcp, &n) + || ovs_scan(s, "push_vlan(tpid=%i,vid=%i,pcp=%i,cfi=%i)%n", + &tpid, &vid, &pcp, &cfi, &n)) { push.vlan_tpid = htons(tpid); push.vlan_tci = htons((vid << VLAN_VID_SHIFT) | (pcp << VLAN_PCP_SHIFT) @@ -514,9 +673,8 @@ parse_odp_action(const char *s, const struct simap *port_names, double percentage; int n = -1; - if (sscanf(s, "sample(sample=%lf%%,actions(%n", &percentage, &n) > 0 - && percentage >= 0. && percentage <= 100.0 - && n > 0) { + if (ovs_scan(s, "sample(sample=%lf%%,actions(%n", &percentage, &n) + && percentage >= 0. && percentage <= 100.0) { size_t sample_ofs, actions_ofs; double probability; @@ -568,7 +726,7 @@ odp_actions_from_string(const char *s, const struct simap *port_names, return 0; } - old_size = actions->size; + old_size = ofpbuf_size(actions); for (;;) { int retval; @@ -579,7 +737,7 @@ odp_actions_from_string(const char *s, const struct simap *port_names, retval = parse_odp_action(s, port_names, actions); if (retval < 0 || !strchr(delimiters, s[retval])) { - actions->size = old_size; + ofpbuf_set_size(actions, old_size); return -retval; } s += retval; @@ -601,15 +759,21 @@ odp_flow_key_attr_len(uint16_t type) switch ((enum ovs_key_attr) type) { case OVS_KEY_ATTR_ENCAP: return -2; case OVS_KEY_ATTR_PRIORITY: return 4; - case OVS_KEY_ATTR_TUN_ID: return 8; + case OVS_KEY_ATTR_SKB_MARK: return 4; + case OVS_KEY_ATTR_DP_HASH: return 4; + case OVS_KEY_ATTR_RECIRC_ID: return 4; + case OVS_KEY_ATTR_TUNNEL: return -2; case OVS_KEY_ATTR_IN_PORT: return 4; case OVS_KEY_ATTR_ETHERNET: return sizeof(struct ovs_key_ethernet); case OVS_KEY_ATTR_VLAN: return sizeof(ovs_be16); case OVS_KEY_ATTR_ETHERTYPE: return 2; + case OVS_KEY_ATTR_MPLS: return -2; case OVS_KEY_ATTR_IPV4: return sizeof(struct ovs_key_ipv4); case OVS_KEY_ATTR_IPV6: return sizeof(struct ovs_key_ipv6); case OVS_KEY_ATTR_TCP: return sizeof(struct ovs_key_tcp); + case OVS_KEY_ATTR_TCP_FLAGS: return 2; case OVS_KEY_ATTR_UDP: return sizeof(struct ovs_key_udp); + case OVS_KEY_ATTR_SCTP: return sizeof(struct ovs_key_sctp); case OVS_KEY_ATTR_ICMP: return sizeof(struct ovs_key_icmp); case OVS_KEY_ATTR_ICMPV6: return sizeof(struct ovs_key_icmpv6); case OVS_KEY_ATTR_ARP: return sizeof(struct ovs_key_arp); @@ -633,10 +797,11 @@ format_generic_odp_key(const struct nlattr *a, struct ds *ds) unspec = nl_attr_get(a); for (i = 0; i < len; i++) { - ds_put_char(ds, i ? ' ': '('); + if (i) { + ds_put_char(ds, ' '); + } ds_put_format(ds, "%02x", unspec[i]); } - ds_put_char(ds, ')'); } } @@ -656,178 +821,694 @@ ovs_frag_type_to_string(enum ovs_frag_type type) } } +static int +tunnel_key_attr_len(int type) +{ + switch (type) { + case OVS_TUNNEL_KEY_ATTR_ID: return 8; + case OVS_TUNNEL_KEY_ATTR_IPV4_SRC: return 4; + case OVS_TUNNEL_KEY_ATTR_IPV4_DST: return 4; + case OVS_TUNNEL_KEY_ATTR_TOS: return 1; + case OVS_TUNNEL_KEY_ATTR_TTL: return 1; + case OVS_TUNNEL_KEY_ATTR_DONT_FRAGMENT: return 0; + case OVS_TUNNEL_KEY_ATTR_CSUM: return 0; + case __OVS_TUNNEL_KEY_ATTR_MAX: + return -1; + } + return -1; +} + +enum odp_key_fitness +odp_tun_key_from_attr(const struct nlattr *attr, struct flow_tnl *tun) +{ + unsigned int left; + const struct nlattr *a; + bool ttl = false; + bool unknown = false; + + NL_NESTED_FOR_EACH(a, left, attr) { + uint16_t type = nl_attr_type(a); + size_t len = nl_attr_get_size(a); + int expected_len = tunnel_key_attr_len(type); + + if (len != expected_len && expected_len >= 0) { + return ODP_FIT_ERROR; + } + + switch (type) { + case OVS_TUNNEL_KEY_ATTR_ID: + tun->tun_id = nl_attr_get_be64(a); + tun->flags |= FLOW_TNL_F_KEY; + break; + case OVS_TUNNEL_KEY_ATTR_IPV4_SRC: + tun->ip_src = nl_attr_get_be32(a); + break; + case OVS_TUNNEL_KEY_ATTR_IPV4_DST: + tun->ip_dst = nl_attr_get_be32(a); + break; + case OVS_TUNNEL_KEY_ATTR_TOS: + tun->ip_tos = nl_attr_get_u8(a); + break; + case OVS_TUNNEL_KEY_ATTR_TTL: + tun->ip_ttl = nl_attr_get_u8(a); + ttl = true; + break; + case OVS_TUNNEL_KEY_ATTR_DONT_FRAGMENT: + tun->flags |= FLOW_TNL_F_DONT_FRAGMENT; + break; + case OVS_TUNNEL_KEY_ATTR_CSUM: + tun->flags |= FLOW_TNL_F_CSUM; + break; + default: + /* Allow this to show up as unexpected, if there are unknown + * tunnel attribute, eventually resulting in ODP_FIT_TOO_MUCH. */ + unknown = true; + break; + } + } + + if (!ttl) { + return ODP_FIT_ERROR; + } + if (unknown) { + return ODP_FIT_TOO_MUCH; + } + return ODP_FIT_PERFECT; +} + +static void +tun_key_to_attr(struct ofpbuf *a, const struct flow_tnl *tun_key) +{ + size_t tun_key_ofs; + + tun_key_ofs = nl_msg_start_nested(a, OVS_KEY_ATTR_TUNNEL); + + /* tun_id != 0 without FLOW_TNL_F_KEY is valid if tun_key is a mask. */ + if (tun_key->tun_id || tun_key->flags & FLOW_TNL_F_KEY) { + nl_msg_put_be64(a, OVS_TUNNEL_KEY_ATTR_ID, tun_key->tun_id); + } + if (tun_key->ip_src) { + nl_msg_put_be32(a, OVS_TUNNEL_KEY_ATTR_IPV4_SRC, tun_key->ip_src); + } + if (tun_key->ip_dst) { + nl_msg_put_be32(a, OVS_TUNNEL_KEY_ATTR_IPV4_DST, tun_key->ip_dst); + } + if (tun_key->ip_tos) { + nl_msg_put_u8(a, OVS_TUNNEL_KEY_ATTR_TOS, tun_key->ip_tos); + } + nl_msg_put_u8(a, OVS_TUNNEL_KEY_ATTR_TTL, tun_key->ip_ttl); + if (tun_key->flags & FLOW_TNL_F_DONT_FRAGMENT) { + nl_msg_put_flag(a, OVS_TUNNEL_KEY_ATTR_DONT_FRAGMENT); + } + if (tun_key->flags & FLOW_TNL_F_CSUM) { + nl_msg_put_flag(a, OVS_TUNNEL_KEY_ATTR_CSUM); + } + + nl_msg_end_nested(a, tun_key_ofs); +} + +static bool +odp_mask_attr_is_wildcard(const struct nlattr *ma) +{ + return is_all_zeros(nl_attr_get(ma), nl_attr_get_size(ma)); +} + +static bool +odp_mask_attr_is_exact(const struct nlattr *ma) +{ + bool is_exact = false; + enum ovs_key_attr attr = nl_attr_type(ma); + + if (attr == OVS_KEY_ATTR_TUNNEL) { + /* XXX this is a hack for now. Should change + * the exact match dection to per field + * instead of per attribute. + */ + struct flow_tnl tun_mask; + memset(&tun_mask, 0, sizeof tun_mask); + odp_tun_key_from_attr(ma, &tun_mask); + if (tun_mask.flags == (FLOW_TNL_F_KEY + | FLOW_TNL_F_DONT_FRAGMENT + | FLOW_TNL_F_CSUM)) { + /* The flags are exact match, check the remaining fields. */ + tun_mask.flags = 0xffff; + is_exact = is_all_ones((uint8_t *)&tun_mask, + offsetof(struct flow_tnl, ip_ttl)); + } + } else { + is_exact = is_all_ones(nl_attr_get(ma), nl_attr_get_size(ma)); + } + + return is_exact; +} + +void +odp_portno_names_set(struct hmap *portno_names, odp_port_t port_no, + char *port_name) +{ + struct odp_portno_names *odp_portno_names; + + odp_portno_names = xmalloc(sizeof *odp_portno_names); + odp_portno_names->port_no = port_no; + odp_portno_names->name = xstrdup(port_name); + hmap_insert(portno_names, &odp_portno_names->hmap_node, + hash_odp_port(port_no)); +} + +static char * +odp_portno_names_get(const struct hmap *portno_names, odp_port_t port_no) +{ + struct odp_portno_names *odp_portno_names; + + HMAP_FOR_EACH_IN_BUCKET (odp_portno_names, hmap_node, + hash_odp_port(port_no), portno_names) { + if (odp_portno_names->port_no == port_no) { + return odp_portno_names->name; + } + } + return NULL; +} + +void +odp_portno_names_destroy(struct hmap *portno_names) +{ + struct odp_portno_names *odp_portno_names, *odp_portno_names_next; + HMAP_FOR_EACH_SAFE (odp_portno_names, odp_portno_names_next, + hmap_node, portno_names) { + hmap_remove(portno_names, &odp_portno_names->hmap_node); + free(odp_portno_names->name); + free(odp_portno_names); + } +} + static void -format_odp_key_attr(const struct nlattr *a, struct ds *ds) -{ - const struct ovs_key_ethernet *eth_key; - const struct ovs_key_ipv4 *ipv4_key; - const struct ovs_key_ipv6 *ipv6_key; - const struct ovs_key_tcp *tcp_key; - const struct ovs_key_udp *udp_key; - const struct ovs_key_icmp *icmp_key; - const struct ovs_key_icmpv6 *icmpv6_key; - const struct ovs_key_arp *arp_key; - const struct ovs_key_nd *nd_key; +format_odp_key_attr(const struct nlattr *a, const struct nlattr *ma, + const struct hmap *portno_names, struct ds *ds, + bool verbose) +{ + struct flow_tnl tun_key; enum ovs_key_attr attr = nl_attr_type(a); + char namebuf[OVS_KEY_ATTR_BUFSIZE]; int expected_len; + bool is_exact; - ds_put_cstr(ds, ovs_key_attr_to_string(attr)); - expected_len = odp_flow_key_attr_len(nl_attr_type(a)); - if (expected_len != -2 && nl_attr_get_size(a) != expected_len) { - ds_put_format(ds, "(bad length %zu, expected %d)", - nl_attr_get_size(a), - odp_flow_key_attr_len(nl_attr_type(a))); - format_generic_odp_key(a, ds); - return; + is_exact = ma ? odp_mask_attr_is_exact(ma) : true; + + ds_put_cstr(ds, ovs_key_attr_to_string(attr, namebuf, sizeof namebuf)); + + { + expected_len = odp_flow_key_attr_len(nl_attr_type(a)); + if (expected_len != -2) { + bool bad_key_len = nl_attr_get_size(a) != expected_len; + bool bad_mask_len = ma && nl_attr_get_size(ma) != expected_len; + + if (bad_key_len || bad_mask_len) { + if (bad_key_len) { + ds_put_format(ds, "(bad key length %"PRIuSIZE", expected %d)(", + nl_attr_get_size(a), expected_len); + } + format_generic_odp_key(a, ds); + if (ma) { + ds_put_char(ds, '/'); + if (bad_mask_len) { + ds_put_format(ds, "(bad mask length %"PRIuSIZE", expected %d)(", + nl_attr_get_size(ma), expected_len); + } + format_generic_odp_key(ma, ds); + } + ds_put_char(ds, ')'); + return; + } + } } + ds_put_char(ds, '('); switch (attr) { case OVS_KEY_ATTR_ENCAP: - ds_put_cstr(ds, "("); - if (nl_attr_get_size(a)) { - odp_flow_key_format(nl_attr_get(a), nl_attr_get_size(a), ds); + if (ma && nl_attr_get_size(ma) && nl_attr_get_size(a)) { + odp_flow_format(nl_attr_get(a), nl_attr_get_size(a), + nl_attr_get(ma), nl_attr_get_size(ma), NULL, ds, + verbose); + } else if (nl_attr_get_size(a)) { + odp_flow_format(nl_attr_get(a), nl_attr_get_size(a), NULL, 0, NULL, + ds, verbose); } - ds_put_char(ds, ')'); break; case OVS_KEY_ATTR_PRIORITY: - ds_put_format(ds, "(%"PRIu32")", nl_attr_get_u32(a)); + case OVS_KEY_ATTR_SKB_MARK: + case OVS_KEY_ATTR_DP_HASH: + case OVS_KEY_ATTR_RECIRC_ID: + ds_put_format(ds, "%#"PRIx32, nl_attr_get_u32(a)); + if (!is_exact) { + ds_put_format(ds, "/%#"PRIx32, nl_attr_get_u32(ma)); + } break; - case OVS_KEY_ATTR_TUN_ID: - ds_put_format(ds, "(%#"PRIx64")", ntohll(nl_attr_get_be64(a))); + case OVS_KEY_ATTR_TUNNEL: + memset(&tun_key, 0, sizeof tun_key); + if (odp_tun_key_from_attr(a, &tun_key) == ODP_FIT_ERROR) { + ds_put_format(ds, "error"); + } else if (!is_exact) { + struct flow_tnl tun_mask; + + memset(&tun_mask, 0, sizeof tun_mask); + odp_tun_key_from_attr(ma, &tun_mask); + ds_put_format(ds, "tun_id=%#"PRIx64"/%#"PRIx64 + ",src="IP_FMT"/"IP_FMT",dst="IP_FMT"/"IP_FMT + ",tos=%#"PRIx8"/%#"PRIx8",ttl=%"PRIu8"/%#"PRIx8 + ",flags(", + ntohll(tun_key.tun_id), ntohll(tun_mask.tun_id), + IP_ARGS(tun_key.ip_src), IP_ARGS(tun_mask.ip_src), + IP_ARGS(tun_key.ip_dst), IP_ARGS(tun_mask.ip_dst), + tun_key.ip_tos, tun_mask.ip_tos, + tun_key.ip_ttl, tun_mask.ip_ttl); + + format_flags(ds, flow_tun_flag_to_string, tun_key.flags, ','); + + /* XXX This code is correct, but enabling it would break the unit + test. Disable it for now until the input parser is fixed. + + ds_put_char(ds, '/'); + format_flags(ds, flow_tun_flag_to_string, tun_mask.flags, ','); + */ + ds_put_char(ds, ')'); + } else { + ds_put_format(ds, "tun_id=0x%"PRIx64",src="IP_FMT",dst="IP_FMT"," + "tos=0x%"PRIx8",ttl=%"PRIu8",flags(", + ntohll(tun_key.tun_id), + IP_ARGS(tun_key.ip_src), + IP_ARGS(tun_key.ip_dst), + tun_key.ip_tos, tun_key.ip_ttl); + + format_flags(ds, flow_tun_flag_to_string, tun_key.flags, ','); + ds_put_char(ds, ')'); + } break; case OVS_KEY_ATTR_IN_PORT: - ds_put_format(ds, "(%"PRIu32")", nl_attr_get_u32(a)); + if (portno_names && verbose && is_exact) { + char *name = odp_portno_names_get(portno_names, + u32_to_odp(nl_attr_get_u32(a))); + if (name) { + ds_put_format(ds, "%s", name); + } else { + ds_put_format(ds, "%"PRIu32, nl_attr_get_u32(a)); + } + } else { + ds_put_format(ds, "%"PRIu32, nl_attr_get_u32(a)); + if (!is_exact) { + ds_put_format(ds, "/%#"PRIx32, nl_attr_get_u32(ma)); + } + } break; case OVS_KEY_ATTR_ETHERNET: - eth_key = nl_attr_get(a); - ds_put_format(ds, "(src="ETH_ADDR_FMT",dst="ETH_ADDR_FMT")", - ETH_ADDR_ARGS(eth_key->eth_src), - ETH_ADDR_ARGS(eth_key->eth_dst)); + if (!is_exact) { + const struct ovs_key_ethernet *eth_mask = nl_attr_get(ma); + const struct ovs_key_ethernet *eth_key = nl_attr_get(a); + + ds_put_format(ds, "src="ETH_ADDR_FMT"/"ETH_ADDR_FMT + ",dst="ETH_ADDR_FMT"/"ETH_ADDR_FMT, + ETH_ADDR_ARGS(eth_key->eth_src), + ETH_ADDR_ARGS(eth_mask->eth_src), + ETH_ADDR_ARGS(eth_key->eth_dst), + ETH_ADDR_ARGS(eth_mask->eth_dst)); + } else { + const struct ovs_key_ethernet *eth_key = nl_attr_get(a); + + ds_put_format(ds, "src="ETH_ADDR_FMT",dst="ETH_ADDR_FMT, + ETH_ADDR_ARGS(eth_key->eth_src), + ETH_ADDR_ARGS(eth_key->eth_dst)); + } break; case OVS_KEY_ATTR_VLAN: - ds_put_char(ds, '('); - format_vlan_tci(ds, nl_attr_get_be16(a)); - ds_put_char(ds, ')'); + { + ovs_be16 vlan_tci = nl_attr_get_be16(a); + if (!is_exact) { + ovs_be16 mask = nl_attr_get_be16(ma); + ds_put_format(ds, "vid=%"PRIu16"/0x%"PRIx16",pcp=%d/0x%x,cfi=%d/%d", + vlan_tci_to_vid(vlan_tci), + vlan_tci_to_vid(mask), + vlan_tci_to_pcp(vlan_tci), + vlan_tci_to_pcp(mask), + vlan_tci_to_cfi(vlan_tci), + vlan_tci_to_cfi(mask)); + } else { + format_vlan_tci(ds, vlan_tci); + } + } + break; + + case OVS_KEY_ATTR_MPLS: { + const struct ovs_key_mpls *mpls_key = nl_attr_get(a); + const struct ovs_key_mpls *mpls_mask = NULL; + size_t size = nl_attr_get_size(a); + + if (!size || size % sizeof *mpls_key) { + ds_put_format(ds, "(bad key length %"PRIuSIZE")", + nl_attr_get_size(a)); + return; + } + if (!is_exact) { + mpls_mask = nl_attr_get(ma); + if (nl_attr_get_size(a) != nl_attr_get_size(ma)) { + ds_put_format(ds, "(key length %"PRIuSIZE" != " + "mask length %"PRIuSIZE")", + nl_attr_get_size(a), nl_attr_get_size(ma)); + return; + } + } + format_mpls(ds, mpls_key, mpls_mask, size / sizeof *mpls_key); break; + } case OVS_KEY_ATTR_ETHERTYPE: - ds_put_format(ds, "(0x%04"PRIx16")", - ntohs(nl_attr_get_be16(a))); + ds_put_format(ds, "0x%04"PRIx16, ntohs(nl_attr_get_be16(a))); + if (!is_exact) { + ds_put_format(ds, "/0x%04"PRIx16, ntohs(nl_attr_get_be16(ma))); + } break; case OVS_KEY_ATTR_IPV4: - ipv4_key = nl_attr_get(a); - ds_put_format(ds, "(src="IP_FMT",dst="IP_FMT",proto=%"PRIu8 - ",tos=%#"PRIx8",ttl=%"PRIu8",frag=%s)", - IP_ARGS(&ipv4_key->ipv4_src), - IP_ARGS(&ipv4_key->ipv4_dst), - ipv4_key->ipv4_proto, ipv4_key->ipv4_tos, - ipv4_key->ipv4_ttl, - ovs_frag_type_to_string(ipv4_key->ipv4_frag)); + if (!is_exact) { + const struct ovs_key_ipv4 *ipv4_key = nl_attr_get(a); + const struct ovs_key_ipv4 *ipv4_mask = nl_attr_get(ma); + + ds_put_format(ds, "src="IP_FMT"/"IP_FMT",dst="IP_FMT"/"IP_FMT + ",proto=%"PRIu8"/%#"PRIx8",tos=%#"PRIx8"/%#"PRIx8 + ",ttl=%"PRIu8"/%#"PRIx8",frag=%s/%#"PRIx8, + IP_ARGS(ipv4_key->ipv4_src), + IP_ARGS(ipv4_mask->ipv4_src), + IP_ARGS(ipv4_key->ipv4_dst), + IP_ARGS(ipv4_mask->ipv4_dst), + ipv4_key->ipv4_proto, ipv4_mask->ipv4_proto, + ipv4_key->ipv4_tos, ipv4_mask->ipv4_tos, + ipv4_key->ipv4_ttl, ipv4_mask->ipv4_ttl, + ovs_frag_type_to_string(ipv4_key->ipv4_frag), + ipv4_mask->ipv4_frag); + } else { + const struct ovs_key_ipv4 *ipv4_key = nl_attr_get(a); + + ds_put_format(ds, "src="IP_FMT",dst="IP_FMT",proto=%"PRIu8 + ",tos=%#"PRIx8",ttl=%"PRIu8",frag=%s", + IP_ARGS(ipv4_key->ipv4_src), + IP_ARGS(ipv4_key->ipv4_dst), + ipv4_key->ipv4_proto, ipv4_key->ipv4_tos, + ipv4_key->ipv4_ttl, + ovs_frag_type_to_string(ipv4_key->ipv4_frag)); + } break; - case OVS_KEY_ATTR_IPV6: { - char src_str[INET6_ADDRSTRLEN]; - char dst_str[INET6_ADDRSTRLEN]; + case OVS_KEY_ATTR_IPV6: + if (!is_exact) { + const struct ovs_key_ipv6 *ipv6_key, *ipv6_mask; + char src_str[INET6_ADDRSTRLEN]; + char dst_str[INET6_ADDRSTRLEN]; + char src_mask[INET6_ADDRSTRLEN]; + char dst_mask[INET6_ADDRSTRLEN]; + + ipv6_key = nl_attr_get(a); + inet_ntop(AF_INET6, ipv6_key->ipv6_src, src_str, sizeof src_str); + inet_ntop(AF_INET6, ipv6_key->ipv6_dst, dst_str, sizeof dst_str); + + ipv6_mask = nl_attr_get(ma); + inet_ntop(AF_INET6, ipv6_mask->ipv6_src, src_mask, sizeof src_mask); + inet_ntop(AF_INET6, ipv6_mask->ipv6_dst, dst_mask, sizeof dst_mask); + + ds_put_format(ds, "src=%s/%s,dst=%s/%s,label=%#"PRIx32"/%#"PRIx32 + ",proto=%"PRIu8"/%#"PRIx8",tclass=%#"PRIx8"/%#"PRIx8 + ",hlimit=%"PRIu8"/%#"PRIx8",frag=%s/%#"PRIx8, + src_str, src_mask, dst_str, dst_mask, + ntohl(ipv6_key->ipv6_label), + ntohl(ipv6_mask->ipv6_label), + ipv6_key->ipv6_proto, ipv6_mask->ipv6_proto, + ipv6_key->ipv6_tclass, ipv6_mask->ipv6_tclass, + ipv6_key->ipv6_hlimit, ipv6_mask->ipv6_hlimit, + ovs_frag_type_to_string(ipv6_key->ipv6_frag), + ipv6_mask->ipv6_frag); + } else { + const struct ovs_key_ipv6 *ipv6_key; + char src_str[INET6_ADDRSTRLEN]; + char dst_str[INET6_ADDRSTRLEN]; + + ipv6_key = nl_attr_get(a); + inet_ntop(AF_INET6, ipv6_key->ipv6_src, src_str, sizeof src_str); + inet_ntop(AF_INET6, ipv6_key->ipv6_dst, dst_str, sizeof dst_str); + + ds_put_format(ds, "src=%s,dst=%s,label=%#"PRIx32",proto=%"PRIu8 + ",tclass=%#"PRIx8",hlimit=%"PRIu8",frag=%s", + src_str, dst_str, ntohl(ipv6_key->ipv6_label), + ipv6_key->ipv6_proto, ipv6_key->ipv6_tclass, + ipv6_key->ipv6_hlimit, + ovs_frag_type_to_string(ipv6_key->ipv6_frag)); + } + break; - ipv6_key = nl_attr_get(a); - inet_ntop(AF_INET6, ipv6_key->ipv6_src, src_str, sizeof src_str); - inet_ntop(AF_INET6, ipv6_key->ipv6_dst, dst_str, sizeof dst_str); + case OVS_KEY_ATTR_TCP: + if (!is_exact) { + const struct ovs_key_tcp *tcp_mask = nl_attr_get(ma); + const struct ovs_key_tcp *tcp_key = nl_attr_get(a); + + ds_put_format(ds, "src=%"PRIu16"/%#"PRIx16 + ",dst=%"PRIu16"/%#"PRIx16, + ntohs(tcp_key->tcp_src), ntohs(tcp_mask->tcp_src), + ntohs(tcp_key->tcp_dst), ntohs(tcp_mask->tcp_dst)); + } else { + const struct ovs_key_tcp *tcp_key = nl_attr_get(a); - ds_put_format(ds, "(src=%s,dst=%s,label=%#"PRIx32",proto=%"PRIu8 - ",tclass=%#"PRIx8",hlimit=%"PRIu8",frag=%s)", - src_str, dst_str, ntohl(ipv6_key->ipv6_label), - ipv6_key->ipv6_proto, ipv6_key->ipv6_tclass, - ipv6_key->ipv6_hlimit, - ovs_frag_type_to_string(ipv6_key->ipv6_frag)); + ds_put_format(ds, "src=%"PRIu16",dst=%"PRIu16, + ntohs(tcp_key->tcp_src), ntohs(tcp_key->tcp_dst)); + } break; - } - case OVS_KEY_ATTR_TCP: - tcp_key = nl_attr_get(a); - ds_put_format(ds, "(src=%"PRIu16",dst=%"PRIu16")", - ntohs(tcp_key->tcp_src), ntohs(tcp_key->tcp_dst)); + case OVS_KEY_ATTR_TCP_FLAGS: + ds_put_format(ds, "0x%03"PRIx16, ntohs(nl_attr_get_be16(a))); + if (!is_exact) { + ds_put_format(ds, "/0x%03"PRIx16, ntohs(nl_attr_get_be16(ma))); + } break; case OVS_KEY_ATTR_UDP: - udp_key = nl_attr_get(a); - ds_put_format(ds, "(src=%"PRIu16",dst=%"PRIu16")", - ntohs(udp_key->udp_src), ntohs(udp_key->udp_dst)); + if (!is_exact) { + const struct ovs_key_udp *udp_mask = nl_attr_get(ma); + const struct ovs_key_udp *udp_key = nl_attr_get(a); + + ds_put_format(ds, "src=%"PRIu16"/%#"PRIx16 + ",dst=%"PRIu16"/%#"PRIx16, + ntohs(udp_key->udp_src), ntohs(udp_mask->udp_src), + ntohs(udp_key->udp_dst), ntohs(udp_mask->udp_dst)); + } else { + const struct ovs_key_udp *udp_key = nl_attr_get(a); + + ds_put_format(ds, "src=%"PRIu16",dst=%"PRIu16, + ntohs(udp_key->udp_src), ntohs(udp_key->udp_dst)); + } + break; + + case OVS_KEY_ATTR_SCTP: + if (ma) { + const struct ovs_key_sctp *sctp_mask = nl_attr_get(ma); + const struct ovs_key_sctp *sctp_key = nl_attr_get(a); + + ds_put_format(ds, "src=%"PRIu16"/%#"PRIx16 + ",dst=%"PRIu16"/%#"PRIx16, + ntohs(sctp_key->sctp_src), ntohs(sctp_mask->sctp_src), + ntohs(sctp_key->sctp_dst), ntohs(sctp_mask->sctp_dst)); + } else { + const struct ovs_key_sctp *sctp_key = nl_attr_get(a); + + ds_put_format(ds, "src=%"PRIu16",dst=%"PRIu16, + ntohs(sctp_key->sctp_src), ntohs(sctp_key->sctp_dst)); + } break; case OVS_KEY_ATTR_ICMP: - icmp_key = nl_attr_get(a); - ds_put_format(ds, "(type=%"PRIu8",code=%"PRIu8")", - icmp_key->icmp_type, icmp_key->icmp_code); + if (!is_exact) { + const struct ovs_key_icmp *icmp_mask = nl_attr_get(ma); + const struct ovs_key_icmp *icmp_key = nl_attr_get(a); + + ds_put_format(ds, "type=%"PRIu8"/%#"PRIx8",code=%"PRIu8"/%#"PRIx8, + icmp_key->icmp_type, icmp_mask->icmp_type, + icmp_key->icmp_code, icmp_mask->icmp_code); + } else { + const struct ovs_key_icmp *icmp_key = nl_attr_get(a); + + ds_put_format(ds, "type=%"PRIu8",code=%"PRIu8, + icmp_key->icmp_type, icmp_key->icmp_code); + } break; case OVS_KEY_ATTR_ICMPV6: - icmpv6_key = nl_attr_get(a); - ds_put_format(ds, "(type=%"PRIu8",code=%"PRIu8")", - icmpv6_key->icmpv6_type, icmpv6_key->icmpv6_code); + if (!is_exact) { + const struct ovs_key_icmpv6 *icmpv6_mask = nl_attr_get(ma); + const struct ovs_key_icmpv6 *icmpv6_key = nl_attr_get(a); + + ds_put_format(ds, "type=%"PRIu8"/%#"PRIx8",code=%"PRIu8"/%#"PRIx8, + icmpv6_key->icmpv6_type, icmpv6_mask->icmpv6_type, + icmpv6_key->icmpv6_code, icmpv6_mask->icmpv6_code); + } else { + const struct ovs_key_icmpv6 *icmpv6_key = nl_attr_get(a); + + ds_put_format(ds, "type=%"PRIu8",code=%"PRIu8, + icmpv6_key->icmpv6_type, icmpv6_key->icmpv6_code); + } break; case OVS_KEY_ATTR_ARP: - arp_key = nl_attr_get(a); - ds_put_format(ds, "(sip="IP_FMT",tip="IP_FMT",op=%"PRIu16"," - "sha="ETH_ADDR_FMT",tha="ETH_ADDR_FMT")", - IP_ARGS(&arp_key->arp_sip), IP_ARGS(&arp_key->arp_tip), - ntohs(arp_key->arp_op), ETH_ADDR_ARGS(arp_key->arp_sha), - ETH_ADDR_ARGS(arp_key->arp_tha)); + if (!is_exact) { + const struct ovs_key_arp *arp_mask = nl_attr_get(ma); + const struct ovs_key_arp *arp_key = nl_attr_get(a); + + ds_put_format(ds, "sip="IP_FMT"/"IP_FMT",tip="IP_FMT"/"IP_FMT + ",op=%"PRIu16"/%#"PRIx16 + ",sha="ETH_ADDR_FMT"/"ETH_ADDR_FMT + ",tha="ETH_ADDR_FMT"/"ETH_ADDR_FMT, + IP_ARGS(arp_key->arp_sip), + IP_ARGS(arp_mask->arp_sip), + IP_ARGS(arp_key->arp_tip), + IP_ARGS(arp_mask->arp_tip), + ntohs(arp_key->arp_op), ntohs(arp_mask->arp_op), + ETH_ADDR_ARGS(arp_key->arp_sha), + ETH_ADDR_ARGS(arp_mask->arp_sha), + ETH_ADDR_ARGS(arp_key->arp_tha), + ETH_ADDR_ARGS(arp_mask->arp_tha)); + } else { + const struct ovs_key_arp *arp_key = nl_attr_get(a); + + ds_put_format(ds, "sip="IP_FMT",tip="IP_FMT",op=%"PRIu16"," + "sha="ETH_ADDR_FMT",tha="ETH_ADDR_FMT, + IP_ARGS(arp_key->arp_sip), IP_ARGS(arp_key->arp_tip), + ntohs(arp_key->arp_op), + ETH_ADDR_ARGS(arp_key->arp_sha), + ETH_ADDR_ARGS(arp_key->arp_tha)); + } break; case OVS_KEY_ATTR_ND: { + const struct ovs_key_nd *nd_key, *nd_mask = NULL; char target[INET6_ADDRSTRLEN]; nd_key = nl_attr_get(a); + if (!is_exact) { + nd_mask = nl_attr_get(ma); + } + inet_ntop(AF_INET6, nd_key->nd_target, target, sizeof target); + ds_put_format(ds, "target=%s", target); + if (!is_exact) { + inet_ntop(AF_INET6, nd_mask->nd_target, target, sizeof target); + ds_put_format(ds, "/%s", target); + } - ds_put_format(ds, "(target=%s", target); if (!eth_addr_is_zero(nd_key->nd_sll)) { ds_put_format(ds, ",sll="ETH_ADDR_FMT, ETH_ADDR_ARGS(nd_key->nd_sll)); + if (!is_exact) { + ds_put_format(ds, "/"ETH_ADDR_FMT, + ETH_ADDR_ARGS(nd_mask->nd_sll)); + } } if (!eth_addr_is_zero(nd_key->nd_tll)) { ds_put_format(ds, ",tll="ETH_ADDR_FMT, ETH_ADDR_ARGS(nd_key->nd_tll)); + if (!is_exact) { + ds_put_format(ds, "/"ETH_ADDR_FMT, + ETH_ADDR_ARGS(nd_mask->nd_tll)); + } } - ds_put_char(ds, ')'); break; } - case OVS_KEY_ATTR_UNSPEC: case __OVS_KEY_ATTR_MAX: default: format_generic_odp_key(a, ds); + if (!is_exact) { + ds_put_char(ds, '/'); + format_generic_odp_key(ma, ds); + } break; } + ds_put_char(ds, ')'); +} + +static struct nlattr * +generate_all_wildcard_mask(struct ofpbuf *ofp, const struct nlattr *key) +{ + const struct nlattr *a; + unsigned int left; + int type = nl_attr_type(key); + int size = nl_attr_get_size(key); + + if (odp_flow_key_attr_len(type) >=0) { + nl_msg_put_unspec_zero(ofp, type, size); + } else { + size_t nested_mask; + + nested_mask = nl_msg_start_nested(ofp, type); + NL_ATTR_FOR_EACH(a, left, key, nl_attr_get_size(key)) { + generate_all_wildcard_mask(ofp, nl_attr_get(a)); + } + nl_msg_end_nested(ofp, nested_mask); + } + + return ofpbuf_base(ofp); } /* Appends to 'ds' a string representation of the 'key_len' bytes of - * OVS_KEY_ATTR_* attributes in 'key'. */ + * OVS_KEY_ATTR_* attributes in 'key'. If non-null, additionally formats the + * 'mask_len' bytes of 'mask' which apply to 'key'. If 'portno_names' is + * non-null and 'verbose' is true, translates odp port number to its name. */ void -odp_flow_key_format(const struct nlattr *key, size_t key_len, struct ds *ds) +odp_flow_format(const struct nlattr *key, size_t key_len, + const struct nlattr *mask, size_t mask_len, + const struct hmap *portno_names, struct ds *ds, bool verbose) { if (key_len) { const struct nlattr *a; unsigned int left; + bool has_ethtype_key = false; + const struct nlattr *ma = NULL; + struct ofpbuf ofp; + bool first_field = true; + ofpbuf_init(&ofp, 100); NL_ATTR_FOR_EACH (a, left, key, key_len) { - if (a != key) { - ds_put_char(ds, ','); + bool is_nested_attr; + bool is_wildcard = false; + int attr_type = nl_attr_type(a); + + if (attr_type == OVS_KEY_ATTR_ETHERTYPE) { + has_ethtype_key = true; } - format_odp_key_attr(a, ds); - } - if (left) { - int i; - - if (left == key_len) { - ds_put_cstr(ds, ""); + + is_nested_attr = (odp_flow_key_attr_len(attr_type) == -2); + + if (mask && mask_len) { + ma = nl_attr_find__(mask, mask_len, nl_attr_type(a)); + is_wildcard = ma ? odp_mask_attr_is_wildcard(ma) : true; + } + + if (verbose || !is_wildcard || is_nested_attr) { + if (is_wildcard && !ma) { + ma = generate_all_wildcard_mask(&ofp, a); + } + if (!first_field) { + ds_put_char(ds, ','); + } + format_odp_key_attr(a, ma, portno_names, ds, verbose); + first_field = false; + } + ofpbuf_clear(&ofp); + } + ofpbuf_uninit(&ofp); + + if (left) { + int i; + + if (left == key_len) { + ds_put_cstr(ds, ""); } ds_put_format(ds, ",***%u leftover bytes*** (", left); for (i = 0; i < left; i++) { @@ -835,28 +1516,72 @@ odp_flow_key_format(const struct nlattr *key, size_t key_len, struct ds *ds) } ds_put_char(ds, ')'); } + if (!has_ethtype_key) { + ma = nl_attr_find__(mask, mask_len, OVS_KEY_ATTR_ETHERTYPE); + if (ma) { + ds_put_format(ds, ",eth_type(0/0x%04"PRIx16")", + ntohs(nl_attr_get_be16(ma))); + } + } } else { ds_put_cstr(ds, ""); } } +/* Appends to 'ds' a string representation of the 'key_len' bytes of + * OVS_KEY_ATTR_* attributes in 'key'. */ +void +odp_flow_key_format(const struct nlattr *key, + size_t key_len, struct ds *ds) +{ + odp_flow_format(key, key_len, NULL, 0, NULL, ds, true); +} + +static void +put_nd(struct ovs_key_nd* nd_key, const uint8_t *nd_sll, + const uint8_t *nd_tll, struct ofpbuf *key) +{ + if (nd_sll) { + memcpy(nd_key->nd_sll, nd_sll, ETH_ADDR_LEN); + } + + if (nd_tll) { + memcpy(nd_key->nd_tll, nd_tll, ETH_ADDR_LEN); + } + + nl_msg_put_unspec(key, OVS_KEY_ATTR_ND, nd_key, sizeof *nd_key); +} + static int -put_nd_key(int n, const char *nd_target_s, - const uint8_t *nd_sll, const uint8_t *nd_tll, struct ofpbuf *key) +put_nd_key(int n, const char *nd_target_s, const uint8_t *nd_sll, + const uint8_t *nd_tll, struct ofpbuf *key) { struct ovs_key_nd nd_key; memset(&nd_key, 0, sizeof nd_key); + if (inet_pton(AF_INET6, nd_target_s, nd_key.nd_target) != 1) { return -EINVAL; } - if (nd_sll) { - memcpy(nd_key.nd_sll, nd_sll, ETH_ADDR_LEN); - } - if (nd_tll) { - memcpy(nd_key.nd_tll, nd_tll, ETH_ADDR_LEN); + + put_nd(&nd_key, nd_sll, nd_tll, key); + return n; +} + +static int +put_nd_mask(int n, const char *nd_target_s, + const uint8_t *nd_sll, const uint8_t *nd_tll, struct ofpbuf *mask) +{ + struct ovs_key_nd nd_mask; + + memset(&nd_mask, 0xff, sizeof nd_mask); + + if (strlen(nd_target_s) != 0 && + inet_pton(AF_INET6, nd_target_s, nd_mask.nd_target) != 1) { + return -EINVAL; } - nl_msg_put_unspec(key, OVS_KEY_ATTR_ND, &nd_key, sizeof nd_key); + + put_nd(&nd_mask, nd_sll, nd_tll, mask); return n; } @@ -875,162 +1600,449 @@ ovs_frag_type_from_string(const char *s, enum ovs_frag_type *type) return true; } -static int -parse_odp_key_attr(const char *s, const struct simap *port_names, - struct ofpbuf *key) -{ - /* Many of the sscanf calls in this function use oversized destination - * fields because some sscanf() implementations truncate the range of %i - * directives, so that e.g. "%"SCNi16 interprets input of "0xfedc" as a - * value of 0x7fff. The other alternatives are to allow only a single - * radix (e.g. decimal or hexadecimal) or to write more sophisticated - * parsers. - * - * The tun_id parser has to use an alternative approach because there is no - * type larger than 64 bits. */ +static ovs_be32 +mpls_lse_from_components(int mpls_label, int mpls_tc, int mpls_ttl, int mpls_bos) +{ + return (htonl((mpls_label << MPLS_LABEL_SHIFT) | + (mpls_tc << MPLS_TC_SHIFT) | + (mpls_ttl << MPLS_TTL_SHIFT) | + (mpls_bos << MPLS_BOS_SHIFT))); +} +static int +parse_odp_key_mask_attr(const char *s, const struct simap *port_names, + struct ofpbuf *key, struct ofpbuf *mask) +{ { - unsigned long long int priority; + uint32_t priority; + uint32_t priority_mask; int n = -1; - if (sscanf(s, "priority(%lli)%n", &priority, &n) > 0 && n > 0) { + if (mask && ovs_scan(s, "skb_priority(%"SCNi32"/%"SCNi32")%n", + &priority, &priority_mask, &n)) { + nl_msg_put_u32(key, OVS_KEY_ATTR_PRIORITY, priority); + nl_msg_put_u32(mask, OVS_KEY_ATTR_PRIORITY, priority_mask); + return n; + } else if (ovs_scan(s, "skb_priority(%"SCNi32")%n", &priority, &n)) { nl_msg_put_u32(key, OVS_KEY_ATTR_PRIORITY, priority); + if (mask) { + nl_msg_put_u32(mask, OVS_KEY_ATTR_PRIORITY, UINT32_MAX); + } + return n; + } + } + + { + uint32_t mark; + uint32_t mark_mask; + int n = -1; + + if (mask && ovs_scan(s, "skb_mark(%"SCNi32"/%"SCNi32")%n", &mark, + &mark_mask, &n)) { + nl_msg_put_u32(key, OVS_KEY_ATTR_SKB_MARK, mark); + nl_msg_put_u32(mask, OVS_KEY_ATTR_SKB_MARK, mark_mask); + return n; + } else if (ovs_scan(s, "skb_mark(%"SCNi32")%n", &mark, &n)) { + nl_msg_put_u32(key, OVS_KEY_ATTR_SKB_MARK, mark); + if (mask) { + nl_msg_put_u32(mask, OVS_KEY_ATTR_SKB_MARK, UINT32_MAX); + } return n; } } { - char tun_id_s[32]; + uint32_t recirc_id; int n = -1; - if (sscanf(s, "tun_id(%31[x0123456789abcdefABCDEF])%n", - tun_id_s, &n) > 0 && n > 0) { - uint64_t tun_id = strtoull(tun_id_s, NULL, 0); - nl_msg_put_be64(key, OVS_KEY_ATTR_TUN_ID, htonll(tun_id)); + if (ovs_scan(s, "recirc_id(%"SCNi32")%n", &recirc_id, &n)) { + nl_msg_put_u32(key, OVS_KEY_ATTR_RECIRC_ID, recirc_id); + nl_msg_put_u32(mask, OVS_KEY_ATTR_RECIRC_ID, UINT32_MAX); return n; } } { - unsigned long long int in_port; + uint32_t dp_hash; + uint32_t dp_hash_mask; int n = -1; - if (sscanf(s, "in_port(%lli)%n", &in_port, &n) > 0 && n > 0) { + if (mask && ovs_scan(s, "dp_hash(%"SCNi32"/%"SCNi32")%n", &dp_hash, + &dp_hash_mask, &n)) { + nl_msg_put_u32(key, OVS_KEY_ATTR_DP_HASH, dp_hash); + nl_msg_put_u32(mask, OVS_KEY_ATTR_DP_HASH, dp_hash_mask); + return n; + } else if (ovs_scan(s, "dp_hash(%"SCNi32")%n", &dp_hash, &n)) { + nl_msg_put_u32(key, OVS_KEY_ATTR_DP_HASH, dp_hash); + if (mask) { + nl_msg_put_u32(mask, OVS_KEY_ATTR_DP_HASH, UINT32_MAX); + } + return n; + } + } + + { + uint64_t tun_id, tun_id_mask; + struct flow_tnl tun_key, tun_key_mask; + int n = -1; + + if (mask && ovs_scan(s, "tunnel(tun_id=%"SCNi64"/%"SCNi64"," + "src="IP_SCAN_FMT"/"IP_SCAN_FMT",dst="IP_SCAN_FMT + "/"IP_SCAN_FMT",tos=%"SCNi8"/%"SCNi8"," + "ttl=%"SCNi8"/%"SCNi8",flags%n", + &tun_id, &tun_id_mask, + IP_SCAN_ARGS(&tun_key.ip_src), + IP_SCAN_ARGS(&tun_key_mask.ip_src), + IP_SCAN_ARGS(&tun_key.ip_dst), + IP_SCAN_ARGS(&tun_key_mask.ip_dst), + &tun_key.ip_tos, &tun_key_mask.ip_tos, + &tun_key.ip_ttl, &tun_key_mask.ip_ttl, &n)) { + int res; + uint32_t flags; + + tun_key.tun_id = htonll(tun_id); + tun_key_mask.tun_id = htonll(tun_id_mask); + res = parse_flags(&s[n], flow_tun_flag_to_string, &flags); + tun_key.flags = flags; + tun_key_mask.flags = UINT16_MAX; + + if (res < 0) { + return res; + } + n += res; + if (s[n] != ')') { + return -EINVAL; + } + n++; + tun_key_to_attr(key, &tun_key); + if (mask) { + tun_key_to_attr(mask, &tun_key_mask); + } + return n; + } else if (ovs_scan(s, "tunnel(tun_id=%"SCNi64"," + "src="IP_SCAN_FMT",dst="IP_SCAN_FMT + ",tos=%"SCNi8",ttl=%"SCNi8",flags%n", &tun_id, + IP_SCAN_ARGS(&tun_key.ip_src), + IP_SCAN_ARGS(&tun_key.ip_dst), + &tun_key.ip_tos, &tun_key.ip_ttl, &n)) { + int res; + uint32_t flags; + + tun_key.tun_id = htonll(tun_id); + res = parse_flags(&s[n], flow_tun_flag_to_string, &flags); + tun_key.flags = flags; + + if (res < 0) { + return res; + } + n += res; + if (s[n] != ')') { + return -EINVAL; + } + n++; + tun_key_to_attr(key, &tun_key); + + if (mask) { + memset(&tun_key, 0xff, sizeof tun_key); + tun_key_to_attr(mask, &tun_key); + } + return n; + } + } + + { + uint32_t in_port; + uint32_t in_port_mask; + int n = -1; + + if (mask && ovs_scan(s, "in_port(%"SCNi32"/%"SCNi32")%n", + &in_port, &in_port_mask, &n)) { nl_msg_put_u32(key, OVS_KEY_ATTR_IN_PORT, in_port); + nl_msg_put_u32(mask, OVS_KEY_ATTR_IN_PORT, in_port_mask); + return n; + } else if (ovs_scan(s, "in_port(%"SCNi32")%n", &in_port, &n)) { + nl_msg_put_u32(key, OVS_KEY_ATTR_IN_PORT, in_port); + if (mask) { + nl_msg_put_u32(mask, OVS_KEY_ATTR_IN_PORT, UINT32_MAX); + } return n; } } + if (port_names && !strncmp(s, "in_port(", 8)) { const char *name; const struct simap_node *node; int name_len; name = s + 8; - name_len = strcspn(s, ")"); + name_len = strcspn(name, ")"); node = simap_find_len(port_names, name, name_len); if (node) { nl_msg_put_u32(key, OVS_KEY_ATTR_IN_PORT, node->data); + + if (mask) { + nl_msg_put_u32(mask, OVS_KEY_ATTR_IN_PORT, UINT32_MAX); + } return 8 + name_len + 1; } } { struct ovs_key_ethernet eth_key; + struct ovs_key_ethernet eth_key_mask; int n = -1; - if (sscanf(s, - "eth(src="ETH_ADDR_SCAN_FMT",dst="ETH_ADDR_SCAN_FMT")%n", - ETH_ADDR_SCAN_ARGS(eth_key.eth_src), - ETH_ADDR_SCAN_ARGS(eth_key.eth_dst), &n) > 0 && n > 0) { + if (mask && ovs_scan(s, + "eth(src="ETH_ADDR_SCAN_FMT"/"ETH_ADDR_SCAN_FMT"," + "dst="ETH_ADDR_SCAN_FMT"/"ETH_ADDR_SCAN_FMT")%n", + ETH_ADDR_SCAN_ARGS(eth_key.eth_src), + ETH_ADDR_SCAN_ARGS(eth_key_mask.eth_src), + ETH_ADDR_SCAN_ARGS(eth_key.eth_dst), + ETH_ADDR_SCAN_ARGS(eth_key_mask.eth_dst), &n)) { + nl_msg_put_unspec(key, OVS_KEY_ATTR_ETHERNET, + ð_key, sizeof eth_key); + nl_msg_put_unspec(mask, OVS_KEY_ATTR_ETHERNET, + ð_key_mask, sizeof eth_key_mask); + return n; + } else if (ovs_scan(s, "eth(src="ETH_ADDR_SCAN_FMT"," + "dst="ETH_ADDR_SCAN_FMT")%n", + ETH_ADDR_SCAN_ARGS(eth_key.eth_src), + ETH_ADDR_SCAN_ARGS(eth_key.eth_dst), &n)) { nl_msg_put_unspec(key, OVS_KEY_ATTR_ETHERNET, ð_key, sizeof eth_key); + + if (mask) { + memset(ð_key, 0xff, sizeof eth_key); + nl_msg_put_unspec(mask, OVS_KEY_ATTR_ETHERNET, + ð_key, sizeof eth_key); + } return n; } } { - uint16_t vid; - int pcp; - int cfi; + int vid, vid_mask; + int pcp, pcp_mask; + int cfi, cfi_mask; int n = -1; - if ((sscanf(s, "vlan(vid=%"SCNi16",pcp=%i)%n", &vid, &pcp, &n) > 0 - && n > 0)) { + if (mask && ovs_scan(s, "vlan(vid=%i/%i,pcp=%i/%i)%n", + &vid, &vid_mask, &pcp, &pcp_mask, &n)) { + nl_msg_put_be16(key, OVS_KEY_ATTR_VLAN, + htons((vid << VLAN_VID_SHIFT) | + (pcp << VLAN_PCP_SHIFT) | + VLAN_CFI)); + nl_msg_put_be16(mask, OVS_KEY_ATTR_VLAN, + htons((vid_mask << VLAN_VID_SHIFT) | + (pcp_mask << VLAN_PCP_SHIFT) | + (1 << VLAN_CFI_SHIFT))); + return n; + } else if (ovs_scan(s, "vlan(vid=%i,pcp=%i)%n", &vid, &pcp, &n)) { nl_msg_put_be16(key, OVS_KEY_ATTR_VLAN, htons((vid << VLAN_VID_SHIFT) | (pcp << VLAN_PCP_SHIFT) | VLAN_CFI)); + if (mask) { + nl_msg_put_be16(mask, OVS_KEY_ATTR_VLAN, OVS_BE16_MAX); + } return n; - } else if ((sscanf(s, "vlan(vid=%"SCNi16",pcp=%i,cfi=%i)%n", - &vid, &pcp, &cfi, &n) > 0 - && n > 0)) { + } else if (mask + && ovs_scan(s, "vlan(vid=%i/%i,pcp=%i/%i,cfi=%i/%i)%n", + &vid, &vid_mask, &pcp, &pcp_mask, + &cfi, &cfi_mask, &n)) { nl_msg_put_be16(key, OVS_KEY_ATTR_VLAN, htons((vid << VLAN_VID_SHIFT) | (pcp << VLAN_PCP_SHIFT) | (cfi ? VLAN_CFI : 0))); + nl_msg_put_be16(mask, OVS_KEY_ATTR_VLAN, + htons((vid_mask << VLAN_VID_SHIFT) | + (pcp_mask << VLAN_PCP_SHIFT) | + (cfi_mask << VLAN_CFI_SHIFT))); + return n; + } else if (ovs_scan(s, "vlan(vid=%i,pcp=%i,cfi=%i)%n", + &vid, &pcp, &cfi, &n)) { + nl_msg_put_be16(key, OVS_KEY_ATTR_VLAN, + htons((vid << VLAN_VID_SHIFT) | + (pcp << VLAN_PCP_SHIFT) | + (cfi ? VLAN_CFI : 0))); + if (mask) { + nl_msg_put_be16(mask, OVS_KEY_ATTR_VLAN, OVS_BE16_MAX); + } return n; } } { int eth_type; + int eth_type_mask; int n = -1; - if (sscanf(s, "eth_type(%i)%n", ð_type, &n) > 0 && n > 0) { + if (mask && ovs_scan(s, "eth_type(%i/%i)%n", + ð_type, ð_type_mask, &n)) { + if (eth_type != 0) { + nl_msg_put_be16(key, OVS_KEY_ATTR_ETHERTYPE, htons(eth_type)); + } + nl_msg_put_be16(mask, OVS_KEY_ATTR_ETHERTYPE, htons(eth_type_mask)); + return n; + } else if (ovs_scan(s, "eth_type(%i)%n", ð_type, &n)) { nl_msg_put_be16(key, OVS_KEY_ATTR_ETHERTYPE, htons(eth_type)); + if (mask) { + nl_msg_put_be16(mask, OVS_KEY_ATTR_ETHERTYPE, OVS_BE16_MAX); + } + return n; + } + } + + { + int label, tc, ttl, bos; + int label_mask, tc_mask, ttl_mask, bos_mask; + int n = -1; + + if (mask && ovs_scan(s, "mpls(label=%i/%i,tc=%i/%i," + "ttl=%i/%i,bos=%i/%i)%n", + &label, &label_mask, &tc, &tc_mask, + &ttl, &ttl_mask, &bos, &bos_mask, &n)) { + struct ovs_key_mpls *mpls, *mpls_mask; + + mpls = nl_msg_put_unspec_uninit(key, OVS_KEY_ATTR_MPLS, + sizeof *mpls); + mpls->mpls_lse = mpls_lse_from_components(label, tc, ttl, bos); + + mpls_mask = nl_msg_put_unspec_uninit(mask, OVS_KEY_ATTR_MPLS, + sizeof *mpls_mask); + mpls_mask->mpls_lse = mpls_lse_from_components( + label_mask, tc_mask, ttl_mask, bos_mask); + return n; + } else if (ovs_scan(s, "mpls(label=%i,tc=%i,ttl=%i,bos=%i)%n", + &label, &tc, &ttl, &bos, &n)) { + struct ovs_key_mpls *mpls; + + mpls = nl_msg_put_unspec_uninit(key, OVS_KEY_ATTR_MPLS, + sizeof *mpls); + mpls->mpls_lse = mpls_lse_from_components(label, tc, ttl, bos); + if (mask) { + mpls = nl_msg_put_unspec_uninit(mask, OVS_KEY_ATTR_MPLS, + sizeof *mpls); + mpls->mpls_lse = OVS_BE32_MAX; + } return n; } } + { - ovs_be32 ipv4_src; - ovs_be32 ipv4_dst; - int ipv4_proto; - int ipv4_tos; - int ipv4_ttl; + struct ovs_key_ipv4 ipv4_key; + struct ovs_key_ipv4 ipv4_mask; + char frag[8]; enum ovs_frag_type ipv4_frag; int n = -1; - if (sscanf(s, "ipv4(src="IP_SCAN_FMT",dst="IP_SCAN_FMT"," - "proto=%i,tos=%i,ttl=%i,frag=%7[a-z])%n", - IP_SCAN_ARGS(&ipv4_src), IP_SCAN_ARGS(&ipv4_dst), - &ipv4_proto, &ipv4_tos, &ipv4_ttl, frag, &n) > 0 - && n > 0 + if (mask + && ovs_scan(s, "ipv4(src="IP_SCAN_FMT"/"IP_SCAN_FMT"," + "dst="IP_SCAN_FMT"/"IP_SCAN_FMT"," + "proto=%"SCNi8"/%"SCNi8"," + "tos=%"SCNi8"/%"SCNi8"," + "ttl=%"SCNi8"/%"SCNi8"," + "frag=%7[a-z]/%"SCNi8")%n", + IP_SCAN_ARGS(&ipv4_key.ipv4_src), + IP_SCAN_ARGS(&ipv4_mask.ipv4_src), + IP_SCAN_ARGS(&ipv4_key.ipv4_dst), + IP_SCAN_ARGS(&ipv4_mask.ipv4_dst), + &ipv4_key.ipv4_proto, &ipv4_mask.ipv4_proto, + &ipv4_key.ipv4_tos, &ipv4_mask.ipv4_tos, + &ipv4_key.ipv4_ttl, &ipv4_mask.ipv4_ttl, + frag, &ipv4_mask.ipv4_frag, &n) && ovs_frag_type_from_string(frag, &ipv4_frag)) { - struct ovs_key_ipv4 ipv4_key; + ipv4_key.ipv4_frag = ipv4_frag; + nl_msg_put_unspec(key, OVS_KEY_ATTR_IPV4, + &ipv4_key, sizeof ipv4_key); - ipv4_key.ipv4_src = ipv4_src; - ipv4_key.ipv4_dst = ipv4_dst; - ipv4_key.ipv4_proto = ipv4_proto; - ipv4_key.ipv4_tos = ipv4_tos; - ipv4_key.ipv4_ttl = ipv4_ttl; + nl_msg_put_unspec(mask, OVS_KEY_ATTR_IPV4, + &ipv4_mask, sizeof ipv4_mask); + return n; + } else if (ovs_scan(s, "ipv4(src="IP_SCAN_FMT",dst="IP_SCAN_FMT"," + "proto=%"SCNi8",tos=%"SCNi8",ttl=%"SCNi8"," + "frag=%7[a-z])%n", + IP_SCAN_ARGS(&ipv4_key.ipv4_src), + IP_SCAN_ARGS(&ipv4_key.ipv4_dst), + &ipv4_key.ipv4_proto, + &ipv4_key.ipv4_tos, + &ipv4_key.ipv4_ttl, + frag, &n) > 0 + && ovs_frag_type_from_string(frag, &ipv4_frag)) { ipv4_key.ipv4_frag = ipv4_frag; nl_msg_put_unspec(key, OVS_KEY_ATTR_IPV4, &ipv4_key, sizeof ipv4_key); + + if (mask) { + memset(&ipv4_key, 0xff, sizeof ipv4_key); + nl_msg_put_unspec(mask, OVS_KEY_ATTR_IPV4, + &ipv4_key, sizeof ipv4_key); + } return n; } } { char ipv6_src_s[IPV6_SCAN_LEN + 1]; + char ipv6_src_mask_s[IPV6_SCAN_LEN + 1]; char ipv6_dst_s[IPV6_SCAN_LEN + 1]; - int ipv6_label; - int ipv6_proto; - int ipv6_tclass; - int ipv6_hlimit; + char ipv6_dst_mask_s[IPV6_SCAN_LEN + 1]; + int ipv6_label, ipv6_label_mask; + int ipv6_proto, ipv6_proto_mask; + int ipv6_tclass, ipv6_tclass_mask; + int ipv6_hlimit, ipv6_hlimit_mask; char frag[8]; enum ovs_frag_type ipv6_frag; + int ipv6_frag_mask; int n = -1; - if (sscanf(s, "ipv6(src="IPV6_SCAN_FMT",dst="IPV6_SCAN_FMT"," - "label=%i,proto=%i,tclass=%i,hlimit=%i,frag=%7[a-z])%n", - ipv6_src_s, ipv6_dst_s, &ipv6_label, - &ipv6_proto, &ipv6_tclass, &ipv6_hlimit, frag, &n) > 0 - && n > 0 + if (mask && ovs_scan(s, "ipv6(src="IPV6_SCAN_FMT"/"IPV6_SCAN_FMT",dst=" + IPV6_SCAN_FMT"/"IPV6_SCAN_FMT"," + "label=%i/%i,proto=%i/%i,tclass=%i/%i," + "hlimit=%i/%i,frag=%7[a-z]/%i)%n", + ipv6_src_s, ipv6_src_mask_s, + ipv6_dst_s, ipv6_dst_mask_s, + &ipv6_label, &ipv6_label_mask, &ipv6_proto, + &ipv6_proto_mask, &ipv6_tclass, &ipv6_tclass_mask, + &ipv6_hlimit, &ipv6_hlimit_mask, frag, + &ipv6_frag_mask, &n) && ovs_frag_type_from_string(frag, &ipv6_frag)) { struct ovs_key_ipv6 ipv6_key; + struct ovs_key_ipv6 ipv6_mask; + + if (inet_pton(AF_INET6, ipv6_src_s, &ipv6_key.ipv6_src) != 1 || + inet_pton(AF_INET6, ipv6_dst_s, &ipv6_key.ipv6_dst) != 1 || + inet_pton(AF_INET6, ipv6_src_mask_s, &ipv6_mask.ipv6_src) != 1 || + inet_pton(AF_INET6, ipv6_dst_mask_s, &ipv6_mask.ipv6_dst) != 1) { + return -EINVAL; + } + + ipv6_key.ipv6_label = htonl(ipv6_label); + ipv6_key.ipv6_proto = ipv6_proto; + ipv6_key.ipv6_tclass = ipv6_tclass; + ipv6_key.ipv6_hlimit = ipv6_hlimit; + ipv6_key.ipv6_frag = ipv6_frag; + nl_msg_put_unspec(key, OVS_KEY_ATTR_IPV6, + &ipv6_key, sizeof ipv6_key); + + ipv6_mask.ipv6_label = htonl(ipv6_label_mask); + ipv6_mask.ipv6_proto = ipv6_proto_mask; + ipv6_mask.ipv6_tclass = ipv6_tclass_mask; + ipv6_mask.ipv6_hlimit = ipv6_hlimit_mask; + ipv6_mask.ipv6_frag = ipv6_frag_mask; + nl_msg_put_unspec(mask, OVS_KEY_ATTR_IPV6, + &ipv6_mask, sizeof ipv6_mask); + return n; + } else if (ovs_scan(s, "ipv6(src="IPV6_SCAN_FMT",dst="IPV6_SCAN_FMT"," + "label=%i,proto=%i,tclass=%i,hlimit=%i," + "frag=%7[a-z])%n", + ipv6_src_s, ipv6_dst_s, &ipv6_label, + &ipv6_proto, &ipv6_tclass, &ipv6_hlimit, frag, &n) + && ovs_frag_type_from_string(frag, &ipv6_frag)) { + struct ovs_key_ipv6 ipv6_key; if (inet_pton(AF_INET6, ipv6_src_s, &ipv6_key.ipv6_src) != 1 || inet_pton(AF_INET6, ipv6_dst_s, &ipv6_key.ipv6_dst) != 1) { @@ -1043,6 +2055,12 @@ parse_odp_key_attr(const char *s, const struct simap *port_names, ipv6_key.ipv6_frag = ipv6_frag; nl_msg_put_unspec(key, OVS_KEY_ATTR_IPV6, &ipv6_key, sizeof ipv6_key); + + if (mask) { + memset(&ipv6_key, 0xff, sizeof ipv6_key); + nl_msg_put_unspec(mask, OVS_KEY_ATTR_IPV6, + &ipv6_key, sizeof ipv6_key); + } return n; } } @@ -1050,15 +2068,57 @@ parse_odp_key_attr(const char *s, const struct simap *port_names, { int tcp_src; int tcp_dst; + int tcp_src_mask; + int tcp_dst_mask; int n = -1; - if (sscanf(s, "tcp(src=%i,dst=%i)%n",&tcp_src, &tcp_dst, &n) > 0 - && n > 0) { + if (mask && ovs_scan(s, "tcp(src=%i/%i,dst=%i/%i)%n", + &tcp_src, &tcp_src_mask, &tcp_dst, + &tcp_dst_mask, &n)) { struct ovs_key_tcp tcp_key; + struct ovs_key_tcp tcp_mask; tcp_key.tcp_src = htons(tcp_src); tcp_key.tcp_dst = htons(tcp_dst); nl_msg_put_unspec(key, OVS_KEY_ATTR_TCP, &tcp_key, sizeof tcp_key); + + tcp_mask.tcp_src = htons(tcp_src_mask); + tcp_mask.tcp_dst = htons(tcp_dst_mask); + nl_msg_put_unspec(mask, OVS_KEY_ATTR_TCP, + &tcp_mask, sizeof tcp_mask); + return n; + } else if (ovs_scan(s, "tcp(src=%i,dst=%i)%n", + &tcp_src, &tcp_dst, &n)) { + struct ovs_key_tcp tcp_key; + + tcp_key.tcp_src = htons(tcp_src); + tcp_key.tcp_dst = htons(tcp_dst); + nl_msg_put_unspec(key, OVS_KEY_ATTR_TCP, &tcp_key, sizeof tcp_key); + + if (mask) { + memset(&tcp_key, 0xff, sizeof tcp_key); + nl_msg_put_unspec(mask, OVS_KEY_ATTR_TCP, + &tcp_key, sizeof tcp_key); + } + return n; + } + } + + { + uint16_t tcp_flags, tcp_flags_mask; + int n = -1; + + if (mask && ovs_scan(s, "tcp_flags(%"SCNi16"/%"SCNi16")%n", + &tcp_flags, &tcp_flags_mask, &n) > 0 && n > 0) { + nl_msg_put_be16(key, OVS_KEY_ATTR_TCP_FLAGS, htons(tcp_flags)); + nl_msg_put_be16(mask, OVS_KEY_ATTR_TCP_FLAGS, htons(tcp_flags_mask)); + return n; + } else if (ovs_scan(s, "tcp_flags(%"SCNi16")%n", &tcp_flags, &n)) { + nl_msg_put_be16(key, OVS_KEY_ATTR_TCP_FLAGS, htons(tcp_flags)); + if (mask) { + nl_msg_put_be16(mask, OVS_KEY_ATTR_TCP_FLAGS, + htons(UINT16_MAX)); + } return n; } } @@ -1066,112 +2126,272 @@ parse_odp_key_attr(const char *s, const struct simap *port_names, { int udp_src; int udp_dst; + int udp_src_mask; + int udp_dst_mask; int n = -1; - if (sscanf(s, "udp(src=%i,dst=%i)%n", &udp_src, &udp_dst, &n) > 0 - && n > 0) { + if (mask && ovs_scan(s, "udp(src=%i/%i,dst=%i/%i)%n", + &udp_src, &udp_src_mask, + &udp_dst, &udp_dst_mask, &n)) { struct ovs_key_udp udp_key; + struct ovs_key_udp udp_mask; udp_key.udp_src = htons(udp_src); udp_key.udp_dst = htons(udp_dst); nl_msg_put_unspec(key, OVS_KEY_ATTR_UDP, &udp_key, sizeof udp_key); + + udp_mask.udp_src = htons(udp_src_mask); + udp_mask.udp_dst = htons(udp_dst_mask); + nl_msg_put_unspec(mask, OVS_KEY_ATTR_UDP, + &udp_mask, sizeof udp_mask); + return n; + } + if (ovs_scan(s, "udp(src=%i,dst=%i)%n", &udp_src, &udp_dst, &n)) { + struct ovs_key_udp udp_key; + + udp_key.udp_src = htons(udp_src); + udp_key.udp_dst = htons(udp_dst); + nl_msg_put_unspec(key, OVS_KEY_ATTR_UDP, &udp_key, sizeof udp_key); + + if (mask) { + memset(&udp_key, 0xff, sizeof udp_key); + nl_msg_put_unspec(mask, OVS_KEY_ATTR_UDP, &udp_key, sizeof udp_key); + } return n; } } { - int icmp_type; - int icmp_code; + int sctp_src; + int sctp_dst; + int sctp_src_mask; + int sctp_dst_mask; int n = -1; - if (sscanf(s, "icmp(type=%i,code=%i)%n", - &icmp_type, &icmp_code, &n) > 0 - && n > 0) { - struct ovs_key_icmp icmp_key; + if (mask && ovs_scan(s, "sctp(src=%i/%i,dst=%i/%i)%n", + &sctp_src, &sctp_src_mask, + &sctp_dst, &sctp_dst_mask, &n)) { + struct ovs_key_sctp sctp_key; + struct ovs_key_sctp sctp_mask; + + sctp_key.sctp_src = htons(sctp_src); + sctp_key.sctp_dst = htons(sctp_dst); + nl_msg_put_unspec(key, OVS_KEY_ATTR_SCTP, &sctp_key, sizeof sctp_key); - icmp_key.icmp_type = icmp_type; - icmp_key.icmp_code = icmp_code; + sctp_mask.sctp_src = htons(sctp_src_mask); + sctp_mask.sctp_dst = htons(sctp_dst_mask); + nl_msg_put_unspec(mask, OVS_KEY_ATTR_SCTP, + &sctp_mask, sizeof sctp_mask); + return n; + } + if (ovs_scan(s, "sctp(src=%i,dst=%i)%n", &sctp_src, &sctp_dst, &n)) { + struct ovs_key_sctp sctp_key; + + sctp_key.sctp_src = htons(sctp_src); + sctp_key.sctp_dst = htons(sctp_dst); + nl_msg_put_unspec(key, OVS_KEY_ATTR_SCTP, &sctp_key, sizeof sctp_key); + + if (mask) { + memset(&sctp_key, 0xff, sizeof sctp_key); + nl_msg_put_unspec(mask, OVS_KEY_ATTR_SCTP, &sctp_key, sizeof sctp_key); + } + return n; + } + } + + { + struct ovs_key_icmp icmp_key; + struct ovs_key_icmp icmp_mask; + int n = -1; + + if (mask && ovs_scan(s, "icmp(type=%"SCNi8"/%"SCNi8"," + "code=%"SCNi8"/%"SCNi8")%n", + &icmp_key.icmp_type, &icmp_mask.icmp_type, + &icmp_key.icmp_code, &icmp_mask.icmp_code, &n)) { + nl_msg_put_unspec(key, OVS_KEY_ATTR_ICMP, + &icmp_key, sizeof icmp_key); + nl_msg_put_unspec(mask, OVS_KEY_ATTR_ICMP, + &icmp_mask, sizeof icmp_mask); + return n; + } else if (ovs_scan(s, "icmp(type=%"SCNi8",code=%"SCNi8")%n", + &icmp_key.icmp_type, &icmp_key.icmp_code, &n)) { nl_msg_put_unspec(key, OVS_KEY_ATTR_ICMP, &icmp_key, sizeof icmp_key); + if (mask) { + memset(&icmp_key, 0xff, sizeof icmp_key); + nl_msg_put_unspec(mask, OVS_KEY_ATTR_ICMP, &icmp_key, + sizeof icmp_key); + } return n; } } { struct ovs_key_icmpv6 icmpv6_key; + struct ovs_key_icmpv6 icmpv6_mask; int n = -1; - if (sscanf(s, "icmpv6(type=%"SCNi8",code=%"SCNi8")%n", - &icmpv6_key.icmpv6_type, &icmpv6_key.icmpv6_code,&n) > 0 - && n > 0) { + if (mask && ovs_scan(s, "icmpv6(type=%"SCNi8"/%"SCNi8"," + "code=%"SCNi8"/%"SCNi8")%n", + &icmpv6_key.icmpv6_type, &icmpv6_mask.icmpv6_type, + &icmpv6_key.icmpv6_code, &icmpv6_mask.icmpv6_code, + &n)) { + nl_msg_put_unspec(key, OVS_KEY_ATTR_ICMPV6, + &icmpv6_key, sizeof icmpv6_key); + nl_msg_put_unspec(mask, OVS_KEY_ATTR_ICMPV6, &icmpv6_mask, + sizeof icmpv6_mask); + return n; + } else if (ovs_scan(s, "icmpv6(type=%"SCNi8",code=%"SCNi8")%n", + &icmpv6_key.icmpv6_type, &icmpv6_key.icmpv6_code, + &n)) { nl_msg_put_unspec(key, OVS_KEY_ATTR_ICMPV6, &icmpv6_key, sizeof icmpv6_key); + + if (mask) { + memset(&icmpv6_key, 0xff, sizeof icmpv6_key); + nl_msg_put_unspec(mask, OVS_KEY_ATTR_ICMPV6, &icmpv6_key, + sizeof icmpv6_key); + } return n; } } { - ovs_be32 arp_sip; - ovs_be32 arp_tip; - int arp_op; - uint8_t arp_sha[ETH_ADDR_LEN]; - uint8_t arp_tha[ETH_ADDR_LEN]; + struct ovs_key_arp arp_key; + struct ovs_key_arp arp_mask; + uint16_t arp_op, arp_op_mask; int n = -1; - if (sscanf(s, "arp(sip="IP_SCAN_FMT",tip="IP_SCAN_FMT"," - "op=%i,sha="ETH_ADDR_SCAN_FMT",tha="ETH_ADDR_SCAN_FMT")%n", - IP_SCAN_ARGS(&arp_sip), - IP_SCAN_ARGS(&arp_tip), - &arp_op, - ETH_ADDR_SCAN_ARGS(arp_sha), - ETH_ADDR_SCAN_ARGS(arp_tha), &n) > 0 && n > 0) { - struct ovs_key_arp arp_key; - - memset(&arp_key, 0, sizeof arp_key); - arp_key.arp_sip = arp_sip; - arp_key.arp_tip = arp_tip; + if (mask && ovs_scan(s, "arp(sip="IP_SCAN_FMT"/"IP_SCAN_FMT"," + "tip="IP_SCAN_FMT"/"IP_SCAN_FMT"," + "op=%"SCNi16"/%"SCNi16"," + "sha="ETH_ADDR_SCAN_FMT"/"ETH_ADDR_SCAN_FMT"," + "tha="ETH_ADDR_SCAN_FMT"/"ETH_ADDR_SCAN_FMT")%n", + IP_SCAN_ARGS(&arp_key.arp_sip), + IP_SCAN_ARGS(&arp_mask.arp_sip), + IP_SCAN_ARGS(&arp_key.arp_tip), + IP_SCAN_ARGS(&arp_mask.arp_tip), + &arp_op, &arp_op_mask, + ETH_ADDR_SCAN_ARGS(arp_key.arp_sha), + ETH_ADDR_SCAN_ARGS(arp_mask.arp_sha), + ETH_ADDR_SCAN_ARGS(arp_key.arp_tha), + ETH_ADDR_SCAN_ARGS(arp_mask.arp_tha), &n)) { arp_key.arp_op = htons(arp_op); - memcpy(arp_key.arp_sha, arp_sha, ETH_ADDR_LEN); - memcpy(arp_key.arp_tha, arp_tha, ETH_ADDR_LEN); nl_msg_put_unspec(key, OVS_KEY_ATTR_ARP, &arp_key, sizeof arp_key); + arp_mask.arp_op = htons(arp_op_mask); + nl_msg_put_unspec(mask, OVS_KEY_ATTR_ARP, + &arp_mask, sizeof arp_mask); + return n; + } else if (ovs_scan(s, "arp(sip="IP_SCAN_FMT",tip="IP_SCAN_FMT"," + "op=%"SCNi16",sha="ETH_ADDR_SCAN_FMT"," + "tha="ETH_ADDR_SCAN_FMT")%n", + IP_SCAN_ARGS(&arp_key.arp_sip), + IP_SCAN_ARGS(&arp_key.arp_tip), + &arp_op, + ETH_ADDR_SCAN_ARGS(arp_key.arp_sha), + ETH_ADDR_SCAN_ARGS(arp_key.arp_tha), &n)) { + arp_key.arp_op = htons(arp_op); + nl_msg_put_unspec(key, OVS_KEY_ATTR_ARP, &arp_key, sizeof arp_key); + + if (mask) { + memset(&arp_key, 0xff, sizeof arp_key); + nl_msg_put_unspec(mask, OVS_KEY_ATTR_ARP, + &arp_key, sizeof arp_key); + } return n; } } { char nd_target_s[IPV6_SCAN_LEN + 1]; + char nd_target_mask_s[IPV6_SCAN_LEN + 1]; uint8_t nd_sll[ETH_ADDR_LEN]; + uint8_t nd_sll_mask[ETH_ADDR_LEN]; uint8_t nd_tll[ETH_ADDR_LEN]; + uint8_t nd_tll_mask[ETH_ADDR_LEN]; int n = -1; - if (sscanf(s, "nd(target="IPV6_SCAN_FMT")%n", - nd_target_s, &n) > 0 && n > 0) { - return put_nd_key(n, nd_target_s, NULL, NULL, key); - } - if (sscanf(s, "nd(target="IPV6_SCAN_FMT",sll="ETH_ADDR_SCAN_FMT")%n", - nd_target_s, ETH_ADDR_SCAN_ARGS(nd_sll), &n) > 0 - && n > 0) { - return put_nd_key(n, nd_target_s, nd_sll, NULL, key); - } - if (sscanf(s, "nd(target="IPV6_SCAN_FMT",tll="ETH_ADDR_SCAN_FMT")%n", - nd_target_s, ETH_ADDR_SCAN_ARGS(nd_tll), &n) > 0 - && n > 0) { - return put_nd_key(n, nd_target_s, NULL, nd_tll, key); - } - if (sscanf(s, "nd(target="IPV6_SCAN_FMT",sll="ETH_ADDR_SCAN_FMT"," - "tll="ETH_ADDR_SCAN_FMT")%n", - nd_target_s, ETH_ADDR_SCAN_ARGS(nd_sll), - ETH_ADDR_SCAN_ARGS(nd_tll), &n) > 0 - && n > 0) { - return put_nd_key(n, nd_target_s, nd_sll, nd_tll, key); + nd_target_mask_s[0] = 0; + memset(nd_sll_mask, 0xff, sizeof nd_sll_mask); + memset(nd_tll_mask, 0xff, sizeof nd_tll_mask); + + if (mask && ovs_scan(s, "nd(target="IPV6_SCAN_FMT"/"IPV6_SCAN_FMT")%n", + nd_target_s, nd_target_mask_s, &n)) { + put_nd_key(n, nd_target_s, NULL, NULL, key); + put_nd_mask(n, nd_target_mask_s, NULL, NULL, mask); + } else if (ovs_scan(s, "nd(target="IPV6_SCAN_FMT")%n", + nd_target_s, &n)) { + put_nd_key(n, nd_target_s, NULL, NULL, key); + if (mask) { + put_nd_mask(n, nd_target_mask_s, NULL, NULL, mask); + } + } else if (mask && + ovs_scan(s, "nd(target="IPV6_SCAN_FMT"/"IPV6_SCAN_FMT + ",sll="ETH_ADDR_SCAN_FMT"/"ETH_ADDR_SCAN_FMT")%n", + nd_target_s, nd_target_mask_s, + ETH_ADDR_SCAN_ARGS(nd_sll), + ETH_ADDR_SCAN_ARGS(nd_sll_mask), &n)) { + put_nd_key(n, nd_target_s, nd_sll, NULL, key); + put_nd_mask(n, nd_target_mask_s, nd_sll_mask, NULL, mask); + } else if (ovs_scan(s, "nd(target="IPV6_SCAN_FMT"," + "sll="ETH_ADDR_SCAN_FMT")%n", + nd_target_s, ETH_ADDR_SCAN_ARGS(nd_sll), &n)) { + put_nd_key(n, nd_target_s, nd_sll, NULL, key); + if (mask) { + put_nd_mask(n, nd_target_mask_s, nd_sll_mask, NULL, mask); + } + } else if (mask && + ovs_scan(s, "nd(target="IPV6_SCAN_FMT"/"IPV6_SCAN_FMT + ",tll="ETH_ADDR_SCAN_FMT"/"ETH_ADDR_SCAN_FMT")%n", + nd_target_s, nd_target_mask_s, + ETH_ADDR_SCAN_ARGS(nd_tll), + ETH_ADDR_SCAN_ARGS(nd_tll_mask), &n)) { + put_nd_key(n, nd_target_s, NULL, nd_tll, key); + put_nd_mask(n, nd_target_mask_s, NULL, nd_tll_mask, mask); + } else if (ovs_scan(s, "nd(target="IPV6_SCAN_FMT"," + "tll="ETH_ADDR_SCAN_FMT")%n", + nd_target_s, ETH_ADDR_SCAN_ARGS(nd_tll), &n)) { + put_nd_key(n, nd_target_s, NULL, nd_tll, key); + if (mask) { + put_nd_mask(n, nd_target_mask_s, NULL, nd_tll_mask, mask); + } + } else if (mask && + ovs_scan(s, "nd(target="IPV6_SCAN_FMT"/"IPV6_SCAN_FMT + ",sll="ETH_ADDR_SCAN_FMT"/"ETH_ADDR_SCAN_FMT"," + "tll="ETH_ADDR_SCAN_FMT"/"ETH_ADDR_SCAN_FMT")%n", + nd_target_s, nd_target_mask_s, + ETH_ADDR_SCAN_ARGS(nd_sll), + ETH_ADDR_SCAN_ARGS(nd_sll_mask), + ETH_ADDR_SCAN_ARGS(nd_tll), + ETH_ADDR_SCAN_ARGS(nd_tll_mask), + &n)) { + put_nd_key(n, nd_target_s, nd_sll, nd_tll, key); + put_nd_mask(n, nd_target_mask_s, nd_sll_mask, nd_tll_mask, mask); + } else if (ovs_scan(s, "nd(target="IPV6_SCAN_FMT"," + "sll="ETH_ADDR_SCAN_FMT"," + "tll="ETH_ADDR_SCAN_FMT")%n", + nd_target_s, ETH_ADDR_SCAN_ARGS(nd_sll), + ETH_ADDR_SCAN_ARGS(nd_tll), &n)) { + put_nd_key(n, nd_target_s, nd_sll, nd_tll, key); + if (mask) { + put_nd_mask(n, nd_target_mask_s, + nd_sll_mask, nd_tll_mask, mask); + } } + + if (n != -1) + return n; + } if (!strncmp(s, "encap(", 6)) { const char *start = s; - size_t encap; + size_t encap, encap_mask = 0; encap = nl_msg_start_nested(key, OVS_KEY_ATTR_ENCAP); + if (mask) { + encap_mask = nl_msg_start_nested(mask, OVS_KEY_ATTR_ENCAP); + } s += 6; for (;;) { @@ -1184,7 +2404,7 @@ parse_odp_key_attr(const char *s, const struct simap *port_names, break; } - retval = parse_odp_key_attr(s, port_names, key); + retval = parse_odp_key_mask_attr(s, port_names, key, mask); if (retval < 0) { return retval; } @@ -1193,6 +2413,9 @@ parse_odp_key_attr(const char *s, const struct simap *port_names, s++; nl_msg_end_nested(key, encap); + if (mask) { + nl_msg_end_nested(mask, encap_mask); + } return s - start; } @@ -1215,10 +2438,10 @@ parse_odp_key_attr(const char *s, const struct simap *port_names, * valid, but they may not be valid as a sequence. 'key' might, for example, * have duplicated keys. odp_flow_key_to_flow() will detect those errors. */ int -odp_flow_key_from_string(const char *s, const struct simap *port_names, - struct ofpbuf *key) +odp_flow_from_string(const char *s, const struct simap *port_names, + struct ofpbuf *key, struct ofpbuf *mask) { - const size_t old_size = key->size; + const size_t old_size = ofpbuf_size(key); for (;;) { int retval; @@ -1227,9 +2450,9 @@ odp_flow_key_from_string(const char *s, const struct simap *port_names, return 0; } - retval = parse_odp_key_attr(s, port_names, key); + retval = parse_odp_key_mask_attr(s, port_names, key, mask); if (retval < 0) { - key->size = old_size; + ofpbuf_set_size(key, old_size); return -retval; } s += retval; @@ -1246,37 +2469,60 @@ ovs_to_odp_frag(uint8_t nw_frag) : OVS_FRAG_TYPE_LATER); } -/* Appends a representation of 'flow' as OVS_KEY_ATTR_* attributes to 'buf'. - * - * 'buf' must have at least ODPUTIL_FLOW_KEY_BYTES bytes of space, or be - * capable of being expanded to allow for that much space. */ -void -odp_flow_key_from_flow(struct ofpbuf *buf, const struct flow *flow) +static uint8_t +ovs_to_odp_frag_mask(uint8_t nw_frag_mask) +{ + uint8_t frag_mask = ~(OVS_FRAG_TYPE_FIRST | OVS_FRAG_TYPE_LATER); + + frag_mask |= (nw_frag_mask & FLOW_NW_FRAG_ANY) ? OVS_FRAG_TYPE_FIRST : 0; + frag_mask |= (nw_frag_mask & FLOW_NW_FRAG_LATER) ? OVS_FRAG_TYPE_LATER : 0; + + return frag_mask; +} + +static void +odp_flow_key_from_flow__(struct ofpbuf *buf, const struct flow *flow, + const struct flow *mask, odp_port_t odp_in_port, + size_t max_mpls_depth, bool export_mask) { struct ovs_key_ethernet *eth_key; size_t encap; + const struct flow *data = export_mask ? mask : flow; - if (flow->skb_priority) { - nl_msg_put_u32(buf, OVS_KEY_ATTR_PRIORITY, flow->skb_priority); + nl_msg_put_u32(buf, OVS_KEY_ATTR_PRIORITY, data->skb_priority); + + if (flow->tunnel.ip_dst || export_mask) { + tun_key_to_attr(buf, &data->tunnel); } - if (flow->tun_id != htonll(0)) { - nl_msg_put_be64(buf, OVS_KEY_ATTR_TUN_ID, flow->tun_id); + nl_msg_put_u32(buf, OVS_KEY_ATTR_SKB_MARK, data->pkt_mark); + + if (data->recirc_id || (mask && mask->recirc_id)) { + nl_msg_put_u32(buf, OVS_KEY_ATTR_RECIRC_ID, data->recirc_id); } - if (flow->in_port != OFPP_NONE && flow->in_port != OFPP_CONTROLLER) { - nl_msg_put_u32(buf, OVS_KEY_ATTR_IN_PORT, - ofp_port_to_odp_port(flow->in_port)); + if (data->dp_hash || (mask && mask->dp_hash)) { + nl_msg_put_u32(buf, OVS_KEY_ATTR_DP_HASH, data->dp_hash); + } + + /* Add an ingress port attribute if this is a mask or 'odp_in_port' + * is not the magical value "ODPP_NONE". */ + if (export_mask || odp_in_port != ODPP_NONE) { + nl_msg_put_odp_port(buf, OVS_KEY_ATTR_IN_PORT, odp_in_port); } eth_key = nl_msg_put_unspec_uninit(buf, OVS_KEY_ATTR_ETHERNET, sizeof *eth_key); - memcpy(eth_key->eth_src, flow->dl_src, ETH_ADDR_LEN); - memcpy(eth_key->eth_dst, flow->dl_dst, ETH_ADDR_LEN); + memcpy(eth_key->eth_src, data->dl_src, ETH_ADDR_LEN); + memcpy(eth_key->eth_dst, data->dl_dst, ETH_ADDR_LEN); if (flow->vlan_tci != htons(0) || flow->dl_type == htons(ETH_TYPE_VLAN)) { - nl_msg_put_be16(buf, OVS_KEY_ATTR_ETHERTYPE, htons(ETH_TYPE_VLAN)); - nl_msg_put_be16(buf, OVS_KEY_ATTR_VLAN, flow->vlan_tci); + if (export_mask) { + nl_msg_put_be16(buf, OVS_KEY_ATTR_ETHERTYPE, OVS_BE16_MAX); + } else { + nl_msg_put_be16(buf, OVS_KEY_ATTR_ETHERTYPE, htons(ETH_TYPE_VLAN)); + } + nl_msg_put_be16(buf, OVS_KEY_ATTR_VLAN, data->vlan_tci); encap = nl_msg_start_nested(buf, OVS_KEY_ATTR_ENCAP); if (flow->vlan_tci == htons(0)) { goto unencap; @@ -1286,92 +2532,131 @@ odp_flow_key_from_flow(struct ofpbuf *buf, const struct flow *flow) } if (ntohs(flow->dl_type) < ETH_TYPE_MIN) { + /* For backwards compatibility with kernels that don't support + * wildcarding, the following convention is used to encode the + * OVS_KEY_ATTR_ETHERTYPE for key and mask: + * + * key mask matches + * -------- -------- ------- + * >0x5ff 0xffff Specified Ethernet II Ethertype. + * >0x5ff 0 Any Ethernet II or non-Ethernet II frame. + * 0xffff Any non-Ethernet II frame (except valid + * 802.3 SNAP packet with valid eth_type). + */ + if (export_mask) { + nl_msg_put_be16(buf, OVS_KEY_ATTR_ETHERTYPE, OVS_BE16_MAX); + } goto unencap; } - nl_msg_put_be16(buf, OVS_KEY_ATTR_ETHERTYPE, flow->dl_type); + nl_msg_put_be16(buf, OVS_KEY_ATTR_ETHERTYPE, data->dl_type); if (flow->dl_type == htons(ETH_TYPE_IP)) { struct ovs_key_ipv4 *ipv4_key; ipv4_key = nl_msg_put_unspec_uninit(buf, OVS_KEY_ATTR_IPV4, sizeof *ipv4_key); - ipv4_key->ipv4_src = flow->nw_src; - ipv4_key->ipv4_dst = flow->nw_dst; - ipv4_key->ipv4_proto = flow->nw_proto; - ipv4_key->ipv4_tos = flow->nw_tos; - ipv4_key->ipv4_ttl = flow->nw_ttl; - ipv4_key->ipv4_frag = ovs_to_odp_frag(flow->nw_frag); + ipv4_key->ipv4_src = data->nw_src; + ipv4_key->ipv4_dst = data->nw_dst; + ipv4_key->ipv4_proto = data->nw_proto; + ipv4_key->ipv4_tos = data->nw_tos; + ipv4_key->ipv4_ttl = data->nw_ttl; + ipv4_key->ipv4_frag = export_mask ? ovs_to_odp_frag_mask(data->nw_frag) + : ovs_to_odp_frag(data->nw_frag); } else if (flow->dl_type == htons(ETH_TYPE_IPV6)) { struct ovs_key_ipv6 *ipv6_key; ipv6_key = nl_msg_put_unspec_uninit(buf, OVS_KEY_ATTR_IPV6, sizeof *ipv6_key); - memcpy(ipv6_key->ipv6_src, &flow->ipv6_src, sizeof ipv6_key->ipv6_src); - memcpy(ipv6_key->ipv6_dst, &flow->ipv6_dst, sizeof ipv6_key->ipv6_dst); - ipv6_key->ipv6_label = flow->ipv6_label; - ipv6_key->ipv6_proto = flow->nw_proto; - ipv6_key->ipv6_tclass = flow->nw_tos; - ipv6_key->ipv6_hlimit = flow->nw_ttl; - ipv6_key->ipv6_frag = ovs_to_odp_frag(flow->nw_frag); - } else if (flow->dl_type == htons(ETH_TYPE_ARP)) { + memcpy(ipv6_key->ipv6_src, &data->ipv6_src, sizeof ipv6_key->ipv6_src); + memcpy(ipv6_key->ipv6_dst, &data->ipv6_dst, sizeof ipv6_key->ipv6_dst); + ipv6_key->ipv6_label = data->ipv6_label; + ipv6_key->ipv6_proto = data->nw_proto; + ipv6_key->ipv6_tclass = data->nw_tos; + ipv6_key->ipv6_hlimit = data->nw_ttl; + ipv6_key->ipv6_frag = export_mask ? ovs_to_odp_frag_mask(data->nw_frag) + : ovs_to_odp_frag(data->nw_frag); + } else if (flow->dl_type == htons(ETH_TYPE_ARP) || + flow->dl_type == htons(ETH_TYPE_RARP)) { struct ovs_key_arp *arp_key; - arp_key = nl_msg_put_unspec_uninit(buf, OVS_KEY_ATTR_ARP, - sizeof *arp_key); - memset(arp_key, 0, sizeof *arp_key); - arp_key->arp_sip = flow->nw_src; - arp_key->arp_tip = flow->nw_dst; - arp_key->arp_op = htons(flow->nw_proto); - memcpy(arp_key->arp_sha, flow->arp_sha, ETH_ADDR_LEN); - memcpy(arp_key->arp_tha, flow->arp_tha, ETH_ADDR_LEN); + arp_key = nl_msg_put_unspec_zero(buf, OVS_KEY_ATTR_ARP, + sizeof *arp_key); + arp_key->arp_sip = data->nw_src; + arp_key->arp_tip = data->nw_dst; + arp_key->arp_op = htons(data->nw_proto); + memcpy(arp_key->arp_sha, data->arp_sha, ETH_ADDR_LEN); + memcpy(arp_key->arp_tha, data->arp_tha, ETH_ADDR_LEN); + } else if (eth_type_mpls(flow->dl_type)) { + struct ovs_key_mpls *mpls_key; + int i, n; + + n = flow_count_mpls_labels(flow, NULL); + n = MIN(n, max_mpls_depth); + mpls_key = nl_msg_put_unspec_uninit(buf, OVS_KEY_ATTR_MPLS, + n * sizeof *mpls_key); + for (i = 0; i < n; i++) { + mpls_key[i].mpls_lse = data->mpls_lse[i]; + } } - if ((flow->dl_type == htons(ETH_TYPE_IP) - || flow->dl_type == htons(ETH_TYPE_IPV6)) - && !(flow->nw_frag & FLOW_NW_FRAG_LATER)) { - + if (is_ip_any(flow) && !(flow->nw_frag & FLOW_NW_FRAG_LATER)) { if (flow->nw_proto == IPPROTO_TCP) { struct ovs_key_tcp *tcp_key; tcp_key = nl_msg_put_unspec_uninit(buf, OVS_KEY_ATTR_TCP, sizeof *tcp_key); - tcp_key->tcp_src = flow->tp_src; - tcp_key->tcp_dst = flow->tp_dst; + tcp_key->tcp_src = data->tp_src; + tcp_key->tcp_dst = data->tp_dst; + + if (data->tcp_flags) { + nl_msg_put_be16(buf, OVS_KEY_ATTR_TCP_FLAGS, data->tcp_flags); + } } else if (flow->nw_proto == IPPROTO_UDP) { struct ovs_key_udp *udp_key; udp_key = nl_msg_put_unspec_uninit(buf, OVS_KEY_ATTR_UDP, sizeof *udp_key); - udp_key->udp_src = flow->tp_src; - udp_key->udp_dst = flow->tp_dst; + udp_key->udp_src = data->tp_src; + udp_key->udp_dst = data->tp_dst; + } else if (flow->nw_proto == IPPROTO_SCTP) { + struct ovs_key_sctp *sctp_key; + + sctp_key = nl_msg_put_unspec_uninit(buf, OVS_KEY_ATTR_SCTP, + sizeof *sctp_key); + sctp_key->sctp_src = data->tp_src; + sctp_key->sctp_dst = data->tp_dst; } else if (flow->dl_type == htons(ETH_TYPE_IP) && flow->nw_proto == IPPROTO_ICMP) { struct ovs_key_icmp *icmp_key; icmp_key = nl_msg_put_unspec_uninit(buf, OVS_KEY_ATTR_ICMP, sizeof *icmp_key); - icmp_key->icmp_type = ntohs(flow->tp_src); - icmp_key->icmp_code = ntohs(flow->tp_dst); + icmp_key->icmp_type = ntohs(data->tp_src); + icmp_key->icmp_code = ntohs(data->tp_dst); } else if (flow->dl_type == htons(ETH_TYPE_IPV6) && flow->nw_proto == IPPROTO_ICMPV6) { struct ovs_key_icmpv6 *icmpv6_key; icmpv6_key = nl_msg_put_unspec_uninit(buf, OVS_KEY_ATTR_ICMPV6, sizeof *icmpv6_key); - icmpv6_key->icmpv6_type = ntohs(flow->tp_src); - icmpv6_key->icmpv6_code = ntohs(flow->tp_dst); + icmpv6_key->icmpv6_type = ntohs(data->tp_src); + icmpv6_key->icmpv6_code = ntohs(data->tp_dst); + + if (flow->tp_dst == htons(0) && + (flow->tp_src == htons(ND_NEIGHBOR_SOLICIT) || + flow->tp_src == htons(ND_NEIGHBOR_ADVERT)) && + (!export_mask || (data->tp_src == htons(0xffff) && + data->tp_dst == htons(0xffff)))) { - if (icmpv6_key->icmpv6_type == ND_NEIGHBOR_SOLICIT - || icmpv6_key->icmpv6_type == ND_NEIGHBOR_ADVERT) { struct ovs_key_nd *nd_key; nd_key = nl_msg_put_unspec_uninit(buf, OVS_KEY_ATTR_ND, sizeof *nd_key); - memcpy(nd_key->nd_target, &flow->nd_target, + memcpy(nd_key->nd_target, &data->nd_target, sizeof nd_key->nd_target); - memcpy(nd_key->nd_sll, flow->arp_sha, ETH_ADDR_LEN); - memcpy(nd_key->nd_tll, flow->arp_tha, ETH_ADDR_LEN); + memcpy(nd_key->nd_sll, data->arp_sha, ETH_ADDR_LEN); + memcpy(nd_key->nd_tll, data->arp_tha, ETH_ADDR_LEN); } } } @@ -1382,11 +2667,127 @@ unencap: } } +/* Appends a representation of 'flow' as OVS_KEY_ATTR_* attributes to 'buf'. + * 'flow->in_port' is ignored (since it is likely to be an OpenFlow port + * number rather than a datapath port number). Instead, if 'odp_in_port' + * is anything other than ODPP_NONE, it is included in 'buf' as the input + * port. + * + * 'buf' must have at least ODPUTIL_FLOW_KEY_BYTES bytes of space, or be + * capable of being expanded to allow for that much space. */ +void +odp_flow_key_from_flow(struct ofpbuf *buf, const struct flow *flow, + const struct flow *mask, odp_port_t odp_in_port) +{ + odp_flow_key_from_flow__(buf, flow, mask, odp_in_port, SIZE_MAX, false); +} + +/* Appends a representation of 'mask' as OVS_KEY_ATTR_* attributes to + * 'buf'. 'flow' is used as a template to determine how to interpret + * 'mask'. For example, the 'dl_type' of 'mask' describes the mask, but + * it doesn't indicate whether the other fields should be interpreted as + * ARP, IPv4, IPv6, etc. + * + * 'buf' must have at least ODPUTIL_FLOW_KEY_BYTES bytes of space, or be + * capable of being expanded to allow for that much space. */ +void +odp_flow_key_from_mask(struct ofpbuf *buf, const struct flow *mask, + const struct flow *flow, uint32_t odp_in_port_mask, + size_t max_mpls_depth) +{ + odp_flow_key_from_flow__(buf, flow, mask, + u32_to_odp(odp_in_port_mask), max_mpls_depth, true); +} + +/* Generate ODP flow key from the given packet metadata */ +void +odp_key_from_pkt_metadata(struct ofpbuf *buf, const struct pkt_metadata *md) +{ + nl_msg_put_u32(buf, OVS_KEY_ATTR_PRIORITY, md->skb_priority); + + if (md->tunnel.ip_dst) { + tun_key_to_attr(buf, &md->tunnel); + } + + nl_msg_put_u32(buf, OVS_KEY_ATTR_SKB_MARK, md->pkt_mark); + + /* Add an ingress port attribute if 'odp_in_port' is not the magical + * value "ODPP_NONE". */ + if (md->in_port.odp_port != ODPP_NONE) { + nl_msg_put_odp_port(buf, OVS_KEY_ATTR_IN_PORT, md->in_port.odp_port); + } +} + +/* Generate packet metadata from the given ODP flow key. */ +void +odp_key_to_pkt_metadata(const struct nlattr *key, size_t key_len, + struct pkt_metadata *md) +{ + const struct nlattr *nla; + size_t left; + uint32_t wanted_attrs = 1u << OVS_KEY_ATTR_PRIORITY | + 1u << OVS_KEY_ATTR_SKB_MARK | 1u << OVS_KEY_ATTR_TUNNEL | + 1u << OVS_KEY_ATTR_IN_PORT; + + *md = PKT_METADATA_INITIALIZER(ODPP_NONE); + + NL_ATTR_FOR_EACH (nla, left, key, key_len) { + uint16_t type = nl_attr_type(nla); + size_t len = nl_attr_get_size(nla); + int expected_len = odp_flow_key_attr_len(type); + + if (len != expected_len && expected_len >= 0) { + continue; + } + + switch (type) { + case OVS_KEY_ATTR_RECIRC_ID: + md->recirc_id = nl_attr_get_u32(nla); + wanted_attrs &= ~(1u << OVS_KEY_ATTR_RECIRC_ID); + break; + case OVS_KEY_ATTR_DP_HASH: + md->dp_hash = nl_attr_get_u32(nla); + wanted_attrs &= ~(1u << OVS_KEY_ATTR_DP_HASH); + break; + case OVS_KEY_ATTR_PRIORITY: + md->skb_priority = nl_attr_get_u32(nla); + wanted_attrs &= ~(1u << OVS_KEY_ATTR_PRIORITY); + break; + case OVS_KEY_ATTR_SKB_MARK: + md->pkt_mark = nl_attr_get_u32(nla); + wanted_attrs &= ~(1u << OVS_KEY_ATTR_SKB_MARK); + break; + case OVS_KEY_ATTR_TUNNEL: { + enum odp_key_fitness res; + + res = odp_tun_key_from_attr(nla, &md->tunnel); + if (res == ODP_FIT_ERROR) { + memset(&md->tunnel, 0, sizeof md->tunnel); + } else if (res == ODP_FIT_PERFECT) { + wanted_attrs &= ~(1u << OVS_KEY_ATTR_TUNNEL); + } + break; + } + case OVS_KEY_ATTR_IN_PORT: + md->in_port.odp_port = nl_attr_get_odp_port(nla); + wanted_attrs &= ~(1u << OVS_KEY_ATTR_IN_PORT); + break; + default: + break; + } + + if (!wanted_attrs) { + return; /* Have everything. */ + } + } +} + uint32_t odp_flow_key_hash(const struct nlattr *key, size_t key_len) { BUILD_ASSERT_DECL(!(NLA_ALIGNTO % sizeof(uint32_t))); - return hash_words((const uint32_t *) key, key_len / sizeof(uint32_t), 0); + return hash_words(ALIGNED_CAST(const uint32_t *, key), + key_len / sizeof(uint32_t), 0); } static void @@ -1404,7 +2805,10 @@ log_odp_key_attributes(struct vlog_rate_limit *rl, const char *title, ds_init(&s); for (i = 0; i < 64; i++) { if (attrs & (UINT64_C(1) << i)) { - ds_put_format(&s, " %s", ovs_key_attr_to_string(i)); + char namebuf[OVS_KEY_ATTR_BUFSIZE]; + + ds_put_format(&s, " %s", + ovs_key_attr_to_string(i, namebuf, sizeof namebuf)); } } if (out_of_range_attr) { @@ -1447,6 +2851,7 @@ parse_flow_nlattrs(const struct nlattr *key, size_t key_len, uint64_t present_attrs; size_t left; + BUILD_ASSERT(OVS_KEY_ATTR_MAX < CHAR_BIT * sizeof present_attrs); present_attrs = 0; *out_of_range_attrp = 0; NL_ATTR_FOR_EACH (nla, left, key, key_len) { @@ -1455,18 +2860,24 @@ parse_flow_nlattrs(const struct nlattr *key, size_t key_len, int expected_len = odp_flow_key_attr_len(type); if (len != expected_len && expected_len >= 0) { - VLOG_ERR_RL(&rl, "attribute %s has length %zu but should have " - "length %d", ovs_key_attr_to_string(type), + char namebuf[OVS_KEY_ATTR_BUFSIZE]; + + VLOG_ERR_RL(&rl, "attribute %s has length %"PRIuSIZE" but should have " + "length %d", ovs_key_attr_to_string(type, namebuf, + sizeof namebuf), len, expected_len); return false; } - if (type >= CHAR_BIT * sizeof present_attrs) { + if (type > OVS_KEY_ATTR_MAX) { *out_of_range_attrp = type; } else { if (present_attrs & (UINT64_C(1) << type)) { + char namebuf[OVS_KEY_ATTR_BUFSIZE]; + VLOG_ERR_RL(&rl, "duplicate %s attribute in flow key", - ovs_key_attr_to_string(type)); + ovs_key_attr_to_string(type, + namebuf, sizeof namebuf)); return false; } @@ -1513,34 +2924,98 @@ check_expectations(uint64_t present_attrs, int out_of_range_attr, static bool parse_ethertype(const struct nlattr *attrs[OVS_KEY_ATTR_MAX + 1], uint64_t present_attrs, uint64_t *expected_attrs, - struct flow *flow) + struct flow *flow, const struct flow *src_flow) { static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5); + bool is_mask = flow != src_flow; if (present_attrs & (UINT64_C(1) << OVS_KEY_ATTR_ETHERTYPE)) { flow->dl_type = nl_attr_get_be16(attrs[OVS_KEY_ATTR_ETHERTYPE]); - if (ntohs(flow->dl_type) < 1536) { + if (!is_mask && ntohs(flow->dl_type) < ETH_TYPE_MIN) { VLOG_ERR_RL(&rl, "invalid Ethertype %"PRIu16" in flow key", ntohs(flow->dl_type)); return false; } + if (is_mask && ntohs(src_flow->dl_type) < ETH_TYPE_MIN && + flow->dl_type != htons(0xffff)) { + return false; + } *expected_attrs |= UINT64_C(1) << OVS_KEY_ATTR_ETHERTYPE; } else { - flow->dl_type = htons(FLOW_DL_TYPE_NONE); + if (!is_mask) { + flow->dl_type = htons(FLOW_DL_TYPE_NONE); + } else if (ntohs(src_flow->dl_type) < ETH_TYPE_MIN) { + /* See comments in odp_flow_key_from_flow__(). */ + VLOG_ERR_RL(&rl, "mask expected for non-Ethernet II frame"); + return false; + } } return true; } static enum odp_key_fitness -parse_l3_onward(const struct nlattr *attrs[OVS_KEY_ATTR_MAX + 1], - uint64_t present_attrs, int out_of_range_attr, - uint64_t expected_attrs, struct flow *flow, - const struct nlattr *key, size_t key_len) +parse_l2_5_onward(const struct nlattr *attrs[OVS_KEY_ATTR_MAX + 1], + uint64_t present_attrs, int out_of_range_attr, + uint64_t expected_attrs, struct flow *flow, + const struct nlattr *key, size_t key_len, + const struct flow *src_flow) { static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5); + bool is_mask = src_flow != flow; + const void *check_start = NULL; + size_t check_len = 0; + enum ovs_key_attr expected_bit = 0xff; + + if (eth_type_mpls(src_flow->dl_type)) { + size_t size = nl_attr_get_size(attrs[OVS_KEY_ATTR_MPLS]); + const ovs_be32 *mpls_lse = nl_attr_get(attrs[OVS_KEY_ATTR_MPLS]); + int n = size / sizeof(ovs_be32); + int i; + + if (!size || size % sizeof(ovs_be32)) { + return ODP_FIT_ERROR; + } - if (flow->dl_type == htons(ETH_TYPE_IP)) { - expected_attrs |= UINT64_C(1) << OVS_KEY_ATTR_IPV4; + if (!is_mask) { + expected_attrs |= (UINT64_C(1) << OVS_KEY_ATTR_MPLS); + + if (!(present_attrs & (UINT64_C(1) << OVS_KEY_ATTR_MPLS))) { + return ODP_FIT_TOO_LITTLE; + } + } else if (present_attrs & (UINT64_C(1) << OVS_KEY_ATTR_MPLS)) { + if (flow->mpls_lse[0] && flow->dl_type != htons(0xffff)) { + return ODP_FIT_ERROR; + } + expected_attrs |= (UINT64_C(1) << OVS_KEY_ATTR_MPLS); + } + + for (i = 0; i < n && i < FLOW_MAX_MPLS_LABELS; i++) { + flow->mpls_lse[i] = mpls_lse[i]; + } + if (n > FLOW_MAX_MPLS_LABELS) { + return ODP_FIT_TOO_MUCH; + } + + if (!is_mask) { + /* BOS may be set only in the innermost label. */ + for (i = 0; i < n - 1; i++) { + if (flow->mpls_lse[i] & htonl(MPLS_BOS_MASK)) { + return ODP_FIT_ERROR; + } + } + + /* BOS must be set in the innermost label. */ + if (n < FLOW_MAX_MPLS_LABELS + && !(flow->mpls_lse[n - 1] & htonl(MPLS_BOS_MASK))) { + return ODP_FIT_TOO_LITTLE; + } + } + + goto done; + } else if (src_flow->dl_type == htons(ETH_TYPE_IP)) { + if (!is_mask) { + expected_attrs |= UINT64_C(1) << OVS_KEY_ATTR_IPV4; + } if (present_attrs & (UINT64_C(1) << OVS_KEY_ATTR_IPV4)) { const struct ovs_key_ipv4 *ipv4_key; @@ -1550,12 +3025,19 @@ parse_l3_onward(const struct nlattr *attrs[OVS_KEY_ATTR_MAX + 1], flow->nw_proto = ipv4_key->ipv4_proto; flow->nw_tos = ipv4_key->ipv4_tos; flow->nw_ttl = ipv4_key->ipv4_ttl; - if (!odp_to_ovs_frag(ipv4_key->ipv4_frag, flow)) { + if (is_mask) { + flow->nw_frag = ipv4_key->ipv4_frag; + check_start = ipv4_key; + check_len = sizeof *ipv4_key; + expected_bit = OVS_KEY_ATTR_IPV4; + } else if (!odp_to_ovs_frag(ipv4_key->ipv4_frag, flow)) { return ODP_FIT_ERROR; } } - } else if (flow->dl_type == htons(ETH_TYPE_IPV6)) { - expected_attrs |= UINT64_C(1) << OVS_KEY_ATTR_IPV6; + } else if (src_flow->dl_type == htons(ETH_TYPE_IPV6)) { + if (!is_mask) { + expected_attrs |= UINT64_C(1) << OVS_KEY_ATTR_IPV6; + } if (present_attrs & (UINT64_C(1) << OVS_KEY_ATTR_IPV6)) { const struct ovs_key_ipv6 *ipv6_key; @@ -1566,19 +3048,27 @@ parse_l3_onward(const struct nlattr *attrs[OVS_KEY_ATTR_MAX + 1], flow->nw_proto = ipv6_key->ipv6_proto; flow->nw_tos = ipv6_key->ipv6_tclass; flow->nw_ttl = ipv6_key->ipv6_hlimit; - if (!odp_to_ovs_frag(ipv6_key->ipv6_frag, flow)) { + if (is_mask) { + flow->nw_frag = ipv6_key->ipv6_frag; + check_start = ipv6_key; + check_len = sizeof *ipv6_key; + expected_bit = OVS_KEY_ATTR_IPV6; + } else if (!odp_to_ovs_frag(ipv6_key->ipv6_frag, flow)) { return ODP_FIT_ERROR; } } - } else if (flow->dl_type == htons(ETH_TYPE_ARP)) { - expected_attrs |= UINT64_C(1) << OVS_KEY_ATTR_ARP; + } else if (src_flow->dl_type == htons(ETH_TYPE_ARP) || + src_flow->dl_type == htons(ETH_TYPE_RARP)) { + if (!is_mask) { + expected_attrs |= UINT64_C(1) << OVS_KEY_ATTR_ARP; + } if (present_attrs & (UINT64_C(1) << OVS_KEY_ATTR_ARP)) { const struct ovs_key_arp *arp_key; arp_key = nl_attr_get(attrs[OVS_KEY_ATTR_ARP]); flow->nw_src = arp_key->arp_sip; flow->nw_dst = arp_key->arp_tip; - if (arp_key->arp_op & htons(0xff00)) { + if (!is_mask && (arp_key->arp_op & htons(0xff00))) { VLOG_ERR_RL(&rl, "unsupported ARP opcode %"PRIu16" in flow " "key", ntohs(arp_key->arp_op)); return ODP_FIT_ERROR; @@ -1586,58 +3076,108 @@ parse_l3_onward(const struct nlattr *attrs[OVS_KEY_ATTR_MAX + 1], flow->nw_proto = ntohs(arp_key->arp_op); memcpy(flow->arp_sha, arp_key->arp_sha, ETH_ADDR_LEN); memcpy(flow->arp_tha, arp_key->arp_tha, ETH_ADDR_LEN); + + if (is_mask) { + check_start = arp_key; + check_len = sizeof *arp_key; + expected_bit = OVS_KEY_ATTR_ARP; + } + } + } else { + goto done; + } + if (check_len > 0) { /* Happens only when 'is_mask'. */ + if (!is_all_zeros(check_start, check_len) && + flow->dl_type != htons(0xffff)) { + return ODP_FIT_ERROR; + } else { + expected_attrs |= UINT64_C(1) << expected_bit; } } - if (flow->nw_proto == IPPROTO_TCP - && (flow->dl_type == htons(ETH_TYPE_IP) || - flow->dl_type == htons(ETH_TYPE_IPV6)) - && !(flow->nw_frag & FLOW_NW_FRAG_LATER)) { - expected_attrs |= UINT64_C(1) << OVS_KEY_ATTR_TCP; + expected_bit = OVS_KEY_ATTR_UNSPEC; + if (src_flow->nw_proto == IPPROTO_TCP + && (src_flow->dl_type == htons(ETH_TYPE_IP) || + src_flow->dl_type == htons(ETH_TYPE_IPV6)) + && !(src_flow->nw_frag & FLOW_NW_FRAG_LATER)) { + if (!is_mask) { + expected_attrs |= UINT64_C(1) << OVS_KEY_ATTR_TCP; + } if (present_attrs & (UINT64_C(1) << OVS_KEY_ATTR_TCP)) { const struct ovs_key_tcp *tcp_key; tcp_key = nl_attr_get(attrs[OVS_KEY_ATTR_TCP]); flow->tp_src = tcp_key->tcp_src; flow->tp_dst = tcp_key->tcp_dst; + expected_bit = OVS_KEY_ATTR_TCP; + } + if (present_attrs & (UINT64_C(1) << OVS_KEY_ATTR_TCP_FLAGS)) { + expected_attrs |= UINT64_C(1) << OVS_KEY_ATTR_TCP_FLAGS; + flow->tcp_flags = nl_attr_get_be16(attrs[OVS_KEY_ATTR_TCP_FLAGS]); + } + } else if (src_flow->nw_proto == IPPROTO_UDP + && (src_flow->dl_type == htons(ETH_TYPE_IP) || + src_flow->dl_type == htons(ETH_TYPE_IPV6)) + && !(src_flow->nw_frag & FLOW_NW_FRAG_LATER)) { + if (!is_mask) { + expected_attrs |= UINT64_C(1) << OVS_KEY_ATTR_UDP; } - } else if (flow->nw_proto == IPPROTO_UDP - && (flow->dl_type == htons(ETH_TYPE_IP) || - flow->dl_type == htons(ETH_TYPE_IPV6)) - && !(flow->nw_frag & FLOW_NW_FRAG_LATER)) { - expected_attrs |= UINT64_C(1) << OVS_KEY_ATTR_UDP; if (present_attrs & (UINT64_C(1) << OVS_KEY_ATTR_UDP)) { const struct ovs_key_udp *udp_key; udp_key = nl_attr_get(attrs[OVS_KEY_ATTR_UDP]); flow->tp_src = udp_key->udp_src; flow->tp_dst = udp_key->udp_dst; + expected_bit = OVS_KEY_ATTR_UDP; + } + } else if (src_flow->nw_proto == IPPROTO_SCTP + && (src_flow->dl_type == htons(ETH_TYPE_IP) || + src_flow->dl_type == htons(ETH_TYPE_IPV6)) + && !(src_flow->nw_frag & FLOW_NW_FRAG_LATER)) { + if (!is_mask) { + expected_attrs |= UINT64_C(1) << OVS_KEY_ATTR_SCTP; + } + if (present_attrs & (UINT64_C(1) << OVS_KEY_ATTR_SCTP)) { + const struct ovs_key_sctp *sctp_key; + + sctp_key = nl_attr_get(attrs[OVS_KEY_ATTR_SCTP]); + flow->tp_src = sctp_key->sctp_src; + flow->tp_dst = sctp_key->sctp_dst; + expected_bit = OVS_KEY_ATTR_SCTP; + } + } else if (src_flow->nw_proto == IPPROTO_ICMP + && src_flow->dl_type == htons(ETH_TYPE_IP) + && !(src_flow->nw_frag & FLOW_NW_FRAG_LATER)) { + if (!is_mask) { + expected_attrs |= UINT64_C(1) << OVS_KEY_ATTR_ICMP; } - } else if (flow->nw_proto == IPPROTO_ICMP - && flow->dl_type == htons(ETH_TYPE_IP) - && !(flow->nw_frag & FLOW_NW_FRAG_LATER)) { - expected_attrs |= UINT64_C(1) << OVS_KEY_ATTR_ICMP; if (present_attrs & (UINT64_C(1) << OVS_KEY_ATTR_ICMP)) { const struct ovs_key_icmp *icmp_key; icmp_key = nl_attr_get(attrs[OVS_KEY_ATTR_ICMP]); flow->tp_src = htons(icmp_key->icmp_type); flow->tp_dst = htons(icmp_key->icmp_code); + expected_bit = OVS_KEY_ATTR_ICMP; + } + } else if (src_flow->nw_proto == IPPROTO_ICMPV6 + && src_flow->dl_type == htons(ETH_TYPE_IPV6) + && !(src_flow->nw_frag & FLOW_NW_FRAG_LATER)) { + if (!is_mask) { + expected_attrs |= UINT64_C(1) << OVS_KEY_ATTR_ICMPV6; } - } else if (flow->nw_proto == IPPROTO_ICMPV6 - && flow->dl_type == htons(ETH_TYPE_IPV6) - && !(flow->nw_frag & FLOW_NW_FRAG_LATER)) { - expected_attrs |= UINT64_C(1) << OVS_KEY_ATTR_ICMPV6; if (present_attrs & (UINT64_C(1) << OVS_KEY_ATTR_ICMPV6)) { const struct ovs_key_icmpv6 *icmpv6_key; icmpv6_key = nl_attr_get(attrs[OVS_KEY_ATTR_ICMPV6]); flow->tp_src = htons(icmpv6_key->icmpv6_type); flow->tp_dst = htons(icmpv6_key->icmpv6_code); - - if (flow->tp_src == htons(ND_NEIGHBOR_SOLICIT) || - flow->tp_src == htons(ND_NEIGHBOR_ADVERT)) { - expected_attrs |= UINT64_C(1) << OVS_KEY_ATTR_ND; + expected_bit = OVS_KEY_ATTR_ICMPV6; + if (src_flow->tp_dst == htons(0) && + (src_flow->tp_src == htons(ND_NEIGHBOR_SOLICIT) || + src_flow->tp_src == htons(ND_NEIGHBOR_ADVERT))) { + if (!is_mask) { + expected_attrs |= UINT64_C(1) << OVS_KEY_ATTR_ND; + } if (present_attrs & (UINT64_C(1) << OVS_KEY_ATTR_ND)) { const struct ovs_key_nd *nd_key; @@ -1646,11 +3186,29 @@ parse_l3_onward(const struct nlattr *attrs[OVS_KEY_ATTR_MAX + 1], sizeof flow->nd_target); memcpy(flow->arp_sha, nd_key->nd_sll, ETH_ADDR_LEN); memcpy(flow->arp_tha, nd_key->nd_tll, ETH_ADDR_LEN); + if (is_mask) { + if (!is_all_zeros((const uint8_t *) nd_key, + sizeof *nd_key) && + (flow->tp_src != htons(0xffff) || + flow->tp_dst != htons(0xffff))) { + return ODP_FIT_ERROR; + } else { + expected_attrs |= UINT64_C(1) << OVS_KEY_ATTR_ND; + } + } } } } } + if (is_mask && expected_bit != OVS_KEY_ATTR_UNSPEC) { + if ((flow->tp_src || flow->tp_dst) && flow->nw_proto != 0xff) { + return ODP_FIT_ERROR; + } else { + expected_attrs |= UINT64_C(1) << expected_bit; + } + } +done: return check_expectations(present_attrs, out_of_range_attr, expected_attrs, key, key_len); } @@ -1660,44 +3218,58 @@ static enum odp_key_fitness parse_8021q_onward(const struct nlattr *attrs[OVS_KEY_ATTR_MAX + 1], uint64_t present_attrs, int out_of_range_attr, uint64_t expected_attrs, struct flow *flow, - const struct nlattr *key, size_t key_len) + const struct nlattr *key, size_t key_len, + const struct flow *src_flow) { static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5); + bool is_mask = src_flow != flow; const struct nlattr *encap = (present_attrs & (UINT64_C(1) << OVS_KEY_ATTR_ENCAP) ? attrs[OVS_KEY_ATTR_ENCAP] : NULL); enum odp_key_fitness encap_fitness; enum odp_key_fitness fitness; - ovs_be16 tci; - /* Calulate fitness of outer attributes. */ - expected_attrs |= ((UINT64_C(1) << OVS_KEY_ATTR_VLAN) | - (UINT64_C(1) << OVS_KEY_ATTR_ENCAP)); - fitness = check_expectations(present_attrs, out_of_range_attr, - expected_attrs, key, key_len); - - /* Get the VLAN TCI value. */ - if (!(present_attrs & (UINT64_C(1) << OVS_KEY_ATTR_VLAN))) { - return ODP_FIT_TOO_LITTLE; - } - tci = nl_attr_get_be16(attrs[OVS_KEY_ATTR_VLAN]); - if (tci == htons(0)) { - /* Corner case for a truncated 802.1Q header. */ - if (fitness == ODP_FIT_PERFECT && nl_attr_get_size(encap)) { - return ODP_FIT_TOO_MUCH; + /* Calculate fitness of outer attributes. */ + if (!is_mask) { + expected_attrs |= ((UINT64_C(1) << OVS_KEY_ATTR_VLAN) | + (UINT64_C(1) << OVS_KEY_ATTR_ENCAP)); + } else { + if (present_attrs & (UINT64_C(1) << OVS_KEY_ATTR_VLAN)) { + expected_attrs |= (UINT64_C(1) << OVS_KEY_ATTR_VLAN); + } + if (present_attrs & (UINT64_C(1) << OVS_KEY_ATTR_ENCAP)) { + expected_attrs |= (UINT64_C(1) << OVS_KEY_ATTR_ENCAP); } - return fitness; - } else if (!(tci & htons(VLAN_CFI))) { - VLOG_ERR_RL(&rl, "OVS_KEY_ATTR_VLAN 0x%04"PRIx16" is nonzero " - "but CFI bit is not set", ntohs(tci)); - return ODP_FIT_ERROR; } + fitness = check_expectations(present_attrs, out_of_range_attr, + expected_attrs, key, key_len); /* Set vlan_tci. * Remove the TPID from dl_type since it's not the real Ethertype. */ - flow->vlan_tci = tci; flow->dl_type = htons(0); + flow->vlan_tci = (present_attrs & (UINT64_C(1) << OVS_KEY_ATTR_VLAN) + ? nl_attr_get_be16(attrs[OVS_KEY_ATTR_VLAN]) + : htons(0)); + if (!is_mask) { + if (!(present_attrs & (UINT64_C(1) << OVS_KEY_ATTR_VLAN))) { + return ODP_FIT_TOO_LITTLE; + } else if (flow->vlan_tci == htons(0)) { + /* Corner case for a truncated 802.1Q header. */ + if (fitness == ODP_FIT_PERFECT && nl_attr_get_size(encap)) { + return ODP_FIT_TOO_MUCH; + } + return fitness; + } else if (!(flow->vlan_tci & htons(VLAN_CFI))) { + VLOG_ERR_RL(&rl, "OVS_KEY_ATTR_VLAN 0x%04"PRIx16" is nonzero " + "but CFI bit is not set", ntohs(flow->vlan_tci)); + return ODP_FIT_ERROR; + } + } else { + if (!(present_attrs & (UINT64_C(1) << OVS_KEY_ATTR_ENCAP))) { + return fitness; + } + } /* Now parse the encapsulated attributes. */ if (!parse_flow_nlattrs(nl_attr_get(encap), nl_attr_get_size(encap), @@ -1706,36 +3278,26 @@ parse_8021q_onward(const struct nlattr *attrs[OVS_KEY_ATTR_MAX + 1], } expected_attrs = 0; - if (!parse_ethertype(attrs, present_attrs, &expected_attrs, flow)) { + if (!parse_ethertype(attrs, present_attrs, &expected_attrs, flow, src_flow)) { return ODP_FIT_ERROR; } - encap_fitness = parse_l3_onward(attrs, present_attrs, out_of_range_attr, - expected_attrs, flow, key, key_len); + encap_fitness = parse_l2_5_onward(attrs, present_attrs, out_of_range_attr, + expected_attrs, flow, key, key_len, + src_flow); /* The overall fitness is the worse of the outer and inner attributes. */ return MAX(fitness, encap_fitness); } -/* Converts the 'key_len' bytes of OVS_KEY_ATTR_* attributes in 'key' to a flow - * structure in 'flow'. Returns an ODP_FIT_* value that indicates how well - * 'key' fits our expectations for what a flow key should contain. - * - * This function doesn't take the packet itself as an argument because none of - * the currently understood OVS_KEY_ATTR_* attributes require it. Currently, - * it is always possible to infer which additional attribute(s) should appear - * by looking at the attributes for lower-level protocols, e.g. if the network - * protocol in OVS_KEY_ATTR_IPV4 or OVS_KEY_ATTR_IPV6 is IPPROTO_TCP then we - * know that a OVS_KEY_ATTR_TCP attribute must appear and that otherwise it - * must be absent. */ -enum odp_key_fitness -odp_flow_key_to_flow(const struct nlattr *key, size_t key_len, - struct flow *flow) +static enum odp_key_fitness +odp_flow_key_to_flow__(const struct nlattr *key, size_t key_len, + struct flow *flow, const struct flow *src_flow) { - static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5); const struct nlattr *attrs[OVS_KEY_ATTR_MAX + 1]; uint64_t expected_attrs; uint64_t present_attrs; int out_of_range_attr; + bool is_mask = src_flow != flow; memset(flow, 0, sizeof *flow); @@ -1747,27 +3309,45 @@ odp_flow_key_to_flow(const struct nlattr *key, size_t key_len, expected_attrs = 0; /* Metadata. */ + if (present_attrs & (UINT64_C(1) << OVS_KEY_ATTR_RECIRC_ID)) { + flow->recirc_id = nl_attr_get_u32(attrs[OVS_KEY_ATTR_RECIRC_ID]); + expected_attrs |= UINT64_C(1) << OVS_KEY_ATTR_RECIRC_ID; + } else if (is_mask) { + /* Always exact match recirc_id when datapath does not sepcify it. */ + flow->recirc_id = UINT32_MAX; + } + + if (present_attrs & (UINT64_C(1) << OVS_KEY_ATTR_DP_HASH)) { + flow->dp_hash = nl_attr_get_u32(attrs[OVS_KEY_ATTR_DP_HASH]); + expected_attrs |= UINT64_C(1) << OVS_KEY_ATTR_DP_HASH; + } if (present_attrs & (UINT64_C(1) << OVS_KEY_ATTR_PRIORITY)) { flow->skb_priority = nl_attr_get_u32(attrs[OVS_KEY_ATTR_PRIORITY]); expected_attrs |= UINT64_C(1) << OVS_KEY_ATTR_PRIORITY; } - if (present_attrs & (UINT64_C(1) << OVS_KEY_ATTR_TUN_ID)) { - flow->tun_id = nl_attr_get_be64(attrs[OVS_KEY_ATTR_TUN_ID]); - expected_attrs |= UINT64_C(1) << OVS_KEY_ATTR_TUN_ID; + if (present_attrs & (UINT64_C(1) << OVS_KEY_ATTR_SKB_MARK)) { + flow->pkt_mark = nl_attr_get_u32(attrs[OVS_KEY_ATTR_SKB_MARK]); + expected_attrs |= UINT64_C(1) << OVS_KEY_ATTR_SKB_MARK; } - if (present_attrs & (UINT64_C(1) << OVS_KEY_ATTR_IN_PORT)) { - uint32_t in_port = nl_attr_get_u32(attrs[OVS_KEY_ATTR_IN_PORT]); - if (in_port >= UINT16_MAX || in_port >= OFPP_MAX) { - VLOG_ERR_RL(&rl, "in_port %"PRIu32" out of supported range", - in_port); + if (present_attrs & (UINT64_C(1) << OVS_KEY_ATTR_TUNNEL)) { + enum odp_key_fitness res; + + res = odp_tun_key_from_attr(attrs[OVS_KEY_ATTR_TUNNEL], &flow->tunnel); + if (res == ODP_FIT_ERROR) { return ODP_FIT_ERROR; + } else if (res == ODP_FIT_PERFECT) { + expected_attrs |= UINT64_C(1) << OVS_KEY_ATTR_TUNNEL; } - flow->in_port = odp_port_to_ofp_port(in_port); + } + + if (present_attrs & (UINT64_C(1) << OVS_KEY_ATTR_IN_PORT)) { + flow->in_port.odp_port + = nl_attr_get_odp_port(attrs[OVS_KEY_ATTR_IN_PORT]); expected_attrs |= UINT64_C(1) << OVS_KEY_ATTR_IN_PORT; - } else { - flow->in_port = OFPP_NONE; + } else if (!is_mask) { + flow->in_port.odp_port = ODPP_NONE; } /* Ethernet header. */ @@ -1777,20 +3357,68 @@ odp_flow_key_to_flow(const struct nlattr *key, size_t key_len, eth_key = nl_attr_get(attrs[OVS_KEY_ATTR_ETHERNET]); memcpy(flow->dl_src, eth_key->eth_src, ETH_ADDR_LEN); memcpy(flow->dl_dst, eth_key->eth_dst, ETH_ADDR_LEN); + if (is_mask) { + expected_attrs |= UINT64_C(1) << OVS_KEY_ATTR_ETHERNET; + } + } + if (!is_mask) { + expected_attrs |= UINT64_C(1) << OVS_KEY_ATTR_ETHERNET; } - expected_attrs |= UINT64_C(1) << OVS_KEY_ATTR_ETHERNET; /* Get Ethertype or 802.1Q TPID or FLOW_DL_TYPE_NONE. */ - if (!parse_ethertype(attrs, present_attrs, &expected_attrs, flow)) { + if (!parse_ethertype(attrs, present_attrs, &expected_attrs, flow, + src_flow)) { return ODP_FIT_ERROR; } - if (flow->dl_type == htons(ETH_TYPE_VLAN)) { + if (is_mask + ? (src_flow->vlan_tci & htons(VLAN_CFI)) != 0 + : src_flow->dl_type == htons(ETH_TYPE_VLAN)) { return parse_8021q_onward(attrs, present_attrs, out_of_range_attr, - expected_attrs, flow, key, key_len); + expected_attrs, flow, key, key_len, src_flow); + } + if (is_mask) { + flow->vlan_tci = htons(0xffff); + if (present_attrs & (UINT64_C(1) << OVS_KEY_ATTR_VLAN)) { + flow->vlan_tci = nl_attr_get_be16(attrs[OVS_KEY_ATTR_VLAN]); + expected_attrs |= (UINT64_C(1) << OVS_KEY_ATTR_VLAN); + } } - return parse_l3_onward(attrs, present_attrs, out_of_range_attr, - expected_attrs, flow, key, key_len); + return parse_l2_5_onward(attrs, present_attrs, out_of_range_attr, + expected_attrs, flow, key, key_len, src_flow); +} + +/* Converts the 'key_len' bytes of OVS_KEY_ATTR_* attributes in 'key' to a flow + * structure in 'flow'. Returns an ODP_FIT_* value that indicates how well + * 'key' fits our expectations for what a flow key should contain. + * + * The 'in_port' will be the datapath's understanding of the port. The + * caller will need to translate with odp_port_to_ofp_port() if the + * OpenFlow port is needed. + * + * This function doesn't take the packet itself as an argument because none of + * the currently understood OVS_KEY_ATTR_* attributes require it. Currently, + * it is always possible to infer which additional attribute(s) should appear + * by looking at the attributes for lower-level protocols, e.g. if the network + * protocol in OVS_KEY_ATTR_IPV4 or OVS_KEY_ATTR_IPV6 is IPPROTO_TCP then we + * know that a OVS_KEY_ATTR_TCP attribute must appear and that otherwise it + * must be absent. */ +enum odp_key_fitness +odp_flow_key_to_flow(const struct nlattr *key, size_t key_len, + struct flow *flow) +{ + return odp_flow_key_to_flow__(key, key_len, flow, flow); +} + +/* Converts the 'key_len' bytes of OVS_KEY_ATTR_* attributes in 'key' to a mask + * structure in 'mask'. 'flow' must be a previously translated flow + * corresponding to 'mask'. Returns an ODP_FIT_* value that indicates how well + * 'key' fits our expectations for what a flow key should contain. */ +enum odp_key_fitness +odp_flow_key_to_mask(const struct nlattr *key, size_t key_len, + struct flow *mask, const struct flow *flow) +{ + return odp_flow_key_to_flow__(key, key_len, mask, flow); } /* Returns 'fitness' as a string, for use in debug messages. */ @@ -1812,25 +3440,51 @@ odp_key_fitness_to_string(enum odp_key_fitness fitness) } /* Appends an OVS_ACTION_ATTR_USERSPACE action to 'odp_actions' that specifies - * Netlink PID 'pid'. If 'cookie' is nonnull, adds a userdata attribute whose - * contents contains 'cookie' and returns the offset within 'odp_actions' of - * the start of the cookie. (If 'cookie' is null, then the return value is not - * meaningful.) */ + * Netlink PID 'pid'. If 'userdata' is nonnull, adds a userdata attribute + * whose contents are the 'userdata_size' bytes at 'userdata' and returns the + * offset within 'odp_actions' of the start of the cookie. (If 'userdata' is + * null, then the return value is not meaningful.) */ size_t -odp_put_userspace_action(uint32_t pid, const union user_action_cookie *cookie, +odp_put_userspace_action(uint32_t pid, + const void *userdata, size_t userdata_size, struct ofpbuf *odp_actions) { + size_t userdata_ofs; size_t offset; offset = nl_msg_start_nested(odp_actions, OVS_ACTION_ATTR_USERSPACE); nl_msg_put_u32(odp_actions, OVS_USERSPACE_ATTR_PID, pid); - if (cookie) { - nl_msg_put_unspec(odp_actions, OVS_USERSPACE_ATTR_USERDATA, - cookie, sizeof *cookie); + if (userdata) { + userdata_ofs = ofpbuf_size(odp_actions) + NLA_HDRLEN; + + /* The OVS kernel module before OVS 1.11 and the upstream Linux kernel + * module before Linux 3.10 required the userdata to be exactly 8 bytes + * long: + * + * - The kernel rejected shorter userdata with -ERANGE. + * + * - The kernel silently dropped userdata beyond the first 8 bytes. + * + * Thus, for maximum compatibility, always put at least 8 bytes. (We + * separately disable features that required more than 8 bytes.) */ + memcpy(nl_msg_put_unspec_zero(odp_actions, OVS_USERSPACE_ATTR_USERDATA, + MAX(8, userdata_size)), + userdata, userdata_size); + } else { + userdata_ofs = 0; } nl_msg_end_nested(odp_actions, offset); - return cookie ? odp_actions->size - NLA_ALIGN(sizeof *cookie) : 0; + return userdata_ofs; +} + +void +odp_put_tunnel_action(const struct flow_tnl *tunnel, + struct ofpbuf *odp_actions) +{ + size_t offset = nl_msg_start_nested(odp_actions, OVS_ACTION_ATTR_SET); + tun_key_to_attr(odp_actions, tunnel); + nl_msg_end_nested(odp_actions, offset); } /* The commit_odp_actions() function and its helpers. */ @@ -1844,22 +3498,38 @@ commit_set_action(struct ofpbuf *odp_actions, enum ovs_key_attr key_type, nl_msg_end_nested(odp_actions, offset); } -static void -commit_set_tun_id_action(const struct flow *flow, struct flow *base, +void +odp_put_pkt_mark_action(const uint32_t pkt_mark, + struct ofpbuf *odp_actions) +{ + commit_set_action(odp_actions, OVS_KEY_ATTR_SKB_MARK, &pkt_mark, + sizeof(pkt_mark)); +} + +/* If any of the flow key data that ODP actions can modify are different in + * 'base->tunnel' and 'flow->tunnel', appends a set_tunnel ODP action to + * 'odp_actions' that change the flow tunneling information in key from + * 'base->tunnel' into 'flow->tunnel', and then changes 'base->tunnel' in the + * same way. In other words, operates the same as commit_odp_actions(), but + * only on tunneling information. */ +void +commit_odp_tunnel_action(const struct flow *flow, struct flow *base, struct ofpbuf *odp_actions) { - if (base->tun_id == flow->tun_id) { - return; + /* A valid IPV4_TUNNEL must have non-zero ip_dst. */ + if (flow->tunnel.ip_dst) { + if (!memcmp(&base->tunnel, &flow->tunnel, sizeof base->tunnel)) { + return; + } + memcpy(&base->tunnel, &flow->tunnel, sizeof base->tunnel); + odp_put_tunnel_action(&base->tunnel, odp_actions); } - base->tun_id = flow->tun_id; - - commit_set_action(odp_actions, OVS_KEY_ATTR_TUN_ID, - &base->tun_id, sizeof(base->tun_id)); } static void commit_set_ether_addr_action(const struct flow *flow, struct flow *base, - struct ofpbuf *odp_actions) + struct ofpbuf *odp_actions, + struct flow_wildcards *wc) { struct ovs_key_ethernet eth_key; @@ -1868,6 +3538,9 @@ commit_set_ether_addr_action(const struct flow *flow, struct flow *base, return; } + memset(&wc->masks.dl_src, 0xff, sizeof wc->masks.dl_src); + memset(&wc->masks.dl_dst, 0xff, sizeof wc->masks.dl_dst); + memcpy(base->dl_src, flow->dl_src, ETH_ADDR_LEN); memcpy(base->dl_dst, flow->dl_dst, ETH_ADDR_LEN); @@ -1879,31 +3552,106 @@ commit_set_ether_addr_action(const struct flow *flow, struct flow *base, } static void -commit_vlan_action(const struct flow *flow, struct flow *base, - struct ofpbuf *odp_actions) +pop_vlan(struct flow *base, + struct ofpbuf *odp_actions, struct flow_wildcards *wc) { - if (base->vlan_tci == flow->vlan_tci) { - return; - } + memset(&wc->masks.vlan_tci, 0xff, sizeof wc->masks.vlan_tci); if (base->vlan_tci & htons(VLAN_CFI)) { nl_msg_put_flag(odp_actions, OVS_ACTION_ATTR_POP_VLAN); + base->vlan_tci = 0; + } +} + +static void +commit_vlan_action(ovs_be16 vlan_tci, struct flow *base, + struct ofpbuf *odp_actions, struct flow_wildcards *wc) +{ + if (base->vlan_tci == vlan_tci) { + return; } - if (flow->vlan_tci & htons(VLAN_CFI)) { + pop_vlan(base, odp_actions, wc); + if (vlan_tci & htons(VLAN_CFI)) { struct ovs_action_push_vlan vlan; vlan.vlan_tpid = htons(ETH_TYPE_VLAN); - vlan.vlan_tci = flow->vlan_tci; + vlan.vlan_tci = vlan_tci; nl_msg_put_unspec(odp_actions, OVS_ACTION_ATTR_PUSH_VLAN, &vlan, sizeof vlan); } - base->vlan_tci = flow->vlan_tci; + base->vlan_tci = vlan_tci; +} + +static void +commit_mpls_action(const struct flow *flow, struct flow *base, + struct ofpbuf *odp_actions, struct flow_wildcards *wc) +{ + int base_n = flow_count_mpls_labels(base, wc); + int flow_n = flow_count_mpls_labels(flow, wc); + int common_n = flow_count_common_mpls_labels(flow, flow_n, base, base_n, + wc); + + while (base_n > common_n) { + if (base_n - 1 == common_n && flow_n > common_n) { + /* If there is only one more LSE in base than there are common + * between base and flow; and flow has at least one more LSE than + * is common then the topmost LSE of base may be updated using + * set */ + struct ovs_key_mpls mpls_key; + + mpls_key.mpls_lse = flow->mpls_lse[flow_n - base_n]; + commit_set_action(odp_actions, OVS_KEY_ATTR_MPLS, + &mpls_key, sizeof mpls_key); + flow_set_mpls_lse(base, 0, mpls_key.mpls_lse); + common_n++; + } else { + /* Otherwise, if there more LSEs in base than are common between + * base and flow then pop the topmost one. */ + ovs_be16 dl_type; + bool popped; + + /* If all the LSEs are to be popped and this is not the outermost + * LSE then use ETH_TYPE_MPLS as the ethertype parameter of the + * POP_MPLS action instead of flow->dl_type. + * + * This is because the POP_MPLS action requires its ethertype + * argument to be an MPLS ethernet type but in this case + * flow->dl_type will be a non-MPLS ethernet type. + * + * When the final POP_MPLS action occurs it use flow->dl_type and + * the and the resulting packet will have the desired dl_type. */ + if ((!eth_type_mpls(flow->dl_type)) && base_n > 1) { + dl_type = htons(ETH_TYPE_MPLS); + } else { + dl_type = flow->dl_type; + } + nl_msg_put_be16(odp_actions, OVS_ACTION_ATTR_POP_MPLS, dl_type); + popped = flow_pop_mpls(base, base_n, flow->dl_type, wc); + ovs_assert(popped); + base_n--; + } + } + + /* If, after the above popping and setting, there are more LSEs in flow + * than base then some LSEs need to be pushed. */ + while (base_n < flow_n) { + struct ovs_action_push_mpls *mpls; + + mpls = nl_msg_put_unspec_zero(odp_actions, + OVS_ACTION_ATTR_PUSH_MPLS, + sizeof *mpls); + mpls->mpls_ethertype = flow->dl_type; + mpls->mpls_lse = flow->mpls_lse[flow_n - base_n - 1]; + flow_push_mpls(base, base_n, mpls->mpls_ethertype, wc); + flow_set_mpls_lse(base, 0, mpls->mpls_lse); + base_n++; + } } static void commit_set_ipv4_action(const struct flow *flow, struct flow *base, - struct ofpbuf *odp_actions) + struct ofpbuf *odp_actions, struct flow_wildcards *wc) { struct ovs_key_ipv4 ipv4_key; @@ -1915,6 +3663,13 @@ commit_set_ipv4_action(const struct flow *flow, struct flow *base, return; } + memset(&wc->masks.nw_src, 0xff, sizeof wc->masks.nw_src); + memset(&wc->masks.nw_dst, 0xff, sizeof wc->masks.nw_dst); + memset(&wc->masks.nw_tos, 0xff, sizeof wc->masks.nw_tos); + memset(&wc->masks.nw_ttl, 0xff, sizeof wc->masks.nw_ttl); + memset(&wc->masks.nw_proto, 0xff, sizeof wc->masks.nw_proto); + memset(&wc->masks.nw_frag, 0xff, sizeof wc->masks.nw_frag); + ipv4_key.ipv4_src = base->nw_src = flow->nw_src; ipv4_key.ipv4_dst = base->nw_dst = flow->nw_dst; ipv4_key.ipv4_tos = base->nw_tos = flow->nw_tos; @@ -1928,7 +3683,7 @@ commit_set_ipv4_action(const struct flow *flow, struct flow *base, static void commit_set_ipv6_action(const struct flow *flow, struct flow *base, - struct ofpbuf *odp_actions) + struct ofpbuf *odp_actions, struct flow_wildcards *wc) { struct ovs_key_ipv6 ipv6_key; @@ -1941,6 +3696,14 @@ commit_set_ipv6_action(const struct flow *flow, struct flow *base, return; } + memset(&wc->masks.ipv6_src, 0xff, sizeof wc->masks.ipv6_src); + memset(&wc->masks.ipv6_dst, 0xff, sizeof wc->masks.ipv6_dst); + memset(&wc->masks.ipv6_label, 0xff, sizeof wc->masks.ipv6_label); + memset(&wc->masks.nw_tos, 0xff, sizeof wc->masks.nw_tos); + memset(&wc->masks.nw_ttl, 0xff, sizeof wc->masks.nw_ttl); + memset(&wc->masks.nw_proto, 0xff, sizeof wc->masks.nw_proto); + memset(&wc->masks.nw_frag, 0xff, sizeof wc->masks.nw_frag); + base->ipv6_src = flow->ipv6_src; memcpy(&ipv6_key.ipv6_src, &base->ipv6_src, sizeof(ipv6_key.ipv6_src)); base->ipv6_dst = flow->ipv6_dst; @@ -1956,27 +3719,73 @@ commit_set_ipv6_action(const struct flow *flow, struct flow *base, &ipv6_key, sizeof(ipv6_key)); } -static void +static enum slow_path_reason +commit_set_arp_action(const struct flow *flow, struct flow *base, + struct ofpbuf *odp_actions, struct flow_wildcards *wc) +{ + struct ovs_key_arp arp_key; + + if (base->nw_src == flow->nw_src && + base->nw_dst == flow->nw_dst && + base->nw_proto == flow->nw_proto && + eth_addr_equals(base->arp_sha, flow->arp_sha) && + eth_addr_equals(base->arp_tha, flow->arp_tha)) { + return 0; + } + + memset(&wc->masks.nw_src, 0xff, sizeof wc->masks.nw_src); + memset(&wc->masks.nw_dst, 0xff, sizeof wc->masks.nw_dst); + memset(&wc->masks.nw_proto, 0xff, sizeof wc->masks.nw_proto); + memset(&wc->masks.arp_sha, 0xff, sizeof wc->masks.arp_sha); + memset(&wc->masks.arp_tha, 0xff, sizeof wc->masks.arp_tha); + + base->nw_src = flow->nw_src; + base->nw_dst = flow->nw_dst; + base->nw_proto = flow->nw_proto; + memcpy(base->arp_sha, flow->arp_sha, ETH_ADDR_LEN); + memcpy(base->arp_tha, flow->arp_tha, ETH_ADDR_LEN); + + arp_key.arp_sip = base->nw_src; + arp_key.arp_tip = base->nw_dst; + arp_key.arp_op = htons(base->nw_proto); + memcpy(arp_key.arp_sha, flow->arp_sha, ETH_ADDR_LEN); + memcpy(arp_key.arp_tha, flow->arp_tha, ETH_ADDR_LEN); + + commit_set_action(odp_actions, OVS_KEY_ATTR_ARP, &arp_key, sizeof arp_key); + + return SLOW_ACTION; +} + +static enum slow_path_reason commit_set_nw_action(const struct flow *flow, struct flow *base, - struct ofpbuf *odp_actions) + struct ofpbuf *odp_actions, struct flow_wildcards *wc) { - /* Check if flow really have an IP header. */ + /* Check if 'flow' really has an L3 header. */ if (!flow->nw_proto) { - return; + return 0; } - if (base->dl_type == htons(ETH_TYPE_IP)) { - commit_set_ipv4_action(flow, base, odp_actions); - } else if (base->dl_type == htons(ETH_TYPE_IPV6)) { - commit_set_ipv6_action(flow, base, odp_actions); + switch (ntohs(base->dl_type)) { + case ETH_TYPE_IP: + commit_set_ipv4_action(flow, base, odp_actions, wc); + break; + + case ETH_TYPE_IPV6: + commit_set_ipv6_action(flow, base, odp_actions, wc); + break; + + case ETH_TYPE_ARP: + return commit_set_arp_action(flow, base, odp_actions, wc); } + + return 0; } static void commit_set_port_action(const struct flow *flow, struct flow *base, - struct ofpbuf *odp_actions) + struct ofpbuf *odp_actions, struct flow_wildcards *wc) { - if (!base->tp_src || !base->tp_dst) { + if (!is_ip_any(base) || (!base->tp_src && !base->tp_dst)) { return; } @@ -1985,6 +3794,9 @@ commit_set_port_action(const struct flow *flow, struct flow *base, return; } + memset(&wc->masks.tp_src, 0xff, sizeof wc->masks.tp_src); + memset(&wc->masks.tp_dst, 0xff, sizeof wc->masks.tp_dst); + if (flow->nw_proto == IPPROTO_TCP) { struct ovs_key_tcp port_key; @@ -2002,33 +3814,70 @@ commit_set_port_action(const struct flow *flow, struct flow *base, commit_set_action(odp_actions, OVS_KEY_ATTR_UDP, &port_key, sizeof(port_key)); + } else if (flow->nw_proto == IPPROTO_SCTP) { + struct ovs_key_sctp port_key; + + port_key.sctp_src = base->tp_src = flow->tp_src; + port_key.sctp_dst = base->tp_dst = flow->tp_dst; + + commit_set_action(odp_actions, OVS_KEY_ATTR_SCTP, + &port_key, sizeof(port_key)); } } static void commit_set_priority_action(const struct flow *flow, struct flow *base, - struct ofpbuf *odp_actions) + struct ofpbuf *odp_actions, + struct flow_wildcards *wc) { if (base->skb_priority == flow->skb_priority) { return; } + + memset(&wc->masks.skb_priority, 0xff, sizeof wc->masks.skb_priority); base->skb_priority = flow->skb_priority; commit_set_action(odp_actions, OVS_KEY_ATTR_PRIORITY, &base->skb_priority, sizeof(base->skb_priority)); } +static void +commit_set_pkt_mark_action(const struct flow *flow, struct flow *base, + struct ofpbuf *odp_actions, + struct flow_wildcards *wc) +{ + if (base->pkt_mark == flow->pkt_mark) { + return; + } + + memset(&wc->masks.pkt_mark, 0xff, sizeof wc->masks.pkt_mark); + base->pkt_mark = flow->pkt_mark; + + odp_put_pkt_mark_action(base->pkt_mark, odp_actions); +} + /* If any of the flow key data that ODP actions can modify are different in * 'base' and 'flow', appends ODP actions to 'odp_actions' that change the flow - * key from 'base' into 'flow', and then changes 'base' the same way. */ -void + * key from 'base' into 'flow', and then changes 'base' the same way. Does not + * commit set_tunnel actions. Users should call commit_odp_tunnel_action() + * in addition to this function if needed. Sets fields in 'wc' that are + * used as part of the action. + * + * Returns a reason to force processing the flow's packets into the userspace + * slow path, if there is one, otherwise 0. */ +enum slow_path_reason commit_odp_actions(const struct flow *flow, struct flow *base, - struct ofpbuf *odp_actions) -{ - commit_set_tun_id_action(flow, base, odp_actions); - commit_set_ether_addr_action(flow, base, odp_actions); - commit_vlan_action(flow, base, odp_actions); - commit_set_nw_action(flow, base, odp_actions); - commit_set_port_action(flow, base, odp_actions); - commit_set_priority_action(flow, base, odp_actions); + struct ofpbuf *odp_actions, struct flow_wildcards *wc) +{ + enum slow_path_reason slow; + + commit_set_ether_addr_action(flow, base, odp_actions, wc); + slow = commit_set_nw_action(flow, base, odp_actions, wc); + commit_set_port_action(flow, base, odp_actions, wc); + commit_mpls_action(flow, base, odp_actions, wc); + commit_vlan_action(flow->vlan_tci, base, odp_actions, wc); + commit_set_priority_action(flow, base, odp_actions, wc); + commit_set_pkt_mark_action(flow, base, odp_actions, wc); + + return slow; }