Re: [V2 RFC net-next PATCH 2/2] virtio_net: export more statistics through ethtool
On Fri, Jun 08, 2012 at 11:35:25AM +0800, Jason Wang wrote: @@ -655,7 +695,17 @@ static netdev_tx_t start_xmit(struct sk_buff *skb, struct net_device *dev) kfree_skb(skb); return NETDEV_TX_OK; } -virtqueue_kick(vi-svq); + +kick = virtqueue_kick_prepare(vi-svq); +if (unlikely(kick)) +virtqueue_notify(vi-svq); + +u64_stats_update_begin(stats-syncp); +if (unlikely(kick)) +stats-data[VIRTNET_TX_KICKS]++; +stats-data[VIRTNET_TX_Q_BYTES] += skb-len; +stats-data[VIRTNET_TX_Q_PACKETS]++; is this statistic interesting? how about decrementing when we free? this way we see how many are pending.. Currently we didn't have per-vq statistics but per-cpu, so the skb could be sent by one vcpu and freed by another. Pehaps another reason to use per-queue satistics. For transmit, it could be done easily as we both send and free skbs under a lock. I'm not sure how acceptable it is to take a lock in get_stats but send a separate patch like this and we'll see what others say. -- MST ___ Virtualization mailing list Virtualization@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Re: [V2 RFC net-next PATCH 2/2] virtio_net: export more statistics through ethtool
On Fri, Jun 08, 2012 at 11:35:25AM +0800, Jason Wang wrote: @@ -655,7 +695,17 @@ static netdev_tx_t start_xmit(struct sk_buff *skb, struct net_device *dev) kfree_skb(skb); return NETDEV_TX_OK; } -virtqueue_kick(vi-svq); + +kick = virtqueue_kick_prepare(vi-svq); +if (unlikely(kick)) +virtqueue_notify(vi-svq); + +u64_stats_update_begin(stats-syncp); +if (unlikely(kick)) +stats-data[VIRTNET_TX_KICKS]++; +stats-data[VIRTNET_TX_Q_BYTES] += skb-len; +stats-data[VIRTNET_TX_Q_PACKETS]++; is this statistic interesting? how about decrementing when we free? this way we see how many are pending.. Currently we didn't have per-vq statistics but per-cpu, so the skb could be sent by one vcpu and freed by another. Pehaps another reason to use per-queue satistics. Just to stress these things do not need to contradict: you can have per cpu stats for each queue. -- MST ___ Virtualization mailing list Virtualization@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Re: [V2 RFC net-next PATCH 2/2] virtio_net: export more statistics through ethtool
On Wed, 2012-06-06 at 15:52 +0800, Jason Wang wrote:
Satistics counters is useful for debugging and performance optimization, so
this
patch lets virtio_net driver collect following and export them to userspace
through ethtool -S:
- number of packets sent/received
- number of bytes sent/received
- number of callbacks for tx/rx
- number of kick for tx/rx
- number of bytes/packets queued for tx
As virtnet_stats were per-cpu, so both per-cpu and gloabl satistics were
collected like:
[...]
I would really like to see some sort of convention for presenting
per-queue statistics through ethtool. At the moment we have a complete
mess of different formats:
bnx2x:[${index}]: ${name}
be2net: ${qtype}q${index}: ${name}
ehea: PR${index} ${name}
mlx4_en: ${qtype}${index}_${name}
myri10ge: dummy stat names as headings
niu: dummy stat names as headings
s2io: ring_${index}_${name}
vmxnet3: dummy stat names as headings
vxge: ${name}_${index}; also dummy stat names as headings
And you're introducing yet another format!
(Additionally some of the drivers are playing games with spaces and tabs
to make ethtool indent the stats the way they like. Ethtool statistics
are inconsistent enough already without drivers pulling that sort of
crap.
I'm inclined to make ethtool start stripping whitespace from stat names,
and *if* people can agree on a common format for per-queue statistic
names then I'll indent them *consistently*. Also, I would make such
stats optional, so you don't get hundreds of lines of crap by default.)
Ben.
--
Ben Hutchings, Staff Engineer, Solarflare
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.
___
Virtualization mailing list
Virtualization@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Re: [V2 RFC net-next PATCH 2/2] virtio_net: export more statistics through ethtool
From: Ben Hutchings bhutchi...@solarflare.com
Date: Thu, 7 Jun 2012 18:15:06 +0100
I would really like to see some sort of convention for presenting
per-queue statistics through ethtool. At the moment we have a complete
mess of different formats:
Indeed. Probably ${QUEUE_TYPE}-${INDEX}-${STATISTIC} is best.
With an agreed upon list of queue types such as rx, tx, rxtx
etc.
___
Virtualization mailing list
Virtualization@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Re: [V2 RFC net-next PATCH 2/2] virtio_net: export more statistics through ethtool
On Thu, 2012-06-07 at 13:05 -0700, David Miller wrote:
From: Ben Hutchings bhutchi...@solarflare.com
Date: Thu, 7 Jun 2012 18:15:06 +0100
I would really like to see some sort of convention for presenting
per-queue statistics through ethtool. At the moment we have a complete
mess of different formats:
Indeed. Probably ${QUEUE_TYPE}-${INDEX}-${STATISTIC} is best.
With an agreed upon list of queue types such as rx, tx, rxtx
etc.
I think we should leave the type names open-ended, as there are other
useful groupings like per-virtual-port. In that case the separator
should be chosen to allow arbitrary type names without ambiguity.
Ben.
--
Ben Hutchings, Staff Engineer, Solarflare
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.
___
Virtualization mailing list
Virtualization@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Re: [V2 RFC net-next PATCH 2/2] virtio_net: export more statistics through ethtool
On 06/07/2012 01:24 PM, Ben Hutchings wrote:
On Thu, 2012-06-07 at 13:05 -0700, David Miller wrote:
From: Ben Hutchingsbhutchi...@solarflare.com
Date: Thu, 7 Jun 2012 18:15:06 +0100
I would really like to see some sort of convention for presenting
per-queue statistics through ethtool. At the moment we have a complete
mess of different formats:
Indeed. Probably ${QUEUE_TYPE}-${INDEX}-${STATISTIC} is best.
With an agreed upon list of queue types such as rx, tx, rxtx
etc.
I think we should leave the type names open-ended, as there are other
useful groupings like per-virtual-port. In that case the separator
should be chosen to allow arbitrary type names without ambiguity.
So you mean like something along the lines of the presence of say '.'
indicating indent a level:
rx_bytes: 1234
myqueue1.rx_bytes: 234
myqueue2.rx_bytes: 345
...
rick jones
___
Virtualization mailing list
Virtualization@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Re: [V2 RFC net-next PATCH 2/2] virtio_net: export more statistics through ethtool
On Thu, 2012-06-07 at 13:39 -0700, Rick Jones wrote:
On 06/07/2012 01:24 PM, Ben Hutchings wrote:
On Thu, 2012-06-07 at 13:05 -0700, David Miller wrote:
From: Ben Hutchingsbhutchi...@solarflare.com
Date: Thu, 7 Jun 2012 18:15:06 +0100
I would really like to see some sort of convention for presenting
per-queue statistics through ethtool. At the moment we have a complete
mess of different formats:
Indeed. Probably ${QUEUE_TYPE}-${INDEX}-${STATISTIC} is best.
With an agreed upon list of queue types such as rx, tx, rxtx
etc.
I think we should leave the type names open-ended, as there are other
useful groupings like per-virtual-port. In that case the separator
should be chosen to allow arbitrary type names without ambiguity.
So you mean like something along the lines of the presence of say '.'
indicating indent a level:
rx_bytes: 1234
myqueue1.rx_bytes: 234
myqueue2.rx_bytes: 345
...
Most drivers seem to want this sort of ordering/grouping:
group0.foo
group0.bar
...
group1.foo
group1.bar
...
but if we have a standard way of indicating groups of statistics then
the user can choose whether they want to reorder by type name.
Ben.
--
Ben Hutchings, Staff Engineer, Solarflare
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.
___
Virtualization mailing list
Virtualization@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Re: [V2 RFC net-next PATCH 2/2] virtio_net: export more statistics through ethtool
On Thu, 2012-06-07 at 21:56 +0100, Ben Hutchings wrote:
On Thu, 2012-06-07 at 13:39 -0700, Rick Jones wrote:
On 06/07/2012 01:24 PM, Ben Hutchings wrote:
On Thu, 2012-06-07 at 13:05 -0700, David Miller wrote:
From: Ben Hutchingsbhutchi...@solarflare.com
Date: Thu, 7 Jun 2012 18:15:06 +0100
I would really like to see some sort of convention for presenting
per-queue statistics through ethtool. At the moment we have a complete
mess of different formats:
Indeed. Probably ${QUEUE_TYPE}-${INDEX}-${STATISTIC} is best.
With an agreed upon list of queue types such as rx, tx, rxtx
etc.
I think we should leave the type names open-ended, as there are other
useful groupings like per-virtual-port. In that case the separator
should be chosen to allow arbitrary type names without ambiguity.
So you mean like something along the lines of the presence of say '.'
indicating indent a level:
rx_bytes: 1234
myqueue1.rx_bytes: 234
myqueue2.rx_bytes: 345
...
Most drivers seem to want this sort of ordering/grouping:
group0.foo
group0.bar
...
group1.foo
group1.bar
...
but if we have a standard way of indicating groups of statistics then
the user can choose whether they want to reorder by type name.
I mean, whether they want to reorder/regroup by the final part of the
statistic name.
Ben.
--
Ben Hutchings, Staff Engineer, Solarflare
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.
___
Virtualization mailing list
Virtualization@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Re: [V2 RFC net-next PATCH 2/2] virtio_net: export more statistics through ethtool
On Wed, Jun 06, 2012 at 03:52:17PM +0800, Jason Wang wrote:
Satistics counters is useful for debugging and performance optimization, so
this
patch lets virtio_net driver collect following and export them to userspace
through ethtool -S:
- number of packets sent/received
- number of bytes sent/received
- number of callbacks for tx/rx
- number of kick for tx/rx
- number of bytes/packets queued for tx
As virtnet_stats were per-cpu, so both per-cpu and gloabl satistics were
collected like:
NIC statistics:
tx_bytes[0]: 1731209929
tx_packets[0]: 60685
tx_kicks[0]: 63
tx_callbacks[0]: 73
tx_queued_bytes[0]: 1935749360
tx_queued_packets[0]: 80652
rx_bytes[0]: 2695648
rx_packets[0]: 40767
rx_kicks[0]: 1
rx_callbacks[0]: 2077
tx_bytes[1]: 9105588697
tx_packets[1]: 344150
tx_kicks[1]: 162
tx_callbacks[1]: 905
tx_queued_bytes[1]: 8901049412
tx_queued_packets[1]: 324184
rx_bytes[1]: 23679828
rx_packets[1]: 358770
rx_kicks[1]: 6
rx_callbacks[1]: 17717
tx_bytes: 10836798626
tx_packets: 404835
tx_kicks: 225
tx_callbacks: 978
tx_queued_bytes: 10836798772
tx_queued_packets: 404836
rx_bytes: 26375476
rx_packets: 399537
rx_kicks: 7
rx_callbacks: 19794
TODO:
- more statistics
- calculate the pending bytes/pkts
Signed-off-by: Jason Wang jasow...@redhat.com
---
Changes from v1:
- style typo fixs
- convert the statistics fields to array
- use unlikely()
---
drivers/net/virtio_net.c | 115
+-
1 files changed, 113 insertions(+), 2 deletions(-)
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 6e4aa6f..909a0a7 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -44,8 +44,14 @@ module_param(gso, bool, 0444);
enum virtnet_stats_type {
VIRTNET_TX_BYTES,
VIRTNET_TX_PACKETS,
+ VIRTNET_TX_KICKS,
+ VIRTNET_TX_CBS,
+ VIRTNET_TX_Q_BYTES,
+ VIRTNET_TX_Q_PACKETS,
VIRTNET_RX_BYTES,
VIRTNET_RX_PACKETS,
+ VIRTNET_RX_KICKS,
+ VIRTNET_RX_CBS,
VIRTNET_NUM_STATS,
};
@@ -54,6 +60,21 @@ struct virtnet_stats {
u64 data[VIRTNET_NUM_STATS];
};
+static struct {
+ char string[ETH_GSTRING_LEN];
+} virtnet_stats_str_attr[] = {
+ { tx_bytes },
+ { tx_packets },
+ { tx_kicks },
+ { tx_callbacks },
+ { tx_queued_bytes },
+ { tx_queued_packets },
+ { rx_bytes },
+ { rx_packets },
+ { rx_kicks },
+ { rx_callbacks },
+};
+
struct virtnet_info {
struct virtio_device *vdev;
struct virtqueue *rvq, *svq, *cvq;
@@ -146,6 +167,11 @@ static struct page *get_a_page(struct virtnet_info *vi,
gfp_t gfp_mask)
static void skb_xmit_done(struct virtqueue *svq)
{
struct virtnet_info *vi = svq-vdev-priv;
+ struct virtnet_stats *stats = this_cpu_ptr(vi-stats);
+
+ u64_stats_update_begin(stats-syncp);
+ stats-data[VIRTNET_TX_CBS]++;
+ u64_stats_update_end(stats-syncp);
/* Suppress further interrupts. */
virtqueue_disable_cb(svq);
@@ -465,6 +491,7 @@ static bool try_fill_recv(struct virtnet_info *vi, gfp_t
gfp)
{
int err;
bool oom;
+ struct virtnet_stats *stats = this_cpu_ptr(vi-stats);
do {
if (vi-mergeable_rx_bufs)
@@ -481,13 +508,24 @@ static bool try_fill_recv(struct virtnet_info *vi,
gfp_t gfp)
} while (err 0);
if (unlikely(vi-num vi-max))
vi-max = vi-num;
- virtqueue_kick(vi-rvq);
+ if (virtqueue_kick_prepare(vi-rvq)) {
+ virtqueue_notify(vi-rvq);
+ u64_stats_update_begin(stats-syncp);
+ stats-data[VIRTNET_RX_KICKS]++;
+ u64_stats_update_end(stats-syncp);
+ }
return !oom;
}
static void skb_recv_done(struct virtqueue *rvq)
{
struct virtnet_info *vi = rvq-vdev-priv;
+ struct virtnet_stats *stats = this_cpu_ptr(vi-stats);
+
+ u64_stats_update_begin(stats-syncp);
+ stats-data[VIRTNET_RX_CBS]++;
+ u64_stats_update_end(stats-syncp);
+
/* Schedule NAPI, Suppress further interrupts if successful. */
if (napi_schedule_prep(vi-napi)) {
virtqueue_disable_cb(rvq);
@@ -630,7 +668,9 @@ static int xmit_skb(struct virtnet_info *vi, struct
sk_buff *skb)
static netdev_tx_t start_xmit(struct sk_buff *skb, struct net_device *dev)
{
struct virtnet_info *vi = netdev_priv(dev);
+ struct virtnet_stats *stats = this_cpu_ptr(vi-stats);
int capacity;
+ bool kick;
/* Free up any pending old buffers before queueing new ones. */
free_old_xmit_skbs(vi);
@@ -655,7 +695,17 @@ static netdev_tx_t start_xmit(struct sk_buff *skb,
struct net_device *dev)
kfree_skb(skb);
return NETDEV_TX_OK;
Re: [V2 RFC net-next PATCH 2/2] virtio_net: export more statistics through ethtool
On 06/08/2012 04:56 AM, Ben Hutchings wrote:
On Thu, 2012-06-07 at 13:39 -0700, Rick Jones wrote:
On 06/07/2012 01:24 PM, Ben Hutchings wrote:
On Thu, 2012-06-07 at 13:05 -0700, David Miller wrote:
From: Ben Hutchingsbhutchi...@solarflare.com
Date: Thu, 7 Jun 2012 18:15:06 +0100
I would really like to see some sort of convention for presenting
per-queue statistics through ethtool. At the moment we have a complete
mess of different formats:
Indeed. Probably ${QUEUE_TYPE}-${INDEX}-${STATISTIC} is best.
With an agreed upon list of queue types such as rx, tx, rxtx
etc.
I think we should leave the type names open-ended, as there are other
useful groupings like per-virtual-port. In that case the separator
should be chosen to allow arbitrary type names without ambiguity.
So you mean like something along the lines of the presence of say '.'
indicating indent a level:
rx_bytes: 1234
myqueue1.rx_bytes: 234
myqueue2.rx_bytes: 345
...
Most drivers seem to want this sort of ordering/grouping:
group0.foo
group0.bar
...
group1.foo
group1.bar
...
but if we have a standard way of indicating groups of statistics then
the user can choose whether they want to reorder by type name.
Ben.
Yes, it looks to me that the per-queue satistics were better:
- Simple and less synchronization.
- Good for future virtio-net multiqueue merging.
___
Virtualization mailing list
Virtualization@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Re: [V2 RFC net-next PATCH 2/2] virtio_net: export more statistics through ethtool
On 06/08/2012 06:19 AM, Michael S. Tsirkin wrote:
On Wed, Jun 06, 2012 at 03:52:17PM +0800, Jason Wang wrote:
Satistics counters is useful for debugging and performance optimization, so
this
patch lets virtio_net driver collect following and export them to userspace
through ethtool -S:
- number of packets sent/received
- number of bytes sent/received
- number of callbacks for tx/rx
- number of kick for tx/rx
- number of bytes/packets queued for tx
As virtnet_stats were per-cpu, so both per-cpu and gloabl satistics were
collected like:
NIC statistics:
tx_bytes[0]: 1731209929
tx_packets[0]: 60685
tx_kicks[0]: 63
tx_callbacks[0]: 73
tx_queued_bytes[0]: 1935749360
tx_queued_packets[0]: 80652
rx_bytes[0]: 2695648
rx_packets[0]: 40767
rx_kicks[0]: 1
rx_callbacks[0]: 2077
tx_bytes[1]: 9105588697
tx_packets[1]: 344150
tx_kicks[1]: 162
tx_callbacks[1]: 905
tx_queued_bytes[1]: 8901049412
tx_queued_packets[1]: 324184
rx_bytes[1]: 23679828
rx_packets[1]: 358770
rx_kicks[1]: 6
rx_callbacks[1]: 17717
tx_bytes: 10836798626
tx_packets: 404835
tx_kicks: 225
tx_callbacks: 978
tx_queued_bytes: 10836798772
tx_queued_packets: 404836
rx_bytes: 26375476
rx_packets: 399537
rx_kicks: 7
rx_callbacks: 19794
TODO:
- more statistics
- calculate the pending bytes/pkts
Signed-off-by: Jason Wangjasow...@redhat.com
---
Changes from v1:
- style typo fixs
- convert the statistics fields to array
- use unlikely()
---
drivers/net/virtio_net.c | 115
+-
1 files changed, 113 insertions(+), 2 deletions(-)
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 6e4aa6f..909a0a7 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -44,8 +44,14 @@ module_param(gso, bool, 0444);
enum virtnet_stats_type {
VIRTNET_TX_BYTES,
VIRTNET_TX_PACKETS,
+ VIRTNET_TX_KICKS,
+ VIRTNET_TX_CBS,
+ VIRTNET_TX_Q_BYTES,
+ VIRTNET_TX_Q_PACKETS,
VIRTNET_RX_BYTES,
VIRTNET_RX_PACKETS,
+ VIRTNET_RX_KICKS,
+ VIRTNET_RX_CBS,
VIRTNET_NUM_STATS,
};
@@ -54,6 +60,21 @@ struct virtnet_stats {
u64 data[VIRTNET_NUM_STATS];
};
+static struct {
+ char string[ETH_GSTRING_LEN];
+} virtnet_stats_str_attr[] = {
+ { tx_bytes },
+ { tx_packets },
+ { tx_kicks },
+ { tx_callbacks },
+ { tx_queued_bytes },
+ { tx_queued_packets },
+ { rx_bytes },
+ { rx_packets },
+ { rx_kicks },
+ { rx_callbacks },
+};
+
struct virtnet_info {
struct virtio_device *vdev;
struct virtqueue *rvq, *svq, *cvq;
@@ -146,6 +167,11 @@ static struct page *get_a_page(struct virtnet_info *vi,
gfp_t gfp_mask)
static void skb_xmit_done(struct virtqueue *svq)
{
struct virtnet_info *vi = svq-vdev-priv;
+ struct virtnet_stats *stats = this_cpu_ptr(vi-stats);
+
+ u64_stats_update_begin(stats-syncp);
+ stats-data[VIRTNET_TX_CBS]++;
+ u64_stats_update_end(stats-syncp);
/* Suppress further interrupts. */
virtqueue_disable_cb(svq);
@@ -465,6 +491,7 @@ static bool try_fill_recv(struct virtnet_info *vi, gfp_t
gfp)
{
int err;
bool oom;
+ struct virtnet_stats *stats = this_cpu_ptr(vi-stats);
do {
if (vi-mergeable_rx_bufs)
@@ -481,13 +508,24 @@ static bool try_fill_recv(struct virtnet_info *vi,
gfp_t gfp)
} while (err 0);
if (unlikely(vi-num vi-max))
vi-max = vi-num;
- virtqueue_kick(vi-rvq);
+ if (virtqueue_kick_prepare(vi-rvq)) {
+ virtqueue_notify(vi-rvq);
+ u64_stats_update_begin(stats-syncp);
+ stats-data[VIRTNET_RX_KICKS]++;
+ u64_stats_update_end(stats-syncp);
+ }
return !oom;
}
static void skb_recv_done(struct virtqueue *rvq)
{
struct virtnet_info *vi = rvq-vdev-priv;
+ struct virtnet_stats *stats = this_cpu_ptr(vi-stats);
+
+ u64_stats_update_begin(stats-syncp);
+ stats-data[VIRTNET_RX_CBS]++;
+ u64_stats_update_end(stats-syncp);
+
/* Schedule NAPI, Suppress further interrupts if successful. */
if (napi_schedule_prep(vi-napi)) {
virtqueue_disable_cb(rvq);
@@ -630,7 +668,9 @@ static int xmit_skb(struct virtnet_info *vi, struct
sk_buff *skb)
static netdev_tx_t start_xmit(struct sk_buff *skb, struct net_device *dev)
{
struct virtnet_info *vi = netdev_priv(dev);
+ struct virtnet_stats *stats = this_cpu_ptr(vi-stats);
int capacity;
+ bool kick;
/* Free up any pending old buffers before queueing new ones. */
[V2 RFC net-next PATCH 2/2] virtio_net: export more statistics through ethtool
Satistics counters is useful for debugging and performance optimization, so this
patch lets virtio_net driver collect following and export them to userspace
through ethtool -S:
- number of packets sent/received
- number of bytes sent/received
- number of callbacks for tx/rx
- number of kick for tx/rx
- number of bytes/packets queued for tx
As virtnet_stats were per-cpu, so both per-cpu and gloabl satistics were
collected like:
NIC statistics:
tx_bytes[0]: 1731209929
tx_packets[0]: 60685
tx_kicks[0]: 63
tx_callbacks[0]: 73
tx_queued_bytes[0]: 1935749360
tx_queued_packets[0]: 80652
rx_bytes[0]: 2695648
rx_packets[0]: 40767
rx_kicks[0]: 1
rx_callbacks[0]: 2077
tx_bytes[1]: 9105588697
tx_packets[1]: 344150
tx_kicks[1]: 162
tx_callbacks[1]: 905
tx_queued_bytes[1]: 8901049412
tx_queued_packets[1]: 324184
rx_bytes[1]: 23679828
rx_packets[1]: 358770
rx_kicks[1]: 6
rx_callbacks[1]: 17717
tx_bytes: 10836798626
tx_packets: 404835
tx_kicks: 225
tx_callbacks: 978
tx_queued_bytes: 10836798772
tx_queued_packets: 404836
rx_bytes: 26375476
rx_packets: 399537
rx_kicks: 7
rx_callbacks: 19794
TODO:
- more statistics
- calculate the pending bytes/pkts
Signed-off-by: Jason Wang jasow...@redhat.com
---
Changes from v1:
- style typo fixs
- convert the statistics fields to array
- use unlikely()
---
drivers/net/virtio_net.c | 115 +-
1 files changed, 113 insertions(+), 2 deletions(-)
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 6e4aa6f..909a0a7 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -44,8 +44,14 @@ module_param(gso, bool, 0444);
enum virtnet_stats_type {
VIRTNET_TX_BYTES,
VIRTNET_TX_PACKETS,
+ VIRTNET_TX_KICKS,
+ VIRTNET_TX_CBS,
+ VIRTNET_TX_Q_BYTES,
+ VIRTNET_TX_Q_PACKETS,
VIRTNET_RX_BYTES,
VIRTNET_RX_PACKETS,
+ VIRTNET_RX_KICKS,
+ VIRTNET_RX_CBS,
VIRTNET_NUM_STATS,
};
@@ -54,6 +60,21 @@ struct virtnet_stats {
u64 data[VIRTNET_NUM_STATS];
};
+static struct {
+ char string[ETH_GSTRING_LEN];
+} virtnet_stats_str_attr[] = {
+ { tx_bytes },
+ { tx_packets },
+ { tx_kicks },
+ { tx_callbacks },
+ { tx_queued_bytes },
+ { tx_queued_packets },
+ { rx_bytes },
+ { rx_packets },
+ { rx_kicks },
+ { rx_callbacks },
+};
+
struct virtnet_info {
struct virtio_device *vdev;
struct virtqueue *rvq, *svq, *cvq;
@@ -146,6 +167,11 @@ static struct page *get_a_page(struct virtnet_info *vi,
gfp_t gfp_mask)
static void skb_xmit_done(struct virtqueue *svq)
{
struct virtnet_info *vi = svq-vdev-priv;
+ struct virtnet_stats *stats = this_cpu_ptr(vi-stats);
+
+ u64_stats_update_begin(stats-syncp);
+ stats-data[VIRTNET_TX_CBS]++;
+ u64_stats_update_end(stats-syncp);
/* Suppress further interrupts. */
virtqueue_disable_cb(svq);
@@ -465,6 +491,7 @@ static bool try_fill_recv(struct virtnet_info *vi, gfp_t
gfp)
{
int err;
bool oom;
+ struct virtnet_stats *stats = this_cpu_ptr(vi-stats);
do {
if (vi-mergeable_rx_bufs)
@@ -481,13 +508,24 @@ static bool try_fill_recv(struct virtnet_info *vi, gfp_t
gfp)
} while (err 0);
if (unlikely(vi-num vi-max))
vi-max = vi-num;
- virtqueue_kick(vi-rvq);
+ if (virtqueue_kick_prepare(vi-rvq)) {
+ virtqueue_notify(vi-rvq);
+ u64_stats_update_begin(stats-syncp);
+ stats-data[VIRTNET_RX_KICKS]++;
+ u64_stats_update_end(stats-syncp);
+ }
return !oom;
}
static void skb_recv_done(struct virtqueue *rvq)
{
struct virtnet_info *vi = rvq-vdev-priv;
+ struct virtnet_stats *stats = this_cpu_ptr(vi-stats);
+
+ u64_stats_update_begin(stats-syncp);
+ stats-data[VIRTNET_RX_CBS]++;
+ u64_stats_update_end(stats-syncp);
+
/* Schedule NAPI, Suppress further interrupts if successful. */
if (napi_schedule_prep(vi-napi)) {
virtqueue_disable_cb(rvq);
@@ -630,7 +668,9 @@ static int xmit_skb(struct virtnet_info *vi, struct sk_buff
*skb)
static netdev_tx_t start_xmit(struct sk_buff *skb, struct net_device *dev)
{
struct virtnet_info *vi = netdev_priv(dev);
+ struct virtnet_stats *stats = this_cpu_ptr(vi-stats);
int capacity;
+ bool kick;
/* Free up any pending old buffers before queueing new ones. */
free_old_xmit_skbs(vi);
@@ -655,7 +695,17 @@ static netdev_tx_t start_xmit(struct sk_buff *skb, struct
net_device *dev)
kfree_skb(skb);
return NETDEV_TX_OK;
}
- virtqueue_kick(vi-svq);
+
+ kick = virtqueue_kick_prepare(vi-svq);
+ if
Re: [V2 RFC net-next PATCH 2/2] virtio_net: export more statistics through ethtool
On Wed, Jun 06, 2012 at 03:52:17PM +0800, Jason Wang wrote:
Satistics counters is useful for debugging and performance optimization, so
this
patch lets virtio_net driver collect following and export them to userspace
through ethtool -S:
- number of packets sent/received
- number of bytes sent/received
- number of callbacks for tx/rx
- number of kick for tx/rx
- number of bytes/packets queued for tx
As virtnet_stats were per-cpu, so both per-cpu and gloabl satistics were
collected like:
NIC statistics:
tx_bytes[0]: 1731209929
tx_packets[0]: 60685
tx_kicks[0]: 63
tx_callbacks[0]: 73
tx_queued_bytes[0]: 1935749360
tx_queued_packets[0]: 80652
rx_bytes[0]: 2695648
rx_packets[0]: 40767
rx_kicks[0]: 1
rx_callbacks[0]: 2077
tx_bytes[1]: 9105588697
tx_packets[1]: 344150
tx_kicks[1]: 162
tx_callbacks[1]: 905
tx_queued_bytes[1]: 8901049412
tx_queued_packets[1]: 324184
rx_bytes[1]: 23679828
rx_packets[1]: 358770
rx_kicks[1]: 6
rx_callbacks[1]: 17717
tx_bytes: 10836798626
tx_packets: 404835
tx_kicks: 225
tx_callbacks: 978
tx_queued_bytes: 10836798772
tx_queued_packets: 404836
rx_bytes: 26375476
rx_packets: 399537
rx_kicks: 7
rx_callbacks: 19794
TODO:
- more statistics
- calculate the pending bytes/pkts
Do we need that? pending is (queued - packets), no?
Signed-off-by: Jason Wang jasow...@redhat.com
---
Changes from v1:
- style typo fixs
- convert the statistics fields to array
- use unlikely()
---
drivers/net/virtio_net.c | 115
+-
1 files changed, 113 insertions(+), 2 deletions(-)
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 6e4aa6f..909a0a7 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -44,8 +44,14 @@ module_param(gso, bool, 0444);
enum virtnet_stats_type {
VIRTNET_TX_BYTES,
VIRTNET_TX_PACKETS,
+ VIRTNET_TX_KICKS,
+ VIRTNET_TX_CBS,
+ VIRTNET_TX_Q_BYTES,
+ VIRTNET_TX_Q_PACKETS,
VIRTNET_RX_BYTES,
VIRTNET_RX_PACKETS,
+ VIRTNET_RX_KICKS,
+ VIRTNET_RX_CBS,
VIRTNET_NUM_STATS,
};
@@ -54,6 +60,21 @@ struct virtnet_stats {
u64 data[VIRTNET_NUM_STATS];
};
+static struct {
static const?
+ char string[ETH_GSTRING_LEN];
+} virtnet_stats_str_attr[] = {
+ { tx_bytes },
+ { tx_packets },
+ { tx_kicks },
+ { tx_callbacks },
+ { tx_queued_bytes },
+ { tx_queued_packets },
+ { rx_bytes },
+ { rx_packets },
+ { rx_kicks },
+ { rx_callbacks },
+};
+
struct virtnet_info {
struct virtio_device *vdev;
struct virtqueue *rvq, *svq, *cvq;
@@ -146,6 +167,11 @@ static struct page *get_a_page(struct virtnet_info *vi,
gfp_t gfp_mask)
static void skb_xmit_done(struct virtqueue *svq)
{
struct virtnet_info *vi = svq-vdev-priv;
+ struct virtnet_stats *stats = this_cpu_ptr(vi-stats);
+
+ u64_stats_update_begin(stats-syncp);
+ stats-data[VIRTNET_TX_CBS]++;
+ u64_stats_update_end(stats-syncp);
/* Suppress further interrupts. */
virtqueue_disable_cb(svq);
@@ -465,6 +491,7 @@ static bool try_fill_recv(struct virtnet_info *vi, gfp_t
gfp)
{
int err;
bool oom;
+ struct virtnet_stats *stats = this_cpu_ptr(vi-stats);
do {
if (vi-mergeable_rx_bufs)
@@ -481,13 +508,24 @@ static bool try_fill_recv(struct virtnet_info *vi,
gfp_t gfp)
} while (err 0);
if (unlikely(vi-num vi-max))
vi-max = vi-num;
- virtqueue_kick(vi-rvq);
+ if (virtqueue_kick_prepare(vi-rvq)) {
if (unlikely())
also move stats here where they are actually used?
+ virtqueue_notify(vi-rvq);
+ u64_stats_update_begin(stats-syncp);
+ stats-data[VIRTNET_RX_KICKS]++;
+ u64_stats_update_end(stats-syncp);
+ }
return !oom;
}
static void skb_recv_done(struct virtqueue *rvq)
{
struct virtnet_info *vi = rvq-vdev-priv;
+ struct virtnet_stats *stats = this_cpu_ptr(vi-stats);
+
+ u64_stats_update_begin(stats-syncp);
+ stats-data[VIRTNET_RX_CBS]++;
+ u64_stats_update_end(stats-syncp);
+
/* Schedule NAPI, Suppress further interrupts if successful. */
if (napi_schedule_prep(vi-napi)) {
virtqueue_disable_cb(rvq);
@@ -630,7 +668,9 @@ static int xmit_skb(struct virtnet_info *vi, struct
sk_buff *skb)
static netdev_tx_t start_xmit(struct sk_buff *skb, struct net_device *dev)
{
struct virtnet_info *vi = netdev_priv(dev);
+ struct virtnet_stats *stats = this_cpu_ptr(vi-stats);
int capacity;
+ bool kick;
/* Free up any pending old buffers before queueing new ones. */
free_old_xmit_skbs(vi);
@@ -655,7 +695,17 @@ static
Re: [V2 RFC net-next PATCH 2/2] virtio_net: export more statistics through ethtool
On Wed, Jun 06, 2012 at 03:52:17PM +0800, Jason Wang wrote:
Satistics counters is useful for debugging and performance optimization, so
this
patch lets virtio_net driver collect following and export them to userspace
through ethtool -S:
- number of packets sent/received
- number of bytes sent/received
- number of callbacks for tx/rx
- number of kick for tx/rx
- number of bytes/packets queued for tx
As virtnet_stats were per-cpu, so both per-cpu and gloabl satistics were
collected like:
NIC statistics:
tx_bytes[0]: 1731209929
tx_packets[0]: 60685
tx_kicks[0]: 63
tx_callbacks[0]: 73
tx_queued_bytes[0]: 1935749360
tx_queued_packets[0]: 80652
rx_bytes[0]: 2695648
rx_packets[0]: 40767
rx_kicks[0]: 1
rx_callbacks[0]: 2077
tx_bytes[1]: 9105588697
tx_packets[1]: 344150
tx_kicks[1]: 162
tx_callbacks[1]: 905
tx_queued_bytes[1]: 8901049412
tx_queued_packets[1]: 324184
rx_bytes[1]: 23679828
rx_packets[1]: 358770
rx_kicks[1]: 6
rx_callbacks[1]: 17717
tx_bytes: 10836798626
tx_packets: 404835
tx_kicks: 225
tx_callbacks: 978
tx_queued_bytes: 10836798772
tx_queued_packets: 404836
rx_bytes: 26375476
rx_packets: 399537
rx_kicks: 7
rx_callbacks: 19794
TODO:
- more statistics
- calculate the pending bytes/pkts
Signed-off-by: Jason Wang jasow...@redhat.com
---
Changes from v1:
- style typo fixs
- convert the statistics fields to array
- use unlikely()
---
drivers/net/virtio_net.c | 115
+-
1 files changed, 113 insertions(+), 2 deletions(-)
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 6e4aa6f..909a0a7 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -44,8 +44,14 @@ module_param(gso, bool, 0444);
enum virtnet_stats_type {
VIRTNET_TX_BYTES,
VIRTNET_TX_PACKETS,
+ VIRTNET_TX_KICKS,
+ VIRTNET_TX_CBS,
+ VIRTNET_TX_Q_BYTES,
+ VIRTNET_TX_Q_PACKETS,
What about counting the time we spend with queue
stopped and # of times we stop the queue?
VIRTNET_RX_BYTES,
VIRTNET_RX_PACKETS,
+ VIRTNET_RX_KICKS,
+ VIRTNET_RX_CBS,
What about a counter for oom on rx?
VIRTNET_NUM_STATS,
};
@@ -54,6 +60,21 @@ struct virtnet_stats {
u64 data[VIRTNET_NUM_STATS];
};
+static struct {
+ char string[ETH_GSTRING_LEN];
+} virtnet_stats_str_attr[] = {
+ { tx_bytes },
+ { tx_packets },
+ { tx_kicks },
+ { tx_callbacks },
+ { tx_queued_bytes },
+ { tx_queued_packets },
+ { rx_bytes },
+ { rx_packets },
+ { rx_kicks },
+ { rx_callbacks },
+};
+
struct virtnet_info {
struct virtio_device *vdev;
struct virtqueue *rvq, *svq, *cvq;
@@ -146,6 +167,11 @@ static struct page *get_a_page(struct virtnet_info *vi,
gfp_t gfp_mask)
static void skb_xmit_done(struct virtqueue *svq)
{
struct virtnet_info *vi = svq-vdev-priv;
+ struct virtnet_stats *stats = this_cpu_ptr(vi-stats);
+
+ u64_stats_update_begin(stats-syncp);
+ stats-data[VIRTNET_TX_CBS]++;
+ u64_stats_update_end(stats-syncp);
/* Suppress further interrupts. */
virtqueue_disable_cb(svq);
@@ -465,6 +491,7 @@ static bool try_fill_recv(struct virtnet_info *vi, gfp_t
gfp)
{
int err;
bool oom;
+ struct virtnet_stats *stats = this_cpu_ptr(vi-stats);
do {
if (vi-mergeable_rx_bufs)
@@ -481,13 +508,24 @@ static bool try_fill_recv(struct virtnet_info *vi,
gfp_t gfp)
} while (err 0);
if (unlikely(vi-num vi-max))
vi-max = vi-num;
- virtqueue_kick(vi-rvq);
+ if (virtqueue_kick_prepare(vi-rvq)) {
+ virtqueue_notify(vi-rvq);
+ u64_stats_update_begin(stats-syncp);
+ stats-data[VIRTNET_RX_KICKS]++;
+ u64_stats_update_end(stats-syncp);
+ }
return !oom;
}
static void skb_recv_done(struct virtqueue *rvq)
{
struct virtnet_info *vi = rvq-vdev-priv;
+ struct virtnet_stats *stats = this_cpu_ptr(vi-stats);
+
+ u64_stats_update_begin(stats-syncp);
+ stats-data[VIRTNET_RX_CBS]++;
+ u64_stats_update_end(stats-syncp);
+
This data path so not entirely free.
I am guessing the overhead is not measureable but
did you check?
An alternative is to count when napi callbacks
are envoked. If we also count when weight was exceeded
we get almost the same result.
/* Schedule NAPI, Suppress further interrupts if successful. */
if (napi_schedule_prep(vi-napi)) {
virtqueue_disable_cb(rvq);
@@ -630,7 +668,9 @@ static int xmit_skb(struct virtnet_info *vi, struct
sk_buff *skb)
static netdev_tx_t start_xmit(struct sk_buff *skb, struct net_device *dev)
{
struct virtnet_info *vi = netdev_priv(dev);
+
Re: [V2 RFC net-next PATCH 2/2] virtio_net: export more statistics through ethtool
On 06/06/2012 04:27 PM, Michael S. Tsirkin wrote:
On Wed, Jun 06, 2012 at 03:52:17PM +0800, Jason Wang wrote:
Satistics counters is useful for debugging and performance optimization, so this
patch lets virtio_net driver collect following and export them to userspace
through ethtool -S:
- number of packets sent/received
- number of bytes sent/received
- number of callbacks for tx/rx
- number of kick for tx/rx
- number of bytes/packets queued for tx
As virtnet_stats were per-cpu, so both per-cpu and gloabl satistics were
collected like:
NIC statistics:
tx_bytes[0]: 1731209929
tx_packets[0]: 60685
tx_kicks[0]: 63
tx_callbacks[0]: 73
tx_queued_bytes[0]: 1935749360
tx_queued_packets[0]: 80652
rx_bytes[0]: 2695648
rx_packets[0]: 40767
rx_kicks[0]: 1
rx_callbacks[0]: 2077
tx_bytes[1]: 9105588697
tx_packets[1]: 344150
tx_kicks[1]: 162
tx_callbacks[1]: 905
tx_queued_bytes[1]: 8901049412
tx_queued_packets[1]: 324184
rx_bytes[1]: 23679828
rx_packets[1]: 358770
rx_kicks[1]: 6
rx_callbacks[1]: 17717
tx_bytes: 10836798626
tx_packets: 404835
tx_kicks: 225
tx_callbacks: 978
tx_queued_bytes: 10836798772
tx_queued_packets: 404836
rx_bytes: 26375476
rx_packets: 399537
rx_kicks: 7
rx_callbacks: 19794
TODO:
- more statistics
- calculate the pending bytes/pkts
Do we need that? pending is (queued - packets), no?
No, if we choose to calculate by tools.
Signed-off-by: Jason Wangjasow...@redhat.com
---
Changes from v1:
- style typo fixs
- convert the statistics fields to array
- use unlikely()
---
drivers/net/virtio_net.c | 115 +-
1 files changed, 113 insertions(+), 2 deletions(-)
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 6e4aa6f..909a0a7 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -44,8 +44,14 @@ module_param(gso, bool, 0444);
enum virtnet_stats_type {
VIRTNET_TX_BYTES,
VIRTNET_TX_PACKETS,
+ VIRTNET_TX_KICKS,
+ VIRTNET_TX_CBS,
+ VIRTNET_TX_Q_BYTES,
+ VIRTNET_TX_Q_PACKETS,
VIRTNET_RX_BYTES,
VIRTNET_RX_PACKETS,
+ VIRTNET_RX_KICKS,
+ VIRTNET_RX_CBS,
VIRTNET_NUM_STATS,
};
@@ -54,6 +60,21 @@ struct virtnet_stats {
u64 data[VIRTNET_NUM_STATS];
};
+static struct {
static const?
Sorry, forget this.
+ char string[ETH_GSTRING_LEN];
+} virtnet_stats_str_attr[] = {
+ { tx_bytes },
+ { tx_packets },
+ { tx_kicks },
+ { tx_callbacks },
+ { tx_queued_bytes },
+ { tx_queued_packets },
+ { rx_bytes },
+ { rx_packets },
+ { rx_kicks },
+ { rx_callbacks },
+};
+
struct virtnet_info {
struct virtio_device *vdev;
struct virtqueue *rvq, *svq, *cvq;
@@ -146,6 +167,11 @@ static struct page *get_a_page(struct virtnet_info *vi,
gfp_t gfp_mask)
static void skb_xmit_done(struct virtqueue *svq)
{
struct virtnet_info *vi = svq-vdev-priv;
+ struct virtnet_stats *stats = this_cpu_ptr(vi-stats);
+
+ u64_stats_update_begin(stats-syncp);
+ stats-data[VIRTNET_TX_CBS]++;
+ u64_stats_update_end(stats-syncp);
/* Suppress further interrupts. */
virtqueue_disable_cb(svq);
@@ -465,6 +491,7 @@ static bool try_fill_recv(struct virtnet_info *vi, gfp_t
gfp)
{
int err;
bool oom;
+ struct virtnet_stats *stats = this_cpu_ptr(vi-stats);
do {
if (vi-mergeable_rx_bufs)
@@ -481,13 +508,24 @@ static bool try_fill_recv(struct virtnet_info *vi, gfp_t
gfp)
} while (err 0);
if (unlikely(vi-num vi-max))
vi-max = vi-num;
- virtqueue_kick(vi-rvq);
+ if (virtqueue_kick_prepare(vi-rvq)) {
if (unlikely())
also move stats here where they are actually used?
Sure.
+ virtqueue_notify(vi-rvq);
+ u64_stats_update_begin(stats-syncp);
+ stats-data[VIRTNET_RX_KICKS]++;
+ u64_stats_update_end(stats-syncp);
+ }
return !oom;
}
static void skb_recv_done(struct virtqueue *rvq)
{
struct virtnet_info *vi = rvq-vdev-priv;
+ struct virtnet_stats *stats = this_cpu_ptr(vi-stats);
+
+ u64_stats_update_begin(stats-syncp);
+ stats-data[VIRTNET_RX_CBS]++;
+ u64_stats_update_end(stats-syncp);
+
/* Schedule NAPI, Suppress further interrupts if successful. */
if (napi_schedule_prep(vi-napi)) {
virtqueue_disable_cb(rvq);
@@ -630,7 +668,9 @@ static int xmit_skb(struct virtnet_info *vi, struct sk_buff
*skb)
static netdev_tx_t start_xmit(struct sk_buff *skb, struct net_device *dev)
{
struct virtnet_info *vi = netdev_priv(dev);
+ struct virtnet_stats *stats = this_cpu_ptr(vi-stats);
int capacity;
+ bool kick;
/*
