| Message ID | 1287618974-4714-8-git-send-email-jesse@nicira.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On 10/20/2010 4:56 PM, Jesse Gross wrote: > Now that vlan acceleration is handled consistently regardless of usage, > it is possible to enable and disable it at will. This adds support for > Ethtool operations that change the offloading status for debugging > purposes, similar to other forms of hardware acceleration. > Jesse, Not sure if this is enough to get dynamic toggling like this dev->hard_header_len is set depending on offloads at init time in vlan_dev_init(). By changing this LL_RESERVED_SPACE won't work correctly and we end up having to call pskb_expand_head(). I think this might end up hurting performance. That said I think I can probably get this working by fixing up the header_ops in vlan_dev.c. And while I'm at it add a vlan_header_cache and vlan_header_cache_update routines. I'll try to get something out tomorrow in the meantime nothing too bad is happening. Thanks, John. > Signed-off-by: Jesse Gross <jesse@nicira.com> > --- > include/linux/ethtool.h | 2 ++ > net/core/ethtool.c | 3 ++- > 2 files changed, 4 insertions(+), 1 deletions(-) > > diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h > index 8a3338c..6628a50 100644 > --- a/include/linux/ethtool.h > +++ b/include/linux/ethtool.h > @@ -309,6 +309,8 @@ struct ethtool_perm_addr { > * flag differs from the read-only value. > */ > enum ethtool_flags { > + ETH_FLAG_TXVLAN = (1 << 7), /* TX VLAN offload enabled */ > + ETH_FLAG_RXVLAN = (1 << 8), /* RX VLAN offload enabled */ > ETH_FLAG_LRO = (1 << 15), /* LRO is enabled */ > ETH_FLAG_NTUPLE = (1 << 27), /* N-tuple filters enabled */ > ETH_FLAG_RXHASH = (1 << 28), > diff --git a/net/core/ethtool.c b/net/core/ethtool.c > index 685c700..956a9f4 100644 > --- a/net/core/ethtool.c > +++ b/net/core/ethtool.c > @@ -132,7 +132,8 @@ EXPORT_SYMBOL(ethtool_op_set_ufo); > * NETIF_F_xxx values in include/linux/netdevice.h > */ > static const u32 flags_dup_features = > - (ETH_FLAG_LRO | ETH_FLAG_NTUPLE | ETH_FLAG_RXHASH); > + (ETH_FLAG_LRO | ETH_FLAG_RXVLAN | ETH_FLAG_TXVLAN | ETH_FLAG_NTUPLE | > + ETH_FLAG_RXHASH); > > u32 ethtool_op_get_flags(struct net_device *dev) > { -- 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
On Wed, Oct 20, 2010 at 8:27 PM, John Fastabend <john.r.fastabend@intel.com> wrote: > On 10/20/2010 4:56 PM, Jesse Gross wrote: >> Now that vlan acceleration is handled consistently regardless of usage, >> it is possible to enable and disable it at will. This adds support for >> Ethtool operations that change the offloading status for debugging >> purposes, similar to other forms of hardware acceleration. >> > > Jesse, > > Not sure if this is enough to get dynamic toggling like this > dev->hard_header_len is set depending on offloads at init time in > vlan_dev_init(). By changing this LL_RESERVED_SPACE won't work > correctly and we end up having to call pskb_expand_head(). I think > this might end up hurting performance. That's a good point. > > That said I think I can probably get this working by fixing up the > header_ops in vlan_dev.c. And while I'm at it add a vlan_header_cache > and vlan_header_cache_update routines. I'll try to get something out > tomorrow in the meantime nothing too bad is happening. That sounds great, thanks. -- 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
diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h index 8a3338c..6628a50 100644 --- a/include/linux/ethtool.h +++ b/include/linux/ethtool.h @@ -309,6 +309,8 @@ struct ethtool_perm_addr { * flag differs from the read-only value. */ enum ethtool_flags { + ETH_FLAG_TXVLAN = (1 << 7), /* TX VLAN offload enabled */ + ETH_FLAG_RXVLAN = (1 << 8), /* RX VLAN offload enabled */ ETH_FLAG_LRO = (1 << 15), /* LRO is enabled */ ETH_FLAG_NTUPLE = (1 << 27), /* N-tuple filters enabled */ ETH_FLAG_RXHASH = (1 << 28), diff --git a/net/core/ethtool.c b/net/core/ethtool.c index 685c700..956a9f4 100644 --- a/net/core/ethtool.c +++ b/net/core/ethtool.c @@ -132,7 +132,8 @@ EXPORT_SYMBOL(ethtool_op_set_ufo); * NETIF_F_xxx values in include/linux/netdevice.h */ static const u32 flags_dup_features = - (ETH_FLAG_LRO | ETH_FLAG_NTUPLE | ETH_FLAG_RXHASH); + (ETH_FLAG_LRO | ETH_FLAG_RXVLAN | ETH_FLAG_TXVLAN | ETH_FLAG_NTUPLE | + ETH_FLAG_RXHASH); u32 ethtool_op_get_flags(struct net_device *dev) {
Now that vlan acceleration is handled consistently regardless of usage, it is possible to enable and disable it at will. This adds support for Ethtool operations that change the offloading status for debugging purposes, similar to other forms of hardware acceleration. Signed-off-by: Jesse Gross <jesse@nicira.com> --- include/linux/ethtool.h | 2 ++ net/core/ethtool.c | 3 ++- 2 files changed, 4 insertions(+), 1 deletions(-)