Commit 1da46568 authored by Ying Xue's avatar Ying Xue Committed by David S. Miller

tipc: make tipc broadcast link support net namespace

TIPC broadcast link is statically established and its relevant states
are maintained with the global variables: "bcbearer", "bclink" and
"bcl". Allowing different namespace to own different broadcast link
instances, these variables must be moved to tipc_net structure and
broadcast link instances would be allocated and initialized when
namespace is created.
Signed-off-by: default avatarYing Xue <ying.xue@windriver.com>
Tested-by: default avatarTero Aho <Tero.Aho@coriant.com>
Reviewed-by: default avatarJon Maloy <jon.maloy@ericsson.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7f9f95d9
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "core.h" #include <linux/kernel.h>
#include "addr.h" #include "addr.h"
/** /**
......
...@@ -37,6 +37,9 @@ ...@@ -37,6 +37,9 @@
#ifndef _TIPC_ADDR_H #ifndef _TIPC_ADDR_H
#define _TIPC_ADDR_H #define _TIPC_ADDR_H
#include <linux/types.h>
#include <linux/tipc.h>
#define TIPC_ZONE_MASK 0xff000000u #define TIPC_ZONE_MASK 0xff000000u
#define TIPC_CLUSTER_MASK 0xfffff000u #define TIPC_CLUSTER_MASK 0xfffff000u
......
This diff is collapsed.
...@@ -37,23 +37,13 @@ ...@@ -37,23 +37,13 @@
#ifndef _TIPC_BCAST_H #ifndef _TIPC_BCAST_H
#define _TIPC_BCAST_H #define _TIPC_BCAST_H
#include "netlink.h" #include <linux/tipc_config.h>
#include "link.h"
#include "node.h"
#define MAX_NODES 4096 #define TIPC_BCLINK_RESET 1
#define WSIZE 32 #define PLSIZE 32
#define TIPC_BCLINK_RESET 1 #define BCBEARER MAX_BEARERS
/**
* struct tipc_node_map - set of node identifiers
* @count: # of nodes in set
* @map: bitmap of node identifiers that are in the set
*/
struct tipc_node_map {
u32 count;
u32 map[MAX_NODES / WSIZE];
};
#define PLSIZE 32
/** /**
* struct tipc_port_list - set of node local destination ports * struct tipc_port_list - set of node local destination ports
...@@ -67,9 +57,64 @@ struct tipc_port_list { ...@@ -67,9 +57,64 @@ struct tipc_port_list {
u32 ports[PLSIZE]; u32 ports[PLSIZE];
}; };
/**
* struct tipc_bcbearer_pair - a pair of bearers used by broadcast link
* @primary: pointer to primary bearer
* @secondary: pointer to secondary bearer
*
* Bearers must have same priority and same set of reachable destinations
* to be paired.
*/
struct tipc_node; struct tipc_bcbearer_pair {
struct tipc_bearer *primary;
struct tipc_bearer *secondary;
};
/**
* struct tipc_bcbearer - bearer used by broadcast link
* @bearer: (non-standard) broadcast bearer structure
* @media: (non-standard) broadcast media structure
* @bpairs: array of bearer pairs
* @bpairs_temp: temporary array of bearer pairs used by tipc_bcbearer_sort()
* @remains: temporary node map used by tipc_bcbearer_send()
* @remains_new: temporary node map used tipc_bcbearer_send()
*
* Note: The fields labelled "temporary" are incorporated into the bearer
* to avoid consuming potentially limited stack space through the use of
* large local variables within multicast routines. Concurrent access is
* prevented through use of the spinlock "bclink_lock".
*/
struct tipc_bcbearer {
struct tipc_bearer bearer;
struct tipc_media media;
struct tipc_bcbearer_pair bpairs[MAX_BEARERS];
struct tipc_bcbearer_pair bpairs_temp[TIPC_MAX_LINK_PRI + 1];
struct tipc_node_map remains;
struct tipc_node_map remains_new;
};
/**
* struct tipc_bclink - link used for broadcast messages
* @lock: spinlock governing access to structure
* @link: (non-standard) broadcast link structure
* @node: (non-standard) node structure representing b'cast link's peer node
* @flags: represent bclink states
* @bcast_nodes: map of broadcast-capable nodes
* @retransmit_to: node that most recently requested a retransmit
*
* Handles sequence numbering, fragmentation, bundling, etc.
*/
struct tipc_bclink {
spinlock_t lock;
struct tipc_link link;
struct tipc_node node;
unsigned int flags;
struct tipc_node_map bcast_nodes;
struct tipc_node *retransmit_to;
};
struct tipc_node;
extern const char tipc_bclink_name[]; extern const char tipc_bclink_name[];
/** /**
...@@ -86,24 +131,24 @@ void tipc_port_list_free(struct tipc_port_list *pl_ptr); ...@@ -86,24 +131,24 @@ void tipc_port_list_free(struct tipc_port_list *pl_ptr);
int tipc_bclink_init(struct net *net); int tipc_bclink_init(struct net *net);
void tipc_bclink_stop(struct net *net); void tipc_bclink_stop(struct net *net);
void tipc_bclink_set_flags(unsigned int flags); void tipc_bclink_set_flags(struct net *tn, unsigned int flags);
void tipc_bclink_add_node(u32 addr); void tipc_bclink_add_node(struct net *net, u32 addr);
void tipc_bclink_remove_node(u32 addr); void tipc_bclink_remove_node(struct net *net, u32 addr);
struct tipc_node *tipc_bclink_retransmit_to(void); struct tipc_node *tipc_bclink_retransmit_to(struct net *tn);
void tipc_bclink_acknowledge(struct tipc_node *n_ptr, u32 acked); void tipc_bclink_acknowledge(struct tipc_node *n_ptr, u32 acked);
void tipc_bclink_rcv(struct net *net, struct sk_buff *buf); void tipc_bclink_rcv(struct net *net, struct sk_buff *buf);
u32 tipc_bclink_get_last_sent(void); u32 tipc_bclink_get_last_sent(struct net *net);
u32 tipc_bclink_acks_missing(struct tipc_node *n_ptr); u32 tipc_bclink_acks_missing(struct tipc_node *n_ptr);
void tipc_bclink_update_link_state(struct net *net, struct tipc_node *n_ptr, void tipc_bclink_update_link_state(struct net *net, struct tipc_node *n_ptr,
u32 last_sent); u32 last_sent);
int tipc_bclink_stats(char *stats_buf, const u32 buf_size); int tipc_bclink_stats(struct net *net, char *stats_buf, const u32 buf_size);
int tipc_bclink_reset_stats(void); int tipc_bclink_reset_stats(struct net *net);
int tipc_bclink_set_queue_limits(u32 limit); int tipc_bclink_set_queue_limits(struct net *net, u32 limit);
void tipc_bcbearer_sort(struct net *net, struct tipc_node_map *nm_ptr, void tipc_bcbearer_sort(struct net *net, struct tipc_node_map *nm_ptr,
u32 node, bool action); u32 node, bool action);
uint tipc_bclink_get_mtu(void); uint tipc_bclink_get_mtu(void);
int tipc_bclink_xmit(struct net *net, struct sk_buff_head *list); int tipc_bclink_xmit(struct net *net, struct sk_buff_head *list);
void tipc_bclink_wakeup_users(struct net *net); void tipc_bclink_wakeup_users(struct net *net);
int tipc_nl_add_bc_link(struct tipc_nl_msg *msg); int tipc_nl_add_bc_link(struct net *net, struct tipc_nl_msg *msg);
#endif #endif
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
#include "bearer.h" #include "bearer.h"
#include "link.h" #include "link.h"
#include "discover.h" #include "discover.h"
#include "bcast.h"
#define MAX_ADDR_STR 60 #define MAX_ADDR_STR 60
...@@ -482,8 +483,8 @@ void tipc_disable_l2_media(struct tipc_bearer *b) ...@@ -482,8 +483,8 @@ void tipc_disable_l2_media(struct tipc_bearer *b)
* @b_ptr: the bearer through which the packet is to be sent * @b_ptr: the bearer through which the packet is to be sent
* @dest: peer destination address * @dest: peer destination address
*/ */
int tipc_l2_send_msg(struct sk_buff *buf, struct tipc_bearer *b, int tipc_l2_send_msg(struct net *net, struct sk_buff *buf,
struct tipc_media_addr *dest) struct tipc_bearer *b, struct tipc_media_addr *dest)
{ {
struct sk_buff *clone; struct sk_buff *clone;
struct net_device *dev; struct net_device *dev;
...@@ -528,7 +529,7 @@ void tipc_bearer_send(struct net *net, u32 bearer_id, struct sk_buff *buf, ...@@ -528,7 +529,7 @@ void tipc_bearer_send(struct net *net, u32 bearer_id, struct sk_buff *buf,
rcu_read_lock(); rcu_read_lock();
b_ptr = rcu_dereference_rtnl(tn->bearer_list[bearer_id]); b_ptr = rcu_dereference_rtnl(tn->bearer_list[bearer_id]);
if (likely(b_ptr)) if (likely(b_ptr))
b_ptr->media->send_msg(buf, b_ptr, dest); b_ptr->media->send_msg(net, buf, b_ptr, dest);
rcu_read_unlock(); rcu_read_unlock();
} }
......
...@@ -37,12 +37,13 @@ ...@@ -37,12 +37,13 @@
#ifndef _TIPC_BEARER_H #ifndef _TIPC_BEARER_H
#define _TIPC_BEARER_H #define _TIPC_BEARER_H
#include "bcast.h"
#include "netlink.h" #include "netlink.h"
#include <net/genetlink.h> #include <net/genetlink.h>
#define MAX_BEARERS 2 #define MAX_BEARERS 2
#define MAX_MEDIA 2 #define MAX_MEDIA 2
#define MAX_NODES 4096
#define WSIZE 32
/* Identifiers associated with TIPC message header media address info /* Identifiers associated with TIPC message header media address info
* - address info field is 32 bytes long * - address info field is 32 bytes long
...@@ -58,6 +59,16 @@ ...@@ -58,6 +59,16 @@
#define TIPC_MEDIA_TYPE_ETH 1 #define TIPC_MEDIA_TYPE_ETH 1
#define TIPC_MEDIA_TYPE_IB 2 #define TIPC_MEDIA_TYPE_IB 2
/**
* struct tipc_node_map - set of node identifiers
* @count: # of nodes in set
* @map: bitmap of node identifiers that are in the set
*/
struct tipc_node_map {
u32 count;
u32 map[MAX_NODES / WSIZE];
};
/** /**
* struct tipc_media_addr - destination address used by TIPC bearers * struct tipc_media_addr - destination address used by TIPC bearers
* @value: address info (format defined by media) * @value: address info (format defined by media)
...@@ -89,7 +100,7 @@ struct tipc_bearer; ...@@ -89,7 +100,7 @@ struct tipc_bearer;
* @name: media name * @name: media name
*/ */
struct tipc_media { struct tipc_media {
int (*send_msg)(struct sk_buff *buf, int (*send_msg)(struct net *net, struct sk_buff *buf,
struct tipc_bearer *b_ptr, struct tipc_bearer *b_ptr,
struct tipc_media_addr *dest); struct tipc_media_addr *dest);
int (*enable_media)(struct net *net, struct tipc_bearer *b_ptr); int (*enable_media)(struct net *net, struct tipc_bearer *b_ptr);
...@@ -157,8 +168,6 @@ struct tipc_bearer_names { ...@@ -157,8 +168,6 @@ struct tipc_bearer_names {
char if_name[TIPC_MAX_IF_NAME]; char if_name[TIPC_MAX_IF_NAME];
}; };
struct tipc_link;
/* /*
* TIPC routines available to supported media types * TIPC routines available to supported media types
*/ */
...@@ -193,8 +202,8 @@ void tipc_media_addr_printf(char *buf, int len, struct tipc_media_addr *a); ...@@ -193,8 +202,8 @@ void tipc_media_addr_printf(char *buf, int len, struct tipc_media_addr *a);
struct sk_buff *tipc_media_get_names(void); struct sk_buff *tipc_media_get_names(void);
int tipc_enable_l2_media(struct net *net, struct tipc_bearer *b); int tipc_enable_l2_media(struct net *net, struct tipc_bearer *b);
void tipc_disable_l2_media(struct tipc_bearer *b); void tipc_disable_l2_media(struct tipc_bearer *b);
int tipc_l2_send_msg(struct sk_buff *buf, struct tipc_bearer *b, int tipc_l2_send_msg(struct net *net, struct sk_buff *buf,
struct tipc_media_addr *dest); struct tipc_bearer *b, struct tipc_media_addr *dest);
struct sk_buff *tipc_bearer_get_names(struct net *net); struct sk_buff *tipc_bearer_get_names(struct net *net);
void tipc_bearer_add_dest(struct net *net, u32 bearer_id, u32 dest); void tipc_bearer_add_dest(struct net *net, u32 bearer_id, u32 dest);
......
...@@ -61,6 +61,11 @@ ...@@ -61,6 +61,11 @@
#include "node.h" #include "node.h"
#include "bearer.h" #include "bearer.h"
#include "bcast.h"
#include "netlink.h"
#include "link.h"
#include "node.h"
#include "msg.h"
#define TIPC_MOD_VER "2.0.0" #define TIPC_MOD_VER "2.0.0"
...@@ -91,6 +96,11 @@ struct tipc_net { ...@@ -91,6 +96,11 @@ struct tipc_net {
/* Bearer list */ /* Bearer list */
struct tipc_bearer __rcu *bearer_list[MAX_BEARERS + 1]; struct tipc_bearer __rcu *bearer_list[MAX_BEARERS + 1];
/* Broadcast link */
struct tipc_bcbearer *bcbearer;
struct tipc_bclink *bclink;
struct tipc_link *bcl;
}; };
#ifdef CONFIG_SYSCTL #ifdef CONFIG_SYSCTL
......
...@@ -941,6 +941,7 @@ static void link_retransmit_failure(struct tipc_link *l_ptr, ...@@ -941,6 +941,7 @@ static void link_retransmit_failure(struct tipc_link *l_ptr,
struct sk_buff *buf) struct sk_buff *buf)
{ {
struct tipc_msg *msg = buf_msg(buf); struct tipc_msg *msg = buf_msg(buf);
struct net *net = l_ptr->owner->net;
pr_warn("Retransmission failure on link <%s>\n", l_ptr->name); pr_warn("Retransmission failure on link <%s>\n", l_ptr->name);
...@@ -958,7 +959,7 @@ static void link_retransmit_failure(struct tipc_link *l_ptr, ...@@ -958,7 +959,7 @@ static void link_retransmit_failure(struct tipc_link *l_ptr,
pr_cont("Outstanding acks: %lu\n", pr_cont("Outstanding acks: %lu\n",
(unsigned long) TIPC_SKB_CB(buf)->handle); (unsigned long) TIPC_SKB_CB(buf)->handle);
n_ptr = tipc_bclink_retransmit_to(); n_ptr = tipc_bclink_retransmit_to(net);
tipc_node_lock(n_ptr); tipc_node_lock(n_ptr);
tipc_addr_string_fill(addr_string, n_ptr->addr); tipc_addr_string_fill(addr_string, n_ptr->addr);
...@@ -973,7 +974,7 @@ static void link_retransmit_failure(struct tipc_link *l_ptr, ...@@ -973,7 +974,7 @@ static void link_retransmit_failure(struct tipc_link *l_ptr,
tipc_node_unlock(n_ptr); tipc_node_unlock(n_ptr);
tipc_bclink_set_flags(TIPC_BCLINK_RESET); tipc_bclink_set_flags(net, TIPC_BCLINK_RESET);
l_ptr->stale_count = 0; l_ptr->stale_count = 0;
} }
} }
...@@ -1404,7 +1405,7 @@ void tipc_link_proto_xmit(struct tipc_link *l_ptr, u32 msg_typ, int probe_msg, ...@@ -1404,7 +1405,7 @@ void tipc_link_proto_xmit(struct tipc_link *l_ptr, u32 msg_typ, int probe_msg,
msg_set_type(msg, msg_typ); msg_set_type(msg, msg_typ);
msg_set_net_plane(msg, l_ptr->net_plane); msg_set_net_plane(msg, l_ptr->net_plane);
msg_set_bcast_ack(msg, l_ptr->owner->bclink.last_in); msg_set_bcast_ack(msg, l_ptr->owner->bclink.last_in);
msg_set_last_bcast(msg, tipc_bclink_get_last_sent()); msg_set_last_bcast(msg, tipc_bclink_get_last_sent(l_ptr->owner->net));
if (msg_typ == STATE_MSG) { if (msg_typ == STATE_MSG) {
u32 next_sent = mod(l_ptr->next_out_no); u32 next_sent = mod(l_ptr->next_out_no);
...@@ -2105,7 +2106,7 @@ struct sk_buff *tipc_link_cmd_config(struct net *net, const void *req_tlv_area, ...@@ -2105,7 +2106,7 @@ struct sk_buff *tipc_link_cmd_config(struct net *net, const void *req_tlv_area,
if (!strcmp(args->name, tipc_bclink_name)) { if (!strcmp(args->name, tipc_bclink_name)) {
if ((cmd == TIPC_CMD_SET_LINK_WINDOW) && if ((cmd == TIPC_CMD_SET_LINK_WINDOW) &&
(tipc_bclink_set_queue_limits(new_value) == 0)) (tipc_bclink_set_queue_limits(net, new_value) == 0))
return tipc_cfg_reply_none(); return tipc_cfg_reply_none();
return tipc_cfg_reply_error_string(TIPC_CFG_NOT_SUPPORTED return tipc_cfg_reply_error_string(TIPC_CFG_NOT_SUPPORTED
" (cannot change setting on broadcast link)"); " (cannot change setting on broadcast link)");
...@@ -2143,7 +2144,7 @@ struct sk_buff *tipc_link_cmd_reset_stats(struct net *net, ...@@ -2143,7 +2144,7 @@ struct sk_buff *tipc_link_cmd_reset_stats(struct net *net,
link_name = (char *)TLV_DATA(req_tlv_area); link_name = (char *)TLV_DATA(req_tlv_area);
if (!strcmp(link_name, tipc_bclink_name)) { if (!strcmp(link_name, tipc_bclink_name)) {
if (tipc_bclink_reset_stats()) if (tipc_bclink_reset_stats(net))
return tipc_cfg_reply_error_string("link not found"); return tipc_cfg_reply_error_string("link not found");
return tipc_cfg_reply_none(); return tipc_cfg_reply_none();
} }
...@@ -2191,7 +2192,7 @@ static int tipc_link_stats(struct net *net, const char *name, char *buf, ...@@ -2191,7 +2192,7 @@ static int tipc_link_stats(struct net *net, const char *name, char *buf,
int ret; int ret;
if (!strcmp(name, tipc_bclink_name)) if (!strcmp(name, tipc_bclink_name))
return tipc_bclink_stats(buf, buf_size); return tipc_bclink_stats(net, buf, buf_size);
node = tipc_link_find_owner(net, name, &bearer_id); node = tipc_link_find_owner(net, name, &bearer_id);
if (!node) if (!node)
...@@ -2640,7 +2641,7 @@ int tipc_nl_link_dump(struct sk_buff *skb, struct netlink_callback *cb) ...@@ -2640,7 +2641,7 @@ int tipc_nl_link_dump(struct sk_buff *skb, struct netlink_callback *cb)
prev_node = node->addr; prev_node = node->addr;
} }
} else { } else {
err = tipc_nl_add_bc_link(&msg); err = tipc_nl_add_bc_link(net, &msg);
if (err) if (err)
goto out; goto out;
...@@ -2739,7 +2740,7 @@ int tipc_nl_link_reset_stats(struct sk_buff *skb, struct genl_info *info) ...@@ -2739,7 +2740,7 @@ int tipc_nl_link_reset_stats(struct sk_buff *skb, struct genl_info *info)
link_name = nla_data(attrs[TIPC_NLA_LINK_NAME]); link_name = nla_data(attrs[TIPC_NLA_LINK_NAME]);
if (strcmp(link_name, tipc_bclink_name) == 0) { if (strcmp(link_name, tipc_bclink_name) == 0) {
err = tipc_bclink_reset_stats(); err = tipc_bclink_reset_stats(net);
if (err) if (err)
return err; return err;
return 0; return 0;
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
#ifndef _TIPC_MSG_H #ifndef _TIPC_MSG_H
#define _TIPC_MSG_H #define _TIPC_MSG_H
#include "bearer.h" #include <linux/tipc.h>
/* /*
* Constants and routines used to read and write TIPC payload message headers * Constants and routines used to read and write TIPC payload message headers
......
...@@ -39,6 +39,7 @@ ...@@ -39,6 +39,7 @@
#include "name_table.h" #include "name_table.h"
#include "name_distr.h" #include "name_distr.h"
#include "subscr.h" #include "subscr.h"
#include "bcast.h"
#define TIPC_NAMETBL_SIZE 1024 /* must be a power of 2 */ #define TIPC_NAMETBL_SIZE 1024 /* must be a power of 2 */
......
...@@ -41,6 +41,7 @@ ...@@ -41,6 +41,7 @@
#include "socket.h" #include "socket.h"
#include "node.h" #include "node.h"
#include "config.h" #include "config.h"
#include "bcast.h"
static const struct nla_policy tipc_nl_net_policy[TIPC_NLA_NET_MAX + 1] = { static const struct nla_policy tipc_nl_net_policy[TIPC_NLA_NET_MAX + 1] = {
[TIPC_NLA_NET_UNSPEC] = { .type = NLA_UNSPEC }, [TIPC_NLA_NET_UNSPEC] = { .type = NLA_UNSPEC },
......
...@@ -368,8 +368,8 @@ static void node_established_contact(struct tipc_node *n_ptr) ...@@ -368,8 +368,8 @@ static void node_established_contact(struct tipc_node *n_ptr)
{ {
n_ptr->action_flags |= TIPC_NOTIFY_NODE_UP; n_ptr->action_flags |= TIPC_NOTIFY_NODE_UP;
n_ptr->bclink.oos_state = 0; n_ptr->bclink.oos_state = 0;
n_ptr->bclink.acked = tipc_bclink_get_last_sent(); n_ptr->bclink.acked = tipc_bclink_get_last_sent(n_ptr->net);
tipc_bclink_add_node(n_ptr->addr); tipc_bclink_add_node(n_ptr->net, n_ptr->addr);
} }
static void node_lost_contact(struct tipc_node *n_ptr) static void node_lost_contact(struct tipc_node *n_ptr)
...@@ -389,7 +389,7 @@ static void node_lost_contact(struct tipc_node *n_ptr) ...@@ -389,7 +389,7 @@ static void node_lost_contact(struct tipc_node *n_ptr)
n_ptr->bclink.reasm_buf = NULL; n_ptr->bclink.reasm_buf = NULL;
} }
tipc_bclink_remove_node(n_ptr->addr); tipc_bclink_remove_node(n_ptr->net, n_ptr->addr);
tipc_bclink_acknowledge(n_ptr, INVALID_LINK_SEQ); tipc_bclink_acknowledge(n_ptr, INVALID_LINK_SEQ);
n_ptr->bclink.recv_permitted = false; n_ptr->bclink.recv_permitted = false;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment