Skip to contentSkip to conversation

VLAN regression caused by: e1000: do vlan cleanup (799d531).

DISCUSSION Ben Greear 2 participants 7 messages Mar 12, 2012 – Mar 20, 2012

Subsystems (3)
Networking Network drivers Intel Ethernet
lore
Share & tools
lore

Ben Greear

author
#0 lore raw

This commit breaks 802.1Q VLANs on my e1000 NIC, and it remains broken in top-of-tree (as of 2 days ago, at least).

commit 5622e4044a916de1af84bfcc4d437ce0c799d531

Author: Jiri Pirko <[email protected]>
Date:   Thu Jul 21 03:26:31 2011 +0000

e1000: do vlan cleanup

- unify vlan and nonvlan rx path
- kill adapter->vlgrp and e1000_vlan_rx_register
- allow to turn on/off rx/tx vlan accel via ethtool (set_features)

Signed-off-by Jiri Pirko <[email protected]>
Signed-off-by David S. Miller <[email protected]>

My OS is RH 8, 32-bit.

My e1000 hardware is:

05:01.0 Ethernet controller: Intel Corporation 82546GB Gigabit Ethernet Controller (rev 03)
Subsystem: Intel Corporation PRO/1000 MT Dual Port Server Adapter
Control: I/O+ Mem+ BusMaster+ SpecCycle- MemWINV+ VGASnoop- ParErr+ Stepping- SERR+ FastB2B- DisINTx-
Status: Cap+ 66MHz+ UDF- FastB2B- ParErr- DEVSEL=medium >TAbort- <TAbort- <MAbort- >SERR- <PERR- INTx-
Latency: 52 (63750ns min), Cache Line Size: 32 bytes
Interrupt: pin A routed to IRQ 24
Region 0: Memory at d8100000 (64-bit, non-prefetchable) [size=128K]
Region 4: I/O ports at 3000 [size=64]
Capabilities: [dc] Power Management version 2
Flags: PMEClk- DSI+ D1- D2- AuxCurrent=0mA PME(D0+,D1-,D2-,D3hot+,D3cold+)
Status: D0 PME-Enable- DSel=0 DScale=1 PME-
Capabilities: [e4] PCI-X non-bridge device
Command: DPERE- ERO+ RBC=512 OST=1
Status: Dev=05:01.0 64bit+ 133MHz+ SCD- USC- DC=simple DMMRBC=2048 DMOST=1 DMCRS=16 RSCEM- 266MHz- 533MHz-
Capabilities: [f0] Message Signalled Interrupts: Mask- 64bit+ Queue=0/0 Enable-
Address: 0000000000000000 Data: 0000
Kernel driver in use: e1000
Kernel modules: e1000

05:01.1 Ethernet controller: Intel Corporation 82546GB Gigabit Ethernet Controller (rev 03)
Subsystem: Intel Corporation PRO/1000 MT Dual Port Server Adapter
Control: I/O+ Mem+ BusMaster+ SpecCycle- MemWINV+ VGASnoop- ParErr+ Stepping- SERR+ FastB2B- DisINTx-
Status: Cap+ 66MHz+ UDF- FastB2B- ParErr- DEVSEL=medium >TAbort- <TAbort- <MAbort- >SERR- <PERR- INTx-
Latency: 52 (63750ns min), Cache Line Size: 32 bytes
Interrupt: pin B routed to IRQ 25
Region 0: Memory at d8120000 (64-bit, non-prefetchable) [size=128K]
Region 4: I/O ports at 3040 [size=64]
Capabilities: [dc] Power Management version 2
Flags: PMEClk- DSI+ D1- D2- AuxCurrent=0mA PME(D0+,D1-,D2-,D3hot+,D3cold+)
Status: D0 PME-Enable- DSel=0 DScale=1 PME-
Capabilities: [e4] PCI-X non-bridge device
Command: DPERE- ERO+ RBC=512 OST=1
Status: Dev=05:01.1 64bit+ 133MHz+ SCD- USC- DC=simple DMMRBC=2048 DMOST=1 DMCRS=16 RSCEM- 266MHz- 533MHz-
Capabilities: [f0] Message Signalled Interrupts: Mask- 64bit+ Queue=0/0 Enable-
Address: 0000000000000000 Data: 0000
Kernel driver in use: e1000
Kernel modules: e1000

I'm attaching ethregs output from good and bad kernels, in case that helps.

