virtio: add debug/performance stats to network driver ifconfig down or remove the module to get the statistics dump. --- drivers/net/virtio_net.c | 110 ++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 94 insertions(+), 16 deletions(-) diff -r 30640b4c8afd drivers/net/virtio_net.c --- a/drivers/net/virtio_net.c Tue Jan 08 17:29:02 2008 +1100 +++ b/drivers/net/virtio_net.c Tue Jan 08 17:30:42 2008 +1100 @@ -45,6 +45,31 @@ struct virtnet_info /* Receive & send queues. */ struct sk_buff_head recv; struct sk_buff_head send; + + struct { + unsigned int kfree_xmit_skb; + unsigned int free_old_xmit_skbs_succeed; + unsigned int free_old_xmit_skbs_fail; + unsigned int sendq_kicks; + unsigned int sendq_packets; + unsigned int sendq_partial_csum; + unsigned int sendq_gso; + unsigned int sendq_sglen; + unsigned int sendq_full; + unsigned int sendq_enabled; + unsigned int sendq_enable_failed; + unsigned int sendq_cancelled; + unsigned int recvq_packets; + unsigned int recvq_refills; + unsigned int recvq_disabled; + unsigned int recvq_enabled; + unsigned int recvq_enable_failed; + unsigned int recvq_reschedule_failed; + unsigned int recvq_partial_csum; + unsigned int recvq_gso; + unsigned int recvq_kicks; + unsigned int poll; + } stats; }; static inline struct virtio_net_hdr *skb_vnet_hdr(struct sk_buff *skb) @@ -67,28 +92,31 @@ static void skb_xmit_done(struct virtque netif_wake_queue(vi->dev); } -static void receive_skb(struct net_device *dev, struct sk_buff *skb, +static void receive_skb(struct virtnet_info *vi, struct sk_buff *skb, unsigned len) { struct virtio_net_hdr *hdr = skb_vnet_hdr(skb); + vi->stats.recvq_packets++; + if (unlikely(len < sizeof(struct virtio_net_hdr) + ETH_HLEN)) { - pr_debug("%s: short packet %i\n", dev->name, len); - dev->stats.rx_length_errors++; + pr_debug("%s: short packet %i\n", vi->dev->name, len); + vi->dev->stats.rx_length_errors++; goto drop; } len -= sizeof(struct virtio_net_hdr); BUG_ON(len > MAX_PACKET_LEN); skb_trim(skb, len); - skb->protocol = eth_type_trans(skb, dev); + skb->protocol = eth_type_trans(skb, vi->dev); pr_debug("Receiving skb proto 0x%04x len %i type %i\n", ntohs(skb->protocol), skb->len, skb->pkt_type); - dev->stats.rx_bytes += skb->len; - dev->stats.rx_packets++; + vi->dev->stats.rx_bytes += skb->len; + vi->dev->stats.rx_packets++; if (hdr->flags & VIRTIO_NET_HDR_F_NEEDS_CSUM) { pr_debug("Needs csum!\n"); + vi->stats.recvq_partial_csum++; skb->ip_summed = CHECKSUM_PARTIAL; skb->csum_start = hdr->csum_start; skb->csum_offset = hdr->csum_offset; @@ -96,7 +124,7 @@ static void receive_skb(struct net_devic || skb->csum_offset > skb->len - 2) { if (net_ratelimit()) printk(KERN_WARNING "%s: csum=%u/%u len=%u\n", - dev->name, skb->csum_start, + vi->dev->name, skb->csum_start, skb->csum_offset, skb->len); goto frame_err; } @@ -104,6 +132,7 @@ static void receive_skb(struct net_devic if (hdr->gso_type != VIRTIO_NET_HDR_GSO_NONE) { pr_debug("GSO!\n"); + vi->stats.recvq_gso++; switch (hdr->gso_type) { case VIRTIO_NET_HDR_GSO_TCPV4: skb_shinfo(skb)->gso_type = SKB_GSO_TCPV4; @@ -120,7 +149,7 @@ static void receive_skb(struct net_devic default: if (net_ratelimit()) printk(KERN_WARNING "%s: bad gso type %u.\n", - dev->name, hdr->gso_type); + vi->dev->name, hdr->gso_type); goto frame_err; } @@ -128,7 +157,7 @@ static void receive_skb(struct net_devic if (skb_shinfo(skb)->gso_size == 0) { if (net_ratelimit()) printk(KERN_WARNING "%s: zero gso size.\n", - dev->name); + vi->dev->name); goto frame_err; } @@ -141,7 +170,7 @@ static void receive_skb(struct net_devic return; frame_err: - dev->stats.rx_frame_errors++; + vi->dev->stats.rx_frame_errors++; drop: dev_kfree_skb(skb); } @@ -173,6 +202,7 @@ static void try_fill_recv(struct virtnet } if (unlikely(vi->num > vi->max)) vi->max = vi->num; + vi->stats.recvq_kicks++; vi->rvq->vq_ops->kick(vi->rvq); } @@ -190,26 +220,33 @@ static int virtnet_poll(struct napi_stru struct sk_buff *skb = NULL; unsigned int len, received = 0; + vi->stats.poll++; again: while (received < budget && (skb = vi->rvq->vq_ops->get_buf(vi->rvq, &len)) != NULL) { __skb_unlink(skb, &vi->recv); - receive_skb(vi->dev, skb, len); + receive_skb(vi, skb, len); vi->num--; received++; } /* FIXME: If we oom and completely run out of inbufs, we need * to start a timer trying to fill more. */ - if (vi->num < vi->max / 2) + if (vi->num < vi->max / 2) { + vi->stats.recvq_refills++; try_fill_recv(vi); + } /* Out of packets? */ if (received < budget) { netif_rx_complete(vi->dev, napi); - if (unlikely(!vi->rvq->vq_ops->enable_cb(vi->rvq)) - && netif_rx_reschedule(vi->dev, napi)) - goto again; + vi->stats.recvq_enabled++; + if (unlikely(!vi->rvq->vq_ops->enable_cb(vi->rvq))) { + vi->stats.recvq_enable_failed++; + if (netif_rx_reschedule(vi->dev, napi)) + goto again; + vi->stats.recvq_reschedule_failed++; + } } return received; @@ -226,6 +263,7 @@ static unsigned free_old_xmit_skbs(struc vi->dev->stats.tx_bytes += len; vi->dev->stats.tx_packets++; kfree_skb(skb); + vi->stats.kfree_xmit_skb++; i++; } return i; @@ -244,12 +282,14 @@ static int start_xmit(struct sk_buff *sk pr_debug("%s: xmit %p %s\n", dev->name, skb, print_mac(mac, dest)); + vi->stats.sendq_packets++; /* Encode metadata header at front. */ hdr = skb_vnet_hdr(skb); if (skb->ip_summed == CHECKSUM_PARTIAL) { hdr->flags = VIRTIO_NET_HDR_F_NEEDS_CSUM; hdr->csum_start = skb->csum_start - skb_headroom(skb); hdr->csum_offset = skb->csum_offset; + vi->stats.sendq_partial_csum++; } else { hdr->flags = 0; hdr->csum_offset = hdr->csum_start = 0; @@ -257,6 +297,7 @@ static int start_xmit(struct sk_buff *sk if (skb_is_gso(skb)) { hdr->gso_size = skb_shinfo(skb)->gso_size; + vi->stats.sendq_gso++; if (skb_shinfo(skb)->gso_type & SKB_GSO_TCP_ECN) hdr->gso_type = VIRTIO_NET_HDR_GSO_TCPV4_ECN; else if (skb_shinfo(skb)->gso_type & SKB_GSO_TCPV4) @@ -275,21 +316,29 @@ static int start_xmit(struct sk_buff *sk vnet_hdr_to_sg(sg, skb); num = skb_to_sgvec(skb, sg+1, 0, skb->len) + 1; __skb_queue_head(&vi->send, skb); + vi->stats.sendq_sglen += num; again: err = vi->svq->vq_ops->add_buf(vi->svq, sg, num, 0, skb); if (err) { + vi->stats.sendq_full++; + /* Can we free any used skbs? */ - if (free_old_xmit_skbs(vi)) + if (free_old_xmit_skbs(vi)) { + vi->stats.free_old_xmit_skbs_succeed++; goto again; + } + vi->stats.free_old_xmit_skbs_fail++; pr_debug("%s: virtio not prepared to send\n", dev->name); netif_stop_queue(dev); /* Activate callback for using skbs: if this fails it * means some were used in the meantime. */ + vi->stats.sendq_enabled++; if (unlikely(!vi->svq->vq_ops->enable_cb(vi->svq))) { printk("Unlikely: restart svq failed\n"); + vi->stats.sendq_enable_failed++; netif_start_queue(dev); goto again; } @@ -297,6 +346,7 @@ again: return NETDEV_TX_BUSY; } + vi->stats.sendq_kicks++; vi->svq->vq_ops->kick(vi->svq); return 0; @@ -342,6 +392,34 @@ static int virtnet_close(struct net_devi kfree_skb(skb); BUG_ON(vi->num != 0); + + printk("Stats for %s\n", dev->name); + printk("kfree_xmit_skb = %u\n", vi->stats.kfree_xmit_skb); + printk("free_old_xmit_skbs_succeed = %u\n", + vi->stats.free_old_xmit_skbs_succeed); + printk("free_old_xmit_skbs_fail = %u\n", + vi->stats.free_old_xmit_skbs_fail); + printk("sendq_kicks = %u\n", vi->stats.sendq_kicks); + printk("sendq_packets = %u\n", vi->stats.sendq_packets); + printk("sendq_partial_csum = %u\n", vi->stats.sendq_partial_csum); + printk("sendq_gso = %u\n", vi->stats.sendq_gso); + printk("sendq_sglen = %u\n", vi->stats.sendq_sglen); + printk("sendq_full = %u\n", vi->stats.sendq_full); + printk("sendq_enable = %u\n", vi->stats.sendq_enabled); + printk("sendq_enable_failed = %u\n", vi->stats.sendq_enable_failed); + printk("sendq_cancelled = %u\n", vi->stats.sendq_cancelled); + printk("recvq_packets = %u\n", vi->stats.recvq_packets); + printk("recvq_refills = %u\n", vi->stats.recvq_refills); + printk("recvq_disabled = %u\n", vi->stats.recvq_disabled); + printk("recvq_enabled = %u\n", vi->stats.recvq_enabled); + printk("recvq_enable_failed = %u\n", vi->stats.recvq_enable_failed); + printk("recvq_reschedule_failed = %u\n", + vi->stats.recvq_reschedule_failed); + printk("recvq_partial_csum = %u\n", vi->stats.recvq_partial_csum); + printk("recvq_gso = %u\n", vi->stats.recvq_gso); + printk("recvq_kicks = %u\n", vi->stats.recvq_kicks); + printk("poll = %u\n", vi->stats.poll); + return 0; }