[PATCH] vlan: restore ethtool ABI to control VLAN hardware acceleration

[PATCH] vlan: restore ethtool ABI to control VLAN hardware acceleration

[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). 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 <kaber@trash.net>
Cc: David S. Miller <davem@davemloft.net>
Cc: netdev@vger.kernel.org
Signed-off-by: Fernando Luis Vazquez Cao <fernando@oss.ntt.co.jp>
---

diff -urNp linux-3.10-rc5-orig/net/core/ethtool.c linux-3.10-rc5/net/core/ethtool.c
--- linux-3.10-rc5-orig/net/core/ethtool.c	2013-06-09 09:41:04.000000000 +0900
+++ linux-3.10-rc5/net/core/ethtool.c	2013-06-14 23:08:22.330454778 +0900
@@ -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",

Re: [PATCH] vlan: restore ethtool ABI to control VLAN hardware acceleration

[Ben Hutchings]

On Mon, 2013-06-17 at 11:28 +0900, Fernando Luis Vázquez Cao wrote:
> 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.

> 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 <kaber@trash.net>
> Cc: David S. Miller <davem@davemloft.net>
> Cc: netdev@vger.kernel.org
> Signed-off-by: Fernando Luis Vazquez Cao <fernando@oss.ntt.co.jp>

Reviewed-by: Ben Hutchings <bhutchings@solarflare.com>

Ben.

> ---
> 
> diff -urNp linux-3.10-rc5-orig/net/core/ethtool.c linux-3.10-rc5/net/core/ethtool.c
> --- linux-3.10-rc5-orig/net/core/ethtool.c	2013-06-09 09:41:04.000000000 +0900
> +++ linux-3.10-rc5/net/core/ethtool.c	2013-06-14 23:08:22.330454778 +0900
> @@ -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, 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.

Re: [PATCH] vlan: restore ethtool ABI to control VLAN hardware acceleration

[David Miller]

From: Ben Hutchings <bhutchings@solarflare.com>
Date: Mon, 17 Jun 2013 19:20:54 +0100

> On Mon, 2013-06-17 at 11:28 +0900, Fernando Luis Vázquez Cao wrote:
>> 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.
> 
>> 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 <kaber@trash.net>
>> Cc: David S. Miller <davem@davemloft.net>
>> Cc: netdev@vger.kernel.org
>> Signed-off-by: Fernando Luis Vazquez Cao <fernando@oss.ntt.co.jp>
> 
> Reviewed-by: Ben Hutchings <bhutchings@solarflare.com>

Ok Ben you were indeed right :-)

Applied, thanks.

Re: [PATCH] vlan: restore ethtool ABI to control VLAN hardware acceleration

[Fernando Luis Vazquez Cao]

On 2013年06月18日 09:10, David Miller wrote:
> From: Ben Hutchings <bhutchings@solarflare.com>
> Date: Mon, 17 Jun 2013 19:20:54 +0100
>
>> On Mon, 2013-06-17 at 11:28 +0900, Fernando Luis Vázquez Cao wrote:
>>> 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.
>>
>>> 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 <kaber@trash.net>
>>> Cc: David S. Miller <davem@davemloft.net>
>>> Cc: netdev@vger.kernel.org
>>> Signed-off-by: Fernando Luis Vazquez Cao <fernando@oss.ntt.co.jp>
>> Reviewed-by: Ben Hutchings <bhutchings@solarflare.com>
> Ok Ben you were indeed right :-)
>
> Applied, thanks.

Could you get this to Linus before 3.10 is out?

Thanks,
Fernando

Re: [PATCH] vlan: restore ethtool ABI to control VLAN hardware acceleration

[David Miller]

From: Fernando Luis Vazquez Cao <fernando_b1@lab.ntt.co.jp>
Date: Tue, 18 Jun 2013 10:38:14 +0900

> Could you get this to Linus before 3.10 is out?

It is never necessary to ask me this.