The symptom is that pkts show up as 'ISL' instead of Ethernet frames. I'm including a capture of that as well. I am sending UDP pkts from one NIC to the other, on vlan 8, though because ARP fails, no UDP is ever sent. The sniff shows rcvd pkts as looking funky, but it could be they are transmitted badly once they hit the NIC, so I don't know if it's actually rx or tx (or both) logic that is busted at this point.

I'm using routing rules to make send-to-self work, but the kernel is un-patched.

Please let me know if you need additional info. I'll be happy to test patches, I have a good setup to reproduce this easily.

Thanks,
Ben

Signature · 2 lines
Ben Greear <[email protected]>
Candela Technologies Inc  http://www.candelatech.com
#1 lore raw
Quoted 68 lines · Mon, Mar 12, 2012 at 07:17:51PM CET, [email protected] wrote:

This commit breaks 802.1Q VLANs on my e1000 NIC, and it remains broken in top-of-tree (as of 2 days ago, at least).

commit 5622e4044a916de1af84bfcc4d437ce0c799d531

Author: Jiri Pirko <[email protected]>
Date:   Thu Jul 21 03:26:31 2011 +0000

e1000: do vlan cleanup

- unify vlan and nonvlan rx path
- kill adapter->vlgrp and e1000_vlan_rx_register
- allow to turn on/off rx/tx vlan accel via ethtool (set_features)

Signed-off-by Jiri Pirko <[email protected]>
Signed-off-by David S. Miller <[email protected]>

My OS is RH 8, 32-bit.

My e1000 hardware is:

05:01.0 Ethernet controller: Intel Corporation 82546GB Gigabit Ethernet Controller (rev 03)
Subsystem: Intel Corporation PRO/1000 MT Dual Port Server Adapter
Control: I/O+ Mem+ BusMaster+ SpecCycle- MemWINV+ VGASnoop- ParErr+ Stepping- SERR+ FastB2B- DisINTx-
Status: Cap+ 66MHz+ UDF- FastB2B- ParErr- DEVSEL=medium >TAbort- <TAbort- <MAbort- >SERR- <PERR- INTx-
Latency: 52 (63750ns min), Cache Line Size: 32 bytes
Interrupt: pin A routed to IRQ 24
Region 0: Memory at d8100000 (64-bit, non-prefetchable) [size=128K]
Region 4: I/O ports at 3000 [size=64]
Capabilities: [dc] Power Management version 2
Flags: PMEClk- DSI+ D1- D2- AuxCurrent=0mA PME(D0+,D1-,D2-,D3hot+,D3cold+)
Status: D0 PME-Enable- DSel=0 DScale=1 PME-
Capabilities: [e4] PCI-X non-bridge device
Command: DPERE- ERO+ RBC=512 OST=1
Status: Dev=05:01.0 64bit+ 133MHz+ SCD- USC- DC=simple DMMRBC=2048 DMOST=1 DMCRS=16 RSCEM- 266MHz- 533MHz-
Capabilities: [f0] Message Signalled Interrupts: Mask- 64bit+ Queue=0/0 Enable-
Address: 0000000000000000 Data: 0000
Kernel driver in use: e1000
Kernel modules: e1000

05:01.1 Ethernet controller: Intel Corporation 82546GB Gigabit Ethernet Controller (rev 03)
Subsystem: Intel Corporation PRO/1000 MT Dual Port Server Adapter
Control: I/O+ Mem+ BusMaster+ SpecCycle- MemWINV+ VGASnoop- ParErr+ Stepping- SERR+ FastB2B- DisINTx-
Status: Cap+ 66MHz+ UDF- FastB2B- ParErr- DEVSEL=medium >TAbort- <TAbort- <MAbort- >SERR- <PERR- INTx-
Latency: 52 (63750ns min), Cache Line Size: 32 bytes
Interrupt: pin B routed to IRQ 25
Region 0: Memory at d8120000 (64-bit, non-prefetchable) [size=128K]
Region 4: I/O ports at 3040 [size=64]
Capabilities: [dc] Power Management version 2
Flags: PMEClk- DSI+ D1- D2- AuxCurrent=0mA PME(D0+,D1-,D2-,D3hot+,D3cold+)
Status: D0 PME-Enable- DSel=0 DScale=1 PME-
Capabilities: [e4] PCI-X non-bridge device
Command: DPERE- ERO+ RBC=512 OST=1
Status: Dev=05:01.1 64bit+ 133MHz+ SCD- USC- DC=simple DMMRBC=2048 DMOST=1 DMCRS=16 RSCEM- 266MHz- 533MHz-
Capabilities: [f0] Message Signalled Interrupts: Mask- 64bit+ Queue=0/0 Enable-
Address: 0000000000000000 Data: 0000
Kernel driver in use: e1000
Kernel modules: e1000

