netvsc: RSS related patches
cover netvsc: RSS related patches
Address a couple of issues related to recording RSS hash value in skb. These were found by reviewing RSS support.
Stephen Hemminger (2):
hv_netvsc: flag software created hash value
hv_netvsc: record hardware hash in skb
drivers/net/hyperv/hyperv_net.h | 1 + drivers/net/hyperv/netvsc_drv.c | 11 +++++++---- drivers/net/hyperv/rndis_filter.c | 8 +++++++- 3 files changed, 15 insertions(+), 5 deletions(-)
Signature · 1 line
2.20.1
PATCH 1/2 hv_netvsc: flag software created hash value
From: Stephen Hemminger <[email protected]>
When the driver needs to create a hash value because it was not done at higher level, then the hash should be marked as a software not hardware hash.
--- drivers/net/hyperv/netvsc_drv.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/net/hyperv/netvsc_drv.c +3 -4
@@ -285,9 +285,9 @@ static inline u32 netvsc_get_hash(else if (flow.basic.n_proto ==htons (ETH_P_IPV6 )) hash =jhash2 ((u32 *)&flow.addrs.v6addrs,8 , hashrnd);else - hash =0 ; +return 0 ; -skb_set_hash (skb, hash,PKT_HASH_TYPE_L3 ); +__skb_set_sw_hash (skb, hash, false); }return hash;
@@ -795,8 +795,7 @@ static struct sk_buff *netvsc_alloc_recv_skb(struct net_device *net, skb->protocol == htons(ETH_P_IP))netvsc_comp_ipcsum (skb); -/* Do L4 checksum offload if enabled and present. -*/ +/* Do L4 checksum offload if enabled and present. */ if (csum_info && (net->features &NETIF_F_RXCSUM )) {if (csum_info->receive.tcp_checksum_succeeded || csum_info->receive.udp_checksum_succeeded)
Signature · 1 line
2.20.1
PATCH 2/2 hv_netvsc: record hardware hash in skb
In reply to Stephen HemmingerFrom: Stephen Hemminger <[email protected]>
Since RSS hash is available from the host, record it in the skb.
--- drivers/net/hyperv/hyperv_net.h | 1 + drivers/net/hyperv/netvsc_drv.c | 4 ++++ drivers/net/hyperv/rndis_filter.c | 8 +++++++- 3 files changed, 12 insertions(+), 1 deletion(-)
drivers/net/hyperv/hyperv_net.h +1 -0
@@ -853,6 +853,7 @@ struct multi_recv_comp {struct nvsc_rsc {const struct ndis_pkt_8021q_info *vlan;const struct ndis_tcp_ip_checksum_info *csum_info; +const u32 *hash_info;u8 is_last;/* last RNDIS msg in a vmtransfer_page */ u32 cnt;/* #fragments in an RSC packet */ u32 pktlen;/* Full packet length */
drivers/net/hyperv/netvsc_drv.c +4 -0
@@ -766,6 +766,7 @@ static struct sk_buff *netvsc_alloc_recv_skb(struct net_device *net,const struct ndis_pkt_8021q_info *vlan = nvchan->rsc.vlan;const struct ndis_tcp_ip_checksum_info *csum_info = nvchan->rsc.csum_info; +const u32 *hash_info = nvchan->rsc.hash_info;struct sk_buff *skb;int i;
@@ -802,6 +803,9 @@ static struct sk_buff *netvsc_alloc_recv_skb(struct net_device *net, skb->ip_summed =CHECKSUM_UNNECESSARY ; } +if (hash_info) +skb_set_hash (skb, *hash_info,PKT_HASH_TYPE_L4 ); +if (vlan) {u16 vlan_tci = vlan->vlanid | (vlan->pri <<VLAN_PRIO_SHIFT ) | (vlan->cfi ?VLAN_CFI_MASK :0 );
drivers/net/hyperv/rndis_filter.c +7 -1
@@ -358,6 +358,7 @@ static inlinevoid rsc_add_data (struct netvsc_channel *nvchan,const struct ndis_pkt_8021q_info *vlan,const struct ndis_tcp_ip_checksum_info *csum_info, +const u32 *hash_info,void *data,u32 len) {u32 cnt = nvchan->rsc.cnt;
@@ -368,6 +369,7 @@ void rsc_add_data(struct netvsc_channel *nvchan, nvchan->rsc.vlan = vlan; nvchan->rsc.csum_info = csum_info; nvchan->rsc.pktlen = len; + nvchan->rsc.hash_info = hash_info; } nvchan->rsc.data[cnt] = data;
@@ -385,6 +387,7 @@ static int rndis_filter_receive_data(struct net_device *ndev,const struct ndis_tcp_ip_checksum_info *csum_info;const struct ndis_pkt_8021q_info *vlan;const struct rndis_pktinfo_id *pktinfo_id; +const u32 *hash_info;u32 data_offset;void *data;bool rsc_more = false;
@@ -411,6 +414,8 @@ static int rndis_filter_receive_data(struct net_device *ndev, csum_info =rndis_get_ppi (rndis_pkt,TCPIP_CHKSUM_PKTINFO ,0 ); + hash_info =rndis_get_ppi (rndis_pkt,NBL_HASH_VALUE ,0 ); + pktinfo_id =rndis_get_ppi (rndis_pkt,RNDIS_PKTINFO_ID ,1 ); data = (void *)msg + data_offset;
@@ -441,7 +446,8 @@ static int rndis_filter_receive_data(struct net_device *ndev,* rndis_pkt->data_len tell us the real data length, we only copy * the data packet to the stack, without the rndis trailer padding */ -rsc_add_data (nvchan, vlan, csum_info, data, rndis_pkt->data_len); +rsc_add_data (nvchan, vlan, csum_info, hash_info, + data, rndis_pkt->data_len);if (rsc_more)return NVSP_STAT_SUCCESS ;
Signature · 1 line
2.20.1
Re: [PATCH net-next 2/2] hv_netvsc: record hardware hash in skb
Quoted 5 lines · Stephen Hemminger
From: Stephen Hemminger <[email protected]>
Since RSS hash is available from the host, record it in the skb.
Note that drivers are supposed to do this only if (dev->features & NETIF_F_RXHASH) is true...
David Miller
maintainerFrom: Stephen Hemminger <[email protected]>
Date: Fri, 1 Nov 2019 16:42:36 -0700
Quoted 2 lines
Address a couple of issues related to recording RSS hash value in skb. These were found by reviewing RSS support.
Series applied.