Skip to content

L
linux
Commit 1a18abaa authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files
Options

tulip: use integrated netdev stats 

struct tulip_private is a bit large (order-1 allocation even on 32bit
arch), try to shrink it, remove its net_device_stats field.
Signed-off-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ae8abfa0
Hide whitespace changes
Inline Side-by-side
Showing with 50 additions and 40 deletions
drivers/net/tulip/interrupt.c
View file @ 1a18abaa
...@@ -180,21 +180,24 @@ int tulip_poll(struct napi_struct *napi, int budget) ...@@ -180,21 +180,24 @@ int tulip_poll(struct napi_struct *napi, int budget)
dev_warn(&dev->dev, dev_warn(&dev->dev,
"Oversized Ethernet frame spanned multiple buffers, status %08x!\n", "Oversized Ethernet frame spanned multiple buffers, status %08x!\n",
status); status);
tp->stats.rx_length_errors++; dev->stats.rx_length_errors++;
} }
} else { } else {
/* There was a fatal error. */ /* There was a fatal error. */
if (tulip_debug > 2) if (tulip_debug > 2)
printk(KERN_DEBUG "%s: Receive error, Rx status %08x\n", printk(KERN_DEBUG "%s: Receive error, Rx status %08x\n",
dev->name, status); dev->name, status);
tp->stats.rx_errors++; /* end of a packet.*/ dev->stats.rx_errors++; /* end of a packet.*/
if (pkt_len > 1518 || if (pkt_len > 1518 ||
(status & RxDescRunt)) (status & RxDescRunt))
tp->stats.rx_length_errors++; dev->stats.rx_length_errors++;
if (status & 0x0004) tp->stats.rx_frame_errors++; if (status & 0x0004)
if (status & 0x0002) tp->stats.rx_crc_errors++; dev->stats.rx_frame_errors++;
if (status & 0x0001) tp->stats.rx_fifo_errors++; if (status & 0x0002)
dev->stats.rx_crc_errors++;
if (status & 0x0001)
dev->stats.rx_fifo_errors++;
} }
} else { } else {
struct sk_buff *skb; struct sk_buff *skb;
...@@ -244,8 +247,8 @@ int tulip_poll(struct napi_struct *napi, int budget) ...@@ -244,8 +247,8 @@ int tulip_poll(struct napi_struct *napi, int budget)
netif_receive_skb(skb); netif_receive_skb(skb);
tp->stats.rx_packets++; dev->stats.rx_packets++;
tp->stats.rx_bytes += pkt_len; dev->stats.rx_bytes += pkt_len;
} }
#ifdef CONFIG_TULIP_NAPI_HW_MITIGATION #ifdef CONFIG_TULIP_NAPI_HW_MITIGATION
received++; received++;
...@@ -404,20 +407,23 @@ static int tulip_rx(struct net_device *dev) ...@@ -404,20 +407,23 @@ static int tulip_rx(struct net_device *dev)
dev_warn(&dev->dev, dev_warn(&dev->dev,
"Oversized Ethernet frame spanned multiple buffers, status %08x!\n", "Oversized Ethernet frame spanned multiple buffers, status %08x!\n",
status); status);
tp->stats.rx_length_errors++; dev->stats.rx_length_errors++;
} }
} else { } else {
/* There was a fatal error. */ /* There was a fatal error. */
if (tulip_debug > 2) if (tulip_debug > 2)
printk(KERN_DEBUG "%s: Receive error, Rx status %08x\n", printk(KERN_DEBUG "%s: Receive error, Rx status %08x\n",
dev->name, status); dev->name, status);
tp->stats.rx_errors++; /* end of a packet.*/ dev->stats.rx_errors++; /* end of a packet.*/
if (pkt_len > 1518 || if (pkt_len > 1518 ||
(status & RxDescRunt)) (status & RxDescRunt))
tp->stats.rx_length_errors++; dev->stats.rx_length_errors++;
if (status & 0x0004) tp->stats.rx_frame_errors++; if (status & 0x0004)
if (status & 0x0002) tp->stats.rx_crc_errors++; dev->stats.rx_frame_errors++;
if (status & 0x0001) tp->stats.rx_fifo_errors++; if (status & 0x0002)
dev->stats.rx_crc_errors++;
if (status & 0x0001)
dev->stats.rx_fifo_errors++;
} }
} else { } else {
struct sk_buff *skb; struct sk_buff *skb;
...@@ -467,8 +473,8 @@ static int tulip_rx(struct net_device *dev) ...@@ -467,8 +473,8 @@ static int tulip_rx(struct net_device *dev)
netif_rx(skb); netif_rx(skb);
tp->stats.rx_packets++; dev->stats.rx_packets++;
tp->stats.rx_bytes += pkt_len; dev->stats.rx_bytes += pkt_len;
} }
received++; received++;
entry = (++tp->cur_rx) % RX_RING_SIZE; entry = (++tp->cur_rx) % RX_RING_SIZE;
...@@ -602,18 +608,22 @@ irqreturn_t tulip_interrupt(int irq, void *dev_instance) ...@@ -602,18 +608,22 @@ irqreturn_t tulip_interrupt(int irq, void *dev_instance)
printk(KERN_DEBUG "%s: Transmit error, Tx status %08x\n", printk(KERN_DEBUG "%s: Transmit error, Tx status %08x\n",
dev->name, status); dev->name, status);
#endif #endif
tp->stats.tx_errors++; dev->stats.tx_errors++;
if (status & 0x4104) tp->stats.tx_aborted_errors++; if (status & 0x4104)
if (status & 0x0C00) tp->stats.tx_carrier_errors++; dev->stats.tx_aborted_errors++;
if (status & 0x0200) tp->stats.tx_window_errors++; if (status & 0x0C00)
if (status & 0x0002) tp->stats.tx_fifo_errors++; dev->stats.tx_carrier_errors++;
if (status & 0x0200)
dev->stats.tx_window_errors++;
if (status & 0x0002)
dev->stats.tx_fifo_errors++;
if ((status & 0x0080) && tp->full_duplex == 0) if ((status & 0x0080) && tp->full_duplex == 0)
tp->stats.tx_heartbeat_errors++; dev->stats.tx_heartbeat_errors++;
} else { } else {
tp->stats.tx_bytes += dev->stats.tx_bytes +=
tp->tx_buffers[entry].skb->len; tp->tx_buffers[entry].skb->len;
tp->stats.collisions += (status >> 3) & 15; dev->stats.collisions += (status >> 3) & 15;
tp->stats.tx_packets++; dev->stats.tx_packets++;
} }
pci_unmap_single(tp->pdev, tp->tx_buffers[entry].mapping, pci_unmap_single(tp->pdev, tp->tx_buffers[entry].mapping,
...@@ -655,7 +665,8 @@ irqreturn_t tulip_interrupt(int irq, void *dev_instance) ...@@ -655,7 +665,8 @@ irqreturn_t tulip_interrupt(int irq, void *dev_instance)
if (csr5 & AbnormalIntr) { /* Abnormal error summary bit. */ if (csr5 & AbnormalIntr) { /* Abnormal error summary bit. */
if (csr5 == 0xffffffff) if (csr5 == 0xffffffff)
break; break;
if (csr5 & TxJabber) tp->stats.tx_errors++; if (csr5 & TxJabber)
dev->stats.tx_errors++;
if (csr5 & TxFIFOUnderflow) { if (csr5 & TxFIFOUnderflow) {
if ((tp->csr6 & 0xC000) != 0xC000) if ((tp->csr6 & 0xC000) != 0xC000)
tp->csr6 += 0x4000; /* Bump up the Tx threshold */ tp->csr6 += 0x4000; /* Bump up the Tx threshold */
...@@ -672,8 +683,8 @@ irqreturn_t tulip_interrupt(int irq, void *dev_instance) ...@@ -672,8 +683,8 @@ irqreturn_t tulip_interrupt(int irq, void *dev_instance)
} }
} }
if (csr5 & RxDied) { /* Missed a Rx frame. */ if (csr5 & RxDied) { /* Missed a Rx frame. */
tp->stats.rx_missed_errors += ioread32(ioaddr + CSR8) & 0xffff; dev->stats.rx_missed_errors += ioread32(ioaddr + CSR8) & 0xffff;
tp->stats.rx_errors++; dev->stats.rx_errors++;
tulip_start_rxtx(tp); tulip_start_rxtx(tp);
} }
/* /*
...@@ -789,7 +800,7 @@ irqreturn_t tulip_interrupt(int irq, void *dev_instance) ...@@ -789,7 +800,7 @@ irqreturn_t tulip_interrupt(int irq, void *dev_instance)
#endif /* CONFIG_TULIP_NAPI */ #endif /* CONFIG_TULIP_NAPI */
if ((missed = ioread32(ioaddr + CSR8) & 0x1ffff)) { if ((missed = ioread32(ioaddr + CSR8) & 0x1ffff)) {
tp->stats.rx_dropped += missed & 0x10000 ? 0x10000 : missed; dev->stats.rx_dropped += missed & 0x10000 ? 0x10000 : missed;
} }
if (tulip_debug > 4) if (tulip_debug > 4)
......
drivers/net/tulip/tulip.h
View file @ 1a18abaa
...@@ -417,7 +417,6 @@ struct tulip_private { ...@@ -417,7 +417,6 @@ struct tulip_private {
int revision; int revision;
int flags; int flags;
struct napi_struct napi; struct napi_struct napi;
struct net_device_stats stats;
struct timer_list timer; /* Media selection timer. */ struct timer_list timer; /* Media selection timer. */
struct timer_list oom_timer; /* Out of memory timer. */ struct timer_list oom_timer; /* Out of memory timer. */
u32 mc_filter[2]; u32 mc_filter[2];
...@@ -570,7 +569,7 @@ static inline void tulip_tx_timeout_complete(struct tulip_private *tp, void __io ...@@ -570,7 +569,7 @@ static inline void tulip_tx_timeout_complete(struct tulip_private *tp, void __io
/* Trigger an immediate transmit demand. */ /* Trigger an immediate transmit demand. */
iowrite32(0, ioaddr + CSR1); iowrite32(0, ioaddr + CSR1);
tp->stats.tx_errors++; tp->dev->stats.tx_errors++;
} }
#endif /* __NET_TULIP_H__ */ #endif /* __NET_TULIP_H__ */
drivers/net/tulip/tulip_core.c
View file @ 1a18abaa
...@@ -725,7 +725,7 @@ static void tulip_clean_tx_ring(struct tulip_private *tp) ...@@ -725,7 +725,7 @@ static void tulip_clean_tx_ring(struct tulip_private *tp)
int status = le32_to_cpu(tp->tx_ring[entry].status); int status = le32_to_cpu(tp->tx_ring[entry].status);
if (status < 0) { if (status < 0) {
tp->stats.tx_errors++; /* It wasn't Txed */ tp->dev->stats.tx_errors++; /* It wasn't Txed */
tp->tx_ring[entry].status = 0; tp->tx_ring[entry].status = 0;
} }
...@@ -781,8 +781,8 @@ static void tulip_down (struct net_device *dev) ...@@ -781,8 +781,8 @@ static void tulip_down (struct net_device *dev)
/* release any unconsumed transmit buffers */ /* release any unconsumed transmit buffers */
tulip_clean_tx_ring(tp); tulip_clean_tx_ring(tp);
if (ioread32 (ioaddr + CSR6) != 0xffffffff) if (ioread32(ioaddr + CSR6) != 0xffffffff)
tp->stats.rx_missed_errors += ioread32 (ioaddr + CSR8) & 0xffff; dev->stats.rx_missed_errors += ioread32(ioaddr + CSR8) & 0xffff;
spin_unlock_irqrestore (&tp->lock, flags); spin_unlock_irqrestore (&tp->lock, flags);
...@@ -864,12 +864,12 @@ static struct net_device_stats *tulip_get_stats(struct net_device *dev) ...@@ -864,12 +864,12 @@ static struct net_device_stats *tulip_get_stats(struct net_device *dev)
spin_lock_irqsave (&tp->lock, flags); spin_lock_irqsave (&tp->lock, flags);
tp->stats.rx_missed_errors += ioread32(ioaddr + CSR8) & 0xffff; dev->stats.rx_missed_errors += ioread32(ioaddr + CSR8) & 0xffff;
spin_unlock_irqrestore(&tp->lock, flags); spin_unlock_irqrestore(&tp->lock, flags);
} }
return &tp->stats; return &dev->stats;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7