* [PATCH] LLTX for tg3
@ 2004-09-07 12:18 Andi Kleen
2004-09-12 17:06 ` Eric Lemoine
0 siblings, 1 reply; 3+ messages in thread
From: Andi Kleen @ 2004-09-07 12:18 UTC (permalink / raw)
To: davem, netdev
Add LLTX suppor to tg3. Locking was already safe for it, so only
trivial changes.
Depends on the LLTX patch sent earlier.
diff -u linux-2.6.8/drivers/net/tg3.c-o linux-2.6.8/drivers/net/tg3.c
--- linux-2.6.8/drivers/net/tg3.c-o 2004-09-04 13:10:46.000000000 +0000
+++ linux-2.6.8/drivers/net/tg3.c 2004-09-07 08:17:36.000000000 +0000
@@ -3036,7 +3036,11 @@
* So we really do need to disable interrupts when taking
* tx_lock here.
*/
- spin_lock_irqsave(&tp->tx_lock, flags);
+ local_irq_save(flags);
+ if (!spin_trylock(&tp->tx_lock)) {
+ local_irq_restore(flags);
+ return -1;
+ }
/* This is a hard error, log it. */
if (unlikely(TX_BUFFS_AVAIL(tp) <= (skb_shinfo(skb)->nr_frags + 1))) {
@@ -8255,6 +8259,7 @@
if (pci_using_dac)
dev->features |= NETIF_F_HIGHDMA;
+ dev->features |= NETIF_F_LLTX;
#if TG3_VLAN_TAG_USED
dev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;
dev->vlan_rx_register = tg3_vlan_rx_register;
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] LLTX for tg3
2004-09-07 12:18 [PATCH] LLTX for tg3 Andi Kleen
@ 2004-09-12 17:06 ` Eric Lemoine
2004-09-12 23:45 ` David S. Miller
0 siblings, 1 reply; 3+ messages in thread
From: Eric Lemoine @ 2004-09-12 17:06 UTC (permalink / raw)
To: Andi Kleen; +Cc: davem, netdev
> Add LLTX suppor to tg3. Locking was already safe for it, so only
> trivial changes.
tg3_set_rx_mode() (dev->set_multicast_list()) and tg3_start_xmit()
used to synchronise thanks to dev->lock_xmit. With your LLTX patches
they don't synchronise anymore (I don't think tg3_set_rx_mode() grabs
tp->tx_lock) ; isn't it an issue?
PS: your LLTX patch to e1000 seems to have the needed extra locking in
e1000_set_multi() though.
> Depends on the LLTX patch sent earlier.
>
> diff -u linux-2.6.8/drivers/net/tg3.c-o linux-2.6.8/drivers/net/tg3.c
> --- linux-2.6.8/drivers/net/tg3.c-o 2004-09-04 13:10:46.000000000 +0000
> +++ linux-2.6.8/drivers/net/tg3.c 2004-09-07 08:17:36.000000000 +0000
> @@ -3036,7 +3036,11 @@
> * So we really do need to disable interrupts when taking
> * tx_lock here.
> */
> - spin_lock_irqsave(&tp->tx_lock, flags);
> + local_irq_save(flags);
> + if (!spin_trylock(&tp->tx_lock)) {
> + local_irq_restore(flags);
> + return -1;
> + }
>
> /* This is a hard error, log it. */
> if (unlikely(TX_BUFFS_AVAIL(tp) <= (skb_shinfo(skb)->nr_frags + 1))) {
> @@ -8255,6 +8259,7 @@
>
> if (pci_using_dac)
> dev->features |= NETIF_F_HIGHDMA;
> + dev->features |= NETIF_F_LLTX;
> #if TG3_VLAN_TAG_USED
> dev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;
> dev->vlan_rx_register = tg3_vlan_rx_register;
>
>
--
Eric
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] LLTX for tg3
2004-09-12 17:06 ` Eric Lemoine
@ 2004-09-12 23:45 ` David S. Miller
0 siblings, 0 replies; 3+ messages in thread
From: David S. Miller @ 2004-09-12 23:45 UTC (permalink / raw)
To: Eric Lemoine; +Cc: ak, davem, netdev
On Sun, 12 Sep 2004 19:06:26 +0200
Eric Lemoine <eric.lemoine@gmail.com> wrote:
> > Add LLTX suppor to tg3. Locking was already safe for it, so only
> > trivial changes.
>
> tg3_set_rx_mode() (dev->set_multicast_list()) and tg3_start_xmit()
> used to synchronise thanks to dev->lock_xmit. With your LLTX patches
> they don't synchronise anymore (I don't think tg3_set_rx_mode() grabs
> tp->tx_lock) ; isn't it an issue?
You're absolutely right, I've made tg3_set_rx_mode() grab the
tx_lock now too.
Good spotting Eric.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2004-09-12 23:45 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2004-09-07 12:18 [PATCH] LLTX for tg3 Andi Kleen
2004-09-12 17:06 ` Eric Lemoine
2004-09-12 23:45 ` David S. Miller
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).