hv_netvsc: Add ethtool handler to set and get TCP hash levels

The patch supports the options to switch TCP hash level between
L3 and L4 by ethtool command. TCP over IPv4 and v6 can be set
differently. The default hash level is L4. We currently only
allow switching TX hash level from within the guests.

For example, for TCP over IPv4 on eth0:
To include TCP port numbers in hashing:
	ethtool -N eth0 rx-flow-hash tcp4 sdfn
To exclude TCP port numbers in hashing:
	ethtool -N eth0 rx-flow-hash tcp4 sd
To show TCP hash level:
	ethtool -n eth0 rx-flow-hash tcp4

Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c
index 9bc7dbab9506e1bc23110cb45e5275b26741f212..44746de3dd4ca3238f1572fcdace0891b31d2264 100644 (file)
--- a/drivers/net/hyperv/netvsc_drv.c
+++ b/drivers/net/hyperv/netvsc_drv.c
@@ -1264,8 +1264,15 @@ netvsc_get_rss_hash_opts(struct net_device_context *ndc,
 
        switch (info->flow_type) {
        case TCP_V4_FLOW:
+               if (ndc->l4_hash & HV_TCP4_L4HASH)
+                       info->data |= l4_flag;
+
+               break;
+
        case TCP_V6_FLOW:
-               info->data |= l4_flag;
+               if (ndc->l4_hash & HV_TCP6_L4HASH)
+                       info->data |= l4_flag;
+
                break;
 
        case UDP_V4_FLOW:
@@ -1318,6 +1325,14 @@ static int netvsc_set_rss_hash_opts(struct net_device_context *ndc,
        if (info->data == (RXH_IP_SRC | RXH_IP_DST |
                           RXH_L4_B_0_1 | RXH_L4_B_2_3)) {
                switch (info->flow_type) {
+               case TCP_V4_FLOW:
+                       ndc->l4_hash |= HV_TCP4_L4HASH;
+                       break;
+
+               case TCP_V6_FLOW:
+                       ndc->l4_hash |= HV_TCP6_L4HASH;
+                       break;
+
                case UDP_V4_FLOW:
                        ndc->l4_hash |= HV_UDP4_L4HASH;
                        break;
@@ -1335,6 +1350,14 @@ static int netvsc_set_rss_hash_opts(struct net_device_context *ndc,
 
        if (info->data == (RXH_IP_SRC | RXH_IP_DST)) {
                switch (info->flow_type) {
+               case TCP_V4_FLOW:
+                       ndc->l4_hash &= ~HV_TCP4_L4HASH;
+                       break;
+
+               case TCP_V6_FLOW:
+                       ndc->l4_hash &= ~HV_TCP6_L4HASH;
+                       break;
+
                case UDP_V4_FLOW:
                        ndc->l4_hash &= ~HV_UDP4_L4HASH;
                        break;