Commit a350ecce authored by Paolo Abeni's avatar Paolo Abeni Committed by David S. Miller
Browse files

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

Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b71b5837

drivers/infiniband/hw/hfi1/vnic_main.c

+1 −2
Original line number Diff line number Diff line
@@ -423,8 +423,7 @@ tx_finish: 


static u16 hfi1_vnic_select_queue(struct net_device *netdev,

				  struct sk_buff *skb,

				  struct net_device *sb_dev,

				  select_queue_fallback_t fallback)

				  struct net_device *sb_dev)

{

	struct hfi1_vnic_vport_info *vinfo = opa_vnic_dev_priv(netdev);

	struct opa_vnic_skb_mdata *mdata;

drivers/infiniband/ulp/opa_vnic/opa_vnic_netdev.c

+2 −4
Original line number Diff line number Diff line
@@ -95,8 +95,7 @@ static netdev_tx_t opa_netdev_start_xmit(struct sk_buff *skb, 
}



static u16 opa_vnic_select_queue(struct net_device *netdev, struct sk_buff *skb,

				 struct net_device *sb_dev,

				 select_queue_fallback_t fallback)

				 struct net_device *sb_dev)

{

	struct opa_vnic_adapter *adapter = opa_vnic_priv(netdev);

	struct opa_vnic_skb_mdata *mdata;
@@ -106,8 +105,7 @@ static u16 opa_vnic_select_queue(struct net_device *netdev, struct sk_buff *skb, 
	mdata = skb_push(skb, sizeof(*mdata));

	mdata->entropy = opa_vnic_calc_entropy(skb);

	mdata->vl = opa_vnic_get_vl(adapter, skb);

	rc = adapter->rn_ops->ndo_select_queue(netdev, skb,

					       sb_dev, fallback);

	rc = adapter->rn_ops->ndo_select_queue(netdev, skb, sb_dev);

	skb_pull(skb, sizeof(*mdata));

	return rc;

}

drivers/net/bonding/bond_main.c

+1 −2
Original line number Diff line number Diff line
@@ -4114,8 +4114,7 @@ static inline int bond_slave_override(struct bonding *bond, 




static u16 bond_select_queue(struct net_device *dev, struct sk_buff *skb,

			     struct net_device *sb_dev,

			     select_queue_fallback_t fallback)

			     struct net_device *sb_dev)

{

	/* This helper function exists to help dev_pick_tx get the correct

	 * destination queue.  Using a helper function skips a call to

drivers/net/ethernet/amazon/ena/ena_netdev.c

+2 −3
Original line number Diff line number Diff line
@@ -2258,8 +2258,7 @@ error_drop_packet: 
}



static u16 ena_select_queue(struct net_device *dev, struct sk_buff *skb,

			    struct net_device *sb_dev,

			    select_queue_fallback_t fallback)

			    struct net_device *sb_dev)

{

	u16 qid;

	/* 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, 
	if (skb_rx_queue_recorded(skb))

		qid = skb_get_rx_queue(skb);

	else

		qid = fallback(dev, skb, NULL);

		qid = netdev_pick_tx(dev, skb, NULL);



	return qid;

}

drivers/net/ethernet/broadcom/bcmsysport.c

+3 −4
Original line number Diff line number Diff line
@@ -2274,8 +2274,7 @@ static const struct ethtool_ops bcm_sysport_ethtool_ops = { 
};



static u16 bcm_sysport_select_queue(struct net_device *dev, struct sk_buff *skb,

				    struct net_device *sb_dev,

				    select_queue_fallback_t fallback)

				    struct net_device *sb_dev)

{

	struct bcm_sysport_priv *priv = netdev_priv(dev);

	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, 
	unsigned int q, port;



	if (!netdev_uses_dsa(dev))

		return fallback(dev, skb, NULL);

		return netdev_pick_tx(dev, skb, NULL);



	/* DSA tagging layer will have configured the correct queue */

	q = BRCM_TAG_GET_QUEUE(queue);
@@ -2291,7 +2290,7 @@ static u16 bcm_sysport_select_queue(struct net_device *dev, struct sk_buff *skb, 
	tx_ring = priv->ring_map[q + port * priv->per_port_num_tx_queues];



	if (unlikely(!tx_ring))

		return fallback(dev, skb, NULL);

		return netdev_pick_tx(dev, skb, NULL);



	return tx_ring->index;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE