vbus: venet macvlan support
Subsystems (3)
cover vbus: venet macvlan support
(Applies to alacrityvm.git/master:34534534)
This patchset implements a vbus venet device with a macvlan backend.
These patches allow an alacrityvm guest to send and receive directly over a macvlan, avoiding the bridge entirely. This driver inherits all of the benefits of the work done to date on vbus/venet driver(SAR offloading, zero-copy in the guest->host path, configurable tx-complete mitigation, interrupt coalescing at the vbus level). Some of the work to re-factor and share the common code between venet-tap and venet-macvlan was done prior because it should be generally useful to anyone wanting to implement a venet type of device.
Once the driver is built and installed, you may use it just like you would a venet-tap device. In order to instantiate a venet-macvlan, there are just two differences from the procedure to instantiating a venet-tap. In order to create the venet-macvlan device, just:
echo venet-macvlan > /config/vbus/devices/<device-name>/type
and
echo "lower-devicename" > /sys/vbus/devices/<device-name>/ll_ifname
where lower-devicename is something like eth0, eth1, eth2 etc.
The second step associates the lower-devicename, usually a physical device, with the venet-macvlan device being created. This step must be perform prior to enabling the venet-macvlan device.
After that, a guest can make use of the venet-macvlan in exactly the same manner as a venet-tap. In fact, the guest actually sees venet-tap and venet-macvlan as identical types of the devices on the vbus.
Using the venet-macvlan driver will reduce some overhead by eliminating the linux bridge from the send and receive paths. For a lightly loaded network segment and system, we have measured this to be aproximately 1-3 us per side depending on what hardware is involved.
Since this driver layered over the macvlan driver, it will have that same limitations as the macvlan driver. For example, forwarding between macvlan devices on the same host is not supported. This driver targeted toward VEPA environments as described by the 'Edge Virtual Bridging' working group.
---
Patrick Mullaney (4):
venet-macvlan: add new driver to connect a venet to a macvlan netdevice
venetdev: support common venet netdev routines
macvlan: allow in-kernel modules to create and manage macvlan devices
macvlan: derived from Arnd Bergmann's patch for macvtap
drivers/net/macvlan.c | 105 +++-- drivers/net/vbus-enet.c | 8 include/linux/macvlan.h | 43 ++ include/linux/venet.h | 5 kernel/vbus/devices/venet/Kconfig | 11 + kernel/vbus/devices/venet/Makefile | 10 - kernel/vbus/devices/venet/device.c | 53 ++- kernel/vbus/devices/venet/macvlan.c | 598 +++++++++++++++++++++++++++++++ kernel/vbus/devices/venet/venetdevice.h | 12 + 9 files changed, 785 insertions(+), 60 deletions(-) create mode 100644 include/linux/macvlan.h create mode 100644 kernel/vbus/devices/venet/macvlan.c
PATCH 1/4 macvlan: derived from Arnd Bergmann's patch for macvtap
This is in the series because this has not gone upstream yet and the subsequent patches depend on it. This patch includes only the basic framework for overriding the receive path and the macvlan header was moved to allow modules outside of driver/net to use it.
---
drivers/net/macvlan.c | 39 +++++++++++++++------------------------ include/linux/macvlan.h | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 24 deletions(-) create mode 100644 include/linux/macvlan.h
drivers/net/macvlan.c +15 -24
@@ -30,22 +30,7 @@#include <linux/if_macvlan.h> #include <net/rtnetlink.h> -#define MACVLAN_HASH_SIZE (1 << BITS_PER_BYTE) - -struct macvlan_port { -struct net_device *dev; -struct hlist_head vlan_hash[MACVLAN_HASH_SIZE ]; -struct list_head vlans; -}; - -struct macvlan_dev { -struct net_device *dev; -struct list_head list; -struct hlist_node hlist; -struct macvlan_port *port; -struct net_device *lowerdev; -}; - +#include <linux/macvlan.h> static struct macvlan_dev *macvlan_hash_lookup (const struct macvlan_port *port,const unsigned char *addr)
@@ -135,7 +120,7 @@ static void macvlan_broadcast(struct sk_buff *skb,else nskb->pkt_type =PACKET_MULTICAST ; -netif_rx (nskb); + vlan->receive (nskb); } } }
@@ -180,11 +165,11 @@ static struct sk_buff *macvlan_handle_frame(struct sk_buff *skb) skb->dev = dev; skb->pkt_type =PACKET_HOST ; -netif_rx (skb); + vlan->receive (skb);return NULL ; } -static int macvlan_start_xmit (struct sk_buff *skb,struct net_device *dev) +int macvlan_start_xmit (struct sk_buff *skb,struct net_device *dev) {const struct macvlan_dev *vlan =netdev_priv (dev);unsigned int len = skb->len;
@@ -202,6 +187,7 @@ static int macvlan_start_xmit(struct sk_buff *skb, struct net_device *dev) }return NETDEV_TX_OK ; } +EXPORT_SYMBOL_GPL (macvlan_start_xmit); static int macvlan_hard_header(struct sk_buff *skb, struct net_device *dev, unsigned short type, const void *daddr,
@@ -412,7 +398,7 @@ static const struct net_device_ops macvlan_netdev_ops = { .ndo_validate_addr = eth_validate_addr, }; -static void macvlan_setup (struct net_device *dev) +void macvlan_setup (struct net_device *dev) {ether_setup (dev);
@@ -423,6 +409,7 @@ static void macvlan_setup(struct net_device *dev) dev->ethtool_ops = &macvlan_ethtool_ops; dev->tx_queue_len =0 ; } +EXPORT_SYMBOL_GPL (macvlan_setup);static int macvlan_port_create (struct net_device *dev) {
@@ -472,7 +459,7 @@ static void macvlan_transfer_operstate(struct net_device *dev) } } -static int macvlan_validate (struct nlattr *tb[],struct nlattr *data[]) +int macvlan_validate (struct nlattr *tb[],struct nlattr *data[]) {if (tb[IFLA_ADDRESS ]) {if (nla_len (tb[IFLA_ADDRESS ]) !=ETH_ALEN )
@@ -482,9 +469,10 @@ static int macvlan_validate(struct nlattr *tb[], struct nlattr *data[]) }return 0 ; } +EXPORT_SYMBOL_GPL (macvlan_validate); -static int macvlan_newlink (struct net_device *dev, -struct nlattr *tb[],struct nlattr *data[]) +int macvlan_newlink (struct net_device *dev, +struct nlattr *tb[],struct nlattr *data[]) {struct macvlan_dev *vlan =netdev_priv (dev);struct macvlan_port *port;
@@ -524,6 +512,7 @@ static int macvlan_newlink(struct net_device *dev, vlan->lowerdev = lowerdev; vlan->dev = dev; vlan->port = port; + vlan->receive = netif_rx; err =register_netdevice (dev);if (err <0 )
@@ -533,8 +522,9 @@ static int macvlan_newlink(struct net_device *dev,macvlan_transfer_operstate (dev);return 0 ; } +EXPORT_SYMBOL_GPL (macvlan_newlink); -static void macvlan_dellink (struct net_device *dev) +void macvlan_dellink (struct net_device *dev) {struct macvlan_dev *vlan =netdev_priv (dev);struct macvlan_port *port = vlan->port;
@@ -545,6 +535,7 @@ static void macvlan_dellink(struct net_device *dev)if (list_empty (&port->vlans))macvlan_port_destroy (port->dev); } +EXPORT_SYMBOL_GPL (macvlan_dellink);static struct rtnl_link_ops macvlan_link_ops__read_mostly = { .kind ="macvlan" ,
include/linux/macvlan.h new file +37 -0
@@ -0,0 +1,37 @@ +#ifndef _MACVLAN_H +#define _MACVLAN_H + +#include <linux/netdevice.h> +#include <linux/netlink.h> +#include <linux/list.h> + +#define MACVLAN_HASH_SIZE (1 << BITS_PER_BYTE) + +struct macvlan_port { +struct net_device *dev; +struct hlist_head vlan_hash[MACVLAN_HASH_SIZE ]; +struct list_head vlans; +}; + +struct macvlan_dev { +struct net_device *dev; +struct list_head list; +struct hlist_node hlist; +struct macvlan_port *port; +struct net_device *lowerdev; + +int (*receive)(struct sk_buff *skb); +}; + +extern int macvlan_start_xmit (struct sk_buff *skb,struct net_device *dev); + +extern void macvlan_setup (struct net_device *dev); + +extern int macvlan_validate (struct nlattr *tb[],struct nlattr *data[]); + +extern int macvlan_newlink (struct net_device *dev, +struct nlattr *tb[],struct nlattr *data[]); + +extern void macvlan_dellink (struct net_device *dev); + +#endif /* _MACVLAN_H */
PATCH 2/4 macvlan: allow in-kernel modules to create and manage macvlan devices
In reply to Patrick MullaneyThe macvlan driver didn't allow for creation/deletion of devices by other in-kernel modules. This patch provides common routines for both in-kernel and netlink based management. This patch also enables macvlan device support for gro for lower level devices that support gro.
---
drivers/net/macvlan.c | 72 +++++++++++++++++++++++++++++++---------------- include/linux/macvlan.h | 6 ++++ 2 files changed, 53 insertions(+), 25 deletions(-)
drivers/net/macvlan.c +47 -25
@@ -208,7 +208,7 @@ static const struct header_ops macvlan_hard_header_ops = { .cache_update = eth_header_cache_update, }; -static int macvlan_open (struct net_device *dev) +int macvlan_open (struct net_device *dev) {struct macvlan_dev *vlan =netdev_priv (dev);struct net_device *lowerdev = vlan->lowerdev;
@@ -235,7 +235,7 @@ out:return err; } -static int macvlan_stop (struct net_device *dev) +int macvlan_stop (struct net_device *dev) {struct macvlan_dev *vlan =netdev_priv (dev);struct net_device *lowerdev = vlan->lowerdev;
@@ -316,7 +316,7 @@ static struct lock_class_key macvlan_netdev_addr_lock_key;#define MACVLAN_FEATURES \ (NETIF_F_SG | NETIF_F_ALL_CSUM | NETIF_F_HIGHDMA | NETIF_F_FRAGLIST | \ NETIF_F_GSO | NETIF_F_TSO | NETIF_F_UFO | NETIF_F_GSO_ROBUST | \ - NETIF_F_TSO_ECN | NETIF_F_TSO6) + NETIF_F_TSO_ECN | NETIF_F_TSO6 | NETIF_F_GRO)#define MACVLAN_STATE_MASK \ ((1<<__LINK_STATE_NOCARRIER) | (1<<__LINK_STATE_DORMANT))
@@ -440,7 +440,7 @@ static void macvlan_port_destroy(struct net_device *dev)kfree (port); } -static void macvlan_transfer_operstate (struct net_device *dev) +void macvlan_transfer_operstate (struct net_device *dev) {struct macvlan_dev *vlan =netdev_priv (dev);const struct net_device *lowerdev = vlan->lowerdev;
@@ -458,6 +458,7 @@ static void macvlan_transfer_operstate(struct net_device *dev)netif_carrier_off (dev); } } +EXPORT_SYMBOL_GPL (macvlan_transfer_operstate);int macvlan_validate (struct nlattr *tb[],struct nlattr *data[]) {
@@ -471,11 +472,47 @@ int macvlan_validate(struct nlattr *tb[], struct nlattr *data[]) }EXPORT_SYMBOL_GPL (macvlan_validate); -int macvlan_newlink (struct net_device *dev, -struct nlattr *tb[],struct nlattr *data[]) +int macvlan_link_lowerdev (struct net_device *dev, +struct net_device *lowerdev) {struct macvlan_dev *vlan =netdev_priv (dev);struct macvlan_port *port; +int err =0 ; + +if (lowerdev->macvlan_port ==NULL ) { + err =macvlan_port_create (lowerdev); +if (err <0 ) +return err; + } + port = lowerdev->macvlan_port; + + vlan->lowerdev = lowerdev; + vlan->dev = dev; + vlan->port = port; + vlan->receive = netif_rx; + +macvlan_init (dev); + +list_add_tail (&vlan->list, &port->vlans); +return 0 ; +} +EXPORT_SYMBOL_GPL (macvlan_link_lowerdev); + +void macvlan_unlink_lowerdev (struct net_device *dev) +{ +struct macvlan_dev *vlan =netdev_priv (dev); +struct macvlan_port *port = vlan->port; + +list_del (&vlan->list); + +if (list_empty (&port->vlans)) +macvlan_port_destroy (port->dev); +} +EXPORT_SYMBOL_GPL (macvlan_unlink_lowerdev); + +int macvlan_newlink (struct net_device *dev, +struct nlattr *tb[],struct nlattr *data[]) +{struct net_device *lowerdev;int err;
@@ -502,23 +539,14 @@ int macvlan_newlink(struct net_device *dev,if (!tb[IFLA_ADDRESS ])random_ether_addr (dev->dev_addr); -if (lowerdev->macvlan_port ==NULL ) { - err =macvlan_port_create (lowerdev); -if (err <0 ) -return err; - } - port = lowerdev->macvlan_port; - - vlan->lowerdev = lowerdev; - vlan->dev = dev; - vlan->port = port; - vlan->receive = netif_rx; + err =macvlan_link_lowerdev (dev, lowerdev); +if (err <0 ) +return err; err =register_netdevice (dev);if (err <0 )return err; -list_add_tail (&vlan->list, &port->vlans);macvlan_transfer_operstate (dev);return 0 ; }
@@ -526,14 +554,8 @@ EXPORT_SYMBOL_GPL(macvlan_newlink);void macvlan_dellink (struct net_device *dev) { -struct macvlan_dev *vlan =netdev_priv (dev); -struct macvlan_port *port = vlan->port; - -list_del (&vlan->list); +macvlan_unlink_lowerdev (dev);unregister_netdevice (dev); - -if (list_empty (&port->vlans)) -macvlan_port_destroy (port->dev); }EXPORT_SYMBOL_GPL (macvlan_dellink);
include/linux/macvlan.h +6 -0
@@ -24,6 +24,12 @@ struct macvlan_dev { };extern int macvlan_start_xmit (struct sk_buff *skb,struct net_device *dev); +extern int macvlan_link_lowerdev (struct net_device *dev, +struct net_device *lowerdev); + +extern void macvlan_unlink_lowerdev (struct net_device *dev); + +extern void macvlan_transfer_operstate (struct net_device *dev);extern void macvlan_setup (struct net_device *dev);
Re: [PATCH 2/4] macvlan: allow in-kernel modules to create and manage macvlan devices
Quoted 12 lines · Patrick Mullaney
The macvlan driver didn't allow for creation/deletion of devices by other in-kernel modules. This patch provides common routines for both in-kernel and netlink based management. This patch also enables macvlan device support for gro for lower level devices that support gro.
drivers/net/macvlan.c +1
-1-static void macvlan_transfer_operstate (struct net_device *dev) +void macvlan_transfer_operstate (struct net_device *dev) {struct macvlan_dev *vlan =netdev_priv (dev);const struct net_device *lowerdev = vlan->lowerdev;
drivers/net/macvlan.c static void macvlan_transfer_operstate(struct net_device *dev) · line 461
Quoted 4 lines
drivers/net/macvlan.c +1
-0@@ -458,6 +458,7 @@ static void macvlan_transfer_operstate(struct net_device *dev)netif_carrier_off (dev); } } +EXPORT_SYMBOL_GPL (macvlan_transfer_operstate);
I think this function could be moved to net/core/dev.c or net/core/link_watch.c. The VLAN code has an identical copy.
drivers/net/macvlan.c int macvlan_validate(struct nlattr *tb[], struct nlattr *data[]) · line 476
Quoted 4 lines
drivers/net/macvlan.c +2
-2-int macvlan_newlink (struct net_device *dev, -struct nlattr *tb[],struct nlattr *data[]) +int macvlan_link_lowerdev (struct net_device *dev, +struct net_device *lowerdev)
Please indent this more cleanly.
Quoted 36 lines
(quoted diff) +0
-0{drivers/net/macvlan.c +20
-8struct macvlan_dev *vlan =netdev_priv (dev);struct macvlan_port *port; +int err =0 ; + +if (lowerdev->macvlan_port ==NULL ) { + err =macvlan_port_create (lowerdev); +if (err <0 ) +return err; + } + port = lowerdev->macvlan_port; + + vlan->lowerdev = lowerdev; + vlan->dev = dev; + vlan->port = port; + vlan->receive = netif_rx; + +macvlan_init (dev); + +list_add_tail (&vlan->list, &port->vlans); +return 0 ; +} +EXPORT_SYMBOL_GPL (macvlan_link_lowerdev);@@ -502,23 +539,14 @@ int macvlan_newlink(struct net_device *dev,if (!tb[IFLA_ADDRESS ])random_ether_addr (dev->dev_addr); -if (lowerdev->macvlan_port ==NULL ) { - err =macvlan_port_create (lowerdev); -if (err <0 ) -return err; - } - port = lowerdev->macvlan_port; - - vlan->lowerdev = lowerdev;
drivers/net/macvlan.c int macvlan_newlink(struct net_device *dev, · line 548
Quoted 10 lines
drivers/net/macvlan.c +3
-3- vlan->dev = dev; - vlan->port = port; - vlan->receive = netif_rx; + err =macvlan_link_lowerdev (dev, lowerdev); +if (err <0 ) +return err; err =register_netdevice (dev);if (err <0 )return err;
You've already added the device to the port->vlans list, so you need to remove it again when register_netdevice() fails.
Quoted 5 lines
drivers/net/macvlan.c +0
-1-list_add_tail (&vlan->list, &port->vlans);macvlan_transfer_operstate (dev);return 0 ; }@@ -526,14 +554,8 @@ EXPORT_SYMBOL_GPL(macvlan_newlink);
PATCH 1/1 netdevice: provide common routine for macvlan and vlan operstate management
Patrick,
This patch is intended to address your comment on moving the operstate transition function. I decided to move it to netdevice.h, perhaps that is a bad idea? It didn't seem to logically fall into dev.c or link_watch.c. I am not against moving them to either one though. Your other comments are addressed and I will send out a second series once this gets reviewed and agreed on.
Thanks for your review/comments.
----------
Provide common routine for the transition of operational state for a leaf device during a root device transition.
---
include/linux/netdevice.h | 19 +++++++++++++++++++ net/8021q/vlan.c | 29 ++++------------------------- 2 files changed, 23 insertions(+), 25 deletions(-)
include/linux/netdevice.h +19 -0
@@ -1999,6 +1999,25 @@ static inline u32 dev_ethtool_get_flags(struct net_device *dev)return 0 ;return dev->ethtool_ops->get_flags (dev); } + +static inline +void netif_stacked_transfer_operstate (const struct net_device *rootdev, +struct net_device *dev) +{ +if (rootdev->operstate ==IF_OPER_DORMANT ) +netif_dormant_on (dev); +else +netif_dormant_off (dev); + +if (netif_carrier_ok (rootdev)) { +if (!netif_carrier_ok (dev)) +netif_carrier_on (dev); + }else { +if (netif_carrier_ok (dev)) +netif_carrier_off (dev); + } +} +#endif /* __KERNEL__ */ #endif /* _LINUX_NETDEVICE_H */
net/8021q/vlan.c +4 -25
@@ -183,27 +183,6 @@ void unregister_vlan_dev(struct net_device *dev)dev_put (real_dev); } -static void vlan_transfer_operstate (const struct net_device *dev, -struct net_device *vlandev) -{ -/* Have to respect userspace enforced dormant state -* of real device, also must allow supplicant running -* on VLAN device -*/ -if (dev->operstate ==IF_OPER_DORMANT ) -netif_dormant_on (vlandev); -else -netif_dormant_off (vlandev); - -if (netif_carrier_ok (dev)) { -if (!netif_carrier_ok (vlandev)) -netif_carrier_on (vlandev); - }else { -if (netif_carrier_ok (vlandev)) -netif_carrier_off (vlandev); - } -} -int vlan_check_real_dev (struct net_device *real_dev,u16 vlan_id) {const char *name = real_dev->name;
@@ -267,7 +246,7 @@ int register_vlan_dev(struct net_device *dev)/* Account for reference in struct vlan_dev_info */ dev_hold (real_dev); -vlan_transfer_operstate (real_dev, dev); +netif_stacked_transfer_operstate (real_dev, dev);linkwatch_fire_event (dev);/* _MUST_ call rfc2863_policy() */ /* So, got the sucker initialized, now lets place
@@ -449,7 +428,7 @@ static int vlan_device_event(struct notifier_block *unused, unsigned long event,if (!vlandev)continue ; -vlan_transfer_operstate (dev, vlandev); +netif_stacked_transfer_operstate (dev, vlandev); }break ;
@@ -492,7 +471,7 @@ static int vlan_device_event(struct notifier_block *unused, unsigned long event,continue ;dev_change_flags (vlandev, flgs & ~IFF_UP ); -vlan_transfer_operstate (dev, vlandev); +netif_stacked_transfer_operstate (dev, vlandev); }break ;
@@ -508,7 +487,7 @@ static int vlan_device_event(struct notifier_block *unused, unsigned long event,continue ;dev_change_flags (vlandev, flgs |IFF_UP ); -vlan_transfer_operstate (dev, vlandev); +netif_stacked_transfer_operstate (dev, vlandev); }break ;
Re: [PATCH] netdevice: provide common routine for macvlan and vlan operstate management
Quoted 6 lines · Patrick Mullaney
This patch is intended to address your comment on moving the operstate transition function. I decided to move it to
netdevice.h, perhaps that is a bad idea? It didn't seem to logically fall intodev.corlink_watch.c. I am not against moving them to either one though. Your other comments are addressed and I will send out a second series once this gets reviewed and agreed on.
Thanks. I don't mind much where exactly it is located, but I'd prefer to not have it inlined. It doesn't seem terribly wrong to move it to dev.c, there are even some helpers for stacked devices already, like address list synchronization.
Besides that the patch looks fine to me.
cover macvlan: support for guest vm direct rx/tx
In reply to Patrick McHardy(Applies to net-2.6.git/master:1dfc5827)
These patches allow other modules to override the receive path of a macvlan. This is being done to support guest VMs operating directly over a macvlan. Routines to allow creation and deletion of macvlans from in-kernel modules were also exposed/added.
---
Patrick Mullaney (3):
macvlan: allow in-kernel modules to create and manage macvlan devices
macvlan: derived from Arnd Bergmann's patch for macvtap
netdevice: provide common routine for macvlan and vlan operstate management
drivers/net/macvlan.c | 135 ++++++++++++++++++++++----------------------- include/linux/macvlan.h | 41 ++++++++++++++ include/linux/netdevice.h | 3 + net/8021q/vlan.c | 29 +--------- net/core/dev.c | 27 +++++++++ 5 files changed, 142 insertions(+), 93 deletions(-) create mode 100644 include/linux/macvlan.h
PATCH 1/3 netdevice: provide common routine for macvlan and vlan operstate management
Provide common routine for the transition of operational state for a leaf device during a root device transition.
---
drivers/net/macvlan.c | 24 +++--------------------- include/linux/netdevice.h | 3 +++ net/8021q/vlan.c | 29 ++++------------------------- net/core/dev.c | 27 +++++++++++++++++++++++++++ 4 files changed, 37 insertions(+), 46 deletions(-)
drivers/net/macvlan.c +3 -21
@@ -455,25 +455,6 @@ static void macvlan_port_destroy(struct net_device *dev)kfree (port); } -static void macvlan_transfer_operstate (struct net_device *dev) -{ -struct macvlan_dev *vlan =netdev_priv (dev); -const struct net_device *lowerdev = vlan->lowerdev; - -if (lowerdev->operstate ==IF_OPER_DORMANT ) -netif_dormant_on (dev); -else -netif_dormant_off (dev); - -if (netif_carrier_ok (lowerdev)) { -if (!netif_carrier_ok (dev)) -netif_carrier_on (dev); - }else { -if (netif_carrier_ok (dev)) -netif_carrier_off (dev); - } -} -static int macvlan_validate (struct nlattr *tb[],struct nlattr *data[]) {if (tb[IFLA_ADDRESS ]) {
@@ -551,7 +532,7 @@ static int macvlan_newlink(struct net_device *dev,return err;list_add_tail (&vlan->list, &port->vlans); -macvlan_transfer_operstate (dev); +netif_stacked_transfer_operstate (dev, lowerdev);return 0 ; }
@@ -591,7 +572,8 @@ static int macvlan_device_event(struct notifier_block *unused,switch (event) {case NETDEV_CHANGE :list_for_each_entry (vlan, &port->vlans, list) -macvlan_transfer_operstate (vlan->dev); +netif_stacked_transfer_operstate (vlan->dev, + vlan->lowerdev);break ;case NETDEV_FEAT_CHANGE :list_for_each_entry (vlan, &port->vlans, list) {
include/linux/netdevice.h +3 -0
@@ -1914,6 +1914,9 @@ unsigned long netdev_increment_features(unsigned long all, unsigned long one, unsigned long mask);unsigned long netdev_fix_features (unsigned long features,const char *name); +void netif_stacked_transfer_operstate (const struct net_device *rootdev, +struct net_device *dev); +static inline int net_gso_ok (int features,int gso_type) {int feature = gso_type <<NETIF_F_GSO_SHIFT ;
net/8021q/vlan.c +4 -25
@@ -183,27 +183,6 @@ void unregister_vlan_dev(struct net_device *dev)dev_put (real_dev); } -static void vlan_transfer_operstate (const struct net_device *dev, -struct net_device *vlandev) -{ -/* Have to respect userspace enforced dormant state -* of real device, also must allow supplicant running -* on VLAN device -*/ -if (dev->operstate ==IF_OPER_DORMANT ) -netif_dormant_on (vlandev); -else -netif_dormant_off (vlandev); - -if (netif_carrier_ok (dev)) { -if (!netif_carrier_ok (vlandev)) -netif_carrier_on (vlandev); - }else { -if (netif_carrier_ok (vlandev)) -netif_carrier_off (vlandev); - } -} -int vlan_check_real_dev (struct net_device *real_dev,u16 vlan_id) {const char *name = real_dev->name;
@@ -261,7 +240,7 @@ int register_vlan_dev(struct net_device *dev)/* Account for reference in struct vlan_dev_info */ dev_hold (real_dev); -vlan_transfer_operstate (real_dev, dev); +netif_stacked_transfer_operstate (real_dev, dev);linkwatch_fire_event (dev);/* _MUST_ call rfc2863_policy() */ /* So, got the sucker initialized, now lets place
@@ -447,7 +426,7 @@ static int vlan_device_event(struct notifier_block *unused, unsigned long event,if (!vlandev)continue ; -vlan_transfer_operstate (dev, vlandev); +netif_stacked_transfer_operstate (dev, vlandev); }break ;
@@ -503,7 +482,7 @@ static int vlan_device_event(struct notifier_block *unused, unsigned long event,continue ;dev_change_flags (vlandev, flgs & ~IFF_UP ); -vlan_transfer_operstate (dev, vlandev); +netif_stacked_transfer_operstate (dev, vlandev); }break ;
@@ -519,7 +498,7 @@ static int vlan_device_event(struct notifier_block *unused, unsigned long event,continue ;dev_change_flags (vlandev, flgs |IFF_UP ); -vlan_transfer_operstate (dev, vlandev); +netif_stacked_transfer_operstate (dev, vlandev); }break ;
net/core/dev.c +27 -0
@@ -4746,6 +4746,33 @@ unsigned long netdev_fix_features(unsigned long features, const char *name)EXPORT_SYMBOL (netdev_fix_features);/** +* netif_stacked_transfer_operstate - transfer operstate +* @rootdev: the root or lower level device to transfer state from +* @dev: the device to transfer operstate to +* +* Transfer operational state from root to device. This is normally +* called when a stacking relationship exists between the root +* device and the device(a leaf device). +*/ +void netif_stacked_transfer_operstate (const struct net_device *rootdev, +struct net_device *dev) +{ +if (rootdev->operstate ==IF_OPER_DORMANT ) +netif_dormant_on (dev); +else +netif_dormant_off (dev); + +if (netif_carrier_ok (rootdev)) { +if (!netif_carrier_ok (dev)) +netif_carrier_on (dev); + }else { +if (netif_carrier_ok (dev)) +netif_carrier_off (dev); + } +} +EXPORT_SYMBOL (netif_stacked_transfer_operstate); + +/** * register_netdevice - register a network device * @dev: device to register *
Re: [PATCH 1/3] netdevice: provide common routine for macvlan and vlan operstate management
Quoted 10 lines · Patrick Mullaney
drivers/net/macvlan.c +1
-1@@ -551,7 +532,7 @@ static int macvlan_newlink(struct net_device *dev,return err;list_add_tail (&vlan->list, &port->vlans); -macvlan_transfer_operstate (dev); +netif_stacked_transfer_operstate (dev, lowerdev);return 0 ; }
drivers/net/macvlan.c static int macvlan_device_event(struct notifier_block *unused, · line 579
Quoted 9 lines
drivers/net/macvlan.c +2
-1@@ -591,7 +572,8 @@ static int macvlan_device_event(struct notifier_block *unused,switch (event) {case NETDEV_CHANGE :list_for_each_entry (vlan, &port->vlans, list) -macvlan_transfer_operstate (vlan->dev); +netif_stacked_transfer_operstate (vlan->dev, + vlan->lowerdev);break ;case NETDEV_FEAT_CHANGE :list_for_each_entry (vlan, &port->vlans, list) {
These have the arguments reversed, lowerdev should come first.
Arnd <><
PATCH 2/3 macvlan: derived from Arnd Bergmann's patch for macvtap
In reply to Patrick MullaneyThis patch includes only the basic framework for overriding the receive path and the macvlan header was moved to allow modules outside of driver/net to use it.
---
drivers/net/macvlan.c | 41 ++++++++++++++++------------------------- include/linux/macvlan.h | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 25 deletions(-) create mode 100644 include/linux/macvlan.h
drivers/net/macvlan.c +16 -25
@@ -30,22 +30,7 @@#include <linux/if_macvlan.h> #include <net/rtnetlink.h> -#define MACVLAN_HASH_SIZE (1 << BITS_PER_BYTE) - -struct macvlan_port { -struct net_device *dev; -struct hlist_head vlan_hash[MACVLAN_HASH_SIZE ]; -struct list_head vlans; -}; - -struct macvlan_dev { -struct net_device *dev; -struct list_head list; -struct hlist_node hlist; -struct macvlan_port *port; -struct net_device *lowerdev; -}; - +#include <linux/macvlan.h> static struct macvlan_dev *macvlan_hash_lookup (const struct macvlan_port *port,const unsigned char *addr)
@@ -135,7 +120,7 @@ static void macvlan_broadcast(struct sk_buff *skb,else nskb->pkt_type =PACKET_MULTICAST ; -netif_rx (nskb); + vlan->receive (nskb); } } }
@@ -180,12 +165,12 @@ static struct sk_buff *macvlan_handle_frame(struct sk_buff *skb) skb->dev = dev; skb->pkt_type =PACKET_HOST ; -netif_rx (skb); + vlan->receive (skb);return NULL ; } -static netdev_tx_t macvlan_start_xmit (struct sk_buff *skb, -struct net_device *dev) +netdev_tx_t macvlan_start_xmit (struct sk_buff *skb, +struct net_device *dev) {int i =skb_get_queue_mapping (skb);struct netdev_queue *txq =netdev_get_tx_queue (dev, i);
@@ -204,6 +189,7 @@ static netdev_tx_t macvlan_start_xmit(struct sk_buff *skb,return NETDEV_TX_OK ; } +EXPORT_SYMBOL_GPL (macvlan_start_xmit); static int macvlan_hard_header(struct sk_buff *skb, struct net_device *dev, unsigned short type, const void *daddr,
@@ -414,7 +400,7 @@ static const struct net_device_ops macvlan_netdev_ops = { .ndo_validate_addr = eth_validate_addr, }; -static void macvlan_setup (struct net_device *dev) +void macvlan_setup (struct net_device *dev) {ether_setup (dev);
@@ -425,6 +411,7 @@ static void macvlan_setup(struct net_device *dev) dev->ethtool_ops = &macvlan_ethtool_ops; dev->tx_queue_len =0 ; } +EXPORT_SYMBOL_GPL (macvlan_setup);static int macvlan_port_create (struct net_device *dev) {
@@ -455,7 +442,7 @@ static void macvlan_port_destroy(struct net_device *dev)kfree (port); } -static int macvlan_validate (struct nlattr *tb[],struct nlattr *data[]) +int macvlan_validate (struct nlattr *tb[],struct nlattr *data[]) {if (tb[IFLA_ADDRESS ]) {if (nla_len (tb[IFLA_ADDRESS ]) !=ETH_ALEN )
@@ -465,6 +452,7 @@ static int macvlan_validate(struct nlattr *tb[], struct nlattr *data[]) }return 0 ; } +EXPORT_SYMBOL_GPL (macvlan_validate); static int macvlan_get_tx_queues(struct net *net, struct nlattr *tb[],
@@ -485,8 +473,8 @@ static int macvlan_get_tx_queues(struct net *net,return 0 ; } -static int macvlan_newlink (struct net_device *dev, -struct nlattr *tb[],struct nlattr *data[]) +int macvlan_newlink (struct net_device *dev, +struct nlattr *tb[],struct nlattr *data[]) {struct macvlan_dev *vlan =netdev_priv (dev);struct macvlan_port *port;
@@ -526,6 +514,7 @@ static int macvlan_newlink(struct net_device *dev, vlan->lowerdev = lowerdev; vlan->dev = dev; vlan->port = port; + vlan->receive = netif_rx; err =register_netdevice (dev);if (err <0 )
@@ -535,8 +524,9 @@ static int macvlan_newlink(struct net_device *dev,netif_stacked_transfer_operstate (dev, lowerdev);return 0 ; } +EXPORT_SYMBOL_GPL (macvlan_newlink); -static void macvlan_dellink (struct net_device *dev) +void macvlan_dellink (struct net_device *dev) {struct macvlan_dev *vlan =netdev_priv (dev);struct macvlan_port *port = vlan->port;
@@ -547,6 +537,7 @@ static void macvlan_dellink(struct net_device *dev)if (list_empty (&port->vlans))macvlan_port_destroy (port->dev); } +EXPORT_SYMBOL_GPL (macvlan_dellink);static struct rtnl_link_ops macvlan_link_ops__read_mostly = { .kind ="macvlan" ,
include/linux/macvlan.h new file +37 -0
@@ -0,0 +1,37 @@ +#ifndef _MACVLAN_H +#define _MACVLAN_H + +#include <linux/netdevice.h> +#include <linux/netlink.h> +#include <linux/list.h> + +#define MACVLAN_HASH_SIZE (1 << BITS_PER_BYTE) + +struct macvlan_port { +struct net_device *dev; +struct hlist_head vlan_hash[MACVLAN_HASH_SIZE ]; +struct list_head vlans; +}; + +struct macvlan_dev { +struct net_device *dev; +struct list_head list; +struct hlist_node hlist; +struct macvlan_port *port; +struct net_device *lowerdev; + +int (*receive)(struct sk_buff *skb); +}; + +extern int macvlan_start_xmit (struct sk_buff *skb,struct net_device *dev); + +extern void macvlan_setup (struct net_device *dev); + +extern int macvlan_validate (struct nlattr *tb[],struct nlattr *data[]); + +extern int macvlan_newlink (struct net_device *dev, +struct nlattr *tb[],struct nlattr *data[]); + +extern void macvlan_dellink (struct net_device *dev); + +#endif /* _MACVLAN_H */
PATCH 3/3 macvlan: allow in-kernel modules to create and manage macvlan devices
In reply to Patrick MullaneyThe macvlan driver didn't allow for creation/deletion of devices by other in-kernel modules. This patch provides common routines for both in-kernel and netlink based management. This patch also enables macvlan device support for gro for lower level devices that support gro.
---
drivers/net/macvlan.c | 72 ++++++++++++++++++++++++++++++++--------------- include/linux/macvlan.h | 4 +++ 2 files changed, 53 insertions(+), 23 deletions(-)
drivers/net/macvlan.c +49 -23
@@ -210,7 +210,7 @@ static const struct header_ops macvlan_hard_header_ops = { .cache_update = eth_header_cache_update, }; -static int macvlan_open (struct net_device *dev) +int macvlan_open (struct net_device *dev) {struct macvlan_dev *vlan =netdev_priv (dev);struct net_device *lowerdev = vlan->lowerdev;
@@ -237,7 +237,7 @@ out:return err; } -static int macvlan_stop (struct net_device *dev) +int macvlan_stop (struct net_device *dev) {struct macvlan_dev *vlan =netdev_priv (dev);struct net_device *lowerdev = vlan->lowerdev;
@@ -318,7 +318,7 @@ static struct lock_class_key macvlan_netdev_addr_lock_key;#define MACVLAN_FEATURES \ (NETIF_F_SG | NETIF_F_ALL_CSUM | NETIF_F_HIGHDMA | NETIF_F_FRAGLIST | \ NETIF_F_GSO | NETIF_F_TSO | NETIF_F_UFO | NETIF_F_GSO_ROBUST | \ - NETIF_F_TSO_ECN | NETIF_F_TSO6) + NETIF_F_TSO_ECN | NETIF_F_TSO6 | NETIF_F_GRO)#define MACVLAN_STATE_MASK \ ((1<<__LINK_STATE_NOCARRIER) | (1<<__LINK_STATE_DORMANT))
@@ -454,6 +454,44 @@ int macvlan_validate(struct nlattr *tb[], struct nlattr *data[]) }EXPORT_SYMBOL_GPL (macvlan_validate); +int macvlan_link_lowerdev (struct net_device *dev, +struct net_device *lowerdev) +{ +struct macvlan_dev *vlan =netdev_priv (dev); +struct macvlan_port *port; +int err =0 ; + +if (lowerdev->macvlan_port ==NULL ) { + err =macvlan_port_create (lowerdev); +if (err <0 ) +return err; + } + port = lowerdev->macvlan_port; + + vlan->lowerdev = lowerdev; + vlan->dev = dev; + vlan->port = port; + vlan->receive = netif_rx; + +macvlan_init (dev); + +list_add_tail (&vlan->list, &port->vlans); +return 0 ; +} +EXPORT_SYMBOL_GPL (macvlan_link_lowerdev); + +void macvlan_unlink_lowerdev (struct net_device *dev) +{ +struct macvlan_dev *vlan =netdev_priv (dev); +struct macvlan_port *port = vlan->port; + +list_del (&vlan->list); + +if (list_empty (&port->vlans)) +macvlan_port_destroy (port->dev); +} +EXPORT_SYMBOL_GPL (macvlan_unlink_lowerdev); + static int macvlan_get_tx_queues(struct net *net, struct nlattr *tb[], unsigned int *num_tx_queues,
@@ -504,38 +542,26 @@ int macvlan_newlink(struct net_device *dev,if (!tb[IFLA_ADDRESS ])random_ether_addr (dev->dev_addr); -if (lowerdev->macvlan_port ==NULL ) { - err =macvlan_port_create (lowerdev); -if (err <0 ) -return err; - } - port = lowerdev->macvlan_port; - - vlan->lowerdev = lowerdev; - vlan->dev = dev; - vlan->port = port; - vlan->receive = netif_rx; + err =macvlan_link_lowerdev (dev, lowerdev); +if (err <0 ) +return err; err =register_netdevice (dev); -if (err <0 ) +if (err <0 ) { +macvlan_unlink_lowerdev (dev);return err; + } -list_add_tail (&vlan->list, &port->vlans);netif_stacked_transfer_operstate (dev, lowerdev); +return 0 ; }EXPORT_SYMBOL_GPL (macvlan_newlink);void macvlan_dellink (struct net_device *dev) { -struct macvlan_dev *vlan =netdev_priv (dev); -struct macvlan_port *port = vlan->port; - -list_del (&vlan->list); +macvlan_unlink_lowerdev (dev);unregister_netdevice (dev); - -if (list_empty (&port->vlans)) -macvlan_port_destroy (port->dev); }EXPORT_SYMBOL_GPL (macvlan_dellink);
include/linux/macvlan.h +4 -0
@@ -24,6 +24,10 @@ struct macvlan_dev { };extern int macvlan_start_xmit (struct sk_buff *skb,struct net_device *dev); +extern int macvlan_link_lowerdev (struct net_device *dev, +struct net_device *lowerdev); + +extern void macvlan_unlink_lowerdev (struct net_device *dev);extern void macvlan_setup (struct net_device *dev);
Re: [PATCH 3/3] macvlan: allow in-kernel modules to create and manage macvlan devices
Quoted 6 lines · Patrick Mullaney
The macvlan driver didn't allow for creation/deletion of devices by other in-kernel modules. This patch provides common routines for both in-kernel and netlink based management. This patch also enables macvlan device support for gro for lower level devices that support gro.
I wonder if doing this way round is a good idea, why don't you just use netlink to set up the endpoint device like the current macvlan and macvtap do? I think doing it consistently for all backends would be a significant advantage.
Arnd <><
Re: [PATCH 3/3] macvlan: allow in-kernel modules to create and manage macvlan devices
In reply to Patrick Mullaneydrivers/net/macvlan.c static struct lock_class_key macvlan_netdev_addr_lock_key; · line 324
Quoted 9 lines · Patrick Mullaney
drivers/net/macvlan.c +1
-1@@ -318,7 +318,7 @@ static struct lock_class_key macvlan_netdev_addr_lock_key;#define MACVLAN_FEATURES \ (NETIF_F_SG | NETIF_F_ALL_CSUM | NETIF_F_HIGHDMA | NETIF_F_FRAGLIST | \ NETIF_F_GSO | NETIF_F_TSO | NETIF_F_UFO | NETIF_F_GSO_ROBUST | \ - NETIF_F_TSO_ECN | NETIF_F_TSO6) + NETIF_F_TSO_ECN | NETIF_F_TSO6 | NETIF_F_GRO)#define MACVLAN_STATE_MASK \ ((1<<__LINK_STATE_NOCARRIER) | (1<<__LINK_STATE_DORMANT))
This hunk looks like it should be a separate patch, because we will want to have this independently of the rest. I have taken it into a series I'm preparing for a new posting of macvtap based on the current net-next tree with my bridge mode changes. I also have your patch 1 (the fixed version) and 2 in there. It's currently work in progress, but if you are interested, take a look at [1].
Arnd <><
[1] http://git.kernel.org/?p=linux/kernel/git/arnd/playground.git;a=shortlog;h=refs/heads/macvlan
Re: [PATCH 0/3] macvlan: support for guest vm direct rx/tx
In reply to Patrick MullaneyQuoted 5 lines · On Fri, 13 Nov 2009 14:55:06 -0500 Patrick Mullaney <[email protected]>…
These patches allow other modules to override the receive path of a macvlan. This is being done to support guest VMs operating directly over a macvlan. Routines to allow creation and deletion of macvlans from in-kernel modules were also exposed/added.
Which guest VM, how will it use it? The kernel is not in the business of providing infrastructure for out of tree patches.
Also, macvlan should really being calling netif_receive_skb() not going through another queue/softirq cycle.
Re: [PATCH 0/3] macvlan: support for guest vm direct rx/tx
Quoted 2 lines · Stephen Hemminger
Also, macvlan should really being calling
netif_receive_skb()not going through another queue/softirq cycle.
I've added a patch for this in my experimental queue now. When I last tried this, I saw a kernel stack overflow but it seems fine now.
I wonder if we can also return from the macvlan hook with skb->dev changed to netif_receive_skb rather than calling it recursively.
Arnd <><
David Miller
maintainerRe: [PATCH 0/3] macvlan: support for guest vm direct rx/tx
From: Arnd Bergmann <[email protected]>
Date: Sat, 28 Nov 2009 00:43:58 +0100
Quoted 7 lines · Stephen Hemminger
Quoted 2 lines
Also, macvlan should really being calling
netif_receive_skb()not going through another queue/softirq cycle.I've added a patch for this in my experimental queue now. When I last tried this, I saw a kernel stack overflow but it seems fine now.
I think it is unwise for any virtual device layer to use netif_receive_skb(). Just like tunnels they should always use netif_rx().
Otherwise stack overflow is a very real concern.
Re: [PATCH 0/3] macvlan: support for guest vm direct rx/tx
Quoted 7 lines · On Fri, 27 Nov 2009 16:19:57 -0800 (PST) David Miller <[email protected]>…
From: Arnd Bergmann <[email protected]>
Date: Sat, 28 Nov 2009 00:43:58 +0100Quoted 4 lines · Stephen Hemminger
Quoted 2 lines
Also, macvlan should really being calling
netif_receive_skb()not going through another queue/softirq cycle.
Quoted 8 lines
Quoted 3 lines
I've added a patch for this in my experimental queue now. When I last tried this, I saw a kernel stack overflow but it seems fine now.
I think it is unwise for any virtual device layer to use
netif_receive_skb(). Just like tunnels they should always usenetif_rx().Otherwise stack overflow is a very real concern.
Maybe we should figure out a way for protocols to return new skb in netif_receive_skb to avoid extra softirq, but avoid stack overflow?
David Miller
maintainerRe: [PATCH 0/3] macvlan: support for guest vm direct rx/tx
From: Stephen Hemminger <[email protected]>
Date: Fri, 27 Nov 2009 21:38:24 -0800
Quoted 2 lines
Maybe we should figure out a way for protocols to return new skb in
netif_receive_skbto avoid extra softirq, but avoid stack overflow?
Eric Dumazet and I tried to find ways to handle this, please see the archives. It's not an easy problem to solve and none of the patches we came up with avoided crashes under high stress scenarios.
PATCH 3/4 venetdev: support common venet netdev routines
In reply to Patrick MullaneyThis patch breaks out common netdev routines that allow a device to pass venetdev pointer as opposed to assuming it is the priv member of the netdevice.
---
kernel/vbus/devices/venet/device.c | 43 ++++++++++++++++++++++++++----- kernel/vbus/devices/venet/venetdevice.h | 5 ++++ 2 files changed, 41 insertions(+), 7 deletions(-)
kernel/vbus/devices/venet/device.c +36 -7
@@ -228,9 +228,8 @@ venetdev_txq_notify_dec(struct venetdev *priv)*/ int -venetdev_netdev_open (struct net_device *dev) +venetdev_open (struct venetdev *priv) { -struct venetdev *priv =netdev_priv (dev);unsigned long flags;BUG_ON (priv->netif.link);
@@ -260,7 +259,7 @@ venetdev_netdev_open(struct net_device *dev) priv->netif.link = true;if (!priv->vbus.link) -netif_carrier_off (dev); +netif_carrier_off (priv->netif.dev);spin_unlock_irqrestore (&priv->lock, flags);
@@ -268,9 +267,16 @@ venetdev_netdev_open(struct net_device *dev) }int -venetdev_netdev_stop (struct net_device *dev) +venetdev_netdev_open (struct net_device *dev) {struct venetdev *priv =netdev_priv (dev); + +return venetdev_open (priv); +} + +int +venetdev_stop (struct venetdev *priv) +{unsigned long flags;int needs_stop = false;
@@ -296,6 +302,14 @@ venetdev_netdev_stop(struct net_device *dev)return 0 ; } +int +venetdev_netdev_stop (struct net_device *dev) +{ +struct venetdev *priv =netdev_priv (dev); + +return venetdev_stop (priv); +} +/* * Configuration changes (passed on by ifconfig) */
@@ -1541,10 +1555,10 @@ venetdev_apply_backpressure(struct venetdev *priv)* the netif flow control is still managed by the actual consumer, * thereby avoiding the creation of an extra servo-loop to the equation. */ +int -venetdev_netdev_tx (struct sk_buff *skb,struct net_device *dev) +venetdev_xmit (struct sk_buff *skb,struct venetdev *priv) { -struct venetdev *priv =netdev_priv (dev);struct ioq *ioq =NULL ;unsigned long flags;
@@ -1585,6 +1599,15 @@ flowcontrol:return NETDEV_TX_BUSY ; } +int +venetdev_netdev_tx (struct sk_buff *skb,struct net_device *dev) +{ +struct venetdev *priv =netdev_priv (dev); + +return venetdev_xmit (skb, priv); +} + +/* * Ioctl commands */
@@ -1599,10 +1622,16 @@ venetdev_netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)* Return statistics to the caller */ struct net_device_stats * +venetdev_get_stats (struct venetdev *priv) +{ +return &priv->netif.stats; +} + +struct net_device_stats *venetdev_netdev_stats (struct net_device *dev) {struct venetdev *priv =netdev_priv (dev); -return &priv->netif.stats; +return venetdev_get_stats (priv); }/*
kernel/vbus/devices/venet/venetdevice.h +5 -0
@@ -142,6 +142,11 @@ int venetdev_netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);struct net_device_stats *venetdev_netdev_stats (struct net_device *dev); +int venetdev_open (struct venetdev *dev); +int venetdev_stop (struct venetdev *dev); +int venetdev_xmit (struct sk_buff *skb,struct venetdev *dev); +struct net_device_stats *venetdev_get_stats (struct venetdev *dev); +static inline void venetdev_netdev_unregister (struct venetdev *priv) {if (priv->netif.enabled) {
PATCH 4/4 venet-macvlan: add new driver to connect a venet to a macvlan netdevice
In reply to Patrick MullaneyThis driver implements a macvlan device as a venet device that can be connected to vbus. Since it is a macvlan device, it provides a more direct path to the underlying adapter by avoiding the bridge.
---
drivers/net/vbus-enet.c | 8 include/linux/venet.h | 5 kernel/vbus/devices/venet/Kconfig | 11 + kernel/vbus/devices/venet/Makefile | 10 - kernel/vbus/devices/venet/device.c | 10 - kernel/vbus/devices/venet/macvlan.c | 598 +++++++++++++++++++++++++++++++ kernel/vbus/devices/venet/venetdevice.h | 7 7 files changed, 642 insertions(+), 7 deletions(-) create mode 100644 kernel/vbus/devices/venet/macvlan.c
drivers/net/vbus-enet.c +8 -0
@@ -832,6 +832,14 @@ vbus_enet_tx_start(struct sk_buff *skb, struct net_device *dev) vsg->cookie = (u64 )(unsigned long )skb; vsg->len = skb->len; + vsg->phdr.transport =skb_transport_header (skb) - skb->head; + vsg->phdr.network =skb_network_header (skb) - skb->head; + +if (skb_mac_header_was_set (skb)) + vsg->phdr.mac =skb_mac_header (skb) - skb->head; +else + vsg->phdr.mac = ~0U ; +if (skb->ip_summed ==CHECKSUM_PARTIAL ) { vsg->flags |=VENET_SG_FLAG_NEEDS_CSUM ; vsg->csum.start = skb->csum_start -skb_headroom (skb);
include/linux/venet.h +5 -0
@@ -78,6 +78,11 @@ struct venet_sg {__u16 hdrlen;__u16 size; } gso; +struct { +__u32 mac;/* mac offset */ +__u32 network;/* network offset */ +__u32 transport;/* transport offset */ + } phdr;__u32 count;/* nr of iovs */ struct venet_iov iov[1 ]; };
kernel/vbus/devices/venet/Kconfig +11 -0
@@ -20,3 +20,14 @@ config VBUS_VENETTAP If unsure, say N +config VBUS_VENETMACV + tristate "Virtual-Bus Ethernet MACVLAN Device" + depends on VBUS_DEVICES && MACVLAN + select VBUS_VENETDEV + default n + help + Provides a vbus based virtual ethernet adapter with a macvlan + device as its backend. + + If unsure, say N +
kernel/vbus/devices/venet/Makefile +5 -5
@@ -1,7 +1,7 @@ -venet-device-objs += device.o -ifneq ($(CONFIG_VBUS_VENETTAP),n) -venet-device-objs += tap.o -endif +venet-tap-objs := device.o tap.o +venet-macvlan-objs := device.o macvlan.o + +obj-$(CONFIG_VBUS_VENETTAP) += venet-tap.o +obj-$(CONFIG_VBUS_VENETMACV) += venet-macvlan.o -obj-$(CONFIG_VBUS_VENETDEV) += venet-device.o
kernel/vbus/devices/venet/device.c +8 -2
@@ -776,6 +776,12 @@ venetdev_sg_import(struct venetdev *priv, void *ptr, int len)return NULL ; } +if (vsg->phdr.mac != ~0U ) +skb_set_mac_header (skb, vsg->phdr.mac); + +skb_set_network_header (skb, vsg->phdr.network); +skb_set_transport_header (skb, vsg->phdr.transport); +if (vsg->flags &VENET_SG_FLAG_GSO ) {struct skb_shared_info *sinfo =skb_shinfo (skb);
@@ -2250,7 +2256,7 @@ host_mac_show(struct vbus_device *dev, struct vbus_device_attribute *attr,struct vbus_device_attribute attr_hmac =__ATTR_RO (host_mac); -static ssize_t +ssize_t cmac_store (struct vbus_device *dev,struct vbus_device_attribute *attr,const char *buf,size_t count) {
@@ -2282,7 +2288,7 @@ cmac_store(struct vbus_device *dev, struct vbus_device_attribute *attr,return count; } -static ssize_t +ssize_t client_mac_show (struct vbus_device *dev,struct vbus_device_attribute *attr,char *buf) {
kernel/vbus/devices/venet/macvlan.c new file +598 -0
598 lines not on this page · raw message
kernel/vbus/devices/venet/venetdevice.h +7 -0
@@ -173,4 +173,11 @@ extern struct vbus_device_attribute attr_ifname;extern struct vbus_device_attribute attr_txmitigation;extern struct vbus_device_attribute attr_zcthresh; +ssize_t cmac_store (struct vbus_device *dev, +struct vbus_device_attribute *attr, +const char *buf,size_t count); +ssize_t client_mac_show (struct vbus_device *dev, +struct vbus_device_attribute *attr,char *buf); + +#endif
Re: [PATCH 4/4] venet-macvlan: add new driver to connect a venet to a macvlan netdevice
Quoted 7 lines · Patrick Mullaney
This driver implements a macvlan device as a venet device that can be connected to vbus. Since it is a macvlan device, it provides a more direct path to the underlying adapter by avoiding the bridge.
kernel/vbus/devices/venet/macvlan.c line 68
Quoted 7 lines
kernel/vbus/devices/venet/macvlan.c new file +6
-0+struct venetmacv { +struct macvlan_dev mdev; +unsigned char ll_ifname[IFNAMSIZ ]; +struct venetdev dev; +const struct net_device_ops *macvlan_netdev_ops; +};
macvlan might destroy the device below you when the underlying device is unregistered. You need to handle this by releasing the venetmacv device. Check out the NETDEV_UNREGISTER case in macvlan_device_event().
Quoted 4 lines · Patrick Mullaney
(Applies to alacrityvm.git/master:34534534)
This patchset implements a vbus venet device with a macvlan backend.
Thanks Pat, applied.
If possible, please submit a patch for the userspace side "-net venet-macvlan[,macaddr][,lower-devname]" feature ASAP and I will merge that as well.
-Greg
Quoted 7 lines · Gregory Haskins
Quoted 4 lines · Patrick Mullaney
(Applies to alacrityvm.git/master:34534534)
This patchset implements a vbus venet device with a macvlan backend.
Thanks Pat, applied.
As I mentioned in my response to these patches, the macvlan part need more work.
Quoted 10 lines · Patrick McHardy
Quoted 6 lines · Gregory Haskins
Quoted 4 lines · Patrick Mullaney
(Applies to alacrityvm.git/master:34534534)
This patchset implements a vbus venet device with a macvlan backend.
Thanks Pat, applied.
As I mentioned in my response to these patches, the macvlan part need more work.
Yeah, I talked to Pat offline. He is going to patch it incrementally as its not a trivial problem to cleanup. For the time being, they are sitting in the alacrityvm tree, but they are not going upstream until the macvlan stuff is resolved. All but the last patch are not really my business to push up, anyway.
In the meantime, Pat or others can enhance the work that he's done to date, so I will carry them out-of-tree.
Kind Regards,
-Greg
Quoted 7 lines · Gregory Haskins
Quoted 6 lines · Patrick McHardy
Quoted 5 lines · Gregory Haskins
Quoted 4 lines · Patrick Mullaney
(Applies to alacrityvm.git/master:34534534)
This patchset implements a vbus venet device with a macvlan backend.
Quoted 8 lines
Quoted 3 lines
Quoted 1 line
Thanks Pat, applied.
As I mentioned in my response to these patches, the macvlan part need more work.
Yeah, I talked to Pat offline. He is going to patch it incrementally as its not a trivial problem to cleanup. For the time being, they are sitting in the alacrityvm tree, but they are not going upstream until the macvlan stuff is resolved.
I see, thanks.