2006-01-02 21:04:38 +03:00
|
|
|
/*
|
|
|
|
* net/tipc/discover.c
|
2007-02-09 17:25:21 +03:00
|
|
|
*
|
2006-01-11 20:40:41 +03:00
|
|
|
* Copyright (c) 2003-2006, Ericsson AB
|
2011-01-07 21:00:11 +03:00
|
|
|
* Copyright (c) 2005-2006, 2010-2011, Wind River Systems
|
2006-01-02 21:04:38 +03:00
|
|
|
* All rights reserved.
|
|
|
|
*
|
2006-01-11 15:30:43 +03:00
|
|
|
* Redistribution and use in source and binary forms, with or without
|
2006-01-02 21:04:38 +03:00
|
|
|
* modification, are permitted provided that the following conditions are met:
|
|
|
|
*
|
2006-01-11 15:30:43 +03: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-02 21:04:38 +03:00
|
|
|
*
|
2006-01-11 15:30:43 +03: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-02 21:04:38 +03:00
|
|
|
* POSSIBILITY OF SUCH DAMAGE.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "core.h"
|
|
|
|
#include "link.h"
|
|
|
|
#include "discover.h"
|
|
|
|
|
|
|
|
#define TIPC_LINK_REQ_INIT 125 /* min delay during bearer start up */
|
2011-04-22 05:34:03 +04:00
|
|
|
#define TIPC_LINK_REQ_FAST 1000 /* max delay if bearer has no links */
|
|
|
|
#define TIPC_LINK_REQ_SLOW 60000 /* max delay if bearer has links */
|
|
|
|
#define TIPC_LINK_REQ_INACTIVE 0xffffffff /* indicates no timer in use */
|
2006-01-02 21:04:38 +03:00
|
|
|
|
|
|
|
|
|
|
|
/**
|
2011-12-30 05:58:42 +04:00
|
|
|
* struct tipc_link_req - information about an ongoing link setup request
|
tipc: decouple the relationship between bearer and link
Currently on both paths of message transmission and reception, the
read lock of tipc_net_lock must be held before bearer is accessed,
while the write lock of tipc_net_lock has to be taken before bearer
is configured. Although it can ensure that bearer is always valid on
the two data paths, link and bearer is closely bound together.
So as the part of effort of removing tipc_net_lock, the locking
policy of bearer protection will be adjusted as below: on the two
data paths, RCU is used, and on the configuration path of bearer,
RTNL lock is applied.
Now RCU just covers the path of message reception. To make it possible
to protect the path of message transmission with RCU, link should not
use its stored bearer pointer to access bearer, but it should use the
bearer identity of its attached bearer as index to get bearer instance
from bearer_list array, which can help us decouple the relationship
between bearer and link. As a result, bearer on the path of message
transmission can be safely protected by RCU when we access bearer_list
array within RCU lock protection.
Signed-off-by: Ying Xue <ying.xue@windriver.com>
Reviewed-by: Jon Maloy <jon.maloy@ericsson.com>
Reviewed-by: Erik Hugne <erik.hugne@ericsson.com>
Tested-by: Erik Hugne <erik.hugne@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-04-21 06:55:46 +04:00
|
|
|
* @bearer_id: identity of bearer issuing requests
|
2006-01-02 21:04:38 +03:00
|
|
|
* @dest: destination address for request messages
|
tipc: decouple the relationship between bearer and link
Currently on both paths of message transmission and reception, the
read lock of tipc_net_lock must be held before bearer is accessed,
while the write lock of tipc_net_lock has to be taken before bearer
is configured. Although it can ensure that bearer is always valid on
the two data paths, link and bearer is closely bound together.
So as the part of effort of removing tipc_net_lock, the locking
policy of bearer protection will be adjusted as below: on the two
data paths, RCU is used, and on the configuration path of bearer,
RTNL lock is applied.
Now RCU just covers the path of message reception. To make it possible
to protect the path of message transmission with RCU, link should not
use its stored bearer pointer to access bearer, but it should use the
bearer identity of its attached bearer as index to get bearer instance
from bearer_list array, which can help us decouple the relationship
between bearer and link. As a result, bearer on the path of message
transmission can be safely protected by RCU when we access bearer_list
array within RCU lock protection.
Signed-off-by: Ying Xue <ying.xue@windriver.com>
Reviewed-by: Jon Maloy <jon.maloy@ericsson.com>
Reviewed-by: Erik Hugne <erik.hugne@ericsson.com>
Tested-by: Erik Hugne <erik.hugne@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-04-21 06:55:46 +04:00
|
|
|
* @domain: network domain to which links can be established
|
2011-04-22 04:05:25 +04:00
|
|
|
* @num_nodes: number of nodes currently discovered (i.e. with an active link)
|
2014-01-08 02:02:43 +04:00
|
|
|
* @lock: spinlock for controlling access to requests
|
2006-01-02 21:04:38 +03:00
|
|
|
* @buf: request message to be (repeatedly) sent
|
|
|
|
* @timer: timer governing period between requests
|
|
|
|
* @timer_intv: current interval between requests (in ms)
|
|
|
|
*/
|
2011-12-30 05:58:42 +04:00
|
|
|
struct tipc_link_req {
|
tipc: decouple the relationship between bearer and link
Currently on both paths of message transmission and reception, the
read lock of tipc_net_lock must be held before bearer is accessed,
while the write lock of tipc_net_lock has to be taken before bearer
is configured. Although it can ensure that bearer is always valid on
the two data paths, link and bearer is closely bound together.
So as the part of effort of removing tipc_net_lock, the locking
policy of bearer protection will be adjusted as below: on the two
data paths, RCU is used, and on the configuration path of bearer,
RTNL lock is applied.
Now RCU just covers the path of message reception. To make it possible
to protect the path of message transmission with RCU, link should not
use its stored bearer pointer to access bearer, but it should use the
bearer identity of its attached bearer as index to get bearer instance
from bearer_list array, which can help us decouple the relationship
between bearer and link. As a result, bearer on the path of message
transmission can be safely protected by RCU when we access bearer_list
array within RCU lock protection.
Signed-off-by: Ying Xue <ying.xue@windriver.com>
Reviewed-by: Jon Maloy <jon.maloy@ericsson.com>
Reviewed-by: Erik Hugne <erik.hugne@ericsson.com>
Tested-by: Erik Hugne <erik.hugne@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-04-21 06:55:46 +04:00
|
|
|
u32 bearer_id;
|
2006-01-02 21:04:38 +03:00
|
|
|
struct tipc_media_addr dest;
|
tipc: decouple the relationship between bearer and link
Currently on both paths of message transmission and reception, the
read lock of tipc_net_lock must be held before bearer is accessed,
while the write lock of tipc_net_lock has to be taken before bearer
is configured. Although it can ensure that bearer is always valid on
the two data paths, link and bearer is closely bound together.
So as the part of effort of removing tipc_net_lock, the locking
policy of bearer protection will be adjusted as below: on the two
data paths, RCU is used, and on the configuration path of bearer,
RTNL lock is applied.
Now RCU just covers the path of message reception. To make it possible
to protect the path of message transmission with RCU, link should not
use its stored bearer pointer to access bearer, but it should use the
bearer identity of its attached bearer as index to get bearer instance
from bearer_list array, which can help us decouple the relationship
between bearer and link. As a result, bearer on the path of message
transmission can be safely protected by RCU when we access bearer_list
array within RCU lock protection.
Signed-off-by: Ying Xue <ying.xue@windriver.com>
Reviewed-by: Jon Maloy <jon.maloy@ericsson.com>
Reviewed-by: Erik Hugne <erik.hugne@ericsson.com>
Tested-by: Erik Hugne <erik.hugne@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-04-21 06:55:46 +04:00
|
|
|
u32 domain;
|
2011-04-22 04:05:25 +04:00
|
|
|
int num_nodes;
|
2014-01-08 02:02:43 +04:00
|
|
|
spinlock_t lock;
|
2006-01-02 21:04:38 +03:00
|
|
|
struct sk_buff *buf;
|
|
|
|
struct timer_list timer;
|
|
|
|
unsigned int timer_intv;
|
|
|
|
};
|
|
|
|
|
2007-02-09 17:25:21 +03:00
|
|
|
/**
|
2006-01-18 02:38:21 +03:00
|
|
|
* tipc_disc_init_msg - initialize a link setup message
|
2006-01-02 21:04:38 +03:00
|
|
|
* @type: message type (request or response)
|
|
|
|
* @b_ptr: ptr to bearer issuing message
|
|
|
|
*/
|
2014-04-21 06:55:52 +04:00
|
|
|
static void tipc_disc_init_msg(struct sk_buff *buf, u32 type,
|
|
|
|
struct tipc_bearer *b_ptr)
|
2006-01-02 21:04:38 +03:00
|
|
|
{
|
|
|
|
struct tipc_msg *msg;
|
2014-03-28 13:32:09 +04:00
|
|
|
u32 dest_domain = b_ptr->domain;
|
2006-01-02 21:04:38 +03:00
|
|
|
|
2014-04-21 06:55:52 +04:00
|
|
|
msg = buf_msg(buf);
|
|
|
|
tipc_msg_init(msg, LINK_CONFIG, type, INT_H_SIZE, dest_domain);
|
|
|
|
msg_set_non_seq(msg, 1);
|
|
|
|
msg_set_node_sig(msg, tipc_random);
|
|
|
|
msg_set_dest_domain(msg, dest_domain);
|
|
|
|
msg_set_bc_netid(msg, tipc_net_id);
|
|
|
|
b_ptr->media->addr2msg(&b_ptr->addr, msg_media_addr(msg));
|
2006-01-02 21:04:38 +03:00
|
|
|
}
|
|
|
|
|
2006-10-17 08:44:59 +04:00
|
|
|
/**
|
|
|
|
* disc_dupl_alert - issue node address duplication alert
|
|
|
|
* @b_ptr: pointer to bearer detecting duplication
|
|
|
|
* @node_addr: duplicated node address
|
|
|
|
* @media_addr: media address advertised by duplicated node
|
|
|
|
*/
|
2011-01-07 21:00:11 +03:00
|
|
|
static void disc_dupl_alert(struct tipc_bearer *b_ptr, u32 node_addr,
|
2006-10-17 08:44:59 +04:00
|
|
|
struct tipc_media_addr *media_addr)
|
|
|
|
{
|
|
|
|
char node_addr_str[16];
|
|
|
|
char media_addr_str[64];
|
|
|
|
|
2010-05-11 18:30:12 +04:00
|
|
|
tipc_addr_string_fill(node_addr_str, node_addr);
|
2012-06-29 08:50:23 +04:00
|
|
|
tipc_media_addr_printf(media_addr_str, sizeof(media_addr_str),
|
|
|
|
media_addr);
|
2012-06-29 08:16:37 +04:00
|
|
|
pr_warn("Duplicate %s using %s seen on <%s>\n", node_addr_str,
|
|
|
|
media_addr_str, b_ptr->name);
|
2006-10-17 08:44:59 +04:00
|
|
|
}
|
|
|
|
|
2006-01-02 21:04:38 +03:00
|
|
|
/**
|
2014-02-18 12:06:46 +04:00
|
|
|
* tipc_disc_rcv - handle incoming link setup message (request or response)
|
2006-01-02 21:04:38 +03:00
|
|
|
* @buf: buffer containing message
|
2008-06-05 04:32:35 +04:00
|
|
|
* @b_ptr: bearer that message arrived on
|
2006-01-02 21:04:38 +03:00
|
|
|
*/
|
2014-02-18 12:06:46 +04:00
|
|
|
void tipc_disc_rcv(struct sk_buff *buf, struct tipc_bearer *b_ptr)
|
2006-01-02 21:04:38 +03:00
|
|
|
{
|
2011-02-28 18:03:05 +03:00
|
|
|
struct tipc_node *n_ptr;
|
2011-12-30 05:58:42 +04:00
|
|
|
struct tipc_link *link;
|
2011-10-29 01:30:08 +04:00
|
|
|
struct tipc_media_addr media_addr;
|
2011-02-28 18:03:05 +03:00
|
|
|
struct sk_buff *rbuf;
|
2006-01-02 21:04:38 +03:00
|
|
|
struct tipc_msg *msg = buf_msg(buf);
|
|
|
|
u32 dest = msg_dest_domain(msg);
|
|
|
|
u32 orig = msg_prevnode(msg);
|
|
|
|
u32 net_id = msg_bc_netid(msg);
|
|
|
|
u32 type = msg_type(msg);
|
2011-10-29 00:26:41 +04:00
|
|
|
u32 signature = msg_node_sig(msg);
|
2011-10-29 01:30:08 +04:00
|
|
|
int addr_mismatch;
|
2011-02-28 18:03:05 +03:00
|
|
|
int link_fully_up;
|
2006-01-02 21:04:38 +03:00
|
|
|
|
2011-10-07 23:48:41 +04:00
|
|
|
media_addr.broadcast = 1;
|
2013-04-17 10:18:26 +04:00
|
|
|
b_ptr->media->msg2addr(b_ptr, &media_addr, msg_media_addr(msg));
|
2011-11-04 21:24:29 +04:00
|
|
|
kfree_skb(buf);
|
2006-01-02 21:04:38 +03:00
|
|
|
|
2011-10-29 01:30:08 +04:00
|
|
|
/* Ensure message from node is valid and communication is permitted */
|
2006-01-02 21:04:38 +03:00
|
|
|
if (net_id != tipc_net_id)
|
|
|
|
return;
|
2011-10-07 23:48:41 +04:00
|
|
|
if (media_addr.broadcast)
|
|
|
|
return;
|
2006-01-18 02:38:21 +03:00
|
|
|
if (!tipc_addr_domain_valid(dest))
|
2006-01-02 21:04:38 +03:00
|
|
|
return;
|
2006-01-18 02:38:21 +03:00
|
|
|
if (!tipc_addr_node_valid(orig))
|
2006-01-02 21:04:38 +03:00
|
|
|
return;
|
2006-10-17 08:44:59 +04:00
|
|
|
if (orig == tipc_own_addr) {
|
2011-01-07 21:00:11 +03:00
|
|
|
if (memcmp(&media_addr, &b_ptr->addr, sizeof(media_addr)))
|
2006-10-17 08:44:59 +04:00
|
|
|
disc_dupl_alert(b_ptr, tipc_own_addr, &media_addr);
|
2006-01-02 21:04:38 +03:00
|
|
|
return;
|
2006-10-17 08:44:59 +04:00
|
|
|
}
|
2010-05-11 18:30:12 +04:00
|
|
|
if (!tipc_in_scope(dest, tipc_own_addr))
|
2006-01-02 21:04:38 +03:00
|
|
|
return;
|
2014-03-28 13:32:09 +04:00
|
|
|
if (!tipc_in_scope(b_ptr->domain, orig))
|
2011-02-28 18:03:05 +03:00
|
|
|
return;
|
2010-08-17 15:00:16 +04:00
|
|
|
|
2011-02-28 18:03:05 +03:00
|
|
|
/* Locate structure corresponding to requesting node */
|
|
|
|
n_ptr = tipc_node_find(orig);
|
|
|
|
if (!n_ptr) {
|
|
|
|
n_ptr = tipc_node_create(orig);
|
|
|
|
if (!n_ptr)
|
2010-08-17 15:00:16 +04:00
|
|
|
return;
|
2011-02-28 18:03:05 +03:00
|
|
|
}
|
|
|
|
tipc_node_lock(n_ptr);
|
|
|
|
|
2011-10-29 01:30:08 +04:00
|
|
|
/* Prepare to validate requesting node's signature and media address */
|
2011-02-28 18:03:05 +03:00
|
|
|
link = n_ptr->links[b_ptr->identity];
|
2011-10-29 01:30:08 +04:00
|
|
|
addr_mismatch = (link != NULL) &&
|
|
|
|
memcmp(&link->media_addr, &media_addr, sizeof(media_addr));
|
2011-02-28 18:03:05 +03:00
|
|
|
|
2011-10-29 01:30:08 +04:00
|
|
|
/*
|
|
|
|
* Ensure discovery message's signature is correct
|
|
|
|
*
|
|
|
|
* If signature is incorrect and there is no working link to the node,
|
|
|
|
* accept the new signature but invalidate all existing links to the
|
|
|
|
* node so they won't re-activate without a new discovery message.
|
|
|
|
*
|
|
|
|
* If signature is incorrect and the requested link to the node is
|
|
|
|
* working, accept the new signature. (This is an instance of delayed
|
|
|
|
* rediscovery, where a link endpoint was able to re-establish contact
|
|
|
|
* with its peer endpoint on a node that rebooted before receiving a
|
|
|
|
* discovery message from that node.)
|
|
|
|
*
|
|
|
|
* If signature is incorrect and there is a working link to the node
|
|
|
|
* that is not the requested link, reject the request (must be from
|
|
|
|
* a duplicate node).
|
|
|
|
*/
|
|
|
|
if (signature != n_ptr->signature) {
|
|
|
|
if (n_ptr->working_links == 0) {
|
|
|
|
struct tipc_link *curr_link;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < MAX_BEARERS; i++) {
|
|
|
|
curr_link = n_ptr->links[i];
|
|
|
|
if (curr_link) {
|
|
|
|
memset(&curr_link->media_addr, 0,
|
|
|
|
sizeof(media_addr));
|
|
|
|
tipc_link_reset(curr_link);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
addr_mismatch = (link != NULL);
|
|
|
|
} else if (tipc_link_is_up(link) && !addr_mismatch) {
|
|
|
|
/* delayed rediscovery */
|
|
|
|
} else {
|
|
|
|
disc_dupl_alert(b_ptr, orig, &media_addr);
|
2011-02-28 18:03:05 +03:00
|
|
|
tipc_node_unlock(n_ptr);
|
|
|
|
return;
|
2006-01-02 21:04:38 +03:00
|
|
|
}
|
2011-10-29 01:30:08 +04:00
|
|
|
n_ptr->signature = signature;
|
2011-02-28 18:03:05 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Ensure requesting node's media address is correct
|
|
|
|
*
|
|
|
|
* If media address doesn't match and the link is working, reject the
|
|
|
|
* request (must be from a duplicate node).
|
|
|
|
*
|
|
|
|
* If media address doesn't match and the link is not working, accept
|
|
|
|
* the new media address and reset the link to ensure it starts up
|
|
|
|
* cleanly.
|
|
|
|
*/
|
2011-10-29 01:30:08 +04:00
|
|
|
if (addr_mismatch) {
|
|
|
|
if (tipc_link_is_up(link)) {
|
2011-02-28 18:03:05 +03:00
|
|
|
disc_dupl_alert(b_ptr, orig, &media_addr);
|
|
|
|
tipc_node_unlock(n_ptr);
|
2006-01-02 21:04:38 +03:00
|
|
|
return;
|
2011-10-29 01:30:08 +04:00
|
|
|
} else {
|
|
|
|
memcpy(&link->media_addr, &media_addr,
|
|
|
|
sizeof(media_addr));
|
|
|
|
tipc_link_reset(link);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Create a link endpoint for this bearer, if necessary */
|
|
|
|
if (!link) {
|
|
|
|
link = tipc_link_create(n_ptr, b_ptr, &media_addr);
|
|
|
|
if (!link) {
|
|
|
|
tipc_node_unlock(n_ptr);
|
|
|
|
return;
|
2006-01-02 21:04:38 +03:00
|
|
|
}
|
2011-02-28 18:03:05 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Accept discovery message & send response, if necessary */
|
|
|
|
link_fully_up = link_working_working(link);
|
2011-02-28 18:56:23 +03:00
|
|
|
|
tipc: remove interface state mirroring in bearer
struct 'tipc_bearer' is a generic representation of the underlying
media type, and exists in a one-to-one relationship to each interface
TIPC is using. The struct contains a 'blocked' flag that mirrors the
operational and execution state of the represented interface, and is
updated through notification calls from the latter. The users of
tipc_bearer are checking this flag before each attempt to send a
packet via the interface.
This state mirroring serves no purpose in the current code base. TIPC
links will not discover a media failure any faster through this
mechanism, and in reality the flag only adds overhead at packet
sending and reception.
Furthermore, the fact that the flag needs to be protected by a spinlock
aggregated into tipc_bearer has turned out to cause a serious and
completely unnecessary deadlock problem.
CPU0 CPU1
---- ----
Time 0: bearer_disable() link_timeout()
Time 1: spin_lock_bh(&b_ptr->lock) tipc_link_push_queue()
Time 2: tipc_link_delete() tipc_bearer_blocked(b_ptr)
Time 3: k_cancel_timer(&req->timer) spin_lock_bh(&b_ptr->lock)
Time 4: del_timer_sync(&req->timer)
I.e., del_timer_sync() on CPU0 never returns, because the timer handler
on CPU1 is waiting for the bearer lock.
We eliminate the 'blocked' flag from struct tipc_bearer, along with all
tests on this flag. This not only resolves the deadlock, but also
simplifies and speeds up the data path execution of TIPC. It also fits
well into our ongoing effort to make the locking policy simpler and
more manageable.
An effect of this change is that we can get rid of functions such as
tipc_bearer_blocked(), tipc_continue() and tipc_block_bearer().
We replace the latter with a new function, tipc_reset_bearer(), which
resets all links associated to the bearer immediately after an
interface goes down.
A user might notice one slight change in link behaviour after this
change. When an interface goes down, (e.g. through a NETDEV_DOWN
event) all attached links will be reset immediately, instead of
leaving it to each link to detect the failure through a timer-driven
mechanism. We consider this an improvement, and see no obvious risks
with the new behavior.
Signed-off-by: Erik Hugne <erik.hugne@ericsson.com>
Reviewed-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>
2013-12-06 19:08:00 +04:00
|
|
|
if ((type == DSC_REQ_MSG) && !link_fully_up) {
|
2014-04-21 06:55:52 +04:00
|
|
|
rbuf = tipc_buf_acquire(INT_H_SIZE);
|
2011-02-28 18:56:23 +03:00
|
|
|
if (rbuf) {
|
2014-04-21 06:55:52 +04:00
|
|
|
tipc_disc_init_msg(rbuf, DSC_RESP_MSG, b_ptr);
|
tipc: decouple the relationship between bearer and link
Currently on both paths of message transmission and reception, the
read lock of tipc_net_lock must be held before bearer is accessed,
while the write lock of tipc_net_lock has to be taken before bearer
is configured. Although it can ensure that bearer is always valid on
the two data paths, link and bearer is closely bound together.
So as the part of effort of removing tipc_net_lock, the locking
policy of bearer protection will be adjusted as below: on the two
data paths, RCU is used, and on the configuration path of bearer,
RTNL lock is applied.
Now RCU just covers the path of message reception. To make it possible
to protect the path of message transmission with RCU, link should not
use its stored bearer pointer to access bearer, but it should use the
bearer identity of its attached bearer as index to get bearer instance
from bearer_list array, which can help us decouple the relationship
between bearer and link. As a result, bearer on the path of message
transmission can be safely protected by RCU when we access bearer_list
array within RCU lock protection.
Signed-off-by: Ying Xue <ying.xue@windriver.com>
Reviewed-by: Jon Maloy <jon.maloy@ericsson.com>
Reviewed-by: Erik Hugne <erik.hugne@ericsson.com>
Tested-by: Erik Hugne <erik.hugne@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-04-21 06:55:46 +04:00
|
|
|
tipc_bearer_send(b_ptr->identity, rbuf, &media_addr);
|
2011-11-04 21:24:29 +04:00
|
|
|
kfree_skb(rbuf);
|
2011-02-28 18:56:23 +03:00
|
|
|
}
|
2006-01-02 21:04:38 +03:00
|
|
|
}
|
2011-02-28 18:56:23 +03:00
|
|
|
|
|
|
|
tipc_node_unlock(n_ptr);
|
2006-01-02 21:04:38 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2011-04-22 04:05:25 +04:00
|
|
|
* disc_update - update frequency of periodic link setup requests
|
2006-01-02 21:04:38 +03:00
|
|
|
* @req: ptr to link request structure
|
2011-04-22 05:34:03 +04:00
|
|
|
*
|
|
|
|
* Reinitiates discovery process if discovery object has no associated nodes
|
|
|
|
* and is either not currently searching or is searching at a slow rate
|
2006-01-02 21:04:38 +03:00
|
|
|
*/
|
2011-12-30 05:58:42 +04:00
|
|
|
static void disc_update(struct tipc_link_req *req)
|
2006-01-02 21:04:38 +03:00
|
|
|
{
|
2011-04-22 05:34:03 +04:00
|
|
|
if (!req->num_nodes) {
|
|
|
|
if ((req->timer_intv == TIPC_LINK_REQ_INACTIVE) ||
|
|
|
|
(req->timer_intv > TIPC_LINK_REQ_FAST)) {
|
|
|
|
req->timer_intv = TIPC_LINK_REQ_INIT;
|
2006-01-02 21:04:38 +03:00
|
|
|
k_start_timer(&req->timer, req->timer_intv);
|
|
|
|
}
|
|
|
|
}
|
2007-02-09 17:25:21 +03:00
|
|
|
}
|
2006-01-02 21:04:38 +03:00
|
|
|
|
2011-04-22 04:05:25 +04:00
|
|
|
/**
|
|
|
|
* tipc_disc_add_dest - increment set of discovered nodes
|
|
|
|
* @req: ptr to link request structure
|
|
|
|
*/
|
2011-12-30 05:58:42 +04:00
|
|
|
void tipc_disc_add_dest(struct tipc_link_req *req)
|
2011-04-22 04:05:25 +04:00
|
|
|
{
|
2014-01-08 02:02:43 +04:00
|
|
|
spin_lock_bh(&req->lock);
|
2011-04-22 04:05:25 +04:00
|
|
|
req->num_nodes++;
|
2014-01-08 02:02:43 +04:00
|
|
|
spin_unlock_bh(&req->lock);
|
2011-04-22 04:05:25 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* tipc_disc_remove_dest - decrement set of discovered nodes
|
|
|
|
* @req: ptr to link request structure
|
|
|
|
*/
|
2011-12-30 05:58:42 +04:00
|
|
|
void tipc_disc_remove_dest(struct tipc_link_req *req)
|
2011-04-22 04:05:25 +04:00
|
|
|
{
|
2014-01-08 02:02:43 +04:00
|
|
|
spin_lock_bh(&req->lock);
|
2011-04-22 04:05:25 +04:00
|
|
|
req->num_nodes--;
|
|
|
|
disc_update(req);
|
2014-01-08 02:02:43 +04:00
|
|
|
spin_unlock_bh(&req->lock);
|
2011-04-22 04:05:25 +04:00
|
|
|
}
|
|
|
|
|
2006-01-02 21:04:38 +03:00
|
|
|
/**
|
|
|
|
* disc_timeout - send a periodic link setup request
|
|
|
|
* @req: ptr to link request structure
|
2007-02-09 17:25:21 +03:00
|
|
|
*
|
2006-01-02 21:04:38 +03:00
|
|
|
* Called whenever a link setup request timer associated with a bearer expires.
|
|
|
|
*/
|
2011-12-30 05:58:42 +04:00
|
|
|
static void disc_timeout(struct tipc_link_req *req)
|
2006-01-02 21:04:38 +03:00
|
|
|
{
|
2011-04-22 05:34:03 +04:00
|
|
|
int max_delay;
|
|
|
|
|
2014-01-08 02:02:43 +04:00
|
|
|
spin_lock_bh(&req->lock);
|
2006-01-02 21:04:38 +03:00
|
|
|
|
2011-04-22 05:34:03 +04:00
|
|
|
/* Stop searching if only desired node has been found */
|
tipc: decouple the relationship between bearer and link
Currently on both paths of message transmission and reception, the
read lock of tipc_net_lock must be held before bearer is accessed,
while the write lock of tipc_net_lock has to be taken before bearer
is configured. Although it can ensure that bearer is always valid on
the two data paths, link and bearer is closely bound together.
So as the part of effort of removing tipc_net_lock, the locking
policy of bearer protection will be adjusted as below: on the two
data paths, RCU is used, and on the configuration path of bearer,
RTNL lock is applied.
Now RCU just covers the path of message reception. To make it possible
to protect the path of message transmission with RCU, link should not
use its stored bearer pointer to access bearer, but it should use the
bearer identity of its attached bearer as index to get bearer instance
from bearer_list array, which can help us decouple the relationship
between bearer and link. As a result, bearer on the path of message
transmission can be safely protected by RCU when we access bearer_list
array within RCU lock protection.
Signed-off-by: Ying Xue <ying.xue@windriver.com>
Reviewed-by: Jon Maloy <jon.maloy@ericsson.com>
Reviewed-by: Erik Hugne <erik.hugne@ericsson.com>
Tested-by: Erik Hugne <erik.hugne@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-04-21 06:55:46 +04:00
|
|
|
if (tipc_node(req->domain) && req->num_nodes) {
|
2011-04-22 05:34:03 +04:00
|
|
|
req->timer_intv = TIPC_LINK_REQ_INACTIVE;
|
|
|
|
goto exit;
|
2006-01-02 21:04:38 +03:00
|
|
|
}
|
|
|
|
|
2011-04-22 05:34:03 +04:00
|
|
|
/*
|
|
|
|
* Send discovery message, then update discovery timer
|
|
|
|
*
|
|
|
|
* Keep doubling time between requests until limit is reached;
|
|
|
|
* hold at fast polling rate if don't have any associated nodes,
|
|
|
|
* otherwise hold at slow polling rate
|
|
|
|
*/
|
tipc: decouple the relationship between bearer and link
Currently on both paths of message transmission and reception, the
read lock of tipc_net_lock must be held before bearer is accessed,
while the write lock of tipc_net_lock has to be taken before bearer
is configured. Although it can ensure that bearer is always valid on
the two data paths, link and bearer is closely bound together.
So as the part of effort of removing tipc_net_lock, the locking
policy of bearer protection will be adjusted as below: on the two
data paths, RCU is used, and on the configuration path of bearer,
RTNL lock is applied.
Now RCU just covers the path of message reception. To make it possible
to protect the path of message transmission with RCU, link should not
use its stored bearer pointer to access bearer, but it should use the
bearer identity of its attached bearer as index to get bearer instance
from bearer_list array, which can help us decouple the relationship
between bearer and link. As a result, bearer on the path of message
transmission can be safely protected by RCU when we access bearer_list
array within RCU lock protection.
Signed-off-by: Ying Xue <ying.xue@windriver.com>
Reviewed-by: Jon Maloy <jon.maloy@ericsson.com>
Reviewed-by: Erik Hugne <erik.hugne@ericsson.com>
Tested-by: Erik Hugne <erik.hugne@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-04-21 06:55:46 +04:00
|
|
|
tipc_bearer_send(req->bearer_id, req->buf, &req->dest);
|
tipc: remove interface state mirroring in bearer
struct 'tipc_bearer' is a generic representation of the underlying
media type, and exists in a one-to-one relationship to each interface
TIPC is using. The struct contains a 'blocked' flag that mirrors the
operational and execution state of the represented interface, and is
updated through notification calls from the latter. The users of
tipc_bearer are checking this flag before each attempt to send a
packet via the interface.
This state mirroring serves no purpose in the current code base. TIPC
links will not discover a media failure any faster through this
mechanism, and in reality the flag only adds overhead at packet
sending and reception.
Furthermore, the fact that the flag needs to be protected by a spinlock
aggregated into tipc_bearer has turned out to cause a serious and
completely unnecessary deadlock problem.
CPU0 CPU1
---- ----
Time 0: bearer_disable() link_timeout()
Time 1: spin_lock_bh(&b_ptr->lock) tipc_link_push_queue()
Time 2: tipc_link_delete() tipc_bearer_blocked(b_ptr)
Time 3: k_cancel_timer(&req->timer) spin_lock_bh(&b_ptr->lock)
Time 4: del_timer_sync(&req->timer)
I.e., del_timer_sync() on CPU0 never returns, because the timer handler
on CPU1 is waiting for the bearer lock.
We eliminate the 'blocked' flag from struct tipc_bearer, along with all
tests on this flag. This not only resolves the deadlock, but also
simplifies and speeds up the data path execution of TIPC. It also fits
well into our ongoing effort to make the locking policy simpler and
more manageable.
An effect of this change is that we can get rid of functions such as
tipc_bearer_blocked(), tipc_continue() and tipc_block_bearer().
We replace the latter with a new function, tipc_reset_bearer(), which
resets all links associated to the bearer immediately after an
interface goes down.
A user might notice one slight change in link behaviour after this
change. When an interface goes down, (e.g. through a NETDEV_DOWN
event) all attached links will be reset immediately, instead of
leaving it to each link to detect the failure through a timer-driven
mechanism. We consider this an improvement, and see no obvious risks
with the new behavior.
Signed-off-by: Erik Hugne <erik.hugne@ericsson.com>
Reviewed-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>
2013-12-06 19:08:00 +04:00
|
|
|
|
2011-04-22 05:34:03 +04:00
|
|
|
|
|
|
|
req->timer_intv *= 2;
|
|
|
|
if (req->num_nodes)
|
|
|
|
max_delay = TIPC_LINK_REQ_SLOW;
|
|
|
|
else
|
|
|
|
max_delay = TIPC_LINK_REQ_FAST;
|
|
|
|
if (req->timer_intv > max_delay)
|
|
|
|
req->timer_intv = max_delay;
|
|
|
|
|
|
|
|
k_start_timer(&req->timer, req->timer_intv);
|
|
|
|
exit:
|
2014-01-08 02:02:43 +04:00
|
|
|
spin_unlock_bh(&req->lock);
|
2006-01-02 21:04:38 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2011-04-21 22:58:26 +04:00
|
|
|
* tipc_disc_create - create object to send periodic link setup requests
|
2006-01-02 21:04:38 +03:00
|
|
|
* @b_ptr: ptr to bearer issuing requests
|
|
|
|
* @dest: destination address for request messages
|
2011-04-21 01:24:07 +04:00
|
|
|
* @dest_domain: network domain to which links can be established
|
2007-02-09 17:25:21 +03:00
|
|
|
*
|
2011-04-21 22:58:26 +04:00
|
|
|
* Returns 0 if successful, otherwise -errno.
|
2006-01-02 21:04:38 +03:00
|
|
|
*/
|
2014-03-28 13:32:09 +04:00
|
|
|
int tipc_disc_create(struct tipc_bearer *b_ptr, struct tipc_media_addr *dest)
|
2006-01-02 21:04:38 +03:00
|
|
|
{
|
2011-12-30 05:58:42 +04:00
|
|
|
struct tipc_link_req *req;
|
2006-01-02 21:04:38 +03:00
|
|
|
|
2006-07-22 02:52:20 +04:00
|
|
|
req = kmalloc(sizeof(*req), GFP_ATOMIC);
|
2006-01-02 21:04:38 +03:00
|
|
|
if (!req)
|
2011-04-21 22:58:26 +04:00
|
|
|
return -ENOMEM;
|
2006-01-02 21:04:38 +03:00
|
|
|
|
2014-04-21 06:55:52 +04:00
|
|
|
req->buf = tipc_buf_acquire(INT_H_SIZE);
|
2014-04-25 06:44:15 +04:00
|
|
|
if (!req->buf) {
|
|
|
|
kfree(req);
|
2014-04-21 06:55:52 +04:00
|
|
|
return -ENOMEM;
|
2014-04-25 06:44:15 +04:00
|
|
|
}
|
2006-01-02 21:04:38 +03:00
|
|
|
|
2014-04-21 06:55:52 +04:00
|
|
|
tipc_disc_init_msg(req->buf, DSC_REQ_MSG, b_ptr);
|
2006-01-02 21:04:38 +03:00
|
|
|
memcpy(&req->dest, dest, sizeof(*dest));
|
tipc: decouple the relationship between bearer and link
Currently on both paths of message transmission and reception, the
read lock of tipc_net_lock must be held before bearer is accessed,
while the write lock of tipc_net_lock has to be taken before bearer
is configured. Although it can ensure that bearer is always valid on
the two data paths, link and bearer is closely bound together.
So as the part of effort of removing tipc_net_lock, the locking
policy of bearer protection will be adjusted as below: on the two
data paths, RCU is used, and on the configuration path of bearer,
RTNL lock is applied.
Now RCU just covers the path of message reception. To make it possible
to protect the path of message transmission with RCU, link should not
use its stored bearer pointer to access bearer, but it should use the
bearer identity of its attached bearer as index to get bearer instance
from bearer_list array, which can help us decouple the relationship
between bearer and link. As a result, bearer on the path of message
transmission can be safely protected by RCU when we access bearer_list
array within RCU lock protection.
Signed-off-by: Ying Xue <ying.xue@windriver.com>
Reviewed-by: Jon Maloy <jon.maloy@ericsson.com>
Reviewed-by: Erik Hugne <erik.hugne@ericsson.com>
Tested-by: Erik Hugne <erik.hugne@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-04-21 06:55:46 +04:00
|
|
|
req->bearer_id = b_ptr->identity;
|
|
|
|
req->domain = b_ptr->domain;
|
2011-04-22 04:05:25 +04:00
|
|
|
req->num_nodes = 0;
|
2006-01-02 21:04:38 +03:00
|
|
|
req->timer_intv = TIPC_LINK_REQ_INIT;
|
2014-01-08 02:02:43 +04:00
|
|
|
spin_lock_init(&req->lock);
|
2006-01-02 21:04:38 +03:00
|
|
|
k_init_timer(&req->timer, (Handler)disc_timeout, (unsigned long)req);
|
|
|
|
k_start_timer(&req->timer, req->timer_intv);
|
2011-04-21 22:58:26 +04:00
|
|
|
b_ptr->link_req = req;
|
tipc: decouple the relationship between bearer and link
Currently on both paths of message transmission and reception, the
read lock of tipc_net_lock must be held before bearer is accessed,
while the write lock of tipc_net_lock has to be taken before bearer
is configured. Although it can ensure that bearer is always valid on
the two data paths, link and bearer is closely bound together.
So as the part of effort of removing tipc_net_lock, the locking
policy of bearer protection will be adjusted as below: on the two
data paths, RCU is used, and on the configuration path of bearer,
RTNL lock is applied.
Now RCU just covers the path of message reception. To make it possible
to protect the path of message transmission with RCU, link should not
use its stored bearer pointer to access bearer, but it should use the
bearer identity of its attached bearer as index to get bearer instance
from bearer_list array, which can help us decouple the relationship
between bearer and link. As a result, bearer on the path of message
transmission can be safely protected by RCU when we access bearer_list
array within RCU lock protection.
Signed-off-by: Ying Xue <ying.xue@windriver.com>
Reviewed-by: Jon Maloy <jon.maloy@ericsson.com>
Reviewed-by: Erik Hugne <erik.hugne@ericsson.com>
Tested-by: Erik Hugne <erik.hugne@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-04-21 06:55:46 +04:00
|
|
|
tipc_bearer_send(req->bearer_id, req->buf, &req->dest);
|
2011-04-21 22:58:26 +04:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* tipc_disc_delete - destroy object sending periodic link setup requests
|
|
|
|
* @req: ptr to link request structure
|
|
|
|
*/
|
2011-12-30 05:58:42 +04:00
|
|
|
void tipc_disc_delete(struct tipc_link_req *req)
|
2011-04-21 22:58:26 +04:00
|
|
|
{
|
|
|
|
k_cancel_timer(&req->timer);
|
|
|
|
k_term_timer(&req->timer);
|
2011-11-04 21:24:29 +04:00
|
|
|
kfree_skb(req->buf);
|
2011-04-21 22:58:26 +04:00
|
|
|
kfree(req);
|
2007-02-09 17:25:21 +03:00
|
|
|
}
|
2014-04-21 06:55:52 +04:00
|
|
|
|
|
|
|
/**
|
|
|
|
* tipc_disc_reset - reset object to send periodic link setup requests
|
|
|
|
* @b_ptr: ptr to bearer issuing requests
|
|
|
|
* @dest_domain: network domain to which links can be established
|
|
|
|
*/
|
|
|
|
void tipc_disc_reset(struct tipc_bearer *b_ptr)
|
|
|
|
{
|
|
|
|
struct tipc_link_req *req = b_ptr->link_req;
|
|
|
|
|
|
|
|
spin_lock_bh(&req->lock);
|
|
|
|
tipc_disc_init_msg(req->buf, DSC_REQ_MSG, b_ptr);
|
|
|
|
req->bearer_id = b_ptr->identity;
|
|
|
|
req->domain = b_ptr->domain;
|
|
|
|
req->num_nodes = 0;
|
|
|
|
req->timer_intv = TIPC_LINK_REQ_INIT;
|
|
|
|
k_start_timer(&req->timer, req->timer_intv);
|
|
|
|
tipc_bearer_send(req->bearer_id, req->buf, &req->dest);
|
|
|
|
spin_unlock_bh(&req->lock);
|
|
|
|
}
|