net: allow fallback function to pass netdev

Alexander Duyck · Jeff Kirsher · commit 8ec56fc3c5ee · 2018-07-09T13:57:25.000-07:00
For most of these calls we can just pass NULL through to the fallback
function as the sb_dev. The only cases where we cannot are the cases where
we might be dealing with either an upper device or a driver that would
have configured things to support an sb_dev itself.

The only driver that has any significant change in this patch set should be
ixgbe as we can drop the redundant functionality that existed in both the
ndo_select_queue function and the fallback function that was passed through
to us.

Signed-off-by: Alexander Duyck &lt;alexander.h.duyck@intel.com&gt;
Tested-by: Andrew Bowers &lt;andrewx.bowers@intel.com&gt;
Signed-off-by: Jeff Kirsher &lt;jeffrey.t.kirsher@intel.com&gt;
diff --git a/drivers/net/ethernet/amazon/ena/ena_netdev.c b/drivers/net/ethernet/amazon/ena/ena_netdev.c
@@ -2224,7 +2224,7 @@ static u16 ena_select_queue(struct net_device *dev, struct sk_buff *skb,
 	if (skb_rx_queue_recorded(skb))
 		qid = skb_get_rx_queue(skb);
 	else
-		qid = fallback(dev, skb);
+		qid = fallback(dev, skb, NULL);
 
 	return qid;
 }
diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c
@@ -2116,15 +2116,15 @@ static u16 bcm_sysport_select_queue(struct net_device *dev, struct sk_buff *skb,
 	unsigned int q, port;
 
 	if (!netdev_uses_dsa(dev))
-		return fallback(dev, skb);
+		return fallback(dev, skb, NULL);
 
 	/* DSA tagging layer will have configured the correct queue */
 	q = BRCM_TAG_GET_QUEUE(queue);
 	port = BRCM_TAG_GET_PORT(queue);
 	tx_ring = priv->ring_map[q + port * priv->per_port_num_tx_queues];
 
 	if (unlikely(!tx_ring))
-		return fallback(dev, skb);
+		return fallback(dev, skb, NULL);
 
 	return tx_ring->index;
 }
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
@@ -1933,7 +1933,8 @@ u16 bnx2x_select_queue(struct net_device *dev, struct sk_buff *skb,
 	}
 
 	/* select a non-FCoE queue */
-	return fallback(dev, skb) % (BNX2X_NUM_ETH_QUEUES(bp) * bp->max_cos);
+	return fallback(dev, skb, NULL) %
+	       (BNX2X_NUM_ETH_QUEUES(bp) * bp->max_cos);
 }
 
 void bnx2x_set_num_queues(struct bnx2x *bp)
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
@@ -973,7 +973,7 @@ static u16 cxgb_select_queue(struct net_device *dev, struct sk_buff *skb,
 		return txq;
 	}
 
-	return fallback(dev, skb) % dev->real_num_tx_queues;
+	return fallback(dev, skb, NULL) % dev->real_num_tx_queues;
 }
 
 static int closest_timer(const struct sge *s, int time)
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_enet.c b/drivers/net/ethernet/hisilicon/hns/hns_enet.c
@@ -2033,7 +2033,7 @@ hns_nic_select_queue(struct net_device *ndev, struct sk_buff *skb,
 	    is_multicast_ether_addr(eth_hdr->h_dest))
 		return 0;
 	else
