: Spider ethernet driver spinlocks
PATCH 1/2 : Spider ethernet driver spinlocks
Please review/apply/ack/forward upstream.
--linas
The spider network driver currently uses hand-rolled spinlocks in a few places. Replace these with industry standard spinlocks. In particular, this should add some safety if multiple threads are touching the tx and rx chain pointers.
----
drivers/net/spider_net.c | 18 ++++++++---------- drivers/net/spider_net.h | 4 ++-- 2 files changed, 10 insertions(+), 12 deletions(-)
drivers/net/spider_net.c +8 -10
@@ -335,8 +335,6 @@ spider_net_init_chain(struct spider_net_struct spider_net_descr *descr;dma_addr_t buf; -atomic_set (&card->rx_chain_refill,0 ); - descr = start_descr;memset (descr,0 ,sizeof (*descr) * no);
@@ -509,15 +507,15 @@ spider_net_refill_rx_chain(struct spider* and omitting it) is ok. If called by NAPI, we'll be called again * as spider_net_decode_one_descr is called several times. If some * interrupt calls us, the NAPI is about to clean up anyway. */ -if (atomic_inc_return (&card->rx_chain_refill) ==1 ) +if (spin_trylock (&card->rx_chain_lock)) {while (spider_net_get_descr_status (chain->head) ==SPIDER_NET_DESCR_NOT_IN_USE ) {if (spider_net_prepare_rx_descr (card, chain->head))break ; chain->head = chain->head->next; } - -atomic_dec (&card->rx_chain_refill); +spin_unlock (&card->rx_chain_lock); + } }/**
@@ -596,10 +594,8 @@ spider_net_release_tx_chain(struct spidestruct spider_net_descr_chain *tx_chain = &card->tx_chain;enum spider_net_descr_status status; -if (atomic_inc_return (&card->tx_chain_release) !=1 ) { -atomic_dec (&card->tx_chain_release); +if (!spin_trylock (&card->tx_chain_lock))return 1 ; - }for (;;) { status =spider_net_get_descr_status (tx_chain->tail);
@@ -633,7 +629,7 @@ spider_net_release_tx_chain(struct spide tx_chain->tail = tx_chain->tail->next; } out: -atomic_dec (&card->tx_chain_release); +spin_unlock (&card->tx_chain_lock);netif_wake_queue (card->netdev);
@@ -2072,7 +2068,9 @@ spider_net_setup_netdev(struct spider_nepci_set_drvdata (card->pdev, netdev); -atomic_set (&card->tx_chain_release,0 ); +spin_lock_init (&card->rx_chain_lock); +spin_lock_init (&card->tx_chain_lock); + card->rxram_full_tl.data = (unsigned long ) card; card->rxram_full_tl.func = (void (*)(unsigned long )) spider_net_handle_rxram_full;
drivers/net/spider_net.h +2 -2
@@ -451,8 +451,8 @@ struct spider_net_card {struct spider_net_descr_chain tx_chain;struct spider_net_descr_chain rx_chain; -atomic_t rx_chain_refill; -atomic_t tx_chain_release; +spinlock_t rx_chain_lock; +spinlock_t tx_chain_lock;struct net_device_stats netdev_stats;
PATCH 2/2 : Spider ethernet driver -- protect chain head
Please review/apply/ack/forward upstream.
--linas
Prevent a potential race. If two threads are both calling the transmit routine, both can potentially try to grab the same dma descriptor. Serialize access to the head of the tx ring with spinlocks.
----
drivers/net/spider_net.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-)
drivers/net/spider_net.c +8 -4
@@ -806,13 +806,19 @@ spider_net_stop(struct net_device *netdestatic struct spider_net_descr *spider_net_get_next_tx_descr (struct spider_net_card *card) { +struct spider_net_descr *descr; +spin_lock (&card->tx_chain_lock); + + descr = card->tx_chain.head;/* check, if head points to not-in-use descr */ if (spider_net_get_descr_status (card->tx_chain.head) ==SPIDER_NET_DESCR_NOT_IN_USE ) { -return card->tx_chain.head; + card->tx_chain.head = descr->next; }else { -return NULL ; + descr =NULL ; } +spin_unlock (&card->tx_chain_lock); +return descr; }/**
@@ -932,8 +938,6 @@ spider_net_xmit(struct sk_buff *skb, strif (result) goto error; - card->tx_chain.head = card->tx_chain.head->next; -if (spider_net_get_descr_status (descr->prev) !=SPIDER_NET_DESCR_CARDOWNED ) {/* make sure the current descriptor is in memory. Then
Re: [PATCH 2/2]: Spider ethernet driver -- protect chain head
Quoted 4 lines · Linas Vepstas
Prevent a potential race. If two threads are both calling the transmit routine, both can potentially try to grab the same dma descriptor. Serialize access to the head of the tx ring with spinlocks.
Two threads cannot be in spider_net_xmit() simultaneosuly because hard_start_xmit entry point is already protected by net_device xmit_lock, see Documentation/net/netdevices.txt
Signature · 1 line
Eugene
Re: [PATCH 2/2]: Spider ethernet driver -- protect chain head
Quoted 9 lines · Eugene Surovegin
Quoted 4 lines · Linas Vepstas
Prevent a potential race. If two threads are both calling the transmit routine, both can potentially try to grab the same dma descriptor. Serialize access to the head of the tx ring with spinlocks.
Two threads cannot be in
spider_net_xmit()simultaneosuly becausehard_start_xmitentry point is already protected bynet_devicexmit_lock, seeDocumentation/net/netdevices.txt
Ahh, thank you. I was wondering why I never semmed to see this this happen in "real life".
--linas