hv_netvsc: Some fixes for the select_queue
Haiyang Zhang
maintainercover hv_netvsc: Some fixes for the select_queue
This patch set includes two fixes for the select_queue process.
Haiyang Zhang (2):
hv_netvsc: Remove "unlikely" from netvsc_select_queue
hv_netvsc: Fix the queue_mapping in netvsc_vf_xmit()
drivers/net/hyperv/netvsc_drv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Signature · 1 line
2.25.1
Haiyang Zhang
maintainerPATCH 1/2 hv_netvsc: Remove "unlikely" from netvsc_select_queue
When using vf_ops->ndo_select_queue, the number of queues of VF is usually bigger than the synthetic NIC. This condition may happen often.
Remove "unlikely" from the comparison of ndev->real_num_tx_queues.
--- drivers/net/hyperv/netvsc_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/hyperv/netvsc_drv.c +1 -1
@@ -367,7 +367,7 @@ static u16 netvsc_select_queue(struct net_device *ndev, struct sk_buff *skb, }rcu_read_unlock (); -while (unlikely (txq >= ndev->real_num_tx_queues)) +while (txq >= ndev->real_num_tx_queues) txq -= ndev->real_num_tx_queues;return txq;
Signature · 1 line
2.25.1
Haiyang Zhang
maintainerPATCH 2/2 hv_netvsc: Fix the queue_mapping in netvsc_vf_xmit()
In reply to Haiyang Zhangnetvsc_vf_xmit() / dev_queue_xmit() will call VF NIC’s ndo_select_queue or netdev_pick_tx() again. They will use skb_get_rx_queue() to get the queue number, so the “skb->queue_mapping - 1” will be used. This may cause the last queue of VF not been used.
Use skb_record_rx_queue() here, so that the skb_get_rx_queue() called later will get the correct queue number, and VF will be able to use all queues.
--- drivers/net/hyperv/netvsc_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/hyperv/netvsc_drv.c +1 -1
@@ -502,7 +502,7 @@ static int netvsc_vf_xmit(struct net_device *net, struct net_device *vf_netdev,int rc; skb->dev = vf_netdev; - skb->queue_mapping =qdisc_skb_cb (skb)->slave_dev_queue_mapping; +skb_record_rx_queue (skb,qdisc_skb_cb (skb)->slave_dev_queue_mapping); rc =dev_queue_xmit (skb);if (likely (rc ==NET_XMIT_SUCCESS || rc ==NET_XMIT_CN )) {
Signature · 1 line
2.25.1
David Miller
maintainerFrom: Haiyang Zhang <[email protected]>
Date: Thu, 20 Aug 2020 14:53:13 -0700
Quoted 1 line
This patch set includes two fixes for the
select_queueprocess.
Series applied, thank you.