lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Wed, 23 Jan 2013 18:46:37 +0000 From: "Choi, David" <David.Choi@...rel.Com> To: "netdev@...r.kernel.org" <netdev@...r.kernel.org> CC: "Doong, Ping" <Ping.Doong@...rel.Com>, "Choi, David" <David.Choi@...rel.Com>, "davem@...emloft.net" <davem@...emloft.net>, "joe@...ches.com" <joe@...ches.com>, "bhutchings@...arflare.com" <bhutchings@...arflare.com> Subject: [PATCH net-next] drivers/net/ethernet/micrel/ks8851_mll: Implement basic statistics From: David J. Choi <david.choi@...rel.com> Summary of changes: add codes to collect basic statistical information about Ethernet packets. Signed-off-by: David J. Choi <david.choi@...rel.com> --- --- net-next/drivers/net/ethernet/micrel/ks8851_mll.c.orig 2013-01-22 17:25:59.000000000 -0800 +++ net-next/drivers/net/ethernet/micrel/ks8851_mll.c 2013-01-23 10:31:24.000000000 -0800 @@ -793,17 +793,35 @@ static void ks_rcv(struct ks_net *ks, st frame_hdr = ks->frame_head_info; while (ks->frame_cnt--) { skb = netdev_alloc_skb(netdev, frame_hdr->len + 16); - if (likely(skb && (frame_hdr->sts & RXFSHR_RXFV) && + if (unlikely(!skb)) { + /* discard the packet from the device */ + ks_wrreg16(ks, KS_RXQCR, ks->rc_rxqcr | RXQCR_RRXEF); + netdev->stats.rx_dropped++; + } + + else if (likely((frame_hdr->sts & RXFSHR_RXFV) && (frame_hdr->len < RX_BUF_SIZE) && frame_hdr->len)) { skb_reserve(skb, 2); /* read data block including CRC 4 bytes */ ks_read_qmu(ks, (u16 *)skb->data, frame_hdr->len); - skb_put(skb, frame_hdr->len); + + /* exclude the size of CRC */ + skb_put(skb, frame_hdr->len - 4); skb->protocol = eth_type_trans(skb, netdev); netif_rx(skb); + netdev->stats.rx_packets++; + + /* crc field */ + netdev->stats.rx_bytes += frame_hdr->len - 4; } else { - pr_err("%s: err:skb alloc\n", __func__); - ks_wrreg16(ks, KS_RXQCR, (ks->rc_rxqcr | RXQCR_RRXEF)); + /* discard the packet from the device */ + ks_wrreg16(ks, KS_RXQCR, ks->rc_rxqcr | RXQCR_RRXEF); + netdev->stats.rx_dropped++; + if (frame_hdr->len >= RX_BUF_SIZE || !frame_hdr->len) + netdev->stats.rx_length_errors++; + if (!(frame_hdr->sts & RXFSHR_RXFV)) + netdev->stats.rx_frame_errors++; + if (skb) dev_kfree_skb_irq(skb); } @@ -876,6 +894,8 @@ static irqreturn_t ks_irq(int irq, void pmecr &= ~PMECR_WKEVT_MASK; ks_wrreg16(ks, KS_PMECR, pmecr | PMECR_WKEVT_LINK); } + if (unlikely(status & IRQ_RXOI)) + ks->netdev->stats.rx_over_errors++; /* this should be the last in IRQ handler*/ ks_restore_cmd_reg(ks); @@ -1015,6 +1035,8 @@ static int ks_start_xmit(struct sk_buff if (likely(ks_tx_fifo_space(ks) >= skb->len + 12)) { ks_write_qmu(ks, skb->data, skb->len); + netdev->stats.tx_bytes += skb->len; + netdev->stats.tx_packets++; dev_kfree_skb(skb); } else retv = NETDEV_TX_BUSY; --- -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists