Commit 1e60cebf authored by zhang kai's avatar zhang kai Committed by David S. Miller
Browse files

net: let flow have same hash in two directions 



using same source and destination ip/port for flow hash calculation
within the two directions.

Signed-off-by: default avatarzhang kai <zhangkaiheb@126.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5e7b30d2

net/core/flow_dissector.c

+9 −9
Original line number Diff line number Diff line
@@ -1504,7 +1504,7 @@ __be32 flow_get_u32_dst(const struct flow_keys *flow) 
}

EXPORT_SYMBOL(flow_get_u32_dst);



/* Sort the source and destination IP (and the ports if the IP are the same),

/* Sort the source and destination IP and the ports,

 * to have consistent hash within the two directions

 */

static inline void __flow_hash_consistentify(struct flow_keys *keys)
@@ -1515,11 +1515,11 @@ static inline void __flow_hash_consistentify(struct flow_keys *keys) 
	case FLOW_DISSECTOR_KEY_IPV4_ADDRS:

		addr_diff = (__force u32)keys->addrs.v4addrs.dst -

			    (__force u32)keys->addrs.v4addrs.src;

		if ((addr_diff < 0) ||

		    (addr_diff == 0 &&

		     ((__force u16)keys->ports.dst <

		      (__force u16)keys->ports.src))) {

		if (addr_diff < 0)

			swap(keys->addrs.v4addrs.src, keys->addrs.v4addrs.dst);



		if ((__force u16)keys->ports.dst <

		    (__force u16)keys->ports.src) {

			swap(keys->ports.src, keys->ports.dst);

		}

		break;
@@ -1527,13 +1527,13 @@ static inline void __flow_hash_consistentify(struct flow_keys *keys) 
		addr_diff = memcmp(&keys->addrs.v6addrs.dst,

				   &keys->addrs.v6addrs.src,

				   sizeof(keys->addrs.v6addrs.dst));

		if ((addr_diff < 0) ||

		    (addr_diff == 0 &&

		     ((__force u16)keys->ports.dst <

		      (__force u16)keys->ports.src))) {

		if (addr_diff < 0) {

			for (i = 0; i < 4; i++)

				swap(keys->addrs.v6addrs.src.s6_addr32[i],

				     keys->addrs.v6addrs.dst.s6_addr32[i]);

		}

		if ((__force u16)keys->ports.dst <

		    (__force u16)keys->ports.src) {

			swap(keys->ports.src, keys->ports.dst);

		}

		break;