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_TUN_ID: return "tun_id";
case OVS_KEY_ATTR_IPV4_TUNNEL: return "ipv4_tunnel";
}
}
-static void
-format_flags(struct ds *ds, const char *(*bit_to_string)(uint32_t),
- uint32_t flags)
-{
- uint32_t bad = 0;
-
- ds_put_format(ds, "(");
- if (!flags) {
- goto out;
- }
- while (flags) {
- uint32_t bit = rightmost_1bit(flags);
- const char *s;
-
- s = bit_to_string(bit);
- if (s) {
- ds_put_format(ds, "%s,", s);
- } else {
- bad |= bit;
- }
-
- flags &= ~bit;
- }
-
- if (bad) {
- ds_put_format(ds, "0x%"PRIx32",", bad);
- }
- ds_chomp(ds, ',');
-out:
- ds_put_format(ds, ")");
-}
-
static int
parse_flags(const char *s, const char *(*bit_to_string)(uint32_t),
uint32_t *res)
break;
case 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_cstr(ds, ",slow_path(");
+ format_flags(ds, slow_path_reason_to_string,
+ cookie.slow_path.reason, ',');
+ ds_put_format(ds, ")");
break;
case USER_ACTION_COOKIE_UNSPEC:
}
static const char *
-tun_flag_to_string(uint32_t flags)
+odp_tun_flag_to_string(uint32_t flags)
{
switch (flags) {
case OVS_TNL_F_DONT_FRAGMENT:
break;
case OVS_KEY_ATTR_PRIORITY:
- ds_put_format(ds, "(%"PRIu32")", nl_attr_get_u32(a));
+ ds_put_format(ds, "(%#"PRIx32")", nl_attr_get_u32(a));
break;
case OVS_KEY_ATTR_SKB_MARK:
- ds_put_format(ds, "(%"PRIu32")", nl_attr_get_u32(a));
+ ds_put_format(ds, "(%#"PRIx32")", nl_attr_get_u32(a));
break;
case OVS_KEY_ATTR_TUN_ID:
case OVS_KEY_ATTR_IPV4_TUNNEL:
ipv4_tun_key = nl_attr_get(a);
ds_put_format(ds, "(tun_id=0x%"PRIx64",src="IP_FMT",dst="IP_FMT","
- "tos=0x%"PRIx8",ttl=%"PRIu8",flags",
+ "tos=0x%"PRIx8",ttl=%"PRIu8",flags(",
ntohll(ipv4_tun_key->tun_id),
- IP_ARGS(&ipv4_tun_key->ipv4_src),
- IP_ARGS(&ipv4_tun_key->ipv4_dst),
+ IP_ARGS(ipv4_tun_key->ipv4_src),
+ IP_ARGS(ipv4_tun_key->ipv4_dst),
ipv4_tun_key->ipv4_tos, ipv4_tun_key->ipv4_ttl);
- format_flags(ds, tun_flag_to_string, ipv4_tun_key->tun_flags);
- ds_put_format(ds, ")");
+ format_flags(ds, odp_tun_flag_to_string,
+ ipv4_tun_key->tun_flags, ',');
+ ds_put_format(ds, "))");
break;
case OVS_KEY_ATTR_IN_PORT:
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),
+ 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));
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),
+ 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;
unsigned long long int priority;
int n = -1;
- if (sscanf(s, "priority(%lli)%n", &priority, &n) > 0 && n > 0) {
+ if (sscanf(s, "skb_priority(%llx)%n", &priority, &n) > 0 && n > 0) {
nl_msg_put_u32(key, OVS_KEY_ATTR_PRIORITY, priority);
return n;
}
unsigned long long int mark;
int n = -1;
- if (sscanf(s, "skb_mark(%lli)%n", &mark, &n) > 0 && n > 0) {
+ if (sscanf(s, "skb_mark(%llx)%n", &mark, &n) > 0 && n > 0) {
nl_msg_put_u32(key, OVS_KEY_ATTR_SKB_MARK, mark);
return n;
}
tun_key.ipv4_tos = tos;
tun_key.ipv4_ttl = ttl;
- res = parse_flags(&s[n], tun_flag_to_string, &tun_key.tun_flags);
+ res = parse_flags(&s[n], odp_tun_flag_to_string,
+ &tun_key.tun_flags);
if (res < 0) {
return res;
}
: OVS_FRAG_TYPE_LATER);
}
+/* The set of kernel flags we understand. Used to detect if ODP_FIT_TOO_MUCH */
+#define OVS_TNL_F_KNOWN_MASK \
+ (OVS_TNL_F_DONT_FRAGMENT | OVS_TNL_F_CSUM | OVS_TNL_F_KEY)
+
+/* These allow the flow/kernel view of the flags to change in future */
+static uint32_t
+flow_to_odp_flags(uint16_t flags)
+{
+ return (flags & FLOW_TNL_F_DONT_FRAGMENT ? OVS_TNL_F_DONT_FRAGMENT : 0)
+ | (flags & FLOW_TNL_F_CSUM ? OVS_TNL_F_CSUM : 0)
+ | (flags & FLOW_TNL_F_KEY ? OVS_TNL_F_KEY : 0);
+}
+
+static uint16_t
+odp_to_flow_flags(uint32_t tun_flags)
+{
+ return (tun_flags & OVS_TNL_F_DONT_FRAGMENT ? FLOW_TNL_F_DONT_FRAGMENT : 0)
+ | (tun_flags & OVS_TNL_F_CSUM ? FLOW_TNL_F_CSUM : 0)
+ | (tun_flags & OVS_TNL_F_KEY ? FLOW_TNL_F_KEY : 0);
+}
+
/* 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'
nl_msg_put_u32(buf, OVS_KEY_ATTR_PRIORITY, flow->skb_priority);
}
- if (flow->tunnel.tun_id != htonll(0)) {
+ if (flow->tunnel.ip_dst) {
+ struct ovs_key_ipv4_tunnel *ipv4_tun_key;
+
+ ipv4_tun_key = nl_msg_put_unspec_uninit(buf, OVS_KEY_ATTR_IPV4_TUNNEL,
+ sizeof *ipv4_tun_key);
+ /* layouts differ, flags has different size */
+ ipv4_tun_key->tun_id = flow->tunnel.tun_id;
+ ipv4_tun_key->tun_flags = flow_to_odp_flags(flow->tunnel.flags);
+ ipv4_tun_key->ipv4_src = flow->tunnel.ip_src;
+ ipv4_tun_key->ipv4_dst = flow->tunnel.ip_dst;
+ ipv4_tun_key->ipv4_tos = flow->tunnel.ip_tos;
+ ipv4_tun_key->ipv4_ttl = flow->tunnel.ip_ttl;
+ memset(ipv4_tun_key->pad, 0, sizeof ipv4_tun_key->pad);
+ } else if (flow->tunnel.tun_id != htonll(0)) {
nl_msg_put_be64(buf, OVS_KEY_ATTR_TUN_ID, flow->tunnel.tun_id);
}
expected_attrs |= UINT64_C(1) << OVS_KEY_ATTR_TUN_ID;
}
+ if (present_attrs & (UINT64_C(1) << OVS_KEY_ATTR_IPV4_TUNNEL)) {
+ const struct ovs_key_ipv4_tunnel *ipv4_tun_key;
+
+ ipv4_tun_key = nl_attr_get(attrs[OVS_KEY_ATTR_IPV4_TUNNEL]);
+
+ flow->tunnel.tun_id = ipv4_tun_key->tun_id;
+ flow->tunnel.ip_src = ipv4_tun_key->ipv4_src;
+ flow->tunnel.ip_dst = ipv4_tun_key->ipv4_dst;
+ flow->tunnel.flags = odp_to_flow_flags(ipv4_tun_key->tun_flags);
+ flow->tunnel.ip_tos = ipv4_tun_key->ipv4_tos;
+ flow->tunnel.ip_ttl = ipv4_tun_key->ipv4_ttl;
+
+ /* Allow this to show up as unexpected, if there are unknown flags,
+ * eventually resulting in ODP_FIT_TOO_MUCH.
+ * OVS_TNL_F_KNOWN_MASK defined locally above. */
+ if (!(ipv4_tun_key->tun_flags & ~OVS_TNL_F_KNOWN_MASK)) {
+ expected_attrs |= UINT64_C(1) << OVS_KEY_ATTR_IPV4_TUNNEL;
+ }
+ }
+
if (present_attrs & (UINT64_C(1) << OVS_KEY_ATTR_IN_PORT)) {
flow->in_port = nl_attr_get_u32(attrs[OVS_KEY_ATTR_IN_PORT]);
expected_attrs |= UINT64_C(1) << OVS_KEY_ATTR_IN_PORT;
}
static void
-commit_set_tun_id_action(const struct flow *flow, struct flow *base,
+commit_set_tunnel_action(const struct flow *flow, struct flow *base,
struct ofpbuf *odp_actions)
{
- if (base->tunnel.tun_id == flow->tunnel.tun_id) {
+ if (!memcmp(&base->tunnel, &flow->tunnel, sizeof base->tunnel)) {
return;
}
- base->tunnel.tun_id = flow->tunnel.tun_id;
+ memcpy(&base->tunnel, &flow->tunnel, sizeof base->tunnel);
- commit_set_action(odp_actions, OVS_KEY_ATTR_TUN_ID,
- &base->tunnel.tun_id, sizeof(base->tunnel.tun_id));
+ /* A valid IPV4_TUNNEL must have non-zero ip_dst. */
+ if (flow->tunnel.ip_dst) {
+ struct ovs_key_ipv4_tunnel ipv4_tun_key;
+
+ ipv4_tun_key.tun_id = base->tunnel.tun_id;
+ ipv4_tun_key.tun_flags = flow_to_odp_flags(base->tunnel.flags);
+ ipv4_tun_key.ipv4_src = base->tunnel.ip_src;
+ ipv4_tun_key.ipv4_dst = base->tunnel.ip_dst;
+ ipv4_tun_key.ipv4_tos = base->tunnel.ip_tos;
+ ipv4_tun_key.ipv4_ttl = base->tunnel.ip_ttl;
+ memset(&ipv4_tun_key.pad, 0, sizeof ipv4_tun_key.pad);
+
+ commit_set_action(odp_actions, OVS_KEY_ATTR_IPV4_TUNNEL,
+ &ipv4_tun_key, sizeof ipv4_tun_key);
+ } else {
+ commit_set_action(odp_actions, OVS_KEY_ATTR_TUN_ID,
+ &base->tunnel.tun_id, sizeof base->tunnel.tun_id);
+ }
}
static void
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_tunnel_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);
git://git.onelab.eu / sliver-openvswitch.git / blobdiff