History

net: remove 'fallback' argument from dev->ndo_select_queue()

After the previous patch, all the callers of ndo_select_queue() provide as a 'fallback' argument netdev_pick_tx. The only exceptions are nested calls to ndo_select_queue(), which pass down the 'fallback' available in the current scope - still netdev_pick_tx. We can drop such argument and replace fallback() invocation with netdev_pick_tx(). This avoids an indirect call per xmit packet in some scenarios (TCP syn, UDP unconnected, XDP generic, pktgen) with device drivers implementing such ndo. It also clean the code a bit. Tested with ixgbe and CONFIG_FCOE=m With pktgen using queue xmit: threads vanilla patched (kpps) (kpps) 1 2334 2428 2 4166 4278 4 7895 8100 v1 -> v2: - rebased after helper's name change

Paolo Abeni committed 7 years ago

Commit a350ecc1 parent b71b58332 files · +57 −97Browse files

Unified · Split

32 files
  1. drivers/infiniband/hw/hfi1/vnic_main.c +1 −2
  2. drivers/infiniband/ulp/opa_vnic/opa_vnic_netdev.c +2 −4
  3. drivers/net/bonding/bond_main.c +1 −2
  4. drivers/net/ethernet/amazon/ena/ena_netdev.c +2 −3
  5. drivers/net/ethernet/broadcom/bcmsysport.c +3 −4
  6. drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c +2 −3
  7. drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h +1 −2
  8. drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +2 −3
  9. drivers/net/ethernet/hisilicon/hns/hns_enet.c +2 −3
  10. drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +2 −3
  11. drivers/net/ethernet/mellanox/mlx4/en_tx.c +3 −4
  12. drivers/net/ethernet/mellanox/mlx4/mlx4_en.h +1 −2
  13. drivers/net/ethernet/mellanox/mlx5/core/en.h +1 −2
  14. drivers/net/ethernet/mellanox/mlx5/core/en_tx.c +2 −3
  15. drivers/net/ethernet/qlogic/qede/qede.h +1 −2
  16. drivers/net/ethernet/qlogic/qede/qede_fp.c +2 −3
  17. drivers/net/ethernet/renesas/ravb_main.c +1 −2
  18. drivers/net/ethernet/sun/ldmvsw.c +1 −2
  19. drivers/net/ethernet/sun/sunvnet.c +1 −2
  20. drivers/net/hyperv/netvsc_drv.c +4 −6
  21. drivers/net/net_failover.c +3 −5
  22. drivers/net/team/team.c +1 −2
  23. drivers/net/tun.c +1 −2
  24. drivers/net/wireless/marvell/mwifiex/main.c +1 −2
  25. drivers/net/xen-netback/interface.c +3 −3
  26. drivers/net/xen-netfront.c +1 −2
  27. drivers/staging/rtl8188eu/os_dep/os_intfs.c +1 −2
  28. drivers/staging/rtl8723bs/os_dep/os_intfs.c +1 −2
  29. include/linux/netdevice.h +4 −8
  30. net/core/dev.c +3 −6
  31. net/mac80211/iface.c +2 −4
  32. net/packet/af_packet.c +1 −2
