@@ -15,6 +15,12 @@
* All the members, except thoff, are in network byte order.
*/
struct flow_keys {
+ u16 thoff;
+#define FLOW_KEYS_HASH_START_FIELD n_proto
+ __be16 n_proto;
+ u8 ip_proto;
+ u8 padding;
+
/* (src,dst) must be grouped, in the same way than in IP header */
__be32 src;
__be32 dst;
@@ -22,11 +28,11 @@ struct flow_keys {
__be32 ports;
__be16 port16[2];
};
- u16 thoff;
- __be16 n_proto;
- u8 ip_proto;
};
+#define FLOW_KEYS_HASH_OFFSET \
+ offsetof(struct flow_keys, FLOW_KEYS_HASH_START_FIELD)
+
bool __skb_flow_dissect(const struct sk_buff *skb, struct flow_keys *flow,
void *data, __be16 proto, int nhoff, int hlen);
static inline bool skb_flow_dissect(const struct sk_buff *skb, struct flow_keys *flow)
@@ -267,9 +267,19 @@ static __always_inline void __flow_hash_secret_init(void)
net_get_random_once(&hashrnd, sizeof(hashrnd));
}
-static __always_inline u32 __flow_hash_3words(u32 a, u32 b, u32 c, u32 keyval)
+static __always_inline u32 __flow_hash_words(u32 *words, u32 length, u32 keyval)
{
- return jhash_3words(a, b, c, keyval);
+ return jhash2(words, length, keyval);
+}
+
+static inline void *flow_keys_hash_start(struct flow_keys *flow)
+{
+ return (void *)flow + FLOW_KEYS_HASH_OFFSET;
+}
+
+static inline size_t flow_keys_hash_length(struct flow_keys *flow)
+{
+ return (sizeof(*flow) - FLOW_KEYS_HASH_OFFSET) / sizeof(u32);
}
static inline u32 __flow_hash_from_keys(struct flow_keys *keys, u32 keyval)
@@ -284,10 +294,8 @@ static inline u32 __flow_hash_from_keys(struct flow_keys *keys, u32 keyval)
swap(keys->port16[0], keys->port16[1]);
}
- hash = __flow_hash_3words((__force u32)keys->dst,
- (__force u32)keys->src,
- (__force u32)keys->ports,
- keyval);
+ hash = __flow_hash_words((u32 *)flow_keys_hash_start(keys),
+ flow_keys_hash_length(keys), keyval);
if (!hash)
hash = 1;
This patch changes flow hashing to use jhash2 over the flow_keys structure instead just doing jhash_3words over src, dst, and ports. This method will allow us take more input into the hashing function so that we can include full IPv6 addresses, VLAN, flow labels etc. without needing to resort to xor'ing which makes for a poor hash. Signed-off-by: Tom Herbert <tom@herbertland.com> --- include/net/flow_keys.h | 12 +++++++++--- net/core/flow_dissector.c | 20 ++++++++++++++------ 2 files changed, 23 insertions(+), 9 deletions(-)