: spidernet: misc fixes
Subsystems (2)
cover : spidernet: misc fixes
Jeff,
A series of five patches against the spidernet ethernet device driver.
The first fixes a compile break in the current kernel.rg tree. The second restructures the descriptor ring, per an old suggestion. The third & fourth fix a race condition seen under heavy load. The fifth is a trite janitorial patch.
Please apply.
--linas
PATCH 1/5 : spidernet: compile break.
As of 2.6.20-git4, the spider_net driver does not compile. This appears to be due to some archaic usage involving kobjects.
It also fixes a nasty double-free during ifdown of interface.
----
drivers/net/spider_net.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/net/spider_net.c +1 -4
@@ -1906,8 +1906,7 @@ spider_net_stop(struct net_device *netdespider_net_write_reg (card,SPIDER_NET_GHIINT1MSK ,0 );spider_net_write_reg (card,SPIDER_NET_GHIINT2MSK ,0 ); -/* free_irq(netdev->irq, netdev);*/ -free_irq (to_pci_dev (netdev->class_dev.dev)->irq, netdev); +free_irq (netdev->irq, netdev);spider_net_write_reg (card,SPIDER_NET_GDTDMACCNTR ,SPIDER_NET_DMA_TX_FEND_VALUE );
@@ -1919,8 +1918,6 @@ spider_net_stop(struct net_device *netdespider_net_release_tx_chain (card,1 );spider_net_free_rx_chain_contents (card); -spider_net_free_rx_chain_contents (card); -spider_net_free_chain (card, &card->tx_chain);spider_net_free_chain (card, &card->rx_chain);
PATCH 2/5 spidernet: separate hardware state from driver state.
In reply to Linas VepstasThis patch separates the hardware descriptor state from the driver descriptor state, per (old) suggestion from Ben Herrenschmidt. This compiles and boots and seems to work.
----
drivers/net/spider_net.c | 150 ++++++++++++++++++++++++++--------------------- drivers/net/spider_net.h | 16 +++-- 2 files changed, 95 insertions(+), 71 deletions(-)
drivers/net/spider_net.h +11 -5
@@ -24,7 +24,7 @@#ifndef _SPIDER_NET_H#define _SPIDER_NET_H -#define VERSION "1.6 B" +#define VERSION "1.6 C"#include "sungem_phy.h"
@@ -356,8 +356,8 @@ enum spider_net_int2_status {#define SPIDER_NET_DESCR_NOT_IN_USE 0xF0000000#define SPIDER_NET_DESCR_TXDESFLG 0x00800000 -struct spider_net_descr { -/* as defined by the hardware */ +/* Descriptor, as defined by the hardware */ +struct spider_net_hw_descr {u32 buf_addr;u32 buf_size;u32 next_descr_addr;
@@ -366,13 +366,15 @@ struct spider_net_descr {u32 valid_size;/* all zeroes for tx */ u32 data_status;u32 data_error;/* all zeroes for tx */ +} __attribute__((aligned(32))); -/* used in the driver */ +struct spider_net_descr { +struct spider_net_hw_descr *hwdescr;struct sk_buff *skb;u32 bus_addr;struct spider_net_descr *next;struct spider_net_descr *prev; -} __attribute__((aligned(32))); +};struct spider_net_descr_chain {spinlock_t lock;
@@ -380,6 +382,7 @@ struct spider_net_descr_chain {struct spider_net_descr *tail;struct spider_net_descr *ring;int num_desc; +struct spider_net_hw_descr *hwring;dma_addr_t dma_addr; };
@@ -452,6 +455,9 @@ struct spider_net_card {struct net_device_stats netdev_stats;struct spider_net_extra_stats spider_stats;struct spider_net_options options; + +/* Must be last item in struct */ +struct spider_net_descr darray[0 ]; }; #define pr_err(fmt,arg...) \
drivers/net/spider_net.c +84 -66
375 lines not on this page · raw message
PATCH 3/5 : spidernet: fix racy double-free of skb
In reply to Linas VepstasIt appears that under certain circumstances, a race will result in a double-free of an skb. This patch null's out the skb pointer upon the skb free, avoiding the inadvertent deref of bogus data. The next patch fixes the actual race.
----
drivers/net/spider_net.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-)
drivers/net/spider_net.c +15 -8
@@ -360,10 +360,11 @@ spider_net_free_rx_chain_contents(struct descr = card->rx_chain.head;do {if (descr->skb) { -dev_kfree_skb (descr->skb);pci_unmap_single (card->pdev, descr->hwdescr->buf_addr,SPIDER_NET_MAX_FRAME ,PCI_DMA_BIDIRECTIONAL ); +dev_kfree_skb (descr->skb); + descr->skb =NULL ; } descr = descr->next; }while (descr != card->rx_chain.head);
@@ -417,6 +418,7 @@ spider_net_prepare_rx_descr(struct spide SPIDER_NET_MAX_FRAME, PCI_DMA_FROMDEVICE);if (pci_dma_mapping_error (buf)) {dev_kfree_skb_any (descr->skb); + descr->skb =NULL ;if (netif_msg_rx_err (card) &&net_ratelimit ())pr_err ("Could not iommu-map rx buffer\n" ); card->spider_stats.rx_iommu_map_error++;
@@ -646,6 +648,7 @@ static int spider_net_prepare_tx_descr(struct spider_net_card *card, struct sk_buff *skb) { + struct spider_net_descr_chain *chain = &card->tx_chain;struct spider_net_descr *descr;struct spider_net_hw_descr *hwdescr;dma_addr_t buf;
@@ -660,10 +663,15 @@ spider_net_prepare_tx_descr(struct spidereturn -ENOMEM ; } -spin_lock_irqsave (&card->tx_chain.lock, flags); +spin_lock_irqsave (&chain->lock, flags); descr = card->tx_chain.head; +if (descr->next == chain->tail->prev) { +spin_unlock_irqrestore (&chain->lock, flags); +pci_unmap_single (card->pdev, buf, skb->len,PCI_DMA_TODEVICE ); +return -ENOMEM ; + } hwdescr = descr->hwdescr; - card->tx_chain.head = descr->next; + chain->head = descr->next; descr->skb = skb; hwdescr->buf_addr = buf;
@@ -673,7 +681,7 @@ spider_net_prepare_tx_descr(struct spide hwdescr->dmac_cmd_status =SPIDER_NET_DESCR_CARDOWNED |SPIDER_NET_DMAC_NOCS ; -spin_unlock_irqrestore (&card->tx_chain.lock, flags); +spin_unlock_irqrestore (&chain->lock, flags);if (skb->protocol ==htons (ETH_P_IP ))switch (skb->nh.iph->protocol) {
@@ -802,6 +810,7 @@ spider_net_release_tx_chain(struct spide chain->tail = descr->next; hwdescr->dmac_cmd_status |=SPIDER_NET_DESCR_NOT_IN_USE ; skb = descr->skb; + descr->skb =NULL ; buf_addr = hwdescr->buf_addr;spin_unlock_irqrestore (&chain->lock, flags);
@@ -867,13 +876,10 @@ spider_net_xmit(struct sk_buff *skb, str {int cnt;struct spider_net_card *card =netdev_priv (netdev); -struct spider_net_descr_chain *chain = &card->tx_chain;spider_net_release_tx_chain (card,0 ); -if ((chain->head->next == chain->tail->prev) || - (spider_net_prepare_tx_descr (card, skb) !=0 )) { - +if (spider_net_prepare_tx_descr (card, skb) !=0 ) { card->netdev_stats.tx_dropped++;netif_stop_queue (netdev);return NETDEV_TX_BUSY ;
@@ -1091,6 +1097,7 @@ spider_net_decode_one_descr(struct spide bad_desc:dev_kfree_skb_irq (descr->skb); + descr->skb =NULL ; hwdescr->dmac_cmd_status =SPIDER_NET_DESCR_NOT_IN_USE ;return 0 ; }
PATCH 4/5 : spidernet: transmit race
In reply to Linas VepstasMultiple threads performing a transmit can race into the spidernet tx ring cleanup code. This puts the relevant check under a lock.
----
drivers/net/spider_net.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/net/spider_net.c +5 -1
@@ -767,8 +767,12 @@ spider_net_release_tx_chain(struct spideunsigned long flags;int status; -while (chain->tail != chain->head) { +while (1 ) {spin_lock_irqsave (&chain->lock, flags); +if (chain->tail == chain->head) { +spin_unlock_irqrestore (&chain->lock, flags); +return 0 ; + } descr = chain->tail; hwdescr = descr->hwdescr;
Janitorial patch. Undo long lines, fix typo in err msg.
----
drivers/net/spider_net.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
drivers/net/spider_net.c +7 -6
@@ -1017,14 +1017,15 @@ static void show_rx_chain(struct spider_#endif /** -* spider_net_decode_one_descr - processes an rx descriptor +* spider_net_decode_one_descr - processes an RX descriptor * @card: card structure * -* Returns 1 if a packet has been sent to the stack, otherwise 0 +* Returns 1 if a packet has been sent to the stack, otherwise 0. * -* Processes an rx descriptor by iommu-unmapping the data buffer and passing -* the packet up to the stack. This function is called in softirq -* context, e.g. either bottom half from interrupt or NAPI polling context +* Processes an RX descriptor by iommu-unmapping the data buffer +* and passing the packet up to the stack. This function is called +* in softirq context, e.g. either bottom half from interrupt or +* NAPI polling context. */ static int spider_net_decode_one_descr (struct spider_net_card *card)
@@ -1061,7 +1062,7 @@ spider_net_decode_one_descr(struct spideif ( (status !=SPIDER_NET_DESCR_COMPLETE ) && (status !=SPIDER_NET_DESCR_FRAME_END ) ) {if (netif_msg_rx_err (card)) -pr_err ("%s: RX descriptor with unkown state %d\n" , +pr_err ("%s: RX descriptor with unknown state %d\n" , card->netdev->name, status); card->spider_stats.rx_desc_unk_state++; goto bad_desc;
PATCH 5/5 : spidernet janitorial: typos
Resend, The subject line was wrong on the last one. End-of-day tiredness.
--linas
Janitorial patch. Undo long lines, fix typo in err msg.
----
drivers/net/spider_net.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
drivers/net/spider_net.c +7 -6
@@ -1017,14 +1017,15 @@ static void show_rx_chain(struct spider_#endif /** -* spider_net_decode_one_descr - processes an rx descriptor +* spider_net_decode_one_descr - processes an RX descriptor * @card: card structure * -* Returns 1 if a packet has been sent to the stack, otherwise 0 +* Returns 1 if a packet has been sent to the stack, otherwise 0. * -* Processes an rx descriptor by iommu-unmapping the data buffer and passing -* the packet up to the stack. This function is called in softirq -* context, e.g. either bottom half from interrupt or NAPI polling context +* Processes an RX descriptor by iommu-unmapping the data buffer +* and passing the packet up to the stack. This function is called +* in softirq context, e.g. either bottom half from interrupt or +* NAPI polling context. */ static int spider_net_decode_one_descr (struct spider_net_card *card)
@@ -1061,7 +1062,7 @@ spider_net_decode_one_descr(struct spideif ( (status !=SPIDER_NET_DESCR_COMPLETE ) && (status !=SPIDER_NET_DESCR_FRAME_END ) ) {if (netif_msg_rx_err (card)) -pr_err ("%s: RX descriptor with unkown state %d\n" , +pr_err ("%s: RX descriptor with unknown state %d\n" , card->netdev->name, status); card->spider_stats.rx_desc_unk_state++; goto bad_desc;