2006-01-03 02:04:38 +08:00
|
|
|
/*
|
|
|
|
|
* net/tipc/bearer.h: Include file for TIPC bearer code
|
2007-02-09 22:25:21 +08:00
|
|
|
*
|
2014-11-20 17:29:07 +08:00
|
|
|
* Copyright (c) 1996-2006, 2013-2014, Ericsson AB
|
2011-01-08 02:00:11 +08:00
|
|
|
* Copyright (c) 2005, 2010-2011, Wind River Systems
|
2006-01-03 02:04:38 +08:00
|
|
|
* All rights reserved.
|
|
|
|
|
*
|
2006-01-11 20:30:43 +08:00
|
|
|
* Redistribution and use in source and binary forms, with or without
|
2006-01-03 02:04:38 +08:00
|
|
|
* modification, are permitted provided that the following conditions are met:
|
|
|
|
|
*
|
2006-01-11 20:30:43 +08:00
|
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
|
|
|
* notice, this list of conditions and the following disclaimer.
|
|
|
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
|
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
|
|
|
* documentation and/or other materials provided with the distribution.
|
|
|
|
|
* 3. Neither the names of the copyright holders nor the names of its
|
|
|
|
|
* contributors may be used to endorse or promote products derived from
|
|
|
|
|
* this software without specific prior written permission.
|
2006-01-03 02:04:38 +08:00
|
|
|
*
|
2006-01-11 20:30:43 +08:00
|
|
|
* Alternatively, this software may be distributed under the terms of the
|
|
|
|
|
* GNU General Public License ("GPL") version 2 as published by the Free
|
|
|
|
|
* Software Foundation.
|
|
|
|
|
*
|
|
|
|
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
|
|
|
|
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
|
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
|
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
|
|
|
|
|
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
|
|
|
|
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
|
|
|
|
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
|
|
|
|
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
|
|
|
|
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
|
|
|
|
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
2006-01-03 02:04:38 +08:00
|
|
|
* POSSIBILITY OF SUCH DAMAGE.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#ifndef _TIPC_BEARER_H
|
|
|
|
|
#define _TIPC_BEARER_H
|
|
|
|
|
|
2014-11-20 17:29:07 +08:00
|
|
|
#include "netlink.h"
|
2015-05-14 22:46:13 +08:00
|
|
|
#include "core.h"
|
2014-11-20 17:29:07 +08:00
|
|
|
#include <net/genetlink.h>
|
2006-01-03 02:04:38 +08:00
|
|
|
|
2015-03-05 17:23:49 +08:00
|
|
|
#define MAX_MEDIA 3
|
2015-01-09 15:27:07 +08:00
|
|
|
#define MAX_NODES 4096
|
|
|
|
|
#define WSIZE 32
|
2006-01-03 02:04:38 +08:00
|
|
|
|
tipc: improve and extend media address conversion functions
TIPC currently handles two media specific addresses: Ethernet MAC
addresses and InfiniBand addresses. Those are kept in three different
formats:
1) A "raw" format as obtained from the device. This format is known
only by the media specific adapter code in eth_media.c and
ib_media.c.
2) A "generic" internal format, in the form of struct tipc_media_addr,
which can be referenced and passed around by the generic media-
unaware code.
3) A serialized version of the latter, to be conveyed in neighbor
discovery messages.
Conversion between the three formats can only be done by the media
specific code, so we have function pointers for this purpose in
struct tipc_media. Here, the media adapters can install their own
conversion functions at startup.
We now introduce a new such function, 'raw2addr()', whose purpose
is to convert from format 1 to format 2 above. We also try to as far
as possible uniform commenting, variable names and usage of these
functions, with the purpose of making them more comprehensible.
We can now also remove the function tipc_l2_media_addr_set(), whose
job is done better by the new function.
Finally, we expand the field for serialized addresses (format 3)
in discovery messages from 20 to 32 bytes. This is permitted
according to the spec, and reduces the risk of problems when we
add new media in the future.
Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Reviewed-by: Ying Xue <ying.xue@windriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-05-14 17:39:13 +08:00
|
|
|
/* Identifiers associated with TIPC message header media address info
|
|
|
|
|
* - address info field is 32 bytes long
|
|
|
|
|
* - the field's actual content and length is defined per media
|
|
|
|
|
* - remaining unused bytes in the field are set to zero
|
2011-10-08 01:37:34 +08:00
|
|
|
*/
|
2015-02-27 15:56:57 +08:00
|
|
|
#define TIPC_MEDIA_INFO_SIZE 32
|
2011-10-08 01:37:34 +08:00
|
|
|
#define TIPC_MEDIA_TYPE_OFFSET 3
|
2015-02-27 15:56:58 +08:00
|
|
|
#define TIPC_MEDIA_ADDR_OFFSET 4
|
2011-10-08 01:37:34 +08:00
|
|
|
|
2010-11-30 20:00:53 +08:00
|
|
|
/*
|
|
|
|
|
* Identifiers of supported TIPC media types
|
|
|
|
|
*/
|
|
|
|
|
#define TIPC_MEDIA_TYPE_ETH 1
|
2013-04-17 14:18:28 +08:00
|
|
|
#define TIPC_MEDIA_TYPE_IB 2
|
2015-03-05 17:23:49 +08:00
|
|
|
#define TIPC_MEDIA_TYPE_UDP 3
|
2010-11-30 20:00:53 +08:00
|
|
|
|
2015-01-09 15:27:07 +08:00
|
|
|
/**
|
|
|
|
|
* 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];
|
|
|
|
|
};
|
|
|
|
|
|
2012-07-10 18:55:09 +08:00
|
|
|
/**
|
2011-10-08 03:19:11 +08:00
|
|
|
* struct tipc_media_addr - destination address used by TIPC bearers
|
|
|
|
|
* @value: address info (format defined by media)
|
|
|
|
|
* @media_id: TIPC media type identifier
|
|
|
|
|
* @broadcast: non-zero if address is a broadcast address
|
2010-11-30 20:00:53 +08:00
|
|
|
*/
|
|
|
|
|
struct tipc_media_addr {
|
2015-02-27 15:56:57 +08:00
|
|
|
u8 value[TIPC_MEDIA_INFO_SIZE];
|
2011-10-08 03:19:11 +08:00
|
|
|
u8 media_id;
|
|
|
|
|
u8 broadcast;
|
2010-11-30 20:00:53 +08:00
|
|
|
};
|
|
|
|
|
|
2011-01-08 02:00:11 +08:00
|
|
|
struct tipc_bearer;
|
2006-01-03 02:04:38 +08:00
|
|
|
|
|
|
|
|
/**
|
2013-12-11 12:45:40 +08:00
|
|
|
* struct tipc_media - Media specific info exposed to generic bearer layer
|
2006-01-03 02:04:38 +08:00
|
|
|
* @send_msg: routine which handles buffer transmission
|
2013-10-18 13:23:17 +08:00
|
|
|
* @enable_media: routine which enables a media
|
|
|
|
|
* @disable_media: routine which disables a media
|
tipc: improve and extend media address conversion functions
TIPC currently handles two media specific addresses: Ethernet MAC
addresses and InfiniBand addresses. Those are kept in three different
formats:
1) A "raw" format as obtained from the device. This format is known
only by the media specific adapter code in eth_media.c and
ib_media.c.
2) A "generic" internal format, in the form of struct tipc_media_addr,
which can be referenced and passed around by the generic media-
unaware code.
3) A serialized version of the latter, to be conveyed in neighbor
discovery messages.
Conversion between the three formats can only be done by the media
specific code, so we have function pointers for this purpose in
struct tipc_media. Here, the media adapters can install their own
conversion functions at startup.
We now introduce a new such function, 'raw2addr()', whose purpose
is to convert from format 1 to format 2 above. We also try to as far
as possible uniform commenting, variable names and usage of these
functions, with the purpose of making them more comprehensible.
We can now also remove the function tipc_l2_media_addr_set(), whose
job is done better by the new function.
Finally, we expand the field for serialized addresses (format 3)
in discovery messages from 20 to 32 bytes. This is permitted
according to the spec, and reduces the risk of problems when we
add new media in the future.
Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Reviewed-by: Ying Xue <ying.xue@windriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-05-14 17:39:13 +08:00
|
|
|
* @addr2str: convert media address format to string
|
|
|
|
|
* @addr2msg: convert from media addr format to discovery msg addr format
|
|
|
|
|
* @msg2addr: convert from discovery msg addr format to media addr format
|
|
|
|
|
* @raw2addr: convert from raw addr format to media addr format
|
2006-01-03 02:04:38 +08:00
|
|
|
* @priority: default link (and bearer) priority
|
|
|
|
|
* @tolerance: default time (in ms) before declaring link failure
|
|
|
|
|
* @window: default window (in packets) before declaring link congestion
|
2010-11-30 20:00:53 +08:00
|
|
|
* @type_id: TIPC media identifier
|
2013-12-11 12:45:43 +08:00
|
|
|
* @hwaddr_len: TIPC media address len
|
2006-01-03 02:04:38 +08:00
|
|
|
* @name: media name
|
|
|
|
|
*/
|
2011-12-30 09:19:42 +08:00
|
|
|
struct tipc_media {
|
2015-01-09 15:27:07 +08:00
|
|
|
int (*send_msg)(struct net *net, struct sk_buff *buf,
|
2006-01-03 02:04:38 +08:00
|
|
|
struct tipc_bearer *b_ptr,
|
|
|
|
|
struct tipc_media_addr *dest);
|
2015-03-05 17:23:49 +08:00
|
|
|
int (*enable_media)(struct net *net, struct tipc_bearer *b_ptr,
|
|
|
|
|
struct nlattr *attr[]);
|
2013-10-18 13:23:17 +08:00
|
|
|
void (*disable_media)(struct tipc_bearer *b_ptr);
|
tipc: improve and extend media address conversion functions
TIPC currently handles two media specific addresses: Ethernet MAC
addresses and InfiniBand addresses. Those are kept in three different
formats:
1) A "raw" format as obtained from the device. This format is known
only by the media specific adapter code in eth_media.c and
ib_media.c.
2) A "generic" internal format, in the form of struct tipc_media_addr,
which can be referenced and passed around by the generic media-
unaware code.
3) A serialized version of the latter, to be conveyed in neighbor
discovery messages.
Conversion between the three formats can only be done by the media
specific code, so we have function pointers for this purpose in
struct tipc_media. Here, the media adapters can install their own
conversion functions at startup.
We now introduce a new such function, 'raw2addr()', whose purpose
is to convert from format 1 to format 2 above. We also try to as far
as possible uniform commenting, variable names and usage of these
functions, with the purpose of making them more comprehensible.
We can now also remove the function tipc_l2_media_addr_set(), whose
job is done better by the new function.
Finally, we expand the field for serialized addresses (format 3)
in discovery messages from 20 to 32 bytes. This is permitted
according to the spec, and reduces the risk of problems when we
add new media in the future.
Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Reviewed-by: Ying Xue <ying.xue@windriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-05-14 17:39:13 +08:00
|
|
|
int (*addr2str)(struct tipc_media_addr *addr,
|
|
|
|
|
char *strbuf,
|
|
|
|
|
int bufsz);
|
|
|
|
|
int (*addr2msg)(char *msg, struct tipc_media_addr *addr);
|
|
|
|
|
int (*msg2addr)(struct tipc_bearer *b,
|
|
|
|
|
struct tipc_media_addr *addr,
|
|
|
|
|
char *msg);
|
|
|
|
|
int (*raw2addr)(struct tipc_bearer *b,
|
|
|
|
|
struct tipc_media_addr *addr,
|
|
|
|
|
char *raw);
|
2006-01-03 02:04:38 +08:00
|
|
|
u32 priority;
|
|
|
|
|
u32 tolerance;
|
|
|
|
|
u32 window;
|
|
|
|
|
u32 type_id;
|
2013-12-11 12:45:43 +08:00
|
|
|
u32 hwaddr_len;
|
2006-01-03 02:04:38 +08:00
|
|
|
char name[TIPC_MAX_MEDIA_NAME];
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/**
|
2013-12-11 12:45:40 +08:00
|
|
|
* struct tipc_bearer - Generic TIPC bearer structure
|
tipc: remove bearer_lock from tipc_bearer struct
After the earlier commits ("tipc: remove 'links' list from
tipc_bearer struct") and ("tipc: introduce new spinlock to protect
struct link_req"), there is no longer any need to protect struct
link_req or or any link list by use of bearer_lock. Furthermore,
we have eliminated the need for using bearer_lock during downcalls
(send) from the link to the bearer, since we have ensured that
bearers always have a longer life cycle that their associated links,
and always contain valid data.
So, the only need now for a lock protecting bearers is for guaranteeing
consistency of the bearer list itself. For this, it is sufficient, at
least for the time being, to continue applying 'net_lock´ in write mode.
By removing bearer_lock we also pre-empt introduction of issue b) descibed
in the previous commit "tipc: remove 'links' list from tipc_bearer struct":
"b) When the outer protection from net_lock is gone, taking
bearer_lock and node_lock in opposite order of method 1) and 2)
will become an obvious deadlock hazard".
Therefore, we now eliminate the bearer_lock spinlock.
Signed-off-by: Ying Xue <ying.xue@windriver.com>
Reviewed-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-02-14 06:29:17 +08:00
|
|
|
* @media_ptr: pointer to additional media-specific information about bearer
|
2011-01-08 02:00:11 +08:00
|
|
|
* @mtu: max packet size bearer can support
|
|
|
|
|
* @addr: media-specific address associated with bearer
|
|
|
|
|
* @name: bearer name (format = media:interface)
|
2006-01-03 02:04:38 +08:00
|
|
|
* @media: ptr to media structure associated with bearer
|
2013-12-11 12:45:40 +08:00
|
|
|
* @bcast_addr: media address used in broadcasting
|
2014-04-21 10:55:45 +08:00
|
|
|
* @rcu: rcu struct for tipc_bearer
|
2006-01-03 02:04:38 +08:00
|
|
|
* @priority: default link priority for bearer
|
2011-10-18 23:34:29 +08:00
|
|
|
* @window: default window size for bearer
|
|
|
|
|
* @tolerance: default link tolerance for bearer
|
2014-03-28 17:32:08 +08:00
|
|
|
* @domain: network domain to which links can be established
|
2006-01-03 02:04:38 +08:00
|
|
|
* @identity: array index of this bearer within TIPC bearer array
|
|
|
|
|
* @link_req: ptr to (optional) structure making periodic link setup requests
|
|
|
|
|
* @net_plane: network plane ('A' through 'H') currently associated with bearer
|
|
|
|
|
* @nodes: indicates which nodes in cluster can be reached through bearer
|
2011-01-08 02:00:11 +08:00
|
|
|
*
|
|
|
|
|
* Note: media-specific code is responsible for initialization of the fields
|
|
|
|
|
* indicated below when a bearer is enabled; TIPC's generic bearer code takes
|
|
|
|
|
* care of initializing all other fields.
|
2006-01-03 02:04:38 +08:00
|
|
|
*/
|
2011-01-08 02:00:11 +08:00
|
|
|
struct tipc_bearer {
|
2014-04-21 10:55:47 +08:00
|
|
|
void __rcu *media_ptr; /* initalized by media */
|
2011-01-08 02:00:11 +08:00
|
|
|
u32 mtu; /* initalized by media */
|
|
|
|
|
struct tipc_media_addr addr; /* initalized by media */
|
|
|
|
|
char name[TIPC_MAX_BEARER_NAME];
|
2011-12-30 09:19:42 +08:00
|
|
|
struct tipc_media *media;
|
2013-04-17 14:18:26 +08:00
|
|
|
struct tipc_media_addr bcast_addr;
|
2014-04-21 10:55:45 +08:00
|
|
|
struct rcu_head rcu;
|
2006-01-03 02:04:38 +08:00
|
|
|
u32 priority;
|
2011-10-18 23:34:29 +08:00
|
|
|
u32 window;
|
|
|
|
|
u32 tolerance;
|
2014-03-28 17:32:08 +08:00
|
|
|
u32 domain;
|
2006-01-03 02:04:38 +08:00
|
|
|
u32 identity;
|
2011-12-30 09:58:42 +08:00
|
|
|
struct tipc_link_req *link_req;
|
2006-01-03 02:04:38 +08:00
|
|
|
char net_plane;
|
tipc: simplify bearer level broadcast
Until now, we have been keeping track of the exact set of broadcast
destinations though the help structure tipc_node_map. This leads us to
have to maintain a whole infrastructure for supporting this, including
a pseudo-bearer and a number of functions to manipulate both the bearers
and the node map correctly. Apart from the complexity, this approach is
also limiting, as struct tipc_node_map only can support cluster local
broadcast if we want to avoid it becoming excessively large. We want to
eliminate this limitation, in order to enable introduction of scoped
multicast in the future.
A closer analysis reveals that it is unnecessary maintaining this "full
set" overview; it is sufficient to keep a counter per bearer, indicating
how many nodes can be reached via this bearer at the moment. The protocol
is now robust enough to handle transitional discrepancies between the
nominal number of reachable destinations, as expected by the broadcast
protocol itself, and the number which is actually reachable at the
moment. The initial broadcast synchronization, in conjunction with the
retransmission mechanism, ensures that all packets will eventually be
acknowledged by the correct set of destinations.
This commit introduces these changes.
Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Reviewed-by: Ying Xue <ying.xue@windriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-10-22 20:51:42 +08:00
|
|
|
int node_cnt;
|
2008-09-03 14:38:32 +08:00
|
|
|
struct tipc_node_map nodes;
|
2006-01-03 02:04:38 +08:00
|
|
|
};
|
|
|
|
|
|
2011-12-30 10:39:49 +08:00
|
|
|
struct tipc_bearer_names {
|
2006-01-03 02:04:38 +08:00
|
|
|
char media_name[TIPC_MAX_MEDIA_NAME];
|
|
|
|
|
char if_name[TIPC_MAX_IF_NAME];
|
|
|
|
|
};
|
|
|
|
|
|
2010-11-30 20:00:53 +08:00
|
|
|
/*
|
|
|
|
|
* TIPC routines available to supported media types
|
|
|
|
|
*/
|
|
|
|
|
|
2015-01-09 15:27:04 +08:00
|
|
|
void tipc_rcv(struct net *net, struct sk_buff *skb, struct tipc_bearer *b_ptr);
|
2010-11-30 20:00:53 +08:00
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Routines made available to TIPC by supported media types
|
|
|
|
|
*/
|
2013-12-11 12:45:39 +08:00
|
|
|
extern struct tipc_media eth_media_info;
|
2010-11-30 20:00:53 +08:00
|
|
|
|
2013-04-17 14:18:28 +08:00
|
|
|
#ifdef CONFIG_TIPC_MEDIA_IB
|
2013-12-11 12:45:39 +08:00
|
|
|
extern struct tipc_media ib_media_info;
|
2013-04-17 14:18:28 +08:00
|
|
|
#endif
|
2015-03-05 17:23:49 +08:00
|
|
|
#ifdef CONFIG_TIPC_MEDIA_UDP
|
|
|
|
|
extern struct tipc_media udp_media_info;
|
|
|
|
|
#endif
|
2013-04-17 14:18:28 +08:00
|
|
|
|
2014-11-20 17:29:07 +08:00
|
|
|
int tipc_nl_bearer_disable(struct sk_buff *skb, struct genl_info *info);
|
|
|
|
|
int tipc_nl_bearer_enable(struct sk_buff *skb, struct genl_info *info);
|
2014-11-20 17:29:08 +08:00
|
|
|
int tipc_nl_bearer_dump(struct sk_buff *skb, struct netlink_callback *cb);
|
|
|
|
|
int tipc_nl_bearer_get(struct sk_buff *skb, struct genl_info *info);
|
2014-11-20 17:29:09 +08:00
|
|
|
int tipc_nl_bearer_set(struct sk_buff *skb, struct genl_info *info);
|
2014-11-20 17:29:07 +08:00
|
|
|
|
2014-11-20 17:29:15 +08:00
|
|
|
int tipc_nl_media_dump(struct sk_buff *skb, struct netlink_callback *cb);
|
|
|
|
|
int tipc_nl_media_get(struct sk_buff *skb, struct genl_info *info);
|
2014-11-20 17:29:16 +08:00
|
|
|
int tipc_nl_media_set(struct sk_buff *skb, struct genl_info *info);
|
2014-11-20 17:29:15 +08:00
|
|
|
|
2011-10-18 23:34:29 +08:00
|
|
|
int tipc_media_set_priority(const char *name, u32 new_value);
|
|
|
|
|
int tipc_media_set_window(const char *name, u32 new_value);
|
2012-06-29 12:50:23 +08:00
|
|
|
void tipc_media_addr_printf(char *buf, int len, struct tipc_media_addr *a);
|
2015-03-05 17:23:49 +08:00
|
|
|
int tipc_enable_l2_media(struct net *net, struct tipc_bearer *b,
|
|
|
|
|
struct nlattr *attrs[]);
|
2013-12-11 12:45:43 +08:00
|
|
|
void tipc_disable_l2_media(struct tipc_bearer *b);
|
2015-01-09 15:27:07 +08:00
|
|
|
int tipc_l2_send_msg(struct net *net, struct sk_buff *buf,
|
|
|
|
|
struct tipc_bearer *b, struct tipc_media_addr *dest);
|
2006-01-03 02:04:38 +08:00
|
|
|
|
2015-01-09 15:27:06 +08:00
|
|
|
void tipc_bearer_add_dest(struct net *net, u32 bearer_id, u32 dest);
|
|
|
|
|
void tipc_bearer_remove_dest(struct net *net, u32 bearer_id, u32 dest);
|
|
|
|
|
struct tipc_bearer *tipc_bearer_find(struct net *net, const char *name);
|
2011-12-30 09:19:42 +08:00
|
|
|
struct tipc_media *tipc_media_find(const char *name);
|
tipc: relocate common functions from media to bearer
Currently, registering a TIPC stack handler in the network device layer
is done twice, once for Ethernet (eth_media) and Infiniband (ib_media)
repectively. But, as this registration is not media specific, we can
avoid some code duplication by moving the registering function to
the generic bearer layer, to the file bearer.c, and call it only once.
The same is true for the network device event notifier.
As a side effect, the two workqueues we are using for for setting up/
cleaning up media can now be eliminated. Furthermore, the array for
storing the specific media type structs, media_array[], can be entirely
deleted.
Note that the eth_started and ib_started flags were removed during the
code relocation. There is now only one call to bearer_setup and
bearer_cleanup, and these can logically not race against each other.
Despite its size, this cleanup work incurs no functional changes in TIPC.
In particular, it should be noted that the sequence ordering of received
packets is unaffected by this change, since packet reception never was
subject to any work queue handling in the first place.
Signed-off-by: Ying Xue <ying.xue@windriver.com>
Cc: Patrick McHardy <kaber@trash.net>
Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Reviewed-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2013-12-11 12:45:42 +08:00
|
|
|
int tipc_bearer_setup(void);
|
|
|
|
|
void tipc_bearer_cleanup(void);
|
2015-01-09 15:27:05 +08:00
|
|
|
void tipc_bearer_stop(struct net *net);
|
2015-01-09 15:27:06 +08:00
|
|
|
void tipc_bearer_send(struct net *net, u32 bearer_id, struct sk_buff *buf,
|
2013-12-11 12:45:43 +08:00
|
|
|
struct tipc_media_addr *dest);
|
2015-10-22 20:51:43 +08:00
|
|
|
int tipc_bearer_mtu(struct net *net, u32 bearer_id);
|
2015-07-17 04:54:24 +08:00
|
|
|
void tipc_bearer_xmit(struct net *net, u32 bearer_id,
|
|
|
|
|
struct sk_buff_head *xmitq,
|
|
|
|
|
struct tipc_media_addr *dst);
|
tipc: simplify bearer level broadcast
Until now, we have been keeping track of the exact set of broadcast
destinations though the help structure tipc_node_map. This leads us to
have to maintain a whole infrastructure for supporting this, including
a pseudo-bearer and a number of functions to manipulate both the bearers
and the node map correctly. Apart from the complexity, this approach is
also limiting, as struct tipc_node_map only can support cluster local
broadcast if we want to avoid it becoming excessively large. We want to
eliminate this limitation, in order to enable introduction of scoped
multicast in the future.
A closer analysis reveals that it is unnecessary maintaining this "full
set" overview; it is sufficient to keep a counter per bearer, indicating
how many nodes can be reached via this bearer at the moment. The protocol
is now robust enough to handle transitional discrepancies between the
nominal number of reachable destinations, as expected by the broadcast
protocol itself, and the number which is actually reachable at the
moment. The initial broadcast synchronization, in conjunction with the
retransmission mechanism, ensures that all packets will eventually be
acknowledged by the correct set of destinations.
This commit introduces these changes.
Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Reviewed-by: Ying Xue <ying.xue@windriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-10-22 20:51:42 +08:00
|
|
|
void tipc_bearer_bc_xmit(struct net *net, u32 bearer_id,
|
|
|
|
|
struct sk_buff_head *xmitq);
|
2006-01-03 02:04:38 +08:00
|
|
|
|
2010-05-11 22:30:16 +08:00
|
|
|
#endif /* _TIPC_BEARER_H */
|