Thu, Sep 27, 2012 at 03:44:19PM CEST, jwboyer@redhat.com wrote:
On Tue, Sep 25, 2012 at 12:22:22PM -0400, Josh Boyer wrote:
On Mon, Sep 24, 2012 at 02:39:00PM +0200, Jiri Pirko wrote:
Mon, Sep 24, 2012 at 02:28:20PM CEST, jwboyer@redhat.com wrote:
On Mon, Sep 24, 2012 at 08:02:54AM +0200, Jiri Pirko wrote:
Update team driver to latest net-next.
Split patches available here: http://people.redhat.com/jpirko/f18_team_update_3/
Jiri Pirko (5): team: add support for non-ethernet devices team: don't print warn message on -ESRCH during event send vlan: add helper which can be called to see if device is used by vlan team: do not allow to add VLAN challenged port when vlan is used team: send port changed when added
drivers/net/team/Kconfig | 4 +- drivers/net/team/team.c | 137 ++++++++++++++++++++++++-------- drivers/net/team/team_mode_broadcast.c | 8 +- drivers/net/team/team_mode_roundrobin.c | 8 +- include/linux/if_team.h | 4 +- include/linux/if_vlan.h | 9 ++- net/8021q/vlan_core.c | 6 ++ 7 files changed, 128 insertions(+), 48 deletions(-)
Does this replace the team-net-next-20120808.patch we're currently carrying or is it in addition to that?
It is an addition to that.
Thanks.
Applied to f18/master today. Should be in the next rc7-git1 kernel build.
This patch got a conflict with Linus' tree today because:
commit 0b121fd28d071c766dddab743031ba6cfe9be68e Author: Jiri Pirko jiri@resnulli.us Date: Sat Sep 22 07:07:53 2012 +0000
team: send port changed when added
was pulled in already. I've reworked the patch a bit. It's below. Could you review and let me know if it looks sane?
Sorry for delay. I was on vacation.
Yes, this looks good. Thanks!
Jiri
josh
--- linux-3.6.0-0.rc7.git2.1.fc18.x86_64.orig/drivers/net/team/Kconfig +++ linux-3.6.0-0.rc7.git2.1.fc18.x86_64/drivers/net/team/Kconfig @@ -21,7 +21,7 @@ config NET_TEAM_MODE_BROADCAST ---help--- Basic mode where packets are transmitted always by all suitable ports.
All added ports are setup to have team's mac address.
All added ports are setup to have team's device address.
To compile this team mode as a module, choose M here: the module will be called team_mode_broadcast.
@@ -33,7 +33,7 @@ config NET_TEAM_MODE_ROUNDROBIN Basic mode where port used for transmitting packets is selected in round-robin fashion using packet counter.
All added ports are setup to have team's mac address.
All added ports are setup to have team's device address.
To compile this team mode as a module, choose M here: the module will be called team_mode_roundrobin.
--- linux-3.6.0-0.rc7.git2.1.fc18.x86_64.orig/drivers/net/team/team.c +++ linux-3.6.0-0.rc7.git2.1.fc18.x86_64/drivers/net/team/team.c @@ -54,29 +54,29 @@ static struct team_port *team_port_get_r }
/*
- Since the ability to change mac address for open port device is tested in
- Since the ability to change device address for open port device is tested in
- team_port_add, this function can be called without control of return value
*/ -static int __set_port_mac(struct net_device *port_dev,
const unsigned char *dev_addr)
+static int __set_port_dev_addr(struct net_device *port_dev,
const unsigned char *dev_addr)
{ struct sockaddr addr;
- memcpy(addr.sa_data, dev_addr, ETH_ALEN);
- addr.sa_family = ARPHRD_ETHER;
- memcpy(addr.sa_data, dev_addr, port_dev->addr_len);
- addr.sa_family = port_dev->type; return dev_set_mac_address(port_dev, &addr);
}
-static int team_port_set_orig_mac(struct team_port *port) +static int team_port_set_orig_dev_addr(struct team_port *port) {
- return __set_port_mac(port->dev, port->orig.dev_addr);
- return __set_port_dev_addr(port->dev, port->orig.dev_addr);
}
-int team_port_set_team_mac(struct team_port *port) +int team_port_set_team_dev_addr(struct team_port *port) {
- return __set_port_mac(port->dev, port->team->dev->dev_addr);
- return __set_port_dev_addr(port->dev, port->team->dev->dev_addr);
} -EXPORT_SYMBOL(team_port_set_team_mac); +EXPORT_SYMBOL(team_port_set_team_dev_addr);
static void team_refresh_port_linkup(struct team_port *port) { @@ -967,6 +967,8 @@ static struct netpoll_info *team_netpoll #endif
static void __team_port_change_port_added(struct team_port *port, bool linkup); +static int team_dev_type_check_change(struct net_device *dev,
struct net_device *port_dev);
static int team_port_add(struct team *team, struct net_device *port_dev) { @@ -975,9 +977,8 @@ static int team_port_add(struct team *te char *portname = port_dev->name; int err;
- if (port_dev->flags & IFF_LOOPBACK ||
port_dev->type != ARPHRD_ETHER) {
netdev_err(dev, "Device %s is of an unsupported type\n",
- if (port_dev->flags & IFF_LOOPBACK) {
return -EINVAL; }netdev_err(dev, "Device %s is loopback device. Loopback devices can't be added as a team port\n", portname);
@@ -988,6 +989,17 @@ static int team_port_add(struct team *te return -EBUSY; }
- if (port_dev->features & NETIF_F_VLAN_CHALLENGED &&
vlan_uses_dev(dev)) {
netdev_err(dev, "Device %s is VLAN challenged and team device has VLAN set up\n",
portname);
return -EPERM;
- }
- err = team_dev_type_check_change(dev, port_dev);
- if (err)
return err;
- if (port_dev->flags & IFF_UP) { netdev_err(dev, "Device %s is up. Set it down before adding it as a team port\n", portname);
@@ -1010,7 +1022,7 @@ static int team_port_add(struct team *te goto err_set_mtu; }
- memcpy(port->orig.dev_addr, port_dev->dev_addr, ETH_ALEN);
memcpy(port->orig.dev_addr, port_dev->dev_addr, port_dev->addr_len);
err = team_port_enter(team, port); if (err) {
@@ -1091,7 +1103,7 @@ err_vids_add:
err_dev_open: team_port_leave(team, port);
- team_port_set_orig_mac(port);
- team_port_set_orig_dev_addr(port);
err_port_enter: dev_set_mtu(port_dev, port->orig.mtu); @@ -1129,7 +1141,7 @@ static int team_port_del(struct team *te vlan_vids_del_by_dev(port_dev, dev); dev_close(port_dev); team_port_leave(team, port);
- team_port_set_orig_mac(port);
- team_port_set_orig_dev_addr(port); dev_set_mtu(port_dev, port->orig.mtu); synchronize_rcu(); kfree(port);
@@ -1480,17 +1492,18 @@ static void team_set_rx_mode(struct net_
static int team_set_mac_address(struct net_device *dev, void *p) {
- struct sockaddr *addr = p; struct team *team = netdev_priv(dev); struct team_port *port;
int err;
err = eth_mac_addr(dev, p);
if (err)
return err;
- if (dev->type == ARPHRD_ETHER && !is_valid_ether_addr(addr->sa_data))
return -EADDRNOTAVAIL;
- memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);
- dev->addr_assign_type &= ~NET_ADDR_RANDOM; rcu_read_lock(); list_for_each_entry_rcu(port, &team->port_list, list)
if (team->ops.port_change_mac)
team->ops.port_change_mac(team, port);
if (team->ops.port_change_dev_addr)
rcu_read_unlock(); return 0;team->ops.port_change_dev_addr(team, port);
} @@ -1721,6 +1734,45 @@ static const struct net_device_ops team_
- rt netlink interface
***********************/
+static void team_setup_by_port(struct net_device *dev,
struct net_device *port_dev)
+{
- dev->header_ops = port_dev->header_ops;
- dev->type = port_dev->type;
- dev->hard_header_len = port_dev->hard_header_len;
- dev->addr_len = port_dev->addr_len;
- dev->mtu = port_dev->mtu;
- memcpy(dev->broadcast, port_dev->broadcast, port_dev->addr_len);
- memcpy(dev->dev_addr, port_dev->dev_addr, port_dev->addr_len);
- dev->addr_assign_type &= ~NET_ADDR_RANDOM;
+}
+static int team_dev_type_check_change(struct net_device *dev,
struct net_device *port_dev)
+{
- struct team *team = netdev_priv(dev);
- char *portname = port_dev->name;
- int err;
- if (dev->type == port_dev->type)
return 0;
- if (!list_empty(&team->port_list)) {
netdev_err(dev, "Device %s is of different type\n", portname);
return -EBUSY;
- }
- err = call_netdevice_notifiers(NETDEV_PRE_TYPE_CHANGE, dev);
- err = notifier_to_errno(err);
- if (err) {
netdev_err(dev, "Refused to change device type\n");
return err;
- }
- dev_uc_flush(dev);
- dev_mc_flush(dev);
- team_setup_by_port(dev, port_dev);
- call_netdevice_notifiers(NETDEV_POST_TYPE_CHANGE, dev);
- return 0;
+}
static void team_setup(struct net_device *dev) { ether_setup(dev); @@ -2442,7 +2494,7 @@ static void __team_options_change_check( list_add_tail(&opt_inst->tmp_list, &sel_opt_inst_list); } err = team_nl_send_event_options_get(team, &sel_opt_inst_list);
- if (err)
- if (err && err != -ESRCH) netdev_warn(team->dev, "Failed to send options change via netlink (err %d)\n", err);
} @@ -2471,9 +2523,9 @@ static void __team_port_change_send(stru
send_event: err = team_nl_send_event_port_list_get(port->team);
- if (err)
netdev_warn(port->team->dev, "Failed to send port change of device %s via netlink\n",
port->dev->name);
- if (err && err != -ESRCH)
netdev_warn(port->team->dev, "Failed to send port change of device %s via netlink (err %d)\n",
port->dev->name, err);
}
--- linux-3.6.0-0.rc7.git2.1.fc18.x86_64.orig/drivers/net/team/team_mode_broadcast.c +++ linux-3.6.0-0.rc7.git2.1.fc18.x86_64/drivers/net/team/team_mode_broadcast.c @@ -48,18 +48,18 @@ static bool bc_transmit(struct team *tea
static int bc_port_enter(struct team *team, struct team_port *port) {
- return team_port_set_team_mac(port);
- return team_port_set_team_dev_addr(port);
}
-static void bc_port_change_mac(struct team *team, struct team_port *port) +static void bc_port_change_dev_addr(struct team *team, struct team_port *port) {
- team_port_set_team_mac(port);
- team_port_set_team_dev_addr(port);
}
static const struct team_mode_ops bc_mode_ops = { .transmit = bc_transmit, .port_enter = bc_port_enter,
- .port_change_mac = bc_port_change_mac,
- .port_change_dev_addr = bc_port_change_dev_addr,
};
static const struct team_mode bc_mode = { --- linux-3.6.0-0.rc7.git2.1.fc18.x86_64.orig/drivers/net/team/team_mode_roundrobin.c +++ linux-3.6.0-0.rc7.git2.1.fc18.x86_64/drivers/net/team/team_mode_roundrobin.c @@ -66,18 +66,18 @@ drop:
static int rr_port_enter(struct team *team, struct team_port *port) {
- return team_port_set_team_mac(port);
- return team_port_set_team_dev_addr(port);
}
-static void rr_port_change_mac(struct team *team, struct team_port *port) +static void rr_port_change_dev_addr(struct team *team, struct team_port *port) {
- team_port_set_team_mac(port);
- team_port_set_team_dev_addr(port);
}
static const struct team_mode_ops rr_mode_ops = { .transmit = rr_transmit, .port_enter = rr_port_enter,
- .port_change_mac = rr_port_change_mac,
- .port_change_dev_addr = rr_port_change_dev_addr,
};
static const struct team_mode rr_mode = { --- linux-3.6.0-0.rc7.git2.1.fc18.x86_64.orig/include/linux/if_team.h +++ linux-3.6.0-0.rc7.git2.1.fc18.x86_64/include/linux/if_team.h @@ -108,7 +108,7 @@ struct team_mode_ops { bool (*transmit)(struct team *team, struct sk_buff *skb); int (*port_enter)(struct team *team, struct team_port *port); void (*port_leave)(struct team *team, struct team_port *port);
- void (*port_change_mac)(struct team *team, struct team_port *port);
- void (*port_change_dev_addr)(struct team *team, struct team_port *port); void (*port_enabled)(struct team *team, struct team_port *port); void (*port_disabled)(struct team *team, struct team_port *port);
}; @@ -238,7 +238,7 @@ static inline struct team_port *team_get return NULL; }
-extern int team_port_set_team_mac(struct team_port *port); +extern int team_port_set_team_dev_addr(struct team_port *port); extern int team_options_register(struct team *team, const struct team_option *option, size_t option_count); --- linux-3.6.0-0.rc7.git2.1.fc18.x86_64.orig/include/linux/if_vlan.h +++ linux-3.6.0-0.rc7.git2.1.fc18.x86_64/include/linux/if_vlan.h @@ -74,8 +74,6 @@ static inline struct vlan_ethhdr *vlan_e /* found in socket.c */ extern void vlan_ioctl_set(int (*hook)(struct net *, void __user *));
-struct vlan_info;
static inline int is_vlan_dev(struct net_device *dev) { return dev->priv_flags & IFF_802_1Q_VLAN; @@ -101,6 +99,8 @@ extern int vlan_vids_add_by_dev(struct n const struct net_device *by_dev); extern void vlan_vids_del_by_dev(struct net_device *dev, const struct net_device *by_dev);
+extern bool vlan_uses_dev(const struct net_device *dev); #else static inline struct net_device * __vlan_find_dev_deep(struct net_device *real_dev, u16 vlan_id) @@ -151,6 +151,11 @@ static inline void vlan_vids_del_by_dev( const struct net_device *by_dev) { }
+static inline bool vlan_uses_dev(const struct net_device *dev) +{
- return false;
+} #endif
/** --- linux-3.6.0-0.rc7.git2.1.fc18.x86_64.orig/net/8021q/vlan_core.c +++ linux-3.6.0-0.rc7.git2.1.fc18.x86_64/net/8021q/vlan_core.c @@ -368,3 +368,9 @@ void vlan_vids_del_by_dev(struct net_dev vlan_vid_del(dev, vid_info->vid); } EXPORT_SYMBOL(vlan_vids_del_by_dev);
+bool vlan_uses_dev(const struct net_device *dev) +{
- return rtnl_dereference(dev->vlan_info) ? true : false;
+} +EXPORT_SYMBOL(vlan_uses_dev);