* [RFC PATCH v2 9/9] sfc: Support for byte queue limits
@ 2011-08-08 4:53 Tom Herbert
2011-08-09 8:21 ` Eric Dumazet
2011-08-15 18:36 ` Ben Hutchings
0 siblings, 2 replies; 3+ messages in thread
From: Tom Herbert @ 2011-08-08 4:53 UTC (permalink / raw)
To: davem, netdev
Changes to sfc to use byte queue limits.
Signed-off-by: Tom Herbert <therbert@google.com>
---
drivers/net/sfc/tx.c | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/drivers/net/sfc/tx.c b/drivers/net/sfc/tx.c
index 84eb99e..9aa4339 100644
--- a/drivers/net/sfc/tx.c
+++ b/drivers/net/sfc/tx.c
@@ -31,7 +31,9 @@
#define EFX_TXQ_THRESHOLD(_efx) ((_efx)->txq_entries / 2u)
static void efx_dequeue_buffer(struct efx_tx_queue *tx_queue,
- struct efx_tx_buffer *buffer)
+ struct efx_tx_buffer *buffer,
+ unsigned int *pkts_compl,
+ unsigned int *bytes_compl)
{
if (buffer->unmap_len) {
struct pci_dev *pci_dev = tx_queue->efx->pci_dev;
@@ -48,6 +50,8 @@ static void efx_dequeue_buffer(struct efx_tx_queue *tx_queue,
}
if (buffer->skb) {
+ (*pkts_compl)++;
+ (*bytes_compl) += buffer->skb->len;
dev_kfree_skb_any((struct sk_buff *) buffer->skb);
buffer->skb = NULL;
netif_vdbg(tx_queue->efx, tx_done, tx_queue->efx->net_dev,
@@ -254,6 +258,8 @@ netdev_tx_t efx_enqueue_skb(struct efx_tx_queue *tx_queue, struct sk_buff *skb)
buffer->skb = skb;
buffer->continuation = false;
+ netdev_tx_sent_queue(tx_queue->core_txq, 1, skb->len);
+
/* Pass off to hardware */
efx_nic_push_buffers(tx_queue);
@@ -271,10 +277,11 @@ netdev_tx_t efx_enqueue_skb(struct efx_tx_queue *tx_queue, struct sk_buff *skb)
unwind:
/* Work backwards until we hit the original insert pointer value */
while (tx_queue->insert_count != tx_queue->write_count) {
+ unsigned int pkts_compl = 0, bytes_compl = 0;
--tx_queue->insert_count;
insert_ptr = tx_queue->insert_count & tx_queue->ptr_mask;
buffer = &tx_queue->buffer[insert_ptr];
- efx_dequeue_buffer(tx_queue, buffer);
+ efx_dequeue_buffer(tx_queue, buffer, &pkts_compl, &bytes_compl);
buffer->len = 0;
}
@@ -297,7 +304,9 @@ netdev_tx_t efx_enqueue_skb(struct efx_tx_queue *tx_queue, struct sk_buff *skb)
* specified index.
*/
static void efx_dequeue_buffers(struct efx_tx_queue *tx_queue,
- unsigned int index)
+ unsigned int index,
+ unsigned int *pkts_compl,
+ unsigned int *bytes_compl)
{
struct efx_nic *efx = tx_queue->efx;
unsigned int stop_index, read_ptr;
@@ -315,7 +324,7 @@ static void efx_dequeue_buffers(struct efx_tx_queue *tx_queue,
return;
}
- efx_dequeue_buffer(tx_queue, buffer);
+ efx_dequeue_buffer(tx_queue, buffer, pkts_compl, bytes_compl);
buffer->continuation = true;
buffer->len = 0;
@@ -426,10 +435,12 @@ void efx_xmit_done(struct efx_tx_queue *tx_queue, unsigned int index)
{
unsigned fill_level;
struct efx_nic *efx = tx_queue->efx;
+ unsigned int pkts_compl = 0, bytes_compl = 0;
EFX_BUG_ON_PARANOID(index > tx_queue->ptr_mask);
- efx_dequeue_buffers(tx_queue, index);
+ efx_dequeue_buffers(tx_queue, index, &pkts_compl, &bytes_compl);
+ netdev_tx_completed_queue(tx_queue->core_txq, pkts_compl, bytes_compl);
/* See if we need to restart the netif queue. This barrier
* separates the update of read_count from the test of the
@@ -519,13 +530,15 @@ void efx_release_tx_buffers(struct efx_tx_queue *tx_queue)
/* Free any buffers left in the ring */
while (tx_queue->read_count != tx_queue->write_count) {
+ unsigned int pkts_compl = 0, bytes_compl = 0;
buffer = &tx_queue->buffer[tx_queue->read_count & tx_queue->ptr_mask];
- efx_dequeue_buffer(tx_queue, buffer);
+ efx_dequeue_buffer(tx_queue, buffer, &pkts_compl, &bytes_compl);
buffer->continuation = true;
buffer->len = 0;
++tx_queue->read_count;
}
+ netdev_tx_reset_queue(tx_queue->core_txq);
}
void efx_fini_tx_queue(struct efx_tx_queue *tx_queue)
@@ -1168,6 +1181,8 @@ static int efx_enqueue_skb_tso(struct efx_tx_queue *tx_queue,
/* Pass off to hardware */
efx_nic_push_buffers(tx_queue);
+ netdev_tx_sent_queue(tx_queue->core_txq, 1, skb->len);
+
tx_queue->tso_bursts++;
return NETDEV_TX_OK;
--
1.7.3.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [RFC PATCH v2 9/9] sfc: Support for byte queue limits
2011-08-08 4:53 [RFC PATCH v2 9/9] sfc: Support for byte queue limits Tom Herbert
@ 2011-08-09 8:21 ` Eric Dumazet
2011-08-15 18:36 ` Ben Hutchings
1 sibling, 0 replies; 3+ messages in thread
From: Eric Dumazet @ 2011-08-09 8:21 UTC (permalink / raw)
To: Tom Herbert; +Cc: davem, netdev
Le dimanche 07 août 2011 à 21:53 -0700, Tom Herbert a écrit :
> Changes to sfc to use byte queue limits.
>
> Signed-off-by: Tom Herbert <therbert@google.com>
> ---
> void efx_fini_tx_queue(struct efx_tx_queue *tx_queue)
> @@ -1168,6 +1181,8 @@ static int efx_enqueue_skb_tso(struct efx_tx_queue *tx_queue,
> /* Pass off to hardware */
> efx_nic_push_buffers(tx_queue);
>
> + netdev_tx_sent_queue(tx_queue->core_txq, 1, skb->len);
> +
> tx_queue->tso_bursts++;
> return NETDEV_TX_OK;
>
Hmm, thats too late at this point : Hardware might have sent the buffer
and tx completion already freed skb.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [RFC PATCH v2 9/9] sfc: Support for byte queue limits
2011-08-08 4:53 [RFC PATCH v2 9/9] sfc: Support for byte queue limits Tom Herbert
2011-08-09 8:21 ` Eric Dumazet
@ 2011-08-15 18:36 ` Ben Hutchings
1 sibling, 0 replies; 3+ messages in thread
From: Ben Hutchings @ 2011-08-15 18:36 UTC (permalink / raw)
To: Tom Herbert; +Cc: davem, netdev
On Sun, 2011-08-07 at 21:53 -0700, Tom Herbert wrote:
> Changes to sfc to use byte queue limits.
>
> Signed-off-by: Tom Herbert <therbert@google.com>
> ---
> drivers/net/sfc/tx.c | 27 +++++++++++++++++++++------
> 1 files changed, 21 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/net/sfc/tx.c b/drivers/net/sfc/tx.c
> index 84eb99e..9aa4339 100644
> --- a/drivers/net/sfc/tx.c
> +++ b/drivers/net/sfc/tx.c
> @@ -31,7 +31,9 @@
> #define EFX_TXQ_THRESHOLD(_efx) ((_efx)->txq_entries / 2u)
>
> static void efx_dequeue_buffer(struct efx_tx_queue *tx_queue,
> - struct efx_tx_buffer *buffer)
> + struct efx_tx_buffer *buffer,
> + unsigned int *pkts_compl,
> + unsigned int *bytes_compl)
> {
> if (buffer->unmap_len) {
> struct pci_dev *pci_dev = tx_queue->efx->pci_dev;
> @@ -48,6 +50,8 @@ static void efx_dequeue_buffer(struct efx_tx_queue *tx_queue,
> }
>
> if (buffer->skb) {
> + (*pkts_compl)++;
> + (*bytes_compl) += buffer->skb->len;
We avoid using *buffer->skb on the completion path, as it is liklely to
be cache-cold. I would prefer to add and subtract fragment lengths
(buffer->len) instead. (This will also result in a slightly more
accurate estimate of the queue length when TSO is used.)
> dev_kfree_skb_any((struct sk_buff *) buffer->skb);
> buffer->skb = NULL;
> netif_vdbg(tx_queue->efx, tx_done, tx_queue->efx->net_dev,
> @@ -254,6 +258,8 @@ netdev_tx_t efx_enqueue_skb(struct efx_tx_queue *tx_queue, struct sk_buff *skb)
> buffer->skb = skb;
> buffer->continuation = false;
>
> + netdev_tx_sent_queue(tx_queue->core_txq, 1, skb->len);
> +
> /* Pass off to hardware */
> efx_nic_push_buffers(tx_queue);
>
> @@ -271,10 +277,11 @@ netdev_tx_t efx_enqueue_skb(struct efx_tx_queue *tx_queue, struct sk_buff *skb)
> unwind:
> /* Work backwards until we hit the original insert pointer value */
> while (tx_queue->insert_count != tx_queue->write_count) {
> + unsigned int pkts_compl = 0, bytes_compl = 0;
> --tx_queue->insert_count;
> insert_ptr = tx_queue->insert_count & tx_queue->ptr_mask;
> buffer = &tx_queue->buffer[insert_ptr];
> - efx_dequeue_buffer(tx_queue, buffer);
> + efx_dequeue_buffer(tx_queue, buffer, &pkts_compl, &bytes_compl);
> buffer->len = 0;
> }
>
> @@ -297,7 +304,9 @@ netdev_tx_t efx_enqueue_skb(struct efx_tx_queue *tx_queue, struct sk_buff *skb)
> * specified index.
> */
> static void efx_dequeue_buffers(struct efx_tx_queue *tx_queue,
> - unsigned int index)
> + unsigned int index,
> + unsigned int *pkts_compl,
> + unsigned int *bytes_compl)
> {
> struct efx_nic *efx = tx_queue->efx;
> unsigned int stop_index, read_ptr;
> @@ -315,7 +324,7 @@ static void efx_dequeue_buffers(struct efx_tx_queue *tx_queue,
> return;
> }
>
> - efx_dequeue_buffer(tx_queue, buffer);
> + efx_dequeue_buffer(tx_queue, buffer, pkts_compl, bytes_compl);
[...]
Since efx_deqeueue_buffers() is the only caller of efx_dequeue_buffer()
that actually wants to count the completed packets & bytes, the counting
should be done here.
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.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-08-15 18:36 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-08-08 4:53 [RFC PATCH v2 9/9] sfc: Support for byte queue limits Tom Herbert
2011-08-09 8:21 ` Eric Dumazet
2011-08-15 18:36 ` Ben Hutchings
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).