* [PATCH net-next] igb: Add support for byte queue limits.
@ 2011-12-21 15:18 Eric Dumazet
2011-12-21 19:42 ` David Miller
0 siblings, 1 reply; 6+ messages in thread
From: Eric Dumazet @ 2011-12-21 15:18 UTC (permalink / raw)
To: David Miller; +Cc: netdev, Jeff Kirsher, Alexander Duyck
This adds support for byte queue limits (BQL)
Since this driver collects bytes count in 'bytecount' field, use it also
in igb_tx_map()
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
CC: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
CC: Alexander Duyck <alexander.h.duyck@intel.com>
---
drivers/net/ethernet/intel/igb/igb.h | 5 +++++
drivers/net/ethernet/intel/igb/igb_main.c | 5 +++++
2 files changed, 10 insertions(+)
diff --git a/drivers/net/ethernet/intel/igb/igb.h b/drivers/net/ethernet/intel/igb/igb.h
index c69feeb..3d12e67 100644
--- a/drivers/net/ethernet/intel/igb/igb.h
+++ b/drivers/net/ethernet/intel/igb/igb.h
@@ -447,4 +447,9 @@ static inline s32 igb_get_phy_info(struct e1000_hw *hw)
return 0;
}
+static inline struct netdev_queue *txring_txq(const struct igb_ring *tx_ring)
+{
+ return netdev_get_tx_queue(tx_ring->netdev, tx_ring->queue_index);
+}
+
#endif /* _IGB_H_ */
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index 89d576c..dcc68cc 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -3201,6 +3201,7 @@ static void igb_clean_tx_ring(struct igb_ring *tx_ring)
buffer_info = &tx_ring->tx_buffer_info[i];
igb_unmap_and_free_tx_resource(tx_ring, buffer_info);
}
+ netdev_tx_reset_queue(txring_txq(tx_ring));
size = sizeof(struct igb_tx_buffer) * tx_ring->count;
memset(tx_ring->tx_buffer_info, 0, size);
@@ -4238,6 +4239,8 @@ static void igb_tx_map(struct igb_ring *tx_ring,
frag++;
}
+ netdev_tx_sent_queue(txring_txq(tx_ring), first->bytecount);
+
/* write last descriptor with RS and EOP bits */
cmd_type |= cpu_to_le32(size) | cpu_to_le32(IGB_TXD_DCMD);
tx_desc->read.cmd_type_len = cmd_type;
@@ -5777,6 +5780,8 @@ static bool igb_clean_tx_irq(struct igb_q_vector *q_vector)
}
}
+ netdev_tx_completed_queue(txring_txq(tx_ring),
+ total_packets, total_bytes);
i += tx_ring->count;
tx_ring->next_to_clean = i;
u64_stats_update_begin(&tx_ring->tx_syncp);
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH net-next] igb: Add support for byte queue limits.
2011-12-21 15:18 [PATCH net-next] igb: Add support for byte queue limits Eric Dumazet
@ 2011-12-21 19:42 ` David Miller
2011-12-21 21:17 ` Wyborny, Carolyn
0 siblings, 1 reply; 6+ messages in thread
From: David Miller @ 2011-12-21 19:42 UTC (permalink / raw)
To: eric.dumazet; +Cc: netdev, jeffrey.t.kirsher, alexander.h.duyck
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Wed, 21 Dec 2011 16:18:15 +0100
> This adds support for byte queue limits (BQL)
>
> Since this driver collects bytes count in 'bytecount' field, use it also
> in igb_tx_map()
>
> Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
> CC: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> CC: Alexander Duyck <alexander.h.duyck@intel.com>
Intel folks, you got this?
^ permalink raw reply [flat|nested] 6+ messages in thread
* RE: [PATCH net-next] igb: Add support for byte queue limits.
2011-12-21 19:42 ` David Miller
@ 2011-12-21 21:17 ` Wyborny, Carolyn
2012-01-03 6:07 ` Eric Dumazet
0 siblings, 1 reply; 6+ messages in thread
From: Wyborny, Carolyn @ 2011-12-21 21:17 UTC (permalink / raw)
To: David Miller, eric.dumazet@gmail.com
Cc: netdev@vger.kernel.org, Kirsher, Jeffrey T, Duyck, Alexander H
>-----Original Message-----
>From: netdev-owner@vger.kernel.org [mailto:netdev-owner@vger.kernel.org]
>On Behalf Of David Miller
>Sent: Wednesday, December 21, 2011 11:42 AM
>To: eric.dumazet@gmail.com
>Cc: netdev@vger.kernel.org; Kirsher, Jeffrey T; Duyck, Alexander H
>Subject: Re: [PATCH net-next] igb: Add support for byte queue limits.
>
>From: Eric Dumazet <eric.dumazet@gmail.com>
>Date: Wed, 21 Dec 2011 16:18:15 +0100
>
>> This adds support for byte queue limits (BQL)
>>
>> Since this driver collects bytes count in 'bytecount' field, use it
>also
>> in igb_tx_map()
>>
>> Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
>> CC: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>> CC: Alexander Duyck <alexander.h.duyck@intel.com>
>
>Intel folks, you got this?
>--
>To unsubscribe from this list: send the line "unsubscribe netdev" in
>the body of a message to majordomo@vger.kernel.org
>More majordomo info at http://vger.kernel.org/majordomo-info.html
Yes, although many are out for the holidays.
ACK. We'll get it into our queue for testing.
Thanks,
Carolyn Wyborny
Linux Development
LAN Access Division
Intel Corporation
^ permalink raw reply [flat|nested] 6+ messages in thread
* RE: [PATCH net-next] igb: Add support for byte queue limits.
2011-12-21 21:17 ` Wyborny, Carolyn
@ 2012-01-03 6:07 ` Eric Dumazet
2012-01-03 10:15 ` Jeff Kirsher
0 siblings, 1 reply; 6+ messages in thread
From: Eric Dumazet @ 2012-01-03 6:07 UTC (permalink / raw)
To: Wyborny, Carolyn
Cc: David Miller, netdev@vger.kernel.org, Kirsher, Jeffrey T,
Duyck, Alexander H
Le mercredi 21 décembre 2011 à 21:17 +0000, Wyborny, Carolyn a écrit :
>
> >-----Original Message-----
> >From: netdev-owner@vger.kernel.org [mailto:netdev-owner@vger.kernel.org]
> >On Behalf Of David Miller
> >Sent: Wednesday, December 21, 2011 11:42 AM
> >To: eric.dumazet@gmail.com
> >Cc: netdev@vger.kernel.org; Kirsher, Jeffrey T; Duyck, Alexander H
> >Subject: Re: [PATCH net-next] igb: Add support for byte queue limits.
> >
> >From: Eric Dumazet <eric.dumazet@gmail.com>
> >Date: Wed, 21 Dec 2011 16:18:15 +0100
> >
> >> This adds support for byte queue limits (BQL)
> >>
> >> Since this driver collects bytes count in 'bytecount' field, use it
> >also
> >> in igb_tx_map()
> >>
> >> Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
> >> CC: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> >> CC: Alexander Duyck <alexander.h.duyck@intel.com>
> >
> >Intel folks, you got this?
> >--
> >To unsubscribe from this list: send the line "unsubscribe netdev" in
> >the body of a message to majordomo@vger.kernel.org
> >More majordomo info at http://vger.kernel.org/majordomo-info.html
>
> Yes, although many are out for the holidays.
>
> ACK. We'll get it into our queue for testing.
Any news on this patch ?
I would like it being added for next merge window.
By the way I did test it on my machine.
Thanks
^ permalink raw reply [flat|nested] 6+ messages in thread
* RE: [PATCH net-next] igb: Add support for byte queue limits.
2012-01-03 6:07 ` Eric Dumazet
@ 2012-01-03 10:15 ` Jeff Kirsher
2012-01-05 6:26 ` Eric Dumazet
0 siblings, 1 reply; 6+ messages in thread
From: Jeff Kirsher @ 2012-01-03 10:15 UTC (permalink / raw)
To: Eric Dumazet
Cc: Wyborny, Carolyn, David Miller, netdev@vger.kernel.org,
Duyck, Alexander H
[-- Attachment #1: Type: text/plain, Size: 1646 bytes --]
On Tue, 2012-01-03 at 07:07 +0100, Eric Dumazet wrote:
> Le mercredi 21 décembre 2011 à 21:17 +0000, Wyborny, Carolyn a écrit :
> >
> > >-----Original Message-----
> > >From: netdev-owner@vger.kernel.org [mailto:netdev-owner@vger.kernel.org]
> > >On Behalf Of David Miller
> > >Sent: Wednesday, December 21, 2011 11:42 AM
> > >To: eric.dumazet@gmail.com
> > >Cc: netdev@vger.kernel.org; Kirsher, Jeffrey T; Duyck, Alexander H
> > >Subject: Re: [PATCH net-next] igb: Add support for byte queue limits.
> > >
> > >From: Eric Dumazet <eric.dumazet@gmail.com>
> > >Date: Wed, 21 Dec 2011 16:18:15 +0100
> > >
> > >> This adds support for byte queue limits (BQL)
> > >>
> > >> Since this driver collects bytes count in 'bytecount' field, use it
> > >also
> > >> in igb_tx_map()
> > >>
> > >> Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
> > >> CC: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> > >> CC: Alexander Duyck <alexander.h.duyck@intel.com>
> > >
> > >Intel folks, you got this?
> > >--
> > >To unsubscribe from this list: send the line "unsubscribe netdev" in
> > >the body of a message to majordomo@vger.kernel.org
> > >More majordomo info at http://vger.kernel.org/majordomo-info.html
> >
> > Yes, although many are out for the holidays.
> >
> > ACK. We'll get it into our queue for testing.
>
> Any news on this patch ?
>
> I would like it being added for next merge window.
>
> By the way I did test it on my machine.
>
> Thanks
>
Yes, it passed testing, so I will push it in my next series of patches.
Just waiting on the current series to be accepted before I push it.
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* RE: [PATCH net-next] igb: Add support for byte queue limits.
2012-01-03 10:15 ` Jeff Kirsher
@ 2012-01-05 6:26 ` Eric Dumazet
0 siblings, 0 replies; 6+ messages in thread
From: Eric Dumazet @ 2012-01-05 6:26 UTC (permalink / raw)
To: jeffrey.t.kirsher
Cc: Wyborny, Carolyn, David Miller, netdev@vger.kernel.org,
Duyck, Alexander H
Le mardi 03 janvier 2012 à 02:15 -0800, Jeff Kirsher a écrit :
> On Tue, 2012-01-03 at 07:07 +0100, Eric Dumazet wrote:
> >
> > Any news on this patch ?
> >
> > I would like it being added for next merge window.
> >
> > Thanks
> >
>
> Yes, it passed testing, so I will push it in my next series of patches.
> Just waiting on the current series to be accepted before I push it.
Thanks Jeff !
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-01-05 6:27 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-12-21 15:18 [PATCH net-next] igb: Add support for byte queue limits Eric Dumazet
2011-12-21 19:42 ` David Miller
2011-12-21 21:17 ` Wyborny, Carolyn
2012-01-03 6:07 ` Eric Dumazet
2012-01-03 10:15 ` Jeff Kirsher
2012-01-05 6:26 ` Eric Dumazet
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).