I'm attaching ethregs output from good and bad kernels, in case that helps.

The symptom is that pkts show up as 'ISL' instead of Ethernet frames. I'm including a capture of that as well. I am sending UDP pkts from one NIC to the other, on vlan 8, though because ARP fails, no UDP is ever sent. The sniff shows rcvd pkts as looking funky, but it could be they are transmitted badly once they hit the NIC, so I don't know if it's actually rx or tx (or both) logic that is busted at this point.

Quoted 4 lines

I'm using routing rules to make send-to-self work, but the kernel is un-patched.

Please let me know if you need additional info. I'll be happy to test patches, I have a good setup to reproduce this easily.

Thanks for the report Ben.

It would help it you try to enable/disable vlan hw accel by ethtool to see if it helps.

I have suspition that vlan filter must be on/offed along with vlan accel.

Thanks.

Jirka

Quoted 8 lines

Thanks,
Ben

Signature · 2 lines
Ben Greear <[email protected]>
Candela Technologies Inc  http://www.candelatech.com
author
#2 lore raw
Quoted 5 lines · Jiri Pirko
Quoted 2 lines · Mon, Mar 12, 2012 at 07:17:51PM CET, [email protected] wrote:

Please let me know if you need additional info. I'll be happy to test patches, I have a good setup to reproduce this easily.

Quoted 7 lines

Thanks for the report Ben.

It would help it you try to enable/disable vlan hw accel by ethtool to see if it helps.

I have suspition that vlan filter must be on/offed along with vlan accel.

Can that even be done in the 3.0 kernel? Or do you want me to just try the 3.3-rxX kernel?

Ben

Signature · 15 lines
Ben Greear <[email protected]>
Candela Technologies Inc  http://www.candelatech.com


------------------------------------------------------------------------------
Keep Your Developer Skills Current with LearnDevNow!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-d2d
_______________________________________________
E1000-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/e1000-devel
To learn more about Intel&#174; Ethernet, visit http://communities.intel.com/community/wired
author
#3 lore raw
In reply to Jiri Pirko
Quoted 74 lines · Jiri Pirko
Quoted 68 lines · Mon, Mar 12, 2012 at 07:17:51PM CET, [email protected] wrote:

This commit breaks 802.1Q VLANs on my e1000 NIC, and it remains broken in top-of-tree (as of 2 days ago, at least).

commit 5622e4044a916de1af84bfcc4d437ce0c799d531

Author: Jiri Pirko<[email protected]>
Date:   Thu Jul 21 03:26:31 2011 +0000

e1000: do vlan cleanup

- unify vlan and nonvlan rx path
- kill adapter->vlgrp and e1000_vlan_rx_register
- allow to turn on/off rx/tx vlan accel via ethtool (set_features)

Signed-off-by Jiri Pirko<[email protected]>
Signed-off-by David S. Miller<[email protected]>

My OS is RH 8, 32-bit.

My e1000 hardware is:

05:01.0 Ethernet controller: Intel Corporation 82546GB Gigabit Ethernet Controller (rev 03)
Subsystem: Intel Corporation PRO/1000 MT Dual Port Server Adapter
Control: I/O+ Mem+ BusMaster+ SpecCycle- MemWINV+ VGASnoop- ParErr+ Stepping- SERR+ FastB2B- DisINTx-
Status: Cap+ 66MHz+ UDF- FastB2B- ParErr- DEVSEL=medium>TAbort-<TAbort-<MAbort->SERR-<PERR- INTx-
Latency: 52 (63750ns min), Cache Line Size: 32 bytes
Interrupt: pin A routed to IRQ 24
Region 0: Memory at d8100000 (64-bit, non-prefetchable) [size=128K]
Region 4: I/O ports at 3000 [size=64]
Capabilities: [dc] Power Management version 2
Flags: PMEClk- DSI+ D1- D2- AuxCurrent=0mA PME(D0+,D1-,D2-,D3hot+,D3cold+)
Status: D0 PME-Enable- DSel=0 DScale=1 PME-
Capabilities: [e4] PCI-X non-bridge device
Command: DPERE- ERO+ RBC=512 OST=1
Status: Dev=05:01.0 64bit+ 133MHz+ SCD- USC- DC=simple DMMRBC=2048 DMOST=1 DMCRS=16 RSCEM- 266MHz- 533MHz-
Capabilities: [f0] Message Signalled Interrupts: Mask- 64bit+ Queue=0/0 Enable-
Address: 0000000000000000 Data: 0000
Kernel driver in use: e1000
Kernel modules: e1000

