macvlan: disable LRO on lowerdev instead of a macvlan
Subsystems (2)
v2 cover macvlan: disable LRO on lowerdev instead of a macvlan
A customer of ours encountered a problem with LRO on an ixgbe network card. Analysis showed that it was a known conflict of forwarding and LRO but the forwarding was enabled in an LXC container where only a macvlan was, not the ethernet device itself.
I believe the solution is exactly the same as what we do for "normal" (802.1q) VLAN devices: if dev_disable_lro() is called for such device, LRO is disabled on the underlying "real" device instead.
v2: adapt to changes merged from net-next
Michal Kubecek (2):
macvlan: introduce macvlan_dev_real_dev() helper function
macvlan: disable LRO on lower device instead of macvlan
include/linux/if_macvlan.h | 16 ++++++++++++++++ net/core/dev.c | 5 +++++ 2 files changed, 21 insertions(+)
Signature · 1 line
1.8.1.4
PATCH v2 1/2 macvlan: introduce macvlan_dev_real_dev() helper function
Introduce helper function macvlan_dev_real_dev which returns the underlying device of a macvlan device, similar to vlan_dev_real_dev() for 802.1q VLAN devices.
v2: IFF_MACVLAN flag and equivalent of is_macvlan_dev() were introduced in the meantime
--- include/linux/if_macvlan.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
include/linux/if_macvlan.h +16 -0
@@ -119,4 +119,20 @@ extern int macvlan_link_register(struct rtnl_link_ops *ops);extern netdev_tx_t macvlan_start_xmit (struct sk_buff *skb,struct net_device *dev); +#if IS_ENABLED (CONFIG_MACVLAN ) +static inline struct net_device * +macvlan_dev_real_dev (const struct net_device *dev) +{ +struct macvlan_dev *macvlan =netdev_priv (dev); + +return macvlan->lowerdev; +} +#else +static inline struct net_device * +macvlan_dev_real_dev (const struct net_device *dev) +{ +return NULL ; +} +#endif +#endif /* _LINUX_IF_MACVLAN_H */
Signature · 1 line
1.8.1.4
Re: [PATCH net v2 1/2] macvlan: introduce macvlan_dev_real_dev() helper function
Quoted 26 lines · Michal Kubecek
Introduce helper function
macvlan_dev_real_devwhich returns the underlying device of a macvlan device, similar tovlan_dev_real_dev()for 802.1q VLAN devices.v2:
IFF_MACVLANflag and equivalent ofis_macvlan_dev()were introduced in the meantimeSigned-off-by Michal Kubecek <[email protected]>--- include/linux/if_macvlan.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)include/linux/if_macvlan.h +6
-0@@ -119,4 +119,20 @@ extern int macvlan_link_register(struct rtnl_link_ops *ops);extern netdev_tx_t macvlan_start_xmit (struct sk_buff *skb,struct net_device *dev); +#if IS_ENABLED (CONFIG_MACVLAN ) +static inline struct net_device * +macvlan_dev_real_dev (const struct net_device *dev) +{ +struct macvlan_dev *macvlan =netdev_priv (dev); +
include/linux/if_macvlan.h extern int macvlan_link_register(struct rtnl_link_ops *ops); · line 137
Quoted 10 lines
include/linux/if_macvlan.h +10
-0+ return macvlan->lowerdev; +} +#else +static inline struct net_device * +macvlan_dev_real_dev (const struct net_device *dev) +{ +return NULL ; +} +#endif +
You may want to do the same here as was done for vlan_dev_real_dev(). This function is not intended to be called blindly and should always be called after netif_is_macvlan().
-vlad
Quoted 2 lines
include/linux/if_macvlan.h +0
-0#endif /* _LINUX_IF_MACVLAN_H */
Re: [PATCH net v2 1/2] macvlan: introduce macvlan_dev_real_dev() helper function
Quoted 14 lines · Vlad Yasevich
Quoted 13 lines · Michal Kubecek
include/linux/if_macvlan.h +13
-0+#if IS_ENABLED (CONFIG_MACVLAN ) +static inline struct net_device * +macvlan_dev_real_dev (const struct net_device *dev) +{ +struct macvlan_dev *macvlan =netdev_priv (dev); + +return macvlan->lowerdev; +} +#else +static inline struct net_device * +macvlan_dev_real_dev (const struct net_device *dev) +{ +return NULL ;
Quoted 8 lines
include/linux/if_macvlan.h extern int macvlan_link_register(struct rtnl_link_ops *ops); · line 137
Quoted 3 lines
include/linux/if_macvlan.h +3
-0+} +#endif +You may want to do the same here as was done for
vlan_dev_real_dev(). This function is not intended to be called blindly and should always
be called afternetif_is_macvlan().
I'm not sure. It makes sense from the developer point of view: if we find an inconsistency which must be caused by a bug in kernel code, do panic so that the bug is found and fixed as soon as possible. However, I remember a discussion where the point was that BUG() and BUG_ON() should only be used if there is no way to recover. From this point of view, WARN or WARN_ONCE might be better choice - but I'm not strictly opposed to BUG().
Michal Kubecek
David Miller
maintainerRe: [PATCH net v2 1/2] macvlan: introduce macvlan_dev_real_dev() helper function
From: Michal Kubecek <[email protected]>
Date: Thu, 14 Nov 2013 16:57:57 +0100
Quoted 24 lines · Vlad Yasevich
Quoted 14 lines · Michal Kubecek
Quoted 13 lines
include/linux/if_macvlan.h +13
-0+#if IS_ENABLED (CONFIG_MACVLAN ) +static inline struct net_device * +macvlan_dev_real_dev (const struct net_device *dev) +{ +struct macvlan_dev *macvlan =netdev_priv (dev); + +return macvlan->lowerdev; +} +#else +static inline struct net_device * +macvlan_dev_real_dev (const struct net_device *dev) +{ +return NULL ;Quoted 8 lines
include/linux/if_macvlan.h extern int macvlan_link_register(struct rtnl_link_ops *ops); · line 137
Quoted 3 lines
include/linux/if_macvlan.h +3
-0+} +#endif +You may want to do the same here as was done for
vlan_dev_real_dev(). This function is not intended to be called blindly and should always
be called afternetif_is_macvlan().
Quoted 7 lines
I'm not sure. It makes sense from the developer point of view: if we find an inconsistency which must be caused by a bug in kernel code, do panic so that the bug is found and fixed as soon as possible. However, I remember a discussion where the point was that
BUG()andBUG_ON()should only be used if there is no way to recover. From this point of view, WARN orWARN_ONCEmight be better choice - but I'm not strictly opposed toBUG().
At least for the time being use BUG(), to be consistent with the same way how VLAN handles this situation.
Thanks.
Re: [PATCH net v2 1/2] macvlan: introduce macvlan_dev_real_dev() helper function
Quoted 12 lines · David Miller
Quoted 12 lines
Quoted 12 lines · Michal Kubecek
Quoted 11 lines
include/linux/if_macvlan.h +11
-0+#if IS_ENABLED (CONFIG_MACVLAN ) +static inline struct net_device * +macvlan_dev_real_dev (const struct net_device *dev) +{ +struct macvlan_dev *macvlan =netdev_priv (dev); + +return macvlan->lowerdev; +} +#else +static inline struct net_device * +macvlan_dev_real_dev (const struct net_device *dev)
Quoted 8 lines
Quoted 5 lines
Quoted 5 lines
include/linux/if_macvlan.h extern int macvlan_link_register(struct rtnl_link_ops *ops); · line 137
Quoted 5 lines
include/linux/if_macvlan.h +5
-0+{ +return NULL ; +} +#endif +At least for the time being use
BUG(), to be consistent with the same way how VLAN handles this situation.
OK, v3 sent.
Michal Kubecek
Re: [PATCH net v2 1/2] macvlan: introduce macvlan_dev_real_dev() helper function
In reply to Michal KubecekQuoted 32 lines · Michal Kubecek
Quoted 14 lines · Vlad Yasevich
Quoted 13 lines · Michal Kubecek
include/linux/if_macvlan.h +13
-0+#if IS_ENABLED (CONFIG_MACVLAN ) +static inline struct net_device * +macvlan_dev_real_dev (const struct net_device *dev) +{ +struct macvlan_dev *macvlan =netdev_priv (dev); + +return macvlan->lowerdev; +} +#else +static inline struct net_device * +macvlan_dev_real_dev (const struct net_device *dev) +{ +return NULL ;Quoted 8 lines
include/linux/if_macvlan.h extern int macvlan_link_register(struct rtnl_link_ops *ops); · line 137
Quoted 3 lines
include/linux/if_macvlan.h +3
-0+} +#endif +You may want to do the same here as was done for
vlan_dev_real_dev(). This function is not intended to be called blindly and should always
be called afternetif_is_macvlan().I'm not sure. It makes sense from the developer point of view: if we find an inconsistency which must be caused by a bug in kernel code, do panic so that the bug is found and fixed as soon as possible. However, I remember a discussion where the point was that
BUG()andBUG_ON()should only be used if there is no way to recover. From this point of view, WARN orWARN_ONCEmight be better choice - but I'm not strictly opposed toBUG().
Quoted 2 lines
Michal Kubecek
If someone blindly calls macvlan_dev_real_dev() and macvlan module is enabled, but there is no macvlan device, you are going to get garbage and crash. So crashing if module is disabled for the same case seems perfectly reasonable.
-vlad
PATCH v2 2/2 macvlan: disable LRO on lower device instead of macvlan
In reply to Michal KubecekA macvlan device has always LRO disabled so that calling dev_disable_lro() on it does nothing. If we need to disable LRO e.g. because
- the macvlan device is inserted into a bridge
- IPv6 forwarding is enabled for it
- it is in a different namespace than lowerdev and IPv4 forwarding is enabled in it
we need to disable LRO on its underlying device instead (as we do for 802.1q VLAN devices).
v2: use newly introduced netif_is_macvlan()
--- net/core/dev.c | 5 +++++ 1 file changed, 5 insertions(+)
net/core/dev.c +5 -0
@@ -131,6 +131,7 @@#include <linux/static_key.h> #include <linux/hashtable.h> #include <linux/vmalloc.h> +#include <linux/if_macvlan.h> #include "net-sysfs.h"
@@ -1424,6 +1425,10 @@ void dev_disable_lro(struct net_device *dev)if (is_vlan_dev (dev)) dev =vlan_dev_real_dev (dev); +/* the same for macvlan devices */ +if (netif_is_macvlan (dev)) + dev =macvlan_dev_real_dev (dev); + dev->wanted_features &= ~NETIF_F_LRO ;netdev_update_features (dev);
Signature · 1 line
1.8.1.4