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

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

netdev: Allocate multiple queues for TX. 



alloc_netdev_mq() now allocates an array of netdev_queue
structures for TX, based upon the queue_count argument.

Furthermore, all accesses to the TX queues are now vectored
through the netdev_get_tx_queue() and netdev_for_each_tx_queue()
interfaces.  This makes it easy to grep the tree for all
things that want to get to a TX queue of a net device.

Problem spots which are not really multiqueue aware yet, and
only work with one queue, can easily be spotted by grepping
for all netdev_get_tx_queue() calls that pass in a zero index.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 070825b3

drivers/net/bonding/bond_main.c

+4 −2
Original line number Diff line number Diff line
@@ -5042,7 +5042,9 @@ static int bond_check_params(struct bond_params *params) 


static struct lock_class_key bonding_netdev_xmit_lock_key;



static void bond_set_lockdep_class_one(struct netdev_queue *txq)

static void bond_set_lockdep_class_one(struct net_device *dev,

				       struct netdev_queue *txq,

				       void *_unused)

{

	lockdep_set_class(&txq->_xmit_lock,

			  &bonding_netdev_xmit_lock_key);
@@ -5050,7 +5052,7 @@ static void bond_set_lockdep_class_one(struct netdev_queue *txq) 


static void bond_set_lockdep_class(struct net_device *dev)

{

	bond_set_lockdep_class_one(&dev->tx_queue);

	netdev_for_each_tx_queue(dev, bond_set_lockdep_class_one, NULL);

}



/* Create a new bond based on the specified name and bonding parameters.

drivers/net/hamradio/bpqether.c

+4 −2
Original line number Diff line number Diff line
@@ -124,14 +124,16 @@ static LIST_HEAD(bpq_devices); 
 */

static struct lock_class_key bpq_netdev_xmit_lock_key;



static void bpq_set_lockdep_class_one(struct netdev_queue *txq)

static void bpq_set_lockdep_class_one(struct net_device *dev,

				      struct netdev_queue *txq,

				      void *_unused)

{

	lockdep_set_class(&txq->_xmit_lock, &bpq_netdev_xmit_lock_key);

}



static void bpq_set_lockdep_class(struct net_device *dev)

{

	bpq_set_lockdep_class_one(&dev->tx_queue);

	netdev_for_each_tx_queue(dev, bpq_set_lockdep_class_one, NULL);

}



/* ------------------------------------------------------------------------ */

drivers/net/ifb.c

+9 −3
Original line number Diff line number Diff line
@@ -229,14 +229,20 @@ module_param(numifbs, int, 0); 
MODULE_PARM_DESC(numifbs, "Number of ifb devices");



/*

 * dev_ifb->tx_queue.lock is usually taken after dev->rx_queue.lock,

 * dev_ifb's TX queue lock is usually taken after dev->rx_queue.lock,

 * reversely to e.g. qdisc_lock_tree(). It should be safe until

 * ifb doesn't take dev->tx_queue.lock with dev_ifb->rx_queue.lock.

 * ifb doesn't take dev's TX queue lock with dev_ifb->rx_queue.lock.

 * But lockdep should know that ifb has different locks from dev.

 */

static struct lock_class_key ifb_tx_queue_lock_key;

static struct lock_class_key ifb_rx_queue_lock_key;



static void set_tx_lockdep_key(struct net_device *dev,

			       struct netdev_queue *txq,

			       void *_unused)

{

	lockdep_set_class(&txq->lock, &ifb_tx_queue_lock_key);

}



static int __init ifb_init_one(int index)

{
@@ -258,7 +264,7 @@ static int __init ifb_init_one(int index) 
	if (err < 0)

		goto err;



	lockdep_set_class(&dev_ifb->tx_queue.lock, &ifb_tx_queue_lock_key);

	netdev_for_each_tx_queue(dev_ifb, set_tx_lockdep_key, NULL);

	lockdep_set_class(&dev_ifb->rx_queue.lock, &ifb_rx_queue_lock_key);



	return 0;

drivers/net/macvlan.c

+4 −2
Original line number Diff line number Diff line
@@ -285,7 +285,9 @@ static struct lock_class_key macvlan_netdev_xmit_lock_key; 
#define MACVLAN_STATE_MASK \

	((1<<__LINK_STATE_NOCARRIER) | (1<<__LINK_STATE_DORMANT))



static void macvlan_set_lockdep_class_one(struct netdev_queue *txq)

static void macvlan_set_lockdep_class_one(struct net_device *dev,

					  struct netdev_queue *txq,

					  void *_unused)

{

	lockdep_set_class(&txq->_xmit_lock,

			  &macvlan_netdev_xmit_lock_key);
@@ -293,7 +295,7 @@ static void macvlan_set_lockdep_class_one(struct netdev_queue *txq) 


static void macvlan_set_lockdep_class(struct net_device *dev)

{

	macvlan_set_lockdep_class_one(&dev->tx_queue);

	netdev_for_each_tx_queue(dev, macvlan_set_lockdep_class_one, NULL);

}



static int macvlan_init(struct net_device *dev)

drivers/net/wireless/hostap/hostap_hw.c

+4 −2
Original line number Diff line number Diff line
@@ -3102,7 +3102,9 @@ static void prism2_clear_set_tim_queue(local_info_t *local) 
 */

static struct lock_class_key hostap_netdev_xmit_lock_key;



static void prism2_set_lockdep_class_one(struct netdev_queue *txq)

static void prism2_set_lockdep_class_one(struct net_device *dev,

					 struct netdev_queue *txq,

					 void *_unused)

{

	lockdep_set_class(&txq->_xmit_lock,

			  &hostap_netdev_xmit_lock_key);
@@ -3110,7 +3112,7 @@ static void prism2_set_lockdep_class_one(struct netdev_queue *txq) 


static void prism2_set_lockdep_class(struct net_device *dev)

{

	prism2_set_lockdep_class_one(&dev->tx_queue);

	netdev_for_each_tx_queue(dev, prism2_set_lockdep_class_one, NULL);

}



static struct net_device *