* [patch net-next 1/3] team: use function team_port_txable() for determing enabled and up port
2012-07-11 15:34 [patch net-next 0/3] team: couple of patches Jiri Pirko
@ 2012-07-11 15:34 ` Jiri Pirko
2012-07-11 15:34 ` [patch net-next 2/3] team: add broadcast mode Jiri Pirko
` (2 subsequent siblings)
3 siblings, 0 replies; 7+ messages in thread
From: Jiri Pirko @ 2012-07-11 15:34 UTC (permalink / raw)
To: netdev; +Cc: davem
Signed-off-by: Jiri Pirko <jpirko@redhat.com>
---
drivers/net/team/team.c | 6 ++++++
drivers/net/team/team_mode_roundrobin.c | 6 +++---
include/linux/if_team.h | 1 +
3 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
index 9b94f53..bc7afa5 100644
--- a/drivers/net/team/team.c
+++ b/drivers/net/team/team.c
@@ -677,6 +677,12 @@ bool team_port_enabled(struct team_port *port)
}
EXPORT_SYMBOL(team_port_enabled);
+bool team_port_txable(struct team_port *port)
+{
+ return port->linkup && team_port_enabled(port);
+}
+EXPORT_SYMBOL(team_port_txable);
+
/*
* Enable/disable port by adding to enabled port hashlist and setting
* port->index (Might be racy so reader could see incorrect ifindex when
diff --git a/drivers/net/team/team_mode_roundrobin.c b/drivers/net/team/team_mode_roundrobin.c
index 52dd0ec..0cf38e9 100644
--- a/drivers/net/team/team_mode_roundrobin.c
+++ b/drivers/net/team/team_mode_roundrobin.c
@@ -30,16 +30,16 @@ static struct team_port *__get_first_port_up(struct team *team,
{
struct team_port *cur;
- if (port->linkup)
+ if (team_port_txable(port))
return port;
cur = port;
list_for_each_entry_continue_rcu(cur, &team->port_list, list)
- if (cur->linkup)
+ if (team_port_txable(port))
return cur;
list_for_each_entry_rcu(cur, &team->port_list, list) {
if (cur == port)
break;
- if (cur->linkup)
+ if (team_port_txable(port))
return cur;
}
return NULL;
diff --git a/include/linux/if_team.h b/include/linux/if_team.h
index 99efd60..dca426c 100644
--- a/include/linux/if_team.h
+++ b/include/linux/if_team.h
@@ -64,6 +64,7 @@ struct team_port {
};
extern bool team_port_enabled(struct team_port *port);
+extern bool team_port_txable(struct team_port *port);
struct team_mode_ops {
int (*init)(struct team *team);
--
1.7.10.4
^ permalink raw reply related [flat|nested] 7+ messages in thread* [patch net-next 2/3] team: add broadcast mode
2012-07-11 15:34 [patch net-next 0/3] team: couple of patches Jiri Pirko
2012-07-11 15:34 ` [patch net-next 1/3] team: use function team_port_txable() for determing enabled and up port Jiri Pirko
@ 2012-07-11 15:34 ` Jiri Pirko
2012-07-11 15:34 ` [patch net-next 3/3] team: make team_port_enabled() and team_port_txable() static inline Jiri Pirko
2012-07-12 15:11 ` [patch net-next 0/3] team: couple of patches David Miller
3 siblings, 0 replies; 7+ messages in thread
From: Jiri Pirko @ 2012-07-11 15:34 UTC (permalink / raw)
To: netdev; +Cc: davem
Signed-off-by: Jiri Pirko <jpirko@redhat.com>
---
drivers/net/team/Kconfig | 13 ++++-
drivers/net/team/Makefile | 1 +
drivers/net/team/team_mode_broadcast.c | 88 ++++++++++++++++++++++++++++++++
3 files changed, 101 insertions(+), 1 deletion(-)
create mode 100644 drivers/net/team/team_mode_broadcast.c
diff --git a/drivers/net/team/Kconfig b/drivers/net/team/Kconfig
index 89024d5..6a7260b 100644
--- a/drivers/net/team/Kconfig
+++ b/drivers/net/team/Kconfig
@@ -15,6 +15,17 @@ menuconfig NET_TEAM
if NET_TEAM
+config NET_TEAM_MODE_BROADCAST
+ tristate "Broadcast mode support"
+ depends on NET_TEAM
+ ---help---
+ Basic mode where packets are transmitted always by all suitable ports.
+
+ All added ports are setup to have team's mac address.
+
+ To compile this team mode as a module, choose M here: the module
+ will be called team_mode_broadcast.
+
config NET_TEAM_MODE_ROUNDROBIN
tristate "Round-robin mode support"
depends on NET_TEAM
@@ -22,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 bond's mac address.
+ All added ports are setup to have team's mac address.
To compile this team mode as a module, choose M here: the module
will be called team_mode_roundrobin.
diff --git a/drivers/net/team/Makefile b/drivers/net/team/Makefile
index fb9f4c1..9757630 100644
--- a/drivers/net/team/Makefile
+++ b/drivers/net/team/Makefile
@@ -3,6 +3,7 @@
#
obj-$(CONFIG_NET_TEAM) += team.o
+obj-$(CONFIG_NET_TEAM_MODE_BROADCAST) += team_mode_broadcast.o
obj-$(CONFIG_NET_TEAM_MODE_ROUNDROBIN) += team_mode_roundrobin.o
obj-$(CONFIG_NET_TEAM_MODE_ACTIVEBACKUP) += team_mode_activebackup.o
obj-$(CONFIG_NET_TEAM_MODE_LOADBALANCE) += team_mode_loadbalance.o
diff --git a/drivers/net/team/team_mode_broadcast.c b/drivers/net/team/team_mode_broadcast.c
new file mode 100644
index 0000000..5562345
--- /dev/null
+++ b/drivers/net/team/team_mode_broadcast.c
@@ -0,0 +1,88 @@
+/*
+ * drivers/net/team/team_mode_broadcast.c - Broadcast mode for team
+ * Copyright (c) 2012 Jiri Pirko <jpirko@redhat.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#include <linux/kernel.h>
+#include <linux/types.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/errno.h>
+#include <linux/netdevice.h>
+#include <linux/if_team.h>
+
+static bool bc_transmit(struct team *team, struct sk_buff *skb)
+{
+ struct team_port *cur;
+ struct team_port *last = NULL;
+ struct sk_buff *skb2;
+ bool ret;
+ bool sum_ret = false;
+
+ list_for_each_entry_rcu(cur, &team->port_list, list) {
+ if (team_port_txable(cur)) {
+ if (last) {
+ skb2 = skb_clone(skb, GFP_ATOMIC);
+ if (skb2) {
+ skb2->dev = last->dev;
+ ret = dev_queue_xmit(skb2);
+ if (!sum_ret)
+ sum_ret = ret;
+ }
+ }
+ last = cur;
+ }
+ }
+ if (last) {
+ skb->dev = last->dev;
+ ret = dev_queue_xmit(skb);
+ if (!sum_ret)
+ sum_ret = ret;
+ }
+ return sum_ret;
+}
+
+static int bc_port_enter(struct team *team, struct team_port *port)
+{
+ return team_port_set_team_mac(port);
+}
+
+static void bc_port_change_mac(struct team *team, struct team_port *port)
+{
+ team_port_set_team_mac(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,
+};
+
+static const struct team_mode bc_mode = {
+ .kind = "broadcast",
+ .owner = THIS_MODULE,
+ .ops = &bc_mode_ops,
+};
+
+static int __init bc_init_module(void)
+{
+ return team_mode_register(&bc_mode);
+}
+
+static void __exit bc_cleanup_module(void)
+{
+ team_mode_unregister(&bc_mode);
+}
+
+module_init(bc_init_module);
+module_exit(bc_cleanup_module);
+
+MODULE_LICENSE("GPL v2");
+MODULE_AUTHOR("Jiri Pirko <jpirko@redhat.com>");
+MODULE_DESCRIPTION("Broadcast mode for team");
+MODULE_ALIAS("team-mode-broadcast");
--
1.7.10.4
^ permalink raw reply related [flat|nested] 7+ messages in thread* [patch net-next 3/3] team: make team_port_enabled() and team_port_txable() static inline
2012-07-11 15:34 [patch net-next 0/3] team: couple of patches Jiri Pirko
2012-07-11 15:34 ` [patch net-next 1/3] team: use function team_port_txable() for determing enabled and up port Jiri Pirko
2012-07-11 15:34 ` [patch net-next 2/3] team: add broadcast mode Jiri Pirko
@ 2012-07-11 15:34 ` Jiri Pirko
2012-07-12 15:11 ` [patch net-next 0/3] team: couple of patches David Miller
3 siblings, 0 replies; 7+ messages in thread
From: Jiri Pirko @ 2012-07-11 15:34 UTC (permalink / raw)
To: netdev; +Cc: davem
Signed-off-by: Jiri Pirko <jpirko@redhat.com>
---
drivers/net/team/team.c | 12 ------------
include/linux/if_team.h | 11 +++++++++--
2 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
index bc7afa5..3620c63 100644
--- a/drivers/net/team/team.c
+++ b/drivers/net/team/team.c
@@ -671,18 +671,6 @@ static bool team_port_find(const struct team *team,
return false;
}
-bool team_port_enabled(struct team_port *port)
-{
- return port->index != -1;
-}
-EXPORT_SYMBOL(team_port_enabled);
-
-bool team_port_txable(struct team_port *port)
-{
- return port->linkup && team_port_enabled(port);
-}
-EXPORT_SYMBOL(team_port_txable);
-
/*
* Enable/disable port by adding to enabled port hashlist and setting
* port->index (Might be racy so reader could see incorrect ifindex when
diff --git a/include/linux/if_team.h b/include/linux/if_team.h
index dca426c..dfa0c8e 100644
--- a/include/linux/if_team.h
+++ b/include/linux/if_team.h
@@ -63,8 +63,15 @@ struct team_port {
long mode_priv[0];
};
-extern bool team_port_enabled(struct team_port *port);
-extern bool team_port_txable(struct team_port *port);
+static inline bool team_port_enabled(struct team_port *port)
+{
+ return port->index != -1;
+}
+
+static inline bool team_port_txable(struct team_port *port)
+{
+ return port->linkup && team_port_enabled(port);
+}
struct team_mode_ops {
int (*init)(struct team *team);
--
1.7.10.4
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [patch net-next 0/3] team: couple of patches
2012-07-11 15:34 [patch net-next 0/3] team: couple of patches Jiri Pirko
` (2 preceding siblings ...)
2012-07-11 15:34 ` [patch net-next 3/3] team: make team_port_enabled() and team_port_txable() static inline Jiri Pirko
@ 2012-07-12 15:11 ` David Miller
2012-07-12 15:14 ` David Miller
3 siblings, 1 reply; 7+ messages in thread
From: David Miller @ 2012-07-12 15:11 UTC (permalink / raw)
To: jpirko; +Cc: netdev
From: Jiri Pirko <jpirko@redhat.com>
Date: Wed, 11 Jul 2012 17:34:01 +0200
> Jiri Pirko (3):
> team: use function team_port_txable() for determing enabled and up
> port
> team: add broadcast mode
> team: make team_port_enabled() and team_port_txable() static inline
All applied, thanks.
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [patch net-next 0/3] team: couple of patches
2012-07-12 15:11 ` [patch net-next 0/3] team: couple of patches David Miller
@ 2012-07-12 15:14 ` David Miller
2012-07-12 15:53 ` Jiri Pirko
0 siblings, 1 reply; 7+ messages in thread
From: David Miller @ 2012-07-12 15:14 UTC (permalink / raw)
To: jpirko; +Cc: netdev
From: David Miller <davem@davemloft.net>
Date: Thu, 12 Jul 2012 08:11:24 -0700 (PDT)
> From: Jiri Pirko <jpirko@redhat.com>
> Date: Wed, 11 Jul 2012 17:34:01 +0200
>
>> Jiri Pirko (3):
>> team: use function team_port_txable() for determing enabled and up
>> port
>> team: add broadcast mode
>> team: make team_port_enabled() and team_port_txable() static inline
>
> All applied, thanks.
Jiri, btw, any chance I can convince you to remove the EXPERIMENTAL
Kconfig dependency?
Code I've written and checked in myself over the past few days is
several orders of magnitude more experimental than the team driver
is :-)
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [patch net-next 0/3] team: couple of patches
2012-07-12 15:14 ` David Miller
@ 2012-07-12 15:53 ` Jiri Pirko
0 siblings, 0 replies; 7+ messages in thread
From: Jiri Pirko @ 2012-07-12 15:53 UTC (permalink / raw)
To: David Miller; +Cc: netdev
Thu, Jul 12, 2012 at 05:14:43PM CEST, davem@davemloft.net wrote:
>From: David Miller <davem@davemloft.net>
>Date: Thu, 12 Jul 2012 08:11:24 -0700 (PDT)
>
>> From: Jiri Pirko <jpirko@redhat.com>
>> Date: Wed, 11 Jul 2012 17:34:01 +0200
>>
>>> Jiri Pirko (3):
>>> team: use function team_port_txable() for determing enabled and up
>>> port
>>> team: add broadcast mode
>>> team: make team_port_enabled() and team_port_txable() static inline
>>
>> All applied, thanks.
>
>Jiri, btw, any chance I can convince you to remove the EXPERIMENTAL
>Kconfig dependency?
>
>Code I've written and checked in myself over the past few days is
>several orders of magnitude more experimental than the team driver
>is :-)
Hehe :) Nevertheless, I would like to keep this flag for some more time.
I will remove that once I have all planned basic functionality in.
Jirka
^ permalink raw reply [flat|nested] 7+ messages in thread