drivers/infiniband/hw/hfi1/vnic_main.c+1−2
@@ -423,8 +423,7 @@ tx_finish: · 422 unmodified lines
423423
424424 static u16 hfi1_vnic_select_queue(struct net_device *netdev,
425425 struct sk_buff *skb,
426− struct net_device *sb_dev,
427− select_queue_fallback_t fallback)
426+ struct net_device *sb_dev)
428427 {
429428 struct hfi1_vnic_vport_info *vinfo = opa_vnic_dev_priv(netdev);
430429 struct opa_vnic_skb_mdata *mdata;
drivers/infiniband/ulp/opa_vnic/opa_vnic_netdev.c+2−4
@@ -95,8 +95,7 @@ static netdev_tx_t opa_netdev_start_xmit(struct sk_buff *skb, · 94 unmodified lines
9595 }
9696
9797 static u16 opa_vnic_select_queue(struct net_device *netdev, struct sk_buff *skb,
98− struct net_device *sb_dev,
99− select_queue_fallback_t fallback)
98+ struct net_device *sb_dev)
10099 {
101100 struct opa_vnic_adapter *adapter = opa_vnic_priv(netdev);
102101 struct opa_vnic_skb_mdata *mdata;
@@ -106,8 +105,7 @@ static u16 opa_vnic_select_queue(struct net_device *netdev, struct sk_buff *skb, · 3 unmodified lines
106105 mdata = skb_push(skb, sizeof(*mdata));
107106 mdata->entropy = opa_vnic_calc_entropy(skb);
108107 mdata->vl = opa_vnic_get_vl(adapter, skb);
109− rc = adapter->rn_ops->ndo_select_queue(netdev, skb,
110− sb_dev, fallback);
108+ rc = adapter->rn_ops->ndo_select_queue(netdev, skb, sb_dev);
111109 skb_pull(skb, sizeof(*mdata));
112110 return rc;
113111 }
drivers/net/bonding/bond_main.c+1−2
@@ -4114,8 +4114,7 @@ static inline int bond_slave_override(struct bonding *bond, · 4113 unmodified lines
41144114
41154115
41164116 static u16 bond_select_queue(struct net_device *dev, struct sk_buff *skb,
4117− struct net_device *sb_dev,
4118− select_queue_fallback_t fallback)
4117+ struct net_device *sb_dev)
41194118 {
41204119 /* This helper function exists to help dev_pick_tx get the correct
41214120 * destination queue. Using a helper function skips a call to
drivers/net/ethernet/amazon/ena/ena_netdev.c+2−3
@@ -2258,8 +2258,7 @@ error_drop_packet: · 2257 unmodified lines
22582258 }
22592259
22602260 static u16 ena_select_queue(struct net_device *dev, struct sk_buff *skb,
2261− struct net_device *sb_dev,
2262− select_queue_fallback_t fallback)
2261+ struct net_device *sb_dev)
22632262 {
22642263 u16 qid;
22652264 /* we suspect that this is good for in--kernel network services that
@@ -2269,7 +2268,7 @@ static u16 ena_select_queue(struct net_device *dev, struct sk_buff *skb, · 3 unmodified lines
22692268 if (skb_rx_queue_recorded(skb))
22702269 qid = skb_get_rx_queue(skb);
22712270 else
2272− qid = fallback(dev, skb, NULL);
2271+ qid = netdev_pick_tx(dev, skb, NULL);
22732272
22742273 return qid;
22752274 }
drivers/net/ethernet/broadcom/bcmsysport.c+3−4
@@ -2274,8 +2274,7 @@ static const struct ethtool_ops bcm_sysport_ethtool_ops = { · 2273 unmodified lines
22742274 };
22752275
22762276 static u16 bcm_sysport_select_queue(struct net_device *dev, struct sk_buff *skb,
2277− struct net_device *sb_dev,
2278− select_queue_fallback_t fallback)
2277+ struct net_device *sb_dev)
22792278 {
22802279 struct bcm_sysport_priv *priv = netdev_priv(dev);
22812280 u16 queue = skb_get_queue_mapping(skb);
@@ -2283,7 +2282,7 @@ static u16 bcm_sysport_select_queue(struct net_device *dev, struct sk_buff *skb, · 1 unmodified line
22832282 unsigned int q, port;
22842283
22852284 if (!netdev_uses_dsa(dev))
2286− return fallback(dev, skb, NULL);
2285+ return netdev_pick_tx(dev, skb, NULL);
22872286
22882287 /* DSA tagging layer will have configured the correct queue */
22892288 q = BRCM_TAG_GET_QUEUE(queue);
@@ -2291,7 +2290,7 @@ static u16 bcm_sysport_select_queue(struct net_device *dev, struct sk_buff *skb, · 1 unmodified line
22912290 tx_ring = priv->ring_map[q + port * priv->per_port_num_tx_queues];
22922291
22932292 if (unlikely(!tx_ring))
2294− return fallback(dev, skb, NULL);
2293+ return netdev_pick_tx(dev, skb, NULL);
22952294
22962295 return tx_ring->index;
22972296 }
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c+2−3
@@ -1909,8 +1909,7 @@ void bnx2x_netif_stop(struct bnx2x *bp, int disable_hw) · 1908 unmodified lines
19091909 }
19101910
19111911 u16 bnx2x_select_queue(struct net_device *dev, struct sk_buff *skb,
1912− struct net_device *sb_dev,
1913− select_queue_fallback_t fallback)
1912+ struct net_device *sb_dev)
19141913 {
19151914 struct bnx2x *bp = netdev_priv(dev);
19161915
@@ -1932,7 +1931,7 @@ u16 bnx2x_select_queue(struct net_device *dev, struct sk_buff *skb, · 15 unmodified lines
19321931 }
19331932
19341933 /* select a non-FCoE queue */
1935− return fallback(dev, skb, NULL) %
1934+ return netdev_pick_tx(dev, skb, NULL) %
19361935 (BNX2X_NUM_ETH_QUEUES(bp) * bp->max_cos);
19371936 }
19381937
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h+1−2
@@ -498,8 +498,7 @@ int bnx2x_set_vf_spoofchk(struct net_device *dev, int idx, bool val); · 497 unmodified lines
498498
499499 /* select_queue callback */
500500 u16 bnx2x_select_queue(struct net_device *dev, struct sk_buff *skb,
501− struct net_device *sb_dev,
502− select_queue_fallback_t fallback);
501+ struct net_device *sb_dev);
503502
504503 static inline void bnx2x_update_rx_prod(struct bnx2x *bp,
505504 struct bnx2x_fastpath *fp,
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c+2−3
@@ -979,8 +979,7 @@ freeout: · 978 unmodified lines
979979 }
980980
981981 static u16 cxgb_select_queue(struct net_device *dev, struct sk_buff *skb,
982− struct net_device *sb_dev,
983− select_queue_fallback_t fallback)
982+ struct net_device *sb_dev)
984983 {
985984 int txq;
986985
@@ -1022,7 +1021,7 @@ static u16 cxgb_select_queue(struct net_device *dev, struct sk_buff *skb, · 35 unmodified lines
10221021 return txq;
10231022 }
10241023
1025− return fallback(dev, skb, NULL) % dev->real_num_tx_queues;
1024+ return netdev_pick_tx(dev, skb, NULL) % dev->real_num_tx_queues;
10261025 }
10271026
10281027 static int closest_timer(const struct sge *s, int time)
drivers/net/ethernet/hisilicon/hns/hns_enet.c+2−3
@@ -1964,8 +1964,7 @@ static void hns_nic_get_stats64(struct net_device *ndev, · 1963 unmodified lines
19641964
19651965 static u16
19661966 hns_nic_select_queue(struct net_device *ndev, struct sk_buff *skb,
1967− struct net_device *sb_dev,
1968− select_queue_fallback_t fallback)
1967+ struct net_device *sb_dev)
19691968 {
19701969 struct ethhdr *eth_hdr = (struct ethhdr *)skb->data;
19711970 struct hns_nic_priv *priv = netdev_priv(ndev);
@@ -1975,7 +1974,7 @@ hns_nic_select_queue(struct net_device *ndev, struct sk_buff *skb, · 3 unmodified lines
19751974 is_multicast_ether_addr(eth_hdr->h_dest))
19761975 return 0;
19771976 else
1978− return fallback(ndev, skb, NULL);
1977+ return netdev_pick_tx(ndev, skb, NULL);
19791978 }
19801979
19811980 static const struct net_device_ops hns_nic_netdev_ops = {
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c+2−3
@@ -8483,8 +8483,7 @@ static void ixgbe_atr(struct ixgbe_ring *ring, · 8482 unmodified lines
84838483
84848484 #ifdef IXGBE_FCOE
84858485 static u16 ixgbe_select_queue(struct net_device *dev, struct sk_buff *skb,
8486− struct net_device *sb_dev,
8487− select_queue_fallback_t fallback)
8486+ struct net_device *sb_dev)
84888487 {
84898488 struct ixgbe_adapter *adapter;
84908489 struct ixgbe_ring_feature *f;
@@ -8514,7 +8513,7 @@ static u16 ixgbe_select_queue(struct net_device *dev, struct sk_buff *skb, · 23 unmodified lines
85148513 break;
85158514 /* fall through */
85168515 default:
8517− return fallback(dev, skb, sb_dev);
8516+ return netdev_pick_tx(dev, skb, sb_dev);
85188517 }
85198518
85208519 f = &adapter->ring_feature[RING_F_FCOE];
drivers/net/ethernet/mellanox/mlx4/en_tx.c+3−4
@@ -685,16 +685,15 @@ static void build_inline_wqe(struct mlx4_en_tx_desc *tx_desc, · 684 unmodified lines
685685 }
686686
687687 u16 mlx4_en_select_queue(struct net_device *dev, struct sk_buff *skb,
688− struct net_device *sb_dev,
689− select_queue_fallback_t fallback)
688+ struct net_device *sb_dev)
690689 {
691690 struct mlx4_en_priv *priv = netdev_priv(dev);
692691 u16 rings_p_up = priv->num_tx_rings_p_up;
693692
694693 if (netdev_get_num_tc(dev))
695− return fallback(dev, skb, NULL);
694+ return netdev_pick_tx(dev, skb, NULL);
696695
697− return fallback(dev, skb, NULL) % rings_p_up;
696+ return netdev_pick_tx(dev, skb, NULL) % rings_p_up;
698697 }
699698
700699 static void mlx4_bf_copy(void __iomem *dst, const void *src,
drivers/net/ethernet/mellanox/mlx4/mlx4_en.h+1−2
@@ -698,8 +698,7 @@ void mlx4_en_arm_cq(struct mlx4_en_priv *priv, struct mlx4_en_cq *cq); · 697 unmodified lines
698698
699699 void mlx4_en_tx_irq(struct mlx4_cq *mcq);
700700 u16 mlx4_en_select_queue(struct net_device *dev, struct sk_buff *skb,
701− struct net_device *sb_dev,
702− select_queue_fallback_t fallback);
701+ struct net_device *sb_dev);
703702 netdev_tx_t mlx4_en_xmit(struct sk_buff *skb, struct net_device *dev);
704703 netdev_tx_t mlx4_en_xmit_frame(struct mlx4_en_rx_ring *rx_ring,
705704 struct mlx4_en_rx_alloc *frame,
drivers/net/ethernet/mellanox/mlx5/core/en.h+1−2
@@ -769,8 +769,7 @@ struct mlx5e_profile { · 768 unmodified lines
769769 void mlx5e_build_ptys2ethtool_map(void);
770770
771771 u16 mlx5e_select_queue(struct net_device *dev, struct sk_buff *skb,
772− struct net_device *sb_dev,
773− select_queue_fallback_t fallback);
772+ struct net_device *sb_dev);
774773 netdev_tx_t mlx5e_xmit(struct sk_buff *skb, struct net_device *dev);
775774 netdev_tx_t mlx5e_sq_xmit(struct mlx5e_txqsq *sq, struct sk_buff *skb,
776775 struct mlx5e_tx_wqe *wqe, u16 pi);
drivers/net/ethernet/mellanox/mlx5/core/en_tx.c+2−3
@@ -110,11 +110,10 @@ static inline int mlx5e_get_dscp_up(struct mlx5e_priv *priv, struct sk_buff *skb · 109 unmodified lines
110110 #endif
111111
112112 u16 mlx5e_select_queue(struct net_device *dev, struct sk_buff *skb,
113− struct net_device *sb_dev,
114− select_queue_fallback_t fallback)
113+ struct net_device *sb_dev)
115114 {
115+ int channel_ix = netdev_pick_tx(dev, skb, NULL);
116116 struct mlx5e_priv *priv = netdev_priv(dev);
117− int channel_ix = fallback(dev, skb, NULL);
118117 u16 num_channels;
119118 int up = 0;
120119
drivers/net/ethernet/qlogic/qede/qede.h+1−2
@@ -498,8 +498,7 @@ struct qede_reload_args { · 497 unmodified lines
498498 /* Datapath functions definition */
499499 netdev_tx_t qede_start_xmit(struct sk_buff *skb, struct net_device *ndev);
500500 u16 qede_select_queue(struct net_device *dev, struct sk_buff *skb,
501− struct net_device *sb_dev,
502− select_queue_fallback_t fallback);
501+ struct net_device *sb_dev);
503502 netdev_features_t qede_features_check(struct sk_buff *skb,
504503 struct net_device *dev,
505504 netdev_features_t features);
drivers/net/ethernet/qlogic/qede/qede_fp.c+2−3
@@ -1696,8 +1696,7 @@ netdev_tx_t qede_start_xmit(struct sk_buff *skb, struct net_device *ndev) · 1695 unmodified lines
16961696 }
16971697
16981698 u16 qede_select_queue(struct net_device *dev, struct sk_buff *skb,
1699− struct net_device *sb_dev,
1700− select_queue_fallback_t fallback)
1699+ struct net_device *sb_dev)
17011700 {
17021701 struct qede_dev *edev = netdev_priv(dev);
17031702 int total_txq;
@@ -1705,7 +1704,7 @@ u16 qede_select_queue(struct net_device *dev, struct sk_buff *skb, · 1 unmodified line
17051704 total_txq = QEDE_TSS_COUNT(edev) * edev->dev_info.num_tc;
17061705
17071706 return QEDE_TSS_COUNT(edev) ?
1708− fallback(dev, skb, NULL) % total_txq : 0;
1707+ netdev_pick_tx(dev, skb, NULL) % total_txq : 0;
17091708 }
17101709
17111710 /* 8B udp header + 8B base tunnel header + 32B option length */
drivers/net/ethernet/renesas/ravb_main.c+1−2
@@ -1615,8 +1615,7 @@ drop: · 1614 unmodified lines
16151615 }
16161616
16171617 static u16 ravb_select_queue(struct net_device *ndev, struct sk_buff *skb,
1618− struct net_device *sb_dev,
1619− select_queue_fallback_t fallback)
1618+ struct net_device *sb_dev)
16201619 {
16211620 /* If skb needs TX timestamp, it is handled in network control queue */
16221621 return (skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP) ? RAVB_NC :
drivers/net/ethernet/sun/ldmvsw.c+1−2
@@ -101,8 +101,7 @@ static struct vnet_port *vsw_tx_port_find(struct sk_buff *skb, · 100 unmodified lines
101101 }
102102
103103 static u16 vsw_select_queue(struct net_device *dev, struct sk_buff *skb,
104− struct net_device *sb_dev,
105− select_queue_fallback_t fallback)
104+ struct net_device *sb_dev)
106105 {
107106 struct vnet_port *port = netdev_priv(dev);
108107
drivers/net/ethernet/sun/sunvnet.c+1−2
@@ -234,8 +234,7 @@ static struct vnet_port *vnet_tx_port_find(struct sk_buff *skb, · 233 unmodified lines
234234 }
235235
236236 static u16 vnet_select_queue(struct net_device *dev, struct sk_buff *skb,
237− struct net_device *sb_dev,
238− select_queue_fallback_t fallback)
237+ struct net_device *sb_dev)
239238 {
240239 struct vnet *vp = netdev_priv(dev);
241240 struct vnet_port *port = __tx_port_find(vp, skb);
drivers/net/hyperv/netvsc_drv.c+4−6
@@ -308,7 +308,7 @@ static inline int netvsc_get_tx_queue(struct net_device *ndev, · 307 unmodified lines
308308 * If a valid queue has already been assigned, then use that.
309309 * Otherwise compute tx queue based on hash and the send table.
310310 *
311− * This is basically similar to default (__netdev_pick_tx) with the added step
311+ * This is basically similar to default (netdev_pick_tx) with the added step
312312 * of using the host send_table when no other queue has been assigned.
313313 *
314314 * TODO support XPS - but get_xps_queue not exported
@@ -331,8 +331,7 @@ static u16 netvsc_pick_tx(struct net_device *ndev, struct sk_buff *skb) · 16 unmodified lines
331331 }
332332
333333 static u16 netvsc_select_queue(struct net_device *ndev, struct sk_buff *skb,
334− struct net_device *sb_dev,
335− select_queue_fallback_t fallback)
334+ struct net_device *sb_dev)
336335 {
337336 struct net_device_context *ndc = netdev_priv(ndev);
338337 struct net_device *vf_netdev;
@@ -344,10 +343,9 @@ static u16 netvsc_select_queue(struct net_device *ndev, struct sk_buff *skb, · 5 unmodified lines
344343 const struct net_device_ops *vf_ops = vf_netdev->netdev_ops;
345344
346345 if (vf_ops->ndo_select_queue)
347− txq = vf_ops->ndo_select_queue(vf_netdev, skb,
348− sb_dev, fallback);
346+ txq = vf_ops->ndo_select_queue(vf_netdev, skb, sb_dev);
349347 else
350− txq = fallback(vf_netdev, skb, NULL);
348+ txq = netdev_pick_tx(vf_netdev, skb, NULL);
351349
352350 /* Record the queue selected by VF so that it can be
353351 * used for common case where VF has more queues than
drivers/net/net_failover.c+3−5
@@ -115,8 +115,7 @@ static netdev_tx_t net_failover_start_xmit(struct sk_buff *skb, · 114 unmodified lines
115115
116116 static u16 net_failover_select_queue(struct net_device *dev,
117117 struct sk_buff *skb,
118− struct net_device *sb_dev,
119− select_queue_fallback_t fallback)
118+ struct net_device *sb_dev)
120119 {
121120 struct net_failover_info *nfo_info = netdev_priv(dev);
122121 struct net_device *primary_dev;
@@ -127,10 +126,9 @@ static u16 net_failover_select_queue(struct net_device *dev, · 4 unmodified lines
127126 const struct net_device_ops *ops = primary_dev->netdev_ops;
128127
129128 if (ops->ndo_select_queue)
130− txq = ops->ndo_select_queue(primary_dev, skb,
131− sb_dev, fallback);
129+ txq = ops->ndo_select_queue(primary_dev, skb, sb_dev);
132130 else
133− txq = fallback(primary_dev, skb, NULL);
131+ txq = netdev_pick_tx(primary_dev, skb, NULL);
134132
135133 qdisc_skb_cb(skb)->slave_dev_queue_mapping = skb->queue_mapping;
136134
drivers/net/team/team.c+1−2
@@ -1691,8 +1691,7 @@ static netdev_tx_t team_xmit(struct sk_buff *skb, struct net_device *dev) · 1690 unmodified lines
16911691 }
16921692
16931693 static u16 team_select_queue(struct net_device *dev, struct sk_buff *skb,
1694− struct net_device *sb_dev,
1695− select_queue_fallback_t fallback)
1694+ struct net_device *sb_dev)
16961695 {
16971696 /*
16981697 * This helper function exists to help dev_pick_tx get the correct
drivers/net/tun.c+1−2
@@ -606,8 +606,7 @@ static u16 tun_ebpf_select_queue(struct tun_struct *tun, struct sk_buff *skb) · 605 unmodified lines
606606 }
607607
608608 static u16 tun_select_queue(struct net_device *dev, struct sk_buff *skb,
609− struct net_device *sb_dev,
610− select_queue_fallback_t fallback)
609+ struct net_device *sb_dev)
611610 {
612611 struct tun_struct *tun = netdev_priv(dev);
613612 u16 ret;
drivers/net/wireless/marvell/mwifiex/main.c+1−2
@@ -1282,8 +1282,7 @@ static struct net_device_stats *mwifiex_get_stats(struct net_device *dev) · 1281 unmodified lines
12821282
12831283 static u16
12841284 mwifiex_netdev_select_wmm_queue(struct net_device *dev, struct sk_buff *skb,
1285− struct net_device *sb_dev,
1286− select_queue_fallback_t fallback)
1285+ struct net_device *sb_dev)
12871286 {
12881287 skb->priority = cfg80211_classify8021d(skb, NULL);
12891288 return mwifiex_1d_to_wmm_queue[skb->priority];
drivers/net/xen-netback/interface.c+3−3
@@ -148,8 +148,7 @@ void xenvif_wake_queue(struct xenvif_queue *queue) · 147 unmodified lines
148148 }
149149
150150 static u16 xenvif_select_queue(struct net_device *dev, struct sk_buff *skb,
151− struct net_device *sb_dev,
152− select_queue_fallback_t fallback)
151+ struct net_device *sb_dev)
153152 {
154153 struct xenvif *vif = netdev_priv(dev);
155154 unsigned int size = vif->hash.size;
@@ -162,7 +161,8 @@ static u16 xenvif_select_queue(struct net_device *dev, struct sk_buff *skb, · 6 unmodified lines
162161 return 0;
163162
164163 if (vif->hash.alg == XEN_NETIF_CTRL_HASH_ALGORITHM_NONE)
165− return fallback(dev, skb, NULL) % dev->real_num_tx_queues;
164+ return netdev_pick_tx(dev, skb, NULL) %
165+ dev->real_num_tx_queues;
166166
167167 xenvif_set_skb_hash(vif, skb);
168168
drivers/net/xen-netfront.c+1−2
@@ -543,8 +543,7 @@ static int xennet_count_skb_slots(struct sk_buff *skb) · 542 unmodified lines
543543 }
544544
545545 static u16 xennet_select_queue(struct net_device *dev, struct sk_buff *skb,
546− struct net_device *sb_dev,
547− select_queue_fallback_t fallback)
546+ struct net_device *sb_dev)
548547 {
549548 unsigned int num_queues = dev->real_num_tx_queues;
550549 u32 hash;
drivers/staging/rtl8188eu/os_dep/os_intfs.c+1−2
@@ -245,8 +245,7 @@ static unsigned int rtw_classify8021d(struct sk_buff *skb) · 244 unmodified lines
245245 }
246246
247247 static u16 rtw_select_queue(struct net_device *dev, struct sk_buff *skb,
248− struct net_device *sb_dev,
249− select_queue_fallback_t fallback)
248+ struct net_device *sb_dev)
250249 {
251250 struct adapter *padapter = rtw_netdev_priv(dev);
252251 struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
drivers/staging/rtl8723bs/os_dep/os_intfs.c+1−2
@@ -404,8 +404,7 @@ static unsigned int rtw_classify8021d(struct sk_buff *skb) · 403 unmodified lines
404404
405405
406406 static u16 rtw_select_queue(struct net_device *dev, struct sk_buff *skb,
407− struct net_device *sb_dev,
408− select_queue_fallback_t fallback)
407+ struct net_device *sb_dev)
409408 {
410409 struct adapter *padapter = rtw_netdev_priv(dev);
411410 struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
include/linux/netdevice.h+4−8
@@ -986,8 +986,7 @@ struct devlink; · 985 unmodified lines
986986 * those the driver believes to be appropriate.
987987 *
988988 * u16 (*ndo_select_queue)(struct net_device *dev, struct sk_buff *skb,
989− * struct net_device *sb_dev,
990− * select_queue_fallback_t fallback);
989+ * struct net_device *sb_dev);
991990 * Called to decide which queue to use when device supports multiple
992991 * transmit queues.
993992 *
@@ -1268,8 +1267,7 @@ struct net_device_ops { · 274 unmodified lines
12681267 netdev_features_t features);
12691268 u16 (*ndo_select_queue)(struct net_device *dev,
12701269 struct sk_buff *skb,
1271− struct net_device *sb_dev,
1272− select_queue_fallback_t fallback);
1270+ struct net_device *sb_dev);
12731271 void (*ndo_change_rx_flags)(struct net_device *dev,
12741272 int flags);
12751273 void (*ndo_set_rx_mode)(struct net_device *dev);
@@ -2641,11 +2639,9 @@ void dev_close_many(struct list_head *head, bool unlink); · 1365 unmodified lines
26412639 void dev_disable_lro(struct net_device *dev);
26422640 int dev_loopback_xmit(struct net *net, struct sock *sk, struct sk_buff *newskb);
26432641 u16 dev_pick_tx_zero(struct net_device *dev, struct sk_buff *skb,
2644− struct net_device *sb_dev,
2645− select_queue_fallback_t fallback);
2642+ struct net_device *sb_dev);
26462643 u16 dev_pick_tx_cpu_id(struct net_device *dev, struct sk_buff *skb,
2647− struct net_device *sb_dev,
2648− select_queue_fallback_t fallback);
2644+ struct net_device *sb_dev);
26492645 int dev_queue_xmit(struct sk_buff *skb);
26502646 int dev_queue_xmit_accel(struct sk_buff *skb, struct net_device *sb_dev);
26512647 int dev_direct_xmit(struct sk_buff *skb, u16 queue_id);
net/core/dev.c+3−6
@@ -3689,16 +3689,14 @@ get_cpus_map: · 3688 unmodified lines
36893689 }
36903690
36913691 u16 dev_pick_tx_zero(struct net_device *dev, struct sk_buff *skb,
3692− struct net_device *sb_dev,
3693− select_queue_fallback_t fallback)
3692+ struct net_device *sb_dev)
36943693 {
36953694 return 0;
36963695 }
36973696 EXPORT_SYMBOL(dev_pick_tx_zero);
36983697
36993698 u16 dev_pick_tx_cpu_id(struct net_device *dev, struct sk_buff *skb,
3700− struct net_device *sb_dev,
3701− select_queue_fallback_t fallback)
3699+ struct net_device *sb_dev)
37023700 {
37033701 return (u16)raw_smp_processor_id() % dev->real_num_tx_queues;
37043702 }
@@ -3748,8 +3746,7 @@ struct netdev_queue *netdev_core_pick_tx(struct net_device *dev, · 43 unmodified lines
37483746 const struct net_device_ops *ops = dev->netdev_ops;
37493747
37503748 if (ops->ndo_select_queue)
3751− queue_index = ops->ndo_select_queue(dev, skb, sb_dev,
3752− netdev_pick_tx);
3749+ queue_index = ops->ndo_select_queue(dev, skb, sb_dev);
37533750 else
37543751 queue_index = netdev_pick_tx(dev, skb, sb_dev);
37553752
net/mac80211/iface.c+2−4
@@ -1133,8 +1133,7 @@ static void ieee80211_uninit(struct net_device *dev) · 1132 unmodified lines
11331133
11341134 static u16 ieee80211_netdev_select_queue(struct net_device *dev,
11351135 struct sk_buff *skb,
1136− struct net_device *sb_dev,
1137− select_queue_fallback_t fallback)
1136+ struct net_device *sb_dev)
11381137 {
11391138 return ieee80211_select_queue(IEEE80211_DEV_TO_SUB_IF(dev), skb);
11401139 }
@@ -1179,8 +1178,7 @@ static const struct net_device_ops ieee80211_dataif_ops = { · 38 unmodified lines
11791178
11801179 static u16 ieee80211_monitor_select_queue(struct net_device *dev,
11811180 struct sk_buff *skb,
1182− struct net_device *sb_dev,
1183− select_queue_fallback_t fallback)
1181+ struct net_device *sb_dev)
11841182 {
11851183 struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
11861184 struct ieee80211_local *local = sdata->local;
net/packet/af_packet.c+1−2
@@ -287,8 +287,7 @@ static u16 packet_pick_tx_queue(struct sk_buff *skb) · 286 unmodified lines
287287 #endif
288288 skb_record_rx_queue(skb, cpu % dev->real_num_tx_queues);
289289 if (ops->ndo_select_queue) {
290− queue_index = ops->ndo_select_queue(dev, skb, NULL,
291− netdev_pick_tx);
290+ queue_index = ops->ndo_select_queue(dev, skb, NULL);
292291 queue_index = netdev_cap_txqueue(dev, queue_index);
293292 } else {
294293 queue_index = netdev_pick_tx(dev, skb, NULL);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t