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

Commit f50b4076 authored by David Vrabel's avatar David Vrabel Committed by David S. Miller
Browse files

xen-netfront: don't nest queue locks in xennet_connect() 



The nesting of the per-queue rx_lock and tx_lock in xennet_connect()
is confusing to both humans and lockdep.  The locking is safe because
this is the only place where the locks are nested in this way but
lockdep still warns.

Instead of adding the missing lockdep annotations, refactor the
locking to avoid the confusing nesting.  This is still safe, because
the xenbus connection state changes are all serialized by the xenwatch
thread.

Signed-off-by: default avatarDavid Vrabel <david.vrabel@citrix.com>
Reported-by: default avatarSander Eikelenboom <linux@eikelenboom.it>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6e08d5e3

drivers/net/xen-netfront.c

+12 −4
Original line number Diff line number Diff line
@@ -2046,13 +2046,15 @@ static int xennet_connect(struct net_device *dev) 
	/* By now, the queue structures have been set up */

	for (j = 0; j < num_queues; ++j) {

		queue = &np->queues[j];

		spin_lock_bh(&queue->rx_lock);

		spin_lock_irq(&queue->tx_lock);



		/* Step 1: Discard all pending TX packet fragments. */

		spin_lock_irq(&queue->tx_lock);

		xennet_release_tx_bufs(queue);

		spin_unlock_irq(&queue->tx_lock);



		/* Step 2: Rebuild the RX buffer freelist and the RX ring itself. */

		spin_lock_bh(&queue->rx_lock);



		for (requeue_idx = 0, i = 0; i < NET_RX_RING_SIZE; i++) {

			skb_frag_t *frag;

			const struct page *page;
@@ -2076,6 +2078,8 @@ static int xennet_connect(struct net_device *dev) 
		}



		queue->rx.req_prod_pvt = requeue_idx;



		spin_unlock_bh(&queue->rx_lock);

	}



	/*
@@ -2087,13 +2091,17 @@ static int xennet_connect(struct net_device *dev) 
	netif_carrier_on(np->netdev);

	for (j = 0; j < num_queues; ++j) {

		queue = &np->queues[j];



		notify_remote_via_irq(queue->tx_irq);

		if (queue->tx_irq != queue->rx_irq)

			notify_remote_via_irq(queue->rx_irq);

		xennet_tx_buf_gc(queue);

		xennet_alloc_rx_buffers(queue);



		spin_lock_irq(&queue->tx_lock);

		xennet_tx_buf_gc(queue);

		spin_unlock_irq(&queue->tx_lock);



		spin_lock_bh(&queue->rx_lock);

		xennet_alloc_rx_buffers(queue);

		spin_unlock_bh(&queue->rx_lock);

	}