05:01.1 Ethernet controller: Intel Corporation 82546GB Gigabit Ethernet Controller (rev 03)
Subsystem: Intel Corporation PRO/1000 MT Dual Port Server Adapter
Control: I/O+ Mem+ BusMaster+ SpecCycle- MemWINV+ VGASnoop- ParErr+ Stepping- SERR+ FastB2B- DisINTx-
Status: Cap+ 66MHz+ UDF- FastB2B- ParErr- DEVSEL=medium>TAbort-<TAbort-<MAbort->SERR-<PERR- INTx-
Latency: 52 (63750ns min), Cache Line Size: 32 bytes
Interrupt: pin B routed to IRQ 25
Region 0: Memory at d8120000 (64-bit, non-prefetchable) [size=128K]
Region 4: I/O ports at 3040 [size=64]
Capabilities: [dc] Power Management version 2
Flags: PMEClk- DSI+ D1- D2- AuxCurrent=0mA PME(D0+,D1-,D2-,D3hot+,D3cold+)
Status: D0 PME-Enable- DSel=0 DScale=1 PME-
Capabilities: [e4] PCI-X non-bridge device
Command: DPERE- ERO+ RBC=512 OST=1
Status: Dev=05:01.1 64bit+ 133MHz+ SCD- USC- DC=simple DMMRBC=2048 DMOST=1 DMCRS=16 RSCEM- 266MHz- 533MHz-
Capabilities: [f0] Message Signalled Interrupts: Mask- 64bit+ Queue=0/0 Enable-
Address: 0000000000000000 Data: 0000
Kernel driver in use: e1000
Kernel modules: e1000

I'm attaching ethregs output from good and bad kernels, in case that helps.

The symptom is that pkts show up as 'ISL' instead of Ethernet frames. I'm including a capture of that as well. I am sending UDP pkts from one NIC to the other, on vlan 8, though because ARP fails, no UDP is ever sent. The sniff shows rcvd pkts as looking funky, but it could be they are transmitted badly once they hit the NIC, so I don't know if it's actually rx or tx (or both) logic that is busted at this point.

Quoted 4 lines

I'm using routing rules to make send-to-self work, but the kernel is un-patched.

Please let me know if you need additional info. I'll be happy to test patches, I have a good setup to reproduce this easily.

Quoted 7 lines

Thanks for the report Ben.

It would help it you try to enable/disable vlan hw accel by ethtool to see if it helps.

I have suspition that vlan filter must be on/offed along with vlan accel.

Ok, if I disable rx-vlan-hw-parse on both NICs, traffic starts working.

And, if I re-enable rx-vlan-hw-parse on both NICs, it continues to work.

Maybe the initialization logic needs some fixing?

This is on 3.3.0-rc7+.

Thanks,
Ben

Signature · 15 lines
Ben Greear <[email protected]>
Candela Technologies Inc  http://www.candelatech.com


------------------------------------------------------------------------------
Keep Your Developer Skills Current with LearnDevNow!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-d2d
_______________________________________________
E1000-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/e1000-devel
To learn more about Intel&#174; Ethernet, visit http://communities.intel.com/community/wired
#4 lore raw
Quoted 80 lines · Tue, Mar 13, 2012 at 07:44:18PM CET, [email protected] wrote:
Quoted 79 lines · Jiri Pirko
Quoted 68 lines · Mon, Mar 12, 2012 at 07:17:51PM CET, [email protected] wrote:

This commit breaks 802.1Q VLANs on my e1000 NIC, and it remains broken in top-of-tree (as of 2 days ago, at least).

commit 5622e4044a916de1af84bfcc4d437ce0c799d531

Author: Jiri Pirko<[email protected]>
Date:   Thu Jul 21 03:26:31 2011 +0000

e1000: do vlan cleanup

- unify vlan and nonvlan rx path
- kill adapter->vlgrp and e1000_vlan_rx_register
- allow to turn on/off rx/tx vlan accel via ethtool (set_features)

Signed-off-by Jiri Pirko<[email protected]>
Signed-off-by David S. Miller<[email protected]>

My OS is RH 8, 32-bit.

My e1000 hardware is:

