Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e32f55f3 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch '10GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue 



Jeff Kirsher says:

====================
L2 Fwd Offload & 10GbE Intel Driver Updates 2018-07-09

This patch series is meant to allow support for the L2 forward offload, aka
MACVLAN offload without the need for using ndo_select_queue.

The existing solution currently requires that we use ndo_select_queue in
the transmit path if we want to associate specific Tx queues with a given
MACVLAN interface. In order to get away from this we need to repurpose the
tc_to_txq array and XPS pointer for the MACVLAN interface and use those as
a means of accessing the queues on the lower device. As a result we cannot
offload a device that is configured as multiqueue, however it doesn't
really make sense to configure a macvlan interfaced as being multiqueue
anyway since it doesn't really have a qdisc of its own in the first place.

The big changes in this set are:
  Allow lower device to update tc_to_txq and XPS map of offloaded MACVLAN
  Disable XPS for single queue devices
  Replace accel_priv with sb_dev in ndo_select_queue
  Add sb_dev parameter to fallback function for ndo_select_queue
  Consolidated ndo_select_queue functions that appeared to be duplicates
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 4929c942 8ec56fc3

drivers/infiniband/hw/hfi1/vnic_main.c

+1 −1
Original line number Diff line number Diff line
@@ -423,7 +423,7 @@ static netdev_tx_t hfi1_netdev_start_xmit(struct sk_buff *skb, 


static u16 hfi1_vnic_select_queue(struct net_device *netdev,

				  struct sk_buff *skb,

				  void *accel_priv,

				  struct net_device *sb_dev,

				  select_queue_fallback_t fallback)

{

	struct hfi1_vnic_vport_info *vinfo = opa_vnic_dev_priv(netdev);

drivers/infiniband/ulp/opa_vnic/opa_vnic_netdev.c

+2 −2
Original line number Diff line number Diff line
@@ -95,7 +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,

				 void *accel_priv,

				 struct net_device *sb_dev,

				 select_queue_fallback_t fallback)

{

	struct opa_vnic_adapter *adapter = opa_vnic_priv(netdev);
@@ -107,7 +107,7 @@ static u16 opa_vnic_select_queue(struct net_device *netdev, struct sk_buff *skb, 
	mdata->entropy = opa_vnic_calc_entropy(skb);

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

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

					       accel_priv, fallback);

					       sb_dev, fallback);

	skb_pull(skb, sizeof(*mdata));

	return rc;

}

drivers/net/bonding/bond_main.c

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




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

			     void *accel_priv, select_queue_fallback_t fallback)

			     struct net_device *sb_dev,

			     select_queue_fallback_t fallback)

{

	/* 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

+3 −2
Original line number Diff line number Diff line
@@ -2213,7 +2213,8 @@ static void ena_netpoll(struct net_device *netdev) 
#endif /* CONFIG_NET_POLL_CONTROLLER */



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

			    void *accel_priv, select_queue_fallback_t fallback)

			    struct net_device *sb_dev,

			    select_queue_fallback_t fallback)

{

	u16 qid;

	/* we suspect that this is good for in--kernel network services that
@@ -2223,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;

}

drivers/net/ethernet/broadcom/bcmsysport.c

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



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

				    void *accel_priv,

				    struct net_device *sb_dev,

				    select_queue_fallback_t fallback)

{

	struct bcm_sysport_priv *priv = netdev_priv(dev);
@@ -2116,7 +2116,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);

		return fallback(dev, skb, NULL);



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

	q = BRCM_TAG_GET_QUEUE(queue);
@@ -2124,7 +2124,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);

		return fallback(dev, skb, NULL);



	return tx_ring->index;

}