vlan: restore ethtool ABI to control VLAN hardware acceleration

PATCH Applied Fernando Luis Vázquez Cao 3 participants 5 messages Jun 17, 2013 – Jun 18, 2013

Subsystems (2)

Networking Network drivers

lore

Share & tools

lore

Fernando Luis Vázquez Cao

author

2013-06-17 03:14 UTC #0 lore raw

PATCH 1/1 vlan: restore ethtool ABI to control VLAN hardware acceleration

As part of the push to add 802.1ad server provider tagging support to the kernel the VLAN features flags were renamed. Unfortunately the kernel name for the VLAN hardware acceleration features that the kernel shows user space was included in the rename, which broke ethtool (txvlan and rxvlan options do not work). This patch restores the original names, i.e. the original ABI. If we wanted to make clear to users that we are refering to CTAGs we can always change ethtool's short_name and long_name for these features (for example something along the lines of txvlan -> txvlan-ctag, tx-vlan-offload -> tx-vlan-ctag-offload).

Cc Patrick McHardy <[email protected]>

Cc David S. Miller <[email protected]>

Cc [email protected]

Signed-off-by Fernando Luis Vazquez Cao <[email protected]>

---

net/core/ethtool.c +3 -3

diff -urNp linux-3.10-rc5-orig/net/core/ethtool.c linux-3.10-rc5/net/core/ethtool.c
@@ -60,10 +60,10 @@ static const char netdev_features_string
 	[NETIF_F_IPV6_CSUM_BIT] =        "tx-checksum-ipv6",
 	[NETIF_F_HIGHDMA_BIT] =          "highdma",
 	[NETIF_F_FRAGLIST_BIT] =         "tx-scatter-gather-fraglist",
-	[NETIF_F_HW_VLAN_CTAG_TX_BIT] =  "tx-vlan-ctag-hw-insert",
+	[NETIF_F_HW_VLAN_CTAG_TX_BIT] =  "tx-vlan-hw-insert",
 
-	[NETIF_F_HW_VLAN_CTAG_RX_BIT] =  "rx-vlan-ctag-hw-parse",
-	[NETIF_F_HW_VLAN_CTAG_FILTER_BIT] = "rx-vlan-ctag-filter",
+	[NETIF_F_HW_VLAN_CTAG_RX_BIT] =  "rx-vlan-hw-parse",
+	[NETIF_F_HW_VLAN_CTAG_FILTER_BIT] = "rx-vlan-filter",
 	[NETIF_F_HW_VLAN_STAG_TX_BIT] =  "tx-vlan-stag-hw-insert",
 	[NETIF_F_HW_VLAN_STAG_RX_BIT] =  "rx-vlan-stag-hw-parse",
 	[NETIF_F_HW_VLAN_STAG_FILTER_BIT] = "rx-vlan-stag-filter",

Ben Hutchings

Reviewed-by on v1 1/1

2013-06-17 18:20 UTC #1 lore raw

Quoted 5 lines · Fernando Luis Vázquez Cao

As part of the push to add 802.1ad server provider tagging support to the kernel the VLAN features flags were renamed. Unfortunately the kernel name for the VLAN hardware acceleration features that the kernel shows user space was included in the rename, which broke ethtool (txvlan and rxvlan options do not work).

I expected something like that and said this was an ABI change, but apparently my objection wasn't sufficient.

Quoted 10 lines

This patch restores the original names, i.e. the original ABI.
If we wanted to make clear to users that we are refering to CTAGs we can always change ethtool's short_name and long_name for these features (for example something along the lines of txvlan -> txvlan-ctag, tx-vlan-offload -> tx-vlan-ctag-offload).
Cc Patrick McHardy <[email protected]>
Cc David S. Miller <[email protected]>
Cc [email protected]
Signed-off-by Fernando Luis Vazquez Cao <[email protected]>

Reviewed-by Ben Hutchings <[email protected]>

Ben.

Quoted 20 lines

---

diff -urNp linux-3.10-rc5-orig/net/core/ethtool.c linux-3.10-rc5/net/core/ethtool.c

net/core/ethtool.c +3 -3

@@ -60,10 +60,10 @@ static const char netdev_features_string
 	[NETIF_F_IPV6_CSUM_BIT] =        "tx-checksum-ipv6",
 	[NETIF_F_HIGHDMA_BIT] =          "highdma",
 	[NETIF_F_FRAGLIST_BIT] =         "tx-scatter-gather-fraglist",
