Commit 9f249089 authored by Tom Herbert's avatar Tom Herbert Committed by David S. Miller

net: Add keys for TIPC address

Add a new flow key for TIPC addresses.
Signed-off-by: default avatarTom Herbert <tom@herbertland.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c3f83241
...@@ -49,6 +49,14 @@ struct flow_dissector_key_ipv6_addrs { ...@@ -49,6 +49,14 @@ struct flow_dissector_key_ipv6_addrs {
struct in6_addr dst; struct in6_addr dst;
}; };
/**
* struct flow_dissector_key_tipc_addrs:
* @srcnode: source node address
*/
struct flow_dissector_key_tipc_addrs {
__be32 srcnode;
};
/** /**
* struct flow_dissector_key_addrs: * struct flow_dissector_key_addrs:
* @v4addrs: IPv4 addresses * @v4addrs: IPv4 addresses
...@@ -58,6 +66,7 @@ struct flow_dissector_key_addrs { ...@@ -58,6 +66,7 @@ struct flow_dissector_key_addrs {
union { union {
struct flow_dissector_key_ipv4_addrs v4addrs; struct flow_dissector_key_ipv4_addrs v4addrs;
struct flow_dissector_key_ipv6_addrs v6addrs; struct flow_dissector_key_ipv6_addrs v6addrs;
struct flow_dissector_key_tipc_addrs tipcaddrs;
}; };
}; };
...@@ -97,6 +106,7 @@ enum flow_dissector_key_id { ...@@ -97,6 +106,7 @@ enum flow_dissector_key_id {
FLOW_DISSECTOR_KEY_IPV6_HASH_ADDRS, /* struct flow_dissector_key_addrs */ FLOW_DISSECTOR_KEY_IPV6_HASH_ADDRS, /* struct flow_dissector_key_addrs */
FLOW_DISSECTOR_KEY_PORTS, /* struct flow_dissector_key_ports */ FLOW_DISSECTOR_KEY_PORTS, /* struct flow_dissector_key_ports */
FLOW_DISSECTOR_KEY_ETH_ADDRS, /* struct flow_dissector_key_eth_addrs */ FLOW_DISSECTOR_KEY_ETH_ADDRS, /* struct flow_dissector_key_eth_addrs */
FLOW_DISSECTOR_KEY_TIPC_ADDRS, /* struct flow_dissector_key_tipc_addrs */
FLOW_DISSECTOR_KEY_MAX, FLOW_DISSECTOR_KEY_MAX,
}; };
......
...@@ -294,13 +294,12 @@ bool __skb_flow_dissect(const struct sk_buff *skb, ...@@ -294,13 +294,12 @@ bool __skb_flow_dissect(const struct sk_buff *skb,
key_control->thoff = (u16)nhoff; key_control->thoff = (u16)nhoff;
if (skb_flow_dissector_uses_key(flow_dissector, if (skb_flow_dissector_uses_key(flow_dissector,
FLOW_DISSECTOR_KEY_IPV6_HASH_ADDRS)) { FLOW_DISSECTOR_KEY_TIPC_ADDRS)) {
key_addrs = skb_flow_dissector_target(flow_dissector, key_addrs = skb_flow_dissector_target(flow_dissector,
FLOW_DISSECTOR_KEY_IPV6_HASH_ADDRS, FLOW_DISSECTOR_KEY_TIPC_ADDRS,
target_container); target_container);
key_addrs->v4addrs.src = hdr->srcnode; key_addrs->tipcaddrs.srcnode = hdr->srcnode;
key_addrs->v4addrs.dst = 0; key_control->addr_type = FLOW_DISSECTOR_KEY_TIPC_ADDRS;
key_control->addr_type = FLOW_DISSECTOR_KEY_IPV4_ADDRS;
} }
return true; return true;
} }
...@@ -408,6 +407,9 @@ static inline size_t flow_keys_hash_length(struct flow_keys *flow) ...@@ -408,6 +407,9 @@ static inline size_t flow_keys_hash_length(struct flow_keys *flow)
case FLOW_DISSECTOR_KEY_IPV6_ADDRS: case FLOW_DISSECTOR_KEY_IPV6_ADDRS:
diff -= sizeof(flow->addrs.v6addrs); diff -= sizeof(flow->addrs.v6addrs);
break; break;
case FLOW_DISSECTOR_KEY_TIPC_ADDRS:
diff -= sizeof(flow->addrs.tipcaddrs);
break;
} }
return (sizeof(*flow) - diff) / sizeof(u32); return (sizeof(*flow) - diff) / sizeof(u32);
} }
...@@ -420,6 +422,8 @@ __be32 flow_get_u32_src(const struct flow_keys *flow) ...@@ -420,6 +422,8 @@ __be32 flow_get_u32_src(const struct flow_keys *flow)
case FLOW_DISSECTOR_KEY_IPV6_ADDRS: case FLOW_DISSECTOR_KEY_IPV6_ADDRS:
return (__force __be32)ipv6_addr_hash( return (__force __be32)ipv6_addr_hash(
&flow->addrs.v6addrs.src); &flow->addrs.v6addrs.src);
case FLOW_DISSECTOR_KEY_TIPC_ADDRS:
return flow->addrs.tipcaddrs.srcnode;
default: default:
return 0; return 0;
} }
...@@ -650,6 +654,10 @@ static const struct flow_dissector_key flow_keys_dissector_keys[] = { ...@@ -650,6 +654,10 @@ static const struct flow_dissector_key flow_keys_dissector_keys[] = {
.key_id = FLOW_DISSECTOR_KEY_IPV6_HASH_ADDRS, .key_id = FLOW_DISSECTOR_KEY_IPV6_HASH_ADDRS,
.offset = offsetof(struct flow_keys, addrs.v4addrs), .offset = offsetof(struct flow_keys, addrs.v4addrs),
}, },
{
.key_id = FLOW_DISSECTOR_KEY_TIPC_ADDRS,
.offset = offsetof(struct flow_keys, addrs.tipcaddrs),
},
{ {
.key_id = FLOW_DISSECTOR_KEY_PORTS, .key_id = FLOW_DISSECTOR_KEY_PORTS,
.offset = offsetof(struct flow_keys, ports), .offset = offsetof(struct flow_keys, ports),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment