Skip to content

net: Strengthen TX and RX hashes

Tom Herbert netdev 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest6 patches 11 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/6net: initialize sk_txhash using random valueinclude/net/ip.h include/net/ipv6.h include/net/sock.h +4 more+12 -330 replies
2/6flow_dissector: Include ip_proto in hash computationnet/core/flow_dissector.c+3 -10 replies
3/6flow_dissector: Add hash_extra field to flow_keys structinclude/net/flow_keys.h include/net/sch_generic.h net/core/flow_dissector.c+3 -211 replies
4/6flow_dissector: Include VLAN ID in hash computationnet/core/flow_dissector.c+1 -00 replies
5/6flow_dissector: Include GRE keyid in hash computationnet/core/flow_dissector.c+14 -10 replies
6/6flow_dissector: Include MPLS entropy label in hash computationinclude/uapi/linux/in.h include/uapi/linux/mpls.h net/core/flow_dissector.c+29 -00 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.

Read the v1 thread

Cover letter [PATCH net-next 0/6] net: Strengthen TX and RX hashes

Both the TX and RX hashes associated with skb->hash are mostly 4-tuple hashes. This is potentially problematic. For instance one could concieve of a DOS attack against a TCP connection using UDP with same 4-tuple. Most switches already use at least a 5-tuple hash, NICs probably should also (for instance Toeplitz hash for UDP could include UDP protocol number). This patch set implements 5-tuple hashes in the stack.

For transmit, we simply initialize sk_hash to a random value instead of performing any actual hash computation. A random value should provide full 32-bits of entropy and ensure that connected sockets have a different hash value regardless of protocol, 4-tuple, network namespace, etc. sock_init_txhash was created to provide this. This also can be called for any family not just IP.

For receive, we add a new field in flow_keys called hash_extra. When doing the jhash this value is XORed into the destination address field. In flow_dissector, the IP protocol is placed in this field so that we get a 5-tuple hash.

Also, in flow_dissector, we add support for including VLAN ID and GRE keyid in the hash (via hash_extra). We implement support for extracting a hash from MPLS entropy labels (RFC 6790).

Tom Herbert (6):
net: initialize sk_txhash using random value
flow_dissector: Include ip_proto in hash computation
flow_dissector: Add hash_extra field to flow_keys struct
flow_dissector: Include VLAN ID in hash computation
flow_dissector: Include GRE keyid in hash computation
flow_dissector: Include MPLS entropy label in hash computation

 include/net/flow_keys.h   |  1 +
 include/net/ip.h          | 13 -------------
 include/net/ipv6.h        | 14 --------------
 include/net/sch_generic.h |  2 +-
 include/net/sock.h        |  6 ++++++
 include/uapi/linux/in.h   |  2 ++
 include/uapi/linux/mpls.h |  3 +++
 net/core/flow_dissector.c | 44 ++++++++++++++++++++++++++++++++++++++++++--
 net/ipv4/datagram.c       |  2 +-
 net/ipv4/tcp_ipv4.c       |  4 ++--
 net/ipv6/datagram.c       |  2 +-
 net/ipv6/tcp_ipv6.c       |  4 ++--
 12 files changed, 61 insertions(+), 36 deletions(-)
Signature · 1 line
2.2.0.rc0.207.ga3a616c