-	[NETIF_F_HW_VLAN_CTAG_TX_BIT] =  "tx-vlan-ctag-hw-insert",
+	[NETIF_F_HW_VLAN_CTAG_TX_BIT] =  "tx-vlan-hw-insert",
 
-	[NETIF_F_HW_VLAN_CTAG_RX_BIT] =  "rx-vlan-ctag-hw-parse",
-	[NETIF_F_HW_VLAN_CTAG_FILTER_BIT] = "rx-vlan-ctag-filter",
+	[NETIF_F_HW_VLAN_CTAG_RX_BIT] =  "rx-vlan-hw-parse",
+	[NETIF_F_HW_VLAN_CTAG_FILTER_BIT] = "rx-vlan-filter",
 	[NETIF_F_HW_VLAN_STAG_TX_BIT] =  "tx-vlan-stag-hw-insert",
 	[NETIF_F_HW_VLAN_STAG_RX_BIT] =  "rx-vlan-stag-hw-parse",
 	[NETIF_F_HW_VLAN_STAG_FILTER_BIT] = "rx-vlan-stag-filter",

Signature · 3 lines

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.

David Miller

maintainer Applied

2013-06-18 00:10 UTC #2 lore raw

From: Ben Hutchings <[email protected]>
Date: Mon, 17 Jun 2013 19:20:54 +0100

Quoted 16 lines · Fernando Luis Vázquez Cao

Quoted 5 lines
As part of the push to add 802.1ad server provider tagging support to the kernel the VLAN features flags were renamed. Unfortunately the kernel name for the VLAN hardware acceleration features that the kernel shows user space was included in the rename, which broke ethtool (txvlan and rxvlan options do not work).
I expected something like that and said this was an ABI change, but apparently my objection wasn't sufficient.
Quoted 6 lines
This patch restores the original names, i.e. the original ABI.
If we wanted to make clear to users that we are refering to CTAGs we can always change ethtool's short_name and long_name for these features (for example something along the lines of txvlan -> txvlan-ctag, tx-vlan-offload -> tx-vlan-ctag-offload).

Quoted 6 lines

Quoted 4 lines
Cc Patrick McHardy <[email protected]>
Cc David S. Miller <[email protected]>
Cc [email protected]
Signed-off-by Fernando Luis Vazquez Cao <[email protected]>
Reviewed-by Ben Hutchings <[email protected]>

Ok Ben you were indeed right :-)

Applied, thanks.

Fernando Luis Vazquez Cao

author

2013-06-18 01:38 UTC #3 lore raw

Quoted 18 lines · David Miller

From: Ben Hutchings <[email protected]>
Date: Mon, 17 Jun 2013 19:20:54 +0100
Quoted 15 lines · Fernando Luis Vázquez Cao
Quoted 5 lines
As part of the push to add 802.1ad server provider tagging support to the kernel the VLAN features flags were renamed. Unfortunately the kernel name for the VLAN hardware acceleration features that the kernel shows user space was included in the rename, which broke ethtool (txvlan and rxvlan options do not work).
I expected something like that and said this was an ABI change, but apparently my objection wasn't sufficient.
Quoted 6 lines
This patch restores the original names, i.e. the original ABI.
If we wanted to make clear to users that we are refering to CTAGs we can always change ethtool's short_name and long_name for these features (for example something along the lines of txvlan -> txvlan-ctag, tx-vlan-offload -> tx-vlan-ctag-offload).

Quoted 8 lines

Quoted 5 lines
Quoted 4 lines
Cc Patrick McHardy <[email protected]>
Cc David S. Miller <[email protected]>
Cc [email protected]
Signed-off-by Fernando Luis Vazquez Cao <[email protected]>
Reviewed-by Ben Hutchings <[email protected]>
Ok Ben you were indeed right :-)
Applied, thanks.

Could you get this to Linus before 3.10 is out?

Thanks,
Fernando

David Miller

maintainer

2013-06-18 07:18 UTC #4 lore raw

From: Fernando Luis Vazquez Cao <[email protected]>
Date: Tue, 18 Jun 2013 10:38:14 +0900

Quoted 1 line

Could you get this to Linus before 3.10 is out?

It is never necessary to ask me this.