05:01.0 Ethernet controller: Intel Corporation 82546GB Gigabit Ethernet Controller (rev 03)
Subsystem: Intel Corporation PRO/1000 MT Dual Port Server Adapter
Control: I/O+ Mem+ BusMaster+ SpecCycle- MemWINV+ VGASnoop- ParErr+ Stepping- SERR+ FastB2B- DisINTx-
Status: Cap+ 66MHz+ UDF- FastB2B- ParErr- DEVSEL=medium>TAbort-<TAbort-<MAbort->SERR-<PERR- INTx-
Latency: 52 (63750ns min), Cache Line Size: 32 bytes
Interrupt: pin A routed to IRQ 24
Region 0: Memory at d8100000 (64-bit, non-prefetchable) [size=128K]
Region 4: I/O ports at 3000 [size=64]
Capabilities: [dc] Power Management version 2
Flags: PMEClk- DSI+ D1- D2- AuxCurrent=0mA PME(D0+,D1-,D2-,D3hot+,D3cold+)
Status: D0 PME-Enable- DSel=0 DScale=1 PME-
Capabilities: [e4] PCI-X non-bridge device
Command: DPERE- ERO+ RBC=512 OST=1
Status: Dev=05:01.0 64bit+ 133MHz+ SCD- USC- DC=simple DMMRBC=2048 DMOST=1 DMCRS=16 RSCEM- 266MHz- 533MHz-
Capabilities: [f0] Message Signalled Interrupts: Mask- 64bit+ Queue=0/0 Enable-
Address: 0000000000000000 Data: 0000
Kernel driver in use: e1000
Kernel modules: e1000

05:01.1 Ethernet controller: Intel Corporation 82546GB Gigabit Ethernet Controller (rev 03)
Subsystem: Intel Corporation PRO/1000 MT Dual Port Server Adapter
Control: I/O+ Mem+ BusMaster+ SpecCycle- MemWINV+ VGASnoop- ParErr+ Stepping- SERR+ FastB2B- DisINTx-
Status: Cap+ 66MHz+ UDF- FastB2B- ParErr- DEVSEL=medium>TAbort-<TAbort-<MAbort->SERR-<PERR- INTx-
Latency: 52 (63750ns min), Cache Line Size: 32 bytes
Interrupt: pin B routed to IRQ 25
Region 0: Memory at d8120000 (64-bit, non-prefetchable) [size=128K]
Region 4: I/O ports at 3040 [size=64]
Capabilities: [dc] Power Management version 2
Flags: PMEClk- DSI+ D1- D2- AuxCurrent=0mA PME(D0+,D1-,D2-,D3hot+,D3cold+)
Status: D0 PME-Enable- DSel=0 DScale=1 PME-
Capabilities: [e4] PCI-X non-bridge device
Command: DPERE- ERO+ RBC=512 OST=1
Status: Dev=05:01.1 64bit+ 133MHz+ SCD- USC- DC=simple DMMRBC=2048 DMOST=1 DMCRS=16 RSCEM- 266MHz- 533MHz-
Capabilities: [f0] Message Signalled Interrupts: Mask- 64bit+ Queue=0/0 Enable-
Address: 0000000000000000 Data: 0000
Kernel driver in use: e1000
Kernel modules: e1000

I'm attaching ethregs output from good and bad kernels, in case that helps.

The symptom is that pkts show up as 'ISL' instead of Ethernet frames. I'm including a capture of that as well. I am sending UDP pkts from one NIC to the other, on vlan 8, though because ARP fails, no UDP is ever sent. The sniff shows rcvd pkts as looking funky, but it could be they are transmitted badly once they hit the NIC, so I don't know if it's actually rx or tx (or both) logic that is busted at this point.

Quoted 4 lines

I'm using routing rules to make send-to-self work, but the kernel is un-patched.

Please let me know if you need additional info. I'll be happy to test patches, I have a good setup to reproduce this easily.

Thanks for the report Ben.

It would help it you try to enable/disable vlan hw accel by ethtool to see if it helps.

Quoted 8 lines
Quoted 2 lines

I have suspition that vlan filter must be on/offed along with vlan accel.

Ok, if I disable rx-vlan-hw-parse on both NICs, traffic starts working.

And, if I re-enable rx-vlan-hw-parse on both NICs, it continues to work.

Maybe the initialization logic needs some fixing?

Could you please try following patch?