-		return fallback(ndev, skb);
+		return fallback(ndev, skb, NULL);
 }
 
 static const struct net_device_ops hns_nic_netdev_ops = {
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -8237,11 +8237,11 @@ static u16 ixgbe_select_queue(struct net_device *dev, struct sk_buff *skb,
 	case htons(ETH_P_FIP):
 		adapter = netdev_priv(dev);
 
-		if (adapter->flags & IXGBE_FLAG_FCOE_ENABLED)
+		if (!sb_dev && (adapter->flags & IXGBE_FLAG_FCOE_ENABLED))
 			break;
 		/* fall through */
 	default:
-		return fallback(dev, skb);
+		return fallback(dev, skb, sb_dev);
 	}
 
 	f = &adapter->ring_feature[RING_F_FCOE];
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_tx.c b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
@@ -695,9 +695,9 @@ u16 mlx4_en_select_queue(struct net_device *dev, struct sk_buff *skb,
 	u16 rings_p_up = priv->num_tx_rings_p_up;
 
 	if (netdev_get_num_tc(dev))
-		return fallback(dev, skb);
+		return fallback(dev, skb, NULL);
 
-	return fallback(dev, skb) % rings_p_up;
+	return fallback(dev, skb, NULL) % rings_p_up;
 }
 
 static void mlx4_bf_copy(void __iomem *dst, const void *src,
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c
@@ -115,7 +115,7 @@ u16 mlx5e_select_queue(struct net_device *dev, struct sk_buff *skb,
 		       select_queue_fallback_t fallback)
 {
 	struct mlx5e_priv *priv = netdev_priv(dev);
-	int channel_ix = fallback(dev, skb);
+	int channel_ix = fallback(dev, skb, NULL);
 	u16 num_channels;
 	int up = 0;
 
diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c
@@ -345,7 +345,7 @@ static u16 netvsc_select_queue(struct net_device *ndev, struct sk_buff *skb,
 			txq = vf_ops->ndo_select_queue(vf_netdev, skb,
 						       sb_dev, fallback);
 		else
-			txq = fallback(vf_netdev, skb);
+			txq = fallback(vf_netdev, skb, NULL);
 
 		/* Record the queue selected by VF so that it can be
 		 * used for common case where VF has more queues than
diff --git a/drivers/net/net_failover.c b/drivers/net/net_failover.c
@@ -131,7 +131,7 @@ static u16 net_failover_select_queue(struct net_device *dev,
 			txq = ops->ndo_select_queue(primary_dev, skb,
 						    sb_dev, fallback);
 		else
-			txq = fallback(primary_dev, skb);
+			txq = fallback(primary_dev, skb, NULL);
 
 		qdisc_skb_cb(skb)->slave_dev_queue_mapping = skb->queue_mapping;
 
diff --git a/drivers/net/xen-netback/interface.c b/drivers/net/xen-netback/interface.c
@@ -155,7 +155,7 @@ static u16 xenvif_select_queue(struct net_device *dev, struct sk_buff *skb,
 	unsigned int size = vif->hash.size;
 
 	if (vif->hash.alg == XEN_NETIF_CTRL_HASH_ALGORITHM_NONE)
-		return fallback(dev, skb) % dev->real_num_tx_queues;
+		return fallback(dev, skb, NULL) % dev->real_num_tx_queues;
 
 	xenvif_set_skb_hash(vif, skb);
 
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
@@ -793,7 +793,8 @@ static inline bool netdev_phys_item_id_same(struct netdev_phys_item_id *a,
 }
 
 typedef u16 (*select_queue_fallback_t)(struct net_device *dev,
-				       struct sk_buff *skb);
+				       struct sk_buff *skb,
+				       struct net_device *sb_dev);
 
 enum tc_setup_type {
 	TC_SETUP_QDISC_MQPRIO,
diff --git a/net/core/dev.c b/net/core/dev.c
@@ -3633,8 +3633,8 @@ u16 dev_pick_tx_cpu_id(struct net_device *dev, struct sk_buff *skb,
 }
 EXPORT_SYMBOL(dev_pick_tx_cpu_id);
 
-static u16 ___netdev_pick_tx(struct net_device *dev, struct sk_buff *skb,
-			     struct net_device *sb_dev)
+static u16 __netdev_pick_tx(struct net_device *dev, struct sk_buff *skb,
+			    struct net_device *sb_dev)
 {
 	struct sock *sk = skb->sk;
 	int queue_index = sk_tx_queue_get(sk);
@@ -3659,12 +3659,6 @@ static u16 ___netdev_pick_tx(struct net_device *dev, struct sk_buff *skb,
 	return queue_index;
 }
 
-static u16 __netdev_pick_tx(struct net_device *dev,
-			    struct sk_buff *skb)
-{
-	return ___netdev_pick_tx(dev, skb, NULL);
-}
-
 struct netdev_queue *netdev_pick_tx(struct net_device *dev,
 				    struct sk_buff *skb,
 				    struct net_device *sb_dev)
@@ -3685,7 +3679,7 @@ struct netdev_queue *netdev_pick_tx(struct net_device *dev,
 			queue_index = ops->ndo_select_queue(dev, skb, sb_dev,
 							    __netdev_pick_tx);
 		else
-			queue_index = ___netdev_pick_tx(dev, skb, sb_dev);
+			queue_index = __netdev_pick_tx(dev, skb, sb_dev);
 
 		queue_index = netdev_cap_txqueue(dev, queue_index);
 	}
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
@@ -275,9 +275,10 @@ static bool packet_use_direct_xmit(const struct packet_sock *po)
 	return po->xmit == packet_direct_xmit;
 }
 
-static u16 __packet_pick_tx_queue(struct net_device *dev, struct sk_buff *skb)
+static u16 __packet_pick_tx_queue(struct net_device *dev, struct sk_buff *skb,
+				  struct net_device *sb_dev)
 {
-	return dev_pick_tx_cpu_id(dev, skb, NULL, NULL);
+	return dev_pick_tx_cpu_id(dev, skb, sb_dev, NULL);
 }
 
 static u16 packet_pick_tx_queue(struct sk_buff *skb)
@@ -291,7 +292,7 @@ static u16 packet_pick_tx_queue(struct sk_buff *skb)
 						    __packet_pick_tx_queue);
 		queue_index = netdev_cap_txqueue(dev, queue_index);
 	} else {
-		queue_index = __packet_pick_tx_queue(dev, skb);
+		queue_index = __packet_pick_tx_queue(dev, skb, NULL);
 	}
 
 	return queue_index;

Original file line number	Diff line number	Diff line change
`@@ -2224,7 +2224,7 @@ static u16 ena_select_queue(struct net_device dev, struct sk_buff skb,`
`2224`	`2224`	`if (skb_rx_queue_recorded(skb))`
`2225`	`2225`	`qid = skb_get_rx_queue(skb);`
`2226`	`2226`	`else`
`2227`		`- qid = fallback(dev, skb);`
	`2227`	`+ qid = fallback(dev, skb, NULL);`
`2228`	`2228`
`2229`	`2229`	`return qid;`
`2230`	`2230`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1933,7 +1933,8 @@ u16 bnx2x_select_queue(struct net_device dev, struct sk_buff skb,`
`1933`	`1933`	`}`
`1934`	`1934`
`1935`	`1935`	`/* select a non-FCoE queue */`
`1936`		`- return fallback(dev, skb) % (BNX2X_NUM_ETH_QUEUES(bp) * bp->max_cos);`
	`1936`	`+ return fallback(dev, skb, NULL) %`
	`1937`	`+ (BNX2X_NUM_ETH_QUEUES(bp) * bp->max_cos);`
`1937`	`1938`	`}`
`1938`	`1939`
`1939`	`1940`	`void bnx2x_set_num_queues(struct bnx2x *bp)`
Original file line number	Diff line number	Diff line change
`@@ -973,7 +973,7 @@ static u16 cxgb_select_queue(struct net_device dev, struct sk_buff skb,`
`973`	`973`	`return txq;`
`974`	`974`	`}`
`975`	`975`
`976`		`- return fallback(dev, skb) % dev->real_num_tx_queues;`
	`976`	`+ return fallback(dev, skb, NULL) % dev->real_num_tx_queues;`
`977`	`977`	`}`
`978`	`978`
`979`	`979`	`static int closest_timer(const struct sge *s, int time)`
Original file line number	Diff line number	Diff line change
`@@ -2033,7 +2033,7 @@ hns_nic_select_queue(struct net_device ndev, struct sk_buff skb,`
`2033`	`2033`	`is_multicast_ether_addr(eth_hdr->h_dest))`
`2034`	`2034`	`return 0;`
`2035`	`2035`	`else`
`2036`		`- return fallback(ndev, skb);`
	`2036`	`+ return fallback(ndev, skb, NULL);`
`2037`	`2037`	`}`
`2038`	`2038`
`2039`	`2039`	`static const struct net_device_ops hns_nic_netdev_ops = {`
Original file line number	Diff line number	Diff line change
`@@ -695,9 +695,9 @@ u16 mlx4_en_select_queue(struct net_device dev, struct sk_buff skb,`
`695`	`695`	`u16 rings_p_up = priv->num_tx_rings_p_up;`
`696`	`696`
`697`	`697`	`if (netdev_get_num_tc(dev))`
`698`		`- return fallback(dev, skb);`
	`698`	`+ return fallback(dev, skb, NULL);`
`699`	`699`
`700`		`- return fallback(dev, skb) % rings_p_up;`
	`700`	`+ return fallback(dev, skb, NULL) % rings_p_up;`
`701`	`701`	`}`
`702`	`702`
`703`	`703`	`static void mlx4_bf_copy(void __iomem dst, const void src,`
Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ u16 mlx5e_select_queue(struct net_device dev, struct sk_buff skb,`
`115`	`115`	`select_queue_fallback_t fallback)`
`116`	`116`	`{`
`117`	`117`	`struct mlx5e_priv *priv = netdev_priv(dev);`
`118`		`- int channel_ix = fallback(dev, skb);`
	`118`	`+ int channel_ix = fallback(dev, skb, NULL);`
`119`	`119`	`u16 num_channels;`
`120`	`120`	`int up = 0;`
`121`	`121`
Original file line number	Diff line number	Diff line change
`@@ -793,7 +793,8 @@ static inline bool netdev_phys_item_id_same(struct netdev_phys_item_id *a,`
`793`	`793`	`}`
`794`	`794`
`795`	`795`	`typedef u16 (select_queue_fallback_t)(struct net_device dev,`
`796`		`- struct sk_buff *skb);`
	`796`	`+ struct sk_buff *skb,`
	`797`	`+ struct net_device *sb_dev);`
`797`	`798`
`798`	`799`	`enum tc_setup_type {`
`799`	`800`	`TC_SETUP_QDISC_MQPRIO,`
Original file line number	Diff line number	Diff line change
`@@ -275,9 +275,10 @@ static bool packet_use_direct_xmit(const struct packet_sock *po)`
`275`	`275`	`return po->xmit == packet_direct_xmit;`
`276`	`276`	`}`
`277`	`277`
`278`		`-static u16 __packet_pick_tx_queue(struct net_device dev, struct sk_buff skb)`
	`278`	`+static u16 __packet_pick_tx_queue(struct net_device dev, struct sk_buff skb,`
	`279`	`+ struct net_device *sb_dev)`
`279`	`280`	`{`
`280`		`- return dev_pick_tx_cpu_id(dev, skb, NULL, NULL);`
	`281`	`+ return dev_pick_tx_cpu_id(dev, skb, sb_dev, NULL);`
`281`	`282`	`}`
`282`	`283`
`283`	`284`	`static u16 packet_pick_tx_queue(struct sk_buff *skb)`
`@@ -291,7 +292,7 @@ static u16 packet_pick_tx_queue(struct sk_buff *skb)`
`291`	`292`	`__packet_pick_tx_queue);`
`292`	`293`	`queue_index = netdev_cap_txqueue(dev, queue_index);`
`293`	`294`	`} else {`
`294`		`- queue_index = __packet_pick_tx_queue(dev, skb);`
	`295`	`+ queue_index = __packet_pick_tx_queue(dev, skb, NULL);`
`295`	`296`	`}`
`296`	`297`
`297`	`298`	`return queue_index;`