drivers/net/ethernet/intel/e1000/e1000_main.c +22 -13
index 6419a88..b06c31c 100644
@@ -164,6 +164,8 @@ static int e1000_82547_fifo_workaround(struct e1000_adapter *adapter,
 static bool e1000_vlan_used(struct e1000_adapter *adapter);
 static void e1000_vlan_mode(struct net_device *netdev,
 			    netdev_features_t features);
+static void e1000_vlan_filter_on_off(struct e1000_adapter *adapter,
+				     bool filter_on);
 static int e1000_vlan_rx_add_vid(struct net_device *netdev, u16 vid);
 static int e1000_vlan_rx_kill_vid(struct net_device *netdev, u16 vid);
 static void e1000_restore_vlan(struct e1000_adapter *adapter);

@@ -1214,7 +1216,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
 	if (err)
 		goto err_register;
 
-	e1000_vlan_mode(netdev, netdev->features);
+	e1000_vlan_filter_on_off(adapter, false);
 
 	/* print bus type/speed/width info */
 	e_info(probe, "(PCI%s:%dMHz:%d-bit) %pM\n",

@@ -4772,6 +4774,22 @@ static bool e1000_vlan_used(struct e1000_adapter *adapter)
 	return false;
 }
 
+static void __e1000_vlan_mode(struct e1000_adapter *adapter,
+			      netdev_features_t features)
+{
+	struct e1000_hw *hw = &adapter->hw;
+	u32 ctrl;
+
+	ctrl = er32(CTRL);
+	if (features & NETIF_F_HW_VLAN_RX) {
+		/* enable VLAN tag insert/strip */
+		ctrl |= E1000_CTRL_VME;
+	} else {
+		/* disable VLAN tag insert/strip */
+		ctrl &= ~E1000_CTRL_VME;
+	}
+	ew32(CTRL, ctrl);
+}
 static void e1000_vlan_filter_on_off(struct e1000_adapter *adapter,
 				     bool filter_on)
 {

@@ -4781,6 +4799,7 @@ static void e1000_vlan_filter_on_off(struct e1000_adapter *adapter,
 	if (!test_bit(__E1000_DOWN, &adapter->flags))
 		e1000_irq_disable(adapter);
 
+	__e1000_vlan_mode(adapter, adapter->netdev->features);
 	if (filter_on) {
 		/* enable VLAN receive filtering */
 		rctl = er32(RCTL);

@@ -4801,24 +4820,14 @@ static void e1000_vlan_filter_on_off(struct e1000_adapter *adapter,
 }
 
 static void e1000_vlan_mode(struct net_device *netdev,
-	netdev_features_t features)
+			    netdev_features_t features)
 {
 	struct e1000_adapter *adapter = netdev_priv(netdev);
-	struct e1000_hw *hw = &adapter->hw;
-	u32 ctrl;
 
 	if (!test_bit(__E1000_DOWN, &adapter->flags))
 		e1000_irq_disable(adapter);
 
-	ctrl = er32(CTRL);
-	if (features & NETIF_F_HW_VLAN_RX) {
-		/* enable VLAN tag insert/strip */
-		ctrl |= E1000_CTRL_VME;
-	} else {
-		/* disable VLAN tag insert/strip */
-		ctrl &= ~E1000_CTRL_VME;
-	}
-	ew32(CTRL, ctrl);
+	__e1000_vlan_mode(adapter, features);
 
 	if (!test_bit(__E1000_DOWN, &adapter->flags))
 		e1000_irq_enable(adapter);

------------------------------------------------------------------------------
This SF email is sponsosred by:
Try Windows Azure free for 90 days Click Here
http://p.sf.net/sfu/sfd2d-msazure
_______________________________________________
E1000-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/e1000-devel
To learn more about Intel&#174; Ethernet, visit http://communities.intel.com/community/wired

author
#5 lore raw
Quoted 5 lines · Jiri Pirko
Quoted 3 lines · Tue, Mar 13, 2012 at 07:44:18PM CET, [email protected] wrote:
Quoted 2 lines

I have suspition that vlan filter must be on/offed along with vlan accel.

Quoted 7 lines
Quoted 5 lines

Ok, if I disable rx-vlan-hw-parse on both NICs, traffic starts working.

And, if I re-enable rx-vlan-hw-parse on both NICs, it continues to work.

Maybe the initialization logic needs some fixing?

Could you please try following patch?

That patches fixes the problem for me. Only lightly tested at this point, but I have verified VLAN traffic works as desired.

Thanks,
Ben

Quoted 81 lines
drivers/net/ethernet/intel/e1000/e1000_main.c +22 -13
index 6419a88..b06c31c 100644
@@ -164,6 +164,8 @@ static int e1000_82547_fifo_workaround(struct e1000_adapter *adapter,
  static bool e1000_vlan_used(struct e1000_adapter *adapter);
  static void e1000_vlan_mode(struct net_device *netdev,
  			    netdev_features_t features);
+static void e1000_vlan_filter_on_off(struct e1000_adapter *adapter,
+				     bool filter_on);
  static int e1000_vlan_rx_add_vid(struct net_device *netdev, u16 vid);
  static int e1000_vlan_rx_kill_vid(struct net_device *netdev, u16 vid);
  static void e1000_restore_vlan(struct e1000_adapter *adapter);

@@ -1214,7 +1216,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
  	if (err)
  		goto err_register;
 
-	e1000_vlan_mode(netdev, netdev->features);
+	e1000_vlan_filter_on_off(adapter, false);
 
  	/* print bus type/speed/width info */
  	e_info(probe, "(PCI%s:%dMHz:%d-bit) %pM\n",

@@ -4772,6 +4774,22 @@ static bool e1000_vlan_used(struct e1000_adapter *adapter)
  	return false;
  }
 
+static void __e1000_vlan_mode(struct e1000_adapter *adapter,
+			      netdev_features_t features)
+{
+	struct e1000_hw *hw =&adapter->hw;
+	u32 ctrl;
+
+	ctrl = er32(CTRL);
+	if (features&  NETIF_F_HW_VLAN_RX) {
+		/* enable VLAN tag insert/strip */
+		ctrl |= E1000_CTRL_VME;
+	} else {
+		/* disable VLAN tag insert/strip */
+		ctrl&= ~E1000_CTRL_VME;
+	}
+	ew32(CTRL, ctrl);
+}
  static void e1000_vlan_filter_on_off(struct e1000_adapter *adapter,
  				     bool filter_on)
  {

@@ -4781,6 +4799,7 @@ static void e1000_vlan_filter_on_off(struct e1000_adapter *adapter,
  	if (!test_bit(__E1000_DOWN,&adapter->flags))
  		e1000_irq_disable(adapter);
 
+	__e1000_vlan_mode(adapter, adapter->netdev->features);
  	if (filter_on) {
  		/* enable VLAN receive filtering */
  		rctl = er32(RCTL);

@@ -4801,24 +4820,14 @@ static void e1000_vlan_filter_on_off(struct e1000_adapter *adapter,
  }
 
  static void e1000_vlan_mode(struct net_device *netdev,
-	netdev_features_t features)
+			    netdev_features_t features)
  {
  	struct e1000_adapter *adapter = netdev_priv(netdev);
-	struct e1000_hw *hw =&adapter->hw;
-	u32 ctrl;
 
  	if (!test_bit(__E1000_DOWN,&adapter->flags))
  		e1000_irq_disable(adapter);
 
-	ctrl = er32(CTRL);
-	if (features&  NETIF_F_HW_VLAN_RX) {
-		/* enable VLAN tag insert/strip */
-		ctrl |= E1000_CTRL_VME;
-	} else {
-		/* disable VLAN tag insert/strip */
-		ctrl&= ~E1000_CTRL_VME;
-	}
-	ew32(CTRL, ctrl);
+	__e1000_vlan_mode(adapter, features);
 
  	if (!test_bit(__E1000_DOWN,&adapter->flags))
  		e1000_irq_enable(adapter);
Signature · 13 lines
Ben Greear <[email protected]>
Candela Technologies Inc  http://www.candelatech.com


------------------------------------------------------------------------------
This SF email is sponsosred by:
Try Windows Azure free for 90 days Click Here 
http://p.sf.net/sfu/sfd2d-msazure
_______________________________________________
E1000-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/e1000-devel
To learn more about Intel&#174; Ethernet, visit http://communities.intel.com/community/wired
#6 lore raw
Quoted 8 lines · Tue, Mar 20, 2012 at 12:24:04AM CET, [email protected] wrote:
Quoted 7 lines · Jiri Pirko
Quoted 5 lines · Tue, Mar 13, 2012 at 07:44:18PM CET, [email protected] wrote:
Quoted 2 lines

I have suspition that vlan filter must be on/offed along with vlan accel.

Ok, if I disable rx-vlan-hw-parse on both NICs, traffic starts working.

Quoted 8 lines
Quoted 5 lines
Quoted 3 lines

And, if I re-enable rx-vlan-hw-parse on both NICs, it continues to work.

Maybe the initialization logic needs some fixing?

Could you please try following patch?

That patches fixes the problem for me. Only lightly tested at this point, but I have verified VLAN traffic works as desired.

Thank you. I'm going to do proper post of this.

Jirka

Quoted 83 lines

Thanks,
Ben

Quoted 79 lines
drivers/net/ethernet/intel/e1000/e1000_main.c +22 -13
index 6419a88..b06c31c 100644
@@ -164,6 +164,8 @@ static int e1000_82547_fifo_workaround(struct e1000_adapter *adapter,
 static bool e1000_vlan_used(struct e1000_adapter *adapter);
 static void e1000_vlan_mode(struct net_device *netdev,
 			    netdev_features_t features);
+static void e1000_vlan_filter_on_off(struct e1000_adapter *adapter,
+				     bool filter_on);
 static int e1000_vlan_rx_add_vid(struct net_device *netdev, u16 vid);
 static int e1000_vlan_rx_kill_vid(struct net_device *netdev, u16 vid);
 static void e1000_restore_vlan(struct e1000_adapter *adapter);

@@ -1214,7 +1216,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
 	if (err)
 		goto err_register;
 
-	e1000_vlan_mode(netdev, netdev->features);
+	e1000_vlan_filter_on_off(adapter, false);
 
 	/* print bus type/speed/width info */
 	e_info(probe, "(PCI%s:%dMHz:%d-bit) %pM\n",

@@ -4772,6 +4774,22 @@ static bool e1000_vlan_used(struct e1000_adapter *adapter)
 	return false;
 }
 
+static void __e1000_vlan_mode(struct e1000_adapter *adapter,
+			      netdev_features_t features)
+{
+	struct e1000_hw *hw =&adapter->hw;
+	u32 ctrl;
+
+	ctrl = er32(CTRL);
+	if (features&  NETIF_F_HW_VLAN_RX) {
+		/* enable VLAN tag insert/strip */
+		ctrl |= E1000_CTRL_VME;
+	} else {
+		/* disable VLAN tag insert/strip */
+		ctrl&= ~E1000_CTRL_VME;
+	}
+	ew32(CTRL, ctrl);
+}
 static void e1000_vlan_filter_on_off(struct e1000_adapter *adapter,
 				     bool filter_on)
 {

@@ -4781,6 +4799,7 @@ static void e1000_vlan_filter_on_off(struct e1000_adapter *adapter,
 	if (!test_bit(__E1000_DOWN,&adapter->flags))
 		e1000_irq_disable(adapter);
 
+	__e1000_vlan_mode(adapter, adapter->netdev->features);
 	if (filter_on) {
 		/* enable VLAN receive filtering */
 		rctl = er32(RCTL);

@@ -4801,24 +4820,14 @@ static void e1000_vlan_filter_on_off(struct e1000_adapter *adapter,
 }
 
 static void e1000_vlan_mode(struct net_device *netdev,
-	netdev_features_t features)
+			    netdev_features_t features)
 {
 	struct e1000_adapter *adapter = netdev_priv(netdev);
-	struct e1000_hw *hw =&adapter->hw;
-	u32 ctrl;
 
 	if (!test_bit(__E1000_DOWN,&adapter->flags))
 		e1000_irq_disable(adapter);
 
-	ctrl = er32(CTRL);
-	if (features&  NETIF_F_HW_VLAN_RX) {
-		/* enable VLAN tag insert/strip */
-		ctrl |= E1000_CTRL_VME;
-	} else {
-		/* disable VLAN tag insert/strip */
-		ctrl&= ~E1000_CTRL_VME;
-	}
-	ew32(CTRL, ctrl);
+	__e1000_vlan_mode(adapter, features);
Quoted 8 lines
Quoted 2 lines
drivers/net/ethernet/intel/e1000/e1000_main.c +0 -0
 	if (!test_bit(__E1000_DOWN,&adapter->flags))
 		e1000_irq_enable(adapter);
Signature · 2 lines
Ben Greear <[email protected]>
Candela Technologies Inc  http://www.candelatech.com

------------------------------------------------------------------------------
This SF email is sponsosred by:
Try Windows Azure free for 90 days Click Here
http://p.sf.net/sfu/sfd2d-msazure
_______________________________________________
E1000-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/e1000-devel
To learn more about Intel&#174; Ethernet, visit http://communities.intel.com/community/wired